Sivecano/dwl - Change SXB57HHWBQQIOEUXK65JKGXX4ZNSGXU55XHSEXU2YZSTFH3PYZRQC

hot reload

Created by C3XnxSHVFrXKPKo1uVW6yFVbzhyk6TJMQ11yN4QNCsue on February 21, 2025

SXB57HHWBQQIOEUXK65JKGXX4ZNSGXU55XHSEXU2YZSTFH3PYZRQC

Dependencies

In channels

main

Change contents

Insertion in util.h at line 2 [12.1]

[12.64]

typedef struct listens {
    struct wl_listener* listen;
    struct listens* next;
} listens;

Insertion in util.h at line 10 [12.1]

[8.30]

struct listens* append_listener(struct wl_listener* l, struct listens* ls);
struct listens* remove_listener(struct wl_listener* l, struct listens* ls);

Insertion in util.c at line 51 [12.172]

[8.307]

[12.692]

}
struct listens*
append_listener(struct wl_listener* new, struct listens* list)
{
    struct listens* l = malloc(sizeof(struct listens));
    l->listen = new;
    l->next = list;
    return l;
}
struct listens*
remove_listener(struct wl_listener* l, struct listens* ls)
{
    struct listens* out = ls;
    struct listens* f = NULL;
    for(struct listens* last = NULL; ls != NULL; ls = ls->next)
    {
        if (ls->listen == l)
        {
            if (last != NULL)
                last->next = ls->next;
            else
                out = ls->next;
            f = ls;
        }
        else
            last = ls;
    }
    free(f);
    return out;

Insertion in dwl.c at line 4 [13.4]

[13.67]

[13.99]


/* stuff for hot-reload */
#define _GNU_SOURCE
#include <dlfcn.h>
#include <limits.h>
#include <unistd.h>
#include <libgen.h>
#include <errno.h>

Insertion in dwl.c at line 79 [13.4]
[12.731]
[12.731]

Replacement in dwl.c at line 90 [13.4]

∅:D[14.60] → [15.4:81]

∅:D[16.60] → [15.4:81]

∅:D[17.60] → [15.4:81]

∅:D[3.61] → [15.4:81]

B:BD[18.52] → [15.4:81]

B:BD[15.81] → [19.5:127]

#define LISTEN(E, L, H)         wl_signal_add((E), ((L)->notify = (H), (L)))
#define LISTEN_STATIC(E, H)     do { static struct wl_listener _l = {.notify = (H)}; wl_signal_add((E), &_l); } while (0)

[3.61]

[13.814]


#define SYM(a) dlsym(dwl_module, #a)
#define TSYM(T, a) ((T)SYM(a))
#define CSYM(T, a) *(TSYM(T*, a))
#define LISTEN(E, L, H)         do { \
                                    (L)->notify = SYM(H); \
                                    listeners = append_listener((L), listeners); \
                                    wl_signal_add((E), (L)); \
                                } while(0)

Insertion in dwl.c at line 101 [13.4]

[13.815]

[20.1]

#define LISTEN_GLOBAL(E, L)     do { \
                                    struct wl_listener* l = SYM(L); \
                                    listeners = append_listener(l, listeners); \
                                    wl_signal_add((E), l); \
                                } while (0)
#define LISTEN_STATIC(E, H)     do { \
                                    struct wl_listener* _l = malloc(sizeof(struct wl_listener)); \
                                    _l->notify = SYM(H); \
                                    listeners = append_listener(_l, listeners); \
                                    wl_signal_add((E), _l); \
                                } while (0)
#define UNLISTEN(L)             do { \
                                    wl_list_remove(&(L)->link); \
                                    listeners = remove_listener((L), listeners);\
                                } while (0)

Insertion in dwl.c at line 280 [13.4]
[21.461]
[22.39]
```
#define static 
```
Insertion in dwl.c at line 283 [13.4]
[22.40]
[23.1]
```
#ifdef HOT
```

Insertion in dwl.c at line 295 [13.4]

[24.67]

[25.40]


#undef static
#define static extern
#endif
/* this is cold */

Insertion in dwl.c at line 302 [13.4]
[25.67]
[25.138]
```
#undef static
#define static
#ifdef HOT
```

Insertion in dwl.c at line 374 [13.4]

[26.72]

[27.1]


#undef static
#define static extern
#endif
/* this is cold */

Insertion in dwl.c at line 381 [13.4]
[27.37]
[23.2008]
```
#ifdef HOT
#undef static
#define static
```

Insertion in dwl.c at line 396 [13.4]

[28.279]

[27.38]


#undef static
#define static extern
#endif
/* this is cold */

Insertion in dwl.c at line 403 [13.4]
[27.63]
[29.519]
```
#ifdef HOT
#undef static
#define static
```

Insertion in dwl.c at line 430 [13.4]

[30.35]

[29.612]


#endif
#ifdef HOT
    #undef static
    #define static extern
#else
    #undef static
    #define static 
#endif

Insertion in dwl.c at line 485 [13.4]
[21.1123]
[19.128]
```
#ifdef HOT
```
Insertion in dwl.c at line 487 [13.4]
[19.195]
[31.519]
```
#endif
```

Insertion in dwl.c at line 511 [13.4]

[32.132]

[33.826]

#endif
/* undoes the shadowing of static from above */
#undef static 
/* this is where we put global hot-reload state */
#ifdef HOT 
#define COLD extern
#else
#define COLD
static void* load(void);
static const char* get_module_path(void);
#endif
COLD void * dwl_module = NULL;
COLD void * last_module = NULL;
COLD struct listens* listeners = NULL;
COLD void reload(const Arg* arg);
#ifndef HOT
static char* runpath;

Insertion in dwl.c at line 537 [13.4]
[13.2395]
[34.55]
```
#ifdef HOT
```
Insertion in dwl.c at line 787 [13.4]
[35.106]
[35.106]
```
#endif
```

Replacement in dwl.c at line 803 [13.4]

B:BD[36.140] → [6.196:245]

	destroykeyboardgroup(&kb_group->destroy, NULL);

[36.140]

[36.270]

	TSYM(void (*)(struct wl_listener*, void*), destroykeyboardgroup)(&kb_group->destroy, NULL);

Insertion in dwl.c at line 814 [13.4]
[37.278]
[37.278]
```
#ifdef HOT
```

Replacement in dwl.c at line 830 [13.4]

B:BD[38.233] → [38.233:268]

B:BD[38.268] → [39.57:90]

	wl_list_remove(&m->destroy.link);
	wl_list_remove(&m->frame.link);

[38.233]

[39.90]

	UNLISTEN(&m->destroy);
	UNLISTEN(&m->frame);

Replacement in dwl.c at line 833 [13.4]
B:BD[39.117] → [40.99:140]
```
	wl_list_remove(&m->request_state.link);
```
[39.117]
[41.117]
```
	UNLISTEN(&m->request_state);
```
Replacement in dwl.c at line 966 [13.4]
B:BD[10.839] → [10.839:873]
```
	wl_list_remove(&listener->link);
```
[10.839]
[10.873]
```
	UNLISTEN(listener);
```

Replacement in dwl.c at line 1297 [13.4]

B:BD[42.754] → [42.754:847]

	wl_list_remove(&c->destroy_decoration.link);
	wl_list_remove(&c->set_decoration_mode.link);

[42.754]

[42.847]

	UNLISTEN(&c->destroy_decoration);
	UNLISTEN(&c->set_decoration_mode);

Replacement in dwl.c at line 1323 [13.4]

B:BD[43.2828] → [43.2828:2863]

B:BD[43.2894] → [43.2894:2969]

	wl_list_remove(&l->destroy.link);
	wl_list_remove(&l->unmap.link);
	wl_list_remove(&l->surface_commit.link);

[43.2828]

[43.2969]

	UNLISTEN(&l->destroy);
	UNLISTEN(&l->unmap);
	UNLISTEN(&l->surface_commit);

Replacement in dwl.c at line 1344 [13.4]

B:BD[21.2515] → [21.2515:2632]

	wl_list_remove(&lock->new_surface.link);
	wl_list_remove(&lock->unlock.link);
	wl_list_remove(&lock->destroy.link);

[21.2515]

[21.2632]

	UNLISTEN(&lock->new_surface);
	UNLISTEN(&lock->unlock);
	UNLISTEN(&lock->destroy);

Replacement in dwl.c at line 1360 [13.4]
B:BD[21.2944] → [21.2944:2992]
```
	wl_list_remove(&m->destroy_lock_surface.link);
```
[21.2944]
[21.2992]
```
	UNLISTEN(&m->destroy_lock_surface);
```

Replacement in dwl.c at line 1380 [13.4]

B:BD[44.10135] → [44.10135:10245]

	wl_list_remove(&c->destroy.link);
	wl_list_remove(&c->set_title.link);
	wl_list_remove(&c->fullscreen.link);

[44.10071]

[44.10245]

	UNLISTEN(&c->destroy);
	UNLISTEN(&c->set_title);
	UNLISTEN(&c->fullscreen);

Replacement in dwl.c at line 1385 [13.4]

B:BD[44.10289] → [45.617:692]

∅:D[45.692] → [44.10289:10327]

B:BD[44.10289] → [44.10289:10327]

B:BD[44.10327] → [45.693:732]

∅:D[45.732] → [44.10327:10365]

B:BD[44.10327] → [44.10327:10365]

		wl_list_remove(&c->activate.link);
		wl_list_remove(&c->associate.link);
		wl_list_remove(&c->configure.link);
		wl_list_remove(&c->dissociate.link);
		wl_list_remove(&c->set_hints.link);

[44.10289]

[45.733]

		UNLISTEN(&c->activate);
		UNLISTEN(&c->associate);
		UNLISTEN(&c->configure);
		UNLISTEN(&c->dissociate);
		UNLISTEN(&c->set_hints);

Replacement in dwl.c at line 1393 [13.4]

B:BD[45.751] → [46.79:114]

∅:D[46.114] → [45.751:817]

B:BD[45.751] → [45.751:817]

		wl_list_remove(&c->commit.link);
		wl_list_remove(&c->map.link);
		wl_list_remove(&c->unmap.link);

[45.751]

[44.10402]

		UNLISTEN(&c->commit);
		UNLISTEN(&c->map);
		UNLISTEN(&c->unmap);

Replacement in dwl.c at line 1410 [13.4]

B:BD[47.2429] → [47.2429:2481]

	wl_list_remove(&pointer_constraint->destroy.link);

[47.2429]

[47.2481]

	UNLISTEN(&pointer_constraint->destroy);

Replacement in dwl.c at line 1424 [13.4]

B:BD[21.3626] → [19.268:340]

	wl_list_remove(&lock_listener.link);
	wl_list_remove(&listener->link);

[21.3626]

[6.1775]

	UNLISTEN(&lock_listener);
	UNLISTEN(listener);

Insertion in dwl.c at line 1433 [13.4]

[6.1966]

	UNLISTEN(&group->key);
	UNLISTEN(&group->modifiers);
	UNLISTEN(&group->destroy);

Deletion in dwl.c at line 1437 [13.4]

B:BD[6.2013] → [6.2013:2128]

	wl_list_remove(&group->key.link);
	wl_list_remove(&group->modifiers.link);
	wl_list_remove(&group->destroy.link);

Insertion in dwl.c at line 2330 [13.4]
[44.31972]
[44.31972]
```
#else /*HOT*/
```
Replacement in dwl.c at line 2371 [13.4]
∅:D[48.137] → [44.32954:32970]
∅:D[8.519] → [44.32954:32970]
B:BD[44.32954] → [44.32954:32970]
```
	printstatus();
```
[8.519]
[44.32970]
```
	TSYM(void (*)(void), printstatus)();
```

Replacement in dwl.c at line 2375 [13.4]

B:BD[44.33102] → [44.33102:33143]

	selmon = xytomon(cursor->x, cursor->y);

[44.33102]

[44.33143]

	selmon = TSYM(Monitor* (*)(double x, double y), xytomon)(cursor->x, cursor->y);

Insertion in dwl.c at line 2390 [13.4]
[44.33819]
[44.33819]
```
#endif
#ifdef HOT
```
Insertion in dwl.c at line 2550 [13.4]
[44.38399]
[44.38399]
```
#else /*HOT*/
```

Replacement in dwl.c at line 2557 [13.4]

B:BD[49.907] → [50.169:243]

	struct sigaction sa = {.sa_flags = SA_RESTART, .sa_handler = handlesig};

[49.907]

[50.243]

	struct sigaction sa = {.sa_flags = SA_RESTART, .sa_handler = SYM(handlesig)};

Replacement in dwl.c at line 2563 [13.4]

B:BD[2.7] → [2.7:39]

	wlr_log_init(log_level, NULL);

[2.7]

[50.338]

	wlr_log_init(CSYM(enum wlr_log_importance, log_level), NULL);

Replacement in dwl.c at line 2579 [13.4]

B:BD[44.39535] → [5.46:111]

	root_bg = wlr_scene_rect_create(&scene->tree, 0, 0, rootcolor);

[44.39535]

[49.1076]

	root_bg = wlr_scene_rect_create(&scene->tree, 0, 0, TSYM(float*, rootcolor));

Replacement in dwl.c at line 2675 [13.4]

B:BD[21.4656] → [19.799:867]

	wl_signal_add(&session_lock_mgr->events.new_lock, &lock_listener);

[21.4656]

[19.867]

	LISTEN_GLOBAL(&session_lock_mgr->events.new_lock, lock_listener);

Replacement in dwl.c at line 2745 [13.4]

B:BD[44.45131] → [6.2196:2231]

	kb_group = createkeyboardgroup();

[44.45131]

[6.2231]

	kb_group = TSYM(KeyboardGroup *(*)(void), createkeyboardgroup)();

Insertion in dwl.c at line 2771 [13.4]
[44.45853]
[44.45853]
```
#endif
#ifdef HOT
```
Replacement in dwl.c at line 3249 [13.4]
∅:D[46.258] → [45.1369:1433]
B:BD[45.1369] → [45.1369:1433]
```
	wl_list_remove(&c->map.link);
	wl_list_remove(&c->unmap.link);
```
[45.1369]
[45.1433]
```
	UNLISTEN(&c->map);
	UNLISTEN(&c->unmap);
```

Insertion in dwl.c at line 3312 [13.4]

[44.58712]


#else /* HOT */
void*
load(void)
{
    const char* path = get_module_path();
    char load[PATH_MAX] = "/tmp/dwl.soXXXXXX";
    void* new;
    if (!path) {
        fprintf(stderr, "cannot find dwl.so\n");
    }
    do {
        mktemp(load);
        errno = 0;
        symlink(path, load);
    } while(errno == EEXIST);
    new = dlopen(load, RTLD_NOW|RTLD_LOCAL);
    unlink(load);
    if (new == NULL)
        fprintf(stderr, "error while loading %s: %s\n", path, dlerror());
    else
        printf("loaded: %s\n", path);

Insertion in dwl.c at line 3339 [13.4]

[44.58713]

    return new;
}
const char *
get_module_path(void) {
    char home[PATH_MAX];
    strcpy(home, getenv("HOME"));
    strcat(home, "/.local/lib");
    const char* abspaths[] = {".", home, "/usr/share/lib", "/usr/local/lib", "/usr/local/share/lib"};
    const char* relpaths[] = {"", "/../lib"};
    char paths[LENGTH(abspaths) + LENGTH(relpaths)][PATH_MAX];
    static char out[PATH_MAX] = "./";
    for (size_t i = 0; i < LENGTH(abspaths); i++)
        realpath(abspaths[i], paths[i]);
    for (size_t i = 0; i < LENGTH(relpaths); i++)
    {
        char tmp[PATH_MAX];
        strcpy(tmp, runpath);
        strcat(tmp, relpaths[i]);
        realpath(tmp, paths[LENGTH(abspaths) + i]);
    }
    for (size_t i = 0; i < LENGTH(paths); i++)
    {
        char tmp[PATH_MAX];
        printf("checking path: %s\n", paths[i]);
        strcpy(tmp, paths[i]);
        // printf("tmp: %s\n", tmp);
        strcat(tmp, "/dwl.so");
        if (access(tmp, F_OK|R_OK) == 0)
        {
            strcpy(out, tmp);
            return out;
        }
    }
    return NULL;
}
void
reload(const Arg* arg)
{
    char* error;
    void* new;
    size_t i = 0;
    // deinitialize previous module
    if (last_module) {
        // dlclose(last_module);
        last_module = NULL;
    }
    wlr_log(WLR_INFO, "reloading");
    new = load();
    if (new == NULL)
    {
        wlr_log(WLR_ERROR, "couldn't load new dwl module from %s", get_module_path());
        system("notify-send -u low \"failed to reload dwl\"");
        return;
    }
    wlr_log(WLR_DEBUG, "---------- listens ---------");
    for(listens* a = listeners; a != NULL; a = a->next)
    {
        Dl_info info;
        void* old = a->listen->notify;
        dladdr(a->listen->notify, &info);
        a->listen->notify = dlsym(new, info.dli_sname);
        if ((error = dlerror()) != NULL){
            fprintf(stderr, "reload failure: %s", error);
            a->listen->notify = old;
            return;
        }
        wlr_log(WLR_DEBUG, "replaced listener: %s", info.dli_sname);
        i++;
    }
    wlr_log(WLR_DEBUG, "----------  done!  ---------");
    wlr_log(WLR_DEBUG, "replaced %zu listeners", i);
    last_module = dwl_module;
    dwl_module = new;
    system("notify-send -u low \"reloaded dwl\"");
}

Insertion in dwl.c at line 3437 [13.4]

[44.58783]


    runpath = dirname(argv[0]);
    dwl_module = load();

Replacement in dwl.c at line 3445 [13.4]

B:BD[2.113] → [2.113:139]

			log_level = WLR_DEBUG;

[2.113]

[44.58875]

			CSYM(enum wlr_log_importance, log_level) = WLR_DEBUG;

Insertion in dwl.c at line 3465 [13.4]
[44.59257]
```
#endif
```

Replacement in config.def.h at line 10 [13.36369]

B:BD[51.442] → [5.243:307]

static const float rootcolor[]             = COLOR(0x222222ff);

[51.442]

[52.9]

const float rootcolor[]             = COLOR(0x222222ff);

Replacement in config.def.h at line 21 [13.36369]
B:BD[2.324] → [2.324:358]
```
static int log_level = WLR_ERROR;
```
[2.324]
[2.358]
```
int log_level = WLR_ERROR;
```

Insertion in config.def.h at line 130 [13.36369]

[53.578]

[54.765]

	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_R,          reload,         {0} },

Replacement in Makefile at line 16 [13.38336]

∅:D[11.80] → [55.273:359]

B:BD[56.99] → [55.273:359]

DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CFLAGS)

[11.80]

[9.698]

DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CFLAGS) -fPIC -rdynamic

Replacement in Makefile at line 19 [13.38336]
B:BD[57.46] → [55.411:420]
```
all: dwl
```
[57.46]
[55.420]
```
all: dwl dwl.so
```

Replacement in Makefile at line 22 [13.38336]

B:BD[58.72] → [7.362:432]

dwl.o: dwl.c client.h config.h config.mk cursor-shape-v1-protocol.h \

[58.72]

[7.432]

dwl.o: dwl.c cursor-shape-v1-protocol.h \
	pointer-constraints-unstable-v1-protocol.h wlr-layer-shell-unstable-v1-protocol.h \
	wlr-output-power-management-unstable-v1-protocol.h xdg-shell-protocol.h
dwl.so: dwl.c client.h config.h config.mk cursor-shape-v1-protocol.h \

Replacement in Makefile at line 55 [13.38336]
B:BD[59.1461] → [60.68:96]
```
	rm -f dwl *.o *-protocol.h
```
[59.1461]
[61.86]
```
	rm -f dwl *.o *-protocol.h *.so
```

Insertion in Makefile at line 69 [13.38336]

[59.1974]

	mkdir -p $(DESTDIR)$(PREFIX)/lib
	cp -f dwl.so $(DESTDIR)$(PREFIX)/lib
	chmod 744 $(DESTDIR)$(PREFIX)/lib/dwl.so

Insertion in Makefile at line 85 [13.38336]

[58.288]


.SUFFIXES: .c .so
.c.so:
	$(CC) $(CPPFLAGS) $(DWLCFLAGS) -o $@ -shared -DHOT  $<

hot reload

Dependencies

In channels

Change contents

Insertion in util.h at line 2 [12.1]

Insertion in util.h at line 10 [12.1]

Insertion in util.c at line 51 [12.172]

Insertion in dwl.c at line 4 [13.4]

Insertion in dwl.c at line 79 [13.4]

Replacement in dwl.c at line 90 [13.4]

Insertion in dwl.c at line 101 [13.4]

Insertion in dwl.c at line 280 [13.4]

Insertion in dwl.c at line 283 [13.4]

Insertion in dwl.c at line 295 [13.4]

Insertion in dwl.c at line 302 [13.4]

Insertion in dwl.c at line 374 [13.4]

Insertion in dwl.c at line 381 [13.4]

Insertion in dwl.c at line 396 [13.4]

Insertion in dwl.c at line 403 [13.4]

Insertion in dwl.c at line 430 [13.4]

Insertion in dwl.c at line 485 [13.4]

Insertion in dwl.c at line 487 [13.4]

Insertion in dwl.c at line 511 [13.4]

Insertion in dwl.c at line 537 [13.4]

Insertion in dwl.c at line 787 [13.4]

Replacement in dwl.c at line 803 [13.4]

Insertion in dwl.c at line 814 [13.4]

Replacement in dwl.c at line 830 [13.4]

Replacement in dwl.c at line 833 [13.4]

Replacement in dwl.c at line 966 [13.4]