From c11a7c3ce1b5ad56d43db977ed44f60dfb56ab45 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Wed, 27 Feb 2008 01:04:22 +0100 Subject: Pass TRUE instead of FALSE to do what the comment says. --- openbox/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'openbox/client.c') diff --git a/openbox/client.c b/openbox/client.c index 26b8dc69..4d63f058 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -1607,7 +1607,7 @@ void client_update_colormap(ObClient *self, Colormap colormap) 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; } -- cgit v1.2.3 From 7753be1cb69da2683258ba08d1395986e77bac4c Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Wed, 27 Feb 2008 03:51:52 +0100 Subject: Make "Unnamed Window" translatable. --- openbox/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'openbox/client.c') diff --git a/openbox/client.c b/openbox/client.c index 4d63f058..115ea090 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -1993,7 +1993,7 @@ void client_update_title(ObClient *self) */ data = g_strdup(""); } else - data = g_strdup("Unnamed Window"); + data = g_strdup(_("Unnamed Window")); } } self->original_title = g_strdup(data); -- cgit v1.2.3 From c38a756ae50616b1431e3137141189a5588654a0 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Wed, 27 Feb 2008 03:59:25 +0100 Subject: Fix some typos and style in client.c, and add a comment. Also moves a comment from many places into one place. --- openbox/client.c | 56 +++++++++++++++++++++----------------------------------- 1 file changed, 21 insertions(+), 35 deletions(-) (limited to 'openbox/client.c') diff --git a/openbox/client.c b/openbox/client.c index 115ea090..3a46f823 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -68,7 +68,7 @@ typedef struct gpointer data; } ClientCallback; -GList *client_list = NULL; +GList *client_list = NULL; static GSList *client_destroy_notifies = NULL; static RrImage *client_default_icon = NULL; @@ -541,7 +541,7 @@ void client_manage(Window window, ObPrompt *prompt) "Not focusing the window because the user is " "working in another window\n"); } - /* 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, @@ -582,7 +582,7 @@ void client_manage(Window window, ObPrompt *prompt) if (!activate) { ob_debug_type(OB_DEBUG_FOCUS, "Focus stealing prevention activated for %s at " - "time %u (last user interactioon time %u)\n", + "time %u (last user interaction time %u)\n", self->title, map_time, event_last_user_time); /* if the client isn't focused, then hilite it so the user knows it is there */ @@ -681,7 +681,7 @@ ObClient *client_fake_manage(Window window) void client_unmanage_all(void) { - while (client_list != NULL) + while (client_list) client_unmanage(client_list->data); } @@ -1086,7 +1086,7 @@ gboolean client_find_onscreen(ObClient *self, gint *x, gint *y, gint w, gint h, /* 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. @@ -1296,7 +1296,7 @@ static void client_get_state(ObClient *self) static void client_get_shaped(ObClient *self) { self->shaped = FALSE; -#ifdef SHAPE +#ifdef SHAPE if (extensions_shape) { gint foo; guint ufoo; @@ -1307,7 +1307,7 @@ static void client_get_shaped(ObClient *self) XShapeQueryExtents(ob_display, self->window, &s, &foo, &foo, &ufoo, &ufoo, &foo, &foo, &foo, &ufoo, &ufoo); - self->shaped = (s != 0); + self->shaped = !!s; } #endif } @@ -1319,13 +1319,13 @@ void client_update_transient_for(ObClient *self) gboolean trangroup = FALSE; if (XGetTransientForHint(ob_display, self->window, &t)) { - if (t != self->window) { /* cant be transient to itself! */ + if (t != self->window) { /* can't be transient to itself! */ target = g_hash_table_lookup(window_map, &t); - /* if this happens then we need to check for it*/ + /* if this happens then we need to check for it */ g_assert(target != self); if (target && !WINDOW_IS_CLIENT(target)) { - /* this can happen when a dialog is a child of - a dockapp, for example */ + /* watch out for windows with a parent that is something + different, like a dockapp for example */ target = NULL; } } @@ -1409,7 +1409,7 @@ static void client_update_transient_tree(ObClient *self, /* 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 && @@ -1448,7 +1448,7 @@ static void client_update_transient_tree(ObClient *self, } /** 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)) { @@ -1890,7 +1890,7 @@ void client_update_wmhints(ObClient *self) { 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(ob_display, self->window)) != NULL) { @@ -1922,7 +1922,7 @@ void client_update_wmhints(ObClient *self) 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; } @@ -2607,13 +2607,6 @@ gboolean client_hide(ObClient *self) 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(); } @@ -2826,7 +2819,7 @@ void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h, 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); @@ -2881,7 +2874,7 @@ void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h, /* 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; @@ -2911,6 +2904,7 @@ void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h, minh = self->base_size.height; } + /* This comment is no longer true */ /* if this is a user-requested resize, then check against min/max sizes */ @@ -3146,7 +3140,7 @@ void client_fullscreen(ObClient *self, gboolean fs) 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; @@ -3197,7 +3191,6 @@ static void client_iconify_recursive(ObClient *self, GSList *it; gboolean changed = FALSE; - if (self->iconic != iconic) { ob_debug("%sconifying window: 0x%lx\n", (iconic ? "I" : "Uni"), self->window); @@ -3812,13 +3805,6 @@ gboolean client_focus(ObClient *self) 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(); xerror_set_ignore(TRUE); @@ -3878,6 +3864,8 @@ static void client_present(ObClient *self, gboolean here, gboolean raise, 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) { @@ -3923,8 +3911,6 @@ gboolean client_focused(ObClient *self) return self == focus_client; } - - RrImage* client_icon(ObClient *self) { RrImage *ret = NULL; -- cgit v1.2.3 From 490ef3213a09ec2b202e9b511a92ce89f811af66 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Tue, 26 Feb 2008 22:22:35 -0500 Subject: Change the kill prompt buttons to "Cancel" and "End Process"/"Disconnect" (for local/remote apps) --- openbox/client.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'openbox/client.c') diff --git a/openbox/client.c b/openbox/client.c index 3a46f823..20a4dffc 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -3406,10 +3406,11 @@ static void client_prompt_kill(ObClient *self) /* 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; @@ -3420,12 +3421,19 @@ static void client_prompt_kill(ObClient *self) 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]), -- cgit v1.2.3