small fix of Vincent's patch
This commit is contained in:
		
							parent
							
								
									27d8d24827
								
							
						
					
					
						commit
						ff79c382c5
					
				| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
# slock version
 | 
					# slock version
 | 
				
			||||||
VERSION = 0.2
 | 
					VERSION = 0.3
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Customize below to fit your system
 | 
					# Customize below to fit your system
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										13
									
								
								slock.c
								
								
								
								
							
							
						
						
									
										13
									
								
								slock.c
								
								
								
								
							| 
						 | 
					@ -2,6 +2,9 @@
 | 
				
			||||||
 * See LICENSE file for license details.
 | 
					 * See LICENSE file for license details.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
#define _XOPEN_SOURCE 500
 | 
					#define _XOPEN_SOURCE 500
 | 
				
			||||||
 | 
					#if HAVE_SHADOW_H
 | 
				
			||||||
 | 
					#include <shadow.h>
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <ctype.h>
 | 
					#include <ctype.h>
 | 
				
			||||||
#include <pwd.h>
 | 
					#include <pwd.h>
 | 
				
			||||||
| 
						 | 
					@ -9,9 +12,6 @@
 | 
				
			||||||
#include <stdio.h>
 | 
					#include <stdio.h>
 | 
				
			||||||
#include <string.h>
 | 
					#include <string.h>
 | 
				
			||||||
#include <unistd.h>
 | 
					#include <unistd.h>
 | 
				
			||||||
#if HAVE_SHADOW_H
 | 
					 | 
				
			||||||
#include <shadow.h>
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
#include <sys/types.h>
 | 
					#include <sys/types.h>
 | 
				
			||||||
#include <X11/keysym.h>
 | 
					#include <X11/keysym.h>
 | 
				
			||||||
#include <X11/Xlib.h>
 | 
					#include <X11/Xlib.h>
 | 
				
			||||||
| 
						 | 
					@ -75,8 +75,6 @@ main(int argc, char **argv) {
 | 
				
			||||||
	screen = DefaultScreen(dpy);
 | 
						screen = DefaultScreen(dpy);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* init */
 | 
						/* init */
 | 
				
			||||||
	len = 0;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	wa.override_redirect = 1;
 | 
						wa.override_redirect = 1;
 | 
				
			||||||
	wa.background_pixel = BlackPixel(dpy, screen);
 | 
						wa.background_pixel = BlackPixel(dpy, screen);
 | 
				
			||||||
	w = XCreateWindow(dpy, RootWindow(dpy, screen), 0, 0,
 | 
						w = XCreateWindow(dpy, RootWindow(dpy, screen), 0, 0,
 | 
				
			||||||
| 
						 | 
					@ -96,6 +94,7 @@ main(int argc, char **argv) {
 | 
				
			||||||
		GrabModeAsync, CurrentTime) != GrabSuccess); len--)
 | 
							GrabModeAsync, CurrentTime) != GrabSuccess); len--)
 | 
				
			||||||
		usleep(1000);
 | 
							usleep(1000);
 | 
				
			||||||
	running = running && (len > 0);
 | 
						running = running && (len > 0);
 | 
				
			||||||
 | 
						len = 0;
 | 
				
			||||||
	XMapRaised(dpy, w);
 | 
						XMapRaised(dpy, w);
 | 
				
			||||||
	XSync(dpy, False);
 | 
						XSync(dpy, False);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -120,11 +119,11 @@ main(int argc, char **argv) {
 | 
				
			||||||
				break;
 | 
									break;
 | 
				
			||||||
			case XK_BackSpace:
 | 
								case XK_BackSpace:
 | 
				
			||||||
				if(len)
 | 
									if(len)
 | 
				
			||||||
				  --len;
 | 
										--len;
 | 
				
			||||||
				break;
 | 
									break;
 | 
				
			||||||
			default:
 | 
								default:
 | 
				
			||||||
				if(num && !iscntrl((int) buf[0])) {
 | 
									if(num && !iscntrl((int) buf[0])) {
 | 
				
			||||||
					memcpy(passwd + len,buf,num);
 | 
										memcpy(passwd + len, buf, num);
 | 
				
			||||||
					len += num;
 | 
										len += num;
 | 
				
			||||||
				}
 | 
									}
 | 
				
			||||||
				break;
 | 
									break;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue