X-Git-Url: https://git.subgeniuskitty.com/xmenu/.git/blobdiff_plain/486784ca8e5b228f81f125ea22d1a35ad711414c..70f5db0f88fcc7525dd3b71fc1408cb6e9cb36f5:/xmenu.h diff --git a/xmenu.h b/xmenu.h index 04a4ddf..a85b44c 100644 --- a/xmenu.h +++ b/xmenu.h @@ -42,7 +42,6 @@ struct Config { /* the value below is computed by xmenu */ int iconsize; - int screenw, screenh; /* screen width and height */ }; /* draw context structure */ @@ -54,6 +53,7 @@ struct DC { GC gc; + FcPattern *pattern; XftFont **fonts; size_t nfonts; }; @@ -65,7 +65,6 @@ struct Item { 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 */ @@ -73,7 +72,7 @@ struct Item { Imlib_Image icon; }; -/* monitor and cursor geometry structure */ +/* monitor geometry structure */ struct Monitor { int x, y, w, h; /* monitor geometry */ }; @@ -85,6 +84,7 @@ struct Menu { struct Item *list; /* list of items contained by the menu */ struct Item *selected; /* item currently selected in the menu */ int x, y, w, h; /* menu geometry */ + int hasicon; /* whether the menu has item with icons */ int drawn; /* whether the menu was already drawn */ unsigned level; /* menu level relative to root */ Window win; /* menu window to map on the screen */