From e61da07522a060da98fa3a56db3d0360469b26cf Mon Sep 17 00:00:00 2001 From: auric <104602845+ihateamongus@users.noreply.github.com> Date: Mon, 8 Sep 2025 21:19:14 -0500 Subject: organize repository layout --- slock/patches/slock-dwmlogo-20210324.diff | 246 ------------------------------ 1 file changed, 246 deletions(-) delete mode 100644 slock/patches/slock-dwmlogo-20210324.diff (limited to 'slock/patches/slock-dwmlogo-20210324.diff') diff --git a/slock/patches/slock-dwmlogo-20210324.diff b/slock/patches/slock-dwmlogo-20210324.diff deleted file mode 100644 index 90625ea..0000000 --- a/slock/patches/slock-dwmlogo-20210324.diff +++ /dev/null @@ -1,246 +0,0 @@ -diff --git a/config.def.h b/config.def.h -index 9855e21..0940fb8 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -3,10 +3,30 @@ static const char *user = "nobody"; - static const char *group = "nogroup"; - - static const char *colorname[NUMCOLS] = { -- [INIT] = "black", /* after initialization */ -+ [BACKGROUND] = "black", /* after initialization */ -+ [INIT] = "#2d2d2d", /* after initialization */ - [INPUT] = "#005577", /* during input */ - [FAILED] = "#CC3333", /* wrong password */ - }; - - /* treat a cleared input like a wrong password (color) */ - static const int failonclear = 1; -+ -+/* insert grid pattern with scale 1:1, the size can be changed with logosize */ -+static const int logosize = 75; -+static const int logow = 12; /* grid width and height for right center alignment*/ -+static const int logoh = 6; -+ -+static XRectangle rectangles[9] = { -+ /* x y w h */ -+ { 0, 3, 1, 3 }, -+ { 1, 3, 2, 1 }, -+ { 0, 5, 8, 1 }, -+ { 3, 0, 1, 5 }, -+ { 5, 3, 1, 2 }, -+ { 7, 3, 1, 2 }, -+ { 8, 3, 4, 1 }, -+ { 9, 4, 1, 2 }, -+ { 11, 4, 1, 2 }, -+ -+}; -diff --git a/config.mk b/config.mk -index 74429ae..08356e8 100644 ---- a/config.mk -+++ b/config.mk -@@ -10,12 +10,20 @@ MANPREFIX = ${PREFIX}/share/man - X11INC = /usr/X11R6/include - X11LIB = /usr/X11R6/lib - -+# Xinerama, comment if you don't want it -+XINERAMALIBS = -lXinerama -+XINERAMAFLAGS = -DXINERAMA -+ -+# freetype -+FREETYPELIBS = -lXft -+FREETYPEINC = /usr/include/freetype2 -+ - # includes and libs --INCS = -I. -I/usr/include -I${X11INC} --LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr -+INCS = -I. -I/usr/include -I${X11INC} -I${FREETYPEINC} -+LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXext -lXrandr - - # flags --CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -DHAVE_SHADOW_H -+CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -DHAVE_SHADOW_H ${XINERAMAFLAGS} - CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} - LDFLAGS = -s ${LIBS} - COMPATSRC = explicit_bzero.c -diff --git a/slock.c b/slock.c -index 5ae738c..3ea9b7f 100644 ---- a/slock.c -+++ b/slock.c -@@ -1,5 +1,6 @@ - /* See LICENSE file for license details. */ --#define _XOPEN_SOURCE 500 -+#define _XOPEN_SOURCE 500 -+#define LENGTH(X) (sizeof X / sizeof X[0]) - #if HAVE_SHADOW_H - #include - #endif -@@ -15,9 +16,13 @@ - #include - #include - #include -+#ifdef XINERAMA -+#include -+#endif - #include - #include - #include -+#include - - #include "arg.h" - #include "util.h" -@@ -25,17 +30,25 @@ - char *argv0; - - enum { -+ BACKGROUND, - INIT, - INPUT, - FAILED, - NUMCOLS - }; - -+#include "config.h" -+ - struct lock { - int screen; - Window root, win; - Pixmap pmap; - unsigned long colors[NUMCOLS]; -+ unsigned int x, y; -+ unsigned int xoff, yoff, mw, mh; -+ Drawable drawable; -+ GC gc; -+ XRectangle rectangles[LENGTH(rectangles)]; - }; - - struct xrandr { -@@ -44,8 +57,6 @@ struct xrandr { - int errbase; - }; - --#include "config.h" -- - static void - die(const char *errstr, ...) - { -@@ -124,6 +135,32 @@ gethash(void) - return hash; - } - -+static void -+resizerectangles(struct lock *lock) -+{ -+ int i; -+ -+ for (i = 0; i < LENGTH(rectangles); i++){ -+ lock->rectangles[i].x = (rectangles[i].x * logosize) -+ + lock->xoff + ((lock->mw) / 2) - (logow / 2 * logosize); -+ lock->rectangles[i].y = (rectangles[i].y * logosize) -+ + lock->yoff + ((lock->mh) / 2) - (logoh / 2 * logosize); -+ lock->rectangles[i].width = rectangles[i].width * logosize; -+ lock->rectangles[i].height = rectangles[i].height * logosize; -+ } -+} -+ -+static void -+drawlogo(Display *dpy, struct lock *lock, int color) -+{ -+ XSetForeground(dpy, lock->gc, lock->colors[BACKGROUND]); -+ XFillRectangle(dpy, lock->drawable, lock->gc, 0, 0, lock->x, lock->y); -+ XSetForeground(dpy, lock->gc, lock->colors[color]); -+ XFillRectangles(dpy, lock->drawable, lock->gc, lock->rectangles, LENGTH(rectangles)); -+ XCopyArea(dpy, lock->drawable, lock->win, lock->gc, 0, 0, lock->x, lock->y, 0, 0); -+ XSync(dpy, False); -+} -+ - static void - readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens, - const char *hash) -@@ -190,10 +227,7 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens, - color = len ? INPUT : ((failure || failonclear) ? FAILED : INIT); - if (running && oldc != color) { - for (screen = 0; screen < nscreens; screen++) { -- XSetWindowBackground(dpy, -- locks[screen]->win, -- locks[screen]->colors[color]); -- XClearWindow(dpy, locks[screen]->win); -+ drawlogo(dpy, locks[screen], color); - } - oldc = color; - } -@@ -228,6 +262,10 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen) - XColor color, dummy; - XSetWindowAttributes wa; - Cursor invisible; -+#ifdef XINERAMA -+ XineramaScreenInfo *info; -+ int n; -+#endif - - if (dpy == NULL || screen < 0 || !(lock = malloc(sizeof(struct lock)))) - return NULL; -@@ -241,12 +279,31 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen) - lock->colors[i] = color.pixel; - } - -+ lock->x = DisplayWidth(dpy, lock->screen); -+ lock->y = DisplayHeight(dpy, lock->screen); -+#ifdef XINERAMA -+ if ((info = XineramaQueryScreens(dpy, &n))) { -+ lock->xoff = info[0].x_org; -+ lock->yoff = info[0].y_org; -+ lock->mw = info[0].width; -+ lock->mh = info[0].height; -+ } else -+#endif -+ { -+ lock->xoff = lock->yoff = 0; -+ lock->mw = lock->x; -+ lock->mh = lock->y; -+ } -+ lock->drawable = XCreatePixmap(dpy, lock->root, -+ lock->x, lock->y, DefaultDepth(dpy, screen)); -+ lock->gc = XCreateGC(dpy, lock->root, 0, NULL); -+ XSetLineAttributes(dpy, lock->gc, 1, LineSolid, CapButt, JoinMiter); -+ - /* init */ - wa.override_redirect = 1; -- wa.background_pixel = lock->colors[INIT]; -+ wa.background_pixel = lock->colors[BACKGROUND]; - lock->win = XCreateWindow(dpy, lock->root, 0, 0, -- DisplayWidth(dpy, lock->screen), -- DisplayHeight(dpy, lock->screen), -+ lock->x, lock->y, - 0, DefaultDepth(dpy, lock->screen), - CopyFromParent, - DefaultVisual(dpy, lock->screen), -@@ -256,6 +313,8 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen) - &color, &color, 0, 0); - XDefineCursor(dpy, lock->win, invisible); - -+ resizerectangles(lock); -+ - /* Try to grab mouse pointer *and* keyboard for 600ms, else fail the lock */ - for (i = 0, ptgrab = kbgrab = -1; i < 6; i++) { - if (ptgrab != GrabSuccess) { -@@ -276,6 +335,7 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen) - XRRSelectInput(dpy, lock->win, RRScreenChangeNotifyMask); - - XSelectInput(dpy, lock->root, SubstructureNotifyMask); -+ drawlogo(dpy, lock, INIT); - return lock; - } - -@@ -391,5 +451,12 @@ main(int argc, char **argv) { - /* everything is now blank. Wait for the correct password */ - readpw(dpy, &rr, locks, nscreens, hash); - -+ for (nlocks = 0, s = 0; s < nscreens; s++) { -+ XFreePixmap(dpy, locks[s]->drawable); -+ XFreeGC(dpy, locks[s]->gc); -+ } -+ -+ XSync(dpy, 0); -+ XCloseDisplay(dpy); - return 0; - } -- cgit v1.2.3