summaryrefslogtreecommitdiff
path: root/dmenu-5.0/patches
diff options
context:
space:
mode:
Diffstat (limited to 'dmenu-5.0/patches')
-rw-r--r--dmenu-5.0/patches/dmenu-alpha-20210605-1a13d04.diff267
-rw-r--r--dmenu-5.0/patches/dmenu-border-4.9.diff25
-rw-r--r--dmenu-5.0/patches/dmenu-xyw-5.0.diff116
3 files changed, 0 insertions, 408 deletions
diff --git a/dmenu-5.0/patches/dmenu-alpha-20210605-1a13d04.diff b/dmenu-5.0/patches/dmenu-alpha-20210605-1a13d04.diff
deleted file mode 100644
index 51679f7..0000000
--- a/dmenu-5.0/patches/dmenu-alpha-20210605-1a13d04.diff
+++ /dev/null
@@ -1,267 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 1edb647..697d511 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -2,6 +2,7 @@
- /* Default settings; can be overriden by command line. */
-
- static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */
-+static const unsigned int alpha = 0xf0;
- /* -fn option overrides fonts[0]; default X11 font or font set */
- static const char *fonts[] = {
- "monospace:size=10"
-@@ -13,6 +14,13 @@ static const char *colors[SchemeLast][2] = {
- [SchemeSel] = { "#eeeeee", "#005577" },
- [SchemeOut] = { "#000000", "#00ffff" },
- };
-+
-+static const unsigned int alphas[SchemeLast][2] = {
-+ [SchemeNorm] = { OPAQUE, alpha },
-+ [SchemeSel] = { OPAQUE, alpha },
-+ [SchemeOut] = { OPAQUE, alpha },
-+};
-+
- /* -l option; if nonzero, dmenu uses vertical list with given number of lines */
- static unsigned int lines = 0;
-
-diff --git a/dmenu.c b/dmenu.c
-index 65f25ce..3e56e1a 100644
---- a/dmenu.c
-+++ b/dmenu.c
-@@ -10,6 +10,7 @@
-
- #include <X11/Xlib.h>
- #include <X11/Xatom.h>
-+#include <X11/Xproto.h>
- #include <X11/Xutil.h>
- #ifdef XINERAMA
- #include <X11/extensions/Xinerama.h>
-@@ -25,6 +26,8 @@
- #define LENGTH(X) (sizeof X / sizeof X[0])
- #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
-
-+#define OPAQUE 0xffU
-+
- /* enums */
- enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
-
-@@ -53,10 +56,16 @@ static XIC xic;
- static Drw *drw;
- static Clr *scheme[SchemeLast];
-
-+static int useargb = 0;
-+static Visual *visual;
-+static int depth;
-+static Colormap cmap;
-+
- #include "config.h"
-
- static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
- static char *(*fstrstr)(const char *, const char *) = strstr;
-+static void xinitvisual();
-
- static void
- appenditem(struct item *item, struct item **list, struct item **last)
-@@ -602,7 +611,7 @@ setup(void)
- #endif
- /* init appearance */
- for (j = 0; j < SchemeLast; j++)
-- scheme[j] = drw_scm_create(drw, colors[j], 2);
-+ scheme[j] = drw_scm_create(drw, colors[j], alphas[i], 2);
-
- clip = XInternAtom(dpy, "CLIPBOARD", False);
- utf8 = XInternAtom(dpy, "UTF8_STRING", False);
-@@ -640,6 +649,7 @@ setup(void)
- x = info[i].x_org;
- y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
- mw = info[i].width;
-+
- XFree(info);
- } else
- #endif
-@@ -657,11 +667,13 @@ setup(void)
-
- /* create menu window */
- swa.override_redirect = True;
-- swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
-+ swa.background_pixel = 0;
-+ swa.border_pixel = 0;
-+ swa.colormap = cmap;
- swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
-- win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0,
-- CopyFromParent, CopyFromParent, CopyFromParent,
-- CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
-+ win = XCreateWindow(dpy, parentwin, x, y, mw, mh, border_width,
-+ depth, CopyFromParent, visual,
-+ CWOverrideRedirect | CWBackPixel | CWBorderPixel | CWColormap | CWEventMask, &swa);
- XSetClassHint(dpy, win, &ch);
-
-
-@@ -747,7 +759,8 @@ main(int argc, char *argv[])
- if (!XGetWindowAttributes(dpy, parentwin, &wa))
- die("could not get embedding window attributes: 0x%lx",
- parentwin);
-- drw = drw_create(dpy, screen, root, wa.width, wa.height);
-+ xinitvisual();
-+ drw = drw_create(dpy, screen, root, wa.width, wa.height, visual, depth, cmap);
- if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
- die("no fonts could be loaded.");
- lrpad = drw->fonts->h;
-@@ -769,3 +782,40 @@ main(int argc, char *argv[])
-
- return 1; /* unreachable */
- }
-+
-+ void
-+xinitvisual()
-+{
-+ XVisualInfo *infos;
-+ XRenderPictFormat *fmt;
-+ int nitems;
-+ int i;
-+
-+ XVisualInfo tpl = {
-+ .screen = screen,
-+ .depth = 32,
-+ .class = TrueColor
-+ };
-+ long masks = VisualScreenMask | VisualDepthMask | VisualClassMask;
-+
-+ infos = XGetVisualInfo(dpy, masks, &tpl, &nitems);
-+ visual = NULL;
-+ for(i = 0; i < nitems; i ++) {
-+ fmt = XRenderFindVisualFormat(dpy, infos[i].visual);
-+ if (fmt->type == PictTypeDirect && fmt->direct.alphaMask) {
-+ visual = infos[i].visual;
-+ depth = infos[i].depth;
-+ cmap = XCreateColormap(dpy, root, visual, AllocNone);
-+ useargb = 1;
-+ break;
-+ }
-+ }
-+
-+ XFree(infos);
-+
-+ if (! visual) {
-+ visual = DefaultVisual(dpy, screen);
-+ depth = DefaultDepth(dpy, screen);
-+ cmap = DefaultColormap(dpy, screen);
-+ }
-+}
-diff --git a/drw.c b/drw.c
-index 4cdbcbe..fe3aadd 100644
---- a/drw.c
-+++ b/drw.c
-@@ -61,7 +61,7 @@ utf8decode(const char *c, long *u, size_t clen)
- }
-
- Drw *
--drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
-+drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap)
- {
- Drw *drw = ecalloc(1, sizeof(Drw));
-
-@@ -70,8 +70,11 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
- drw->root = root;
- drw->w = w;
- drw->h = h;
-- drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
-- drw->gc = XCreateGC(dpy, root, 0, NULL);
-+ drw->visual = visual;
-+ drw->depth = depth;
-+ drw->cmap = cmap;
-+ drw->drawable = XCreatePixmap(dpy, root, w, h, depth);
-+ drw->gc = XCreateGC(dpy, drw->drawable, 0, NULL);
- XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
-
- return drw;
-@@ -87,7 +90,7 @@ drw_resize(Drw *drw, unsigned int w, unsigned int h)
- drw->h = h;
- if (drw->drawable)
- XFreePixmap(drw->dpy, drw->drawable);
-- drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
-+ drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, drw->depth);
- }
-
- void
-@@ -194,21 +197,22 @@ drw_fontset_free(Fnt *font)
- }
-
- void
--drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
-+drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha)
- {
- if (!drw || !dest || !clrname)
- return;
-
-- if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
-- DefaultColormap(drw->dpy, drw->screen),
-+ if (!XftColorAllocName(drw->dpy, drw->visual, drw->cmap,
- clrname, dest))
- die("error, cannot allocate color '%s'", clrname);
-+
-+ dest->pixel = (dest->pixel & 0x00ffffffU) | (alpha << 24);
- }
-
- /* Wrapper to create color schemes. The caller has to call free(3) on the
- * returned color scheme when done using it. */
- Clr *
--drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
-+drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount)
- {
- size_t i;
- Clr *ret;
-@@ -218,7 +222,7 @@ drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
- return NULL;
-
- for (i = 0; i < clrcount; i++)
-- drw_clr_create(drw, &ret[i], clrnames[i]);
-+ drw_clr_create(drw, &ret[i], clrnames[i], alphas[i]);
- return ret;
- }
-
-@@ -274,9 +278,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
- } else {
- XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
- XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
-- d = XftDrawCreate(drw->dpy, drw->drawable,
-- DefaultVisual(drw->dpy, drw->screen),
-- DefaultColormap(drw->dpy, drw->screen));
-+ d = XftDrawCreate(drw->dpy, drw->drawable, drw->visual, drw->cmap);
- x += lpad;
- w -= lpad;
- }
-diff --git a/drw.h b/drw.h
-index 4c67419..f6fa5cd 100644
---- a/drw.h
-+++ b/drw.h
-@@ -20,6 +20,9 @@ typedef struct {
- Display *dpy;
- int screen;
- Window root;
-+ Visual *visual;
-+ unsigned int depth;
-+ Colormap cmap;
- Drawable drawable;
- GC gc;
- Clr *scheme;
-@@ -27,7 +30,7 @@ typedef struct {
- } Drw;
-
- /* Drawable abstraction */
--Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
-+Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h, Visual*, unsigned int, Colormap);
- void drw_resize(Drw *drw, unsigned int w, unsigned int h);
- void drw_free(Drw *drw);
-
-@@ -38,8 +41,8 @@ unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
- void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
-
- /* Colorscheme abstraction */
--void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
--Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
-+void drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha);
-+Clr *drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount);
-
- /* Cursor abstraction */
- Cur *drw_cur_create(Drw *drw, int shape);
diff --git a/dmenu-5.0/patches/dmenu-border-4.9.diff b/dmenu-5.0/patches/dmenu-border-4.9.diff
deleted file mode 100644
index 89b4437..0000000
--- a/dmenu-5.0/patches/dmenu-border-4.9.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up dmenu-4.9-b/config.def.h dmenu-4.9-a/config.def.h
---- dmenu-4.9-b/config.def.h 2019-02-02 13:55:02.000000000 +0100
-+++ dmenu-4.9-a/config.def.h 2019-05-19 02:10:12.740040403 +0200
-@@ -21,3 +21,6 @@ static unsigned int lines = 0;
- * for example: " /?\"&[]"
- */
- static const char worddelimiters[] = " ";
-+
-+/* Size of the window border */
-+static const unsigned int border_width = 5;
-diff -up dmenu-4.9-b/dmenu.c dmenu-4.9-a/dmenu.c
---- dmenu-4.9-b/dmenu.c 2019-02-02 13:55:02.000000000 +0100
-+++ dmenu-4.9-a/dmenu.c 2019-05-19 02:11:20.966710117 +0200
-@@ -654,9 +654,10 @@ setup(void)
- swa.override_redirect = True;
- swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
- swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
-- win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0,
-+ win = XCreateWindow(dpy, parentwin, x, y, mw, mh, border_width,
- CopyFromParent, CopyFromParent, CopyFromParent,
- CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
-+ XSetWindowBorder(dpy, win, scheme[SchemeSel][ColBg].pixel);
- XSetClassHint(dpy, win, &ch);
-
- /* open input methods */
diff --git a/dmenu-5.0/patches/dmenu-xyw-5.0.diff b/dmenu-5.0/patches/dmenu-xyw-5.0.diff
deleted file mode 100644
index ddf9cfb..0000000
--- a/dmenu-5.0/patches/dmenu-xyw-5.0.diff
+++ /dev/null
@@ -1,116 +0,0 @@
-From 7dc7cb96cdda9ad66e33109223c4cc297a7721d1 Mon Sep 17 00:00:00 2001
-From: Alex Cole <ajzcole@airmail.cc>
-Date: Tue, 6 Oct 2020 10:42:07 +1300
-Subject: [PATCH] Updated xyw for 5.0 properly
-
----
- dmenu.1 | 24 ++++++++++++++++++++++++
- dmenu.c | 22 ++++++++++++++++------
- 2 files changed, 40 insertions(+), 6 deletions(-)
-
-diff --git a/dmenu.1 b/dmenu.1
-index 323f93c..a4ecbbb 100644
---- a/dmenu.1
-+++ b/dmenu.1
-@@ -8,6 +8,12 @@ dmenu \- dynamic menu
- .IR lines ]
- .RB [ \-m
- .IR monitor ]
-+.RB [ \-x
-+.IR xoffset ]
-+.RB [ \-y
-+.IR yoffset ]
-+.RB [ \-z
-+.IR width ]
- .RB [ \-p
- .IR prompt ]
- .RB [ \-fn
-@@ -54,6 +60,24 @@ dmenu lists items vertically, with the given number of lines.
- dmenu is displayed on the monitor number supplied. Monitor numbers are starting
- from 0.
- .TP
-+.BI \-x " xoffset"
-+dmenu is placed at this offset measured from the left side of the monitor.
-+Can be negative.
-+If option
-+.B \-m
-+is present, the measurement will use the given monitor.
-+.TP
-+.BI \-y " yoffset"
-+dmenu is placed at this offset measured from the top of the monitor. If the
-+.B \-b
-+option is used, the offset is measured from the bottom. Can be negative.
-+If option
-+.B \-m
-+is present, the measurement will use the given monitor.
-+.TP
-+.BI \-z " width"
-+sets the width of the dmenu window.
-+.TP
- .BI \-p " prompt"
- defines the prompt to be displayed to the left of the input field.
- .TP
-diff --git a/dmenu.c b/dmenu.c
-index 65f25ce..7be19ae 100644
---- a/dmenu.c
-+++ b/dmenu.c
-@@ -37,6 +37,9 @@ struct item {
- static char text[BUFSIZ] = "";
- static char *embed;
- static int bh, mw, mh;
-+static int dmx = 0; /* put dmenu at this x offset */
-+static int dmy = 0; /* put dmenu at this y offset (measured from the bottom if topbar is 0) */
-+static unsigned int dmw = 0; /* make dmenu this wide */
- static int inputw = 0, promptw;
- static int lrpad; /* sum of left and right padding */
- static size_t cursor;
-@@ -637,9 +640,9 @@ setup(void)
- if (INTERSECT(x, y, 1, 1, info[i]))
- break;
-
-- x = info[i].x_org;
-- y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
-- mw = info[i].width;
-+ x = info[i].x_org + dmx;
-+ y = info[i].y_org + (topbar ? dmy : info[i].height - mh - dmy);
-+ mw = (dmw>0 ? dmw : info[i].width);
- XFree(info);
- } else
- #endif
-@@ -647,9 +650,9 @@ setup(void)
- if (!XGetWindowAttributes(dpy, parentwin, &wa))
- die("could not get embedding window attributes: 0x%lx",
- parentwin);
-- x = 0;
-- y = topbar ? 0 : wa.height - mh;
-- mw = wa.width;
-+ x = dmx;
-+ y = topbar ? dmy : wa.height - mh - dmy;
-+ mw = (dmw>0 ? dmw : wa.width);
- }
- promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
- inputw = MIN(inputw, mw/3);
-@@ -690,6 +693,7 @@ static void
- usage(void)
- {
- fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
-+ " [-x xoffset] [-y yoffset] [-z width]\n"
- " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr);
- exit(1);
- }
-@@ -717,6 +721,12 @@ main(int argc, char *argv[])
- /* these options take one argument */
- else if (!strcmp(argv[i], "-l")) /* number of lines in vertical list */
- lines = atoi(argv[++i]);
-+ else if (!strcmp(argv[i], "-x")) /* window x offset */
-+ dmx = atoi(argv[++i]);
-+ else if (!strcmp(argv[i], "-y")) /* window y offset (from bottom up if -b) */
-+ dmy = atoi(argv[++i]);
-+ else if (!strcmp(argv[i], "-z")) /* make dmenu this wide */
-+ dmw = atoi(argv[++i]);
- else if (!strcmp(argv[i], "-m"))
- mon = atoi(argv[++i]);
- else if (!strcmp(argv[i], "-p")) /* adds prompt to left of input field */
---
-2.28.0
-
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-03 01:21:08 +0000