[Hgengine-cvs] SF.net SVN: hgengine:[618] Mercury2/src

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

Revision: 618
          http://hgengine.svn.sourceforge.net/hgengine/?rev=618&view=rev
Author:   cnlohr
Date:     2009-11-13 07:44:56 +0000 (Fri, 13 Nov 2009)

Log Message:
-----------
Broadcast button press location along with button presses.

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

Modified: Mercury2/src/X11Window.cpp
===================================================================
--- Mercury2/src/X11Window.cpp	2009-11-13 07:44:34 UTC (rev 617)
+++ Mercury2/src/X11Window.cpp	2009-11-13 07:44:56 UTC (rev 618)
@@ -286,7 +286,7 @@
 				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(0, 0, 
+				MouseInput::ProcessMouseInput(m_iLastMouseX, m_iLastMouseY , 
 					left, right, center, su, sd);
 				break;
 			}
@@ -323,12 +323,16 @@
 					y = m_height/2 - e->y;
 					if (x!=0 || y!=0) //prevent recursive XWarp
 					{
+						m_iLastMouseX = x;
+						m_iLastMouseY = y;
 						MouseInput::ProcessMouseInput(x, y, left, right, center, su, sd);
 						XWarpPointer(m_display, None, m_window, 0,0,0,0,m_width/2,m_height/2);
 					}
 				}
 				else
 				{
+					m_iLastMouseX = e->x;
+					m_iLastMouseY = e->y;
 					MouseInput::ProcessMouseInput(e->x, e->y, left, right, center, su, sd);
 				}
 				break;

Modified: Mercury2/src/X11Window.h
===================================================================
--- Mercury2/src/X11Window.h	2009-11-13 07:44:34 UTC (rev 617)
+++ Mercury2/src/X11Window.h	2009-11-13 07:44:56 UTC (rev 618)
@@ -28,6 +28,9 @@
 		GLXContext m_renderCtx;
 		Window m_window;
 		Atom m_wmDeleteMessage;
+
+		int m_iLastMouseX;
+		int m_iLastMouseY;
 };
 
 #endif


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