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

compress events properly

Browse source
This commit is contained in:
Dana Jansens 2003-08-31 19:50:17 +00:00
parent 49d58ec9ba
commit d298cfb786
1 changed files with 49 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
openbox/event.c
View file

@ -319,8 +319,8 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
gboolean fallback = TRUE; gboolean fallback = TRUE;
while (TRUE) { while (TRUE) {
if (!XCheckTypedWindowEvent(ob_display, FocusOut, if (!XCheckTypedWindowEvent(ob_display, e->xfocus.window,
e->xfocus.window,&fe)) FocusOut, &fe))
if (!XCheckTypedEvent(ob_display, FocusIn, &fe)) if (!XCheckTypedEvent(ob_display, FocusIn, &fe))
break; break;
if (fe.type == FocusOut) { if (fe.type == FocusOut) {
@ -429,6 +429,8 @@ static void event_process(const XEvent *ec, gpointer data)
ee = *ec; ee = *ec;
e = ⅇ e = ⅇ
g_message("Event %d", e->type);
window = event_get_window(e); window = event_get_window(e);
if ((obwin = g_hash_table_lookup(window_map, &window))) { if ((obwin = g_hash_table_lookup(window_map, &window))) {
switch (obwin->type) { switch (obwin->type) {
@ -845,8 +847,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
msgtype = e->xclient.message_type; msgtype = e->xclient.message_type;
if (msgtype == prop_atoms.wm_change_state) { if (msgtype == prop_atoms.wm_change_state) {
/* compress changes into a single change */ /* compress changes into a single change */
while (XCheckTypedWindowEvent(ob_display, e->type, while (XCheckTypedWindowEvent(ob_display, client->window,
client->window, &ce)) { e->type, &ce)) {
/* XXX: it would be nice to compress ALL messages of a /* XXX: it would be nice to compress ALL messages of a
type, not just messages in a row without other type, not just messages in a row without other
message types between. */ message types between. */
@ -859,8 +861,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
client_set_wm_state(client, e->xclient.data.l[0]); client_set_wm_state(client, e->xclient.data.l[0]);
} else if (msgtype == prop_atoms.net_wm_desktop) { } else if (msgtype == prop_atoms.net_wm_desktop) {
/* compress changes into a single change */ /* compress changes into a single change */
while (XCheckTypedWindowEvent(ob_display, e->type, while (XCheckTypedWindowEvent(ob_display, client->window,
client->window, &ce)) { e->type, &ce)) {
/* XXX: it would be nice to compress ALL messages of a /* XXX: it would be nice to compress ALL messages of a
type, not just messages in a row without other type, not just messages in a row without other
message types between. */ message types between. */
@ -974,14 +976,38 @@ static void event_handle_client(ObClient *client, XEvent *e)
if (!client_validate(client)) break; if (!client_validate(client)) break;
/* compress changes to a single property into a single change */ /* compress changes to a single property into a single change */
while (XCheckTypedWindowEvent(ob_display, e->type, while (XCheckTypedWindowEvent(ob_display, client->window,
client->window, &ce)) { e->type, &ce)) {
/* XXX: it would be nice to compress ALL changes to a property, Atom a, b;
/* XXX: it would be nice to compress ALL changes to a property,
not just changes in a row without other props between. */ not just changes in a row without other props between. */
if (ce.xproperty.atom != e->xproperty.atom) {
XPutBackEvent(ob_display, &ce); a = ce.xproperty.atom;
break; b = e->xproperty.atom;
}
if (a == b)
continue;
if ((a == prop_atoms.net_wm_name ||
a == prop_atoms.wm_name ||
a == prop_atoms.net_wm_icon_name ||
a == prop_atoms.wm_icon_name)
&&
(b == prop_atoms.net_wm_name ||
b == prop_atoms.wm_name ||
b == prop_atoms.net_wm_icon_name ||
b == prop_atoms.wm_icon_name)) {
continue;
}
if ((a == prop_atoms.net_wm_icon ||
a == prop_atoms.kwm_win_icon)
&&
(b == prop_atoms.net_wm_icon ||
b == prop_atoms.kwm_win_icon))
continue;
XPutBackEvent(ob_display, &ce);
break;
} }
msgtype = e->xproperty.atom; msgtype = e->xproperty.atom;
@ -989,24 +1015,22 @@ static void event_handle_client(ObClient *client, XEvent *e)
client_update_normal_hints(client); client_update_normal_hints(client);
/* normal hints can make a window non-resizable */ /* normal hints can make a window non-resizable */
client_setup_decor_and_functions(client); client_setup_decor_and_functions(client);
} } else if (msgtype == XA_WM_HINTS) {
else if (msgtype == XA_WM_HINTS)
client_update_wmhints(client); client_update_wmhints(client);
else if (msgtype == XA_WM_TRANSIENT_FOR) { } else if (msgtype == XA_WM_TRANSIENT_FOR) {
client_update_transient_for(client); client_update_transient_for(client);
client_get_type(client); client_get_type(client);
/* type may have changed, so update the layer */ /* type may have changed, so update the layer */
client_calc_layer(client); client_calc_layer(client);
client_setup_decor_and_functions(client); client_setup_decor_and_functions(client);
} } else if (msgtype == prop_atoms.net_wm_name ||
else if (msgtype == prop_atoms.net_wm_name || msgtype == prop_atoms.wm_name ||
msgtype == prop_atoms.wm_name || msgtype == prop_atoms.net_wm_icon_name ||
msgtype == prop_atoms.net_wm_icon_name || msgtype == prop_atoms.wm_icon_name) {
msgtype == prop_atoms.wm_icon_name)
client_update_title(client); client_update_title(client);
else if (msgtype == prop_atoms.wm_class) } else if (msgtype == prop_atoms.wm_class) {
client_update_class(client); client_update_class(client);
else if (msgtype == prop_atoms.wm_protocols) { } else if (msgtype == prop_atoms.wm_protocols) {
client_update_protocols(client); client_update_protocols(client);
client_setup_decor_and_functions(client); client_setup_decor_and_functions(client);
} }
@ -1014,8 +1038,9 @@ static void event_handle_client(ObClient *client, XEvent *e)
client_update_strut(client); client_update_strut(client);
} }
else if (msgtype == prop_atoms.net_wm_icon || else if (msgtype == prop_atoms.net_wm_icon ||
msgtype == prop_atoms.kwm_win_icon) msgtype == prop_atoms.kwm_win_icon) {
client_update_icons(client); client_update_icons(client);
}
default: default:
; ;
#ifdef SHAPE #ifdef SHAPE