else if (e->type == MappingNotify) {
/* keyboard layout changes for modifier mapping changes. reload the
modifier map, and rebind all the key bindings as appropriate */
- ob_debug("Kepboard map changed. Reloading keyboard bindings.\n");
+ ob_debug("Keyboard map changed. Reloading keyboard bindings.\n");
+ ob_set_state(OB_STATE_RECONFIGURING);
modkeys_shutdown(TRUE);
modkeys_startup(TRUE);
keyboard_rebind();
+ ob_set_state(OB_STATE_RUNNING);
}
else if (e->type == ClientMessage) {
/* This is for _NET_WM_REQUEST_FRAME_EXTENTS messages. They come for
}
}
+static gboolean *context_to_button(ObFrame *f, ObFrameContext con, gboolean press)
+{
+ if (press) {
+ switch (con) {
+ case OB_FRAME_CONTEXT_MAXIMIZE:
+ return &f->max_press;
+ case OB_FRAME_CONTEXT_CLOSE:
+ return &f->close_press;
+ case OB_FRAME_CONTEXT_ICONIFY:
+ return &f->iconify_press;
+ case OB_FRAME_CONTEXT_ALLDESKTOPS:
+ return &f->desk_press;
+ case OB_FRAME_CONTEXT_SHADE:
+ return &f->shade_press;
+ default:
+ return NULL;
+ }
+ } else {
+ switch (con) {
+ case OB_FRAME_CONTEXT_MAXIMIZE:
+ return &f->max_hover;
+ case OB_FRAME_CONTEXT_CLOSE:
+ return &f->close_hover;
+ case OB_FRAME_CONTEXT_ICONIFY:
+ return &f->iconify_hover;
+ case OB_FRAME_CONTEXT_ALLDESKTOPS:
+ return &f->desk_hover;
+ case OB_FRAME_CONTEXT_SHADE:
+ return &f->shade_hover;
+ default:
+ return NULL;
+ }
+ }
+}
+
+static void compress_client_message_event(XEvent *e, XEvent *ce, Window window,
+ Atom msgtype)
+{
+ /* compress changes into a single change */
+ while (XCheckTypedWindowEvent(ob_display, window, e->type, ce)) {
+ /* XXX: it would be nice to compress ALL messages of a
+ type, not just messages in a row without other
+ message types between. */
+ if (ce->xclient.message_type != msgtype) {
+ XPutBackEvent(ob_display, ce);
+ break;
+ }
+ e->xclient = ce->xclient;
+ }
+}
+
static void event_handle_client(ObClient *client, XEvent *e)
{
XEvent ce;
Atom msgtype;
ObFrameContext con;
+ gboolean *but;
static gint px = -1, py = -1;
static guint pb = 0;
static ObFrameContext pcon = OB_FRAME_CONTEXT_NONE;
con = mouse_button_frame_context(con, e->xbutton.button,
e->xbutton.state);
- if (e->type == ButtonRelease && e->xbutton.button == pb)
+ /* button presses on CLIENT_CONTEXTs are not accompanied by a
+ release because they are Replayed to the client */
+ if ((e->type == ButtonRelease || CLIENT_CONTEXT(con, client)) &&
+ e->xbutton.button == pb)
pb = 0, px = py = -1, pcon = OB_FRAME_CONTEXT_NONE;
- switch (con) {
- case OB_FRAME_CONTEXT_MAXIMIZE:
- client->frame->max_press = (e->type == ButtonPress);
+ but = context_to_button(client->frame, con, TRUE);
+ if (but) {
+ *but = (e->type == ButtonPress);
frame_adjust_state(client->frame);
- break;
- case OB_FRAME_CONTEXT_CLOSE:
- client->frame->close_press = (e->type == ButtonPress);
- frame_adjust_state(client->frame);
- break;
- case OB_FRAME_CONTEXT_ICONIFY:
- client->frame->iconify_press = (e->type == ButtonPress);
- frame_adjust_state(client->frame);
- break;
- case OB_FRAME_CONTEXT_ALLDESKTOPS:
- client->frame->desk_press = (e->type == ButtonPress);
- frame_adjust_state(client->frame);
- break;
- case OB_FRAME_CONTEXT_SHADE:
- client->frame->shade_press = (e->type == ButtonPress);
- frame_adjust_state(client->frame);
- break;
- default:
- /* nothing changes with clicks for any other contexts */
- break;
}
}
break;
client->frame->shade_hover || client->frame->iconify_hover ||
client->frame->close_hover)
{
- client->frame->max_hover = FALSE;
- client->frame->desk_hover = FALSE;
- client->frame->shade_hover = FALSE;
- client->frame->iconify_hover = FALSE;
- client->frame->close_hover = FALSE;
- frame_adjust_state(client->frame);
- }
- break;
- case OB_FRAME_CONTEXT_MAXIMIZE:
- if (!client->frame->max_hover && !pb) {
- client->frame->max_hover = TRUE;
- frame_adjust_state(client->frame);
- }
- break;
- case OB_FRAME_CONTEXT_ALLDESKTOPS:
- if (!client->frame->desk_hover && !pb) {
- client->frame->desk_hover = TRUE;
- frame_adjust_state(client->frame);
- }
- break;
- case OB_FRAME_CONTEXT_SHADE:
- if (!client->frame->shade_hover && !pb) {
- client->frame->shade_hover = TRUE;
- frame_adjust_state(client->frame);
- }
- break;
- case OB_FRAME_CONTEXT_ICONIFY:
- if (!client->frame->iconify_hover && !pb) {
- client->frame->iconify_hover = TRUE;
+ client->frame->max_hover =
+ client->frame->desk_hover =
+ client->frame->shade_hover =
+ client->frame->iconify_hover =
+ client->frame->close_hover = FALSE;
frame_adjust_state(client->frame);
}
break;
- case OB_FRAME_CONTEXT_CLOSE:
- if (!client->frame->close_hover && !pb) {
- client->frame->close_hover = TRUE;
+ default:
+ but = context_to_button(client->frame, con, FALSE);
+ if (but && !*but && !pb) {
+ *but = TRUE;
frame_adjust_state(client->frame);
}
break;
- default:
- break;
}
break;
case LeaveNotify:
case OB_FRAME_CONTEXT_TLCORNER:
case OB_FRAME_CONTEXT_TRCORNER:
/* we've left the button area inside the titlebar */
- if (client->frame->max_hover || client->frame->desk_hover ||
- client->frame->shade_hover || client->frame->iconify_hover ||
- client->frame->close_hover)
- {
- client->frame->max_hover = FALSE;
- client->frame->desk_hover = FALSE;
- client->frame->shade_hover = FALSE;
- client->frame->iconify_hover = FALSE;
+ client->frame->max_hover =
+ client->frame->desk_hover =
+ client->frame->shade_hover =
+ client->frame->iconify_hover =
client->frame->close_hover = FALSE;
- frame_adjust_state(client->frame);
+ if (e->xcrossing.mode == NotifyGrab) {
+ client->frame->max_press =
+ client->frame->desk_press =
+ client->frame->shade_press =
+ client->frame->iconify_press =
+ client->frame->close_press = FALSE;
}
break;
- case OB_FRAME_CONTEXT_MAXIMIZE:
- client->frame->max_hover = FALSE;
- client->frame->max_press = FALSE;
- frame_adjust_state(client->frame);
- break;
- case OB_FRAME_CONTEXT_ALLDESKTOPS:
- client->frame->desk_hover = FALSE;
- client->frame->desk_press = FALSE;
- frame_adjust_state(client->frame);
- break;
- case OB_FRAME_CONTEXT_SHADE:
- client->frame->shade_hover = FALSE;
- client->frame->shade_press = FALSE;
- frame_adjust_state(client->frame);
- break;
- case OB_FRAME_CONTEXT_ICONIFY:
- client->frame->iconify_hover = FALSE;
- client->frame->iconify_press = FALSE;
- frame_adjust_state(client->frame);
- break;
- case OB_FRAME_CONTEXT_CLOSE:
- client->frame->close_hover = FALSE;
- client->frame->close_press = FALSE;
- frame_adjust_state(client->frame);
- break;
case OB_FRAME_CONTEXT_FRAME:
/* When the mouse leaves an animating window, don't use the
corresponding enter events. Pretend like the animating window
}
break;
default:
+ but = context_to_button(client->frame, con, FALSE);
+ if (but) {
+ *but = FALSE;
+ if (e->xcrossing.mode == NotifyGrab) {
+ but = context_to_button(client->frame, con, TRUE);
+ *but = FALSE;
+ }
+ frame_adjust_state(client->frame);
+ }
break;
}
break;
con = frame_context(client, e->xcrossing.window,
e->xcrossing.x, e->xcrossing.y);
switch (con) {
- case OB_FRAME_CONTEXT_MAXIMIZE:
- client->frame->max_hover = TRUE;
- client->frame->max_press = (con == pcon);
- frame_adjust_state(client->frame);
- break;
- case OB_FRAME_CONTEXT_ALLDESKTOPS:
- client->frame->desk_hover = TRUE;
- client->frame->desk_press = (con == pcon);
- frame_adjust_state(client->frame);
- break;
- case OB_FRAME_CONTEXT_SHADE:
- client->frame->shade_hover = TRUE;
- client->frame->shade_press = (con == pcon);
- frame_adjust_state(client->frame);
- break;
- case OB_FRAME_CONTEXT_ICONIFY:
- client->frame->iconify_hover = TRUE;
- client->frame->iconify_press = (con == pcon);
- frame_adjust_state(client->frame);
- break;
- case OB_FRAME_CONTEXT_CLOSE:
- client->frame->close_hover = TRUE;
- client->frame->close_press = (con == pcon);
- frame_adjust_state(client->frame);
- break;
case OB_FRAME_CONTEXT_FRAME:
if (grab_on_keyboard())
break;
}
break;
default:
+ but = context_to_button(client->frame, con, FALSE);
+ if (but) {
+ *but = TRUE;
+ if (e->xcrossing.mode == NotifyUngrab) {
+ but = context_to_button(client->frame, con, TRUE);
+ *but = (con == pcon);
+ }
+ frame_adjust_state(client->frame);
+ }
break;
}
break;
RECT_TO_DIMS(client->area, x, y, w, h);
ob_debug("ConfigureRequest for \"%s\" desktop %d wmstate %d "
- "visibile %d\n"
+ "visible %d\n"
" x %d y %d w %d h %d b %d\n",
client->title,
screen_desktop, client->wmstate, client->frame->visible,
/* if the border width is changing then that is the same
as requesting a resize, but we don't actually change
the client's border, so it will change their root
- coordiantes (since they include the border width) and
+ coordinates (since they include the border width) and
we need to a notify then */
move = TRUE;
}
-
if (e->xconfigurerequest.value_mask & CWStackMode) {
ObClient *sibling = NULL;
gulong ignore_start;
(e->xconfigurerequest.value_mask & CWWidth) ||
(e->xconfigurerequest.value_mask & CWHeight))
{
+ /* don't allow clients to move shaded windows (fvwm does this)
+ */
if (e->xconfigurerequest.value_mask & CWX) {
- /* don't allow clients to move shaded windows (fvwm does this)
- */
if (!client->shaded)
x = e->xconfigurerequest.x;
move = TRUE;
}
if (e->xconfigurerequest.value_mask & CWY) {
- /* don't allow clients to move shaded windows (fvwm does this)
- */
if (!client->shaded)
y = e->xconfigurerequest.y;
move = TRUE;
}
{
- gint lw,lh;
+ gint lw, lh;
client_try_configure(client, &x, &y, &w, &h, &lw, &lh, FALSE);
if ((e->xconfigurerequest.value_mask & CWWidth &&
!(e->xconfigurerequest.value_mask & CWX)))
client_gravity_resize_w(client, &x, client->area.width, w);
- /* if y was not given, then use gravity to figure out the new
- y. the reference point should not be moved */
+ /* same for y */
if ((e->xconfigurerequest.value_mask & CWHeight &&
!(e->xconfigurerequest.value_mask & CWY)))
client_gravity_resize_h(client, &y, client->area.height,h);
msgtype = e->xclient.message_type;
if (msgtype == prop_atoms.wm_change_state) {
- /* compress changes into a single change */
- while (XCheckTypedWindowEvent(ob_display, client->window,
- e->type, &ce)) {
- /* XXX: it would be nice to compress ALL messages of a
- type, not just messages in a row without other
- message types between. */
- if (ce.xclient.message_type != msgtype) {
- XPutBackEvent(ob_display, &ce);
- break;
- }
- e->xclient = ce.xclient;
- }
+ compress_client_message_event(e, &ce, client->window, msgtype);
client_set_wm_state(client, e->xclient.data.l[0]);
} else if (msgtype == prop_atoms.net_wm_desktop) {
- /* compress changes into a single change */
- while (XCheckTypedWindowEvent(ob_display, client->window,
- e->type, &ce)) {
- /* XXX: it would be nice to compress ALL messages of a
- type, not just messages in a row without other
- message types between. */
- if (ce.xclient.message_type != msgtype) {
- XPutBackEvent(ob_display, &ce);
- break;
- }
- e->xclient = ce.xclient;
- }
+ compress_client_message_event(e, &ce, client->window, msgtype);
if ((unsigned)e->xclient.data.l[0] < screen_num_desktops ||
(unsigned)e->xclient.data.l[0] == DESKTOP_ALL)
client_set_desktop(client, (unsigned)e->xclient.data.l[0],
(e->xclient.data.l[0] == 2 ? "user" : "INVALID"))));
/* XXX make use of data.l[2] !? */
if (e->xclient.data.l[0] == 1 || e->xclient.data.l[0] == 2) {
- /* don't use the user's timestamp for client_focus, cuz if it's
- an old broken timestamp (happens all the time) then focus
- won't move even though we're trying to move it
- event_curtime = e->xclient.data.l[1];*/
+ event_curtime = e->xclient.data.l[1];
if (e->xclient.data.l[1] == 0)
ob_debug_type(OB_DEBUG_APP_BUGS,
"_NET_ACTIVE_WINDOW message for window %s is"
} else
ob_debug_type(OB_DEBUG_APP_BUGS,
"_NET_ACTIVE_WINDOW message for window %s is "
- "missing source indication\n");
- client_activate(client, TRUE, TRUE, TRUE,
+ "missing source indication\n", client->title);
+ client_activate(client, FALSE, TRUE, TRUE,
(e->xclient.data.l[0] == 0 ||
e->xclient.data.l[0] == 2));
} else if (msgtype == prop_atoms.net_wm_moveresize) {
if (e->xclient.data.l[0] & 1 << 11) {
h = e->xclient.data.l[4];
- /* if y was not given, then use gravity to figure out the new
- y. the reference point should not be moved */
+ /* same for y */
if (!(e->xclient.data.l[0] & 1 << 9))
client_gravity_resize_h(client, &y, client->area.height,h);
}
reconfigure the window if it needs to. emacs will update its
normal hints every time it receives a conigurenotify */
client_reconfigure(client, FALSE);
+ } else if (msgtype == prop_atoms.motif_wm_hints) {
+ client_get_mwm_hints(client);
+ /* This can override some mwm hints */
+ client_get_type_and_transientness(client);
+
+ /* Apply the changes to the window */
+ client_setup_decor_and_functions(client, TRUE);
} else if (msgtype == XA_WM_HINTS) {
client_update_wmhints(client);
} else if (msgtype == XA_WM_TRANSIENT_FOR) {
client_update_protocols(client);
client_setup_decor_and_functions(client, TRUE);
}
- else if (msgtype == prop_atoms.net_wm_strut) {
- client_update_strut(client);
- }
- else if (msgtype == prop_atoms.net_wm_strut_partial) {
+ else if (msgtype == prop_atoms.net_wm_strut ||
+ msgtype == prop_atoms.net_wm_strut_partial) {
client_update_strut(client);
}
else if (msgtype == prop_atoms.net_wm_icon) {
default:
;
#ifdef SHAPE
- if (extensions_shape && e->type == extensions_shape_event_basep) {
- client->shaped = ((XShapeEvent*)e)->shaped;
- frame_adjust_shape(client->frame);
+ {
+ int kind;
+ if (extensions_shape && e->type == extensions_shape_event_basep) {
+ switch (((XShapeEvent*)e)->kind) {
+ case ShapeBounding:
+ case ShapeClip:
+ client->shaped = ((XShapeEvent*)e)->shaped;
+ kind = ShapeBounding;
+ break;
+ case ShapeInput:
+ client->shaped_input = ((XShapeEvent*)e)->shaped;
+ kind = ShapeInput;
+ break;
+ }
+ frame_adjust_shape_kind(client->frame, kind);
+ }
}
#endif
}
dock_remove(app, TRUE);
break;
case DestroyNotify:
- dock_remove(app, FALSE);
- break;
case ReparentNotify:
dock_remove(app, FALSE);
break;
else if (keycode == ob_keycode(OB_KEY_LEFT)) {
/* Left goes to the parent menu */
- menu_frame_select(frame, NULL, TRUE);
+ if (frame->parent)
+ menu_frame_select(frame, NULL, TRUE);
ret = TRUE;
}
XSync(ob_display, FALSE);
}
-gboolean event_time_after(Time t1, Time t2)
+gboolean event_time_after(guint32 t1, guint32 t2)
{
g_assert(t1 != CurrentTime);
g_assert(t2 != CurrentTime);
- http://tronche.com/gui/x/xlib/input/pointer-grabbing.html
*/
- /* TIME_HALF is half of the number space of a Time type variable */
-#define TIME_HALF (Time)(1 << (sizeof(Time)*8-1))
+ /* TIME_HALF is not half of the number space of a Time type variable.
+ * Rather, it is half the number space of a timestamp value, which is
+ * always 32 bits. */
+#define TIME_HALF (guint32)(1 << 31)
if (t2 >= TIME_HALF)
/* t2 is in the second half so t1 might wrap around and be smaller than
projects / mikachu / openbox.git / blobdiff