Updates dwm, st, dmenu, slock, and dwmblocks

13 files changed, 1082 insertions, 492 deletions

diff --git a/slock/LICENSE b/slock/LICENSE
index cb52dba..2e4419b 100755..100644
--- a/slock/LICENSE
+++ b/slock/LICENSE
@@ -4,7 +4,6 @@ MIT/X Consortium License
 © 2014 Dimitris Papastamos <sin@2f30.org>
 © 2006-2014 Anselm R Garbe <anselm@garbe.us>
 © 2014-2016 Laslo Hunhold <dev@frign.de>
-© 2016-2023 Hiltjo Posthuma <hiltjo@codemadness.org>
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/slock/Makefile b/slock/Makefile
index 6d74b21..b20fd4e 100755..100644
--- a/slock/Makefile
+++ b/slock/Makefile
@@ -6,41 +6,56 @@ include config.mk
 SRC = slock.c ${COMPATSRC}
 OBJ = ${SRC:.c=.o}
 
-all: slock
+all: options slock
+
+options:
+	@echo slock build options:
+	@echo "CFLAGS   = ${CFLAGS}"
+	@echo "LDFLAGS  = ${LDFLAGS}"
+	@echo "CC       = ${CC}"
 
 .c.o:
-	${CC} -c ${CFLAGS} $<
+	@echo CC $<
+	@${CC} -c ${CFLAGS} $<
 
 ${OBJ}: config.h config.mk arg.h util.h
 
 config.h:
-	cp config.def.h $@
+	@echo creating $@ from config.def.h
+	@cp config.def.h $@
 
 slock: ${OBJ}
-	${CC} -o $@ ${OBJ} ${LDFLAGS}
+	@echo CC -o $@
+	@${CC} -o $@ ${OBJ} ${LDFLAGS}
 
 clean:
-	rm -f slock ${OBJ} slock-${VERSION}.tar.gz
+	@echo cleaning
+	@rm -f slock ${OBJ} slock-${VERSION}.tar.gz
 
 dist: clean
-	mkdir -p slock-${VERSION}
-	cp -R LICENSE Makefile README slock.1 config.mk \
+	@echo creating dist tarball
+	@mkdir -p slock-${VERSION}
+	@cp -R LICENSE Makefile README slock.1 config.mk \
 		${SRC} config.def.h arg.h util.h slock-${VERSION}
-	tar -cf slock-${VERSION}.tar slock-${VERSION}
-	gzip slock-${VERSION}.tar
-	rm -rf slock-${VERSION}
+	@tar -cf slock-${VERSION}.tar slock-${VERSION}
+	@gzip slock-${VERSION}.tar
+	@rm -rf slock-${VERSION}
 
 install: all
-	mkdir -p ${DESTDIR}${PREFIX}/bin
-	cp -f slock ${DESTDIR}${PREFIX}/bin
-	chmod 755 ${DESTDIR}${PREFIX}/bin/slock
-	chmod u+s ${DESTDIR}${PREFIX}/bin/slock
-	mkdir -p ${DESTDIR}${MANPREFIX}/man1
-	sed "s/VERSION/${VERSION}/g" <slock.1 >${DESTDIR}${MANPREFIX}/man1/slock.1
-	chmod 644 ${DESTDIR}${MANPREFIX}/man1/slock.1
+	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
+	@mkdir -p ${DESTDIR}${PREFIX}/bin
+	@cp -f slock ${DESTDIR}${PREFIX}/bin
+	@chmod 755 ${DESTDIR}${PREFIX}/bin/slock
+	@chmod u+s ${DESTDIR}${PREFIX}/bin/slock
+	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
+	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
+	@sed "s/VERSION/${VERSION}/g" <slock.1 >${DESTDIR}${MANPREFIX}/man1/slock.1
+	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/slock.1
 
 uninstall:
-	rm -f ${DESTDIR}${PREFIX}/bin/slock
-	rm -f ${DESTDIR}${MANPREFIX}/man1/slock.1
+	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
+	@rm -f ${DESTDIR}${PREFIX}/bin/slock
+	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
+	@rm -f ${DESTDIR}${MANPREFIX}/man1/slock.1
 
-.PHONY: all clean dist install uninstall
+.PHONY: all options clean dist install uninstall
diff --git a/slock/README b/slock/README
index dcacd01..dcacd01 100755..100644
--- a/slock/README
+++ b/slock/README
diff --git a/slock/arg.h b/slock/arg.h
index 0b23c53..0b23c53 100755..100644
--- a/slock/arg.h
+++ b/slock/arg.h
diff --git a/slock/config.def.h b/slock/config.def.h
index 6b2f461..6fbd851 100755..100644
--- a/slock/config.def.h
+++ b/slock/config.def.h
@@ -1,19 +1,37 @@
 /* user and group to drop privileges to */
-static const char *user = "nobody";
-static const char *group = "nogroup";
+static const char *group = "wheel";
+static int personalblur = 0;
 
 static const char *colorname[NUMCOLS] = {
-    [INIT] = "black",     /* after initialization */
-    [INPUT] = "#005577",  /* during input */
-    [FAILED] = "#CC3333", /* wrong password */
-    [CAPS] = "red",       /* CapsLock on */
+	[INIT] =   "#3c3836",         /* after initialization */
+	[INPUT] =  "#005577",       /* during input */
+	[INPUT_ALT] = "#227799",    /* during input, second color */
+	[FAILED] = "#CC3333",       /* wrong password */
+	[CAPS] = "#FF0000",             /* CapsLock on */
+    [CAPS_ALT] = "#FFA666",     /* hypothetical alternate color for CapsLock on */
+	[PAM] =    "#9400D3",       /* waiting for PAM */
 };
 
 /* treat a cleared input like a wrong password (color) */
 static const int failonclear = 1;
 
-/* time to cancel lock with mouse movement in seconds */
-static const int timetocancel = 3;
+/* Background image path, should be available to the user above */
+static const char* background_image = "/home/si/Pictures/wallpaper/yejin-wall.png";
+
+/* default message */
+static const char *message = "THESIAH";
+
+/* text color */
+static const char *text_color = "#131313";
+
+/* text size */
+static const char *font_name = "monospace:size=18:bold";
+
+/* time in seconds before the monitor shuts down */
+static const int monitortime = 600;
+
+/* PAM service that's used for authentication */
+static const char* pam_service = "login";
 
 /* insert grid pattern with scale 1:1, the size can be changed with logosize */
 static const int logosize = 75;
@@ -22,16 +40,38 @@ static const int logow = 12;
 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},
+	/* 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 },
 };
 
 /*Enable blur*/
 #define BLUR
 /*Set blur radius*/
-static const int blurRadius = 5;
+static int blurRadius=5;
 /*Enable Pixelation*/
-// #define PIXELATION
+//#define PIXELATION
 /*Set pixelation radius*/
-static const int pixelSize = 0;
+static const int pixelSize=0;
+
+/*
+ * Xresources preferences to load at startup
+ */
+ResourcePref resources[] = {
+		{ "color0",    STRING,  &colorname[INIT] },
+		{ "color4",     STRING,  &colorname[INPUT] },
+		{ "color12",    STRING,  &colorname[INPUT_ALT] },
+		{ "color1",     STRING,  &colorname[FAILED] },
+		{ "color3",     STRING,  &colorname[CAPS] },
+		{ "color11",    STRING,  &colorname[CAPS_ALT] },
+		{ "color13",    STRING,  &colorname[PAM] },
+		{ "color0",     STRING,  &text_color },
+};
+
diff --git a/slock/config.def.h.bak b/slock/config.def.h.bak
new file mode 100644
index 0000000..946c17d
--- /dev/null
+++ b/slock/config.def.h.bak
@@ -0,0 +1,77 @@
+/* user and group to drop privileges to */
+static const char *group = "wheel";
+static int personalblur = 0;
+
+static const char *colorname[NUMCOLS] = {
+	[INIT] =   "#3c3836",         /* after initialization */
+	[INPUT] =  "#005577",       /* during input */
+	[INPUT_ALT] = "#227799",    /* during input, second color */
+	[FAILED] = "#CC3333",       /* wrong password */
+	[CAPS] = "#FF0000",             /* CapsLock on */
+    [CAPS_ALT] = "#FFA666",     /* hypothetical alternate color for CapsLock on */
+	[PAM] =    "#9400D3",       /* waiting for PAM */
+};
+
+/* treat a cleared input like a wrong password (color) */
+static const int failonclear = 1;
+
+/* Background image path, should be available to the user above */
+static const char* background_image = "/home/si/Pictures/yejin-wall.png";
+
+/* default message */
+static const char *message = "THESIAH";
+
+/* text color */
+static const char *text_color = "#131313";
+
+/* text size */
+static const char *font_name = "monospace:size=18:bold";
+
+/* time in seconds before the monitor shuts down */
+static const int monitortime = 600;
+
+/* PAM service that's used for authentication */
+static const char* pam_service = "login";
+
+/* insert grid pattern with scale 1:1, the size can be changed with logosize */
+static const int logosize = 75;
+/* grid width and height for right center alignment */
+static const int logow = 12;
+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 },
+};
+
+/*Enable blur*/
+#define BLUR
+/*Set blur radius*/
+static int blurRadius=5;
+/*Enable Pixelation*/
+//#define PIXELATION
+/*Set pixelation radius*/
+static const int pixelSize=0;
+
+/*
+ * Xresources preferences to load at startup
+ */
+ResourcePref resources[] = {
+		{ "color0",    STRING,  &colorname[INIT] },
+		{ "color4",     STRING,  &colorname[INPUT] },
+		{ "color12",    STRING,  &colorname[INPUT_ALT] },
+		{ "color1",     STRING,  &colorname[FAILED] },
+		{ "color3",     STRING,  &colorname[CAPS] },
+		{ "color11",    STRING,  &colorname[CAPS_ALT] },
+		{ "color13",    STRING,  &colorname[PAM] },
+		{ "color0",     STRING,  &text_color },
+};
+
diff --git a/slock/config.h b/slock/config.h
index b347559..6fbd851 100755..100644
--- a/slock/config.h
+++ b/slock/config.h
@@ -1,19 +1,37 @@
 /* user and group to drop privileges to */
-static const char *user = "nobody";
-static const char *group = "nogroup";
+static const char *group = "wheel";
+static int personalblur = 0;
 
 static const char *colorname[NUMCOLS] = {
-    [INIT] = "black",     /* after initialization */
-    [INPUT] = "#005577",  /* during input */
-    [FAILED] = "#CC3333", /* wrong password */
-    [CAPS] = "orange",    /* CapsLock on */
+	[INIT] =   "#3c3836",         /* after initialization */
+	[INPUT] =  "#005577",       /* during input */
+	[INPUT_ALT] = "#227799",    /* during input, second color */
+	[FAILED] = "#CC3333",       /* wrong password */
+	[CAPS] = "#FF0000",             /* CapsLock on */
+    [CAPS_ALT] = "#FFA666",     /* hypothetical alternate color for CapsLock on */
+	[PAM] =    "#9400D3",       /* waiting for PAM */
 };
 
 /* treat a cleared input like a wrong password (color) */
 static const int failonclear = 1;
 
-/* time to cancel lock with mouse movement in seconds */
-static const int timetocancel = 3;
+/* Background image path, should be available to the user above */
+static const char* background_image = "/home/si/Pictures/wallpaper/yejin-wall.png";
+
+/* default message */
+static const char *message = "THESIAH";
+
+/* text color */
+static const char *text_color = "#131313";
+
+/* text size */
+static const char *font_name = "monospace:size=18:bold";
+
+/* time in seconds before the monitor shuts down */
+static const int monitortime = 600;
+
+/* PAM service that's used for authentication */
+static const char* pam_service = "login";
 
 /* insert grid pattern with scale 1:1, the size can be changed with logosize */
 static const int logosize = 75;
@@ -22,16 +40,38 @@ static const int logow = 12;
 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},
+	/* 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 },
 };
 
 /*Enable blur*/
 #define BLUR
 /*Set blur radius*/
-static const int blurRadius = 5;
+static int blurRadius=5;
 /*Enable Pixelation*/
-// #define PIXELATION
+//#define PIXELATION
 /*Set pixelation radius*/
-static const int pixelSize = 0;
+static const int pixelSize=0;
+
+/*
+ * Xresources preferences to load at startup
+ */
+ResourcePref resources[] = {
+		{ "color0",    STRING,  &colorname[INIT] },
+		{ "color4",     STRING,  &colorname[INPUT] },
+		{ "color12",    STRING,  &colorname[INPUT_ALT] },
+		{ "color1",     STRING,  &colorname[FAILED] },
+		{ "color3",     STRING,  &colorname[CAPS] },
+		{ "color11",    STRING,  &colorname[CAPS_ALT] },
+		{ "color13",    STRING,  &colorname[PAM] },
+		{ "color0",     STRING,  &text_color },
+};
+
diff --git a/slock/config.h.bak b/slock/config.h.bak
new file mode 100644
index 0000000..6fbd851
--- /dev/null
+++ b/slock/config.h.bak
@@ -0,0 +1,77 @@
+/* user and group to drop privileges to */
+static const char *group = "wheel";
+static int personalblur = 0;
+
+static const char *colorname[NUMCOLS] = {
+	[INIT] =   "#3c3836",         /* after initialization */
+	[INPUT] =  "#005577",       /* during input */
+	[INPUT_ALT] = "#227799",    /* during input, second color */
+	[FAILED] = "#CC3333",       /* wrong password */
+	[CAPS] = "#FF0000",             /* CapsLock on */
+    [CAPS_ALT] = "#FFA666",     /* hypothetical alternate color for CapsLock on */
+	[PAM] =    "#9400D3",       /* waiting for PAM */
+};
+
+/* treat a cleared input like a wrong password (color) */
+static const int failonclear = 1;
+
+/* Background image path, should be available to the user above */
+static const char* background_image = "/home/si/Pictures/wallpaper/yejin-wall.png";
+
+/* default message */
+static const char *message = "THESIAH";
+
+/* text color */
+static const char *text_color = "#131313";
+
+/* text size */
+static const char *font_name = "monospace:size=18:bold";
+
+/* time in seconds before the monitor shuts down */
+static const int monitortime = 600;
+
+/* PAM service that's used for authentication */
+static const char* pam_service = "login";
+
+/* insert grid pattern with scale 1:1, the size can be changed with logosize */
+static const int logosize = 75;
+/* grid width and height for right center alignment */
+static const int logow = 12;
+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 },
+};
+
+/*Enable blur*/
+#define BLUR
+/*Set blur radius*/
+static int blurRadius=5;
+/*Enable Pixelation*/
+//#define PIXELATION
+/*Set pixelation radius*/
+static const int pixelSize=0;
+
+/*
+ * Xresources preferences to load at startup
+ */
+ResourcePref resources[] = {
+		{ "color0",    STRING,  &colorname[INIT] },
+		{ "color4",     STRING,  &colorname[INPUT] },
+		{ "color12",    STRING,  &colorname[INPUT_ALT] },
+		{ "color1",     STRING,  &colorname[FAILED] },
+		{ "color3",     STRING,  &colorname[CAPS] },
+		{ "color11",    STRING,  &colorname[CAPS_ALT] },
+		{ "color13",    STRING,  &colorname[PAM] },
+		{ "color0",     STRING,  &text_color },
+};
+
diff --git a/slock/config.mk b/slock/config.mk
index 587adb4..7dab153 100755..100644
--- a/slock/config.mk
+++ b/slock/config.mk
@@ -20,7 +20,7 @@ FREETYPEINC = /usr/include/freetype2
 
 # includes and libs
 INCS = -I. -I/usr/include -I${X11INC} -I${FREETYPEINC}
-LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXext -lXrandr -lImlib2
+LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXext -lXrandr -lImlib2 -lpam -lcairo
 
 # flags
 CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -DHAVE_SHADOW_H ${XINERAMAFLAGS}
@@ -35,3 +35,6 @@ COMPATSRC = explicit_bzero.c
 #CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE -D_NETBSD_SOURCE
 # On OpenBSD set COMPATSRC to empty
 #COMPATSRC =
+
+# compiler and linker
+CC = cc
diff --git a/slock/explicit_bzero.c b/slock/explicit_bzero.c
index 3e33ca8..3e33ca8 100755..100644
--- a/slock/explicit_bzero.c
+++ b/slock/explicit_bzero.c
diff --git a/slock/slock.1 b/slock/slock.1
index 40c15e1..541a264 100755..100644
--- a/slock/slock.1
+++ b/slock/slock.1
@@ -1,45 +1,43 @@
-.Dd October 6, 2023
+.Dd 2016-08-23
 .Dt SLOCK 1
-.Os
 .Sh NAME
 .Nm slock
 .Nd simple X screen locker
 .Sh SYNOPSIS
 .Nm
 .Op Fl v
+.Op Fl m Ar message
 .Op Ar cmd Op Ar arg ...
 .Sh DESCRIPTION
 .Nm
-is a simple X screen locker.
-If provided,
-.Ar cmd
+is a simple X screen locker. If provided,
+.Ar cmd Op Ar arg ...
 is executed after the screen has been locked.
-.Pp
-The options are as follows:
+.Sh OPTIONS
 .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 EXIT STATUS
-.Ex -std
-.Sh EXAMPLES
-$
-.Nm
-/usr/sbin/s2ram
 .Sh SECURITY CONSIDERATIONS
 To make sure a locked screen can not be bypassed by switching VTs
 or killing the X server with Ctrl+Alt+Backspace, it is recommended
 to disable both in
 .Xr xorg.conf 5
 for maximum security:
-.Bd -literal
+.Bd -literal -offset left
 Section "ServerFlags"
 	Option "DontVTSwitch" "True"
 	Option "DontZap"      "True"
 EndSection
 .Ed
+.Sh EXAMPLES
+$
+.Nm
+/usr/sbin/s2ram
 .Sh CUSTOMIZATION
 .Nm
 can be customized by creating a custom config.h from config.def.h and
-(re)compiling the source code.
-This keeps it fast, secure and simple.
+(re)compiling the source code. This keeps it fast, secure and simple.
diff --git a/slock/slock.c b/slock/slock.c
index 4efd4a2..22f0a29 100755..100644
--- a/slock/slock.c
+++ b/slock/slock.c
@@ -1,512 +1,850 @@
 /* See LICENSE file for license details. */
-#define _XOPEN_SOURCE 500
-#define LENGTH(X) (sizeof X / sizeof X[0])
+#include <X11/Xmd.h>
+#define _XOPEN_SOURCE   500
+#define LENGTH(X)       (sizeof X / sizeof X[0])
 #if HAVE_SHADOW_H
 #include <shadow.h>
 #endif
 
-#include <X11/extensions/Xrandr.h>
 #include <ctype.h>
+#include <cairo/cairo-xlib.h>
 #include <errno.h>
+#include <math.h>
 #include <grp.h>
 #include <pwd.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
-#include <sys/types.h>
-#include <time.h>
 #include <unistd.h>
+#include <sys/types.h>
+#include <X11/extensions/Xrandr.h>
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif
-#include <Imlib2.h>
-#include <X11/XKBlib.h>
-#include <X11/Xft/Xft.h>
+#include <X11/extensions/dpms.h>
+#include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <X11/keysym.h>
+#include <X11/XKBlib.h>
+#include <X11/Xresource.h>
+#include <X11/Xft/Xft.h>
+#include <Imlib2.h>
+#include <security/pam_appl.h>
+#include <security/pam_misc.h>
 
+#include <pthread.h>
+#include <time.h>
 #include "arg.h"
 #include "util.h"
 
 char *argv0;
+static int pam_conv(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr);
+struct pam_conv pamc = {pam_conv, NULL};
+char passwd[256];
+
+/* global count to prevent repeated error messages */
+int count_error = 0;
+
+enum {
+	CAPS,
+    CAPS_ALT,
+	INIT,
+	INPUT,
+	INPUT_ALT,
+	FAILED,
+	PAM,
+	NUMCOLS
+};
+
+/* Xresources preferences */
+enum resource_type {
+	STRING = 0,
+	INTEGER = 1,
+	FLOAT = 2
+};
 
-enum { INIT, INPUT, FAILED, CAPS, NUMCOLS };
+typedef struct {
+	char *name;
+	enum resource_type type;
+	void *dst;
+} ResourcePref;
+
+struct displayData{
+	struct lock **locks;
+	Display* dpy;
+	int nscreens;
+	cairo_t **crs;
+	cairo_surface_t **surfaces;
+};
+static pthread_mutex_t mutex= PTHREAD_MUTEX_INITIALIZER;
 
 #include "config.h"
 
 struct lock {
-  int screen;
-  Window root, win;
-  Pixmap pmap;
-  Pixmap bgmap;
-  unsigned long colors[NUMCOLS];
-  unsigned int x, y;
-  unsigned int xoff, yoff, mw, mh;
-  Drawable drawable;
-  GC gc;
-  XRectangle rectangles[LENGTH(rectangles)];
+	int screen;
+	Window root, win;
+	Pixmap pmap;
+	Pixmap bgmap;
+	unsigned long colors[NUMCOLS];
+	unsigned int x, y;
+	unsigned int xoff, yoff, mw, mh;
+	Drawable drawable;
+	GC gc;
+	XRectangle rectangles[LENGTH(rectangles)];
 };
 
 struct xrandr {
-  int active;
-  int evbase;
-  int errbase;
+	int active;
+	int evbase;
+	int errbase;
 };
 
 Imlib_Image image;
 
-static time_t tim;
+static void
+die(const char *errstr, ...)
+{
+	va_list ap;
 
-static void die(const char *errstr, ...) {
-  va_list ap;
+	va_start(ap, errstr);
+	vfprintf(stderr, errstr, ap);
+	va_end(ap);
+	exit(1);
+}
 
-  va_start(ap, errstr);
-  vfprintf(stderr, errstr, ap);
-  va_end(ap);
-  exit(1);
+static int
+pam_conv(int num_msg, const struct pam_message **msg,
+		struct pam_response **resp, void *appdata_ptr)
+{
+	int retval = PAM_CONV_ERR;
+	for(int i=0; i<num_msg; i++) {
+		if (msg[i]->msg_style == PAM_PROMPT_ECHO_OFF &&
+				strncmp(msg[i]->msg, "Password: ", 10) == 0) {
+			struct pam_response *resp_msg = malloc(sizeof(struct pam_response));
+			if (!resp_msg)
+				die("malloc failed\n");
+			char *password = malloc(strlen(passwd) + 1);
+			if (!password)
+				die("malloc failed\n");
+			memset(password, 0, strlen(passwd) + 1);
+			strcpy(password, passwd);
+			resp_msg->resp_retcode = 0;
+			resp_msg->resp = password;
+			resp[i] = resp_msg;
+			retval = PAM_SUCCESS;
+		}
+	}
+	return retval;
 }
 
 #ifdef __linux__
 #include <fcntl.h>
 #include <linux/oom.h>
 
-static void dontkillme(void) {
-  FILE *f;
-  const char oomfile[] = "/proc/self/oom_score_adj";
-
-  if (!(f = fopen(oomfile, "w"))) {
-    if (errno == ENOENT)
-      return;
-    die("slock: fopen %s: %s\n", oomfile, strerror(errno));
-  }
-  fprintf(f, "%d", OOM_SCORE_ADJ_MIN);
-  if (fclose(f)) {
-    if (errno == EACCES)
-      die("slock: unable to disable OOM killer. "
-          "Make sure to suid or sgid slock.\n");
-    else
-      die("slock: fclose %s: %s\n", oomfile, strerror(errno));
-  }
+static void
+dontkillme(void)
+{
+	FILE *f;
+	const char oomfile[] = "/proc/self/oom_score_adj";
+
+	if (!(f = fopen(oomfile, "w"))) {
+		if (errno == ENOENT)
+			return;
+		die("slock: fopen %s: %s\n", oomfile, strerror(errno));
+	}
+	fprintf(f, "%d", OOM_SCORE_ADJ_MIN);
+	if (fclose(f)) {
+		if (errno == EACCES)
+			die("slock: unable to disable OOM killer. "
+			    "Make sure to suid or sgid slock.\n");
+		else
+			die("slock: fclose %s: %s\n", oomfile, strerror(errno));
+	}
 }
 #endif
 
-static const char *gethash(void) {
-  const char *hash;
-  struct passwd *pw;
+static void writemessage(Display *dpy, Window win, int screen) {
+    Visual *visual = DefaultVisual(dpy, screen);
+    Colormap colormap = DefaultColormap(dpy, screen);
+    XftDraw *draw;
+    XftFont *font;
+    XftColor color;
+    XGlyphInfo extents;  // Use XGlyphInfo for text extents
+    int x, y;
+    XWindowAttributes attr;
+
+    XGetWindowAttributes(dpy, win, &attr);
+
+    draw = XftDrawCreate(dpy, win, visual, colormap);
+    font = XftFontOpenName(dpy, screen, font_name); // Make sure font_name is defined, such as "monospace:size=18"
+    if (!XftColorAllocName(dpy, visual, colormap, text_color, &color)) { // Ensure text_color is defined, e.g., "#FFFFFF"
+        fprintf(stderr, "slock: failed to allocate color\n");
+    }
+
+    // Measure the text
+    XftTextExtentsUtf8(dpy, font, (FcChar8 *)message, strlen(message), &extents);
+    // Center the text horizontally and vertically
+    x = (attr.width - extents.xOff) / 2;
+    y = (attr.height - (font->ascent + font->descent)) / 1.32 + font->ascent;
+
+    // Draw the text
+    XftDrawStringUtf8(draw, &color, font, x, y, (FcChar8 *)message, strlen(message));
 
-  /* Check if the current user has a password entry */
-  errno = 0;
-  if (!(pw = getpwuid(getuid()))) {
-    if (errno)
-      die("slock: getpwuid: %s\n", strerror(errno));
-    else
-      die("slock: cannot retrieve password entry\n");
-  }
-  hash = pw->pw_passwd;
+    // Cleanup
+    XftColorFree(dpy, visual, colormap, &color);
+    XftDrawDestroy(draw);
+    XftFontClose(dpy, font);
+}
+
+static const char *
+gethash(void)
+{
+	const char *hash;
+	struct passwd *pw;
+
+	/* Check if the current user has a password entry */
+	errno = 0;
+	if (!(pw = getpwuid(getuid()))) {
+		if (errno)
+			die("slock: getpwuid: %s\n", strerror(errno));
+		else
+			die("slock: cannot retrieve password entry\n");
+	}
+	hash = pw->pw_passwd;
 
 #if HAVE_SHADOW_H
-  if (!strcmp(hash, "x")) {
-    struct spwd *sp;
-    if (!(sp = getspnam(pw->pw_name)))
-      die("slock: getspnam: cannot retrieve shadow entry. "
-          "Make sure to suid or sgid slock.\n");
-    hash = sp->sp_pwdp;
-  }
+	if (!strcmp(hash, "x")) {
+		struct spwd *sp;
+		if (!(sp = getspnam(pw->pw_name)))
+			die("slock: getspnam: cannot retrieve shadow entry. "
+			    "Make sure to suid or sgid slock.\n");
+		hash = sp->sp_pwdp;
+	}
 #else
-  if (!strcmp(hash, "*")) {
+	if (!strcmp(hash, "*")) {
 #ifdef __OpenBSD__
-    if (!(pw = getpwuid_shadow(getuid())))
-      die("slock: getpwnam_shadow: cannot retrieve shadow entry. "
-          "Make sure to suid or sgid slock.\n");
-    hash = pw->pw_passwd;
+		if (!(pw = getpwuid_shadow(getuid())))
+			die("slock: getpwnam_shadow: cannot retrieve shadow entry. "
+			    "Make sure to suid or sgid slock.\n");
+		hash = pw->pw_passwd;
 #else
-    die("slock: getpwuid: cannot retrieve shadow entry. "
-        "Make sure to suid or sgid slock.\n");
+		die("slock: getpwuid: cannot retrieve shadow entry. "
+		    "Make sure to suid or sgid slock.\n");
 #endif /* __OpenBSD__ */
-  }
+	}
 #endif /* HAVE_SHADOW_H */
 
-  return hash;
+	/* pam, store user name */
+	hash = pw->pw_name;
+	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
+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); */
-  lock->drawable = lock->bgmap;
-  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
+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); */
+	lock->drawable = lock->bgmap;
+	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) {
-  XRRScreenChangeNotifyEvent *rre;
-  char buf[32], passwd[256], *inputhash;
-  int caps, num, screen, running, failure, oldc;
-  unsigned int len, color, indicators;
-  KeySym ksym;
-  XEvent ev;
-
-  len = 0;
-  caps = 0;
-  running = 1;
-  failure = 0;
-  oldc = INIT;
-
-  if (!XkbGetIndicatorState(dpy, XkbUseCoreKbd, &indicators))
-    caps = indicators & 1;
-
-  while (running && !XNextEvent(dpy, &ev)) {
-    running = !((time(NULL) - tim < timetocancel) && (ev.type == MotionNotify));
-    if (ev.type == KeyPress) {
-      explicit_bzero(&buf, sizeof(buf));
-      num = XLookupString(&ev.xkey, buf, sizeof(buf), &ksym, 0);
-      if (IsKeypadKey(ksym)) {
-        if (ksym == XK_KP_Enter)
-          ksym = XK_Return;
-        else if (ksym >= XK_KP_0 && ksym <= XK_KP_9)
-          ksym = (ksym - XK_KP_0) + XK_0;
-      }
-      if (IsFunctionKey(ksym) || IsKeypadKey(ksym) || IsMiscFunctionKey(ksym) ||
-          IsPFKey(ksym) || IsPrivateKeypadKey(ksym))
-        continue;
-      switch (ksym) {
-      case XK_Return:
-        passwd[len] = '\0';
-        errno = 0;
-        if (!(inputhash = crypt(passwd, hash)))
-          fprintf(stderr, "slock: crypt: %s\n", strerror(errno));
-        else
-          running = !!strcmp(inputhash, hash);
-        if (running) {
-          XBell(dpy, 100);
-          failure = 1;
-        }
-        explicit_bzero(&passwd, sizeof(passwd));
-        len = 0;
-        break;
-      case XK_Escape:
-        explicit_bzero(&passwd, sizeof(passwd));
-        len = 0;
-        break;
-      case XK_BackSpace:
-        if (len)
-          passwd[--len] = '\0';
-        break;
-      case XK_Caps_Lock:
-        caps = !caps;
-        break;
-      default:
-        if (num && !iscntrl((int)buf[0]) && (len + num < sizeof(passwd))) {
-          memcpy(passwd + len, buf, num);
-          len += num;
-        }
-        break;
-      }
-      color = len ? (caps ? CAPS : INPUT)
-                  : (failure || failonclear ? FAILED : INIT);
-      if (running && oldc != color) {
-        for (screen = 0; screen < nscreens; screen++) {
-          drawlogo(dpy, locks[screen], color);
-        }
-        oldc = color;
-      }
-    } else if (rr->active && ev.type == rr->evbase + RRScreenChangeNotify) {
-      rre = (XRRScreenChangeNotifyEvent *)&ev;
-      for (screen = 0; screen < nscreens; screen++) {
-        if (locks[screen]->win == rre->window) {
-          if (rre->rotation == RR_Rotate_90 || rre->rotation == RR_Rotate_270)
-            XResizeWindow(dpy, locks[screen]->win, rre->height, rre->width);
-          else
-            XResizeWindow(dpy, locks[screen]->win, rre->width, rre->height);
-          XClearWindow(dpy, locks[screen]->win);
-          break;
-        }
-      }
-    } else {
-      for (screen = 0; screen < nscreens; screen++)
-        XRaiseWindow(dpy, locks[screen]->win);
-    }
-  }
+static void
+refresh(Display *dpy, Window win , int screen, struct tm time, cairo_t* cr, cairo_surface_t* sfc)
+{/*Function that displays given time on the given screen*/
+	static char tm[32]="";
+	double xpos,ypos;
+    cairo_text_extents_t extents;
+
+	sprintf(tm,"%02d/%02d/%d %02d:%02d",time.tm_year+1900,time.tm_mon+1,time.tm_mday,time.tm_hour,time.tm_min);
+
+    XClearWindow(dpy, win);
+    cairo_set_source_rgb(cr, 1, 1, 1); // Corrected color values (0 to 1 range)
+    cairo_select_font_face(cr, "serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
+    cairo_set_font_size(cr, 64.0);
+
+    // Measure the text to be rendered
+    cairo_text_extents(cr, tm, &extents);
+    xpos = (DisplayWidth(dpy, screen) - extents.width) / 2 - extents.x_bearing;
+    ypos = (DisplayHeight(dpy, screen) - extents.height) / 1.2 - extents.y_bearing;
+
+    cairo_move_to(cr, xpos, ypos);
+    cairo_show_text(cr, tm);
+
+    writemessage(dpy, win, screen);
+
+    cairo_surface_flush(sfc);
+    XFlush(dpy);
+}
+
+static void*
+displayTime(void* input)
+{ /*Thread that keeps track of time and refreshes it every 5 seconds */
+ struct displayData* displayData=(struct displayData*)input;
+ while (1){
+ pthread_mutex_lock(&mutex); /*Mutex to prevent interference with refreshing screen while typing password*/
+ time_t rawtime;
+ time(&rawtime);
+ struct tm tm = *localtime(&rawtime);
+ for (int k=0;k<displayData->nscreens;k++){
+	 refresh(displayData->dpy, displayData->locks[k]->win, displayData->locks[k]->screen, tm,displayData->crs[k],displayData->surfaces[k]);
+	 }
+ pthread_mutex_unlock(&mutex);
+ sleep(5);
+ }
+ return NULL;
 }
 
-static struct lock *lockscreen(Display *dpy, struct xrandr *rr, int screen) {
-  char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
-  int i, ptgrab, kbgrab;
-  struct lock *lock;
-  XColor color, dummy;
-  XSetWindowAttributes wa;
-  Cursor invisible;
+static void
+readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
+       const char *hash,cairo_t **crs,cairo_surface_t **surfaces)
+{
+	XRRScreenChangeNotifyEvent *rre;
+	char buf[32];
+	int caps, num, screen, running, failure, oldc, retval;
+	unsigned int len, color, indicators;
+	KeySym ksym;
+	XEvent ev;
+	pam_handle_t *pamh;
+
+	len = 0;
+	caps = 0;
+	running = 1;
+	failure = 0;
+	oldc = INIT;
+
+	if (!XkbGetIndicatorState(dpy, XkbUseCoreKbd, &indicators))
+		caps = indicators & 1;
+
+	while (running && !XNextEvent(dpy, &ev)) {
+		if (ev.type == KeyPress) {
+			explicit_bzero(&buf, sizeof(buf));
+			num = XLookupString(&ev.xkey, buf, sizeof(buf), &ksym, 0);
+			if (IsKeypadKey(ksym)) {
+				if (ksym == XK_KP_Enter)
+					ksym = XK_Return;
+				else if (ksym >= XK_KP_0 && ksym <= XK_KP_9)
+					ksym = (ksym - XK_KP_0) + XK_0;
+			}
+			if (IsFunctionKey(ksym) ||
+			    IsKeypadKey(ksym) ||
+			    IsMiscFunctionKey(ksym) ||
+			    IsPFKey(ksym) ||
+			    IsPrivateKeypadKey(ksym))
+				continue;
+			switch (ksym) {
+			case XK_Return:
+				passwd[len] = '\0';
+				errno = 0;
+				retval = pam_start(pam_service, hash, &pamc, &pamh);
+				color = PAM;
+				for (screen = 0; screen < nscreens; screen++) {
+					XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[color]);
+					XClearWindow(dpy, locks[screen]->win);
+					XRaiseWindow(dpy, locks[screen]->win);
+				}
+				XSync(dpy, False);
+
+				if (retval == PAM_SUCCESS)
+					retval = pam_authenticate(pamh, 0);
+				if (retval == PAM_SUCCESS)
+					retval = pam_acct_mgmt(pamh, 0);
+
+				running = 1;
+				if (retval == PAM_SUCCESS)
+					running = 0;
+				else
+					fprintf(stderr, "slock: %s\n", pam_strerror(pamh, retval));
+				pam_end(pamh, retval);
+				if (running) {
+					XBell(dpy, 100);
+					failure = 1;
+				}
+				explicit_bzero(&passwd, sizeof(passwd));
+				len = 0;
+				break;
+			case XK_Escape:
+				explicit_bzero(&passwd, sizeof(passwd));
+				len = 0;
+				break;
+			case XK_BackSpace:
+				if (len)
+					passwd[--len] = '\0';
+				break;
+			case XK_Caps_Lock:
+				caps = !caps;
+				break;
+			default:
+				if (num && !iscntrl((int)buf[0]) &&
+				    (len + num < sizeof(passwd))) {
+					memcpy(passwd + len, buf, num);
+					len += num;
+				}
+				break;
+			}
+            color = len ? (caps ? (len % 2 ? CAPS : CAPS_ALT) : (len % 2 ? INPUT : INPUT_ALT))
+                  : ((failure || failonclear) ? FAILED : INIT);
+			if (running && oldc != color) {
+		        pthread_mutex_lock(&mutex); /*Stop the time refresh thread from interfering*/
+				for (screen = 0; screen < nscreens; screen++) {
+                    time_t rawtime;
+                    time(&rawtime);
+					drawlogo(dpy, locks[screen], color);
+					writemessage(dpy, locks[screen]->win, screen);
+	                refresh(dpy, locks[screen]->win,locks[screen]->screen, *localtime(&rawtime),crs[screen],surfaces[screen]);
+				}
+				pthread_mutex_unlock(&mutex);
+				oldc = color;
+			}
+		} else if (rr->active && ev.type == rr->evbase + RRScreenChangeNotify) {
+			rre = (XRRScreenChangeNotifyEvent*)&ev;
+		    pthread_mutex_lock(&mutex); /*Stop the time refresh thread from interfering.*/
+			for (screen = 0; screen < nscreens; screen++) {
+				if (locks[screen]->win == rre->window) {
+					if (rre->rotation == RR_Rotate_90 ||
+					    rre->rotation == RR_Rotate_270)
+						XResizeWindow(dpy, locks[screen]->win,
+						              rre->height, rre->width);
+					else
+						XResizeWindow(dpy, locks[screen]->win,
+						              rre->width, rre->height);
+					XClearWindow(dpy, locks[screen]->win);
+					break;
+				}
+			}
+            pthread_mutex_unlock(&mutex);
+		} else {
+			for (screen = 0; screen < nscreens; screen++)
+				XRaiseWindow(dpy, locks[screen]->win);
+		}
+	}
+}
+
+static struct lock *
+lockscreen(Display *dpy, struct xrandr *rr, int screen)
+{
+	char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
+	int i, ptgrab, kbgrab;
+	struct lock *lock;
+	XColor color, dummy;
+	XSetWindowAttributes wa;
+	Cursor invisible;
 #ifdef XINERAMA
-  XineramaScreenInfo *info;
-  int n;
+	XineramaScreenInfo *info;
+	int n;
 #endif
 
-  if (dpy == NULL || screen < 0 || !(lock = malloc(sizeof(struct lock))))
-    return NULL;
-
-  lock->screen = 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++) {
-    XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), colorname[i],
-                     &color, &dummy);
-    lock->colors[i] = color.pixel;
-  }
-
-  lock->x = DisplayWidth(dpy, lock->screen);
-  lock->y = DisplayHeight(dpy, lock->screen);
+	if (dpy == NULL || screen < 0 || !(lock = malloc(sizeof(struct lock))))
+		return NULL;
+
+	lock->screen = 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++) {
+		XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen),
+		                 colorname[i], &color, &dummy);
+		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
+	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;
-  lock->win = XCreateWindow(dpy, lock->root, 0, 0, lock->x, lock->y, 0,
-                            DefaultDepth(dpy, lock->screen), CopyFromParent,
-                            DefaultVisual(dpy, lock->screen),
-                            CWOverrideRedirect | CWBackPixel, &wa);
-  if (lock->bgmap)
-    XSetWindowBackgroundPixmap(dpy, lock->win, lock->bgmap);
-  lock->pmap = XCreateBitmapFromData(dpy, lock->win, curs, 8, 8);
-  invisible =
-      XCreatePixmapCursor(dpy, lock->pmap, lock->pmap, &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) {
-      ptgrab = XGrabPointer(
-          dpy, lock->root, False,
-          ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
-          GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime);
-    }
-    if (kbgrab != GrabSuccess) {
-      kbgrab = XGrabKeyboard(dpy, lock->root, True, GrabModeAsync,
-                             GrabModeAsync, CurrentTime);
-    }
+	{
+		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;
+	lock->win = XCreateWindow(dpy, lock->root, 0, 0,
+	                          lock->x, lock->y,
+	                          0, DefaultDepth(dpy, lock->screen),
+	                          CopyFromParent,
+	                          DefaultVisual(dpy, lock->screen),
+	                          CWOverrideRedirect | CWBackPixel, &wa);
+    if(lock->bgmap) XSetWindowBackgroundPixmap(dpy, lock->win, lock->bgmap);
+	lock->pmap = XCreateBitmapFromData(dpy, lock->win, curs, 8, 8);
+	invisible = XCreatePixmapCursor(dpy, lock->pmap, lock->pmap,
+	                                &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) {
+			ptgrab = XGrabPointer(dpy, lock->root, False,
+			                      ButtonPressMask | ButtonReleaseMask |
+			                      PointerMotionMask, GrabModeAsync,
+			                      GrabModeAsync, None, invisible, CurrentTime);
+		}
+		if (kbgrab != GrabSuccess) {
+			kbgrab = XGrabKeyboard(dpy, lock->root, True,
+			                       GrabModeAsync, GrabModeAsync, CurrentTime);
+		}
+
+		/* input is grabbed: we can lock the screen */
+		if (ptgrab == GrabSuccess && kbgrab == GrabSuccess) {
+			XMapRaised(dpy, lock->win);
+			if (rr->active)
+				XRRSelectInput(dpy, lock->win, RRScreenChangeNotifyMask);
+
+			XSelectInput(dpy, lock->root, SubstructureNotifyMask);
+			drawlogo(dpy, lock, INIT);
+			return lock;
+		}
+
+		/* retry on AlreadyGrabbed but fail on other errors */
+		if ((ptgrab != AlreadyGrabbed && ptgrab != GrabSuccess) ||
+		    (kbgrab != AlreadyGrabbed && kbgrab != GrabSuccess))
+			break;
+
+		usleep(100000);
+	}
+
+	/* we couldn't grab all input: fail out */
+	if (ptgrab != GrabSuccess)
+		fprintf(stderr, "slock: unable to grab mouse pointer for screen %d\n",
+		        screen);
+	if (kbgrab != GrabSuccess)
+		fprintf(stderr, "slock: unable to grab keyboard for screen %d\n",
+		        screen);
+	return NULL;
+}
 
-    /* input is grabbed: we can lock the screen */
-    if (ptgrab == GrabSuccess && kbgrab == GrabSuccess) {
-      XMapRaised(dpy, lock->win);
-      if (rr->active)
-        XRRSelectInput(dpy, lock->win, RRScreenChangeNotifyMask);
+int
+resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst)
+{
+	char **sdst = dst;
+	int *idst = dst;
+	float *fdst = dst;
+
+	char fullname[256];
+	char fullclass[256];
+	char *type;
+	XrmValue ret;
+
+	snprintf(fullname, sizeof(fullname), "%s.%s", "slock", name);
+	snprintf(fullclass, sizeof(fullclass), "%s.%s", "Slock", name);
+	fullname[sizeof(fullname) - 1] = fullclass[sizeof(fullclass) - 1] = '\0';
+
+	XrmGetResource(db, fullname, fullclass, &type, &ret);
+	if (ret.addr == NULL || strncmp("String", type, 64))
+		return 1;
+
+	switch (rtype) {
+	case STRING:
+		*sdst = ret.addr;
+		break;
+	case INTEGER:
+		*idst = strtoul(ret.addr, NULL, 10);
+		break;
+	case FLOAT:
+		*fdst = strtof(ret.addr, NULL);
+		break;
+	}
+	return 0;
+}
 
-      XSelectInput(dpy, lock->root, SubstructureNotifyMask);
-      drawlogo(dpy, lock, INIT);
-      tim = time(NULL);
-      return lock;
-    }
+void
+config_init(Display *dpy)
+{
+	char *resm;
+	XrmDatabase db;
+	ResourcePref *p;
+
+	XrmInitialize();
+	resm = XResourceManagerString(dpy);
+	if (!resm)
+		return;
+
+	db = XrmGetStringDatabase(resm);
+	for (p = resources; p < resources + LEN(resources); p++)
+		resource_load(db, p->name, p->type, p->dst);
+}
 
-    /* retry on AlreadyGrabbed but fail on other errors */
-    if ((ptgrab != AlreadyGrabbed && ptgrab != GrabSuccess) ||
-        (kbgrab != AlreadyGrabbed && kbgrab != GrabSuccess))
-      break;
-
-    usleep(100000);
-  }
-
-  /* we couldn't grab all input: fail out */
-  if (ptgrab != GrabSuccess)
-    fprintf(stderr, "slock: unable to grab mouse pointer for screen %d\n",
-            screen);
-  if (kbgrab != GrabSuccess)
-    fprintf(stderr, "slock: unable to grab keyboard for screen %d\n", screen);
-  return NULL;
+static void
+usage(void)
+{
+	die("usage: slock [-v] [-m message] [cmd [arg ...]]\n");
 }
 
-static void usage(void) { die("usage: slock [-v] [cmd [arg ...]]\n"); }
-
-int main(int argc, char **argv) {
-  struct xrandr rr;
-  struct lock **locks;
-  struct passwd *pwd;
-  struct group *grp;
-  uid_t duid;
-  gid_t dgid;
-  const char *hash;
-  Display *dpy;
-  int s, nlocks, nscreens;
-
-  ARGBEGIN {
-  case 'v':
-    puts("slock-" VERSION);
-    return 0;
-  default:
-    usage();
-  }
-  ARGEND
-
-  /* validate drop-user and -group */
-  errno = 0;
-  if (!(pwd = getpwnam(user)))
-    die("slock: getpwnam %s: %s\n", user,
-        errno ? strerror(errno) : "user entry not found");
-  duid = pwd->pw_uid;
-  errno = 0;
-  if (!(grp = getgrnam(group)))
-    die("slock: getgrnam %s: %s\n", group,
-        errno ? strerror(errno) : "group entry not found");
-  dgid = grp->gr_gid;
+int
+main(int argc, char **argv) {
+	struct xrandr rr;
+	struct lock **locks;
+	struct passwd *pwd;
+	struct group *grp;
+	uid_t duid;
+	gid_t dgid;
+	const char *hash;
+	Display *dpy;
+	int s, nlocks, nscreens;
+	CARD16 standby, suspend, off;
+	BOOL dpms_state;
+
+	ARGBEGIN {
+	case 'v':
+		fprintf(stderr, "slock-"VERSION"\n");
+		return 0;
+	case 'm':
+		message = EARGF(usage());
+		break;
+	default:
+		usage();
+	} ARGEND
+
+	/* validate drop-user and -group */
+	errno = 0;
+	if (!(pwd = getpwnam(getenv("USER"))))
+		die("slock: getpwnam %s: %s\n", getenv("USER"),
+		    errno ? strerror(errno) : "user entry not found");
+	duid = pwd->pw_uid;
+	errno = 0;
+	if (!(grp = getgrnam(group)))
+		die("slock: getgrnam %s: %s\n", group,
+		    errno ? strerror(errno) : "group entry not found");
+	dgid = grp->gr_gid;
 
 #ifdef __linux__
-  dontkillme();
+	dontkillme();
 #endif
 
-  hash = gethash();
-  errno = 0;
-  if (!crypt("", hash))
-    die("slock: crypt: %s\n", strerror(errno));
-
-  if (!(dpy = XOpenDisplay(NULL)))
-    die("slock: cannot open display\n");
-
-  /* drop privileges */
-  if (setgroups(0, NULL) < 0)
-    die("slock: setgroups: %s\n", strerror(errno));
-  if (setgid(dgid) < 0)
-    die("slock: setgid: %s\n", strerror(errno));
-  if (setuid(duid) < 0)
-    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);
+	/* the contents of hash are used to transport the current user name */
+	hash = gethash();
+	errno = 0;
 
-#ifdef BLUR
+	XInitThreads();
 
-  /*Blur function*/
-  imlib_image_blur(blurRadius);
-#endif // BLUR
+	if (!(dpy = XOpenDisplay(NULL)))
+		die("slock: cannot open display\n");
 
-#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;
+	/* drop privileges */
+	if (setgroups(0, NULL) < 0)
+		die("slock: setgroups: %s\n", strerror(errno));
+	if (setgid(dgid) < 0)
+		die("slock: setgid: %s\n", strerror(errno));
+	if (setuid(duid) < 0)
+		die("slock: setuid: %s\n", strerror(errno));
+
+	config_init(dpy);
+
+    /* Load picture */
+    Imlib_Image buffer = imlib_load_image(background_image);
+    if (buffer) {
+        blurRadius = personalblur;
+
+        imlib_context_set_image(buffer);
+        int background_image_width = imlib_image_get_width();
+        int background_image_height = imlib_image_get_height();
+
+        /* Create an image to be rendered */
+        Screen *scr = ScreenOfDisplay(dpy, DefaultScreen(dpy));
+        image = imlib_create_image(scr->width, scr->height);
+        imlib_context_set_image(image);
+
+        /* Fill the image for every X monitor */
+        XRRMonitorInfo	*monitors;
+        int number_of_monitors;
+        monitors = XRRGetMonitors(dpy, RootWindow(dpy, XScreenNumberOfScreen(scr)), True, &number_of_monitors);
+
+        int i;
+        for (i = 0; i < number_of_monitors; i++) {
+          imlib_blend_image_onto_image(buffer, 0, 0, 0, background_image_width, background_image_height, monitors[i].x, monitors[i].y, monitors[i].width, monitors[i].height);
         }
-      }
-      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 */
-  rr.active = XRRQueryExtension(dpy, &rr.evbase, &rr.errbase);
-
-  /* get number of screens in display "dpy" and blank them */
-  nscreens = ScreenCount(dpy);
-  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)
-      nlocks++;
-    else
-      break;
-  }
-  XSync(dpy, 0);
-
-  /* did we manage to lock everything? */
-  if (nlocks != nscreens)
-    return 1;
-
-  /* run post-lock command */
-  if (argc > 0) {
-    switch (fork()) {
-    case -1:
-      die("slock: fork failed: %s\n", strerror(errno));
-    case 0:
-      if (close(ConnectionNumber(dpy)) < 0)
-        die("slock: close: %s\n", strerror(errno));
-      execvp(argv[0], argv);
-      fprintf(stderr, "slock: execvp %s: %s\n", argv[0], strerror(errno));
-      _exit(1);
+        /* Clean up */
+        imlib_context_set_image(buffer);
+        imlib_free_image();
+        imlib_context_set_image(image);
+    } else {
+          /*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);
     }
-  }
 
-  /* 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);
-  }
+#ifdef BLUR
+	/*Blur function*/
+	imlib_image_blur(blurRadius);
+#endif // BLUR	
 
-  XSync(dpy, 0);
-  XCloseDisplay(dpy);
-  return 0;
+#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 */
+	rr.active = XRRQueryExtension(dpy, &rr.evbase, &rr.errbase);
+
+	/* get number of screens in display "dpy" and blank them */
+	nscreens = ScreenCount(dpy);
+	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) {
+			writemessage(dpy, locks[s]->win, s);
+			nlocks++;
+		} else {
+ 			break;
+		}
+	}
+
+	/* did we manage to lock everything? */
+	if (nlocks != nscreens)
+		return 1;
+
+	/* DPMS magic to disable the monitor */
+	if (!DPMSCapable(dpy))
+		die("slock: DPMSCapable failed\n");
+	if (!DPMSInfo(dpy, &standby, &dpms_state))
+		die("slock: DPMSInfo failed\n");
+	if (!DPMSEnable(dpy) && !dpms_state)
+		die("slock: DPMSEnable failed\n");
+	if (!DPMSGetTimeouts(dpy, &standby, &suspend, &off))
+		die("slock: DPMSGetTimeouts failed\n");
+	if (!standby || !suspend || !off)
+		die("slock: at least one DPMS variable is zero\n");
+	if (!DPMSSetTimeouts(dpy, monitortime, monitortime, monitortime))
+		die("slock: DPMSSetTimeouts failed\n");
+
+	XSync(dpy, 0);
+
+	/* run post-lock command */
+	if (argc > 0) {
+		switch (fork()) {
+		case -1:
+			die("slock: fork failed: %s\n", strerror(errno));
+		case 0:
+			if (close(ConnectionNumber(dpy)) < 0)
+				die("slock: close: %s\n", strerror(errno));
+			execvp(argv[0], argv);
+			fprintf(stderr, "slock: execvp %s: %s\n", argv[0], strerror(errno));
+			_exit(1);
+		}
+	}
+
+	/* everything is now blank. Wait for the correct password */
+	pthread_t thredid;
+    /* Create Cairo drawables upon which the time will be shown. */
+    struct displayData displayData;
+	cairo_surface_t **surfaces;
+	cairo_t **crs;
+    if (!(surfaces=calloc(nscreens, sizeof(cairo_surface_t*)))){
+		die("Out of memory");
+	}
+	if (!(crs=calloc(nscreens, sizeof(cairo_t*)))){
+		die("Out of memory");
+	}
+	for (int k=0;k<nscreens;k++){
+		Drawable win=locks[k]->win;
+		int screen=locks[k]->screen;
+		XMapWindow(dpy, win);
+		surfaces[k]=cairo_xlib_surface_create(dpy, win, DefaultVisual(dpy, screen),DisplayWidth(dpy, screen) , DisplayHeight(dpy, screen));
+		crs[k]=cairo_create(surfaces[k]);
+	}
+	displayData.dpy=dpy;
+	displayData.locks=locks;
+	displayData.nscreens=nscreens;
+	displayData.crs=crs;
+	displayData.surfaces=surfaces;
+    /*Start the thread that redraws time every 5 seconds*/
+	pthread_create(&thredid, NULL, displayTime, &displayData);
+	/*Wait for the password*/
+	readpw(dpy, &rr, locks, nscreens, hash,crs,surfaces);
+
+	/* reset DPMS values to inital ones */
+	DPMSSetTimeouts(dpy, standby, suspend, off);
+	if (!dpms_state)
+		DPMSDisable(dpy);
+	XSync(dpy, 0);
+
+	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;
 }
diff --git a/slock/util.h b/slock/util.h
index 6f748b8..148dbc1 100755..100644
--- a/slock/util.h
+++ b/slock/util.h
@@ -1,2 +1,5 @@
+/* macros */
+#define LEN(a)			(sizeof(a) / sizeof(a)[0])
+
 #undef explicit_bzero
 void explicit_bzero(void *, size_t);