nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "add XFlush to g_timeout callbacks"

Browse source 
This reverts commit aa3685d16a.

Mika's commit using a GSource to handle X Events fixes this problem, so this
commit is not needed
This commit is contained in:
Dana Jansens 2010-07-09 20:58:21 -07:00 committed by Mikael Magnusson
parent 179312f9ae
commit 624ffe397b
10 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
openbox/dock.c
View file

@ -632,7 +632,6 @@ static gboolean hide_timeout(gpointer data)
hide_timeout_id = 0; hide_timeout_id = 0;
XFlush(obt_display);
return FALSE; /* don't repeat */ return FALSE; /* don't repeat */
} }
@ -644,7 +643,6 @@ static gboolean show_timeout(gpointer data)
show_timeout_id = 0; show_timeout_id = 0;
XFlush(obt_display);
return FALSE; /* don't repeat */ return FALSE; /* don't repeat */
} }

2
openbox/event.c
View file

@ -2073,7 +2073,6 @@ static gboolean focus_delay_func(gpointer data)
if (client_focus(d->client) && config_focus_raise) if (client_focus(d->client) && config_focus_raise)
stacking_raise(CLIENT_AS_WINDOW(d->client)); stacking_raise(CLIENT_AS_WINDOW(d->client));
event_curtime = old; event_curtime = old;
XFlush(obt_display);
return FALSE; /* no repeat */ return FALSE; /* no repeat */
} }
@ -2086,7 +2085,6 @@ static gboolean unfocus_delay_func(gpointer data)
event_curserial = d->serial; event_curserial = d->serial;
focus_nothing(); focus_nothing();
event_curtime = old; event_curtime = old;
XFlush(obt_display);
return FALSE; /* no repeat */ return FALSE; /* no repeat */
} }

3
openbox/frame.c
View file

@ -1672,7 +1672,6 @@ static gboolean flash_timeout(gpointer data)
self->focused = FALSE; self->focused = FALSE;
} }
XFlush(obt_display);
return TRUE; /* go again */ return TRUE; /* go again */
} }
@ -1770,11 +1769,11 @@ static gboolean frame_animate_iconify(gpointer p)
} }
XMoveResizeWindow(obt_display, self->window, x, y, w, h); XMoveResizeWindow(obt_display, self->window, x, y, w, h);
XFlush(obt_display);
if (time == 0) if (time == 0)
frame_end_iconify_animation(self); frame_end_iconify_animation(self);
XFlush(obt_display);
return time > 0; /* repeat until we're out of time */ return time > 0; /* repeat until we're out of time */
} }

1
openbox/keyboard.c
View file

@ -66,7 +66,6 @@ static void grab_keys(gboolean grab)
static gboolean chain_timeout(gpointer data) static gboolean chain_timeout(gpointer data)
{ {
keyboard_reset_chains(0); keyboard_reset_chains(0);
XFlush(obt_display);
return FALSE; /* don't repeat */ return FALSE; /* don't repeat */
} }

2
openbox/menuframe.c
View file

@ -1158,7 +1158,6 @@ static gboolean submenu_show_timeout(gpointer data)
{ {
g_assert(menu_frame_visible); g_assert(menu_frame_visible);
menu_entry_frame_show_submenu((ObMenuEntryFrame*)data); menu_entry_frame_show_submenu((ObMenuEntryFrame*)data);
XFlush(obt_display);
return FALSE; return FALSE;
} }
@ -1166,7 +1165,6 @@ static gboolean submenu_hide_timeout(gpointer data)
{ {
g_assert(menu_frame_visible); g_assert(menu_frame_visible);
menu_frame_hide((ObMenuFrame*)data); menu_frame_hide((ObMenuFrame*)data);
XFlush(obt_display);
return FALSE; return FALSE;
} }

3
openbox/moveresize.c
View file

@ -462,8 +462,6 @@ static gboolean sync_timeout_func(gpointer data)
++waiting_for_sync; /* we timed out waiting for our sync... */ ++waiting_for_sync; /* we timed out waiting for our sync... */
do_resize(); /* ...so let any pending resizes through */ do_resize(); /* ...so let any pending resizes through */
XFlush(obt_display);
if (waiting_for_sync > SYNC_TIMEOUTS) { if (waiting_for_sync > SYNC_TIMEOUTS) {
sync_timer = 0; sync_timer = 0;
return FALSE; /* don't repeat */ return FALSE; /* don't repeat */
@ -618,7 +616,6 @@ static gboolean edge_warp_delay_func(gpointer data)
} }
edge_warp_odd = !edge_warp_odd; edge_warp_odd = !edge_warp_odd;
XFlush(obt_display);
return TRUE; /* do repeat ! */ return TRUE; /* do repeat ! */
} }

1
openbox/ping.c
View file

@ -148,7 +148,6 @@ static gboolean ping_timeout(gpointer data)
++t->waiting; ++t->waiting;
XFlush(obt_display);
return TRUE; /* repeat */ return TRUE; /* repeat */
} }

1
openbox/popup.c
View file

@ -148,7 +148,6 @@ static gboolean popup_show_timeout(gpointer data)
self->delay_mapped = FALSE; self->delay_mapped = FALSE;
self->delay_timer = 0; self->delay_timer = 0;
XFlush(obt_display);
return FALSE; /* don't repeat */ return FALSE; /* don't repeat */
} }

1
openbox/screen.c
View file

@ -940,7 +940,6 @@ static gboolean hide_desktop_popup_func(gpointer data)
{ {
pager_popup_hide(desktop_popup); pager_popup_hide(desktop_popup);
desktop_popup_timer = 0; desktop_popup_timer = 0;
XFlush(obt_display);
return FALSE; /* don't repeat */ return FALSE; /* don't repeat */
} }

2
openbox/startupnotify.c
View file

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