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 f6b67a64da796f90b5a9cbc6328c77b7a49c77f3..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;
@@ -471,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:
@@ -707,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;
        }
 
@@ -873,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)))
        {