nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2025-02-01 05:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

make the linux port act a bit more like the windows port, for better or worse

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4129 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2012-10-14 10:57:11 +00:00
parent b84d03a87c
commit e31ebac4cb
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
engine/gl/gl_vidlinuxglx.c
View file

@ -56,6 +56,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define WARP_HEIGHT 200 #define WARP_HEIGHT 200
static Display *vid_dpy = NULL; static Display *vid_dpy = NULL;
static Cursor vid_nullcursor;
static Window vid_window; static Window vid_window;
static GLXContext ctx = NULL; static GLXContext ctx = NULL;
int scrnum; int scrnum;
@ -399,12 +400,16 @@ static void GetEvent(void)
int cx = vid.pixelwidth/2, cy=vid.pixelheight/2; int cx = vid.pixelwidth/2, cy=vid.pixelheight/2;
IN_MouseMove(0, false, event.xmotion.x - cx, event.xmotion.y - cy, 0, 0); IN_MouseMove(0, false, event.xmotion.x - cx, event.xmotion.y - cy, 0, 0);
/* move the mouse to the window center again */ /* move the mouse to the window center again (disabling warp first so we don't see it*/
XSelectInput(vid_dpy, vid_window, X_MASK & ~PointerMotionMask); XSelectInput(vid_dpy, vid_window, X_MASK & ~PointerMotionMask);
XWarpPointer(vid_dpy, None, vid_window, 0, 0, 0, 0, XWarpPointer(vid_dpy, None, vid_window, 0, 0, 0, 0,
cx, cy); cx, cy);
XSelectInput(vid_dpy, vid_window, X_MASK); XSelectInput(vid_dpy, vid_window, X_MASK);
} }
else
{
IN_MouseMove(0, true, event.xmotion.x, event.xmotion.y, 0, 0);
}
} }
break; break;
@ -550,7 +555,7 @@ static void GetEvent(void)
wantwindowed = !!_windowed_mouse.value; wantwindowed = !!_windowed_mouse.value;
if (!ActiveApp) if (!ActiveApp)
wantwindowed = false; wantwindowed = false;
if (key_dest == key_console && !vidglx_fullscreen) if (Key_MouseShouldBeFree() && !vidglx_fullscreen)
wantwindowed = false; wantwindowed = false;
if (old_windowed_mouse != wantwindowed) if (old_windowed_mouse != wantwindowed)
@ -562,12 +567,15 @@ static void GetEvent(void)
Con_DPrintf("uninstall grabs\n"); Con_DPrintf("uninstall grabs\n");
/* ungrab the pointer */ /* ungrab the pointer */
uninstall_grabs(); uninstall_grabs();
XUndefineCursor(vid_dpy, vid_window);
} }
else else
{ {
Con_DPrintf("install grabs\n"); Con_DPrintf("install grabs\n");
/* grab the pointer */ /* grab the pointer */
install_grabs(); install_grabs();
/*hide the cursor*/
XDefineCursor(vid_dpy, vid_window, vid_nullcursor);
} }
} }
} }
@ -599,6 +607,8 @@ void GLVID_Shutdown(void)
if (vid_window) if (vid_window)
XDestroyWindow(vid_dpy, vid_window); XDestroyWindow(vid_dpy, vid_window);
if (vid_nullcursor)
XFreeCursor(vid_dpy, vid_nullcursor);
#ifdef WITH_VMODE #ifdef WITH_VMODE
if (vid_dpy) { if (vid_dpy) {
if (vidmode_active) if (vidmode_active)
@ -947,8 +957,7 @@ qboolean GLVID_Init (rendererstate_t *info, unsigned char *palette)
} }
#endif #endif
//hide the cursor. vid_nullcursor = CreateNullCursor(vid_dpy, vid_window);
XDefineCursor(vid_dpy, vid_window, CreateNullCursor(vid_dpy, vid_window));
XFlush(vid_dpy); XFlush(vid_dpy);
@ -1014,7 +1023,7 @@ qboolean GLVID_Init (rendererstate_t *info, unsigned char *palette)
vid.recalc_refdef = 1; // force a surface cache flush vid.recalc_refdef = 1; // force a surface cache flush
if (Cvar_Get("vidx_grabkeyboard", "0", 0, "Additional video options")->value) if (Cvar_Get("vidx_grabkeyboard", "0", 0, "Additional video options")->value)
XGrabKeyboard(vid_dpy, vid_window, XGrabKeyboard(vid_dpy, vid_window,
False, False,
GrabModeAsync, GrabModeAsync, GrabModeAsync, GrabModeAsync,
CurrentTime); CurrentTime);