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

config option for icons in desktop menus

Browse source
This commit is contained in:
Mikael Magnusson 2004-10-31 10:10:33 +00:00
parent b27343a314
commit 10805a4764
5 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/rc.xml.in
View file

@ -54,6 +54,7 @@
<floatingY>0</floatingY> <floatingY>0</floatingY>
<autoHide>no</autoHide> <autoHide>no</autoHide>
<hideDelay>300</hideDelay> <hideDelay>300</hideDelay>
<desktopMenuIcons>yes</desktopMenuIcons>
<moveButton>A-Left</moveButton> <moveButton>A-Left</moveButton>
</dock> </dock>

4
data/rc.xsd
View file

@ -28,6 +28,9 @@
update hideTimeout to hideDelay update hideTimeout to hideDelay
Thu Apr 22 12:33:11 UTC 2004 - mikachu(a)openbox.org Thu Apr 22 12:33:11 UTC 2004 - mikachu(a)openbox.org
add diffs between 3.1 and 3.2 add diffs between 3.1 and 3.2
Sun Oct 31 10:08:34 UTC 2004 - mikachu(a)openbox.org
we haven't remembered to update this changelog in a while,
adding desktopMenuIcons.
--> -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://openbox.org/" targetNamespace="http://openbox.org/"
@ -124,6 +127,7 @@
<xs:element name="floatingY" type="xs:integer"/> <xs:element name="floatingY" type="xs:integer"/>
<xs:element name="autoHide" type="ob:yesorno"/> <xs:element name="autoHide" type="ob:yesorno"/>
<xs:element name="hideDelay" type="xs:integer"/> <xs:element name="hideDelay" type="xs:integer"/>
<xs:element name="disktopMenuIcons" type="ob:yesorno"/>
<xs:element name="moveButton" type="ob:button"/> <xs:element name="moveButton" type="ob:button"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>

2
openbox/client_list_menu.c
View file

@ -73,7 +73,7 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
e = menu_add_normal(menu, i, e = menu_add_normal(menu, i,
(c->iconic ? c->icon_title : c->title), acts); (c->iconic ? c->icon_title : c->title), acts);
if ((icon = client_icon(c, 32, 32))) { if (config_menu_client_list_icons && (icon = client_icon(c, 32, 32))) {
e->data.normal.icon_width = icon->width; e->data.normal.icon_width = icon->width;
e->data.normal.icon_height = icon->height; e->data.normal.icon_height = icon->height;
e->data.normal.icon_data = icon->data; e->data.normal.icon_data = icon->data;

4
openbox/config.c
View file

@ -66,6 +66,7 @@ gint config_mouse_dclicktime;
gboolean config_menu_warppointer; gboolean config_menu_warppointer;
gboolean config_menu_xorstyle; gboolean config_menu_xorstyle;
guint config_menu_hide_delay; guint config_menu_hide_delay;
gboolean config_menu_client_list_icons;
GSList *config_menu_files; GSList *config_menu_files;
@ -408,6 +409,8 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
config_menu_xorstyle = parse_bool(doc, n); config_menu_xorstyle = parse_bool(doc, n);
if ((n = parse_find_node("hideDelay", node))) if ((n = parse_find_node("hideDelay", node)))
config_menu_hide_delay = parse_int(doc, n); config_menu_hide_delay = parse_int(doc, n);
if ((n = parse_find_node("desktopMenuIcons", node)))
config_menu_client_list_icons = parse_int(doc, n);
} }
} }
@ -597,6 +600,7 @@ void config_startup(ObParseInst *i)
config_menu_warppointer = TRUE; config_menu_warppointer = TRUE;
config_menu_xorstyle = TRUE; config_menu_xorstyle = TRUE;
config_menu_hide_delay = 250; config_menu_hide_delay = 250;
config_menu_client_list_icons = TRUE;
config_menu_files = NULL; config_menu_files = NULL;
parse_register(i, "menu", parse_menu, NULL); parse_register(i, "menu", parse_menu, NULL);

2
openbox/config.h
View file

@ -113,6 +113,8 @@ extern gboolean config_menu_warppointer;
extern gboolean config_menu_xorstyle; extern gboolean config_menu_xorstyle;
/*! delay for hiding menu when opening */ /*! delay for hiding menu when opening */
extern guint config_menu_hide_delay; extern guint config_menu_hide_delay;
/*! show icons in client_list_menu */
extern gboolean config_menu_client_list_icons;
/*! User-specified menu files */ /*! User-specified menu files */
extern GSList *config_menu_files; extern GSList *config_menu_files;