Tomaz's new water effect has been added and looks very nice

[xonotic/darkplaces.git] / vid_glx.c

diff --git a/vid_glx.c b/vid_glx.c
index 800b46c10f2ef5cc0cfcdd34a372243fd342340c..4a5e04171031b3050e17fd7b5910578b2a1d664c 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;
@@ -381,8 +383,29 @@ static void HandleEvents(void)
                        case 5:
                                Key_Event(K_MWHEELDOWN, true);
                                break;
+                       case 6:
+                               Key_Event(K_MOUSE4, true);
+                               break;
+                       case 7:
+                               Key_Event(K_MOUSE5, true);
+                               break;
+                       case 8:
+                               Key_Event(K_MOUSE6, true);
+                               break;
+                       case 9:
+                               Key_Event(K_MOUSE7, true);
+                               break;
+                       case 10:
+                               Key_Event(K_MOUSE8, true);
+                               break;
+                       case 11:
+                               Key_Event(K_MOUSE9, true);
+                               break;
+                       case 12:
+                               Key_Event(K_MOUSE10, true);
+                               break;
                        default:
-                               Con_Printf("HandleEvents: ButtonPress gave value %d, 1-5 expected\n", event.xbutton.button);
+                               Con_Printf("HandleEvents: ButtonPress gave value %d, 1-12 expected\n", event.xbutton.button);
                                break;
                        }
                        break;
@@ -406,8 +429,29 @@ static void HandleEvents(void)
                        case 5:
                                Key_Event(K_MWHEELDOWN, false);
                                break;
+                       case 6:
+                               Key_Event(K_MOUSE4, false);
+                               break;
+                       case 7:
+                               Key_Event(K_MOUSE5, false);
+                               break;
+                       case 8:
+                               Key_Event(K_MOUSE6, false);
+                               break;
+                       case 9:
+                               Key_Event(K_MOUSE7, false);
+                               break;
+                       case 10:
+                               Key_Event(K_MOUSE8, false);
+                               break;
+                       case 11:
+                               Key_Event(K_MOUSE9, false);
+                               break;
+                       case 12:
+                               Key_Event(K_MOUSE10, false);
+                               break;
                        default:
-                               Con_Printf("HandleEvents: ButtonRelease gave value %d, 1-5 expected\n", event.xbutton.button);
+                               Con_Printf("HandleEvents: ButtonRelease gave value %d, 1-12 expected\n", event.xbutton.button);
                                break;
                        }
                        break;
@@ -429,7 +473,7 @@ 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:
@@ -665,7 +709,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;
        }
 
@@ -831,7 +875,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)))
        {