X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_glx.c;h=1dd50cabc7aba1383f5b7ab746ef5f0e14006d9d;hb=d560c170ab305550f8fc6ab39d94daee5b732fbd;hp=fc4cdcb735793508f5631d2c5bb43fcfecd254c6;hpb=f3a0ca9464dc2f1e3ee948259f723c27fbe29dc4;p=xonotic%2Fdarkplaces.git diff --git a/vid_glx.c b/vid_glx.c index fc4cdcb7..1dd50cab 100644 --- a/vid_glx.c +++ b/vid_glx.c @@ -35,11 +35,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include +#if !defined(__APPLE__) && !defined(__MACH__) #include +#endif #include #include "quakedef.h" +// Tell startup code that we have a client int cl_available = true; //GLX prototypes @@ -61,7 +64,7 @@ static dllfunction_t getprocaddressfuncs[] = //GLX_SGI_video_sync GLint (GLAPIENTRY *qglXGetVideoSyncSGI)(GLuint *count); -GLint (GLAPIENTRY *qglXWaitVideoSyncSGI)(int divisor, int remainder, unsigned int *count); +GLint (GLAPIENTRY *qglXWaitVideoSyncSGI)(GLint divisor, GLint remainder, GLuint *count); static dllfunction_t videosyncfuncs[] = { @@ -71,7 +74,7 @@ static dllfunction_t videosyncfuncs[] = }; static Display *vidx11_display = NULL; -static int scrnum; +static int vidx11_screen; static Window win; static GLXContext ctx = NULL; @@ -79,8 +82,10 @@ Atom wm_delete_window_atom; #define KEY_MASK (KeyPressMask | KeyReleaseMask) #define MOUSE_MASK (ButtonPressMask | ButtonReleaseMask | \ - PointerMotionMask | ButtonMotionMask ) -#define X_MASK (KEY_MASK | MOUSE_MASK | VisibilityChangeMask | StructureNotifyMask ) + PointerMotionMask | ButtonMotionMask) +#define X_MASK (KEY_MASK | MOUSE_MASK | VisibilityChangeMask | \ + StructureNotifyMask | FocusChangeMask | EnterWindowMask | \ + LeaveWindowMask) static qboolean mouse_avail = true; @@ -88,8 +93,10 @@ static qboolean mouse_active = false, usingmouse = false; static float mouse_x, mouse_y; static int p_mouse_x, p_mouse_y; +#ifndef __APPLE__ cvar_t vid_dga = {CVAR_SAVE, "vid_dga", "1"}; cvar_t vid_dga_mouseaccel = {0, "vid_dga_mouseaccel", "1"}; +#endif qboolean vidmode_ext = false; @@ -106,13 +113,15 @@ static Colormap vidx11_colormap; /*-----------------------------------------------------------------------*/ -static int XLateKey(XKeyEvent *ev) +static int XLateKey(XKeyEvent *ev, char *ascii) { int key = 0; char buf[64]; - KeySym keysym; + KeySym keysym, shifted; - XLookupString(ev, buf, sizeof buf, &keysym, 0); + keysym = XLookupKeysym (ev, 0); + XLookupString(ev, buf, sizeof buf, &shifted, 0); + *ascii = buf[0]; switch(keysym) { @@ -200,33 +209,15 @@ static int XLateKey(XKeyEvent *ev) case XK_KP_Subtract: key = K_KP_MINUS; break; case XK_KP_Divide: key = K_KP_SLASH; break; -#if 0 - case 0x021: key = '1';break;/* [!] */ - case 0x040: key = '2';break;/* [@] */ - case 0x023: key = '3';break;/* [#] */ - case 0x024: key = '4';break;/* [$] */ - case 0x025: key = '5';break;/* [%] */ - case 0x05e: key = '6';break;/* [^] */ - case 0x026: key = '7';break;/* [&] */ - case 0x02a: key = '8';break;/* [*] */ - case 0x028: key = '9';;break;/* [(] */ - case 0x029: key = '0';break;/* [)] */ - case 0x05f: key = '-';break;/* [_] */ - case 0x02b: key = '=';break;/* [+] */ - case 0x07c: key = '\'';break;/* [|] */ - case 0x07d: key = '[';break;/* [}] */ - case 0x07b: key = ']';break;/* [{] */ - case 0x022: key = '\'';break;/* ["] */ - case 0x03a: key = ';';break;/* [:] */ - case 0x03f: key = '/';break;/* [?] */ - case 0x03e: key = '.';break;/* [>] */ - case 0x03c: key = ',';break;/* [<] */ -#endif - default: - key = *(unsigned char*)buf; - if (key >= 'A' && key <= 'Z') - key = key - 'A' + 'a'; + if (keysym < 32 && keysym > 126) + break; + + if (keysym >= 'A' && keysym <= 'Z') + key = keysym - 'A' + 'a'; + else + key = keysym; + break; } @@ -268,6 +259,7 @@ static void install_grabs(void) XGrabPointer(vidx11_display, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime); +#ifndef __APPLE__ if (vid_dga.integer) { int MajorVersion, MinorVersion; @@ -275,7 +267,7 @@ static void install_grabs(void) if (!XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion)) { // unable to query, probalby not supported - Con_Printf( "Failed to detect XF86DGA Mouse\n" ); + Con_Print( "Failed to detect XF86DGA Mouse\n" ); vid_dga.integer = 0; } else @@ -286,6 +278,7 @@ static void install_grabs(void) } } else +#endif XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, scr_width / 2, scr_height / 2); XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime); @@ -299,8 +292,10 @@ static void uninstall_grabs(void) if (!vidx11_display || !win) return; +#ifndef __APPLE__ if (vid_dga.integer == 1) XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), 0); +#endif XUngrabPointer(vidx11_display, CurrentTime); XUngrabKeyboard(vidx11_display, CurrentTime); @@ -314,6 +309,8 @@ static void uninstall_grabs(void) static void HandleEvents(void) { XEvent event; + int key; + char ascii; qboolean dowarp = false; if (!vidx11_display) @@ -327,24 +324,28 @@ static void HandleEvents(void) { case KeyPress: // key pressed - Key_Event(XLateKey(&event.xkey), true); + key = XLateKey (&event.xkey, &ascii); + Key_Event(key, ascii, true); break; case KeyRelease: // key released - Key_Event(XLateKey(&event.xkey), false); + key = XLateKey (&event.xkey, &ascii); + Key_Event(key, ascii, false); break; case MotionNotify: // mouse moved if (usingmouse) { +#ifndef __APPLE__ 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; } else +#endif { if (!event.xmotion.send_event) @@ -358,8 +359,8 @@ static void HandleEvents(void) p_mouse_y = event.xmotion.y; } } - else - ui_mouseupdate(event.xmotion.x, event.xmotion.y); + //else + // ui_mouseupdate(event.xmotion.x, event.xmotion.y); break; case ButtonPress: @@ -367,22 +368,43 @@ static void HandleEvents(void) switch(event.xbutton.button) { case 1: - Key_Event(K_MOUSE1, true); + Key_Event(K_MOUSE1, 0, true); break; case 2: - Key_Event(K_MOUSE3, true); + Key_Event(K_MOUSE3, 0, true); break; case 3: - Key_Event(K_MOUSE2, true); + Key_Event(K_MOUSE2, 0, true); break; case 4: - Key_Event(K_MWHEELUP, true); + Key_Event(K_MWHEELUP, 0, true); break; case 5: - Key_Event(K_MWHEELDOWN, true); + Key_Event(K_MWHEELDOWN, 0, true); + break; + case 6: + Key_Event(K_MOUSE4, 0, true); + break; + case 7: + Key_Event(K_MOUSE5, 0, true); + break; + case 8: + Key_Event(K_MOUSE6, 0, true); break; - default: - Con_Printf("HandleEvents: ButtonPress gave value %d, 1-5 expected\n", event.xbutton.button); + case 9: + Key_Event(K_MOUSE7, 0, true); + break; + case 10: + Key_Event(K_MOUSE8, 0, true); + break; + case 11: + Key_Event(K_MOUSE9, 0, true); + break; + case 12: + Key_Event(K_MOUSE10, 0, true); + break; + default: + Con_Printf("HandleEvents: ButtonPress gave value %d, 1-12 expected\n", event.xbutton.button); break; } break; @@ -392,22 +414,43 @@ static void HandleEvents(void) switch(event.xbutton.button) { case 1: - Key_Event(K_MOUSE1, false); + Key_Event(K_MOUSE1, 0, false); break; case 2: - Key_Event(K_MOUSE3, false); + Key_Event(K_MOUSE3, 0, false); break; case 3: - Key_Event(K_MOUSE2, false); + Key_Event(K_MOUSE2, 0, false); break; case 4: - Key_Event(K_MWHEELUP, false); + Key_Event(K_MWHEELUP, 0, false); break; case 5: - Key_Event(K_MWHEELDOWN, false); + Key_Event(K_MWHEELDOWN, 0, false); + break; + case 6: + Key_Event(K_MOUSE4, 0, false); + break; + case 7: + Key_Event(K_MOUSE5, 0, false); + break; + case 8: + Key_Event(K_MOUSE6, 0, false); + break; + case 9: + Key_Event(K_MOUSE7, 0, false); break; - default: - Con_Printf("HandleEvents: ButtonRelease gave value %d, 1-5 expected\n", event.xbutton.button); + case 10: + Key_Event(K_MOUSE8, 0, false); + break; + case 11: + Key_Event(K_MOUSE9, 0, false); + break; + case 12: + Key_Event(K_MOUSE10, 0, false); + break; + default: + Con_Printf("HandleEvents: ButtonRelease gave value %d, 1-12 expected\n", event.xbutton.button); break; } break; @@ -429,22 +472,29 @@ static void HandleEvents(void) break; case ClientMessage: // window manager messages - if ((event.xclient.format == 32) && (event.xclient.data.l[0] == wm_delete_window_atom)) + if ((event.xclient.format == 32) && ((unsigned int)event.xclient.data.l[0] == wm_delete_window_atom)) Sys_Quit(); break; case MapNotify: // window restored vid_hidden = false; + vid_activewindow = false; + VID_RestoreSystemGamma(); break; case UnmapNotify: // window iconified/rolledup/whatever vid_hidden = true; + vid_activewindow = false; + VID_RestoreSystemGamma(); break; case FocusIn: // window is now the input focus + vid_activewindow = true; break; case FocusOut: // window is no longer the input focus + vid_activewindow = false; + VID_RestoreSystemGamma(); break; case EnterNotify: // mouse entered window @@ -490,7 +540,6 @@ static void IN_ActivateMouse( void ) } } - void VID_Shutdown(void) { if (!ctx || !vidx11_display) @@ -500,11 +549,12 @@ void VID_Shutdown(void) usingmouse = false; if (vidx11_display) { + VID_RestoreSystemGamma(); uninstall_grabs(); // FIXME: glXDestroyContext here? if (vidmode_active) - XF86VidModeSwitchToMode(vidx11_display, scrnum, vidmodes[0]); + XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[0]); if (win) XDestroyWindow(vidx11_display, win); XCloseDisplay(vidx11_display); @@ -515,11 +565,13 @@ void VID_Shutdown(void) ctx = NULL; GL_CloseLibrary(); + Key_ClearStates (); } void signal_handler(int sig) { printf("Received signal %d, exiting...\n", sig); + VID_RestoreSystemGamma(); Sys_Quit(); exit(0); } @@ -555,7 +607,8 @@ void VID_Finish (void) int usemouse; if (r_render.integer) { - qglFinish(); + if (r_speeds.integer || gl_finish.integer) + qglFinish(); qglXSwapBuffers(vidx11_display, win); } @@ -583,92 +636,29 @@ void VID_Finish (void) } } -// 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) +int VID_SetGamma(unsigned short *ramps) { -// 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); + return XF86VidModeSetGammaRamp(vidx11_display, vidx11_screen, 256, ramps, ramps + 256, ramps + 512); +} - // 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 +int VID_GetGamma(unsigned short *ramps) +{ + return XF86VidModeGetGammaRamp(vidx11_display, vidx11_screen, 256, ramps, ramps + 256, ramps + 512); } void VID_Init(void) { +#ifndef __APPLE__ Cvar_RegisterVariable (&vid_dga); Cvar_RegisterVariable (&vid_dga_mouseaccel); +#endif InitSig(); // trap evil signals +// COMMANDLINEOPTION: Input: -nomouse disables mouse support (see also vid_mouse cvar) if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe")) mouse_avail = false; } -void VID_BuildGLXAttrib(int *attrib, int stencil, int gamma) +void VID_BuildGLXAttrib(int *attrib, int stencil) { *attrib++ = GLX_RGBA; *attrib++ = GLX_RED_SIZE;*attrib++ = 1; @@ -682,14 +672,10 @@ void VID_BuildGLXAttrib(int *attrib, int stencil, int gamma) *attrib++ = GLX_STENCIL_SIZE;*attrib++ = 8; *attrib++ = GLX_ALPHA_SIZE;*attrib++ = 1; } - if (gamma) - { - *attrib++ = GLX_X_VISUAL_TYPE;*attrib++ = GLX_DIRECT_COLOR; - }; *attrib++ = None; } -int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil) +int VID_InitMode(int fullscreen, int width, int height, int bpp) { int i; int attrib[32]; @@ -700,7 +686,14 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil) int MajorVersion, MinorVersion; const char *drivername; +#if defined(__APPLE__) && defined(__MACH__) + drivername = "/usr/X11R6/lib/libGL.1.dylib"; +#else drivername = "libGL.so.1"; +#endif +// COMMANDLINEOPTION: Linux GLX: -gl_driver selects a GL driver library, default is libGL.so.1, useful only for using fxmesa or similar, if you don't know what this is for, you don't need it +// COMMANDLINEOPTION: BSD GLX: -gl_driver selects a GL driver library, default is libGL.so.1, useful only for using fxmesa or similar, if you don't know what this is for, you don't need it +// LordHavoc: although this works on MacOSX, it's useless there (as there is only one system libGL) i = COM_CheckParm("-gl_driver"); if (i && i < com_argc - 1) drivername = com_argv[i + 1]; @@ -712,12 +705,12 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil) if (!(vidx11_display = XOpenDisplay(NULL))) { - Con_Printf("Couldn't open the X display\n"); + Con_Print("Couldn't open the X display\n"); return false; } - scrnum = DefaultScreen(vidx11_display); - root = RootWindow(vidx11_display, scrnum); + vidx11_screen = DefaultScreen(vidx11_display); + root = RootWindow(vidx11_display, vidx11_screen); // Get video mode list MajorVersion = MinorVersion = 0; @@ -725,7 +718,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil) vidmode_ext = false; else { - Con_Printf("Using XFree86-VidModeExtension Version %d.%d\n", MajorVersion, MinorVersion); + Con_DPrintf("Using XFree86-VidModeExtension Version %d.%d\n", MajorVersion, MinorVersion); vidmode_ext = true; } @@ -739,35 +732,22 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil) return false; } - visinfo = NULL; -// LordHavoc: FIXME: finish this code, we need to allocate colors before we can store them -#if 0 - if (!COM_CheckParm("-nogamma")) - { - VID_BuildGLXAttrib(attrib, stencil, true); - visinfo = qglXChooseVisual(vidx11_display, scrnum, attrib); - } -#endif + VID_BuildGLXAttrib(attrib, bpp == 32); + visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib); if (!visinfo) { - VID_BuildGLXAttrib(attrib, stencil, false); - visinfo = qglXChooseVisual(vidx11_display, scrnum, attrib); - if (!visinfo) - { - Con_Printf("Couldn't get an RGB, Double-buffered, Depth visual\n"); - return false; - } + Con_Print("Couldn't get an RGB, Double-buffered, Depth visual\n"); + return false; } if (vidmode_ext) { int best_fit, best_dist, dist, x, y; - XF86VidModeGetAllModeLines(vidx11_display, scrnum, &num_vidmodes, &vidmodes); - // Are we going fullscreen? If so, let's change video mode if (fullscreen) { + XF86VidModeGetAllModeLines(vidx11_display, vidx11_screen, &num_vidmodes, &vidmodes); best_dist = 9999999; best_fit = -1; @@ -795,11 +775,11 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil) height = vidmodes[best_fit]->vdisplay; // change to the mode - XF86VidModeSwitchToMode(vidx11_display, scrnum, vidmodes[best_fit]); + XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[best_fit]); vidmode_active = true; // Move the viewport to top left - XF86VidModeSetViewPort(vidx11_display, scrnum, 0, 0); + XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0); } else fullscreen = 0; @@ -841,7 +821,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil) XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, 0, 0); XFlush(vidx11_display); // Move the viewport to top left - XF86VidModeSetViewPort(vidx11_display, scrnum, 0, 0); + XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0); } //XSync(vidx11_display, False); @@ -866,13 +846,22 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil) gl_version = qglGetString(GL_VERSION); gl_extensions = qglGetString(GL_EXTENSIONS); gl_platform = "GLX"; - gl_platformextensions = qglXQueryExtensionsString(vidx11_display, scrnum); + gl_platformextensions = qglXQueryExtensionsString(vidx11_display, vidx11_screen); + + gl_videosyncavailable = false; +// COMMANDLINEOPTION: Linux GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions) +// COMMANDLINEOPTION: BSD GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions) +// COMMANDLINEOPTION: MacOSX GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions) GL_CheckExtension("GLX_ARB_get_proc_address", getprocaddressfuncs, "-nogetprocaddress", false); +// COMMANDLINEOPTION: Linux GLX: -novideosync disables GLX_SGI_video_sync +// COMMANDLINEOPTION: BSD GLX: -novideosync disables GLX_SGI_video_sync +// COMMANDLINEOPTION: MacOSX GLX: -novideosync disables GLX_SGI_video_sync gl_videosyncavailable = GL_CheckExtension("GLX_SGI_video_sync", videosyncfuncs, "-novideosync", false); usingmouse = false; vid_hidden = false; + vid_activewindow = true; GL_Init(); return true; } @@ -903,7 +892,7 @@ static void *prjobj = NULL; int GL_OpenLibrary(const char *name) { - Con_Printf("Loading GL driver %s\n", name); + Con_Printf("Loading OpenGL driver %s\n", name); GL_CloseLibrary(); if (!(prjobj = dlopen(name, RTLD_LAZY))) { @@ -935,3 +924,4 @@ void *GL_GetProcAddress(const char *name) p = (void *) dlsym(prjobj, name); return p; } +