all repos — openbox @ 624ffe397bb52757f486208b754489cdb77fd923

openbox fork - make it a bit more like ryudo 

Revert "add XFlush to g_timeout callbacks"

This reverts commit aa3685d16af4a565eecdc39047ee8d140ef5cd99.

Mika's commit using a GSource to handle X Events fixes this problem, so this
commit is not needed
Dana Jansens danakj@orodu.net
commit

624ffe397bb52757f486208b754489cdb77fd923

parent

179312f9ae8ad3fdae977ac0d4004aa6ef33f5eb

10 files changed, 1 insertions(+), 17 deletions(-)

jump to
M openbox/dock.c → openbox/dock.c 
@@ -632,7 +632,6 @@ dock_configure();
 
     hide_timeout_id = 0;
 
-    XFlush(obt_display);
     return FALSE; /* don't repeat */
 }
 

@@ -644,7 +643,6 @@ dock_configure();
 
     show_timeout_id = 0;
 
-    XFlush(obt_display);
     return FALSE; /* don't repeat */
 }
M openbox/event.c → openbox/event.c 
@@ -2073,7 +2073,6 @@ event_curserial = d->serial;
     if (client_focus(d->client) && config_focus_raise)
         stacking_raise(CLIENT_AS_WINDOW(d->client));
     event_curtime = old;
-    XFlush(obt_display);
     return FALSE; /* no repeat */
 }
 

@@ -2086,7 +2085,6 @@ event_curtime = d->time;
     event_curserial = d->serial;
     focus_nothing();
     event_curtime = old;
-    XFlush(obt_display);
     return FALSE; /* no repeat */
 }
M openbox/frame.c → openbox/frame.c 
@@ -1672,7 +1672,6 @@ frame_adjust_focus(self, self->flash_on);
         self->focused = FALSE;
     }
 
-    XFlush(obt_display);
     return TRUE; /* go again */
 }
 

@@ -1770,11 +1769,11 @@ h = self->size.top; /* just the titlebar */
     }
 
     XMoveResizeWindow(obt_display, self->window, x, y, w, h);
+    XFlush(obt_display);
 
     if (time == 0)
         frame_end_iconify_animation(self);
 
-    XFlush(obt_display);
     return time > 0; /* repeat until we're out of time */
 }
M openbox/keyboard.c → openbox/keyboard.c 
@@ -66,7 +66,6 @@ 
 static gboolean chain_timeout(gpointer data)
 {
     keyboard_reset_chains(0);
-    XFlush(obt_display);
     return FALSE; /* don't repeat */
 }
M openbox/menuframe.c → openbox/menuframe.c 
@@ -1158,7 +1158,6 @@ static gboolean submenu_show_timeout(gpointer data)
 {
     g_assert(menu_frame_visible);
     menu_entry_frame_show_submenu((ObMenuEntryFrame*)data);
-    XFlush(obt_display);
     return FALSE;
 }
 

@@ -1166,7 +1165,6 @@ static gboolean submenu_hide_timeout(gpointer data)
 {
     g_assert(menu_frame_visible);
     menu_frame_hide((ObMenuFrame*)data);
-    XFlush(obt_display);
     return FALSE;
 }
M openbox/moveresize.c → openbox/moveresize.c 
@@ -462,8 +462,6 @@ {
     ++waiting_for_sync; /* we timed out waiting for our sync... */
     do_resize(); /* ...so let any pending resizes through */
 
-    XFlush(obt_display);
-
     if (waiting_for_sync > SYNC_TIMEOUTS) {
         sync_timer = 0;
         return FALSE; /* don't repeat */

@@ -618,7 +616,6 @@ }
     }
     edge_warp_odd = !edge_warp_odd;
 
-    XFlush(obt_display);
     return TRUE; /* do repeat ! */
 }
M openbox/ping.c → openbox/ping.c 
@@ -148,7 +148,6 @@ t->h(t->client, TRUE); /* notify that the client isn't responding */
 
     ++t->waiting;
 
-    XFlush(obt_display);
     return TRUE; /* repeat */
 }
M openbox/popup.c → openbox/popup.c 
@@ -148,7 +148,6 @@ self->mapped = TRUE;
     self->delay_mapped = FALSE;
     self->delay_timer = 0;
 
-    XFlush(obt_display);
     return FALSE; /* don't repeat */
 }
M openbox/screen.c → openbox/screen.c 
@@ -940,7 +940,6 @@ static gboolean hide_desktop_popup_func(gpointer data)
 {
     pager_popup_hide(desktop_popup);
     desktop_popup_timer = 0;
-    XFlush(obt_display);
     return FALSE; /* don't repeat */
 }
M openbox/startupnotify.c → openbox/startupnotify.c 
@@ -116,7 +116,6 @@ {
     SnStartupSequence *seq = data;
     sn_waits = g_slist_remove(sn_waits, seq);
     screen_set_root_cursor();
-    XFlush(obt_display);
     return FALSE; /* don't repeat */
 }
 

@@ -229,7 +228,6 @@ static gboolean sn_launch_wait_timeout(gpointer data)
 {
     SnLauncherContext *sn = data;
     sn_launcher_context_complete(sn);
-    XFlush(obt_display);
     return FALSE; /* don't repeat */
 }