slock

slock-message-20191215-post_pam.diff (5857B)

---

 diff --unified --recursive --text --color a/config.def.h b/config.def.h
 --- a/config.def.h	2019-12-15 02:32:55.802402599 +0100
 +++ b/config.def.h	2019-12-15 02:34:38.442408519 +0100
 @@ -14,3 +14,12 @@
  
  /* PAM service that's used for authentication */
  static const char* pam_service = "login";
 +
 +/* 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 = "6x10";
 diff --unified --recursive --text --color a/config.mk b/config.mk
 --- a/config.mk	2019-12-15 02:32:55.802402599 +0100
 +++ b/config.mk	2019-12-15 02:34:48.715742442 +0100
 @@ -12,7 +12,7 @@
  
  # includes and libs
  INCS = -I. -I/usr/include -I${X11INC}
 -LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr -lpam
 +LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr -lpam -lXinerama
  
  # flags
  CPPFLAGS += -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -DHAVE_SHADOW_H
 diff --unified --recursive --text --color a/slock.1 b/slock.1
 --- a/slock.1	2016-11-20 01:31:23.000000000 +0100
 +++ b/slock.1	2019-12-15 02:34:07.839073423 +0100
 @@ -6,6 +6,8 @@
  .Sh SYNOPSIS
  .Nm
  .Op Fl v
 +.Op Fl f
 +.Op Fl m Ar message
  .Op Ar cmd Op Ar arg ...
  .Sh DESCRIPTION
  .Nm
 @@ -16,6 +18,11 @@
  .Bl -tag -width Ds
  .It Fl v
  Print version information to stdout and exit.
 +.It Fl f
 +List all valid X fonts 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 --unified --recursive --text --color a/slock.c b/slock.c
 --- a/slock.c	2019-12-15 02:32:55.802402599 +0100
 +++ b/slock.c	2019-12-15 02:34:07.839073423 +0100
 @@ -15,6 +15,7 @@
  #include <unistd.h>
  #include <sys/types.h>
  #include <X11/extensions/Xrandr.h>
 +#include <X11/extensions/Xinerama.h>
  #include <X11/keysym.h>
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
 @@ -29,6 +30,9 @@
  struct pam_conv pamc = {pam_conv, NULL};
  char passwd[256];
  
 +/* global count to prevent repeated error messages */
 +int count_error = 0;
 +
  enum {
  	INIT,
  	INPUT,
 @@ -114,6 +118,98 @@
  }
  #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;
 +	XGCValues gr_values;
 +	XFontStruct *fontinfo;
 +	XColor color, dummy;
 +	XineramaScreenInfo *xsi;
 +	GC gc;
 +	fontinfo = XLoadQueryFont(dpy, font_name);
 +
 +	if (fontinfo == NULL) {
 +		if (count_error == 0) {
 +			fprintf(stderr, "slock: Unable to load font \"%s\"\n", font_name);
 +			fprintf(stderr, "slock: Try listing fonts with 'slock -f'\n");
 +			count_error++;
 +		}
 +		return;
 +	}
 +
 +	tab_size = 8 * XTextWidth(fontinfo, " ", 1);
 +
 +	XAllocNamedColor(dpy, DefaultColormap(dpy, screen),
 +		 text_color, &color, &dummy);
 +
 +	gr_values.font = fontinfo->fid;
 +	gr_values.foreground = color.pixel;
 +	gc=XCreateGC(dpy,win,GCFont+GCForeground, &gr_values);
 +
 +	/*  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);
 +	}
 +
 +	height = s_height*3/7 - (k*20)/3;
 +	width  = (s_width - XTextWidth(fontinfo, message, line_len))/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++;
 +			}
 +
 +			XDrawString(dpy, win, gc, width + tab_size*tab_replace, height + 20*k, 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);
 +}
 +
 +
 +
  static const char *
  gethash(void)
  {
 @@ -244,6 +340,7 @@
  					                     locks[screen]->win,
  					                     locks[screen]->colors[color]);
  					XClearWindow(dpy, locks[screen]->win);
 +					writemessage(dpy, locks[screen]->win, screen);
  				}
  				oldc = color;
  			}
 @@ -342,7 +439,7 @@
  static void
  usage(void)
  {
 -	die("usage: slock [-v] [cmd [arg ...]]\n");
 +	die("usage: slock [-v] [-f] [-m message] [cmd [arg ...]]\n");
  }
  
  int
 @@ -355,12 +452,25 @@
  	gid_t dgid;
  	const char *hash;
  	Display *dpy;
 -	int s, nlocks, nscreens;
 +	int i, s, nlocks, nscreens;
 +	int count_fonts;
 +	char **font_names;
  
  	ARGBEGIN {
  	case 'v':
  		fprintf(stderr, "slock-"VERSION"\n");
  		return 0;
 +	case 'm':
 +		message = EARGF(usage());
 +		break;
 +	case 'f':
 +		if (!(dpy = XOpenDisplay(NULL)))
 +			die("slock: cannot open display\n");
 +		font_names = XListFonts(dpy, "*", 10000 /* list 10000 fonts*/, &count_fonts);
 +		for (i=0; i<count_fonts; i++) {
 +			fprintf(stderr, "%s\n", *(font_names+i));
 +		}
 +		return 0;
  	default:
  		usage();
  	} ARGEND
 @@ -404,10 +514,12 @@
  	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);