[Scummvm-cvs-logs] CVS: scummvm/backends/x11 x11.cpp,1.33,1.34

Max Horn fingolfin at users.sourceforge.net
Sun Dec 5 09:44:03 CET 2004


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

Modified Files:
	x11.cpp 
Log Message:
Clean up OSystem::Event

Index: x11.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/x11/x11.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- x11.cpp	28 Sep 2004 20:19:24 -0000	1.33
+++ x11.cpp	5 Dec 2004 17:42:16 -0000	1.34
@@ -923,7 +923,7 @@
 					}
 				}
 				if (keycode != -1) {
-					scumm_event.event_code = EVENT_KEYDOWN;
+					scumm_event.type = EVENT_KEYDOWN;
 					scumm_event.kbd.keycode = keycode;
 					scumm_event.kbd.ascii = (ascii != -1 ? ascii : keycode);
 					scumm_event.kbd.flags = mode;
@@ -965,7 +965,7 @@
 					}
 				}
 				if (keycode != -1) {
-					scumm_event.event_code = EVENT_KEYUP;
+					scumm_event.type = EVENT_KEYUP;
 					scumm_event.kbd.keycode = keycode;
 					scumm_event.kbd.ascii = (ascii != -1 ? ascii : keycode);
 					scumm_event.kbd.flags = mode;
@@ -978,12 +978,12 @@
 			if (report_presses != 0) {
 				if (event.xbutton.button == 1) {
 					if (fake_right_mouse == 0) {
-						scumm_event.event_code = EVENT_LBUTTONDOWN;
+						scumm_event.type = EVENT_LBUTTONDOWN;
 					} else {
-						scumm_event.event_code = EVENT_RBUTTONDOWN;
+						scumm_event.type = EVENT_RBUTTONDOWN;
 					}
 				} else if (event.xbutton.button == 3)
-					scumm_event.event_code = EVENT_RBUTTONDOWN;
+					scumm_event.type = EVENT_RBUTTONDOWN;
 				scumm_event.mouse.x = event.xbutton.x - scumm_x;
 				scumm_event.mouse.y = event.xbutton.y - scumm_y;
 				return true;
@@ -994,12 +994,12 @@
 			if (report_presses != 0) {
 				if (event.xbutton.button == 1) {
 					if (fake_right_mouse == 0) {
-						scumm_event.event_code = EVENT_LBUTTONUP;
+						scumm_event.type = EVENT_LBUTTONUP;
 					} else {
-						scumm_event.event_code = EVENT_RBUTTONUP;
+						scumm_event.type = EVENT_RBUTTONUP;
 					}
 				} else if (event.xbutton.button == 3)
-					scumm_event.event_code = EVENT_RBUTTONUP;
+					scumm_event.type = EVENT_RBUTTONUP;
 				scumm_event.mouse.x = event.xbutton.x - scumm_x;
 				scumm_event.mouse.y = event.xbutton.y - scumm_y;
 				return true;
@@ -1007,7 +1007,7 @@
 			break;
 
 		case MotionNotify:
-			scumm_event.event_code = EVENT_MOUSEMOVE;
+			scumm_event.type = EVENT_MOUSEMOVE;
 			scumm_event.mouse.x = event.xmotion.x - scumm_x;
 			scumm_event.mouse.y = event.xmotion.y - scumm_y;
 			set_mouse_pos(scumm_event.mouse.x, scumm_event.mouse.y);





More information about the Scummvm-git-logs mailing list