update
This commit is contained in:
parent
6612087d47
commit
abe3dcd14e
|
@ -0,0 +1,21 @@
|
||||||
|
/* user and group to drop privileges to */
|
||||||
|
static const char *user = "kc";
|
||||||
|
static const char *group = "kc";
|
||||||
|
|
||||||
|
static const char *colorname[NUMCOLS] = {
|
||||||
|
[INIT] = "black", /* after initialization */
|
||||||
|
[INPUT] = "#005577", /* during input */
|
||||||
|
[FAILED] = "#CC3333", /* wrong password */
|
||||||
|
};
|
||||||
|
|
||||||
|
/* treat a cleared input like a wrong password (color) */
|
||||||
|
static const int failonclear = 1;
|
||||||
|
|
||||||
|
/*Enable blur*/
|
||||||
|
#define BLUR
|
||||||
|
/*Set blur radius*/
|
||||||
|
static const int blurRadius=5;
|
||||||
|
/*Enable Pixelation*/
|
||||||
|
//#define PIXELATION
|
||||||
|
/*Set pixelation radius*/
|
||||||
|
static const int pixelSize=2;
|
|
@ -0,0 +1,15 @@
|
||||||
|
--- config.def.h
|
||||||
|
+++ 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 = "6x10";
|
6
config.h
6
config.h
|
@ -7,7 +7,13 @@ static const char *colorname[NUMCOLS] = {
|
||||||
[INPUT] = "#005577", /* during input */
|
[INPUT] = "#005577", /* during input */
|
||||||
[FAILED] = "#CC3333", /* wrong password */
|
[FAILED] = "#CC3333", /* wrong password */
|
||||||
};
|
};
|
||||||
|
static const char * message = "Suckless: Software that sucks less.";/* default message */
|
||||||
|
|
||||||
|
/* text color */
|
||||||
|
static const char * text_color = "#ffffff";
|
||||||
|
|
||||||
|
/* text size (must be a valid size) */
|
||||||
|
static const char * font_name = "6x13";
|
||||||
/* treat a cleared input like a wrong password (color) */
|
/* treat a cleared input like a wrong password (color) */
|
||||||
static const int failonclear = 1;
|
static const int failonclear = 1;
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ X11LIB = /usr/X11R6/lib
|
||||||
|
|
||||||
# includes and libs
|
# includes and libs
|
||||||
INCS = -I. -I/usr/include -I${X11INC}
|
INCS = -I. -I/usr/include -I${X11INC}
|
||||||
LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr -lImlib2
|
LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lXinerama -lX11 -lXext -lXrandr -lImlib2
|
||||||
|
|
||||||
# flags
|
# flags
|
||||||
CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -DHAVE_SHADOW_H
|
CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -DHAVE_SHADOW_H
|
||||||
|
|
|
@ -0,0 +1,32 @@
|
||||||
|
# slock version
|
||||||
|
VERSION = 1.4
|
||||||
|
|
||||||
|
# Customize below to fit your system
|
||||||
|
|
||||||
|
# paths
|
||||||
|
PREFIX = /usr/local
|
||||||
|
MANPREFIX = ${PREFIX}/share/man
|
||||||
|
|
||||||
|
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 -lImlib2
|
||||||
|
|
||||||
|
# flags
|
||||||
|
CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -DHAVE_SHADOW_H
|
||||||
|
CFLAGS = -std=c99 -pedantic -Wall -Ofast ${INCS} ${CPPFLAGS}
|
||||||
|
LDFLAGS = -s ${LIBS}
|
||||||
|
COMPATSRC = explicit_bzero.c
|
||||||
|
|
||||||
|
# On OpenBSD and Darwin remove -lcrypt from LIBS
|
||||||
|
#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXext -lXrandr
|
||||||
|
# On *BSD remove -DHAVE_SHADOW_H from CPPFLAGS
|
||||||
|
# On NetBSD add -D_NETBSD_SOURCE to CPPFLAGS
|
||||||
|
#CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE -D_NETBSD_SOURCE
|
||||||
|
# On OpenBSD set COMPATSRC to empty
|
||||||
|
#COMPATSRC =
|
||||||
|
|
||||||
|
# compiler and linker
|
||||||
|
CC = cc
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- config.mk
|
||||||
|
+++ config.mk
|
||||||
|
@@ -12,7 +12,7 @@ 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
|
||||||
|
+LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr -lXinerama
|
||||||
|
|
||||||
|
# flags
|
||||||
|
CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -DHAVE_SHADOW_H
|
|
@ -0,0 +1,250 @@
|
||||||
|
From b46028b2797b886154258dcafe71c349cdc68b43 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Blair Drummond <blair.robert.drummond@gmail.com>
|
||||||
|
Date: Wed, 2 Oct 2019 14:59:00 -0400
|
||||||
|
Subject: [PATCH] Add a message command. Fixes old version's bugs.
|
||||||
|
|
||||||
|
---
|
||||||
|
config.def.h | 9 ++++
|
||||||
|
config.mk | 2 +-
|
||||||
|
slock.1 | 7 +++
|
||||||
|
slock.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++++--
|
||||||
|
4 files changed, 133 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 9855e21..c2a0ab2 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 = "6x10";
|
||||||
|
diff --git a/config.mk b/config.mk
|
||||||
|
index 74429ae..c4ccf66 100644
|
||||||
|
--- a/config.mk
|
||||||
|
+++ b/config.mk
|
||||||
|
@@ -12,7 +12,7 @@ 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
|
||||||
|
+LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr -lXinerama
|
||||||
|
|
||||||
|
# flags
|
||||||
|
CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -DHAVE_SHADOW_H
|
||||||
|
diff --git a/slock.1 b/slock.1
|
||||||
|
index 82cdcd6..946165f 100644
|
||||||
|
--- a/slock.1
|
||||||
|
+++ b/slock.1
|
||||||
|
@@ -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 @@ is executed after the screen has been locked.
|
||||||
|
.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 --git a/slock.c b/slock.c
|
||||||
|
index 5ae738c..610929b 100644
|
||||||
|
--- a/slock.c
|
||||||
|
+++ b/slock.c
|
||||||
|
@@ -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>
|
||||||
|
@@ -24,6 +25,9 @@
|
||||||
|
|
||||||
|
char *argv0;
|
||||||
|
|
||||||
|
+/* global count to prevent repeated error messages */
|
||||||
|
+int count_error = 0;
|
||||||
|
+
|
||||||
|
enum {
|
||||||
|
INIT,
|
||||||
|
INPUT,
|
||||||
|
@@ -83,6 +87,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;
|
||||||
|
+ 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)
|
||||||
|
{
|
||||||
|
@@ -194,6 +290,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 +397,7 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen)
|
||||||
|
static void
|
||||||
|
usage(void)
|
||||||
|
{
|
||||||
|
- die("usage: slock [-v] [cmd [arg ...]]\n");
|
||||||
|
+ die("usage: slock [-v] [-f] [-m message] [cmd [arg ...]]\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
@@ -313,12 +410,25 @@ main(int argc, char **argv) {
|
||||||
|
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
|
||||||
|
@@ -363,10 +473,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.20.1
|
||||||
|
|
7
slock.1
7
slock.1
|
@ -6,6 +6,8 @@
|
||||||
.Sh SYNOPSIS
|
.Sh SYNOPSIS
|
||||||
.Nm
|
.Nm
|
||||||
.Op Fl v
|
.Op Fl v
|
||||||
|
.Op Fl f
|
||||||
|
.Op Fl m Ar message
|
||||||
.Op Ar cmd Op Ar arg ...
|
.Op Ar cmd Op Ar arg ...
|
||||||
.Sh DESCRIPTION
|
.Sh DESCRIPTION
|
||||||
.Nm
|
.Nm
|
||||||
|
@ -16,6 +18,11 @@ is executed after the screen has been locked.
|
||||||
.Bl -tag -width Ds
|
.Bl -tag -width Ds
|
||||||
.It Fl v
|
.It Fl v
|
||||||
Print version information to stdout and exit.
|
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
|
.El
|
||||||
.Sh SECURITY CONSIDERATIONS
|
.Sh SECURITY CONSIDERATIONS
|
||||||
To make sure a locked screen can not be bypassed by switching VTs
|
To make sure a locked screen can not be bypassed by switching VTs
|
||||||
|
|
132
slock.c
132
slock.c
|
@ -16,6 +16,7 @@
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <X11/extensions/Xrandr.h>
|
#include <X11/extensions/Xrandr.h>
|
||||||
|
#include <X11/extensions/Xinerama.h>
|
||||||
#include <X11/keysym.h>
|
#include <X11/keysym.h>
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
#include <X11/Xutil.h>
|
#include <X11/Xutil.h>
|
||||||
|
@ -26,6 +27,9 @@
|
||||||
|
|
||||||
char *argv0;
|
char *argv0;
|
||||||
|
|
||||||
|
/* global count to prevent repeated error messages */
|
||||||
|
int count_error = 0;
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
INIT,
|
INIT,
|
||||||
INPUT,
|
INPUT,
|
||||||
|
@ -88,6 +92,98 @@ dontkillme(void)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
static void
|
||||||
|
writemessage(Display *dpy, Window win, int screen,const char * message)
|
||||||
|
{
|
||||||
|
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 *
|
static const char *
|
||||||
gethash(void)
|
gethash(void)
|
||||||
{
|
{
|
||||||
|
@ -207,12 +303,23 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
|
||||||
color = len ? INPUT : ((failure || failonclear) ? FAILED : INIT);
|
color = len ? INPUT : ((failure || failonclear) ? FAILED : INIT);
|
||||||
if (running && oldc != color) {
|
if (running && oldc != color) {
|
||||||
for (screen = 0; screen < nscreens; screen++) {
|
for (screen = 0; screen < nscreens; screen++) {
|
||||||
if(locks[screen]->bgmap)
|
// if (locks[nscreens] != NULL) {
|
||||||
|
if(locks[screen]->bgmap){
|
||||||
XSetWindowBackgroundPixmap(dpy, locks[screen]->win, locks[screen]->bgmap);
|
XSetWindowBackgroundPixmap(dpy, locks[screen]->win, locks[screen]->bgmap);
|
||||||
else
|
}else{
|
||||||
XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[0]);
|
XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[0]);
|
||||||
XClearWindow(dpy, locks[screen]->win);
|
XClearWindow(dpy, locks[screen]->win);
|
||||||
}
|
}
|
||||||
|
if (failure ){
|
||||||
|
XClearWindow(dpy, locks[screen]->win);
|
||||||
|
writemessage(dpy, locks[screen]->win, screen,"color");
|
||||||
|
|
||||||
|
failure=0;}
|
||||||
|
else {
|
||||||
|
XClearWindow(dpy, locks[screen]->win);
|
||||||
|
writemessage(dpy, locks[screen]->win, screen,"...");}
|
||||||
|
|
||||||
|
}
|
||||||
oldc = color;
|
oldc = color;
|
||||||
}
|
}
|
||||||
} else if (rr->active && ev.type == rr->evbase + RRScreenChangeNotify) {
|
} else if (rr->active && ev.type == rr->evbase + RRScreenChangeNotify) {
|
||||||
|
@ -235,8 +342,8 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
|
||||||
XRaiseWindow(dpy, locks[screen]->win);
|
XRaiseWindow(dpy, locks[screen]->win);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (failure ){failure=0;}
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct lock *
|
static struct lock *
|
||||||
lockscreen(Display *dpy, struct xrandr *rr, int screen)
|
lockscreen(Display *dpy, struct xrandr *rr, int screen)
|
||||||
{
|
{
|
||||||
|
@ -331,7 +438,7 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen)
|
||||||
static void
|
static void
|
||||||
usage(void)
|
usage(void)
|
||||||
{
|
{
|
||||||
die("usage: slock [-v] [cmd [arg ...]]\n");
|
die("usage: slock [-v] [-f] [-m message] [cmd [arg ...]]\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
|
@ -351,12 +458,22 @@ if (getenv("USER")!=NULL){
|
||||||
gid_t dgid;
|
gid_t dgid;
|
||||||
const char *hash;
|
const char *hash;
|
||||||
Display *dpy;
|
Display *dpy;
|
||||||
int s, nlocks, nscreens;
|
int i, s, nlocks, nscreens;
|
||||||
|
int count_fonts;
|
||||||
|
char **font_names;
|
||||||
|
|
||||||
ARGBEGIN {
|
ARGBEGIN {
|
||||||
case 'v':
|
case 'v':
|
||||||
fprintf(stderr, "slock-"VERSION"\n");
|
fprintf(stderr, "slock-"VERSION"\n");
|
||||||
return 0;
|
return 0;
|
||||||
|
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:
|
default:
|
||||||
usage();
|
usage();
|
||||||
} ARGEND
|
} ARGEND
|
||||||
|
@ -455,11 +572,12 @@ if (getenv("USER")!=NULL){
|
||||||
if (!(locks = calloc(nscreens, sizeof(struct lock *))))
|
if (!(locks = calloc(nscreens, sizeof(struct lock *))))
|
||||||
die("slock: out of memory\n");
|
die("slock: out of memory\n");
|
||||||
for (nlocks = 0, s = 0; s < nscreens; s++) {
|
for (nlocks = 0, s = 0; s < nscreens; s++) {
|
||||||
if ((locks[s] = lockscreen(dpy, &rr, s)) != NULL)
|
if ((locks[s] = lockscreen(dpy, &rr, s)) != NULL) {
|
||||||
nlocks++;
|
nlocks++;
|
||||||
else
|
} else {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
XSync(dpy, 0);
|
XSync(dpy, 0);
|
||||||
|
|
||||||
/* did we manage to lock everything? */
|
/* did we manage to lock everything? */
|
||||||
|
|
85
slock.c.orig
85
slock.c.orig
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
#include <Imlib2.h>
|
||||||
#include <grp.h>
|
#include <grp.h>
|
||||||
#include <pwd.h>
|
#include <pwd.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
@ -36,6 +37,7 @@ struct lock {
|
||||||
int screen;
|
int screen;
|
||||||
Window root, win;
|
Window root, win;
|
||||||
Pixmap pmap;
|
Pixmap pmap;
|
||||||
|
Pixmap bgmap;
|
||||||
unsigned long colors[NUMCOLS];
|
unsigned long colors[NUMCOLS];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -47,6 +49,8 @@ struct xrandr {
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
Imlib_Image image;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
die(const char *errstr, ...)
|
die(const char *errstr, ...)
|
||||||
{
|
{
|
||||||
|
@ -203,9 +207,10 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
|
||||||
color = len ? INPUT : ((failure || failonclear) ? FAILED : INIT);
|
color = len ? INPUT : ((failure || failonclear) ? FAILED : INIT);
|
||||||
if (running && oldc != color) {
|
if (running && oldc != color) {
|
||||||
for (screen = 0; screen < nscreens; screen++) {
|
for (screen = 0; screen < nscreens; screen++) {
|
||||||
XSetWindowBackground(dpy,
|
if(locks[screen]->bgmap)
|
||||||
locks[screen]->win,
|
XSetWindowBackgroundPixmap(dpy, locks[screen]->win, locks[screen]->bgmap);
|
||||||
locks[screen]->colors[color]);
|
else
|
||||||
|
XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[0]);
|
||||||
XClearWindow(dpy, locks[screen]->win);
|
XClearWindow(dpy, locks[screen]->win);
|
||||||
}
|
}
|
||||||
oldc = color;
|
oldc = color;
|
||||||
|
@ -248,6 +253,17 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen)
|
||||||
lock->screen = screen;
|
lock->screen = screen;
|
||||||
lock->root = RootWindow(dpy, lock->screen);
|
lock->root = RootWindow(dpy, lock->screen);
|
||||||
|
|
||||||
|
if(image)
|
||||||
|
{
|
||||||
|
lock->bgmap = XCreatePixmap(dpy, lock->root, DisplayWidth(dpy, lock->screen), DisplayHeight(dpy, lock->screen), DefaultDepth(dpy, lock->screen));
|
||||||
|
imlib_context_set_image(image);
|
||||||
|
imlib_context_set_display(dpy);
|
||||||
|
imlib_context_set_visual(DefaultVisual(dpy, lock->screen));
|
||||||
|
imlib_context_set_colormap(DefaultColormap(dpy, lock->screen));
|
||||||
|
imlib_context_set_drawable(lock->bgmap);
|
||||||
|
imlib_render_image_on_drawable(0, 0);
|
||||||
|
imlib_free_image();
|
||||||
|
}
|
||||||
for (i = 0; i < NUMCOLS; i++) {
|
for (i = 0; i < NUMCOLS; i++) {
|
||||||
XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen),
|
XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen),
|
||||||
colorname[i], &color, &dummy);
|
colorname[i], &color, &dummy);
|
||||||
|
@ -264,6 +280,8 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen)
|
||||||
CopyFromParent,
|
CopyFromParent,
|
||||||
DefaultVisual(dpy, lock->screen),
|
DefaultVisual(dpy, lock->screen),
|
||||||
CWOverrideRedirect | CWBackPixel, &wa);
|
CWOverrideRedirect | CWBackPixel, &wa);
|
||||||
|
if(lock->bgmap)
|
||||||
|
XSetWindowBackgroundPixmap(dpy, lock->win, lock->bgmap);
|
||||||
lock->pmap = XCreateBitmapFromData(dpy, lock->win, curs, 8, 8);
|
lock->pmap = XCreateBitmapFromData(dpy, lock->win, curs, 8, 8);
|
||||||
invisible = XCreatePixmapCursor(dpy, lock->pmap, lock->pmap,
|
invisible = XCreatePixmapCursor(dpy, lock->pmap, lock->pmap,
|
||||||
&color, &color, 0, 0);
|
&color, &color, 0, 0);
|
||||||
|
@ -318,6 +336,13 @@ usage(void)
|
||||||
|
|
||||||
int
|
int
|
||||||
main(int argc, char **argv) {
|
main(int argc, char **argv) {
|
||||||
|
if (getenv("USER")!=NULL){
|
||||||
|
|
||||||
|
if (getpwnam(getenv("USER"))){
|
||||||
|
group=getenv("USER");}
|
||||||
|
if (getgrnam(getenv("USER"))){
|
||||||
|
user=getenv("USER");}
|
||||||
|
}
|
||||||
struct xrandr rr;
|
struct xrandr rr;
|
||||||
struct lock **locks;
|
struct lock **locks;
|
||||||
struct passwd *pwd;
|
struct passwd *pwd;
|
||||||
|
@ -368,6 +393,60 @@ main(int argc, char **argv) {
|
||||||
if (setuid(duid) < 0)
|
if (setuid(duid) < 0)
|
||||||
die("slock: setuid: %s\n", strerror(errno));
|
die("slock: setuid: %s\n", strerror(errno));
|
||||||
|
|
||||||
|
/*Create screenshot Image*/
|
||||||
|
Screen *scr = ScreenOfDisplay(dpy, DefaultScreen(dpy));
|
||||||
|
image = imlib_create_image(scr->width,scr->height);
|
||||||
|
imlib_context_set_image(image);
|
||||||
|
imlib_context_set_display(dpy);
|
||||||
|
imlib_context_set_visual(DefaultVisual(dpy,0));
|
||||||
|
imlib_context_set_drawable(RootWindow(dpy,XScreenNumberOfScreen(scr)));
|
||||||
|
imlib_copy_drawable_to_image(0,0,0,scr->width,scr->height,0,0,1);
|
||||||
|
|
||||||
|
#ifdef BLUR
|
||||||
|
|
||||||
|
/*Blur function*/
|
||||||
|
imlib_image_blur(blurRadius);
|
||||||
|
#endif // BLUR
|
||||||
|
|
||||||
|
#ifdef PIXELATION
|
||||||
|
/*Pixelation*/
|
||||||
|
int width = scr->width;
|
||||||
|
int height = scr->height;
|
||||||
|
|
||||||
|
for(int y = 0; y < height; y += pixelSize)
|
||||||
|
{
|
||||||
|
for(int x = 0; x < width; x += pixelSize)
|
||||||
|
{
|
||||||
|
int red = 0;
|
||||||
|
int green = 0;
|
||||||
|
int blue = 0;
|
||||||
|
|
||||||
|
Imlib_Color pixel;
|
||||||
|
Imlib_Color* pp;
|
||||||
|
pp = &pixel;
|
||||||
|
for(int j = 0; j < pixelSize && j < height; j++)
|
||||||
|
{
|
||||||
|
for(int i = 0; i < pixelSize && i < width; i++)
|
||||||
|
{
|
||||||
|
imlib_image_query_pixel(x+i,y+j,pp);
|
||||||
|
red += pixel.red;
|
||||||
|
green += pixel.green;
|
||||||
|
blue += pixel.blue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
red /= (pixelSize*pixelSize);
|
||||||
|
green /= (pixelSize*pixelSize);
|
||||||
|
blue /= (pixelSize*pixelSize);
|
||||||
|
imlib_context_set_color(red,green,blue,pixel.alpha);
|
||||||
|
imlib_image_fill_rectangle(x,y,pixelSize,pixelSize);
|
||||||
|
red = 0;
|
||||||
|
green = 0;
|
||||||
|
blue = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#endif
|
||||||
/* check for Xrandr support */
|
/* check for Xrandr support */
|
||||||
rr.active = XRRQueryExtension(dpy, &rr.evbase, &rr.errbase);
|
rr.active = XRRQueryExtension(dpy, &rr.evbase, &rr.errbase);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue