README Update

- Add list of personal modifications
- Convert to markdown

.gitignore

@@ -1,5 +1,3 @@
-# Slock Files
+.vscode/
 *.o
-*.orig
 slock
-config.h

Makefile

@@ -30,7 +30,7 @@ slock: ${OBJ}
 
 clean:
 	@echo cleaning
-	@rm -f slock ${OBJ} slock-${VERSION}.tar.gz config.h
+	@rm -f slock ${OBJ} slock-${VERSION}.tar.gz
 
 dist: clean
 	@echo creating dist tarball

README.md

@@ -1,36 +1,35 @@
-# slock - simple screen locker
+# Sravan's slock - simple screen locker
 
-Sravan's custom build of slock. Original slock build by suckless team found here: [https://tools.suckless.org/slock/](https://tools.suckless.org/slock/)
+[slock](https://tools.suckless.org/slock/) is a simple screen locker utility for X.
+This is Sravan's fork of slock with patches and custom modifications.
 
-## Requirements
+## slock Information
+
+### Requirements
 
 In order to build slock you need the Xlib header files.
 
-## Installation
+### Installation
 
-Edit [config.mk](config.mk) to match your local setup (slock is installed into
+Edit config.mk to match your local setup (slock is installed into
 the /usr/local namespace by default).
 
 Afterwards enter the following command to build and install slock
 (if necessary as root):
 
-```
     make clean install
-```
 
-## Running slock
+### Running slock
 
-Simply invoke the `slock` command. To get out of it, enter your password.
+Simply invoke the 'slock' command. To get out of it, enter your password.
 
-## Configuration
+## Personal Modifications
 
-The configuration of slock is done by creating a custom config.h and (re)compiling the source code.
+### Patches
 
-## Patches
+* [blur pixelated screen](https://tools.suckless.org/slock/patches/blur-pixelated-screen/)
+* [dpms](https://tools.suckless.org/slock/patches/dpms/)
 
-Most patches can be found on the suckless website: [https://tools.suckless.org/slock/patches/](https://tools.suckless.org/slock/patches/)
+### Modifications
 
-* [capscolor](https://tools.suckless.org/slock/patches/capscolor/) - Introduces an additional color to indicate the state of Caps Lock.
+* Update user and group in config
-* [mediakeys](https://tools.suckless.org/slock/patches/mediakeys/) - Allows use of media keys while screen is locked
-* [message](https://tools.suckless.org/slock/patches/message/) - This patch lets you add a message to your lock screen. You can place a default message in `config.h`, and you can also pass a message with `-m message`
-* [terminalkeys](https://tools.suckless.org/slock/patches/terminalkeys/) - Add key commands that are commonly used in terminal applications (in particular the login prompt) to slock

config.def.h

@@ -1,22 +1,12 @@
 /* user and group to drop privileges to */
 static const char *user  = "nobody";
-static const char *group = "nobody";
+static const char *group = "nogroup";
 
 static const char *colorname[NUMCOLS] = {
 	[INIT] =   "black",     /* after initialization */
-	[INPUT]  = "purple", /* during input */
+	[INPUT] =  "#005577",   /* during input */
-	[FAILED] = "red",    /* wrong password */
+	[FAILED] = "#CC3333",   /* wrong password */
-	[CAPS]   = "cyan",   /* CapsLock on */
 };
 
 /* treat a cleared input like a wrong password (color) */
-static const int failonclear = 0;
+static const int failonclear = 1;
-
-/* default message */
-static const char * message = "Display Locked with Slock";
-
-/* text color */
-static const char * text_color = "white";
-
-/* text size (must be a valid size) */
-static const char * font_name = "lucidasans-bold-24";

config.h

@@ -0,0 +1,25 @@
+/* user and group to drop privileges to */
+static const char *user  = "sravan";
+static const char *group = "sravan";
+
+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;
+
+/* time in seconds before the monitor shuts down */
+static const int monitortime = 5;
+
+/*Enable blur*/
+#define BLUR
+/*Set blur radius*/
+static const int blurRadius=15;
+
+/*Enable Pixelation*/
+#define PIXELATION
+/*Set pixelation radius*/
+static const int pixelSize=10;

config.mk

@@ -12,11 +12,11 @@ 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 -lXinerama
+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 -Os ${INCS} ${CPPFLAGS}
+CFLAGS = -std=c99 -pedantic -Wall -Ofast ${INCS} ${CPPFLAGS}
 LDFLAGS = -s ${LIBS}
 COMPATSRC = explicit_bzero.c
 

patches/slock-capscolor-20170106-2d2a21a.diff

@@ -1,87 +0,0 @@
-From 95463f58beb669d9221881deac3b6df7d9c4f162 Mon Sep 17 00:00:00 2001
-From: Klemens Nanni <kl3@posteo.org>
-Date: Fri, 2 Sep 2016 14:53:30 +0200
-Subject: [PATCH] Indicate the state of CapsLock through a different color
-
----
- config.def.h |  1 +
- slock.c      | 15 ++++++++++++---
- 2 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index 9855e21..6288856 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -6,6 +6,7 @@ static const char *colorname[NUMCOLS] = {
- 	[INIT] =   "black",     /* after initialization */
- 	[INPUT] =  "#005577",   /* during input */
- 	[FAILED] = "#CC3333",   /* wrong password */
-+	[CAPS] = "red",         /* CapsLock on */
- };
- 
- /* treat a cleared input like a wrong password (color) */
-diff --git a/slock.c b/slock.c
-index d55eb3d..d7804f1 100644
---- a/slock.c
-+++ b/slock.c
-@@ -18,6 +18,7 @@
- #include <X11/keysym.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
-+#include <X11/XKBlib.h>
- 
- #include "arg.h"
- #include "util.h"
-@@ -28,6 +29,7 @@ enum {
- 	INIT,
- 	INPUT,
- 	FAILED,
-+	CAPS,
- 	NUMCOLS
- };
- 
-@@ -130,16 +132,20 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
- {
- 	XRRScreenChangeNotifyEvent *rre;
- 	char buf[32], passwd[256], *inputhash;
--	int num, screen, running, failure, oldc;
--	unsigned int len, color;
-+	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)) {
- 		if (ev.type == KeyPress) {
- 			explicit_bzero(&buf, sizeof(buf));
-@@ -179,6 +185,9 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
- 				if (len)
- 					passwd[len--] = '\0';
- 				break;
-+			case XK_Caps_Lock:
-+				caps = !caps;
-+				break;
- 			default:
- 				if (num && !iscntrl((int)buf[0]) &&
- 				    (len + num < sizeof(passwd))) {
-@@ -187,7 +196,7 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
- 				}
- 				break;
- 			}
--			color = len ? INPUT : ((failure || failonclear) ? FAILED : INIT);
-+			color = len ? (caps ? CAPS : INPUT) : (failure || failonclear ? FAILED : INIT);
- 			if (running && oldc != color) {
- 				for (screen = 0; screen < nscreens; screen++) {
- 					XSetWindowBackground(dpy,
--- 
-2.11.0
-

patches/slock-mediakeys-1.4.diff

@@ -1,31 +0,0 @@
-diff --git a/slock.c b/slock.c
-index 5ae738c..bd54be2 100644
---- a/slock.c
-+++ b/slock.c
-@@ -18,6 +18,7 @@
- #include <X11/keysym.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
-+#include <X11/XF86keysym.h>
- 
- #include "arg.h"
- #include "util.h"
-@@ -157,6 +158,18 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
- 			    IsPrivateKeypadKey(ksym))
- 				continue;
- 			switch (ksym) {
-+      case XF86XK_AudioPlay:
-+      case XF86XK_AudioStop:
-+      case XF86XK_AudioPrev:
-+      case XF86XK_AudioNext:
-+      case XF86XK_AudioRaiseVolume:
-+      case XF86XK_AudioLowerVolume:
-+      case XF86XK_AudioMute:
-+      case XF86XK_AudioMicMute:
-+      case XF86XK_MonBrightnessDown:
-+      case XF86XK_MonBrightnessUp:
-+        XSendEvent(dpy, DefaultRootWindow(dpy), True, KeyPressMask, &ev);
-+        break;
- 			case XK_Return:
- 				passwd[len] = '\0';
- 				errno = 0;

patches/slock-message-20191002-b46028b.diff

@@ -1,250 +0,0 @@
-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
-

patches/slock-terminalkeys-1.4.diff

@@ -1,40 +0,0 @@
-From 4b6b51100fa14256753f663c93daeb0f89f0a65a Mon Sep 17 00:00:00 2001
-From: Matthias Schoth <mschoth@gmail.com>
-Date: Fri, 15 May 2020 22:10:27 +0200
-Subject: [PATCH] Add key commands that are commonly used in terminal
- applications to slock.
-
----
- slock.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/slock.c b/slock.c
-index d2f0886..bf1a392 100644
---- a/slock.c
-+++ b/slock.c
-@@ -156,6 +156,22 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
- 			    IsPFKey(ksym) ||
- 			    IsPrivateKeypadKey(ksym))
- 				continue;
-+			if (ev.xkey.state & ControlMask) {
-+				switch (ksym) {
-+				case XK_u:
-+					ksym = XK_Escape;
-+					break;
-+				case XK_m:
-+					ksym = XK_Return;
-+					break;
-+				case XK_j:
-+					ksym = XK_Return;
-+					break;
-+				case XK_h:
-+                                       ksym = XK_BackSpace;
-+					break;
-+				}
-+			}
- 			switch (ksym) {
- 			case XK_Return:
- 				passwd[len] = '\0';
--- 
-2.26.2
-

slock.1

@@ -6,8 +6,6 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl v
-.Op Fl f
-.Op Fl m Ar message
 .Op Ar cmd Op Ar arg ...
 .Sh DESCRIPTION
 .Nm
@@ -18,11 +16,6 @@ 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

slock.c

@@ -15,26 +15,21 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <X11/extensions/Xrandr.h>
-#include <X11/extensions/Xinerama.h>
+#include <X11/extensions/dpms.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <X11/XKBlib.h>
+#include <Imlib2.h>
-#include <X11/XF86keysym.h>
 
 #include "arg.h"
 #include "util.h"
 
 char *argv0;
 
-/* global count to prevent repeated error messages */
-int count_error = 0;
-
 enum {
 	INIT,
 	INPUT,
 	FAILED,
-	CAPS,
 	NUMCOLS
 };
 
@@ -42,6 +37,7 @@ struct lock {
 	int screen;
 	Window root, win;
 	Pixmap pmap;
+	Pixmap bgmap;
 	unsigned long colors[NUMCOLS];
 };
 
@@ -53,6 +49,8 @@ struct xrandr {
 
 #include "config.h"
 
+Imlib_Image image;
+
 static void
 die(const char *errstr, ...)
 {
@@ -90,98 +88,6 @@ 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)
 {
@@ -229,20 +135,16 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
 {
 	XRRScreenChangeNotifyEvent *rre;
 	char buf[32], passwd[256], *inputhash;
-	int caps, num, screen, running, failure, oldc;
+	int num, screen, running, failure, oldc;
-	unsigned int len, color, indicators;
+	unsigned int len, color;
 	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)) {
 		if (ev.type == KeyPress) {
 			explicit_bzero(&buf, sizeof(buf));
@@ -259,35 +161,7 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
 			    IsPFKey(ksym) ||
 			    IsPrivateKeypadKey(ksym))
 				continue;
-			if (ev.xkey.state & ControlMask) {
 			switch (ksym) {
-				case XK_u:
-					ksym = XK_Escape;
-					break;
-				case XK_m:
-					ksym = XK_Return;
-					break;
-				case XK_j:
-					ksym = XK_Return;
-					break;
-				case XK_h:
-                                       ksym = XK_BackSpace;
-					break;
-				}
-			}
-			switch (ksym) {
-      case XF86XK_AudioPlay:
-      case XF86XK_AudioStop:
-      case XF86XK_AudioPrev:
-      case XF86XK_AudioNext:
-      case XF86XK_AudioRaiseVolume:
-      case XF86XK_AudioLowerVolume:
-      case XF86XK_AudioMute:
-      case XF86XK_AudioMicMute:
-      case XF86XK_MonBrightnessDown:
-      case XF86XK_MonBrightnessUp:
-        XSendEvent(dpy, DefaultRootWindow(dpy), True, KeyPressMask, &ev);
-        break;
 			case XK_Return:
 				passwd[len] = '\0';
 				errno = 0;
@@ -310,9 +184,6 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
 				if (len)
 					passwd[--len] = '\0';
 				break;
-			case XK_Caps_Lock:
-				caps = !caps;
-				break;
 			default:
 				if (num && !iscntrl((int)buf[0]) &&
 				    (len + num < sizeof(passwd))) {
@@ -321,14 +192,14 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
 				}
 				break;
 			}
-			color = len ? (caps ? CAPS : INPUT) : (failure || failonclear ? FAILED : INIT);
+			color = len ? INPUT : ((failure || failonclear) ? FAILED : INIT);
 			if (running && oldc != color) {
 				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);
-					writemessage(dpy, locks[screen]->win, screen);
 				}
 				oldc = color;
 			}
@@ -370,6 +241,17 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen)
 	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);
@@ -386,6 +268,8 @@ lockscreen(Display *dpy, struct xrandr *rr, int 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);
@@ -435,7 +319,7 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen)
 static void
 usage(void)
 {
-	die("usage: slock [-v] [-f] [-m message] [cmd [arg ...]]\n");
+	die("usage: slock [-v] [cmd [arg ...]]\n");
 }
 
 int
@@ -448,25 +332,13 @@ main(int argc, char **argv) {
 	gid_t dgid;
 	const char *hash;
 	Display *dpy;
-	int i, s, nlocks, nscreens;
+	int s, nlocks, nscreens;
-	int count_fonts;
+	CARD16 standby, suspend, off;
-	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
@@ -503,6 +375,60 @@ main(int argc, char **argv) {
 	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);
+
+#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 */
 	rr.active = XRRQueryExtension(dpy, &rr.evbase, &rr.errbase);
 
@@ -511,19 +437,31 @@ 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);
 
 	/* 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 (!DPMSEnable(dpy))
+		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()) {
@@ -541,5 +479,9 @@ main(int argc, char **argv) {
 	/* everything is now blank. Wait for the correct password */
 	readpw(dpy, &rr, locks, nscreens, hash);
 
+	/* reset DPMS values to inital ones */
+	DPMSSetTimeouts(dpy, standby, suspend, off);
+	XSync(dpy, 0);
+
 	return 0;
 }