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
ObClient *client = NULL;
ObDock *dock = NULL;
ObDockApp *dockapp = NULL;
- Menu *menu = NULL;
+ ObMenu *menu = NULL;
ObWindow *obwin = NULL;
window = event_get_window(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);
/* 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 */
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;
static void event_handle_menu(ObClient *client, XEvent *e)
{
- static MenuEntry *over = NULL;
- MenuEntry *entry;
- Menu *top;
+ static ObMenuEntry *over = NULL;
+ ObMenuEntry *entry;
+ ObMenu *top;
GSList *it;
top = g_slist_nth_data(menu_visible, 0);
g_message("BUTTON RELEASED");
for (it = menu_visible; it; it = g_slist_next(it)) {
- Menu *m = it->data;
+ ObMenu *m = it->data;
if (e->xbutton.x_root >= m->location.x - ob_rr_theme->bwidth &&
e->xbutton.y_root >= m->location.y - ob_rr_theme->bwidth &&
e->xbutton.x_root < m->location.x + m->size.width +
case MotionNotify:
g_message("motion");
for (it = menu_visible; it; it = g_slist_next(it)) {
- Menu *m = it->data;
+ ObMenu *m = it->data;
if ((entry = menu_find_entry_by_pos(it->data,
e->xmotion.x_root -
m->location.x,