Fast commit before Im off for 10 days. Please correct/undo my commit if it breaks...

[xonotic/darkplaces.git] / vid_glx.c

diff --git a/vid_glx.c b/vid_glx.c
index 1ea67984e0c5565c738ce53502f3d9cb6e81feb2..86eb757d2a7042c3956c691d470c98ab5a104f20 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -79,8 +79,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;
@@ -106,13 +108,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 +204,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;
        }
 
@@ -314,6 +300,8 @@ static void uninstall_grabs(void)
 static void HandleEvents(void)
 {
        XEvent event;
+       int key;
+       char ascii;
        qboolean dowarp = false;
 
        if (!vidx11_display)
@@ -327,12 +315,14 @@ 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:
@@ -358,8 +348,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 +357,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 +403,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 +467,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 +554,7 @@ void VID_Shutdown(void)
        ctx = NULL;
 
        GL_CloseLibrary();
+       Key_ClearStates ();
 }
 
 void signal_handler(int sig)
@@ -671,7 +660,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];
@@ -707,7 +696,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,7 +710,7 @@ 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)
        {
@@ -842,7 +831,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 +862,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)))
        {