From a9567a816385f8f66ed0f827bb4af78cdb10cd6d Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 29 Aug 2003 07:56:49 +0000 Subject: move the client and client-list menus into the 'kernel' --- plugins/menu/client_list_menu.c | 132 -------------------------- plugins/menu/client_menu.c | 204 ---------------------------------------- 2 files changed, 336 deletions(-) delete mode 100644 plugins/menu/client_list_menu.c delete mode 100644 plugins/menu/client_menu.c (limited to 'plugins/menu') diff --git a/plugins/menu/client_list_menu.c b/plugins/menu/client_list_menu.c deleted file mode 100644 index 5b9637bf..00000000 --- a/plugins/menu/client_list_menu.c +++ /dev/null @@ -1,132 +0,0 @@ -#include "kernel/openbox.h" -#include "kernel/menu.h" -#include "kernel/menuframe.h" -#include "kernel/action.h" -#include "kernel/screen.h" -#include "kernel/client.h" -#include "kernel/focus.h" -#include "gettext.h" - -#include "render/theme.h" - -#include - -#define MENU_NAME "client-list-menu" - -typedef struct { - /* how many desktop menus we've made */ - guint desktops; -} MenuData; - -typedef struct { - guint desktop; -} DesktopData; - -void plugin_setup_config() { } - -static void desk_menu_update(ObMenuFrame *frame, gpointer data) -{ - ObMenu *menu = frame->menu; - DesktopData *d = data; - GList *it; - gint i; - - menu_clear_entries(menu->name); - - for (it = focus_order[d->desktop], i = 0; it; it = g_list_next(it), ++i) { - ObClient *c = it->data; - if (client_normal(c)) { - GSList *acts; - ObAction* act; - ObMenuEntry *e; - ObClientIcon *icon; - - act = action_from_string("activate"); - act->data.activate.c = c; - acts = g_slist_prepend(NULL, act); - e = menu_add_normal(menu->name, i, - (c->iconic ? c->icon_title : c->title), acts); - - if ((icon = client_icon(c, 32, 32))) { - e->data.normal.icon_width = icon->width; - e->data.normal.icon_height = icon->height; - e->data.normal.icon_data = icon->data; - } - } - } - -} - -/* executes it without changing the client in the actions, since we set that - when we make the actions! */ -static void desk_menu_execute(ObMenuEntry *self, gpointer data) -{ - GSList *it; - - for (it = self->data.normal.actions; it; it = g_slist_next(it)) - { - ObAction *act = it->data; - act->func(&act->data); - } -} - -static void desk_menu_destroy(ObMenu *menu, gpointer data) -{ - DesktopData *d = data; - - g_free(d); -} - -static void self_update(ObMenuFrame *frame, gpointer data) -{ - guint i; - MenuData *d = data; - - menu_clear_entries(MENU_NAME); - - for (i = 0; i < screen_num_desktops; ++i) { - gchar *name = g_strdup_printf("%s-%u", MENU_NAME, i); - DesktopData *data = g_new(DesktopData, 1); - - data->desktop = i; - menu_new(name, screen_desktop_names[i], data); - menu_set_update_func(name, desk_menu_update); - menu_set_execute_func(name, desk_menu_execute); - menu_set_destroy_func(name, desk_menu_destroy); - - menu_add_submenu(MENU_NAME, 0, name); - - g_free(name); - } - - d->desktops = MAX(d->desktops, screen_num_desktops); -} - -static void self_destroy(ObMenu *menu, gpointer data) -{ - MenuData *d = data; - guint i; - - for (i = 0; i < d->desktops; ++i) { - gchar *name = g_strdup_printf("%s-%u", MENU_NAME, i); - menu_free(name); - g_free(name); - } - g_free(d); -} - -void plugin_startup() -{ - MenuData *data; - - data = g_new(MenuData, 1); - data->desktops = 0; - menu_new(MENU_NAME, _("Desktops"), data); - menu_set_update_func(MENU_NAME, self_update); - menu_set_destroy_func(MENU_NAME, self_destroy); -} - -void plugin_shutdown() -{ - menu_free(MENU_NAME); -} diff --git a/plugins/menu/client_menu.c b/plugins/menu/client_menu.c deleted file mode 100644 index 0c2167c3..00000000 --- a/plugins/menu/client_menu.c +++ /dev/null @@ -1,204 +0,0 @@ -#include "kernel/debug.h" -#include "kernel/menu.h" -#include "kernel/menuframe.h" -#include "kernel/screen.h" -#include "kernel/client.h" -#include "kernel/openbox.h" -#include "kernel/frame.h" -#include "gettext.h" - -#include - -#define CLIENT_MENU_NAME "client-menu" -#define SEND_TO_MENU_NAME "client-send-to-menu" -#define LAYER_MENU_NAME "client-layer-menu" - -enum { - LAYER_TOP, - LAYER_NORMAL, - LAYER_BOTTOM -}; - -enum { - CLIENT_SEND_TO, - CLIENT_LAYER, - CLIENT_ICONIFY, - CLIENT_MAXIMIZE, - CLIENT_RAISE, - CLIENT_LOWER, - CLIENT_SHADE, - CLIENT_DECORATE, - CLIENT_MOVE, - CLIENT_RESIZE, - CLIENT_CLOSE -}; - -void plugin_setup_config() { } - -static void client_update(ObMenuFrame *frame, gpointer data) -{ - ObMenu *menu = frame->menu; - ObMenuEntry *e; - GList *it; - - frame->show_title = FALSE; - - for (it = menu->entries; it; it = g_list_next(it)) { - e = it->data; - if (e->type == OB_MENU_ENTRY_TYPE_NORMAL) - e->data.normal.enabled = !!frame->client; - } - - if (!frame->client) - return; - - e = menu_find_entry_id(menu, CLIENT_ICONIFY); - e->data.normal.enabled = frame->client->functions & OB_CLIENT_FUNC_ICONIFY; - - e = menu_find_entry_id(menu, CLIENT_MAXIMIZE); - e->data.normal.enabled =frame->client->functions & OB_CLIENT_FUNC_MAXIMIZE; - - e = menu_find_entry_id(menu, CLIENT_SHADE); - e->data.normal.enabled = frame->client->functions & OB_CLIENT_FUNC_SHADE; - - e = menu_find_entry_id(menu, CLIENT_MOVE); - e->data.normal.enabled = frame->client->functions & OB_CLIENT_FUNC_MOVE; - - e = menu_find_entry_id(menu, CLIENT_RESIZE); - e->data.normal.enabled = frame->client->functions & OB_CLIENT_FUNC_RESIZE; - - e = menu_find_entry_id(menu, CLIENT_CLOSE); - e->data.normal.enabled = frame->client->functions & OB_CLIENT_FUNC_CLOSE; -} - -static void layer_update(ObMenuFrame *frame, gpointer data) -{ - ObMenu *menu = frame->menu; - ObMenuEntry *e; - GList *it; - - for (it = menu->entries; it; it = g_list_next(it)) { - e = it->data; - if (e->type == OB_MENU_ENTRY_TYPE_NORMAL) - e->data.normal.enabled = !!frame->client; - } - - if (!frame->client) - return; - - e = menu_find_entry_id(menu, LAYER_TOP); - e->data.normal.enabled = !frame->client->above; - - e = menu_find_entry_id(menu, LAYER_NORMAL); - e->data.normal.enabled = (frame->client->above || frame->client->below); - - e = menu_find_entry_id(menu, LAYER_BOTTOM); - e->data.normal.enabled = !frame->client->below; -} - -static void send_to_update(ObMenuFrame *frame, gpointer data) -{ - ObMenu *menu = frame->menu; - guint i; - GSList *acts; - ObAction *act; - - menu_clear_entries(SEND_TO_MENU_NAME); - - if (!frame->client) - return; - - for (i = 0; i <= screen_num_desktops; ++i) { - gchar *name; - guint desk; - - if (i >= screen_num_desktops) { - menu_add_separator(CLIENT_MENU_NAME, -1); - - desk = DESKTOP_ALL; - name = _("All desktops"); - } else { - desk = i; - name = screen_desktop_names[i]; - } - - act = action_from_string("SendToDesktop"); - act->data.sendto.desk = desk; - act->data.sendto.follow = FALSE; - acts = g_slist_prepend(NULL, act); - menu_add_normal(SEND_TO_MENU_NAME, desk, name, acts); - - if (frame->client->desktop == desk) { - ObMenuEntry *e = menu_find_entry_id(menu, desk); - g_assert(e); - e->data.normal.enabled = FALSE; - } - } -} - -void plugin_startup() -{ - GSList *acts; - - menu_new(LAYER_MENU_NAME, _("Layer"), NULL); - menu_set_update_func(LAYER_MENU_NAME, layer_update); - - acts = g_slist_prepend(NULL, action_from_string("SendToTopLayer")); - menu_add_normal(LAYER_MENU_NAME, LAYER_TOP, _("Always on top"), acts); - - acts = g_slist_prepend(NULL, action_from_string("SendToNormalLayer")); - menu_add_normal(LAYER_MENU_NAME, LAYER_NORMAL, _("Normal"), acts); - - acts = g_slist_prepend(NULL, action_from_string("SendToBottomLayer")); - menu_add_normal(LAYER_MENU_NAME, LAYER_BOTTOM, _("Always on bottom"),acts); - - - menu_new(SEND_TO_MENU_NAME, _("Send to desktop"), NULL); - menu_set_update_func(SEND_TO_MENU_NAME, send_to_update); - - - menu_new(CLIENT_MENU_NAME, _("Client menu"), NULL); - menu_set_update_func(CLIENT_MENU_NAME, client_update); - - menu_add_submenu(CLIENT_MENU_NAME, CLIENT_SEND_TO, SEND_TO_MENU_NAME); - - menu_add_submenu(CLIENT_MENU_NAME, CLIENT_LAYER, LAYER_MENU_NAME); - - acts = g_slist_prepend(NULL, action_from_string("Iconify")); - menu_add_normal(CLIENT_MENU_NAME, CLIENT_ICONIFY, _("Iconify"), acts); - - acts = g_slist_prepend(NULL, action_from_string("ToggleMaximizeFull")); - menu_add_normal(CLIENT_MENU_NAME, CLIENT_MAXIMIZE, _("Maximize"), acts); - - acts = g_slist_prepend(NULL, action_from_string("Raise")); - menu_add_normal(CLIENT_MENU_NAME, CLIENT_RAISE, _("Raise to top"), acts); - - acts = g_slist_prepend(NULL, action_from_string("Lower")); - menu_add_normal(CLIENT_MENU_NAME, CLIENT_LOWER, _("Lower to bottom"),acts); - - acts = g_slist_prepend(NULL, action_from_string("ToggleShade")); - menu_add_normal(CLIENT_MENU_NAME, CLIENT_SHADE, _("Roll up/down"), acts); - - acts = g_slist_prepend(NULL, action_from_string("ToggleDecorations")); - menu_add_normal(CLIENT_MENU_NAME, CLIENT_DECORATE, _("Decorate"), acts); - - menu_add_separator(CLIENT_MENU_NAME, -1); - - acts = g_slist_prepend(NULL, action_from_string("KeyboardMove")); - menu_add_normal(CLIENT_MENU_NAME, CLIENT_MOVE, _("Move"), acts); - - acts = g_slist_prepend(NULL, action_from_string("KeyboardResize")); - menu_add_normal(CLIENT_MENU_NAME, CLIENT_RESIZE, _("Resize"), acts); - - menu_add_separator(CLIENT_MENU_NAME, -1); - - acts = g_slist_prepend(NULL, action_from_string("Close")); - menu_add_normal(CLIENT_MENU_NAME, CLIENT_CLOSE, _("Close"), acts); -} - -void plugin_shutdown() -{ - menu_free(LAYER_MENU_NAME); - menu_free(SEND_TO_MENU_NAME); - menu_free(CLIENT_MENU_NAME); -} -- cgit v1.2.3