[Scummvm-cvs-logs] CVS: scummvm/backends/wince wince-sdl.cpp,1.11,1.12 wince-sdl.h,1.7,1.8

[Nicolas Bacca]

Update of /cvsroot/scummvm/scummvm/backends/wince
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30723

Modified Files:
	wince-sdl.cpp wince-sdl.h 
Log Message:
Synch with branch and Smartphone changes (Smartphone build not ready yet, but getting ready slowly)

Index: wince-sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/wince-sdl.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- wince-sdl.cpp	28 Mar 2004 20:31:17 -0000	1.11
+++ wince-sdl.cpp	9 May 2004 15:02:10 -0000	1.12
@@ -35,6 +35,8 @@
 #include "resource.h"
 
 #include "CEActions.h"
+#include "CEActionsPocket.h"
+#include "CEActionsSmartphone.h"
 #include "ItemAction.h"
 #include "CEKeysDialog.h"
 
@@ -62,6 +64,8 @@
 // Given to the true main, needed for backend adaptation
 
[...1106 lines suppressed...]
 				if (!_freeLook)
@@ -1294,7 +1285,6 @@
 
 		case SDL_QUIT:
 			event->event_code = EVENT_QUIT;
-			CEDevice::disableHardwareKeyMapping();
 			return true;
 		}
 	}
@@ -1302,6 +1292,9 @@
 }
 
 void OSystem_WINCE3::quit() {
-	CEDevice::disableHardwareKeyMapping();
+	fclose(stdout_file);
+	fclose(stderr_file);
+	DeleteFile(TEXT("\\scummvm_stdout.txt"));
+	DeleteFile(TEXT("\\scummvm_stderr.txt"));
 	OSystem_SDL::quit();
 }

Index: wince-sdl.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/wince-sdl.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- wince-sdl.h	28 Mar 2004 20:31:17 -0000	1.7
+++ wince-sdl.h	9 May 2004 15:02:10 -0000	1.8
@@ -43,10 +43,6 @@
 	// Update the dirty areas of the screen
 	void internUpdateScreen();
 
-	bool hasFeature(Feature f);
-	void setFeatureState(Feature f, bool enable);
-	bool getFeatureState(Feature f);
-
 	void initSize(uint w, uint h);
 
 	// Overloaded from SDL_Common (toolbar handling)
@@ -71,17 +67,39 @@
 	void add_right_click();
 	void swap_mouse_visibility();
 	void swap_freeLook();
+	void swap_zoom_up();
+	void swap_zoom_down();
 
-protected:
-	SDL_Surface *_hwscreen;    // hardware screen
+#ifdef WIN32_PLATFORM_WFSP
+	// Smartphone actions
+	void add_left_click();
+	void move_cursor_up();
+	void move_cursor_down();
+	void move_cursor_left();
+	void move_cursor_right();
+	void switch_zone();
+#endif
 
-	ScalerProc *_scaler_proc;
 
-	virtual void load_gfx_mode();
-	virtual void unload_gfx_mode();
-	virtual bool save_screenshot(const char *filename);
+protected:
+	void load_gfx_mode();
+	void unload_gfx_mode();
 	void hotswap_gfx_mode();
+	bool save_screenshot(const char *filename);
 
+	
+	//const GraphicsMode *getSupportedGraphicsModes() const;	
+	bool setGraphicsMode(int mode);
+	//int getGraphicsMode() const;	
+	int getDefaultGraphicsMode() const;
+
+	void setWindowCaption(const char *caption);
+	bool openCD(int drive);
+	int getOutputSampleRate() const;
+
+	bool hasFeature(Feature f);
+	void setFeatureState(Feature f, bool enable);
+	bool getFeatureState(Feature f);
 
 private:
 
@@ -92,13 +110,15 @@
 	static void private_sound_proc(void *param, byte *buf, int len);
 	static SoundProc _originalSoundProc;
 
+	bool update_scalers();
 	void create_toolbar();
 	void update_game_settings();
 	void check_mappings();
 	void update_keyboard();
 	void get_sample_rate();	
 
-	CEKEYS::KeysBuffer *_keysBuffer;
+	void retrieve_mouse_location(int &x, int &y);
+
 	CEGUI::ToolbarHandler _toolbarHandler;
 
 	SDL_Surface *_toolbarLow;	// toolbar 320x40
@@ -111,9 +131,6 @@
 
 	bool _forceHideMouse;		// force invisible mouse cursor
 
-	bool _addRightClickDown;	// add a right click event (button pushed)
-	bool _addRightClickUp;		// add a right click event (button released)
-
 	bool _forcePanelInvisible;  // force panel visibility for some cases
 	bool _panelVisible;			// panel visibility
 	bool _panelStateForced;		// panel visibility forced by external call
@@ -129,6 +146,10 @@
 	bool _saveToolbarState;		// save visibility when forced
 	String _saveActiveToolbar;	// save active toolbar when forced
 
+	bool _saveToolbarZoom;		// save visibility when zooming 
+	bool _zoomUp;				// zooming up mode
+	bool _zoomDown;				// zooming down mode
+
 	int _scaleFactorXm;
 	int _scaleFactorXd;
 	int _scaleFactorYm;