adding parser, added rc filke

4 files changed, 88 insertions, 42 deletions

diff --git a/defsxrc b/defsxrc
index f0c091b..a4125d8 100644
--- a/defsxrc
+++ b/defsxrc
@@ -1,18 +1,17 @@
 # Colour Themes:
-border_focused_colour =	#c0cbff
-border_unfocused_colour = #555555
-border_swap_colour = #fff4c0
+border_focused_colour 	: #c0cbff
+border_unfocused_colour : #555555
+border_swap_colour 		: #fff4c0
 
 # General Options:
-master_coverage = 60%
-gaps = 10
+master_coverage : 60%
+gaps : 10
 
 # Keybinds:
 # Commands must be surrounded with ""
 # Function calls don't need this
 
-mod_key = alt
+mod_key : alt
 
-bind mod + shift + return = "st"
-# this is an internal command - a pointer to a function
-bind mod + j = focus_next
+bind : [mod + shift + return] : "st"
+bind : [mod + j] 			  : focus_next
diff --git a/src/defs.h b/src/defs.h
index d3f16c7..000e842 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -1,11 +1,6 @@
 /* See LICENSE for more information on use */
-
-#ifndef DEFS_H
-#define DEFS_H
-
-#include <X11/Xlib.h>
-
-#define SXWM_VERSION	"sxwm ver. 1.1.1"
+#pragma once
+#define SXWM_VERSION	"sxwm ver. 1.2"
 #define SXWM_AUTHOR		"(C) Abhinav Prasai 2025"
 #define SXWM_LICINFO	"See LICENSE for more info"
 
@@ -24,6 +19,7 @@
 	const char *name[] = { __VA_ARGS__, NULL }
 
 
+#include <X11/Xlib.h>
 #define INIT_WORKSPACE \
 void change_ws1(void);\
 void moveto_ws1(void);\
@@ -107,7 +103,7 @@ typedef struct {
 	int master_width;
 	int resize_master_amt;
 	int snap_distance;
-	Binding *binds;
+	Binding binds[256];
 } Config;
 
 typedef struct {
@@ -115,4 +111,16 @@ typedef struct {
 	int w, h;
 } Monitor;
 
-#endif
+extern void close_focused(void);
+extern void dec_gaps(void);
+extern void focus_next(void);
+extern void focus_prev(void);
+extern void inc_gaps(void);
+extern void move_master_next(void);
+extern void move_master_prev(void);
+extern void quit(void);
+extern void resize_master_add(void);
+extern void resize_master_sub(void);
+extern void toggle_floating(void);
+extern void toggle_floating_global(void);
+extern void toggle_fullscreen(void);
diff --git a/src/parser.h b/src/parser.h
new file mode 100644
index 0000000..997e245
--- /dev/null
+++ b/src/parser.h
@@ -0,0 +1,19 @@
+#pragma once
+#include "defs.h"
+
+static struct { const char *n; void (*fn)(void); } call_table[] = {
+	{"close_window",	close_focused},
+	{"decrease_gaps",	dec_gaps},
+	{"focus_next",		focus_next},
+	{"focus_previous", 	focus_prev},
+	{"increase_gaps",	inc_gaps},
+	{"master_next",		move_master_next},
+	{"master_previous",	move_master_prev},
+	{"quit",			quit},
+	{"master_increase", resize_master_add},
+	{"master_decrease", resize_master_sub},
+	{"floating",		toggle_floating},
+	{"global_floating", toggle_floating_global},
+	{"fullscreen",		toggle_fullscreen},
+	{NULL,NULL}
+};
diff --git a/src/sxwm.c b/src/sxwm.c
index 90bfca2..c3567db 100644
--- a/src/sxwm.c
+++ b/src/sxwm.c
@@ -34,10 +34,10 @@
 void add_client(Window w);
 void change_workspace(int ws);
 int clean_mask(int mask);
-void close_focused(void);
-void dec_gaps(void);
-void focus_next(void);
-void focus_prev(void);
+/* void close_focused(void); */
+/* void dec_gaps(void); */
+/* void focus_next(void); */
+/* void focus_prev(void); */
 int get_monitor_for(Client *c);
 void grab_keys(void);
 void hdl_button(XEvent *xev);
@@ -52,17 +52,17 @@ void hdl_keypress(XEvent *xev);
 void hdl_map_req(XEvent *xev);
 void hdl_motion(XEvent *xev);
 void hdl_root_property(XEvent *xev);
-void inc_gaps(void);
+/* void inc_gaps(void); */
 void init_defaults(void);
-void move_master_next(void);
-void move_master_prev(void);
+/* void move_master_next(void); */
+/* void move_master_prev(void); */
 void move_to_workspace(int ws);
 void other_wm(void);
 int other_wm_err(Display *dpy, XErrorEvent *ee);
 long parse_col(const char *hex);
-void quit(void);
-void resize_master_add(void);
-void resize_master_sub(void);
+/* void quit(void); */
+/* void resize_master_add(void); */
+/* void resize_master_sub(void); */
 void run(void);
 void scan_existing_windows(void);
 void setup(void);
@@ -70,9 +70,9 @@ void setup_atoms(void);
 void spawn(const char **cmd);
 void swap_clients(Client *a, Client *b);
 void tile(void);
-void toggle_floating(void);
-void toggle_floating_global(void);
-void toggle_fullscreen(void);
+/* void toggle_floating(void); */
+/* void toggle_floating_global(void); */
+/* void toggle_fullscreen(void); */
 void update_borders(void);
 void update_monitors(void);
 void update_net_client_list(void);
@@ -95,6 +95,7 @@ Atom atom_net_workarea;
 Cursor c_normal, c_move, c_resize;
 Client *workspaces[NUM_WORKSPACES] = { NULL };
 Config default_config;
+Config user_config;
 int current_ws = 0;
 DragMode drag_mode = DRAG_NONE;
 Client *drag_client = NULL;
@@ -132,16 +133,23 @@ add_client(Window w)
 		fprintf(stderr, "sxwm: could not alloc memory for client\n");
 		return;
 	}
+
+	if (workspaces[current_ws] == NULL) {
+		workspaces[current_ws] = c;
+	} else {
+		Client *tail = workspaces[current_ws];
+		while (tail->next)
+			tail = tail->next;
+		tail->next = c;
+	}
 	c->win = w;
-	c->next = workspaces[current_ws];
-	workspaces[current_ws] = c;
+	c->next = NULL;
 
 	if (!focused) {
 		focused = c;
 	}
 
 	++open_windows;
-
 	XSelectInput(dpy, w,
 			EnterWindowMask | LeaveWindowMask |
 			FocusChangeMask | PropertyChangeMask |
@@ -284,11 +292,11 @@ grab_keys(void)
 	/* ungrab all keys */
 	XUngrabKey(dpy, AnyKey, AnyModifier, root);
 
-	for (unsigned int i = 0; i < LENGTH(binds); ++i) {
-		if ((keycode = XKeysymToKeycode(dpy, binds[i].keysym))) {
+	for (unsigned int i = 0; i < LENGTH(user_config.binds); ++i) {
+		if ((keycode = XKeysymToKeycode(dpy, user_config.binds[i].keysym))) {
 			for (unsigned int j = 0; j < LENGTH(modifiers); ++j) {
 				XGrabKey(dpy, keycode,
-						binds[i].mods | modifiers[j],
+						user_config.binds[i].mods | modifiers[j],
 						root, True, GrabModeAsync, GrabModeAsync);
 			}
 		}
@@ -520,12 +528,13 @@ hdl_keypress(XEvent *xev)
 	KeySym keysym = XLookupKeysym(&xev->xkey, 0);
 	unsigned int mods = clean_mask(xev->xkey.state);
 
-	for (unsigned int i = 0; i < LENGTH(binds); ++i) {
-		if (keysym == binds[i].keysym && mods == (unsigned int)clean_mask(binds[i].mods)) {
-			if (binds[i].is_func) {
-				binds[i].action.fn();
+	for (unsigned int i = 0; i < LENGTH(user_config.binds); ++i) {
+		if (keysym == user_config.binds[i].keysym &&
+				mods == (unsigned int)clean_mask(user_config.binds[i].mods)) {
+			if (user_config.binds[i].is_func) {
+				user_config.binds[i].action.fn();
 			} else {
-				spawn(binds[i].action.cmd);
+				spawn(user_config.binds[i].action.cmd);
 			}
 			return;
 		}
@@ -825,6 +834,15 @@ init_defaults(void)
 	default_config.master_width = 50;
 	default_config.resize_master_amt = 5;
 	default_config.snap_distance = 5;
+
+	for (unsigned long i = 0; i < LENGTH(binds); ++i) {
+		default_config.binds[i].mods = binds[i].mods;
+		default_config.binds[i].keysym = binds[i].keysym;
+		default_config.binds[i].action.cmd = binds[i].action.cmd;
+		default_config.binds[i].is_func = binds[i].is_func;
+	}
+
+	user_config = default_config;
 }
 
 void
@@ -955,6 +973,7 @@ quit(void)
 	XFreeCursor(dpy, c_normal);
 	XFreeCursor(dpy, c_resize);
 	errx(0, "quitting...");
+
 }
 
 void
@@ -1023,6 +1042,7 @@ setup(void)
 
 	setup_atoms();
 	other_wm();
+	init_defaults();
 	grab_keys();
 
 	c_normal = XCreateFontCursor(dpy, XC_left_ptr);