PolytreeDE
/
polytreewm
1
0
Fork 0
Code Issues 4 Releases Activity

Remove data structure

This commit is contained in:
Alex Kotov 2021-11-14 11:17:15 +05:00
parent cc9e554091
commit 76155eb52a
Signed by: kotovalexarian
GPG Key ID: 553C0EBBEB5D5F08
4 changed files with 20 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -3,7 +3,7 @@
include config.mk
SRC = atoms.c datastruct.c datetime.c drw.c dwm.c settings.c status.c tags.c util.c
SRC = atoms.c datetime.c drw.c dwm.c settings.c status.c tags.c util.c
OBJ = ${SRC:.c=.o}
all: options dwm
@ -17,7 +17,7 @@ options:
%.o: %.c
${CC} -c $< -o $@ ${CFLAGS}
${OBJ}: atoms.h datastruct.h datetime.h drw.h config.def.h config.mk settings.h status.h tags.h util.h
${OBJ}: atoms.h datetime.h drw.h config.def.h config.mk settings.h status.h tags.h util.h
dwm: ${OBJ}
${CC} -o $@ ${OBJ} ${LDFLAGS}

140
datastruct.c
View File

@ -1,140 +0,0 @@
#include "datastruct.h"
#include <stdlib.h>
struct Datastruct {
DatastructItem top;
};
struct DatastructItem {
Datastruct datastruct;
DatastructItem next;
const void *value;
};
Datastruct datastruct_new()
{
Datastruct datastruct = malloc(sizeof(struct Datastruct));
if (datastruct == NULL) return NULL;
datastruct->top = NULL;
return datastruct;
}
void datastruct_delete(const Datastruct datastruct)
{
// TODO: maybe we should assert?
if (datastruct == NULL) return;
for (DatastructItem item = datastruct->top; item; item = item->next) free(item);
free(datastruct);
}
void *datastruct_value(const Datastruct datastruct, const DatastructItem item)
{
// TODO: maybe we should assert?
if (datastruct == NULL || item == NULL || item->datastruct != datastruct) {
return NULL;
}
// We discard const modifier because user may want to modify it's data.
return (void*)item->value;
}
DatastructItem datastruct_top(const Datastruct datastruct)
{
// TODO: maybe we should assert?
if (datastruct == NULL) return NULL;
return datastruct->top;
}
DatastructItem datastruct_next(
const Datastruct datastruct,
const DatastructItem item
) {
// TODO: maybe we should assert?
if (datastruct == NULL || item == NULL || item->datastruct != datastruct) {
return NULL;
}
return item->next;
}
DatastructItem datastruct_find_first(
const Datastruct datastruct,
const void *const value
) {
// TODO: maybe we should assert?
if (datastruct == NULL) return NULL;
for (DatastructItem item = datastruct->top; item; item = item->next) {
if (item->value == value) return item;
}
return NULL;
}
DatastructItem datastruct_find_last(
const Datastruct datastruct,
const void *const value
) {
// TODO: maybe we should assert?
if (datastruct == NULL) return NULL;
DatastructItem result = NULL;
for (DatastructItem item = datastruct->top; item; item = item->next) {
if (item->value == value) result = item;
}
return result;
}
void datastruct_remove(const Datastruct datastruct, const DatastructItem item)
{
// TODO: maybe we should assert?
if (datastruct == NULL || item == NULL || item->datastruct != datastruct) {
return;
}
DatastructItem prev_item = datastruct->top;
while (prev_item && prev_item->next != item) {
prev_item = prev_item->next;
}
// TODO: maybe we should assert?
if (prev_item == NULL) return;
prev_item->next = item->next;
free(item);
}
DatastructItem datastruct_push(const Datastruct datastruct, const void *const value)
{
// TODO: maybe we should assert?
if (datastruct == NULL) return NULL;
DatastructItem item = malloc(sizeof(struct DatastructItem));
item->datastruct = datastruct;
item->next = datastruct->top;
item->value = value;
datastruct->top = item;
return item;
}
DatastructItem datastruct_insert(
const Datastruct datastruct,
const DatastructItem item,
const void *const value
) {
// TODO: maybe we should assert?
if (datastruct == NULL || item == NULL || item->datastruct != datastruct) {
return NULL;
}
DatastructItem new_item = malloc(sizeof(struct DatastructItem));
new_item->datastruct = datastruct;
new_item->next = item->next;
new_item->value = value;
item->next = new_item;
return new_item;
}

26
datastruct.h
View File

@ -1,26 +0,0 @@
#ifndef _DATASTRUCT_H
#define _DATASTRUCT_H
#include <stddef.h>
#define DATASTRUCT_DELETE(datastruct) { \
datastruct_delete(datastruct); \
datastruct = NULL; \
}
typedef struct Datastruct *Datastruct;
typedef struct DatastructItem *DatastructItem;
Datastruct datastruct_new();
void datastruct_delete(Datastruct datastruct);
void *datastruct_value(Datastruct datastruct, DatastructItem item);
DatastructItem datastruct_top(Datastruct datastruct);
DatastructItem datastruct_next(Datastruct datastruct, DatastructItem item);
DatastructItem datastruct_find_first(Datastruct datastruct, const void *value);
DatastructItem datastruct_find_last(Datastruct datastruct, const void *value);
void datastruct_remove(Datastruct datastruct, DatastructItem item);
DatastructItem datastruct_push(Datastruct datastruct, const void *value);
DatastructItem datastruct_insert(Datastruct datastruct, DatastructItem item, const void *value);
#endif // _DATASTRUCT_H

78
dwm.c
View File

@ -42,7 +42,6 @@
#include <X11/Xft/Xft.h>
#include "atoms.h"
#include "datastruct.h"
#include "datetime.h"
#include "drw.h"
#include "settings.h"
@ -111,7 +110,7 @@ struct Client {
unsigned int tags;
int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
Client *next;
DatastructItem stack_item;
Client *snext;
Monitor *mon;
Window win;
};
@ -144,7 +143,7 @@ struct Monitor {
int topbar;
Client *clients;
Client *sel;
Datastruct stack;
Client *stack;
Monitor *next;
Window barwin;
const Layout *lt[2];
@ -434,17 +433,9 @@ void
arrange(Monitor *m)
{
if (m)
showhide(
(datastruct_top(m->stack) == NULL)
? NULL
: datastruct_value(m->stack, datastruct_top(m->stack))
);
showhide(m->stack);
else for (m = mons; m; m = m->next)
showhide(
(datastruct_top(m->stack) == NULL)
? NULL
: datastruct_value(m->stack, datastruct_top(m->stack))
);
showhide(m->stack);
if (m) {
arrangemon(m);
restack(m);
@ -477,7 +468,8 @@ attach(Client *c)
void
attachstack(Client *c)
{
c->stack_item = datastruct_push(c->mon->stack, c);
c->snext = c->mon->stack;
c->mon->stack = c;
}
void
@ -607,8 +599,8 @@ cleanup(void)
view(&a);
selmon->lt[selmon->sellt] = &foo;
for (m = mons; m; m = m->next)
while (datastruct_top(m->stack))
unmanage(datastruct_value(m->stack, datastruct_top(m->stack)), 0);
while (m->stack)
unmanage(m->stack, 0);
XUngrabKey(dpy, AnyKey, AnyModifier, root);
while (mons)
cleanupmon(mons);
@ -642,7 +634,6 @@ cleanupmon(Monitor *mon)
}
XUnmapWindow(dpy, mon->barwin);
XDestroyWindow(dpy, mon->barwin);
DATASTRUCT_DELETE(mon->stack);
free(mon);
}
@ -854,8 +845,6 @@ createmon(void)
m->pertag->showbars[i] = m->showbar;
}
m->stack = datastruct_new();
return m;
}
@ -886,20 +875,14 @@ detach(Client *c)
void
detachstack(Client *c)
{
datastruct_remove(c->mon->stack, c->stack_item);
c->stack_item = NULL;
Client **tc, *t;
for (tc = &c->mon->stack; *tc && *tc != c; tc = &(*tc)->snext);
*tc = c->snext;
if (c == c->mon->sel) {
Client *client = NULL;
for (
DatastructItem datastruct_item = datastruct_top(c->mon->stack);
datastruct_item;
datastruct_item = datastruct_next(c->mon->stack, datastruct_item)
) {
client = datastruct_value(c->mon->stack, datastruct_item);
if (!(client && !ISVISIBLE(client))) break;
}
c->mon->sel = client;
for (t = c->mon->stack; t && !ISVISIBLE(t); t = t->snext);
c->mon->sel = t;
}
}
@ -998,14 +981,7 @@ void
focus(Client *c)
{
if (!c || !ISVISIBLE(c))
for (
DatastructItem datastruct_item = datastruct_top(selmon->stack);
datastruct_item;
datastruct_item = datastruct_next(selmon->stack, datastruct_item)
) {
c = datastruct_value(selmon->stack, datastruct_item);
if (!(c && !ISVISIBLE(c))) break;
}
for (c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
if (selmon->sel && selmon->sel != c)
unfocus(selmon->sel, 0);
if (c) {
@ -1829,17 +1805,11 @@ restack(Monitor *m)
if (m->lt[m->sellt]->arrange) {
wc.stack_mode = Below;
wc.sibling = m->barwin;
for (
DatastructItem datastruct_item = datastruct_top(m->stack);
datastruct_item;
datastruct_item = datastruct_next(m->stack, datastruct_item)
) {
c = datastruct_value(m->stack, datastruct_item);
for (c = m->stack; c; c = c->snext)
if (!c->isfloating && ISVISIBLE(c)) {
XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
wc.sibling = c->win;
}
}
}
XSync(dpy, False);
while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
@ -2092,22 +2062,10 @@ showhide(Client *c)
XMoveWindow(dpy, c->win, c->x, c->y);
if (!c->mon->lt[c->mon->sellt]->arrange || c->isfloating)
resize(c, c->x, c->y, c->w, c->h, c->bw, 0);
showhide(
datastruct_next(c->mon->stack, c->stack_item) == NULL
? NULL
: datastruct_value(c->mon->stack,
datastruct_next(c->mon->stack,
c->stack_item))
);
showhide(c->snext);
} else {
/* hide clients bottom up */
showhide(
datastruct_next(c->mon->stack, c->stack_item) == NULL
? NULL
: datastruct_value(c->mon->stack,
datastruct_next(c->mon->stack,
c->stack_item))
);
showhide(c->snext);
XMoveWindow(dpy, c->win, WIDTH(c) * -2, c->y);
}
}