From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 28 Jan 2009 11:26:12 +0000 (+0000)
Subject: oops, fixing syntax
X-Git-Tag: xonotic-v0.1.0preview~1911
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a291cf2943ccfd719c62bf209c661baa13473335;p=xonotic%2Fdarkplaces.git

oops, fixing syntax


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8683 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/vid_glx.c b/vid_glx.c
index f7287cbd..5cdd71e2 100644
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -504,21 +504,23 @@ static void HandleEvents(void)
 				XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0);
 
 				// make sure it's fullscreen
-				XEvent event;
-				event.type = ClientMessage;
-				event.xclient.serial = 0;
-				event.xclient.send_event = True;
-				event.xclient.message_type = net_wm_state_atom;
-				event.xclient.window = win;
-				event.xclient.format = 32;
-				event.xclient.data.l[0] = 1;
-				event.xclient.data.l[1] = net_wm_state_fullscreen_atom;
-				event.xclient.data.l[2] = 0;
-				event.xclient.data.l[3] = 1;
-				event.xclient.data.l[4] = 0;
-				XSendEvent(vidx11_display, root, False, SubstructureRedirectMask | SubstructureNotifyMask, &event);
-
-				dowarp = true;
+				{
+					XEvent event;
+					event.type = ClientMessage;
+					event.xclient.serial = 0;
+					event.xclient.send_event = True;
+					event.xclient.message_type = net_wm_state_atom;
+					event.xclient.window = win;
+					event.xclient.format = 32;
+					event.xclient.data.l[0] = 1;
+					event.xclient.data.l[1] = net_wm_state_fullscreen_atom;
+					event.xclient.data.l[2] = 0;
+					event.xclient.data.l[3] = 1;
+					event.xclient.data.l[4] = 0;
+					XSendEvent(vidx11_display, root, False, SubstructureRedirectMask | SubstructureNotifyMask, &event);
+
+					dowarp = true;
+				}
 			}
 
 			break;
@@ -543,7 +545,7 @@ static void HandleEvents(void)
 			if (vid_isfullscreen && !vid_isnetwmfullscreen)
 				break;
 
-			if(vid_isfullscreen & event.xfocus.mode == NotifyNormal)
+			if(vid_isfullscreen && event.xfocus.mode == NotifyNormal)
 			{
 				// iconify netwm fullscreen window when it loses focus
 				// when the user selects it in the taskbar, the window manager will map it again and send MapNotify