dotfiles/suckless-slock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
main
suckless-slock/patches/slock-message-xft-20210315-ae681c5.patch

238 lines
6.1 KiB
Diff
Raw Permalink Blame History

From ae681c5a52a2b4b257f9432204deedc8b5570e8d Mon Sep 17 00:00:00 2001
From: Nathaniel Evan <nathanielevan@zohomail.com>
Date: Mon, 15 Mar 2021 05:50:20 +0700
Subject: [PATCH] Updates message patch with Xft font support
---
config.def.h | 9 +++++
config.mk | 4 +-
slock.1 | 4 ++
slock.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++++--
4 files changed, 122 insertions(+), 5 deletions(-)
diff --git a/config.def.h b/config.def.h
index 9855e21..2c83077 100644
--- a/config.def.h
+++ b/config.def.h
@@ -10,3 +10,12 @@ static const char *colorname[NUMCOLS] = {
/* treat a cleared input like a wrong password (color) */
static const int failonclear = 1;
+
+/* default message */
+static const char * message = "Suckless: Software that sucks less.";
+
+/* text color */
+static const char * text_color = "#ffffff";
+
+/* text size (must be a valid size) */
+static const char * font_name = "sans-serif:size:pixelsize=24:antialias=true:autohint=true";
diff --git a/config.mk b/config.mk
index 74429ae..69ef27a 100644
--- a/config.mk
+++ b/config.mk
@@ -11,8 +11,8 @@ X11INC = /usr/X11R6/include
X11LIB = /usr/X11R6/lib
# 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/usr/include/freetype2
+LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr -lXinerama -lXft
# flags
CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -DHAVE_SHADOW_H
diff --git a/slock.1 b/slock.1
index 82cdcd6..541a264 100644
--- a/slock.1
+++ b/slock.1
@@ -6,6 +6,7 @@
.Sh SYNOPSIS
.Nm
.Op Fl v
+.Op Fl m Ar message
.Op Ar cmd Op Ar arg ...
.Sh DESCRIPTION
.Nm
@@ -16,6 +17,9 @@ is executed after the screen has been locked.
.Bl -tag -width Ds
.It Fl v
Print version information to stdout and exit.
+.It Fl m Ar message
+Overrides default slock lock message.
+.TP
.El
.Sh SECURITY CONSIDERATIONS
To make sure a locked screen can not be bypassed by switching VTs
diff --git a/slock.c b/slock.c
index 5ae738c..ef569f8 100644
--- a/slock.c
+++ b/slock.c
@@ -14,16 +14,22 @@
#include <string.h>
#include <unistd.h>
#include <sys/types.h>
+#include <fontconfig/fontconfig.h>
#include <X11/extensions/Xrandr.h>
+#include <X11/extensions/Xinerama.h>
#include <X11/keysym.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
+#include <X11/Xft/Xft.h>
#include "arg.h"
#include "util.h"
char *argv0;
+/* global count to prevent repeated error messages */
+int count_error = 0;
+
enum {
INIT,
INPUT,
@@ -83,6 +89,98 @@ dontkillme(void)
}
#endif
+static void
+writemessage(Display *dpy, Window win, int screen)
+{
+ int len, line_len, width, height, s_width, s_height, i, j, k, tab_replace, tab_size;
+ XftFont *fontinfo;
+ XftColor xftcolor;
+ XftDraw *xftdraw;
+ XGlyphInfo ext_msg, ext_space;
+ XineramaScreenInfo *xsi;
+ xftdraw = XftDrawCreate(dpy, win, DefaultVisual(dpy, screen), DefaultColormap(dpy, screen));
+ fontinfo = XftFontOpenName(dpy, screen, font_name);
+ XftColorAllocName(dpy, DefaultVisual(dpy, screen), DefaultColormap(dpy, screen), text_color, &xftcolor);
+
+ if (fontinfo == NULL) {
+ if (count_error == 0) {
+ fprintf(stderr, "slock: Unable to load font \"%s\"\n", font_name);
+ count_error++;
+ }
+ return;
+ }
+
+ XftTextExtentsUtf8(dpy, fontinfo, (XftChar8 *) " ", 1, &ext_space);
+ tab_size = 8 * ext_space.width;
+
+ /* To prevent "Uninitialized" warnings. */
+ xsi = NULL;
+
+ /*
+ * Start formatting and drawing text
+ */
+
+ len = strlen(message);
+
+ /* Max max line length (cut at '\n') */
+ line_len = 0;
+ k = 0;
+ for (i = j = 0; i < len; i++) {
+ if (message[i] == '\n') {
+ if (i - j > line_len)
+ line_len = i - j;
+ k++;
+ i++;
+ j = i;
+ }
+ }
+ /* If there is only one line */
+ if (line_len == 0)
+ line_len = len;
+
+ if (XineramaIsActive(dpy)) {
+ xsi = XineramaQueryScreens(dpy, &i);
+ s_width = xsi[0].width;
+ s_height = xsi[0].height;
+ } else {
+ s_width = DisplayWidth(dpy, screen);
+ s_height = DisplayHeight(dpy, screen);
+ }
+
+ XftTextExtentsUtf8(dpy, fontinfo, (XftChar8 *)message, line_len, &ext_msg);
+ height = s_height*3/7 - (k*20)/3;
+ width = (s_width - ext_msg.width)/2;
+
+ /* Look for '\n' and print the text between them. */
+ for (i = j = k = 0; i <= len; i++) {
+ /* i == len is the special case for the last line */
+ if (i == len || message[i] == '\n') {
+ tab_replace = 0;
+ while (message[j] == '\t' && j < i) {
+ tab_replace++;
+ j++;
+ }
+
+ XftDrawStringUtf8(xftdraw, &xftcolor, fontinfo, width + tab_size*tab_replace, height + 20*k, (XftChar8 *)(message + j), i - j);
+ while (i < len && message[i] == '\n') {
+ i++;
+ j = i;
+ k++;
+ }
+ }
+ }
+
+ /* xsi should not be NULL anyway if Xinerama is active, but to be safe */
+ if (XineramaIsActive(dpy) && xsi != NULL)
+ XFree(xsi);
+
+ XftFontClose(dpy, fontinfo);
+ XftColorFree(dpy, DefaultVisual(dpy, screen), DefaultColormap(dpy, screen), &xftcolor);
+ XftDrawDestroy(xftdraw);
+}
+
+
+
static const char *
gethash(void)
{
@@ -194,6 +292,7 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
locks[screen]->win,
locks[screen]->colors[color]);
XClearWindow(dpy, locks[screen]->win);
+ writemessage(dpy, locks[screen]->win, screen);
}
oldc = color;
}
@@ -300,7 +399,7 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen)
static void
usage(void)
{
- die("usage: slock [-v] [cmd [arg ...]]\n");
+ die("usage: slock [-v] [-m message] [cmd [arg ...]]\n");
}
int
@@ -319,6 +418,9 @@ main(int argc, char **argv) {
case 'v':
fprintf(stderr, "slock-"VERSION"\n");
return 0;
+ case 'm':
+ message = EARGF(usage());
+ break;
default:
usage();
} ARGEND
@@ -363,10 +465,12 @@ main(int argc, char **argv) {
if (!(locks = calloc(nscreens, sizeof(struct lock *))))
die("slock: out of memory\n");
for (nlocks = 0, s = 0; s < nscreens; s++) {
- if ((locks[s] = lockscreen(dpy, &rr, s)) != NULL)
+ if ((locks[s] = lockscreen(dpy, &rr, s)) != NULL) {
+ writemessage(dpy, locks[s]->win, s);
nlocks++;
- else
+ } else {
break;
+ }
}
XSync(dpy, 0);
--
2.30.1
Reference in New Issue View Git Blame Copy Permalink