pbreugno/aswm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: pbreugno:599610fd6f2e733f1e77b88ca4560448053d6428
Branches Tags
pbreugno:main
..
compare: pbreugno:fc736642b208271d15c76461dc7f603dbe1fb0ef
Branches Tags
pbreugno:main

No commits in common. "599610fd6f2e733f1e77b88ca4560448053d6428" and "fc736642b208271d15c76461dc7f603dbe1fb0ef" have entirely different histories.
599610fd6f ... fc736642b2

2 changed files with 6 additions and 11 deletions
Show stats Expand all files Collapse all files

15
src/aswm/aswm.c
View file

@ -17,20 +17,14 @@
Aswm _aswm; Aswm _aswm;
void aswm_open(const char* zlog_conf) { void aswm_open(const char* zlog_conf) {
atexit(aswm_close);
set_up_logger(zlog_conf); set_up_logger(zlog_conf);
XSetErrorHandler(aswm_error_handler);
_aswm.display = XOpenDisplay(NULL); _aswm.display = XOpenDisplay(NULL);
_aswm.desktops = malloc(0); _aswm.desktops = malloc(0);
_aswm.desktops_count = 0; _aswm.desktops_count = 0;
if(_aswm.display == NULL) { XSetErrorHandler(aswm_error_handler);
aswm_error("Cannot open X Display. Check the DISPLAY environement variable, and ensure an X server is running for the corresponding DISPLAY.");
exit(1);
}
Window x_root_window = DefaultRootWindow(_aswm.display); Window x_root_window = DefaultRootWindow(_aswm.display);
XWindowAttributes x_root_attributes; XWindowAttributes x_root_attributes;
XGetWindowAttributes(_aswm.display, x_root_window, &x_root_attributes); XGetWindowAttributes(_aswm.display, x_root_window, &x_root_attributes);
@ -56,6 +50,8 @@ void aswm_open(const char* zlog_conf) {
aswm_debug("ASWM Root window %lu", _aswm.root_window); aswm_debug("ASWM Root window %lu", _aswm.root_window);
aswm_log_tree(aswm_debug, &_aswm, DefaultRootWindow(_aswm.display), 1); aswm_log_tree(aswm_debug, &_aswm, DefaultRootWindow(_aswm.display), 1);
atexit(aswm_close);
} }
void aswm_create_workspace() { void aswm_create_workspace() {
@ -157,8 +153,7 @@ void aswm_event_loop() {
void aswm_close() { void aswm_close() {
free(_aswm.desktops); free(_aswm.desktops);
tear_down_logger(); tear_down_logger();
if(_aswm.display != NULL) XCloseDisplay(_aswm.display);
XCloseDisplay(_aswm.display);
} }
Window aswm_currently_active() { Window aswm_currently_active() {

2
test/test_set_up.c
View file

@ -34,7 +34,7 @@ void set_up_test_logger(void) {
printf("Init test zlog failed\n"); printf("Init test zlog failed\n");
} }
test_log = zlog_get_category("test"); test_log = zlog_get_category("test_log");
if (!test_log) { if (!test_log) {
printf("Get zlog test_log category failed\n"); printf("Get zlog test_log category failed\n");
} }