[Java-game-lib-cvs] CVS: LWJGL/src/native/linux org_lwjgl_Display.cpp,1.2,1.3 org_lwjgl_input_Keyboard.cpp,1.2,1.3 org_lwjgl_input_Mouse.cpp,1.2,1.3

[Elias N. <eli...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv18571

Modified Files:
	org_lwjgl_Display.cpp org_lwjgl_input_Keyboard.cpp 
	org_lwjgl_input_Mouse.cpp 
Log Message:
Fixed a viewport placement bug

Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3

Index: org_lwjgl_input_Keyboard.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Keyboard.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Keyboard.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3

Index: org_lwjgl_input_Mouse.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_input_Mouse.cpp	20 Nov 2002 10:33:37 -0000	1.2
+++ org_lwjgl_input_Mouse.cpp	20 Nov 2002 13:54:58 -0000	1.3
@@ -42,6 +42,7 @@
 
 #include <X11/X.h>
 #include <X11/Xlib.h>
+#include <X11/extensions/xf86vmode.h>
 #include <assert.h>
 #include <string.h>
 #include "org_lwjgl_input_Mouse.h"
@@ -50,6 +51,7 @@
 
 extern Display *disp;
 extern Window win;
+extern int screen;
 extern int current_fullscreen;
 
 int pointer_grabbed;
@@ -124,9 +126,10 @@
 int grabPointer(void) {
 	int result;
 	int mask = EnterWindowMask | LeaveWindowMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask;
-	if (current_fullscreen)
+	if (current_fullscreen) {
 		result = XGrabPointer(disp, win, False, mask, GrabModeAsync, GrabModeAsync, win, blank_cursor, CurrentTime);
-	else
+		XF86VidModeSetViewPort(disp, screen, 0, 0); // make sure we have a centered window
+	} else
 		result = XGrabPointer(disp, win, False, mask, GrabModeAsync, GrabModeAsync, None, blank_cursor, CurrentTime);
 	if (result == GrabSuccess)
 		pointer_grabbed = 1;