projects
/
xmenu
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
conform code to my new coding style
[xmenu]
/
xmenu.h
diff --git
a/xmenu.h
b/xmenu.h
index
909b091
..
e29df02
100644
(file)
--- a/
xmenu.h
+++ b/
xmenu.h
@@
-1,8
+1,7
@@
#define PROGNAME "xmenu"
#define PROGNAME "xmenu"
-/* macros for keyboard menu navigation */
-#define ITEMPREV 0
-#define ITEMNEXT 1
+/* enum for keyboard menu navigation */
+enum { ITEMPREV, ITEMNEXT, ITEMFIRST, ITEMLAST };
/* macros */
#define LEN(x) (sizeof (x) / sizeof (x[0]))
/* macros */
#define LEN(x) (sizeof (x) / sizeof (x[0]))
@@
-53,6
+52,7
@@
struct DC {
GC gc;
GC gc;
+ FcPattern *pattern;
XftFont **fonts;
size_t nfonts;
};
XftFont **fonts;
size_t nfonts;
};
@@
-64,7
+64,6
@@
struct Item {
char *file; /* filename of the icon */
int y; /* item y position relative to menu */
int h; /* item height */
char *file; /* filename of the icon */
int y; /* item y position relative to menu */
int h; /* item height */
- size_t labellen; /* strlen(label) */
struct Item *prev; /* previous item */
struct Item *next; /* next item */
struct Menu *submenu; /* submenu spawned by clicking on item */
struct Item *prev; /* previous item */
struct Item *next; /* next item */
struct Menu *submenu; /* submenu spawned by clicking on item */
@@
-72,7
+71,7
@@
struct Item {
Imlib_Image icon;
};
Imlib_Image icon;
};
-/* monitor
and cursor
geometry structure */
+/* monitor geometry structure */
struct Monitor {
int x, y, w, h; /* monitor geometry */
};
struct Monitor {
int x, y, w, h; /* monitor geometry */
};