removed crosshair_flashspeed and crosshair_flashrange cvars (flashing is now gone)

[xonotic/darkplaces.git] / vid_glx.c

diff --git a/vid_glx.c b/vid_glx.c
index 150736df5b9ae4d5f874c33ad5cbf8cc1d406c5e..04d6516ac50c4294fff924d9877747a822c4393f 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -17,12 +17,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-//#include <termios.h>
-//#include <sys/ioctl.h>
-//#include <sys/stat.h>
-//#include <sys/vt.h>
-//#include <stdarg.h>
-//#include <stdio.h>
 #include <signal.h>
 
 #include <dlfcn.h>
@@ -199,6 +193,7 @@ static int XLateKey(XKeyEvent *ev, char *ascii)
 
                case XK_Alt_L:
                case XK_Meta_L:
+               case XK_ISO_Level3_Shift:
                case XK_Alt_R:
                case XK_Meta_R: key = K_ALT;                    break;
 
@@ -573,9 +568,9 @@ void VID_Finish (qboolean allowmousegrab)
                        Con_Print("glXSwapIntervalSGI didn't accept the vid_vsync change, it will take effect on next vid_restart (GLX_SGI_swap_control does not allow turning off vsync)\n");
        }
 
-// handle the mouse state when windowed if that's changed
+       // handle the mouse state when windowed if that's changed
        vid_usemouse = false;
-       if (allowmousegrab && vid_mouse.integer && !key_consoleactive && !cls.demoplayback)
+       if (allowmousegrab && vid_mouse.integer && !key_consoleactive && (key_dest != key_game || !cls.demoplayback))
                vid_usemouse = true;
        if (!vid_activewindow)
                vid_usemouse = false;
@@ -585,9 +580,12 @@ void VID_Finish (qboolean allowmousegrab)
 
        if (r_render.integer)
        {
+               CHECKGLERROR
                if (r_speeds.integer || gl_finish.integer)
-                       qglFinish();
-               qglXSwapBuffers(vidx11_display, win);
+               {
+                       qglFinish();CHECKGLERROR
+               }
+               qglXSwapBuffers(vidx11_display, win);CHECKGLERROR
        }
 
        if (vid_x11_hardwaregammasupported)
@@ -845,6 +843,20 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
 
 void Sys_SendKeyEvents(void)
 {
+       static qboolean sound_active = true;
+
+       // enable/disable sound on focus gain/loss
+       if (!vid_activewindow && sound_active)
+       {
+               S_BlockSound ();
+               sound_active = false;
+       }
+       else if (vid_activewindow && !sound_active)
+       {
+               S_UnblockSound ();
+               sound_active = true;
+       }
+
        HandleEvents();
 }