[Scummvm-cvs-logs] CVS: scummvm sdl.cpp,1.135,1.136 sdl_gl.cpp,1.6,1.7

Max Horn fingolfin at users.sourceforge.net
Thu Jul 25 14:34:03 CEST 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv7181

Modified Files:
	sdl.cpp sdl_gl.cpp 
Log Message:
rest of zaurus patch

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- sdl.cpp	23 Jul 2002 10:51:17 -0000	1.135
+++ sdl.cpp	25 Jul 2002 21:33:40 -0000	1.136
@@ -844,7 +844,6 @@
 					quit();
 					break;
 				}
-	
 				if (b == (KBD_CTRL|KBD_ALT) && 
 					(ev.key.keysym.sym>='1') && (ev.key.keysym.sym<='7')) {
 					Property prop;
@@ -852,11 +851,47 @@
 					property(PROP_SET_GFX_MODE, &prop);
 					break;
 				}
-	
-	
+				#ifdef QTOPIA
+				// quit on fn+backspace on zaurus
+				if (ev.key.keysym.sym==127) {
+					quit();
+					break;
+				}
+				// map menu key (f11) to f5 (scumm menu)
+				if (ev.key.keysym.sym==292) {
+					event->event_code = EVENT_KEYDOWN;
+					event->kbd.keycode = 286;
+					event->kbd.ascii = mapKey(286, ev.key.keysym.mod);
+				}
+				// map center (space) to tab (default action )
+				// i wanted to map the calendar button but the calendar comes up
+				//
+				else if (ev.key.keysym.sym==32) {
+					event->event_code = EVENT_KEYDOWN;
+					event->kbd.keycode = 9;
+					event->kbd.ascii = mapKey(9, ev.key.keysym.mod);
+				}
+				// since we stole space (pause) above we'll rebind it to the tab key on the keyboard
+				else if (ev.key.keysym.sym==9) {
+					event->event_code = EVENT_KEYDOWN;
+					event->kbd.keycode = 32;
+					event->kbd.ascii = mapKey(32, ev.key.keysym.mod);
+				}
+				else {
+				// let the events fall through if we didn't change them, this may not be the best way to
+				// set it up, but i'm not sure how sdl would like it if we let if fall through then redid it though.
+				// and yes i have an huge terminal size so i dont wrap soon enough.
+					event->event_code = EVENT_KEYDOWN;
+					event->kbd.keycode = ev.key.keysym.sym;
+					event->kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod);
+				}
+				#endif
+				#ifndef QTOPIA
 				event->event_code = EVENT_KEYDOWN;
 				event->kbd.keycode = ev.key.keysym.sym;
 				event->kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod);
+				#endif
+				
 				switch(ev.key.keysym.sym) {
 					case SDLK_LEFT:
 						km.x_vel = -1;
@@ -1340,7 +1375,6 @@
 #ifdef WIN32
 	a = GetTickCount();
 #endif
-
 #ifdef UNIX
 	struct timeval tv;
 	gettimeofday(&tv, NULL);

Index: sdl_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl_gl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sdl_gl.cpp	23 Jul 2002 10:51:17 -0000	1.6
+++ sdl_gl.cpp	25 Jul 2002 21:33:43 -0000	1.7
@@ -1014,7 +1014,6 @@
 #ifdef WIN32
 	a = GetTickCount();
 #endif
-
 #ifdef UNIX
 	struct timeval tv;
 	gettimeofday(&tv, NULL);





More information about the Scummvm-git-logs mailing list