[Hgengine-cvs] SF.net SVN: hgengine:[517] Mercury2/src/X11Window.cpp

[<cn...@us...>]

Revision: 517
          http://hgengine.svn.sourceforge.net/hgengine/?rev=517&view=rev
Author:   cnlohr
Date:     2009-08-23 06:03:15 +0000 (Sun, 23 Aug 2009)

Log Message:
-----------
fix X11 button receiving

Modified Paths:
--------------
    Mercury2/src/X11Window.cpp

Modified: Mercury2/src/X11Window.cpp
===================================================================
--- Mercury2/src/X11Window.cpp	2009-08-23 05:24:34 UTC (rev 516)
+++ Mercury2/src/X11Window.cpp	2009-08-23 06:03:15 UTC (rev 517)
@@ -280,18 +280,14 @@
 			{
 				XButtonEvent* e = (XButtonEvent*)&event;
 				uint8_t left, right, center, su, sd;
-				left   = (e->state & X11_MASK(MOUSE_BTN_LEFT))        ^ (e->button == MOUSE_BTN_LEFT);
-				right  = (e->state & X11_MASK(MOUSE_BTN_RIGHT))       ^ (e->button == MOUSE_BTN_RIGHT);
-				center = (e->state & X11_MASK(MOUSE_BTN_CENTER))      ^ (e->button == MOUSE_BTN_CENTER);
-				su     = (e->state & X11_MASK(MOUSE_BTN_SCROLL_UP))   ^ (e->button == MOUSE_BTN_SCROLL_UP);
-				sd     = (e->state & X11_MASK(MOUSE_BTN_SCROLL_DOWN)) ^ (e->button == MOUSE_BTN_SCROLL_DOWN);
-				
-				MouseInput::ProcessMouseInput(0, 0, 
-					e->state & X11_MASK(MOUSE_BTN_LEFT),
-					e->state & X11_MASK(MOUSE_BTN_RIGHT),
-					e->state & X11_MASK(MOUSE_BTN_CENTER),
-					e->state & X11_MASK(MOUSE_BTN_SCROLL_UP),
-					e->state & X11_MASK(MOUSE_BTN_SCROLL_DOWN));
+				left   = (e->state & X11_MASK(MOUSE_BTN_LEFT))!=0        ^ (e->button == MOUSE_BTN_LEFT);
+				right  = (e->state & X11_MASK(MOUSE_BTN_RIGHT))!=0       ^ (e->button == MOUSE_BTN_RIGHT);
+				center = (e->state & X11_MASK(MOUSE_BTN_CENTER))!=0      ^ (e->button == MOUSE_BTN_CENTER);
+				su     = (e->state & X11_MASK(MOUSE_BTN_SCROLL_UP))!=0   ^ (e->button == MOUSE_BTN_SCROLL_UP);
+				sd     = (e->state & X11_MASK(MOUSE_BTN_SCROLL_DOWN))!=0 ^ (e->button == MOUSE_BTN_SCROLL_DOWN);
+
+				MouseInput::ProcessMouseInput(e->x, e->y, 
+					left, right, center, su, sd);
 				break;
 			}
 			case KeyPress:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.