Merge branch 'master' into 'main'

Initial commit

See merge request vojjvoda/loqy!2

.gitignore

@@ -1,2 +0,0 @@
-loqy
-.gitignore

LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022 Јован Ђокић-Шумарац
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -1,5 +1,2 @@
 # LOQY
 A simple and minimalistic lockscreen for X11, written in C.
-
-
-![LOL](https://gitlab.com/vojjvoda/loqy/-/raw/main/ss.png)

main.c

@@ -15,42 +15,41 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/xf86vmode.h>
 
+/* user and group to drop privileges to */
+static const char *user    = "overlord";
+static const char *group   = "wheel";
+static const char *message = "Password";
 #define PASS_LEN 1024
 #define PASS_BOX_LEN 20
 #define FONT_SIZE 12
 
 
-/* user and group to drop privileges to */
-static const char *user    = "overlord";
-static const char *group   = "wheel";
-static const char *message = "Password";
-
-
-typedef struct{unsigned long  flags;
+typedef struct { unsigned long   flags;
                  unsigned long   functions;
                  unsigned long   decorations;
                  long            inputMode;
                  unsigned long   status;
-}Hints;
+} Hints;
+
 
 
 
 
-int width, height;
 char pass_buffer[PASS_LEN], passwd[PASS_LEN];
 
 
-void anullate(char*, int);
-void catch_fire(char*, int);
-void draw_ui(Display*, Window, Visual*, Colormap, int);
-void get_passwd(Display*, Window, Visual*, Colormap, int, const char*);
+
+void catch_fire (char*, int);
+void draw_ui (Display*, Window, Visual*, Colormap, int, int, int);
+void window_attr (Display*, Window, int, int, int);
+void anullate (char*, int);
+void get_passwd(Display*, Window w, Visual *v, Colormap cmap, int width, int height, int screen, const char*);
 static const char *generate_hash(void);
-void window_attr(Display*, Window, int);
 
 
 
 
-int main(void){
+int main(void) {
 
   struct passwd *pwd;
   struct group *grp;
@@ -61,16 +60,16 @@ int main(void){
 
 
   Display *d = XOpenDisplay(NULL);
-  if(d == NULL) 
+  if ( d == NULL ) 
     catch_fire("Cannot open display\n", 1);
 
 
-  if(!(pwd = getpwnam(user)))
+  if (!(pwd = getpwnam(user)))
     catch_fire("Cannot get user", 6);
   duid = pwd->pw_uid;
 
 
-  if(!(grp = getgrnam(group)))
+  if (!(grp = getgrnam(group)))
     catch_fire("Can't get group", 7);
   dgid = grp->gr_gid;
     
@@ -78,8 +77,8 @@ int main(void){
 
   int s = DefaultScreen(d);
   int depth = DefaultDepth(d, s);
-  width  = DisplayWidth(d, s);
-  height = DisplayHeight(d, s);
+  int width = DisplayWidth(d, s);
+  int height = DisplayHeight(d, s);
 
 
   Window w;
@@ -92,17 +91,15 @@ int main(void){
   XSetWindowAttributes attributes;
   attributes.override_redirect = True;
   attributes.background_pixel = BlackPixel(d, s);
-
   // MAKE THE WINDOW
   w = XCreateWindow(d, XRootWindow(d, s), 0, 0, width, height, 0, depth,
       InputOutput, visual, CWBackPixel | CWOverrideRedirect, &attributes);
 
  
-
   // SET WINDOW ATTRIBUTES 
-  window_attr(d, w, s); 
+  window_attr(d, w, s, width, height); 
   // DRAW THE RECTANGLES AND STRINGS
-  draw_ui(d, w, visual, cmap, s);
+  draw_ui(d, w, visual, cmap, width, height, s);
 
 
   hash = generate_hash();
@@ -121,25 +118,13 @@ int main(void){
 
 
   // CHECK THE DAMNED PASSWORD 
-  get_passwd(d, w, visual, cmap, s, hash);
- 
+  get_passwd(d, w, visual, cmap, width, height, s, hash);
  
   XCloseDisplay(d);
   return 0;
 }
 
-
-
-
-void anullate(char *str, int size){
-  memset(str, 0, size);
-}
-
-
-
-
-
-void catch_fire(char *string, int error){
+void catch_fire (char *string, int error){
   fprintf(stderr, string);
   exit(error);
 }
@@ -148,7 +133,9 @@ void catch_fire(char *string, int error){
 
 
 
-void draw_ui(Display *d, Window w, Visual *visual, Colormap cmap, int s){
+void draw_ui(Display *d, Window w, Visual *visual, Colormap cmap, int width, int height, int s){
+
+
 
   //FONT SHENANIGANS
   char font_name[strlen("monospace-") +2];
@@ -158,8 +145,9 @@ void draw_ui(Display *d, Window w, Visual *visual, Colormap cmap, int s){
 
 
  // FONT COLORS
-  XftColor xft_black, xft_white;
+  XftColor xft_black;
   XftColorAllocName (d, visual, cmap, "black", &xft_black);
+  XftColor xft_white;
   XftColorAllocName (d, visual, cmap, "white", &xft_white);
 
   
@@ -184,11 +172,11 @@ void draw_ui(Display *d, Window w, Visual *visual, Colormap cmap, int s){
   XftDrawRect(xftdraw, &xft_black, black_rect_x, black_rect_y, black_rect_width, black_rect_height);
 
 
-
   // PRINT PASS MESSAGE
   XftDrawString8(xftdraw, &xft_black, font, white_rect_x  + FONT_SIZE/2, height/2 + FONT_SIZE/2 , message, strlen(message));
 
 
+
   // PRINT ASTERISKS
   char pass_asterisks[PASS_BOX_LEN + 1];
   int i = 0;
@@ -199,12 +187,14 @@ void draw_ui(Display *d, Window w, Visual *visual, Colormap cmap, int s){
 
   XftDrawString8(xftdraw, &xft_white, font, black_rect_x  + FONT_SIZE/2, height/2 + FONT_SIZE/2 , pass_asterisks, strlen(pass_asterisks));
 
+
+
 }
 
 
 
 
-void window_attr(Display *d, Window w, int s){
+void window_attr (Display *d, Window w, int s, int width, int height){
 
   int mode_count;
   
@@ -214,7 +204,7 @@ void window_attr(Display *d, Window w, int s){
   video_mode = modes[0];
 
 
-  // DISABLE DECORATIONS
+  // COCKS FOR FULLSCREEN QOQS
   Hints hints;
   hints.flags = 2;
   hints.decorations = 0;
@@ -223,6 +213,8 @@ void window_attr(Display *d, Window w, int s){
 
 
 
+
+
   XSelectInput(d, w, ExposureMask | KeyPressMask);
   XMapWindow(d, w);
 
@@ -232,7 +224,6 @@ void window_attr(Display *d, Window w, int s){
   XF86VidModeSetViewPort(d, s, 0, 0);
   XMoveResizeWindow(d, w, 0, 0, width, height);
   XMapRaised(d, w);
-
   XGrabPointer(d, w, True, 0, GrabModeAsync, GrabModeAsync, w, 0L, CurrentTime);
   XGrabKeyboard(d, w, True, GrabModeAsync, GrabModeAsync, CurrentTime);
 
@@ -243,7 +234,16 @@ void window_attr(Display *d, Window w, int s){
 
 
 
-void get_passwd(Display *d, Window w, Visual *v, Colormap cmap, int screen, const char *hash){
+
+void anullate(char *str, int size){
+  memset(str, 0, size);
+}
+
+
+
+
+
+void get_passwd(Display *d, Window w, Visual *v, Colormap cmap, int width, int height, int screen, const char *hash){
 
   int num, failure = 0, check = 1;
   unsigned int len = 0;
@@ -253,24 +253,23 @@ void get_passwd(Display *d, Window w, Visual *v, Colormap cmap, int screen, cons
 
  
   // CHECK PASSWORD
-   while(1){
+   while (1) {
       XNextEvent(d, &e);
 
-      if(e.type == KeyPress){
-
+      if (e.type == KeyPress) {
         anullate(pass_buffer, sizeof(pass_buffer));
+        
         num = XLookupString(&e.xkey, pass_buffer, sizeof(pass_buffer), &ksym, 0);
 	
+        if (IsKeypadKey(ksym)) {
 	
-        if(IsKeypadKey(ksym)){
-          if(ksym == XK_KP_Enter)
+          if (ksym == XK_KP_Enter)
 			ksym = XK_Return;
 	
-          else if(ksym >= XK_KP_0 && ksym <= XK_KP_9)
+          else if (ksym >= XK_KP_0 && ksym <= XK_KP_9)
 			ksym = (ksym - XK_KP_0) + XK_0;
         }
 	
-
         if (IsFunctionKey(ksym) ||
 	      IsKeypadKey(ksym) ||
 	      IsMiscFunctionKey(ksym) ||
@@ -278,13 +277,13 @@ void get_passwd(Display *d, Window w, Visual *v, Colormap cmap, int screen, cons
 	      IsPrivateKeypadKey(ksym))
 		    continue;
 	
-
-        switch(ksym){
+        switch (ksym) {
 	
           case XK_Return:
             passwd[len] = '\0';
 
-            if(!(input_hash = crypt(passwd, hash))){
+		
+            if (!(input_hash = crypt(passwd, hash))){
               fprintf(stderr, "loqy : crypt error : %s\n", strerror(errno));
             fprintf(stderr, "%d %d\n", errno, EINVAL);
         }
@@ -292,7 +291,8 @@ void get_passwd(Display *d, Window w, Visual *v, Colormap cmap, int screen, cons
 			  check = !!strcmp(input_hash, hash);
 
 	
-            if(check){
+            if (check) {
+
 		      XBell(d, 100);
 		      failure = 1;
 	  	    }
@@ -307,25 +307,26 @@ void get_passwd(Display *d, Window w, Visual *v, Colormap cmap, int screen, cons
 	    	break;
 
     	case XK_BackSpace:
-	    	    if(len)
+	    	if (len)
 		    	passwd[--len] = '\0';
 	    	break;
 
 	    default:
-	    	    if(num && !iscntrl((int)pass_buffer[0]) && (len + num < sizeof(passwd))){
+	    	if (num && !iscntrl((int)pass_buffer[0]) && (len + num < sizeof(passwd))) {
 			  memcpy(passwd + len, pass_buffer, num);
 			  len += num;
 	    	}
 		break;
     	}
 
-      draw_ui(d, w, v, cmap, screen);
+        draw_ui(d, w, v, cmap, width, height, screen);
 
   if(!check)
     exit(0);
 
       }
    }
+
 }
 
 
@@ -337,20 +338,22 @@ static const char *generate_hash(void){
   const char *hash;
   struct passwd *pw;
 
-  if(!(pw = getpwuid(getuid())))
+  if( !(pw = getpwuid(getuid())) )
     catch_fire("Cannot get password info\n", 2);
+
   hash = pw->pw_passwd; 
 
-  if(!strcmp(hash, "x")){
+  if (!strcmp(hash, "x")) {
     struct spwd *sp;
-    if(!(sp = getspnam(pw->pw_name)))
-      catch_fire("cannot retrieve shadow entry. ", 69);
+    if (!(sp = getspnam(pw->pw_name)))
+      catch_fire("cannot retrieve shadow entry. "
+          "Make sure to suid or sgid slock.\n", 69);
       hash = sp->sp_pwdp;
 	}
-
-	if(!strcmp(hash, "*"))
-		catch_fire("slock: getpwuid: cannot retrieve shadow entry. ", 98);
-	
+	if (!strcmp(hash, "*")) {
+		catch_fire("slock: getpwuid: cannot retrieve shadow entry. "
+		    "Make sure to suid or sgid slock.\n", 98);
+	}
 
   return hash;
 }