X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fscreen.c;h=c7127214b599123c39d7611d200f5af45b1290b5;hb=417bcd67ac051f13d6d66874d5cc997b47acd319;hp=e5640256689949044a8c9f7b02dfda77b5043746;hpb=92a6b897a047054d8fabc8fdee9233a555accb11;p=chaz%2Fopenbox

diff --git a/openbox/screen.c b/openbox/screen.c
index e5640256..c7127214 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -1,3 +1,21 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   screen.c for the Openbox window manager
+   Copyright (c) 2003        Ben Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "debug.h"
 #include "openbox.h"
 #include "dock.h"
@@ -10,6 +28,7 @@
 #include "screen.h"
 #include "client.h"
 #include "frame.h"
+#include "event.h"
 #include "focus.h"
 #include "popup.h"
 #include "extensions.h"
@@ -434,6 +453,10 @@ void screen_set_desktop(guint num)
                 frame_hide(c->frame);
         }
     }
+
+    event_ignore_queued_enters();
+
+    focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
 }
 
 static void get_row_col(guint d, guint *r, guint *c)
@@ -725,7 +748,7 @@ void screen_update_layout()
                     if (rows * cols >= screen_num_desktops + cols)
                         rows--;
                 } else if (rows == 0) {
-                    rows = screen_num_desktops / rows;
+                    rows = screen_num_desktops / cols;
                     if (cols * rows < screen_num_desktops)
                         rows++;
                     if (cols * rows >= screen_num_desktops + rows)
@@ -841,15 +864,15 @@ void screen_install_colormap(ObClient *client, gboolean install)
 	else
 	    XUninstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst));
     } else {
-	if (XGetWindowAttributes(ob_display, client->window, &wa) &&
+        if (XGetWindowAttributes(ob_display, client->window, &wa) &&
             wa.colormap != None) {
             xerror_set_ignore(TRUE);
-	    if (install)
-		XInstallColormap(RrDisplay(ob_rr_inst), wa.colormap);
-	    else
-		XUninstallColormap(RrDisplay(ob_rr_inst), wa.colormap);
+            if (install)
+                XInstallColormap(RrDisplay(ob_rr_inst), wa.colormap);
+            else
+                XUninstallColormap(RrDisplay(ob_rr_inst), wa.colormap);
             xerror_set_ignore(FALSE);
-	}
+        }
     }
 }