mirror of
https://github.com/dylanaraps/sowm.git
synced 2025-07-31 04:01:58 -07:00
sowm: clean up'
This commit is contained in:
22
sowm.c
22
sowm.c
@@ -185,9 +185,7 @@ void win_del(Window w) {
|
|||||||
|
|
||||||
if (!c->prev && !c->next) {
|
if (!c->prev && !c->next) {
|
||||||
free(head);
|
free(head);
|
||||||
|
|
||||||
head = 0;
|
head = 0;
|
||||||
|
|
||||||
ws_save(desk);
|
ws_save(desk);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -197,9 +195,8 @@ void win_del(Window w) {
|
|||||||
c->next->prev = 0;
|
c->next->prev = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (!c->next) {
|
else if (!c->next)
|
||||||
c->prev->next = 0;
|
c->prev->next = 0;
|
||||||
}
|
|
||||||
|
|
||||||
else {
|
else {
|
||||||
c->prev->next = c->next;
|
c->prev->next = c->next;
|
||||||
@@ -215,8 +212,7 @@ void win_del(Window w) {
|
|||||||
void win_kill() {
|
void win_kill() {
|
||||||
Window cur = win_current();
|
Window cur = win_current();
|
||||||
|
|
||||||
if (cur != root)
|
if (cur != root) XKillClient(dis, cur);
|
||||||
XKillClient(dis, cur);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void win_center(Window w) {
|
void win_center(Window w) {
|
||||||
@@ -258,8 +254,7 @@ void win_to_ws(const Arg arg) {
|
|||||||
int tmp = desk;
|
int tmp = desk;
|
||||||
Window cur = win_current();
|
Window cur = win_current();
|
||||||
|
|
||||||
if (arg.i == tmp)
|
if (arg.i == tmp) return;
|
||||||
return;
|
|
||||||
|
|
||||||
ws_sel(arg.i);
|
ws_sel(arg.i);
|
||||||
win_add(cur);
|
win_add(cur);
|
||||||
@@ -378,6 +373,8 @@ void wm_setup() {
|
|||||||
void wm_init() {
|
void wm_init() {
|
||||||
XEvent ev;
|
XEvent ev;
|
||||||
|
|
||||||
|
wm_setup();
|
||||||
|
|
||||||
XGrabButton(dis, 1, Mod4Mask, DefaultRootWindow(dis), True,
|
XGrabButton(dis, 1, Mod4Mask, DefaultRootWindow(dis), True,
|
||||||
ButtonPressMask|ButtonReleaseMask|PointerMotionMask, GrabModeAsync, GrabModeAsync, None, None);
|
ButtonPressMask|ButtonReleaseMask|PointerMotionMask, GrabModeAsync, GrabModeAsync, None, None);
|
||||||
|
|
||||||
@@ -386,17 +383,12 @@ void wm_init() {
|
|||||||
|
|
||||||
start.subwindow = None;
|
start.subwindow = None;
|
||||||
|
|
||||||
while(1 && !XNextEvent(dis,&ev))
|
while(1 && !XNextEvent(dis, &ev))
|
||||||
if (events[ev.type]) events[ev.type](&ev);
|
if (events[ev.type]) events[ev.type](&ev);
|
||||||
}
|
}
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
if ((dis = XOpenDisplay(0))) {
|
if ((dis = XOpenDisplay(0))) wm_init();
|
||||||
wm_setup();
|
|
||||||
wm_init();
|
|
||||||
|
|
||||||
XCloseDisplay(dis);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user