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

add icons to the client-list-menu

Browse source
This commit is contained in:
Dana Jansens 2003-08-28 08:08:18 +00:00
parent 2c263fc823
commit 15386e86d4
3 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
openbox/menu.h
View file

@ -59,6 +59,11 @@ struct _ObNormalMenuEntry {
/* List of ObActions */ /* List of ObActions */
GSList *actions; GSList *actions;
/* Icon shit */
gint icon_width;
gint icon_height;
RrPixel32 *icon_data;
}; };
struct _ObSubmenuMenuEntry { struct _ObSubmenuMenuEntry {

17
openbox/menuframe.c
View file

@ -134,7 +134,6 @@ void menu_entry_frame_free(ObMenuEntryFrame *self)
void menu_frame_move(ObMenuFrame *self, gint x, gint y) void menu_frame_move(ObMenuFrame *self, gint x, gint y)
{ {
/* XXX screen constraints */
RECT_SET_POINT(self->area, x, y); RECT_SET_POINT(self->area, x, y);
XMoveWindow(ob_display, self->window, self->area.x, self->area.y); XMoveWindow(ob_display, self->window, self->area.x, self->area.y);
} }
@ -171,6 +170,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
RrAppearance *item_a, *text_a; RrAppearance *item_a, *text_a;
gint th; /* temp */ gint th; /* temp */
ObMenu *sub; ObMenu *sub;
ObClientIcon *icon;
item_a = ((self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && item_a = ((self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
!self->entry->data.normal.enabled) ? !self->entry->data.normal.enabled) ?
@ -230,11 +230,17 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
break; break;
} }
/* XXX draw icons */ if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
if (0) { self->entry->data.normal.icon_data)
{
XMoveResizeWindow(ob_display, self->icon, 0, 0, XMoveResizeWindow(ob_display, self->icon, 0, 0,
self->frame->item_h, self->frame->item_h); self->frame->item_h, self->frame->item_h);
/* XXX set the RGBA surface stuff */ self->a_icon->texture[0].data.rgba.width =
self->entry->data.normal.icon_width;
self->a_icon->texture[0].data.rgba.height =
self->entry->data.normal.icon_height;
self->a_icon->texture[0].data.rgba.data =
self->entry->data.normal.icon_data;
self->a_icon->surface.parent = item_a; self->a_icon->surface.parent = item_a;
self->a_icon->surface.parentx = 0; self->a_icon->surface.parentx = 0;
self->a_icon->surface.parenty = 0; self->a_icon->surface.parenty = 0;
@ -314,7 +320,8 @@ static void menu_frame_render(ObMenuFrame *self)
text_a->texture[0].data.text.string = e->entry->data.normal.label; text_a->texture[0].data.text.string = e->entry->data.normal.label;
RrMinsize(text_a, &tw, &th); RrMinsize(text_a, &tw, &th);
/* XXX has_icon = TRUE; */ if (e->entry->data.normal.icon_data)
has_icon = TRUE;
break; break;
case OB_MENU_ENTRY_TYPE_SUBMENU: case OB_MENU_ENTRY_TYPE_SUBMENU:
sub = e->entry->data.submenu.submenu; sub = e->entry->data.submenu.submenu;

14
plugins/menu/client_list_menu.c
View file

@ -29,20 +29,30 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
ObMenu *menu = frame->menu; ObMenu *menu = frame->menu;
DesktopData *d = data; DesktopData *d = data;
GList *it; GList *it;
gint i;
menu_clear_entries(menu->name); menu_clear_entries(menu->name);
for (it = focus_order[d->desktop]; it; it = g_list_next(it)) { for (it = focus_order[d->desktop], i = 0; it; it = g_list_next(it), ++i) {
ObClient *c = it->data; ObClient *c = it->data;
if (client_normal(c)) { if (client_normal(c)) {
GSList *acts; GSList *acts;
ObAction* act; ObAction* act;
ObMenuEntry *e;
ObClientIcon *icon;
act = action_from_string("activate"); act = action_from_string("activate");
act->data.activate.c = c; act->data.activate.c = c;
acts = g_slist_prepend(NULL, act); acts = g_slist_prepend(NULL, act);
menu_add_normal(menu->name, 0, menu_add_normal(menu->name, i,
(c->iconic ? c->icon_title : c->title), acts); (c->iconic ? c->icon_title : c->title), acts);
if ((icon = client_icon(c, 32, 32))) {
e = menu_find_entry_id(menu, i);
e->data.normal.icon_width = icon->width;
e->data.normal.icon_height = icon->height;
e->data.normal.icon_data = icon->data;
}
} }
} }