X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_glx.c;h=3735592e734189133b9620dec6aa3838c879fb67;hb=bff2055635d6a0b18173b0b7a8f5aa7741d1dd4e;hp=1938a0dda82243b8a461223a9c24a4351ffd4318;hpb=e411cc7d14dad08cbbe27f5b3af86700f7eb5184;p=xonotic%2Fdarkplaces.git diff --git a/vid_glx.c b/vid_glx.c index 1938a0dd..3735592e 100644 --- a/vid_glx.c +++ b/vid_glx.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -38,7 +38,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -static Display *dpy = NULL; +static Display *vidx11_display = NULL; static int scrnum; static Window win; static GLXContext ctx = NULL; @@ -52,16 +52,15 @@ static GLXContext ctx = NULL; viddef_t vid; // global video state static qboolean mouse_avail = true; -static qboolean mouse_active = false; +static qboolean mouse_active = false, usingmouse = false; // static qboolean dga_active; static float mouse_x, mouse_y; static float old_mouse_x, old_mouse_y; static int p_mouse_x, p_mouse_y; -static cvar_t in_mouse = {"in_mouse", "1", false}; -static cvar_t in_dga = {"in_dga", "1", false}; -static cvar_t in_dga_mouseaccel = {"in_dga_mouseaccel", "1", false}; -static cvar_t m_filter = {"m_filter", "0"}; +cvar_t vid_dga = {CVAR_SAVE, "vid_dga", "1"}; +cvar_t vid_dga_mouseaccel = {0, "vid_dga_mouseaccel", "1"}; +cvar_t m_filter = {0, "m_filter", "0"}; qboolean vidmode_ext = false; @@ -74,6 +73,9 @@ static XF86VidModeModeInfo **vidmodes; static int num_vidmodes; static qboolean vidmode_active = false; +static Visual *vidx11_visual; +static Colormap vidx11_colormap; + /*-----------------------------------------------------------------------*/ float gldepthmin, gldepthmax; @@ -93,7 +95,8 @@ XLateKey(XKeyEvent *ev/*, qboolean modified*/) keysym = XLookupKeysym(ev, 0); - switch(keysym) { + switch(keysym) + { case XK_KP_Page_Up: key = KP_PGUP; break; case XK_Page_Up: key = K_PGUP; break; @@ -176,12 +179,12 @@ XLateKey(XKeyEvent *ev/*, qboolean modified*/) case XK_F35: key = K_PGDN; break; default: - if (keysym < 128) { + if (keysym < 128) + { /* ASCII keys */ key = keysym; - if (/*!modified && */((key >= 'A') && (key <= 'Z'))) { + if (/*!modified && */((key >= 'A') && (key <= 'Z'))) key = key + ('a' - 'A'); - } } break; } @@ -191,81 +194,80 @@ XLateKey(XKeyEvent *ev/*, qboolean modified*/) static Cursor CreateNullCursor(Display *display, Window root) { - Pixmap cursormask; - XGCValues xgc; - GC gc; - XColor dummycolour; - Cursor cursor; - - cursormask = XCreatePixmap(display, root, 1, 1, 1/*depth*/); - xgc.function = GXclear; - gc = XCreateGC(display, cursormask, GCFunction, &xgc); - XFillRectangle(display, cursormask, gc, 0, 0, 1, 1); - dummycolour.pixel = 0; - dummycolour.red = 0; - dummycolour.flags = 04; - cursor = XCreatePixmapCursor(display, cursormask, cursormask, - &dummycolour,&dummycolour, 0,0); - XFreePixmap(display,cursormask); - XFreeGC(display,gc); - return cursor; + Pixmap cursormask; + XGCValues xgc; + GC gc; + XColor dummycolour; + Cursor cursor; + + cursormask = XCreatePixmap(display, root, 1, 1, 1/*depth*/); + xgc.function = GXclear; + gc = XCreateGC(display, cursormask, GCFunction, &xgc); + XFillRectangle(display, cursormask, gc, 0, 0, 1, 1); + dummycolour.pixel = 0; + dummycolour.red = 0; + dummycolour.flags = 04; + cursor = XCreatePixmapCursor(display, cursormask, cursormask, &dummycolour,&dummycolour, 0,0); + XFreePixmap(display,cursormask); + XFreeGC(display,gc); + return cursor; } static void install_grabs(void) { - XWindowAttributes attribs_1; - XSetWindowAttributes attribs_2; + XWindowAttributes attribs_1; + XSetWindowAttributes attribs_2; - XGetWindowAttributes(dpy, win, &attribs_1); - attribs_2.event_mask = attribs_1.your_event_mask | KEY_MASK | MOUSE_MASK; - XChangeWindowAttributes(dpy, win, CWEventMask, &attribs_2); + XGetWindowAttributes(vidx11_display, win, &attribs_1); + attribs_2.event_mask = attribs_1.your_event_mask | KEY_MASK | MOUSE_MASK; + XChangeWindowAttributes(vidx11_display, win, CWEventMask, &attribs_2); // inviso cursor - XDefineCursor(dpy, win, CreateNullCursor(dpy, win)); + XDefineCursor(vidx11_display, win, CreateNullCursor(vidx11_display, win)); - XGrabPointer(dpy, win, True, 0, GrabModeAsync, GrabModeAsync, - win, None, CurrentTime); + XGrabPointer(vidx11_display, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime); - if (in_dga.value) { + if (vid_dga.integer) + { int MajorVersion, MinorVersion; - if (!XF86DGAQueryVersion(dpy, &MajorVersion, &MinorVersion)) { + if (!XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion)) + { // unable to query, probalby not supported Con_Printf( "Failed to detect XF86DGA Mouse\n" ); - in_dga.value = 0; - } else { - in_dga.value = 1; - XF86DGADirectVideo(dpy, DefaultScreen(dpy), XF86DGADirectMouse); - XWarpPointer(dpy, None, win, 0, 0, 0, 0, 0, 0); + vid_dga.integer = 0; + } + else + { + vid_dga.integer = 1; + XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), XF86DGADirectMouse); + XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, 0, 0); } - } else { - XWarpPointer(dpy, None, win, - 0, 0, 0, 0, - vid.width / 2, vid.height / 2); } + else + XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, scr_width / 2, scr_height / 2); - XGrabKeyboard(dpy, win, False, GrabModeAsync, GrabModeAsync, CurrentTime); + XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime); mouse_active = true; mouse_x = mouse_y = 0; -// XSync(dpy, True); +// XSync(vidx11_display, True); } static void uninstall_grabs(void) { - if (!dpy || !win) + if (!vidx11_display || !win) return; - if (in_dga.value == 1) { - XF86DGADirectVideo(dpy, DefaultScreen(dpy), 0); - } + if (vid_dga.integer == 1) + XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), 0); - XUngrabPointer(dpy, CurrentTime); - XUngrabKeyboard(dpy, CurrentTime); + XUngrabPointer(vidx11_display, CurrentTime); + XUngrabKeyboard(vidx11_display, CurrentTime); // inviso cursor - XUndefineCursor(dpy, win); + XUndefineCursor(vidx11_display, win); mouse_active = false; } @@ -274,70 +276,110 @@ static void HandleEvents(void) { XEvent event; // KeySym ks; - int b; qboolean dowarp = false; - if (!dpy) + if (!vidx11_display) return; - while (XPending(dpy)) { - XNextEvent(dpy, &event); + while (XPending(vidx11_display)) + { + XNextEvent(vidx11_display, &event); - switch (event.type) { + switch (event.type) + { case KeyPress: case KeyRelease: Key_Event(XLateKey(&event.xkey), event.type == KeyPress); break; case MotionNotify: - if (in_dga.value == 1) { - mouse_x += event.xmotion.x_root * in_dga_mouseaccel.value; - mouse_y += event.xmotion.y_root * in_dga_mouseaccel.value; - } else { - if (!p_mouse_x && !p_mouse_y) { - Con_Printf("event->xmotion.x: %d\n", event.xmotion.x); - Con_Printf("event->xmotion.y: %d\n", event.xmotion.y); + if (usingmouse) + { + if (vid_dga.integer == 1) + { + mouse_x += event.xmotion.x_root * vid_dga_mouseaccel.value; + mouse_y += event.xmotion.y_root * vid_dga_mouseaccel.value; } - if (vid_fullscreen.value || vid_mouse.value) { - if (!event.xmotion.send_event) { + else + { + /* + if (!p_mouse_x && !p_mouse_y) + { + Con_Printf("event->xmotion.x: %d\n", event.xmotion.x); + Con_Printf("event->xmotion.y: %d\n", event.xmotion.y); + } + */ + //if (usingmouse) + { + if (!event.xmotion.send_event) + { + mouse_x += event.xmotion.x - p_mouse_x; + mouse_y += event.xmotion.y - p_mouse_y; + if (abs(scr_width/2 - event.xmotion.x) > scr_width / 4 || abs(scr_height/2 - event.xmotion.y) > scr_height / 4) + dowarp = true; + } + } + /* + else + { mouse_x += (event.xmotion.x - p_mouse_x); mouse_y += (event.xmotion.y - p_mouse_y); - if (abs(vid.width/2 - event.xmotion.x) > vid.width / 4 - || abs(vid.height/2 - event.xmotion.y) > vid.height / 4) { - dowarp = true; - } } - } else { - mouse_x += (event.xmotion.x - p_mouse_x); - mouse_y += (event.xmotion.y - p_mouse_y); + */ + p_mouse_x = event.xmotion.x; + p_mouse_y = event.xmotion.y; } - p_mouse_x = event.xmotion.x; - p_mouse_y = event.xmotion.y; } + else + ui_mouseupdate(event.xmotion.x, event.xmotion.y); break; case ButtonPress: - b=-1; - if (event.xbutton.button == 1) - b = 0; - else if (event.xbutton.button == 2) - b = 2; - else if (event.xbutton.button == 3) - b = 1; - if (b>=0) - Key_Event(K_MOUSE1 + b, true); + switch(event.xbutton.button) + { + case 1: + Key_Event(K_MOUSE1, true); + break; + case 2: + Key_Event(K_MOUSE3, true); + break; + case 3: + Key_Event(K_MOUSE2, true); + break; + case 4: + Key_Event(K_MWHEELUP, true); + break; + case 5: + Key_Event(K_MWHEELDOWN, true); + break; + default: + Con_Printf("HandleEvents: ButtonPress gave value %d, 1-5 expected\n", event.xbutton.button); + break; + } break; case ButtonRelease: - b=-1; - if (event.xbutton.button == 1) - b = 0; - else if (event.xbutton.button == 2) - b = 2; - else if (event.xbutton.button == 3) - b = 1; - if (b>=0) - Key_Event(K_MOUSE1 + b, false); + switch(event.xbutton.button) + { + case 1: + Key_Event(K_MOUSE1, false); + break; + case 2: + Key_Event(K_MOUSE3, false); + break; + case 3: + Key_Event(K_MOUSE2, false); + break; + case 4: + Key_Event(K_MWHEELUP, false); + break; + case 5: + Key_Event(K_MWHEELDOWN, false); + break; + default: + Con_Printf("HandleEvents: ButtonRelease gave value %d, 1-5 expected\n", event.xbutton.button); + break; + } break; case CreateNotify : @@ -352,32 +394,35 @@ static void HandleEvents(void) } } - if (dowarp) { + if (dowarp) + { /* move the mouse to the window center again */ - p_mouse_x = vid.width / 2; - p_mouse_y = vid.height / 2; - XWarpPointer(dpy, None, win, 0, 0, 0, 0, p_mouse_x, p_mouse_y); + p_mouse_x = scr_width / 2; + p_mouse_y = scr_height / 2; + XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, p_mouse_x, p_mouse_y); } } -static void IN_DeactivateMouse( void ) +static void IN_DeactivateMouse( void ) { - if (!mouse_avail || !dpy || !win) + if (!mouse_avail || !vidx11_display || !win) return; - if (mouse_active) { + if (mouse_active) + { uninstall_grabs(); mouse_active = false; } } -static void IN_ActivateMouse( void ) +static void IN_ActivateMouse( void ) { - if (!mouse_avail || !dpy || !win) + if (!mouse_avail || !vidx11_display || !win) return; - if (!mouse_active) { + if (!mouse_active) + { mouse_x = mouse_y = 0; // don't spazz install_grabs(); mouse_active = true; @@ -387,24 +432,25 @@ static void IN_ActivateMouse( void ) void VID_Shutdown(void) { - if (!ctx || !dpy) + if (!ctx || !vidx11_display) return; - if (dpy) { + if (vidx11_display) + { uninstall_grabs(); if (vidmode_active) - XF86VidModeSwitchToMode(dpy, scrnum, vidmodes[0]); + XF86VidModeSwitchToMode(vidx11_display, scrnum, vidmodes[0]); /* Disabled, causes a segfault during shutdown. if (ctx) - glXDestroyContext(dpy, ctx); + glXDestroyContext(vidx11_display, ctx); */ if (win) - XDestroyWindow(dpy, win); - XCloseDisplay(dpy); + XDestroyWindow(vidx11_display, win); + XCloseDisplay(vidx11_display); } vidmode_active = false; - dpy = NULL; + vidx11_display = NULL; win = 0; ctx = NULL; } @@ -430,70 +476,6 @@ void InitSig(void) signal(SIGTERM, signal_handler); } -void VID_CheckMultitexture(void) -{ - void *prjobj; - qglMTexCoord2f = NULL; - qglSelectTexture = NULL; - // Check to see if multitexture is disabled - if (COM_CheckParm("-nomtex")) - { - Con_Printf("...multitexture disabled\n"); - return; - } - if ((prjobj = dlopen(NULL, RTLD_LAZY)) == NULL) - { - Con_Printf("Unable to open symbol list for main program.\n"); - return; - } - // Test for ARB_multitexture - if (!COM_CheckParm("-SGISmtex") && strstr(gl_extensions, "GL_ARB_multitexture ")) - { - Con_Printf("...using GL_ARB_multitexture\n"); - qglMTexCoord2f = (void *) dlsym(prjobj, "glMultiTexCoord2fARB"); - qglSelectTexture = (void *) dlsym(prjobj, "glActiveTextureARB"); - gl_mtexable = true; - gl_mtex_enum = GL_TEXTURE0_ARB; - } - else if (strstr(gl_extensions, "GL_SGIS_multitexture ")) // Test for SGIS_multitexture (if ARB_multitexture not found) - { - Con_Printf("...using GL_SGIS_multitexture\n"); - qglMTexCoord2f = (void *) dlsym(prjobj, "glMTexCoord2fSGIS"); - qglSelectTexture = (void *) dlsym(prjobj, "glSelectTextureSGIS"); - gl_mtexable = true; - gl_mtex_enum = TEXTURE0_SGIS; - } - else - Con_Printf("...multitexture disabled (not detected)\n"); - dlclose(prjobj); -} - -void VID_CheckCVA(void) -{ - void *prjobj; - qglLockArraysEXT = NULL; - qglUnlockArraysEXT = NULL; - gl_supportslockarrays = false; - if (COM_CheckParm("-nocva")) - { - Con_Printf("...compiled vertex arrays disabled\n"); - return; - } - if ((prjobj = dlopen(NULL, RTLD_LAZY)) == NULL) - { - Con_Printf("Unable to open symbol list for main program.\n"); - return; - } - if (strstr(gl_extensions, "GL_EXT_compiled_vertex_array")) - { - Con_Printf("...using compiled vertex arrays\n"); - qglLockArraysEXT = (void *) dlsym(prjobj, "glLockArraysEXT"); - qglUnlockArraysEXT = (void *) dlsym(prjobj, "glUnlockArraysEXT"); - gl_supportslockarrays = true; - } - dlclose(prjobj); -} - /* ================= GL_BeginRendering @@ -512,21 +494,131 @@ void GL_BeginRendering (int *x, int *y, int *width, int *height) void GL_EndRendering (void) { - if (!r_render.value) + int usemouse; + if (!r_render.integer) return; glFlush(); - glXSwapBuffers(dpy, win); + glXSwapBuffers(vidx11_display, win); + +// handle the mouse state when windowed if that's changed + usemouse = false; + if (vid_mouse.integer && key_dest == key_game) + usemouse = true; + if (vidmode_active) + usemouse = true; + if (usemouse) + { + if (!usingmouse) + { + usingmouse = true; + IN_ActivateMouse (); + } + } + else + { + if (usingmouse) + { + usingmouse = false; + IN_DeactivateMouse (); + } + } } +// LordHavoc: ported from SDL 1.2.2, this was far more difficult to port from +// SDL than to simply use the XFree gamma ramp extension, but that affects the +// whole screen even when the game window is inactive, this only affects the +// screen while the window is active, very desirable behavior :) int VID_SetGamma(float prescale, float gamma, float scale, float base) { +// LordHavoc: FIXME: finish this code, we need to allocate colors before we can store them +#if 1 return FALSE; +#else + int i, ncolors, c; + unsigned int Rmask, Gmask, Bmask, Rloss, Gloss, Bloss, Rshift, Gshift, Bshift, mask; + XColor xcmap[256]; + unsigned short ramp[256]; + + if (COM_CheckParm("-nogamma")) + return FALSE; + + if (vidx11_visual->class != DirectColor) + { + Con_Printf("X11 Visual class is %d, can only do gamma on %d\n", vidx11_visual->class, DirectColor); + return FALSE; + } + + Rmask = vidx11_visual->red_mask; + Gmask = vidx11_visual->green_mask; + Bmask = vidx11_visual->blue_mask; + + Rshift = 0; + Rloss = 8; + if ((mask = Rmask)) + { + for (;!(mask & 1);mask >>= 1) + ++Rshift; + for (;(mask & 1);mask >>= 1) + --Rloss; + } + Gshift = 0; + Gloss = 8; + if ((mask = Gmask)) + { + for (;!(mask & 1);mask >>= 1) + ++Gshift; + for (;(mask & 1);mask >>= 1) + --Gloss; + } + Bshift = 0; + Bloss = 8; + if ((mask = Bmask)) + { + for (;!(mask & 1);mask >>= 1) + ++Bshift; + for (;(mask & 1);mask >>= 1) + --Bloss; + } + + BuildGammaTable16(prescale, gamma, scale, base, ramp); + + // convert gamma ramp to palette (yes this seems odd) + ncolors = vidx11_visual->map_entries; + for (i = 0;i < ncolors;i++) + { + c = (256 * i / ncolors); + xcmap[i].pixel = ((c >> Rloss) << Rshift) | ((c >> Gloss) << Gshift) | ((c >> Bloss) << Bshift); + xcmap[i].red = ramp[c]; + xcmap[i].green = ramp[c]; + xcmap[i].blue = ramp[c]; + xcmap[i].flags = (DoRed|DoGreen|DoBlue); + } + XStoreColors(vidx11_display, vidx11_colormap, xcmap, ncolors); + XSync(vidx11_display, false); + // FIXME: should this check for BadAccess/BadColor/BadValue errors produced by XStoreColors before setting this true? + return TRUE; +#endif } void VID_Init(void) { int i; - int attrib[] = { +// LordHavoc: FIXME: finish this code, we need to allocate colors before we can store them +#if 0 + int gammaattrib[] = + { + GLX_RGBA, + GLX_RED_SIZE, 1, + GLX_GREEN_SIZE, 1, + GLX_BLUE_SIZE, 1, + GLX_DOUBLEBUFFER, + GLX_DEPTH_SIZE, 1, + GLX_X_VISUAL_TYPE, GLX_DIRECT_COLOR, + None + }; +#endif + int nogammaattrib[] = + { GLX_RGBA, GLX_RED_SIZE, 1, GLX_GREEN_SIZE, 1, @@ -543,13 +635,12 @@ void VID_Init(void) XVisualInfo *visinfo; qboolean fullscreen = true; int MajorVersion, MinorVersion; - int actualWidth, actualHeight; - Cvar_RegisterVariable (&in_mouse); - Cvar_RegisterVariable (&in_dga); - Cvar_RegisterVariable (&in_dga_mouseaccel); + Cvar_RegisterVariable (&vid_mouse); + Cvar_RegisterVariable (&vid_dga); + Cvar_RegisterVariable (&vid_dga_mouseaccel); Cvar_RegisterVariable (&m_filter); - + // interpret command-line params // set vid parameters @@ -580,101 +671,126 @@ void VID_Init(void) if (vid.conheight < 200) vid.conheight = 200; - if (!(dpy = XOpenDisplay(NULL))) { + if (!(vidx11_display = XOpenDisplay(NULL))) + { fprintf(stderr, "Error couldn't open the X display\n"); exit(1); } - scrnum = DefaultScreen(dpy); - root = RootWindow(dpy, scrnum); + scrnum = DefaultScreen(vidx11_display); + root = RootWindow(vidx11_display, scrnum); // Get video mode list MajorVersion = MinorVersion = 0; - if (!XF86VidModeQueryVersion(dpy, &MajorVersion, &MinorVersion)) { + if (!XF86VidModeQueryVersion(vidx11_display, &MajorVersion, &MinorVersion)) vidmode_ext = false; - } else { + else + { Con_Printf("Using XFree86-VidModeExtension Version %d.%d\n", MajorVersion, MinorVersion); vidmode_ext = true; } - visinfo = glXChooseVisual(dpy, scrnum, attrib); - if (!visinfo) { - fprintf(stderr, "qkHack: Error couldn't get an RGB, Double-buffered, Depth visual\n"); - exit(1); + visinfo = NULL; +// LordHavoc: FIXME: finish this code, we need to allocate colors before we can store them +#if 0 + if (!COM_CheckParm("-nogamma")) + visinfo = glXChooseVisual(vidx11_display, scrnum, gammaattrib); +#endif + if (!visinfo) + { + visinfo = glXChooseVisual(vidx11_display, scrnum, nogammaattrib); + if (!visinfo) + { + fprintf(stderr, "qkHack: Error couldn't get an RGB, Double-buffered, Depth visual\n"); + exit(1); + } } - if (vidmode_ext) { + if (vidmode_ext) + { int best_fit, best_dist, dist, x, y; - - XF86VidModeGetAllModeLines(dpy, scrnum, &num_vidmodes, &vidmodes); + + XF86VidModeGetAllModeLines(vidx11_display, scrnum, &num_vidmodes, &vidmodes); // Are we going fullscreen? If so, let's change video mode - if (fullscreen) { + if (fullscreen) + { best_dist = 9999999; best_fit = -1; - for (i = 0; i < num_vidmodes; i++) { - if (width > vidmodes[i]->hdisplay || - height > vidmodes[i]->vdisplay) + for (i = 0; i < num_vidmodes; i++) + { + if (width > vidmodes[i]->hdisplay || height > vidmodes[i]->vdisplay) continue; x = width - vidmodes[i]->hdisplay; y = height - vidmodes[i]->vdisplay; dist = (x * x) + (y * y); - if (dist < best_dist) { + if (dist < best_dist) + { best_dist = dist; best_fit = i; } } - if (best_fit != -1) { - actualWidth = vidmodes[best_fit]->hdisplay; - actualHeight = vidmodes[best_fit]->vdisplay; + if (best_fit != -1) + { + // LordHavoc: changed from ActualWidth/ActualHeight =, + // to width/height =, so the window will take the full area of + // the mode chosen + width = vidmodes[best_fit]->hdisplay; + height = vidmodes[best_fit]->vdisplay; // change to the mode - XF86VidModeSwitchToMode(dpy, scrnum, vidmodes[best_fit]); + XF86VidModeSwitchToMode(vidx11_display, scrnum, vidmodes[best_fit]); vidmode_active = true; // Move the viewport to top left - XF86VidModeSetViewPort(dpy, scrnum, 0, 0); - } else + XF86VidModeSetViewPort(vidx11_display, scrnum, 0, 0); + } + else fullscreen = 0; } } + // LordHavoc: save the visual for use in gamma ramp settings later + vidx11_visual = visinfo->visual; + /* window attributes */ attr.background_pixel = 0; attr.border_pixel = 0; - attr.colormap = XCreateColormap(dpy, root, visinfo->visual, AllocNone); + // LordHavoc: save the colormap for later, too + vidx11_colormap = attr.colormap = XCreateColormap(vidx11_display, root, visinfo->visual, AllocNone); attr.event_mask = X_MASK; - if (vidmode_active) { - mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | - CWEventMask | CWOverrideRedirect; + if (vidmode_active) + { + mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask | CWOverrideRedirect; attr.override_redirect = True; attr.backing_store = NotUseful; attr.save_under = False; - } else + } + else mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; - win = XCreateWindow(dpy, root, 0, 0, width, height, - 0, visinfo->depth, InputOutput, - visinfo->visual, mask, &attr); - XMapWindow(dpy, win); + win = XCreateWindow(vidx11_display, root, 0, 0, width, height, 0, visinfo->depth, InputOutput, visinfo->visual, mask, &attr); + XStoreName(vidx11_display, win, gamename); + XMapWindow(vidx11_display, win); - if (vidmode_active) { - XMoveWindow(dpy, win, 0, 0); - XRaiseWindow(dpy, win); - XWarpPointer(dpy, None, win, 0, 0, 0, 0, 0, 0); - XFlush(dpy); + if (vidmode_active) + { + XMoveWindow(vidx11_display, win, 0, 0); + XRaiseWindow(vidx11_display, win); + XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, 0, 0); + XFlush(vidx11_display); // Move the viewport to top left - XF86VidModeSetViewPort(dpy, scrnum, 0, 0); + XF86VidModeSetViewPort(vidx11_display, scrnum, 0, 0); } - XFlush(dpy); + XFlush(vidx11_display); - ctx = glXCreateContext(dpy, visinfo, NULL, True); + ctx = glXCreateContext(vidx11_display, visinfo, NULL, True); - glXMakeCurrent(dpy, win, ctx); + glXMakeCurrent(vidx11_display, win, ctx); scr_width = width; scr_height = height; @@ -683,10 +799,6 @@ void VID_Init(void) vid.conheight = height; if (vid.conwidth > width) vid.conwidth = width; - vid.width = vid.conwidth; - vid.height = vid.conheight; - - vid.aspect = ((float)vid.height / (float)vid.width) * (320.0 / 240.0); InitSig(); // trap evil signals @@ -694,9 +806,8 @@ void VID_Init(void) Con_SafePrintf ("Video mode %dx%d initialized.\n", width, height); - vid.recalc_refdef = 1; // force a surface cache flush - - install_grabs(); + // force a surface cache flush +// vid.recalc_refdef = 1; } void Sys_SendKeyEvents(void) @@ -704,13 +815,10 @@ void Sys_SendKeyEvents(void) HandleEvents(); } -void Force_CenterView_f (void) -{ - cl.viewangles[PITCH] = 0; -} - void IN_Init(void) { + if (COM_CheckParm ("-nomouse")) + mouse_avail = false; } void IN_Shutdown(void) @@ -724,13 +832,6 @@ IN_Commands */ void IN_Commands (void) { - if (!dpy || !win) - return; - - if (vidmode_active || key_dest == key_game) - IN_ActivateMouse(); - else - IN_DeactivateMouse (); } /* @@ -743,38 +844,39 @@ void IN_MouseMove (usercmd_t *cmd) if (!mouse_avail) return; - if (!mouse_avail) - return; - - if (m_filter.value) { - mouse_x = (mouse_x + old_mouse_x) * 0.5; - mouse_y = (mouse_y + old_mouse_y) * 0.5; - - old_mouse_x = mouse_x; - old_mouse_y = mouse_y; - } - - mouse_x *= sensitivity.value; - mouse_y *= sensitivity.value; - - if (in_strafe.state & 1) - cmd->sidemove += m_side.value * mouse_x; - else - cl.viewangles[YAW] -= m_yaw.value * mouse_x; - -/* if (freelook)*/ - V_StopPitchDrift (); - - if (/*freelook && */!(in_strafe.state & 1)) { - cl.viewangles[PITCH] += m_pitch.value * mouse_y; - cl.viewangles[PITCH] = bound (-70, cl.viewangles[PITCH], 80); - } else { - if ((in_strafe.state & 1) && noclip_anglehack) - cmd->upmove -= m_forward.value * mouse_y; - else - cmd->forwardmove -= m_forward.value * mouse_y; - } - mouse_x = mouse_y = 0.0; + if (m_filter.integer) + { + mouse_x = (mouse_x + old_mouse_x) * 0.5; + mouse_y = (mouse_y + old_mouse_y) * 0.5; + + old_mouse_x = mouse_x; + old_mouse_y = mouse_y; + } + + mouse_x *= sensitivity.value; + mouse_y *= sensitivity.value; + + if (in_strafe.state & 1) + cmd->sidemove += m_side.value * mouse_x; + else + cl.viewangles[YAW] -= m_yaw.value * mouse_x; + + //if (freelook) + V_StopPitchDrift (); + + if (/*freelook && */!(in_strafe.state & 1)) + { + cl.viewangles[PITCH] += m_pitch.value * mouse_y; + cl.viewangles[PITCH] = bound (-90, cl.viewangles[PITCH], 90); + } + else + { + if ((in_strafe.state & 1) && noclip_anglehack) + cmd->upmove -= m_forward.value * mouse_y; + else + cmd->forwardmove -= m_forward.value * mouse_y; + } + mouse_x = mouse_y = 0.0; } void IN_Move (usercmd_t *cmd)