From 34f21a3c2127161f70c8749b07971aefc4142c2c Mon Sep 17 00:00:00 2001
From: Ted Meyer <tmathmeyer@gmail.com>
Date: Wed, 30 Sep 2015 00:31:32 -0400
Subject: [PATCH 1/3] better arg handling

---
 robolock.c | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/robolock.c b/robolock.c
index 2f7849f..36eaf17 100644
--- a/robolock.c
+++ b/robolock.c
@@ -591,13 +591,17 @@ int lockscreen(Display *disp, lock_t *lock){
 int main(const int argc, char ** argv){
 	const char *pws = 0;
 	Display * disp;
-	/* default blur size */
-	opts.blur_size = 25;
+	
+    {
+        /* default blur size */
+	    opts.blur_size = 25;
 
         /* default thread count */
         opts.threads = 8;
 
-	opts.imagename = 0;
+        /* default image name */
+	    opts.imagename = 0;
+    }
 
 	int c;
 	while((c = getopt(argc, argv, "b:t:i:")) != -1) {
@@ -612,10 +616,18 @@ int main(const int argc, char ** argv){
 				opts.blur_size = atoi(optarg);
 				break;
 			case '?':
-				if (optopt == 'b') {
-					fprintf(stderr, "-b --blur [int]: missing [int]");
-				}
-				break;
+				switch(optopt) {
+                    case 'b':
+					    fprintf(stderr, "-b --blur [int]: missing [int]");
+				        break;
+                    case 'i':
+                        fprintf(stderr, "-i --image [path]: missing [path]");
+                        break;
+                    case 't':
+                        fprintf(stderr, "-t --threads [int]: missing [int]");
+                        break;
+                }
+                break;
 		}
 	}
 	if(!getpwuid(getuid())){

From ce2785e6bddef7ce68331828d357aff38edc2456 Mon Sep 17 00:00:00 2001
From: Ted Meyer <tmathmeyer@gmail.com>
Date: Wed, 30 Sep 2015 01:35:01 -0400
Subject: [PATCH 2/3] added ability to specify the color set for keystrokes

---
 robolock.c | 110 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 95 insertions(+), 15 deletions(-)

diff --git a/robolock.c b/robolock.c
index 176a603..b580667 100644
--- a/robolock.c
+++ b/robolock.c
@@ -31,7 +31,7 @@ typedef struct lock_s {
 	Window root, win;
 	Pixmap pmap;
 	GC gc;
-	XImage * screenshot;
+	XImage *screenshot;
 	unsigned char *scrdata;
 	unsigned int depth;
 	unsigned int width;
@@ -41,7 +41,9 @@ typedef struct lock_s {
 typedef struct options_s {
 	unsigned int blur_size;
 	unsigned int threads;
-	char * imagename;
+	char *imagename;
+    XColor *colors;
+    unsigned int color_count;
 } options_t;
 
 int running = TRUE;
@@ -305,13 +307,10 @@ void postprocesscolor(ppargs_t *args){
 }
 
 
-
 float lastr = 0.0;
 float lastg = 0.0;
 float lastb = 0.0;
 
-
-
 int updateColor(Display *disp, lock_t *lock, float red, float green, float blue){
 
 	if(opts.threads < 1) return FALSE;
@@ -347,6 +346,15 @@ int updateColor(Display *disp, lock_t *lock, float red, float green, float blue)
 	return TRUE;
 }
 
+int pickRandomColor(Display *disp, lock_t *lock, XColor *colors, int color_count) {
+    int color = rand() % color_count;
+    float r = colors[color].red / 65536.0;
+    float g = colors[color].green / 65536.0;
+    float b = colors[color].blue / 65536.0;
+    return updateColor(disp, lock, r-1.0, g-1.0, b-1.0);
+}
+
+
 int getscreenshot(Display * disp, lock_t *lock){
 
 	if(opts.threads < 1) return FALSE;
@@ -458,14 +466,17 @@ void readpw(Display *disp, const char *pws, lock_t *locks, unsigned int numlocks
 				if(num && !iscntrl((int) buf[0]) && (len + num < sizeof(passwd))){
 					memcpy(passwd + len, buf, num);
 					len+= num;
-					unsigned int i;
+                    unsigned int i;
 					for(i= 0; i <numlocks; i++){
-						updateColor(disp, &locks[i],
-							((float)rand()*2.0)/(float)RAND_MAX,
-							((float)rand()*2.0)/(float)RAND_MAX,
-							((float)rand()*2.0)/(float)RAND_MAX);
-					}
-
+					    if (opts.colors) {
+                            pickRandomColor(disp, &locks[i], opts.colors, opts.color_count);
+                        } else {
+                            updateColor(disp, &locks[i],
+							    ((float)rand()*2.0)/(float)RAND_MAX,
+						        ((float)rand()*2.0)/(float)RAND_MAX,
+							    ((float)rand()*2.0)/(float)RAND_MAX);
+                        }
+                    }
 				}
 			break;
 			}
@@ -578,11 +589,70 @@ int lockscreen(Display *disp, lock_t *lock){
 	return TRUE;
 }
 
+int doMakeColor(XColor *at, char *str, Display *disp) {
+    XVisualInfo vinfo;
+    XMatchVisualInfo(disp, DefaultScreen(disp), 32, TrueColor, &vinfo);
+    XSetWindowAttributes wa;
+    wa.colormap = XCreateColormap(disp,
+            DefaultRootWindow(disp),
+            vinfo.visual,
+            AllocNone);
+    wa.border_pixel = 0;
+    wa.background_pixel = 0;
+    
+    if(!XAllocNamedColor(disp, wa.colormap, str, at, at)) {
+        return 0;
+    }
+
+    return 1;
+}
+
+void parseColors(char *optarg, Display *disp) {
+    int rec_colors = 0;
+    int max_colors = 4;
+    int last_hash = -1;
+    XColor *colors = malloc(sizeof(XColor) * max_colors);
+    int done = 0;
+
+    int ctr = 0;
+    while(optarg[ctr]) {
+        switch(optarg[ctr]) {
+            case '#':
+                last_hash = ctr;
+                break;
+            case ' ':
+makenew:
+                if (last_hash != -1) {
+                    optarg[ctr] = 0;
+                    if (rec_colors == max_colors) {
+                        max_colors *=2;
+                        colors = realloc(colors, sizeof(XColor) * max_colors);
+                    }
+                    doMakeColor((colors + rec_colors++)
+                               ,(optarg + last_hash)
+                               ,disp);
+                    last_hash = -1;
+                }
+                if (done) {
+                    goto fillargs;
+                }
+                break;
+        }
+        ctr++;
+    }
+    done = 1;
+    goto makenew;
+fillargs:
+    opts.colors = colors;
+    opts.color_count = rec_colors;
+}
+
 
 int main(const int argc, char ** argv){
 	const char *pws = 0;
 	Display * disp;
-	
+	disp = XOpenDisplay(0);
+    
     {
         /* default blur size */
 	    opts.blur_size = 25;
@@ -592,14 +662,21 @@ int main(const int argc, char ** argv){
 
         /* default image name */
 	    opts.imagename = 0;
+
+        /* default color set */
+        opts.color_count = 0;
+        opts.colors = 0;
     }
 
 	int c;
-	while((c = getopt(argc, argv, "b:t:i:")) != -1) {
+	while((c = getopt(argc, argv, "b:t:i:c:")) != -1) {
 		switch(c) {
 			case 't':
 				opts.threads = atoi(optarg);
 				break;
+			case 'c':
+				parseColors(optarg, disp);
+				break;
 			case 'i':
 				opts.imagename = optarg;
 				break;
@@ -612,6 +689,10 @@ int main(const int argc, char ** argv){
 					    fprintf(stderr, "-b --blur [int]: missing [int]\n");
 				        exit(1);
                         break;
+                    case 'c':
+					    fprintf(stderr, "-c --colorset \"#xxxxxx ...\": missing \"#xxxxxx ...\"\n");
+                        exit(1);
+                        break;
                     case 'i':
 					    fprintf(stderr, "-i --image [path]: missing [path]\n");
                         opts.imagename = "";
@@ -636,7 +717,6 @@ int main(const int argc, char ** argv){
 
 	memset(locks, 0, nscreens * sizeof(lock_t));
 
-	disp = XOpenDisplay(0);
 	if(!disp){
 		printf("No display\n");
 		exit(1);

From 55ffd731058ed5c134c69383fab05bc17ae16c8b Mon Sep 17 00:00:00 2001
From: Ted Meyer <tmathmeyer@gmail.com>
Date: Wed, 30 Sep 2015 01:38:27 -0400
Subject: [PATCH 3/3] tabs are for tools, but whatever

---
 robolock.c | 194 ++++++++++++++++++++++++++---------------------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/robolock.c b/robolock.c
index 48c4b0f..cdb6723 100644
--- a/robolock.c
+++ b/robolock.c
@@ -42,8 +42,8 @@ typedef struct options_s {
 	unsigned int blur_size;
 	unsigned int threads;
 	char *imagename;
-    XColor *colors;
-    unsigned int color_count;
+	XColor *colors;
+	unsigned int color_count;
 } options_t;
 
 int running = TRUE;
@@ -347,11 +347,11 @@ int updateColor(Display *disp, lock_t *lock, float red, float green, float blue)
 }
 
 int pickRandomColor(Display *disp, lock_t *lock, XColor *colors, int color_count) {
-    int color = rand() % color_count;
-    float r = colors[color].red / 65536.0;
-    float g = colors[color].green / 65536.0;
-    float b = colors[color].blue / 65536.0;
-    return updateColor(disp, lock, r-1.0, g-1.0, b-1.0);
+	int color = rand() % color_count;
+	float r = colors[color].red / 65536.0;
+	float g = colors[color].green / 65536.0;
+	float b = colors[color].blue / 65536.0;
+	return updateColor(disp, lock, r-1.0, g-1.0, b-1.0);
 }
 
 
@@ -466,17 +466,17 @@ void readpw(Display *disp, const char *pws, lock_t *locks, unsigned int numlocks
 				if(num && !iscntrl((int) buf[0]) && (len + num < sizeof(passwd))){
 					memcpy(passwd + len, buf, num);
 					len+= num;
-                    unsigned int i;
+					unsigned int i;
 					for(i= 0; i <numlocks; i++){
-					    if (opts.colors) {
-                            pickRandomColor(disp, &locks[i], opts.colors, opts.color_count);
-                        } else {
-                            updateColor(disp, &locks[i],
-							    ((float)rand()*2.0)/(float)RAND_MAX,
-						        ((float)rand()*2.0)/(float)RAND_MAX,
-							    ((float)rand()*2.0)/(float)RAND_MAX);
-                        }
-                    }
+						if (opts.colors) {
+							pickRandomColor(disp, &locks[i], opts.colors, opts.color_count);
+						} else {
+							updateColor(disp, &locks[i],
+								((float)rand()*2.0)/(float)RAND_MAX,
+								((float)rand()*2.0)/(float)RAND_MAX,
+								((float)rand()*2.0)/(float)RAND_MAX);
+						}
+					}
 				}
 			break;
 			}
@@ -613,61 +613,61 @@ int lockscreen(Display *disp, lock_t *lock){
 }
 
 int doMakeColor(XColor *at, char *str, Display *disp) {
-    XVisualInfo vinfo;
-    XMatchVisualInfo(disp, DefaultScreen(disp), 32, TrueColor, &vinfo);
-    XSetWindowAttributes wa;
-    wa.colormap = XCreateColormap(disp,
-            DefaultRootWindow(disp),
-            vinfo.visual,
-            AllocNone);
-    wa.border_pixel = 0;
-    wa.background_pixel = 0;
-    
-    if(!XAllocNamedColor(disp, wa.colormap, str, at, at)) {
-        return 0;
-    }
-
-    return 1;
+	XVisualInfo vinfo;
+	XMatchVisualInfo(disp, DefaultScreen(disp), 32, TrueColor, &vinfo);
+	XSetWindowAttributes wa;
+	wa.colormap = XCreateColormap(disp,
+			DefaultRootWindow(disp),
+			vinfo.visual,
+			AllocNone);
+	wa.border_pixel = 0;
+	wa.background_pixel = 0;
+	
+	if(!XAllocNamedColor(disp, wa.colormap, str, at, at)) {
+		return 0;
+	}
+
+	return 1;
 }
 
 void parseColors(char *optarg, Display *disp) {
-    int rec_colors = 0;
-    int max_colors = 4;
-    int last_hash = -1;
-    XColor *colors = malloc(sizeof(XColor) * max_colors);
-    int done = 0;
-
-    int ctr = 0;
-    while(optarg[ctr]) {
-        switch(optarg[ctr]) {
-            case '#':
-                last_hash = ctr;
-                break;
-            case ' ':
+	int rec_colors = 0;
+	int max_colors = 4;
+	int last_hash = -1;
+	XColor *colors = malloc(sizeof(XColor) * max_colors);
+	int done = 0;
+
+	int ctr = 0;
+	while(optarg[ctr]) {
+		switch(optarg[ctr]) {
+			case '#':
+				last_hash = ctr;
+				break;
+			case ' ':
 makenew:
-                if (last_hash != -1) {
-                    optarg[ctr] = 0;
-                    if (rec_colors == max_colors) {
-                        max_colors *=2;
-                        colors = realloc(colors, sizeof(XColor) * max_colors);
-                    }
-                    doMakeColor((colors + rec_colors++)
-                               ,(optarg + last_hash)
-                               ,disp);
-                    last_hash = -1;
-                }
-                if (done) {
-                    goto fillargs;
-                }
-                break;
-        }
-        ctr++;
-    }
-    done = 1;
-    goto makenew;
+				if (last_hash != -1) {
+					optarg[ctr] = 0;
+					if (rec_colors == max_colors) {
+						max_colors *=2;
+						colors = realloc(colors, sizeof(XColor) * max_colors);
+					}
+					doMakeColor((colors + rec_colors++)
+							   ,(optarg + last_hash)
+							   ,disp);
+					last_hash = -1;
+				}
+				if (done) {
+					goto fillargs;
+				}
+				break;
+		}
+		ctr++;
+	}
+	done = 1;
+	goto makenew;
 fillargs:
-    opts.colors = colors;
-    opts.color_count = rec_colors;
+	opts.colors = colors;
+	opts.color_count = rec_colors;
 }
 
 
@@ -675,21 +675,21 @@ int main(const int argc, char ** argv){
 	const char *pws = 0;
 	Display * disp;
 	disp = XOpenDisplay(0);
-    
-    {
-        /* default blur size */
-	    opts.blur_size = 25;
+	
+	{
+		/* default blur size */
+		opts.blur_size = 25;
 
-        /* default thread count */
-        opts.threads = 8;
+		/* default thread count */
+		opts.threads = 8;
 
-        /* default image name */
-	    opts.imagename = 0;
+		/* default image name */
+		opts.imagename = 0;
 
-        /* default color set */
-        opts.color_count = 0;
-        opts.colors = 0;
-    }
+		/* default color set */
+		opts.color_count = 0;
+		opts.colors = 0;
+	}
 
 	int c;
 	while((c = getopt(argc, argv, "b:t:i:c:")) != -1) {
@@ -708,24 +708,24 @@ int main(const int argc, char ** argv){
 				break;
 			case '?':
 				switch(optopt) {
-                    case 'b':
-					    fprintf(stderr, "-b --blur [int]: missing [int]\n");
-				        exit(1);
-                        break;
-                    case 'c':
-					    fprintf(stderr, "-c --colorset \"#xxxxxx ...\": missing \"#xxxxxx ...\"\n");
-                        exit(1);
-                        break;
-                    case 'i':
-					    fprintf(stderr, "-i --image [path]: missing [path]\n");
-                        opts.imagename = "";
-                        break;
-                    case 't':
-                        fprintf(stderr, "-t --threads [int]: missing [int]\n");
-                        exit(1);
-                        break;
-                }
-                break;
+					case 'b':
+						fprintf(stderr, "-b --blur [int]: missing [int]\n");
+						exit(1);
+						break;
+					case 'c':
+						fprintf(stderr, "-c --colorset \"#xxxxxx ...\": missing \"#xxxxxx ...\"\n");
+						exit(1);
+						break;
+					case 'i':
+						fprintf(stderr, "-i --image [path]: missing [path]\n");
+						opts.imagename = "";
+						break;
+					case 't':
+						fprintf(stderr, "-t --threads [int]: missing [int]\n");
+						exit(1);
+						break;
+				}
+				break;
 		}
 	}
 	if(!getpwuid(getuid())){