suckless-desktop/dmenu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Failed to merge with border patch

Browse Source
This commit is contained in:
Andreev Gregory 2025-03-03 21:42:43 +03:00
commit 930f84c987
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.def.h
View File

@ -17,6 +17,7 @@ static const char *colors[SchemeLast][2] = {
[SchemeSel] = { "#eeeeee", "#005577" }, [SchemeSel] = { "#eeeeee", "#005577" },
[SchemeOut] = { "#000000", "#00ffff" }, [SchemeOut] = { "#000000", "#00ffff" },
[SchemeCaret] = { "#fe5e5e", "#222222" }, [SchemeCaret] = { "#fe5e5e", "#222222" },
[SchemeBorder] = { "#cccccc", "#ffffff" },
}; };
/* -l and -g options; controls number of lines and columns in grid if > 0 */ /* -l and -g options; controls number of lines and columns in grid if > 0 */
@ -28,6 +29,7 @@ static const unsigned int alphas[SchemeLast][2] = {
[SchemeSel] = { OPAQUE, alpha }, [SchemeSel] = { OPAQUE, alpha },
[SchemeOut] = { OPAQUE, alpha }, [SchemeOut] = { OPAQUE, alpha },
[SchemeCaret] = { OPAQUE, OPAQUE }, [SchemeCaret] = { OPAQUE, OPAQUE },
[SchemeBorder] = { OPAQUE, 0xf2 },
}; };
/* /*
@ -35,3 +37,7 @@ static const unsigned int alphas[SchemeLast][2] = {
* for example: " /?\"&[]" * for example: " /?\"&[]"
*/ */
static const char worddelimiters[] = " "; static const char worddelimiters[] = " ";
/* Size of the window border */
static unsigned int border_width = 3;

9
dmenu.c
View File

@ -29,7 +29,7 @@
#define OPAQUE 0xffu #define OPAQUE 0xffu
/* enums */ /* enums */
enum { SchemeNorm, SchemeSel, SchemeOut, SchemeCaret, SchemeLast }; /* color schemes */ enum { SchemeNorm, SchemeSel, SchemeOut, SchemeCaret, SchemeBorder, SchemeLast }; /* color schemes */
struct item { struct item {
char *text; char *text;
@ -771,12 +771,14 @@ setup(void)
/* create menu window */ /* create menu window */
swa.override_redirect = True; swa.override_redirect = True;
swa.background_pixel = 0; swa.background_pixel = 0;
swa.border_pixel = 0; swa.border_pixel = scheme[SchemeBorder][ColFg].pixel;
swa.colormap = cmap; swa.colormap = cmap;
swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
win = XCreateWindow(dpy, root, x, y, mw, mh, 0, win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
depth, CopyFromParent, visual, depth, CopyFromParent, visual,
CWOverrideRedirect | CWBackPixel | CWBorderPixel | CWColormap | CWEventMask, &swa); CWOverrideRedirect | CWBackPixel | CWBorderPixel | CWColormap | CWEventMask, &swa);
if (border_width)
XSetWindowBorder(dpy, win, scheme[SchemeBorder][ColFg].pixel);
XSetClassHint(dpy, win, &ch); XSetClassHint(dpy, win, &ch);
/* input methods */ /* input methods */
@ -853,6 +855,8 @@ main(int argc, char *argv[])
colors[SchemeSel][ColFg] = argv[++i]; colors[SchemeSel][ColFg] = argv[++i];
else if (!strcmp(argv[i], "-w")) /* embedding window id */ else if (!strcmp(argv[i], "-w")) /* embedding window id */
embed = argv[++i]; embed = argv[++i];
else if (!strcmp(argv[i], "-bw"))
border_width = atoi(argv[++i]); /* border width */
else else
usage(); usage();
@ -927,3 +931,4 @@ xinitvisual()
cmap = DefaultColormap(dpy, screen); cmap = DefaultColormap(dpy, screen);
} }
} }