diff options
author | 2022-06-28 10:23:49 -0400 | |
---|---|---|
committer | 2022-06-28 10:23:49 -0400 | |
commit | c1152e1336e2c9dda2557d30e0d6591f66c2dc26 (patch) | |
tree | ba7ee89f2d16903023628eaa2405abed6a6ca1ed /dmenu.c | |
parent | b60e438b069c5e5beffdf6c7546e1e2e87aed305 (diff) | |
download | dmenu-c1152e1336e2c9dda2557d30e0d6591f66c2dc26.tar.gz |
Diffstat (limited to 'dmenu.c')
-rw-r--r-- | dmenu.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/dmenu.c b/dmenu.c index bde0869..34d0943 100644 --- a/dmenu.c +++ b/dmenu.c @@ -918,6 +918,21 @@ main(int argc, char *argv[]) XWindowAttributes wa; int i, fast = 0; + if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) + fputs("warning: no locale support\n", stderr); + if (!(dpy = XOpenDisplay(NULL))) + die("cannot open display"); + screen = DefaultScreen(dpy); + root = RootWindow(dpy, screen); + if (!embed || !(parentwin = strtol(embed, NULL, 0))) + parentwin = root; + if (!XGetWindowAttributes(dpy, parentwin, &wa)) + die("could not get embedding window attributes: 0x%lx", + parentwin); + xinitvisual(); + drw = drw_create(dpy, screen, root, wa.width, wa.height, visual, depth, cmap); + read_Xresources(); + for (i = 1; i < argc; i++) /* these options take no arguments */ if (!strcmp(argv[i], "-v")) { /* prints version information */ @@ -958,20 +973,6 @@ main(int argc, char *argv[]) else usage(); - if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) - fputs("warning: no locale support\n", stderr); - if (!(dpy = XOpenDisplay(NULL))) - die("cannot open display"); - screen = DefaultScreen(dpy); - root = RootWindow(dpy, screen); - if (!embed || !(parentwin = strtol(embed, NULL, 0))) - parentwin = root; - if (!XGetWindowAttributes(dpy, parentwin, &wa)) - die("could not get embedding window attributes: 0x%lx", - parentwin); - xinitvisual(); - drw = drw_create(dpy, screen, root, wa.width, wa.height, visual, depth, cmap); - read_Xresources(); if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) die("no fonts could be loaded."); lrpad = drw->fonts->h; @@ -993,3 +994,4 @@ main(int argc, char *argv[]) return 1; /* unreachable */ } + |