mirror of
https://github.com/dylanaraps/sowm.git
synced 2025-05-19 09:30:24 -07:00
docs: update
This commit is contained in:
parent
3cd6cb43a3
commit
4d6bb33353
86
sowm.c
86
sowm.c
@ -29,18 +29,15 @@ struct key {
|
|||||||
|
|
||||||
typedef struct client client;
|
typedef struct client client;
|
||||||
struct client{
|
struct client{
|
||||||
client *next;
|
client *next, *prev;
|
||||||
client *prev;
|
|
||||||
Window win;
|
Window win;
|
||||||
|
|
||||||
int f, x, y, w, h;
|
int f, x, y, w, h;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct desktop desktop;
|
typedef struct desktop desktop;
|
||||||
struct desktop{
|
struct desktop{
|
||||||
|
client *head, *current;
|
||||||
int mode;
|
int mode;
|
||||||
client *head;
|
|
||||||
client *current;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static void configure_request(XEvent *e);
|
static void configure_request(XEvent *e);
|
||||||
@ -74,16 +71,10 @@ static void ws_sel(int i);
|
|||||||
static void wm_init();
|
static void wm_init();
|
||||||
static void wm_setup();
|
static void wm_setup();
|
||||||
|
|
||||||
static client *current;
|
static client *cur, *head;
|
||||||
static client *head;
|
|
||||||
static desktop desktops[10];
|
static desktop desktops[10];
|
||||||
|
|
||||||
static int bool_quit;
|
static int curr_desk, mode, screen, sh, sw;
|
||||||
static int curr_desk;
|
|
||||||
static int mode;
|
|
||||||
static int screen;
|
|
||||||
static int sh;
|
|
||||||
static int sw;
|
|
||||||
|
|
||||||
static Display *dis;
|
static Display *dis;
|
||||||
static Window root;
|
static Window root;
|
||||||
@ -125,7 +116,7 @@ void win_add(Window w) {
|
|||||||
t->next = c;
|
t->next = c;
|
||||||
}
|
}
|
||||||
|
|
||||||
current = c;
|
cur = c;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ws_go(const Arg arg) {
|
void ws_go(const Arg arg) {
|
||||||
@ -147,42 +138,41 @@ void ws_go(const Arg arg) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void win_center() {
|
void win_center() {
|
||||||
XGetWindowAttributes(dis, current->win, &attr);
|
XGetWindowAttributes(dis, cur->win, &attr);
|
||||||
|
|
||||||
int x = (sw / 2) - (attr.width / 2);
|
int x = (sw / 2) - (attr.width / 2);
|
||||||
int y = (sh / 2) - (attr.height / 2);
|
int y = (sh / 2) - (attr.height / 2);
|
||||||
|
|
||||||
XMoveWindow(dis, current->win, x, y);
|
XMoveWindow(dis, cur->win, x, y);
|
||||||
}
|
}
|
||||||
|
|
||||||
void win_fs() {
|
void win_fs() {
|
||||||
if (current == NULL) return;
|
if (cur == NULL) return;
|
||||||
|
|
||||||
if (current->f != 1) {
|
if (cur->f != 1) {
|
||||||
XGetWindowAttributes(dis, current->win, &attr);
|
XGetWindowAttributes(dis, cur->win, &attr);
|
||||||
|
|
||||||
current->f = 1;
|
cur->f = 1;
|
||||||
current->x = attr.x;
|
cur->x = attr.x;
|
||||||
current->y = attr.y;
|
cur->y = attr.y;
|
||||||
current->w = attr.width;
|
cur->w = attr.width;
|
||||||
current->h = attr.height;
|
cur->h = attr.height;
|
||||||
|
|
||||||
XMoveResizeWindow(dis, current->win, 0, 0, sw, sh);
|
XMoveResizeWindow(dis, cur->win, 0, 0, sw, sh);
|
||||||
}
|
}
|
||||||
|
|
||||||
else {
|
else {
|
||||||
current->f = 0;
|
cur->f = 0;
|
||||||
|
|
||||||
XMoveResizeWindow(dis, current->win, current->x, current->y, \
|
XMoveResizeWindow(dis, cur->win, cur->x, cur->y, cur->w, cur->h);
|
||||||
current->w, current->h);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void win_to_ws(const Arg arg) {
|
void win_to_ws(const Arg arg) {
|
||||||
client *tmp = current;
|
client *tmp = cur;
|
||||||
int tmp2 = curr_desk;
|
int tmp2 = curr_desk;
|
||||||
|
|
||||||
if (arg.i == tmp2 || current == NULL)
|
if (arg.i == tmp2 || cur == NULL)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Add client to desktop
|
// Add client to desktop
|
||||||
@ -232,7 +222,7 @@ void win_update() {
|
|||||||
client *c;
|
client *c;
|
||||||
|
|
||||||
for(c=head;c;c=c->next)
|
for(c=head;c;c=c->next)
|
||||||
if (current == c) {
|
if (cur == c) {
|
||||||
XSetInputFocus(dis, c->win, RevertToParent, CurrentTime);
|
XSetInputFocus(dis, c->win, RevertToParent, CurrentTime);
|
||||||
XRaiseWindow(dis, c->win);
|
XRaiseWindow(dis, c->win);
|
||||||
}
|
}
|
||||||
@ -283,7 +273,7 @@ void motion_notify(XEvent *e) {
|
|||||||
MAX(1, attr.width + (start.button==3 ? xdiff : 0)),
|
MAX(1, attr.width + (start.button==3 ? xdiff : 0)),
|
||||||
MAX(1, attr.height + (start.button==3 ? ydiff : 0)));
|
MAX(1, attr.height + (start.button==3 ? ydiff : 0)));
|
||||||
|
|
||||||
current->f = 0;
|
cur->f = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -292,8 +282,8 @@ void button_release(XEvent *e) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void win_kill() {
|
void win_kill() {
|
||||||
if(current != NULL)
|
if(cur != NULL)
|
||||||
XKillClient(dis, current->win);
|
XKillClient(dis, cur->win);
|
||||||
}
|
}
|
||||||
|
|
||||||
void map_request(XEvent *e) {
|
void map_request(XEvent *e) {
|
||||||
@ -316,13 +306,13 @@ void map_request(XEvent *e) {
|
|||||||
void win_next() {
|
void win_next() {
|
||||||
client *c;
|
client *c;
|
||||||
|
|
||||||
if (current != NULL && head != NULL) {
|
if (cur != NULL && head != NULL) {
|
||||||
if (current->next == NULL)
|
if (cur->next == NULL)
|
||||||
c = head;
|
c = head;
|
||||||
else
|
else
|
||||||
c = current->next;
|
c = cur->next;
|
||||||
|
|
||||||
current = c;
|
cur = c;
|
||||||
win_update();
|
win_update();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -336,7 +326,7 @@ void win_del(Window w) {
|
|||||||
free(head);
|
free(head);
|
||||||
|
|
||||||
head = NULL;
|
head = NULL;
|
||||||
current = NULL;
|
cur = NULL;
|
||||||
|
|
||||||
ws_save(curr_desk);
|
ws_save(curr_desk);
|
||||||
return;
|
return;
|
||||||
@ -345,18 +335,18 @@ void win_del(Window w) {
|
|||||||
if (c->prev == NULL) {
|
if (c->prev == NULL) {
|
||||||
head = c->next;
|
head = c->next;
|
||||||
c->next->prev = NULL;
|
c->next->prev = NULL;
|
||||||
current = c->next;
|
cur = c->next;
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (c->next == NULL) {
|
else if (c->next == NULL) {
|
||||||
c->prev->next = NULL;
|
c->prev->next = NULL;
|
||||||
current = c->prev;
|
cur = c->prev;
|
||||||
}
|
}
|
||||||
|
|
||||||
else {
|
else {
|
||||||
c->prev->next = c->next;
|
c->prev->next = c->next;
|
||||||
c->next->prev = c->prev;
|
c->next->prev = c->prev;
|
||||||
current = c->prev;
|
cur = c->prev;
|
||||||
}
|
}
|
||||||
|
|
||||||
free(c);
|
free(c);
|
||||||
@ -370,13 +360,14 @@ void win_del(Window w) {
|
|||||||
void ws_save(int i) {
|
void ws_save(int i) {
|
||||||
desktops[i].mode = mode;
|
desktops[i].mode = mode;
|
||||||
desktops[i].head = head;
|
desktops[i].head = head;
|
||||||
desktops[i].current = current;
|
desktops[i].current = cur;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ws_sel(int i) {
|
void ws_sel(int i) {
|
||||||
head = desktops[i].head;
|
head = desktops[i].head;
|
||||||
current = desktops[i].current;
|
cur = desktops[i].current;
|
||||||
mode = desktops[i].mode;
|
mode = desktops[i].mode;
|
||||||
|
|
||||||
curr_desk = i;
|
curr_desk = i;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -393,14 +384,13 @@ void wm_setup() {
|
|||||||
key_grab();
|
key_grab();
|
||||||
|
|
||||||
mode = 0;
|
mode = 0;
|
||||||
bool_quit = 0;
|
|
||||||
head = NULL;
|
head = NULL;
|
||||||
current = NULL;
|
cur = NULL;
|
||||||
|
|
||||||
for(i=0;i<TABLENGTH(desktops);++i) {
|
for(i=0;i<TABLENGTH(desktops);++i) {
|
||||||
desktops[i].mode = mode;
|
desktops[i].mode = mode;
|
||||||
desktops[i].head = head;
|
desktops[i].head = head;
|
||||||
desktops[i].current = current;
|
desktops[i].current = cur;
|
||||||
}
|
}
|
||||||
|
|
||||||
const Arg arg = {.i = 1};
|
const Arg arg = {.i = 1};
|
||||||
@ -444,7 +434,7 @@ void wm_init() {
|
|||||||
|
|
||||||
start.subwindow = None;
|
start.subwindow = None;
|
||||||
|
|
||||||
while(!bool_quit && !XNextEvent(dis,&ev))
|
while(!XNextEvent(dis,&ev))
|
||||||
if (events[ev.type]) events[ev.type](&ev);
|
if (events[ev.type]) events[ev.type](&ev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user