gpointer data;
} ClientCallback;
-GList *client_list = NULL;
+GList *client_list = NULL;
static GSList *client_destroy_notifies = NULL;
static RrImage *client_default_icon = NULL;
"Not focusing the window because the user is "
"working in another window");
}
- /* If its a transient (and its parents aren't focused) */
+ /* If it's a transient (and its parents aren't focused) */
else if (client_has_parent(self)) {
activate = FALSE;
ob_debug_type(OB_DEBUG_FOCUS,
if (!activate) {
ob_debug_type(OB_DEBUG_FOCUS,
"Focus stealing prevention activated for %s at "
- "time %u (last user interactioon time %u)",
+ "time %u (last user interaction time %u)",
self->title, map_time, event_last_user_time);
/* if the client isn't focused, then hilite it so the user
knows it is there */
void client_unmanage_all(void)
{
- while (client_list != NULL)
+ while (client_list)
client_unmanage(client_list->data);
}
/* This makes sure windows aren't entirely outside of the screen so you
can't see them at all.
- It makes sure 10% of the window is on the screen at least. At don't
+ It makes sure 10% of the window is on the screen at least. And don't
let it move itself off the top of the screen, which would hide the
titlebar on you. (The user can still do this if they want too, it's
only limiting the application.
static void client_get_shaped(ObClient *self)
{
self->shaped = FALSE;
-#ifdef SHAPE
+#ifdef SHAPE
if (obt_display_extension_shape) {
gint foo;
guint ufoo;
XShapeQueryExtents(obt_display, self->window, &s, &foo,
&foo, &ufoo, &ufoo, &foo, &foo, &foo, &ufoo,
&ufoo);
- self->shaped = (s != 0);
+ self->shaped = !!s;
}
#endif
}
gboolean trangroup = FALSE;
if (XGetTransientForHint(obt_display, self->window, &t)) {
- if (t != self->window) { /* cant be transient to itself! */
+ if (t != self->window) { /* can't be transient to itself! */
ObWindow *tw = window_find(t);
- /* if this happens then we need to check for it*/
+ /* if this happens then we need to check for it */
g_assert(tw != CLIENT_AS_WINDOW(self));
if (tw && WINDOW_IS_CLIENT(tw)) {
/* watch out for windows with a parent that is something
/* If we are now transient for a single window we need to add ourselves to
its children
- WARNING: Cyclical transient ness is possible if two windows are
+ WARNING: Cyclical transient-ness is possible if two windows are
transient for eachother.
*/
else if (newparent &&
}
/** If we change our group transient-ness, our children change their
- effect group transient-ness, which affects how they relate to other
+ effective group transient-ness, which affects how they relate to other
group windows **/
for (it = self->transients; it; it = g_slist_next(it)) {
if (client_focused(self)) {
screen_install_colormap(self, FALSE); /* uninstall old one */
self->colormap = colormap;
- screen_install_colormap(self, FALSE); /* install new one */
+ screen_install_colormap(self, TRUE); /* install new one */
} else
self->colormap = colormap;
}
{
XWMHints *hints;
- /* assume a window takes input if it doesnt specify */
+ /* assume a window takes input if it doesn't specify */
self->can_focus = TRUE;
if ((hints = XGetWMHints(obt_display, self->window)) != NULL) {
ObGroup *oldgroup = self->group;
/* remove from the old group if there was one */
- if (self->group != NULL) {
+ if (self->group) {
group_remove(self->group, self);
self->group = NULL;
}
*/
data = g_strdup("");
} else
- data = g_strdup("Unnamed Window");
+ data = g_strdup(_("Unnamed Window"));
}
}
self->original_title = g_strdup(data);
if (!client_should_show(self)) {
if (self == focus_client) {
- /* if there is a grab going on, then we need to cancel it. if we
- move focus during the grab, applications will get
- NotifyWhileGrabbed events and ignore them !
-
- actions should not rely on being able to move focus during an
- interactive grab.
- */
event_cancel_all_key_grabs();
}
Rect desired = {*x, *y, *w, *h};
frame_rect_to_frame(self->frame, &desired);
- /* make the frame recalculate its dimentions n shit without changing
+ /* make the frame recalculate its dimensions n shit without changing
anything visible for real, this way the constraints below can work with
the updated frame dimensions. */
frame_adjust_area(self->frame, FALSE, TRUE, TRUE);
/* gets the client's position */
frame_frame_gravity(self->frame, x, y);
- /* work within the prefered sizes given by the window */
+ /* work within the preferred sizes given by the window */
if (!(*w == self->area.width && *h == self->area.height)) {
gint basew, baseh, minw, minh;
gint incw, inch;
minh = self->base_size.height;
}
+ /* This comment is no longer true */
/* if this is a user-requested resize, then check against min/max
sizes */
if (fs) {
self->pre_fullscreen_area = self->area;
/* if the window is maximized, its area isn't all that meaningful.
- save it's premax area instead. */
+ save its premax area instead. */
if (self->max_horz) {
self->pre_fullscreen_area.x = self->pre_max_area.x;
self->pre_fullscreen_area.width = self->pre_max_area.width;
GSList *it;
gboolean changed = FALSE;
-
if (self->iconic != iconic) {
ob_debug("%sconifying window: 0x%lx", (iconic ? "I" : "Uni"),
self->window);
/* check if we're already prompting */
if (!self->kill_prompt) {
ObPromptAnswer answers[] = {
- { _("Cancel"), OB_KILL_RESULT_NO },
- { _("Force Exit"), OB_KILL_RESULT_YES }
+ { 0, OB_KILL_RESULT_NO },
+ { 0, OB_KILL_RESULT_YES }
};
gchar *m;
+ const gchar *y;
if (client_on_localhost(self)) {
const gchar *sig;
sig = "kill";
m = g_strdup_printf
- (_("The window \"%s\" does not seem to be responding. Do you want to force it to exit by sending the %s signal?"), self->original_title, sig);
+ (_("The window \"%s\" does not seem to be responding. Do you want to force it to exit by sending the %s signal?"),
+ self->original_title, sig);
+ y = _("End Process");
}
- else
+ else {
m = g_strdup_printf
- (_("The window \"%s\" does not seem to be responding. Do you want to disconnect it from the X server?"), self->original_title);
-
+ (_("The window \"%s\" does not seem to be responding. Do you want to disconnect it from the X server?"),
+ self->original_title);
+ y = _("Disconnect");
+ }
+ /* set the dialog buttons' text */
+ answers[0].text = _("Cancel"); /* "no" */
+ answers[1].text = y; /* "yes" */
self->kill_prompt = prompt_new(m, answers,
sizeof(answers)/sizeof(answers[0]),
go moving on us */
event_halt_focus_delay();
- /* if there is a grab going on, then we need to cancel it. if we move
- focus during the grab, applications will get NotifyWhileGrabbed events
- and ignore them !
-
- actions should not rely on being able to move focus during an
- interactive grab.
- */
event_cancel_all_key_grabs();
obt_display_ignore_errors(TRUE);
client_focus(self);
}
+/* this function exists to map to the client_activate message in the ewmh,
+ the user arg is unused because nobody uses it correctly anyway. */
void client_activate(ObClient *self, gboolean here, gboolean raise,
gboolean unshade, gboolean user)
{
return self == focus_client;
}
-
-
RrImage* client_icon(ObClient *self)
{
RrImage *ret = NULL;
}
}
+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(obt_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(obt_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;
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);
- 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);
+ but = context_to_button(client->frame, con, TRUE);
+ if (but) {
+ *but = (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;
+ 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_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;
- 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 */
- 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;
+ client->frame->max_hover =
+ client->frame->desk_hover =
+ client->frame->shade_hover =
+ client->frame->iconify_hover =
+ client->frame->close_hover = FALSE;
if (e->xcrossing.mode == NotifyGrab) {
- client->frame->max_press = FALSE;
- client->frame->desk_press = FALSE;
- client->frame->shade_press = FALSE;
- client->frame->iconify_press = FALSE;
- client->frame->close_press = FALSE;
+ client->frame->max_press =
+ client->frame->desk_press =
+ client->frame->shade_press =
+ client->frame->iconify_press =
+ client->frame->close_press = FALSE;
}
- frame_adjust_state(client->frame);
- break;
- case OB_FRAME_CONTEXT_MAXIMIZE:
- client->frame->max_hover = FALSE;
- if (e->xcrossing.mode == NotifyGrab)
- client->frame->max_press = FALSE;
- frame_adjust_state(client->frame);
- break;
- case OB_FRAME_CONTEXT_ALLDESKTOPS:
- client->frame->desk_hover = FALSE;
- if (e->xcrossing.mode == NotifyGrab)
- client->frame->desk_press = FALSE;
- frame_adjust_state(client->frame);
- break;
- case OB_FRAME_CONTEXT_SHADE:
- client->frame->shade_hover = FALSE;
- if (e->xcrossing.mode == NotifyGrab)
- client->frame->shade_press = FALSE;
- frame_adjust_state(client->frame);
- break;
- case OB_FRAME_CONTEXT_ICONIFY:
- client->frame->iconify_hover = FALSE;
- if (e->xcrossing.mode == NotifyGrab)
- client->frame->iconify_press = FALSE;
- frame_adjust_state(client->frame);
- break;
- case OB_FRAME_CONTEXT_CLOSE:
- client->frame->close_hover = FALSE;
- if (e->xcrossing.mode == NotifyGrab)
- 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
}
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;
- if (e->xcrossing.mode == NotifyUngrab)
- client->frame->max_press = (con == pcon);
- frame_adjust_state(client->frame);
- break;
- case OB_FRAME_CONTEXT_ALLDESKTOPS:
- client->frame->desk_hover = TRUE;
- if (e->xcrossing.mode == NotifyUngrab)
- client->frame->desk_press = (con == pcon);
- frame_adjust_state(client->frame);
- break;
- case OB_FRAME_CONTEXT_SHADE:
- client->frame->shade_hover = TRUE;
- if (e->xcrossing.mode == NotifyUngrab)
- client->frame->shade_press = (con == pcon);
- frame_adjust_state(client->frame);
- break;
- case OB_FRAME_CONTEXT_ICONIFY:
- client->frame->iconify_hover = TRUE;
- if (e->xcrossing.mode == NotifyUngrab)
- client->frame->iconify_press = (con == pcon);
- frame_adjust_state(client->frame);
- break;
- case OB_FRAME_CONTEXT_CLOSE:
- client->frame->close_hover = TRUE;
- if (e->xcrossing.mode == NotifyUngrab)
- 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",
+ "visible %d",
client->title,
screen_desktop, client->wmstate, client->frame->visible);
ob_debug(" x %d y %d w %d h %d b %d",
/* 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;
}
(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 == OBT_PROP_ATOM(WM_CHANGE_STATE)) {
- /* compress changes into a single change */
- while (XCheckTypedWindowEvent(obt_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(obt_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 == OBT_PROP_ATOM(NET_WM_DESKTOP)) {
- /* compress changes into a single change */
- while (XCheckTypedWindowEvent(obt_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(obt_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],
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);
}
client_update_protocols(client);
client_setup_decor_and_functions(client, TRUE);
}
- else if (msgtype == OBT_PROP_ATOM(NET_WM_STRUT)) {
- client_update_strut(client);
- }
- else if (msgtype == OBT_PROP_ATOM(NET_WM_STRUT_PARTIAL)) {
+ else if (msgtype == OBT_PROP_ATOM(NET_WM_STRUT) ||
+ msgtype == OBT_PROP_ATOM(NET_WM_STRUT_PARTIAL)) {
client_update_strut(client);
}
else if (msgtype == OBT_PROP_ATOM(NET_WM_ICON)) {
dock_unmanage(app, TRUE);
break;
case DestroyNotify:
- dock_unmanage(app, FALSE);
- break;
case ReparentNotify:
dock_unmanage(app, FALSE);
break;
projects / chaz / openbox / commitdiff
