X-Git-Url: http://git.subgeniuskitty.com/xmenu/.git/blobdiff_plain/33376f5420409013cf1d67cfb8800067f63f12d3..6abae763c6cce70c9b753778b5e3742a7719715a:/xmenu.c diff --git a/xmenu.c b/xmenu.c index 6f75c2c..88d834f 100644 --- a/xmenu.c +++ b/xmenu.c @@ -1,100 +1,21 @@ +#include #include +#include #include #include #include +#include +#include #include #include +#include #include #include #include #include +#include #include - -#define PROGNAME "xmenu" -#define ITEMPREV 0 -#define ITEMNEXT 1 -#define IMGPADDING 8 - -/* macros */ -#define LEN(x) (sizeof (x) / sizeof (x[0])) -#define MAX(x,y) ((x)>(y)?(x):(y)) -#define MIN(x,y) ((x)<(y)?(x):(y)) - -/* color enum */ -enum {ColorFG, ColorBG, ColorLast}; - -/* draw context structure */ -struct DC { - XftColor normal[ColorLast]; - XftColor selected[ColorLast]; - XftColor border; - XftColor separator; - - GC gc; - XftFont *font; -}; - -/* menu geometry structure */ -struct Geometry { - int border; /* window border width */ - int separator; /* menu separator width */ - int itemw, itemh; /* item width and height */ - int cursx, cursy; /* cursor position */ - int screenw, screenh; /* screen width and height */ -}; - -/* menu item structure */ -struct Item { - char *label; /* string to be drawed on menu */ - char *output; /* string to be outputed when item is clicked */ - char *file; /* filename of the image */ - 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 */ - Imlib_Image image; -}; - -/* menu structure */ -struct Menu { - struct Menu *parent; /* parent menu */ - struct Item *caller; /* item that spawned the 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 */ - unsigned level; /* menu level relative to root */ - Drawable pixmap; /* pixmap to draw the menu on */ - XftDraw *draw; - Window win; /* menu window to map on the screen */ -}; - -/* functions declarations */ -static void getresources(void); -static void getcolor(const char *s, XftColor *color); -static void setupdc(void); -static void calcgeom(struct Geometry *geom); -static struct Item *allocitem(const char *label, const char *output, char *file); -static struct Menu *allocmenu(struct Menu *parent, struct Item *list, unsigned level); -static struct Menu *buildmenutree(unsigned level, const char *label, const char *output, char *file); -static struct Menu *parsestdin(void); -static void setupmenusize(struct Geometry *geom, struct Menu *menu); -static void setupmenupos(struct Geometry *geom, struct Menu *menu); -static void setupmenu(struct Geometry *geom, struct Menu *menu); -static void grabpointer(void); -static void grabkeyboard(void); -static struct Menu *getmenu(struct Menu *currmenu, Window win); -static struct Item *getitem(struct Menu *menu, int y); -static void mapmenu(struct Menu *currmenu); -static void drawseparator(struct Menu *menu, struct Item *item); -static void drawitem(struct Menu *menu, struct Item *item, XftColor *color); -static void drawmenu(struct Menu *currmenu); -static struct Item *itemcycle(struct Menu *currmenu, int direction); -static void run(struct Menu *currmenu); -static void freemenu(struct Menu *menu); -static void cleanup(void); -static void usage(void); +#include "xmenu.h" /* X stuff */ static Display *dpy; @@ -102,160 +23,282 @@ static int screen; static Visual *visual; static Window rootwin; static Colormap colormap; +static XrmDatabase xdb; +static char *xrm; static struct DC dc; - +static struct Monitor mon; +static Atom utf8string; +static Atom wmdelete; +static Atom netatom[NetLast]; + +/* flags */ +static int iflag = 0; /* whether to disable icons */ +static int rflag = 0; /* whether to disable right-click */ +static int mflag = 0; /* whether the user specified a monitor with -p */ +static int pflag = 0; /* whether the user specified a position with -p */ +static int wflag = 0; /* whether to let the window manager control XMenu */ + +/* include config variable */ #include "config.h" -/* xmenu: generate menu from stdin and print selected entry to stdout */ -int -main(int argc, char *argv[]) +/* show usage */ +static void +usage(void) { - struct Menu *rootmenu; - struct Geometry geom; - int ch; + (void)fprintf(stderr, "usage: xmenu [-irw] [-p position] [title]\n"); + exit(1); +} - while ((ch = getopt(argc, argv, "")) != -1) { - switch (ch) { - default: - usage(); - break; +/* parse position string from -p, + * put results on config.posx, config.posy, and config.monitor */ +static void +parseposition(char *optarg) +{ + long n; + char *s = optarg; + char *endp; + + n = strtol(s, &endp, 10); + if (errno == ERANGE || n > INT_MAX || n < 0 || endp == s || *endp != 'x') + goto error; + config.posx = n; + s = endp+1; + n = strtol(s, &endp, 10); + if (errno == ERANGE || n > INT_MAX || n < 0 || endp == s) + goto error; + config.posy = n; + if (*endp == ':') { + s = endp+1; + mflag = 1; + if (strncasecmp(s, "CUR", 3) == 0) { + config.monitor = -1; + endp = s+3; + } else { + n = strtol(s, &endp, 10); + if (errno == ERANGE || n > INT_MAX || n < 0 || endp == s || *endp != '\0') + goto error; + config.monitor = n; } + } else if (*endp != '\0') { + goto error; } - argc -= optind; - argv += optind; - - if (argc != 0) - usage(); - /* open connection to server and set X variables */ - if ((dpy = XOpenDisplay(NULL)) == NULL) - errx(1, "cannot open display"); - screen = DefaultScreen(dpy); - visual = DefaultVisual(dpy, screen); - rootwin = RootWindow(dpy, screen); - colormap = DefaultColormap(dpy, screen); - - /* imlib2 stuff */ - imlib_set_cache_size(2048 * 1024); - imlib_context_set_dither(1); - imlib_context_set_display(dpy); - imlib_context_set_visual(visual); - imlib_context_set_colormap(colormap); + return; - /* setup */ - getresources(); - setupdc(); - calcgeom(&geom); - - /* generate menus and set them up */ - rootmenu = parsestdin(); - if (rootmenu == NULL) - errx(1, "no menu generated"); - setupmenu(&geom, rootmenu); - - /* grab mouse and keyboard */ - grabpointer(); - grabkeyboard(); - - /* run event loop */ - run(rootmenu); - - /* freeing stuff */ - freemenu(rootmenu); - cleanup(); - - return 0; +error: + errx(1, "improper position: %s", optarg); } -/* read xrdb for configuration options */ +/* get configuration from X resources */ static void getresources(void) { - char *xrm; - long n; char *type; - XrmDatabase xdb; XrmValue xval; - XrmInitialize(); - if ((xrm = XResourceManagerString(dpy)) == NULL) + if (xrm == NULL || xdb == NULL) return; - xdb = XrmGetStringDatabase(xrm); - if (XrmGetResource(xdb, "xmenu.borderWidth", "*", &type, &xval) == True) - if ((n = strtol(xval.addr, NULL, 10)) > 0) - border_pixels = n; + GETNUM(config.border_pixels, xval.addr) if (XrmGetResource(xdb, "xmenu.separatorWidth", "*", &type, &xval) == True) - if ((n = strtol(xval.addr, NULL, 10)) > 0) - separator_pixels = n; - if (XrmGetResource(xdb, "xmenu.padding", "*", &type, &xval) == True) - if ((n = strtol(xval.addr, NULL, 10)) > 0) - padding_pixels = n; + GETNUM(config.separator_pixels, xval.addr) + if (XrmGetResource(xdb, "xmenu.height", "*", &type, &xval) == True) + GETNUM(config.height_pixels, xval.addr) if (XrmGetResource(xdb, "xmenu.width", "*", &type, &xval) == True) - if ((n = strtol(xval.addr, NULL, 10)) > 0) - width_pixels = n; + GETNUM(config.width_pixels, xval.addr) + if (XrmGetResource(xdb, "xmenu.gap", "*", &type, &xval) == True) + GETNUM(config.gap_pixels, xval.addr) if (XrmGetResource(xdb, "xmenu.background", "*", &type, &xval) == True) - background_color = strdup(xval.addr); + config.background_color = xval.addr; if (XrmGetResource(xdb, "xmenu.foreground", "*", &type, &xval) == True) - foreground_color = strdup(xval.addr); + config.foreground_color = xval.addr; if (XrmGetResource(xdb, "xmenu.selbackground", "*", &type, &xval) == True) - selbackground_color = strdup(xval.addr); + config.selbackground_color = xval.addr; if (XrmGetResource(xdb, "xmenu.selforeground", "*", &type, &xval) == True) - selforeground_color = strdup(xval.addr); + config.selforeground_color = xval.addr; if (XrmGetResource(xdb, "xmenu.separator", "*", &type, &xval) == True) - separator_color = strdup(xval.addr); + config.separator_color = xval.addr; if (XrmGetResource(xdb, "xmenu.border", "*", &type, &xval) == True) - border_color = strdup(xval.addr); + config.border_color = xval.addr; if (XrmGetResource(xdb, "xmenu.font", "*", &type, &xval) == True) - font = strdup(xval.addr); + config.font = xval.addr; + if (XrmGetResource(xdb, "xmenu.alignment", "*", &type, &xval) == True) { + if (strcasecmp(xval.addr, "center") == 0) + config.alignment = CenterAlignment; + else if (strcasecmp(xval.addr, "left") == 0) + config.alignment = LeftAlignment; + else if (strcasecmp(xval.addr, "right") == 0) + config.alignment = RightAlignment; + } +} - XrmDestroyDatabase(xdb); +/* get configuration from command-line options */ +static char * +getoptions(int argc, char *argv[]) +{ + int ch; + + while ((ch = getopt(argc, argv, "ip:rw")) != -1) { + switch (ch) { + case 'i': + iflag = 1; + break; + case 'p': + pflag = 1; + parseposition(optarg); + break; + case 'r': + rflag = 1; + break; + case 'w': + wflag = 1; + break; + default: + usage(); + break; + } + } + argc -= optind; + argv += optind; + if (argc > 1) + usage(); + else if (argc == 1) + return *argv; + return PROGNAME; +} + +/* parse font string */ +static void +parsefonts(const char *s) +{ + const char *p; + char buf[1024]; + size_t nfont = 0; + + dc.nfonts = 1; + for (p = s; *p; p++) + if (*p == ',') + dc.nfonts++; + + if ((dc.fonts = calloc(dc.nfonts, sizeof *dc.fonts)) == NULL) + err(1, "calloc"); + + p = s; + while (*p != '\0') { + size_t i; + + i = 0; + while (isspace(*p)) + p++; + while (i < sizeof buf && *p != '\0' && *p != ',') + buf[i++] = *p++; + if (i >= sizeof buf) + errx(1, "font name too long"); + if (*p == ',') + p++; + buf[i] = '\0'; + if (nfont == 0) + if ((dc.pattern = FcNameParse((FcChar8 *)buf)) == NULL) + errx(1, "the first font in the cache must be loaded from a font string"); + if ((dc.fonts[nfont++] = XftFontOpenName(dpy, screen, buf)) == NULL) + errx(1, "could not load font"); + } } /* get color from color string */ static void -getcolor(const char *s, XftColor *color) +ealloccolor(const char *s, XftColor *color) { if(!XftColorAllocName(dpy, visual, colormap, s, color)) - errx(1, "cannot allocate color: %s", s); + errx(1, "could not allocate color: %s", s); +} + +/* query monitor information and cursor position */ +static void +initmonitor(void) +{ + XineramaScreenInfo *info = NULL; + Window dw; /* dummy variable */ + int di; /* dummy variable */ + unsigned du; /* dummy variable */ + int cursx, cursy; /* cursor position */ + int nmons; + int i; + + XQueryPointer(dpy, rootwin, &dw, &dw, &cursx, &cursy, &di, &di, &du); + + mon.x = mon.y = 0; + mon.w = DisplayWidth(dpy, screen); + mon.h = DisplayHeight(dpy, screen); + + if ((info = XineramaQueryScreens(dpy, &nmons)) != NULL) { + int selmon = 0; + + if (!mflag || config.monitor < 0 || config.monitor >= nmons) { + for (i = 0; i < nmons; i++) { + if (BETWEEN(cursx, info[i].x_org, info[i].x_org + info[i].width) && + BETWEEN(cursy, info[i].y_org, info[i].y_org + info[i].height)) { + selmon = i; + break; + } + } + } else { + selmon = config.monitor; + } + + mon.x = info[selmon].x_org; + mon.y = info[selmon].y_org; + mon.w = info[selmon].width; + mon.h = info[selmon].height; + + XFree(info); + } + + if (!pflag) { + config.posx = cursx; + config.posy = cursy; + } else if (mflag) { + config.posx += mon.x; + config.posy += mon.y; + } } /* init draw context */ static void -setupdc(void) +initdc(void) { /* get color pixels */ - getcolor(background_color, &dc.normal[ColorBG]); - getcolor(foreground_color, &dc.normal[ColorFG]); - getcolor(selbackground_color, &dc.selected[ColorBG]); - getcolor(selforeground_color, &dc.selected[ColorFG]); - getcolor(separator_color, &dc.separator); - getcolor(border_color, &dc.border); + ealloccolor(config.background_color, &dc.normal[ColorBG]); + ealloccolor(config.foreground_color, &dc.normal[ColorFG]); + ealloccolor(config.selbackground_color, &dc.selected[ColorBG]); + ealloccolor(config.selforeground_color, &dc.selected[ColorFG]); + ealloccolor(config.separator_color, &dc.separator); + ealloccolor(config.border_color, &dc.border); - /* try to get font */ - if ((dc.font = XftFontOpenName(dpy, screen, font)) == NULL) - errx(1, "cannot load font"); + /* parse fonts */ + parsefonts(config.font); /* create common GC */ dc.gc = XCreateGC(dpy, rootwin, 0, NULL); } -/* calculate menu and screen geometry */ +/* calculate icon size */ static void -calcgeom(struct Geometry *geom) +initiconsize(void) { - Window w1, w2; /* unused variables */ - int a, b; /* unused variables */ - unsigned mask; /* unused variable */ + config.iconsize = config.height_pixels - config.iconpadding * 2; +} - XQueryPointer(dpy, rootwin, &w1, &w2, &geom->cursx, &geom->cursy, &a, &b, &mask); - geom->screenw = DisplayWidth(dpy, screen); - geom->screenh = DisplayHeight(dpy, screen); - geom->itemh = dc.font->height + padding_pixels * 2; - geom->itemw = width_pixels; - geom->border = border_pixels; - geom->separator = separator_pixels; +/* intern atoms */ +static void +initatoms(void) +{ + utf8string = XInternAtom(dpy, "UTF8_STRING", False); + wmdelete = XInternAtom(dpy, "WM_DELETE_WINDOW", False); + netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False); + netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False); + netatom[NetWMWindowTypePopupMenu] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_POPUP_MENU", False); } /* allocate an item */ @@ -287,18 +330,14 @@ allocitem(const char *label, const char *output, char *file) } item->y = 0; item->h = 0; - if (item->label == NULL) - item->labellen = 0; - else - item->labellen = strlen(item->label); item->next = NULL; item->submenu = NULL; - item->image = NULL; + item->icon = NULL; return item; } -/* allocate a menu */ +/* allocate a menu and create its window */ static struct Menu * allocmenu(struct Menu *parent, struct Item *list, unsigned level) { @@ -311,18 +350,22 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level) menu->list = list; menu->caller = NULL; menu->selected = NULL; - menu->w = 0; /* calculated by setupmenu() */ - menu->h = 0; /* calculated by setupmenu() */ - menu->x = 0; /* calculated by setupmenu() */ - menu->y = 0; /* calculated by setupmenu() */ + menu->w = 0; /* recalculated by setupmenu() */ + menu->h = 0; /* recalculated by setupmenu() */ + menu->x = mon.x; /* recalculated by setupmenu() */ + menu->y = mon.y; /* recalculated by setupmenu() */ menu->level = level; + menu->drawn = 0; + menu->hasicon = 0; - swa.override_redirect = True; + swa.override_redirect = (wflag) ? False : True; swa.background_pixel = dc.normal[ColorBG].pixel; swa.border_pixel = dc.border.pixel; swa.save_under = True; /* pop-up windows should save_under*/ swa.event_mask = ExposureMask | KeyPressMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | LeaveWindowMask; + if (wflag) + swa.event_mask |= StructureNotifyMask; menu->win = XCreateWindow(dpy, rootwin, 0, 0, 1, 1, 0, CopyFromParent, CopyFromParent, CopyFromParent, CWOverrideRedirect | CWBackPixel | @@ -348,10 +391,10 @@ buildmenutree(unsigned level, const char *label, const char *output, char *file) /* put the item in the menu tree */ if (prevmenu == NULL) { /* there is no menu yet */ - menu = allocmenu(NULL, curritem, level); - rootmenu = menu; - prevmenu = menu; - curritem->prev = NULL; + menu = allocmenu(NULL, curritem, level); + rootmenu = menu; + prevmenu = menu; + curritem->prev = NULL; } else if (level < prevmenu->level) { /* item is continuation of a parent menu */ /* go up the menu tree until find the menu this item continues */ for (menu = prevmenu, i = level; @@ -359,7 +402,7 @@ buildmenutree(unsigned level, const char *label, const char *output, char *file) menu = menu->parent, i++) ; if (menu == NULL) - errx(1, "reached NULL menu"); + errx(1, "improper indentation detected"); /* find last item in the new menu */ for (item = menu->list; item->next != NULL; item = item->next) @@ -388,6 +431,9 @@ buildmenutree(unsigned level, const char *label, const char *output, char *file) curritem->prev = NULL; } + if (curritem->file) + prevmenu->hasicon = 1; + return rootmenu; } @@ -432,130 +478,261 @@ parsestdin(void) return rootmenu; } -/* load and scale image */ -static Imlib_Image -loadimage(const char *file, int size) +/* get next utf8 char from s return its codepoint and set next_ret to pointer to end of character */ +static FcChar32 +getnextutf8char(const char *s, const char **next_ret) { - Imlib_Image image; - int width; - int height; - int imgsize; + static const unsigned char utfbyte[] = {0x80, 0x00, 0xC0, 0xE0, 0xF0}; + static const unsigned char utfmask[] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8}; + static const FcChar32 utfmin[] = {0, 0x00, 0x80, 0x800, 0x10000}; + static const FcChar32 utfmax[] = {0, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF}; + /* 0xFFFD is the replacement character, used to represent unknown characters */ + static const FcChar32 unknown = 0xFFFD; + FcChar32 ucode; /* FcChar32 type holds 32 bits */ + size_t usize = 0; /* n' of bytes of the utf8 character */ + size_t i; + + *next_ret = s+1; + + /* get code of first byte of utf8 character */ + for (i = 0; i < sizeof utfmask; i++) { + if (((unsigned char)*s & utfmask[i]) == utfbyte[i]) { + usize = i; + ucode = (unsigned char)*s & ~utfmask[i]; + break; + } + } + + /* if first byte is a continuation byte or is not allowed, return unknown */ + if (i == sizeof utfmask || usize == 0) + return unknown; + + /* check the other usize-1 bytes */ + s++; + for (i = 1; i < usize; i++) { + *next_ret = s+1; + /* if byte is nul or is not a continuation byte, return unknown */ + if (*s == '\0' || ((unsigned char)*s & utfmask[0]) != utfbyte[0]) + return unknown; + /* 6 is the number of relevant bits in the continuation byte */ + ucode = (ucode << 6) | ((unsigned char)*s & ~utfmask[0]); + s++; + } - image = imlib_load_image(file); - if (image == NULL) - errx(1, "cannot load image %s", file); + /* check if ucode is invalid or in utf-16 surrogate halves */ + if (!BETWEEN(ucode, utfmin[usize], utfmax[usize]) + || BETWEEN (ucode, 0xD800, 0xDFFF)) + return unknown; - imlib_context_set_image(image); + return ucode; +} - width = imlib_image_get_width(); - height = imlib_image_get_height(); - imgsize = MIN(width, height); +/* get which font contains a given code point */ +static XftFont * +getfontucode(FcChar32 ucode) +{ + FcCharSet *fccharset = NULL; + FcPattern *fcpattern = NULL; + FcPattern *match = NULL; + XftFont *retfont = NULL; + XftResult result; + size_t i; + + for (i = 0; i < dc.nfonts; i++) + if (XftCharExists(dpy, dc.fonts[i], ucode) == FcTrue) + return dc.fonts[i]; + + /* create a charset containing our code point */ + fccharset = FcCharSetCreate(); + FcCharSetAddChar(fccharset, ucode); + + /* create a pattern akin to the dc.pattern but containing our charset */ + if (fccharset) { + fcpattern = FcPatternDuplicate(dc.pattern); + FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); + } - image = imlib_create_cropped_scaled_image(0, 0, imgsize, imgsize, size, size); + /* find pattern matching fcpattern */ + if (fcpattern) { + FcConfigSubstitute(NULL, fcpattern, FcMatchPattern); + FcDefaultSubstitute(fcpattern); + match = XftFontMatch(dpy, screen, fcpattern, &result); + } - return image; + /* if found a pattern, open its font */ + if (match) { + retfont = XftFontOpenPattern(dpy, match); + if (retfont && XftCharExists(dpy, retfont, ucode) == FcTrue) { + if ((dc.fonts = realloc(dc.fonts, dc.nfonts+1)) == NULL) + err(1, "realloc"); + dc.fonts[dc.nfonts] = retfont; + return dc.fonts[dc.nfonts++]; + } else { + XftFontClose(dpy, retfont); + } + } + + /* in case no fount was found, return the first one */ + return dc.fonts[0]; } -/* setup the size of a menu and the position of its items */ +/* draw text into XftDraw, return width of text glyphs */ +static int +drawtext(XftDraw *draw, XftColor *color, int x, int y, unsigned h, const char *text) +{ + int textwidth = 0; + + while (*text) { + XftFont *currfont; + XGlyphInfo ext; + FcChar32 ucode; + const char *next; + size_t len; + + ucode = getnextutf8char(text, &next); + currfont = getfontucode(ucode); + + len = next - text; + XftTextExtentsUtf8(dpy, currfont, (XftChar8 *)text, len, &ext); + textwidth += ext.xOff; + + if (draw) { + int texty; + + texty = y + (h - (currfont->ascent + currfont->descent))/2 + currfont->ascent; + XftDrawStringUtf8(draw, color, currfont, x, texty, (XftChar8 *)text, len); + x += ext.xOff; + } + + text = next; + } + + return textwidth; +} + +/* setup the height, width and icon of the items of a menu */ static void -setupmenusize(struct Geometry *geom, struct Menu *menu) +setupitems(struct Menu *menu) { - XGlyphInfo ext; struct Item *item; - int labelwidth; + int itemwidth; - menu->w = geom->itemw; + menu->w = config.width_pixels; + menu->maxtextw = 0; for (item = menu->list; item != NULL; item = item->next) { item->y = menu->h; - if (item->label == NULL) /* height for separator item */ - item->h = geom->separator; + item->h = config.separator_pixels; else - item->h = geom->itemh; + item->h = config.height_pixels; menu->h += item->h; - - /* get length of item->label rendered in the font */ - XftTextExtentsUtf8(dpy, dc.font, (XftChar8 *)item->label, - item->labellen, &ext); - labelwidth = ext.xOff + dc.font->height * 2 + IMGPADDING * 2; - menu->w = MAX(menu->w, labelwidth); - - /* create image */ - if (item->file != NULL) - item->image = loadimage(item->file, dc.font->height); + if (item->label) + item->textw = drawtext(NULL, NULL, 0, 0, 0, item->label); + else + item->textw = 0; + + /* + * set menu width + * + * the item width depends on the size of its label (item->textw), + * and it is only used to calculate the width of the menu (which + * is equal to the width of the largest item). + * + * the horizontal padding appears 4 times through the width of a + * item: before and after its icon, and before and after its triangle. + * if the iflag is set (icons are disabled) then the horizontal + * padding appears 3 times: before the label and around the triangle. + */ + itemwidth = item->textw + config.triangle_width + config.horzpadding * 3; + itemwidth += (iflag || !menu->hasicon) ? 0 : config.iconsize + config.horzpadding; + menu->w = MAX(menu->w, itemwidth); + menu->maxtextw = MAX(menu->maxtextw, item->textw); } } /* setup the position of a menu */ static void -setupmenupos(struct Geometry *geom, struct Menu *menu) +setupmenupos(struct Menu *menu) { int width, height; - width = menu->w + geom->border * 2; - height = menu->h + geom->border * 2; + width = menu->w + config.border_pixels * 2; + height = menu->h + config.border_pixels * 2; if (menu->parent == NULL) { /* if root menu, calculate in respect to cursor */ - if (geom->screenw - geom->cursx >= menu->w) - menu->x = geom->cursx; - else if (geom->cursx > width) - menu->x = geom->cursx - width; - - if (geom->screenh - geom->cursy >= height) - menu->y = geom->cursy; - else if (geom->screenh > height) - menu->y = geom->screenh - height; + if (pflag || (config.posx >= mon.x && mon.x + mon.w - config.posx >= width)) + menu->x = config.posx; + else if (config.posx > width) + menu->x = config.posx - width; + + if (pflag || (config.posy >= mon.y && mon.y + mon.h - config.posy >= height)) + menu->y = config.posy; + else if (mon.y + mon.h > height) + menu->y = mon.y + mon.h - height; } else { /* else, calculate in respect to parent menu */ - if (geom->screenw - (menu->parent->x + menu->parent->w + geom->border) >= width) - menu->x = menu->parent->x + menu->parent->w + geom->border; - else if (menu->parent->x > menu->w + geom->border) - menu->x = menu->parent->x - menu->w - geom->border; + int parentwidth; + + parentwidth = menu->parent->x + menu->parent->w + config.border_pixels + config.gap_pixels; + + if (mon.x + mon.w - parentwidth >= width) + menu->x = parentwidth; + else if (menu->parent->x > menu->w + config.border_pixels + config.gap_pixels) + menu->x = menu->parent->x - menu->w - config.border_pixels - config.gap_pixels; - if (geom->screenh - (menu->caller->y + menu->parent->y) > height) + if (mon.y + mon.h - (menu->caller->y + menu->parent->y) >= height) menu->y = menu->caller->y + menu->parent->y; - else if (geom->screenh - menu->parent->y > height) - menu->y = menu->parent->y; - else if (geom->screenh > height) - menu->y = geom->screenh - height; + else if (mon.y + mon.h > height) + menu->y = mon.y + mon.h - height; } } /* recursivelly setup menu configuration and its pixmap */ static void -setupmenu(struct Geometry *geom, struct Menu *menu) +setupmenu(struct Menu *menu, XClassHint *classh) { + char *title; struct Item *item; - static XClassHint classh = {PROGNAME, PROGNAME}; XWindowChanges changes; XSizeHints sizeh; + XTextProperty wintitle; /* setup size and position of menus */ - setupmenusize(geom, menu); - setupmenupos(geom, menu); + setupitems(menu); + setupmenupos(menu); /* update menu geometry */ - changes.border_width = geom->border; + changes.border_width = config.border_pixels; changes.height = menu->h; changes.width = menu->w; changes.x = menu->x; changes.y = menu->y; XConfigureWindow(dpy, menu->win, CWBorderWidth | CWWidth | CWHeight | CWX | CWY, &changes); + /* set window title (used if wflag is on) */ + if (menu->parent == NULL) { + title = classh->res_name; + } else { + title = menu->caller->output; + } + XStringListToTextProperty(&title, 1, &wintitle); + /* set window manager hints */ - sizeh.flags = PMaxSize | PMinSize; + sizeh.flags = USPosition | PMaxSize | PMinSize; sizeh.min_width = sizeh.max_width = menu->w; sizeh.min_height = sizeh.max_height = menu->h; - XSetWMProperties(dpy, menu->win, NULL, NULL, NULL, 0, &sizeh, - NULL, &classh); + XSetWMProperties(dpy, menu->win, &wintitle, NULL, NULL, 0, &sizeh, NULL, classh); - /* create pixmap and XftDraw */ - menu->pixmap = XCreatePixmap(dpy, menu->win, menu->w, menu->h, - DefaultDepth(dpy, screen)); - menu->draw = XftDrawCreate(dpy, menu->pixmap, visual, colormap); + /* set WM protocols and ewmh window properties */ + XSetWMProtocols(dpy, menu->win, &wmdelete, 1); + XChangeProperty(dpy, menu->win, netatom[NetWMName], utf8string, 8, + PropModeReplace, (unsigned char *)title, strlen(title)); + XChangeProperty(dpy, menu->win, netatom[NetWMWindowType], XA_ATOM, 32, + PropModeReplace, + (unsigned char *)&netatom[NetWMWindowTypePopupMenu], 1); /* calculate positions of submenus */ for (item = menu->list; item != NULL; item = item->next) { if (item->submenu != NULL) - setupmenu(geom, item->submenu); + setupmenu(item->submenu, classh); } } @@ -573,7 +750,7 @@ grabpointer(void) return; nanosleep(&ts, NULL); } - errx(1, "cannot grab keyboard"); + errx(1, "could not grab pointer"); } /* try to grab keyboard, we may have to wait for another process to ungrab */ @@ -589,36 +766,197 @@ grabkeyboard(void) return; nanosleep(&ts, NULL); } - errx(1, "cannot grab keyboard"); + errx(1, "could not grab keyboard"); } -/* get menu of given window */ -static struct Menu * -getmenu(struct Menu *currmenu, Window win) +/* ungrab pointer and keyboard */ +static void +ungrab(void) { - struct Menu *menu; + XUngrabPointer(dpy, CurrentTime); + XUngrabKeyboard(dpy, CurrentTime); +} - for (menu = currmenu; menu != NULL; menu = menu->parent) - if (menu->win == win) - return menu; +/* load and scale icon */ +static Imlib_Image +loadicon(const char *file) +{ + Imlib_Image icon; + Imlib_Load_Error errcode; + const char *errstr; + int width; + int height; + int imgsize; - return NULL; + icon = imlib_load_image_with_error_return(file, &errcode); + if (*file == '\0') { + warnx("could not load icon (file name is blank)"); + return NULL; + } else if (icon == NULL) { + switch (errcode) { + case IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST: + errstr = "file does not exist"; + break; + case IMLIB_LOAD_ERROR_FILE_IS_DIRECTORY: + errstr = "file is directory"; + break; + case IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_READ: + case IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_WRITE: + errstr = "permission denied"; + break; + case IMLIB_LOAD_ERROR_NO_LOADER_FOR_FILE_FORMAT: + errstr = "unknown file format"; + break; + case IMLIB_LOAD_ERROR_PATH_TOO_LONG: + errstr = "path too long"; + break; + case IMLIB_LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT: + case IMLIB_LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY: + case IMLIB_LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE: + errstr = "improper path"; + break; + case IMLIB_LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS: + errstr = "too many symbolic links"; + break; + case IMLIB_LOAD_ERROR_OUT_OF_MEMORY: + errstr = "out of memory"; + break; + case IMLIB_LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS: + errstr = "out of file descriptors"; + break; + default: + errstr = "unknown error"; + break; + } + warnx("could not load icon (%s): %s", errstr, file); + return NULL; + } + + imlib_context_set_image(icon); + + width = imlib_image_get_width(); + height = imlib_image_get_height(); + imgsize = MIN(width, height); + + icon = imlib_create_cropped_scaled_image(0, 0, imgsize, imgsize, + config.iconsize, + config.iconsize); + + return icon; } -/* get item of given menu and position */ -static struct Item * -getitem(struct Menu *menu, int y) +/* draw pixmap for the selected and unselected version of each item on menu */ +static void +drawitems(struct Menu *menu) { + XftDraw *dsel, *dunsel; struct Item *item; + int textx; + int x, y; - if (menu == NULL) - return NULL; + for (item = menu->list; item != NULL; item = item->next) { + item->unsel = XCreatePixmap(dpy, menu->win, menu->w, item->h, + DefaultDepth(dpy, screen)); - for (item = menu->list; item != NULL; item = item->next) - if (y >= item->y && y <= item->y + item->h) - return item; + XSetForeground(dpy, dc.gc, dc.normal[ColorBG].pixel); + XFillRectangle(dpy, item->unsel, dc.gc, 0, 0, menu->w, item->h); - return NULL; + if (item->label == NULL) { /* item is separator */ + y = item->h/2; + XSetForeground(dpy, dc.gc, dc.separator.pixel); + XDrawLine(dpy, item->unsel, dc.gc, config.horzpadding, y, + menu->w - config.horzpadding, y); + + item->sel = item->unsel; + } else { + item->sel = XCreatePixmap(dpy, menu->win, menu->w, item->h, + DefaultDepth(dpy, screen)); + XSetForeground(dpy, dc.gc, dc.selected[ColorBG].pixel); + XFillRectangle(dpy, item->sel, dc.gc, 0, 0, menu->w, item->h); + + /* draw text */ + textx = config.horzpadding; + textx += (iflag || !menu->hasicon) ? 0 : config.horzpadding + config.iconsize; + switch (config.alignment) { + case CenterAlignment: + textx += (menu->maxtextw - item->textw) / 2; + break; + case RightAlignment: + textx += menu->maxtextw - item->textw; + break; + default: + break; + } + dsel = XftDrawCreate(dpy, item->sel, visual, colormap); + dunsel = XftDrawCreate(dpy, item->unsel, visual, colormap); + XSetForeground(dpy, dc.gc, dc.selected[ColorFG].pixel); + drawtext(dsel, &dc.selected[ColorFG], textx, 0, item->h, item->label); + XSetForeground(dpy, dc.gc, dc.normal[ColorFG].pixel); + drawtext(dunsel, &dc.normal[ColorFG], textx, 0, item->h, item->label); + XftDrawDestroy(dsel); + XftDrawDestroy(dunsel); + + /* draw triangle */ + if (item->submenu != NULL) { + x = menu->w - config.triangle_width - config.horzpadding; + y = (item->h - config.triangle_height + 1) / 2; + + XPoint triangle[] = { + {x, y}, + {x + config.triangle_width, y + config.triangle_height/2}, + {x, y + config.triangle_height}, + {x, y} + }; + + XSetForeground(dpy, dc.gc, dc.selected[ColorFG].pixel); + XFillPolygon(dpy, item->sel, dc.gc, triangle, LEN(triangle), + Convex, CoordModeOrigin); + XSetForeground(dpy, dc.gc, dc.normal[ColorFG].pixel); + XFillPolygon(dpy, item->unsel, dc.gc, triangle, LEN(triangle), + Convex, CoordModeOrigin); + } + + /* try to load icon */ + if (item->file && !iflag) { + item->icon = loadicon(item->file); + free(item->file); + } + + /* draw icon if properly loaded */ + if (item->icon) { + imlib_context_set_image(item->icon); + imlib_context_set_drawable(item->sel); + imlib_render_image_on_drawable(config.horzpadding, config.iconpadding); + imlib_context_set_drawable(item->unsel); + imlib_render_image_on_drawable(config.horzpadding, config.iconpadding); + imlib_context_set_image(item->icon); + imlib_free_image(); + } + } + } +} + +/* copy pixmaps of items of the current menu and of its ancestors into menu window */ +static void +drawmenus(struct Menu *currmenu) +{ + struct Menu *menu; + struct Item *item; + + for (menu = currmenu; menu != NULL; menu = menu->parent) { + if (!menu->drawn) { + drawitems(menu); + menu->drawn = 1; + } + for (item = menu->list; item != NULL; item = item->next) { + if (item == menu->selected) + XCopyArea(dpy, item->sel, menu->win, dc.gc, 0, 0, + menu->w, item->h, 0, item->y); + else + XCopyArea(dpy, item->unsel, menu->win, dc.gc, 0, 0, + menu->w, item->h, 0, item->y); + } + } } /* umap previous menus and map current menu and its parents */ @@ -668,136 +1006,114 @@ mapmenu(struct Menu *currmenu) /* map menus from currmenu (inclusive) until lcamenu (exclusive) */ for (menu = currmenu; menu != lcamenu; menu = menu->parent) { + + if (wflag) { + setupmenupos(menu); + XMoveWindow(dpy, menu->win, menu->x, menu->y); + } + XMapWindow(dpy, menu->win); } prevmenu = currmenu; } -/* draw separator item */ -static void -drawseparator(struct Menu *menu, struct Item *item) -{ - int y; - - y = item->y + item->h/2; - - XSetForeground(dpy, dc.gc, dc.separator.pixel); - XDrawLine(dpy, menu->pixmap, dc.gc, 0, y, menu->w, y); -} - -/* draw regular item */ -static void -drawitem(struct Menu *menu, struct Item *item, XftColor *color) +/* get menu of given window */ +static struct Menu * +getmenu(struct Menu *currmenu, Window win) { - int x, y; - - x = dc.font->height + IMGPADDING; - y = item->y + item->h/2 + dc.font->ascent/2 - 1; - XSetForeground(dpy, dc.gc, color[ColorFG].pixel); - XftDrawStringUtf8(menu->draw, &color[ColorFG], dc.font, - x, y, item->label, item->labellen); - - /* draw triangle, if item contains a submenu */ - if (item->submenu != NULL) { - x = menu->w - dc.font->height/2 - IMGPADDING/2 - triangle_width/2 - 1; - y = item->y + item->h/2 - triangle_height/2 - 1; - - XPoint triangle[] = { - {x, y}, - {x + triangle_width, y + triangle_height/2}, - {x, y + triangle_height}, - {x, y} - }; + struct Menu *menu; - XFillPolygon(dpy, menu->pixmap, dc.gc, triangle, LEN(triangle), - Convex, CoordModeOrigin); - } + for (menu = currmenu; menu != NULL; menu = menu->parent) + if (menu->win == win) + return menu; - /* draw image */ - if (item->file != NULL) { - x = IMGPADDING / 2; - y = item->y + (item->h - dc.font->height) / 2; - imlib_context_set_drawable(menu->pixmap); - imlib_context_set_image(item->image); - imlib_render_image_on_drawable(x, y); - } + return NULL; } -/* draw items of the current menu and of its ancestors */ -static void -drawmenu(struct Menu *currmenu) +/* get item of given menu and position */ +static struct Item * +getitem(struct Menu *menu, int y) { - struct Menu *menu; struct Item *item; - for (menu = currmenu; menu != NULL; menu = menu->parent) { - for (item = menu->list; item != NULL; item = item->next) { - XftColor *color; - - /* determine item color */ - if (item == menu->selected && item->label != NULL) - color = dc.selected; - else - color = dc.normal; - - /* draw item box */ - XSetForeground(dpy, dc.gc, color[ColorBG].pixel); - XFillRectangle(dpy, menu->pixmap, dc.gc, 0, item->y, - menu->w, item->h); + if (menu == NULL) + return NULL; - if (item->label == NULL) /* item is a separator */ - drawseparator(menu, item); - else /* item is a regular item */ - drawitem(menu, item, color); - } + for (item = menu->list; item != NULL; item = item->next) + if (y >= item->y && y <= item->y + item->h) + return item; - XCopyArea(dpy, menu->pixmap, menu->win, dc.gc, 0, 0, - menu->w, menu->h, 0, 0); - } + return NULL; } /* cycle through the items; non-zero direction is next, zero is prev */ static struct Item * itemcycle(struct Menu *currmenu, int direction) { - struct Item *item; + struct Item *item = NULL; struct Item *lastitem; - item = NULL; + for (lastitem = currmenu->list; lastitem && lastitem->next; lastitem = lastitem->next) + ; - if (direction == ITEMNEXT) { + /* select item (either separator or labeled item) in given direction */ + switch (direction) { + case ITEMNEXT: if (currmenu->selected == NULL) item = currmenu->list; else if (currmenu->selected->next != NULL) item = currmenu->selected->next; - - while (item != NULL && item->label == NULL) - item = item->next; - - if (item == NULL) - item = currmenu->list; - } else { - for (lastitem = currmenu->list; - lastitem != NULL && lastitem->next != NULL; - lastitem = lastitem->next) - ; - + break; + case ITEMPREV: if (currmenu->selected == NULL) item = lastitem; else if (currmenu->selected->prev != NULL) item = currmenu->selected->prev; + break; + case ITEMFIRST: + item = currmenu->list; + break; + case ITEMLAST: + item = lastitem; + break; + } + /* + * the selected item can be a separator + * let's select the closest labeled item (ie., one that isn't a separator) + */ + switch (direction) { + case ITEMNEXT: + case ITEMFIRST: + while (item != NULL && item->label == NULL) + item = item->next; + if (item == NULL) + item = currmenu->list; + break; + case ITEMPREV: + case ITEMLAST: while (item != NULL && item->label == NULL) item = item->prev; - if (item == NULL) item = lastitem; + break; } return item; } +/* check if button is used to open a item on click */ +static int +isclickbutton(unsigned int button) +{ + if (button == Button1) + return 1; + if (!rflag && button == Button3) + return 1; + return 0; +} + /* run event loop */ static void run(struct Menu *currmenu) @@ -805,6 +1121,7 @@ run(struct Menu *currmenu) struct Menu *menu; struct Item *item; struct Item *previtem = NULL; + struct Item *lastitem; KeySym ksym; XEvent ev; @@ -814,7 +1131,7 @@ run(struct Menu *currmenu) switch(ev.type) { case Expose: if (ev.xexpose.count == 0) - drawmenu(currmenu); + drawmenus(currmenu); break; case MotionNotify: menu = getmenu(currmenu, ev.xbutton.window); @@ -830,9 +1147,11 @@ run(struct Menu *currmenu) currmenu = menu; } mapmenu(currmenu); - drawmenu(currmenu); + drawmenus(currmenu); break; case ButtonRelease: + if (!isclickbutton(ev.xbutton.button)) + break; menu = getmenu(currmenu, ev.xbutton.window); item = getitem(menu, ev.xbutton.y); if (menu == NULL || item == NULL) @@ -848,7 +1167,7 @@ selectitem: } mapmenu(currmenu); currmenu->selected = currmenu->list; - drawmenu(currmenu); + drawmenus(currmenu); break; case ButtonPress: menu = getmenu(currmenu, ev.xbutton.window); @@ -868,15 +1187,26 @@ selectitem: /* cycle through menu */ item = NULL; - if (ksym == XK_ISO_Left_Tab || ksym == XK_Up) { + if (ksym == XK_Home || ksym == KSYMFIRST) { + item = itemcycle(currmenu, ITEMFIRST); + } else if (ksym == XK_End || ksym == KSYMLAST) { + item = itemcycle(currmenu, ITEMLAST); + } else if (ksym == XK_ISO_Left_Tab || ksym == XK_Up || ksym == KSYMUP) { item = itemcycle(currmenu, ITEMPREV); - } else if (ksym == XK_Tab || ksym == XK_Down) { + } else if (ksym == XK_Tab || ksym == XK_Down || ksym == KSYMDOWN) { item = itemcycle(currmenu, ITEMNEXT); - } else if ((ksym == XK_Return || ksym == XK_Right) && - currmenu->selected != NULL) { + } else if (ksym >= XK_1 && ksym <= XK_9){ + item = itemcycle(currmenu, ITEMFIRST); + lastitem = itemcycle(currmenu, ITEMLAST); + for (int i = ksym - XK_1; i > 0 && item != lastitem; i--) { + currmenu->selected = item; + item = itemcycle(currmenu, ITEMNEXT); + } + } else if ((ksym == XK_Return || ksym == XK_Right || ksym == KSYMRIGHT) && + currmenu->selected != NULL) { item = currmenu->selected; goto selectitem; - } else if ((ksym == XK_Escape || ksym == XK_Left) && + } else if ((ksym == XK_Escape || ksym == XK_Left || ksym == KSYMLEFT) && currmenu->parent != NULL) { item = currmenu->parent->selected; currmenu = currmenu->parent; @@ -884,12 +1214,29 @@ selectitem: } else break; currmenu->selected = item; - drawmenu(currmenu); + drawmenus(currmenu); break; case LeaveNotify: previtem = NULL; currmenu->selected = NULL; - drawmenu(currmenu); + drawmenus(currmenu); + break; + case ConfigureNotify: + menu = getmenu(currmenu, ev.xconfigure.window); + if (menu == NULL) + break; + menu->x = ev.xconfigure.x; + menu->y = ev.xconfigure.y; + break; + case ClientMessage: + if ((unsigned long) ev.xclient.data.l[0] != wmdelete) + break; + /* user closed window */ + menu = getmenu(currmenu, ev.xclient.window); + if (menu->parent == NULL) + return; /* closing the root menu closes the program */ + currmenu = menu->parent; + mapmenu(currmenu); break; } } @@ -897,7 +1244,7 @@ selectitem: /* recursivelly free pixmaps and destroy windows */ static void -freemenu(struct Menu *menu) +cleanmenu(struct Menu *menu) { struct Item *item; struct Item *tmp; @@ -905,34 +1252,29 @@ freemenu(struct Menu *menu) item = menu->list; while (item != NULL) { if (item->submenu != NULL) - freemenu(item->submenu); + cleanmenu(item->submenu); tmp = item; + if (menu->drawn) { + XFreePixmap(dpy, item->unsel); + if (tmp->label != NULL) + XFreePixmap(dpy, item->sel); + } if (tmp->label != tmp->output) free(tmp->label); free(tmp->output); - if (tmp->file != NULL) { - free(tmp->file); - if (tmp->image != NULL) { - imlib_context_set_image(tmp->image); - imlib_free_image(); - } - } item = item->next; free(tmp); } - XFreePixmap(dpy, menu->pixmap); - XftDrawDestroy(menu->draw); XDestroyWindow(dpy, menu->win); free(menu); } -/* cleanup and exit */ +/* cleanup draw context */ static void -cleanup(void) +cleandc(void) { - XUngrabPointer(dpy, CurrentTime); - XUngrabKeyboard(dpy, CurrentTime); + size_t i; XftColorFree(dpy, visual, colormap, &dc.normal[ColorBG]); XftColorFree(dpy, visual, colormap, &dc.normal[ColorFG]); @@ -940,15 +1282,70 @@ cleanup(void) XftColorFree(dpy, visual, colormap, &dc.selected[ColorFG]); XftColorFree(dpy, visual, colormap, &dc.separator); XftColorFree(dpy, visual, colormap, &dc.border); - + for (i = 0; i < dc.nfonts; i++) + XftFontClose(dpy, dc.fonts[i]); XFreeGC(dpy, dc.gc); - XCloseDisplay(dpy); } -/* show usage */ -static void -usage(void) +/* xmenu: generate menu from stdin and print selected entry to stdout */ +int +main(int argc, char *argv[]) { - (void)fprintf(stderr, "usage: xmenu\n"); - exit(1); + struct Menu *rootmenu; + XClassHint classh; + + /* open connection to server and set X variables */ + if ((dpy = XOpenDisplay(NULL)) == NULL) + errx(1, "could not open display"); + screen = DefaultScreen(dpy); + visual = DefaultVisual(dpy, screen); + rootwin = RootWindow(dpy, screen); + colormap = DefaultColormap(dpy, screen); + XrmInitialize(); + if ((xrm = XResourceManagerString(dpy)) != NULL) + xdb = XrmGetStringDatabase(xrm); + + /* get configuration */ + getresources(); + classh.res_class = PROGNAME; + classh.res_name = getoptions(argc, argv); + + /* imlib2 stuff */ + if (!iflag) { + imlib_set_cache_size(2048 * 1024); + imlib_context_set_dither(1); + imlib_context_set_display(dpy); + imlib_context_set_visual(visual); + imlib_context_set_colormap(colormap); + } + + /* initializers */ + initmonitor(); + initdc(); + initiconsize(); + initatoms(); + + /* generate menus and set them up */ + rootmenu = parsestdin(); + if (rootmenu == NULL) + errx(1, "no menu generated"); + setupmenu(rootmenu, &classh); + + /* grab mouse and keyboard */ + if (!wflag) { + grabpointer(); + grabkeyboard(); + } + + /* run event loop */ + run(rootmenu); + + /* clean stuff */ + ungrab(); + cleanmenu(rootmenu); + cleandc(); + XrmDestroyDatabase(xdb); + XCloseDisplay(dpy); + + return 0; }