From: <fr...@us...> - 2011-04-30 12:45:37
|
Revision: 4401 http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4401&view=rev Author: fredm Date: 2011-04-30 12:45:31 +0000 (Sat, 30 Apr 2011) Log Message: ----------- Add machine name into the status bar the same as the GTK UI. Fix a few compiler warnings (patch #3294566) (Sergio Baldovi). Modified Paths: -------------- trunk/fuse/hacking/ChangeLog trunk/fuse/ui/win32/statusbar.c trunk/fuse/ui/win32/win32display.c trunk/fuse/ui/win32/win32internals.h Modified: trunk/fuse/hacking/ChangeLog =================================================================== --- trunk/fuse/hacking/ChangeLog 2011-04-30 12:00:36 UTC (rev 4400) +++ trunk/fuse/hacking/ChangeLog 2011-04-30 12:45:31 UTC (rev 4401) @@ -3616,3 +3616,6 @@ installed as libpng14 (thanks, rkd77) (Fred). 20110430 ui/xlib/xjoystick.c: fix complilation --without-gtk --with-x with joystick configured (rkd77). +20110430 ui/win32/{statusbar.c,win32display.c,win32internals.h}: add machine + name into the status bar the same as the GTK UI. Fix a few compiler + warnings (patch #3294566) (Sergio Baldovi). Modified: trunk/fuse/ui/win32/statusbar.c =================================================================== --- trunk/fuse/ui/win32/statusbar.c 2011-04-30 12:00:36 UTC (rev 4400) +++ trunk/fuse/ui/win32/statusbar.c 2011-04-30 12:45:31 UTC (rev 4401) @@ -124,6 +124,12 @@ return 0; } +void +win32statusbar_update_machine( const char *name ) +{ + SendMessage( fuse_hStatusWindow, SB_SETTEXT, (WPARAM) 0, (LPARAM) name ); +} + int ui_statusbar_update( ui_statusbar_item item, ui_statusbar_state state ) { @@ -257,7 +263,7 @@ } void -win32statusbar_resize( HWND hWnd, WPARAM wParam, LPARAM lParam ) +win32statusbar_resize( HWND hWnd, WPARAM wParam GCC_UNUSED, LPARAM lParam ) { const int speed_bar_width = 70; RECT rcClient; Modified: trunk/fuse/ui/win32/win32display.c =================================================================== --- trunk/fuse/ui/win32/win32display.c 2011-04-30 12:00:36 UTC (rev 4400) +++ trunk/fuse/ui/win32/win32display.c 2011-04-30 12:45:31 UTC (rev 4401) @@ -55,9 +55,9 @@ static const int rgb_pitch = ( DISPLAY_SCREEN_WIDTH + 3 ) * 4; /* The scaled image */ -static unsigned char scaled_image[ 4 * 3 * DISPLAY_SCREEN_HEIGHT * - (size_t)(1.5 * DISPLAY_SCREEN_WIDTH) ]; -static const ptrdiff_t scaled_pitch = 4 * 1.5 * DISPLAY_SCREEN_WIDTH; +static unsigned char scaled_image[ 3 * DISPLAY_SCREEN_HEIGHT * + 6 * DISPLAY_SCREEN_WIDTH ]; +static const ptrdiff_t scaled_pitch = 6 * DISPLAY_SCREEN_WIDTH; /* Win32 specific variables */ static void *win32_pixdata; @@ -222,6 +222,8 @@ int uidisplay_init( int width, int height ) { + const char *machine_name; + image_width = width; image_height = height; image_scale = width / DISPLAY_ASPECT_WIDTH; @@ -234,6 +236,9 @@ win32display_load_gfx_mode(); + machine_name = libspectrum_machine_name( machine_current->machine ); + win32statusbar_update_machine( machine_name ); + return 0; } Modified: trunk/fuse/ui/win32/win32internals.h =================================================================== --- trunk/fuse/ui/win32/win32internals.h 2011-04-30 12:00:36 UTC (rev 4400) +++ trunk/fuse/ui/win32/win32internals.h 2011-04-30 12:45:31 UTC (rev 4401) @@ -117,10 +117,11 @@ * Statusbar routines (statusbar.c) */ -void win32statusbar_create(); +void win32statusbar_create( HWND hWnd ); int win32statusbar_set_visibility( int visible ); void win32statusbar_redraw( HWND hWnd, LPARAM lParam ); void win32statusbar_resize( HWND hWnd, WPARAM wParam, LPARAM lParam ); +void win32statusbar_update_machine( const char *name ); /* * Dialog box reset This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |