commit 9fb183c11a3652f8e1b11eeb1c93a19a645ca084
parent 9cf2ce8736f4e0f3c6ea3339c72ca2f63a418471
Author: Dylan Araps <dylan.araps@gmail.com>
Date: Fri, 11 Oct 2019 20:33:03 +0300
clean up
Diffstat:
| M | catwm.c | | | 40 | ++++++++++++++++++++-------------------- |
| M | config.h | | | 63 | ++++++++++++++++++++++++++++----------------------------------- |
2 files changed, 48 insertions(+), 55 deletions(-)
diff --git a/catwm.c b/catwm.c
@@ -49,29 +49,29 @@ struct desktop{
client *current;
};
-static void add_window(Window w);
+static void win_add(Window w);
static void buttonpress(XEvent *e);
static void buttonrelease(XEvent *e);
-static void center_window();
-static void fullscreen_toggle();
+static void win_mid();
+static void win_fs();
static void change_desktop(const Arg arg);
-static void client_to_desktop(const Arg arg);
+static void win_to_ws(const Arg arg);
static void configurerequest(XEvent *e);
static void destroynotify(XEvent *e);
static void grabkeys();
static void init();
static void keypress(XEvent *e);
-static void kill_client();
+static void win_kill();
static void maprequest(XEvent *e);
static void motionnotify(XEvent *e);
-static void next_win();
-static void remove_window(Window w);
+static void win_next();
+static void win_del(Window w);
static void save_desktop(int i);
static void select_desktop(int i);
static void send_kill_signal(Window w);
static void setup();
static void sigchld(int unused);
-static void spawn(const Arg arg);
+static void sh(const Arg arg);
static void update_current();
#include "config.h"
@@ -100,7 +100,7 @@ static void (*events[LASTEvent])(XEvent *e) = {
[MotionNotify] = motionnotify
};
-void add_window(Window w) {
+void win_add(Window w) {
client *c, *t;
if (!(c = (client *)calloc(1,sizeof(client))))
@@ -143,7 +143,7 @@ void change_desktop(const Arg arg) {
update_current();
}
-void center_window() {
+void win_mid() {
XGetWindowAttributes(dis, current->win, &attr);
int x = (sw / 2) - (attr.width / 2);
@@ -152,7 +152,7 @@ void center_window() {
XMoveWindow(dis, current->win, x, y);
}
-void fullscreen_toggle() {
+void win_fs() {
if (current->f != 1) {
XGetWindowAttributes(dis, current->win, &attr);
@@ -173,7 +173,7 @@ void fullscreen_toggle() {
}
}
-void client_to_desktop(const Arg arg) {
+void win_to_ws(const Arg arg) {
client *tmp = current;
int tmp2 = curr_desk;
@@ -182,13 +182,13 @@ void client_to_desktop(const Arg arg) {
// Add client to desktop
select_desktop(arg.i);
- add_window(tmp->win);
+ win_add(tmp->win);
save_desktop(arg.i);
// Remove client from current desktop
select_desktop(tmp2);
XUnmapWindow(dis,tmp->win);
- remove_window(tmp->win);
+ win_del(tmp->win);
save_desktop(tmp2);
update_current();
}
@@ -220,7 +220,7 @@ void destroynotify(XEvent *e) {
if(i == 0)
return;
- remove_window(ev->window);
+ win_del(ev->window);
update_current();
}
@@ -285,7 +285,7 @@ void buttonrelease(XEvent *e) {
start.subwindow = None;
}
-void kill_client() {
+void win_kill() {
if(current != NULL) {
//send delete signal to window
XEvent ke;
@@ -313,12 +313,12 @@ void maprequest(XEvent *e) {
return;
}
- add_window(ev->window);
+ win_add(ev->window);
XMapWindow(dis,ev->window);
update_current();
}
-void next_win() {
+void win_next() {
client *c;
if (current != NULL && head != NULL) {
@@ -332,7 +332,7 @@ void next_win() {
}
}
-void remove_window(Window w) {
+void win_del(Window w) {
client *c;
for(c=head;c;c=c->next) {
@@ -435,7 +435,7 @@ void sigchld(int unused) {
while(0 < waitpid(-1, NULL, WNOHANG));
}
-void spawn(const Arg arg) {
+void sh(const Arg arg) {
if (fork() == 0) {
if (fork() == 0) {
if (dis) close(ConnectionNumber(dis));
diff --git a/config.h b/config.h
@@ -11,45 +11,38 @@
#ifndef CONFIG_H
#define CONFIG_H
-// Mod (Mod1 == alt) and master size
-#define MOD Mod4Mask
-#define MASTER_SIZE 0.5
+#define MOD Mod4Mask
-// Colors
-#define FOCUS "rgb:bc/57/66"
-#define UNFOCUS "rgb:88/88/88"
+const char* menu[] = {"dmenu_run",NULL};
+const char* term[] = {"st",NULL};
+const char* voldown[] = {"amixer","sset","Master","5\%-",NULL};
+const char* volup[] = {"amixer","sset","Master","5\%+",NULL};
-const char* dmenucmd[] = {"dmenu_run",NULL};
-const char* urxvtcmd[] = {"st",NULL};
-const char* voldown[] = {"amixer","sset","Master","5\%-",NULL};
-const char* volup[] = {"amixer","sset","Master","5\%+",NULL};
+#define DESKTOP(K,N) \
+ { MOD, K, change_desktop, {.i = N}}, \
+ { MOD|ShiftMask, K, win_to_ws, {.i = N}},
-// Avoid multiple paste
-#define DESKTOPCHANGE(K,N) \
- { MOD, K, change_desktop, {.i = N}}, \
- { MOD|ShiftMask, K, client_to_desktop, {.i = N}},
-
-// Shortcuts
static struct key keys[] = {
- // MOD KEY FUNCTION ARGS
- { MOD, XK_q, kill_client, {NULL}},
- { MOD, XK_c, center_window, {NULL}},
- { MOD, XK_f, fullscreen_toggle, {NULL}},
- { Mod1Mask, XK_Tab, next_win, {NULL}},
- { 0, XF86XK_AudioLowerVolume, spawn, {.com = voldown}},
- { 0, XF86XK_AudioRaiseVolume, spawn, {.com = volup}},
- { MOD, XK_d, spawn, {.com = dmenucmd}},
- { MOD, XK_Return, spawn, {.com = urxvtcmd}},
- DESKTOPCHANGE( XK_0, 0)
- DESKTOPCHANGE( XK_1, 1)
- DESKTOPCHANGE( XK_2, 2)
- DESKTOPCHANGE( XK_3, 3)
- DESKTOPCHANGE( XK_4, 4)
- DESKTOPCHANGE( XK_5, 5)
- DESKTOPCHANGE( XK_6, 6)
- DESKTOPCHANGE( XK_7, 7)
- DESKTOPCHANGE( XK_8, 8)
- DESKTOPCHANGE( XK_9, 9)
+ {MOD, XK_q, win_kill, {NULL}},
+ {MOD, XK_c, win_mid, {NULL}},
+ {MOD, XK_f, win_fs, {NULL}},
+ {Mod1Mask, XK_Tab, win_nex, {NULL}},
+
+ {0, XF86XK_AudioLowerVolume, sh, {.com = voldown}},
+ {0, XF86XK_AudioRaiseVolume, sh, {.com = volup}},
+ {MOD, XK_d, sh, {.com = menu}},
+ {MOD, XK_Return, sh, {.com = term}},
+
+ DESKTOP( XK_0, 0)
+ DESKTOP( XK_1, 1)
+ DESKTOP( XK_2, 2)
+ DESKTOP( XK_3, 3)
+ DESKTOP( XK_4, 4)
+ DESKTOP( XK_5, 5)
+ DESKTOP( XK_6, 6)
+ DESKTOP( XK_7, 7)
+ DESKTOP( XK_8, 8)
+ DESKTOP( XK_9, 9)
};
#endif
