X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=6d74a27d2eb15f4f923667080d0463615cf410a2;hb=bddbe9432837edccc67b76f2d29d4dbc9b02203f;hp=7a1f66e93a40c3ab9807890d2fd3926fcdd84a3b;hpb=59f318e897a301a40fb46fadbc4b825ccf86c0ba;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index 7a1f66e9..6d74a27d 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -149,28 +149,7 @@ void event_loop()
     struct timeval *wait;
     gboolean had_event = FALSE;
 
-    while (TRUE) {
-	/*
-	  There are slightly different event retrieval semantics here for
-	  local (or high bandwidth) versus remote (or low bandwidth)
-	  connections to the display/Xserver.
-	*/
-	if (ob_remote) {
-	    if (!XPending(ob_display))
-		break;
-	} else {
-	    /*
-	      This XSync allows for far more compression of events, which
-	      makes things like Motion events perform far far better. Since
-	      it also means network traffic for every event instead of every
-	      X events (where X is the number retrieved at a time), it
-	      probably should not be used for setups where Openbox is
-	      running on a remote/low bandwidth display/Xserver.
-	    */
-	    XSync(ob_display, FALSE);
-	    if (!XEventsQueued(ob_display, QueuedAlready))
-		break;
-	}
+    while (XPending(ob_display)) {
 	XNextEvent(ob_display, &e);
 
 #ifdef USE_LIBSN
@@ -507,7 +486,7 @@ static void event_process(XEvent *e)
 	event_handle_dockapp(dockapp, e);
     else if (dock)
 	event_handle_dock(dock, e);
-    else if (window == ob_root)
+    else if (window == RootWindow(ob_display, ob_screen))
 	event_handle_root(e);
     else if (e->type == MapRequest)
 	client_manage(window);
@@ -662,7 +641,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
         /* are we a fullscreen window or a transient of one? (checks layer)
            if we are then we need to be iconified since we are losing focus
          */
-        if (client->layer == Layer_Fullscreen && !client->iconic &&
+        if (client->layer == OB_STACKING_LAYER_FULLSCREEN && !client->iconic &&
             !client_search_focus_tree_full(client))
             /* iconify fullscreen windows when they and their transients
                aren't focused */
@@ -671,7 +650,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
 	break;
     case EnterNotify:
         if (client_normal(client)) {
-            if (ob_state == OB_STATE_STARTING) {
+            if (ob_state() == OB_STATE_STARTING) {
                 /* move it to the top of the focus order */
                 guint desktop = client->desktop;
                 if (desktop == DESKTOP_ALL) desktop = screen_desktop;