fuse-emulator-cvs — SCM commits for Fuse (the Free Unix Spectrum Emulator), the associated utilities and libspectrum, the ZX Spectrum file format handling library

[fuse-emulator-cvs] fuse/ui/gtk gtkinternals.h,NONE,1.1 statusbar.c,NONE,1.1 Makefile.am,1.15,1.16 gtkui.c,1.100,1.101

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse/ui/gtk
In directory sc8-pr-cvs1:/tmp/cvs-serv16496/ui/gtk

Modified Files:
	Makefile.am gtkui.c 
Added Files:
	gtkinternals.h statusbar.c 
Log Message:
Add very simple statusbar showing tape motor status.


--- NEW FILE: gtkinternals.h ---
/* gtkinternals.h: stuff internal to the GTK+ UI
   Copyright (c) 2003 Philip Kendall

   $Id: gtkinternals.h,v 1.1 2003/10/04 22:25:46 pak21 Exp $

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

   Author contact information:

   E-mail: pak...@sr...
   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England

*/

#ifndef FUSE_GTKINTERNALS_H
#define FUSE_GTKINTERNALS_H

#include <gtk/gtk.h>

/* Is the tape running? */
extern GtkWidget *gtkstatusbar_tape;

#endif				/* #ifndef FUSE_GTKINTERNALS_H */

--- NEW FILE: statusbar.c ---
/* statusbar.c: routines for updating the status bar
   Copyright (c) 2003 Philip Kendall, Russell Marks

   $Id: statusbar.c,v 1.1 2003/10/04 22:25:46 pak21 Exp $

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

   Author contact information:

   E-mail: pak...@sr...
   Postal address: 15 Crescent Road, Wokingham, Berks, RG40 2DB, England

*/

#include <config.h>

#ifdef UI_GTK		/* Use this file iff we're using GTK+ */

#include <gtk/gtk.h>

#include "gtkinternals.h"

/* Is the tape running? */
GtkWidget *gtkstatusbar_tape = NULL;

int
ui_statusbar_tape( int running )
{
  gtk_label_set( GTK_LABEL( gtkstatusbar_tape ),
		 running ? "Tape: 1" : "Tape: 0" );
  return 0;
}

#endif			/* #ifdef UI_GTK */

Index: Makefile.am
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/ui/gtk/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile.am	18 Jun 2003 12:51:10 -0000	1.15
--- Makefile.am	4 Oct 2003 22:25:46 -0000	1.16
***************
*** 1,4 ****
  ## Process this file with automake to produce Makefile.in
! ## Copyright (c) 2001-2002 Philip Kendall
  
  ## $Id$
--- 1,4 ----
  ## Process this file with automake to produce Makefile.in
! ## Copyright (c) 2001-2003 Philip Kendall
  
  ## $Id$
***************
*** 38,42 ****
                       gtkui.c \
  	             options.c keysyms.c picture.c \
! 		     roms.c
  
  BUILT_SOURCES = keysyms.c options.c options.h
--- 38,43 ----
                       gtkui.c \
  	             options.c keysyms.c picture.c \
! 		     roms.c \
! 		     statusbar.c
  
  BUILT_SOURCES = keysyms.c options.c options.h
***************
*** 52,54 ****
  
  noinst_HEADERS = gtkdisplay.h \
! 	         gtkkeyboard.h gtkui.h options.h options.pl options-header.pl
--- 53,60 ----
  
  noinst_HEADERS = gtkdisplay.h \
! 	         gtkkeyboard.h \
! 		 gtkinternals.h \
! 		 gtkui.h \
! 		 options.h \
! 		 options.pl \
! 		 options-header.pl

Index: gtkui.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/ui/gtk/gtkui.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** gtkui.c	18 Jun 2003 12:51:10 -0000	1.100
--- gtkui.c	4 Oct 2003 22:25:46 -0000	1.101
***************
*** 1,4 ****
  /* gtkui.c: GTK+ routines for dealing with the user interface
!    Copyright (c) 2000-2002 Philip Kendall, Russell Marks
  
     $Id$
--- 1,4 ----
  /* gtkui.c: GTK+ routines for dealing with the user interface
!    Copyright (c) 2000-2003 Philip Kendall, Russell Marks
  
     $Id$
***************
*** 47,50 ****
--- 47,51 ----
  #include "gtkdisplay.h"
  #include "gtkkeyboard.h"
+ #include "gtkinternals.h"
  #include "gtkui.h"
  #include "machine.h"
***************
*** 241,245 ****
  ui_init( int *argc, char ***argv )
  {
!   GtkWidget *box,*menu_bar;
    GtkAccelGroup *accel_group;
    GdkGeometry geometry;
--- 242,246 ----
  ui_init( int *argc, char ***argv )
  {
!   GtkWidget *box, *menu_bar, *status_bar;
    GtkAccelGroup *accel_group;
    GdkGeometry geometry;
***************
*** 294,297 ****
--- 295,304 ----
  
    gtk_box_pack_start( GTK_BOX(box), gtkui_drawing_area, FALSE, FALSE, 0 );
+ 
+   status_bar = gtk_hbox_new( FALSE, 3 );
+   gtk_box_pack_start_defaults( GTK_BOX( box ), status_bar );
+ 
+   gtkstatusbar_tape = gtk_label_new( "Tape: 0" );
+   gtk_box_pack_start_defaults( GTK_BOX( status_bar ), gtkstatusbar_tape );
  
    hints = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE |

[fuse-emulator-cvs] fuse/ui ui.h,1.31,1.32

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse/ui
In directory sc8-pr-cvs1:/tmp/cvs-serv16496/ui

Modified Files:
	ui.h 
Log Message:
Add very simple statusbar showing tape motor status.


Index: ui.h
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/ui/ui.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** ui.h	11 Jul 2003 11:03:25 -0000	1.31
--- ui.h	4 Oct 2003 22:25:46 -0000	1.32
***************
*** 84,86 ****
--- 84,89 ----
  int ui_menu_activate_ay_logging( int recording );
  
+ /* Functions to update the statusbar */
+ int ui_statusbar_tape( int running );
+ 
  #endif			/* #ifndef FUSE_UI_H */

[fuse-emulator-cvs] fuse tape.c,1.94,1.95

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse
In directory sc8-pr-cvs1:/tmp/cvs-serv16496

Modified Files:
	tape.c 
Log Message:
Add very simple statusbar showing tape motor status.


Index: tape.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/tape.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** tape.c	4 Oct 2003 21:53:08 -0000	1.94
--- tape.c	4 Oct 2003 22:25:46 -0000	1.95
***************
*** 74,77 ****
--- 74,79 ----
    if( !tape ) return error;
  
+   /* Don't call tape_stop() here as the UI hasn't been initialised yet,
+      so we can't update the statusbar */
    tape_playing = 0;
    tape_microphone = 0;
***************
*** 482,485 ****
--- 484,490 ----
    tape_microphone = 0;
  
+   /* Update the status bar */
+   ui_statusbar_tape( 1 );
+ 
    /* Timex machines have no loading noise */
    if( ( !( machine_current->timex ) ) && settings_current.sound_load )
***************
*** 503,506 ****
--- 508,512 ----
  {
    tape_playing = 0;
+   ui_statusbar_tape( 0 );
    return 0;
  }
***************
*** 554,558 ****
        libspectrum_tape_block_type( block ) == LIBSPECTRUM_TAPE_BLOCK_ROM
      ) {
!     tape_playing = 0;
      return 0;
    }
--- 560,564 ----
        libspectrum_tape_block_type( block ) == LIBSPECTRUM_TAPE_BLOCK_ROM
      ) {
!     error = tape_stop(); if( error ) return error;
      return 0;
    }

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.24,1.25

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv16496/hacking

Modified Files:
	ChangeLog 
Log Message:
Add very simple statusbar showing tape motor status.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ChangeLog	4 Oct 2003 21:53:09 -0000	1.24
--- ChangeLog	4 Oct 2003 22:25:46 -0000	1.25
***************
*** 222,223 ****
--- 222,225 ----
  20031004 timer.c: remove duplicated Win32 code (Marek)
  20031004 tape.c, tape.h: make tape and tape_playing static.
+ 20031004 tape.c, ui/ui.h, ui/gtk: add very simple statusbar showing tape
+ 	 status.

[fuse-emulator-cvs] fuse tape.c,1.93,1.94 tape.h,1.18,1.19

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse
In directory sc8-pr-cvs1:/tmp/cvs-serv11261

Modified Files:
	tape.c tape.h 
Log Message:
Make tape and tape_playing static variables.


Index: tape.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/tape.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** tape.c	19 Jul 2003 09:17:44 -0000	1.93
--- tape.c	4 Oct 2003 21:53:08 -0000	1.94
***************
*** 51,58 ****
  
  /* The current tape */
! libspectrum_tape *tape;
  
  /* Is the emulated tape deck playing? */
! int tape_playing;
  
  /* Is there a high input to the EAR socket? */
--- 51,58 ----
  
  /* The current tape */
! static libspectrum_tape *tape;
  
  /* Is the emulated tape deck playing? */
! static int tape_playing;
  
  /* Is there a high input to the EAR socket? */

Index: tape.h
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/tape.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** tape.h	11 Jul 2003 11:03:25 -0000	1.18
--- tape.h	4 Oct 2003 21:53:09 -0000	1.19
***************
*** 56,60 ****
  int tape_free_block_list( char ***list, size_t n );
  
- extern int tape_playing;
  extern int tape_microphone;
  
--- 56,59 ----

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.23,1.24

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv11261/hacking

Modified Files:
	ChangeLog 
Log Message:
Make tape and tape_playing static variables.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ChangeLog	4 Oct 2003 12:05:01 -0000	1.23
--- ChangeLog	4 Oct 2003 21:53:09 -0000	1.24
***************
*** 221,222 ****
--- 221,223 ----
  	 the 0.6.1.1 changes to HEAD).
  20031004 timer.c: remove duplicated Win32 code (Marek)
+ 20031004 tape.c, tape.h: make tape and tape_playing static.

[fuse-emulator-cvs] fuse/hacking ChangeLog,1.22,1.23

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse/hacking
In directory sc8-pr-cvs1:/tmp/cvs-serv27816/hacking

Modified Files:
	ChangeLog 
Log Message:
Remove duplicated Win32 code (Marek).


Index: ChangeLog
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/hacking/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ChangeLog	3 Oct 2003 18:03:10 -0000	1.22
--- ChangeLog	4 Oct 2003 12:05:01 -0000	1.23
***************
*** 220,221 ****
--- 220,222 ----
  20031003 configure.in: bump version number to 0.6.1.1 (missed when porting
  	 the 0.6.1.1 changes to HEAD).
+ 20031004 timer.c: remove duplicated Win32 code (Marek)

[fuse-emulator-cvs] fuse timer.c,1.18,1.19

[<pa...@us...>]

Update of /cvsroot/fuse-emulator/fuse
In directory sc8-pr-cvs1:/tmp/cvs-serv27816

Modified Files:
	timer.c 
Log Message:
Remove duplicated Win32 code (Marek).


Index: timer.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/timer.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** timer.c	12 Aug 2003 14:30:05 -0000	1.18
--- timer.c	4 Oct 2003 12:05:00 -0000	1.19
***************
*** 185,210 ****
  }
  
- 
-   return 0;
- }
- 
- void
- timer_sleep( void )
- {
- #ifndef DEBUG_MODE
-   while( timer_count <= 0.0 ) Sleep(0);
- #endif				/* #ifndef DEBUG_MODE */
- }
- 
- int
- timer_end( void )
- {
- #ifndef DEBUG_MODE
-   timeKillEvent(wTimerID);	/* cancel the event */
-   wTimerID = 0;
- #endif				/* #ifndef DEBUG_MODE */
-   return 0;
- }
- 
  void CALLBACK
  timer_signal( UINT wTimerID, UINT msg, DWORD dwUser, DWORD dw1, DWORD dw2 )
--- 185,188 ----