X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_glx.c;h=c05f0d3be2729c3c0fc77fe8ec49c94cad05a98b;hb=d2878a072b9a0399379741b3e19536b7327cb388;hp=1ea67984e0c5565c738ce53502f3d9cb6e81feb2;hpb=3f2bc4a392c209700360c90bcfcf826b135c898d;p=xonotic%2Fdarkplaces.git diff --git a/vid_glx.c b/vid_glx.c index 1ea67984..c05f0d3b 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 @@ -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,40 +368,40 @@ 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, true); + Key_Event(K_MOUSE4, 0, true); break; case 7: - Key_Event(K_MOUSE5, true); + Key_Event(K_MOUSE5, 0, true); break; case 8: - Key_Event(K_MOUSE6, true); + Key_Event(K_MOUSE6, 0, true); break; case 9: - Key_Event(K_MOUSE7, true); + Key_Event(K_MOUSE7, 0, true); break; case 10: - Key_Event(K_MOUSE8, true); + Key_Event(K_MOUSE8, 0, true); break; case 11: - Key_Event(K_MOUSE9, true); + Key_Event(K_MOUSE9, 0, true); break; case 12: - Key_Event(K_MOUSE10, true); + Key_Event(K_MOUSE10, 0, true); break; default: Con_Printf("HandleEvents: ButtonPress gave value %d, 1-12 expected\n", event.xbutton.button); @@ -413,40 +414,40 @@ 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, false); + Key_Event(K_MOUSE4, 0, false); break; case 7: - Key_Event(K_MOUSE5, false); + Key_Event(K_MOUSE5, 0, false); break; case 8: - Key_Event(K_MOUSE6, false); + Key_Event(K_MOUSE6, 0, false); break; case 9: - Key_Event(K_MOUSE7, false); + Key_Event(K_MOUSE7, 0, false); break; case 10: - Key_Event(K_MOUSE8, false); + Key_Event(K_MOUSE8, 0, false); break; case 11: - Key_Event(K_MOUSE9, false); + Key_Event(K_MOUSE9, 0, false); break; case 12: - Key_Event(K_MOUSE10, false); + Key_Event(K_MOUSE10, 0, false); break; default: Con_Printf("HandleEvents: ButtonRelease gave value %d, 1-12 expected\n", event.xbutton.button); @@ -477,31 +478,29 @@ static void HandleEvents(void) case MapNotify: // window restored vid_hidden = false; - vid_allowhwgamma = true; + vid_activewindow = false; + VID_RestoreSystemGamma(); break; case UnmapNotify: // window iconified/rolledup/whatever vid_hidden = true; - vid_allowhwgamma = false; + vid_activewindow = false; VID_RestoreSystemGamma(); break; case FocusIn: // window is now the input focus - vid_allowhwgamma = true; + vid_activewindow = true; break; case FocusOut: // window is no longer the input focus - vid_allowhwgamma = false; + vid_activewindow = false; VID_RestoreSystemGamma(); break; case EnterNotify: // mouse entered window - vid_allowhwgamma = true; break; case LeaveNotify: // mouse left window - vid_allowhwgamma = false; - VID_RestoreSystemGamma(); break; } } @@ -566,6 +565,7 @@ void VID_Shutdown(void) ctx = NULL; GL_CloseLibrary(); + Key_ClearStates (); } void signal_handler(int sig) @@ -647,8 +647,10 @@ int VID_GetGamma(unsigned short *ramps) void VID_Init(void) { +#ifndef __APPLE__ Cvar_RegisterVariable (&vid_dga); Cvar_RegisterVariable (&vid_dga_mouseaccel); +#endif InitSig(); // trap evil signals if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe")) mouse_avail = false; @@ -671,7 +673,7 @@ void VID_BuildGLXAttrib(int *attrib, int stencil) *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]; @@ -682,7 +684,11 @@ 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 i = COM_CheckParm("-gl_driver"); if (i && i < com_argc - 1) drivername = com_argv[i + 1]; @@ -694,7 +700,7 @@ 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; } @@ -707,7 +713,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; } @@ -721,11 +727,11 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil) return false; } - VID_BuildGLXAttrib(attrib, stencil); + VID_BuildGLXAttrib(attrib, bpp == 32); visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib); if (!visinfo) { - Con_Printf("Couldn't get an RGB, Double-buffered, Depth visual\n"); + Con_Print("Couldn't get an RGB, Double-buffered, Depth visual\n"); return false; } @@ -842,7 +848,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil) usingmouse = false; vid_hidden = false; - vid_allowhwgamma = true; + vid_activewindow = true; GL_Init(); return true; } @@ -873,7 +879,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))) {