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

a more proper fix for the client list menu trying to activate a closed client, no difference on end result

Browse source
This commit is contained in:
Mikael Magnusson 2006-08-19 20:34:27 +00:00
parent 71ba050bfa
commit d77c8f62f2
4 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
openbox/client.c
View file

@ -2856,9 +2856,6 @@ void client_unfocus(ObClient *self)
void client_activate(ObClient *self, gboolean here)
{
/* This check is for the client_list_menu trying to activate
* a closed client. */
if (!g_list_find(client_list, self)) return;
if (client_normal(self) && screen_showing_desktop)
screen_show_desktop(FALSE);
if (self->iconic)

32
openbox/client_list_menu.c
View file

@ -154,10 +154,40 @@ static void self_update(ObMenuFrame *frame, gpointer data)
}
}
void client_list_menu_startup()
static void client_dest(ObClient *client, gpointer data)
{
/* This concise function removes all references to a closed
* client in the client_list_menu, so we don't have to check
* in client.c */
GSList *it;
for (it = desktop_menus; it; it = g_slist_next(it)) {
ObMenu *mit = it->data;
GList *eit;
for (eit = mit->entries; eit; eit = g_list_next(eit)) {
ObMenuEntry *meit = eit->data;
if (meit->type == OB_MENU_ENTRY_TYPE_NORMAL) {
ObAction *a = meit->data.normal.actions->data;
ObClient *c = a->data.any.c;
if (c == client)
a->data.any.c = NULL;
}
}
}
}
void client_list_menu_startup(gboolean reconfig)
{
ObMenu *menu;
if (!reconfig)
client_add_destructor(client_dest, NULL);
menu = menu_new(MENU_NAME, _("Desktops"), NULL);
menu_set_update_func(menu, self_update);
}
void client_list_menu_shutdown(gboolean reconfig)
{
if (!reconfig)
client_remove_destructor(client_dest);
}

3
openbox/client_list_menu.h
View file

@ -19,6 +19,7 @@
#ifndef ob__client_list_menu_h
#define ob__client_list_menu_h
void client_list_menu_startup();
void client_list_menu_startup(gboolean reconfig);
void client_list_menu_shutdown(gboolean reconfig);
#endif

4
openbox/menu.c
View file

@ -69,7 +69,7 @@ void menu_startup(gboolean reconfig)
menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
(GDestroyNotify)menu_destroy_hash_value);
client_list_menu_startup();
client_list_menu_startup(reconfig);
client_menu_startup();
menu_parse_inst = parse_startup();
@ -110,6 +110,8 @@ void menu_shutdown(gboolean reconfig)
parse_shutdown(menu_parse_inst);
menu_parse_inst = NULL;
client_list_menu_shutdown(reconfig);
menu_frame_hide_all();
g_hash_table_destroy(menu_hash);
menu_hash = NULL;