diff --git a/Makefile b/Makefile index 279b1c0..578194f 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ DWLDEVCFLAGS = -g -Wpedantic -Wall -Wextra -Wdeclaration-after-statement \ -Wfloat-conversion # CFLAGS / LDFLAGS -PKGS = wayland-server xkbcommon libinput pixman-1 fcft $(XLIBS) +PKGS = wayland-server xkbcommon libinput $(XLIBS) DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(WLR_INCS) $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CFLAGS) LDLIBS = `$(PKG_CONFIG) --libs $(PKGS)` $(WLR_LIBS) -lm $(LIBS) diff --git a/config.def.h b/config.def.h index 71d83f5..318442d 100644 --- a/config.def.h +++ b/config.def.h @@ -7,21 +7,15 @@ static const int sloppyfocus = 1; /* focus follows mouse */ static const int bypass_surface_visibility = 0; /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible */ static const unsigned int borderpx = 1; /* border pixel of windows */ -static const int showbar = 1; /* 0 means no bar */ -static const int topbar = 1; /* 0 means bottom bar */ -static const char *fonts[] = {"monospace:size=10"}; -static const float rootcolor[] = COLOR(0x000000ff); +static const float rootcolor[] = COLOR(0x222222ff); +static const float bordercolor[] = COLOR(0x444444ff); +static const float focuscolor[] = COLOR(0x005577ff); +static const float urgentcolor[] = COLOR(0xff0000ff); /* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */ static const float fullscreen_bg[] = {0.0f, 0.0f, 0.0f, 1.0f}; /* You can also use glsl colors */ -static uint32_t colors[][3] = { - /* fg bg border */ - [SchemeNorm] = { 0xbbbbbbff, 0x222222ff, 0x444444ff }, - [SchemeSel] = { 0xeeeeeeff, 0x005577ff, 0x005577ff }, - [SchemeUrg] = { 0, 0, 0x770000ff }, -}; -/* tagging */ -static char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; +/* tagging - TAGCOUNT must be no greater than 31 */ +#define TAGCOUNT (9) /* logging */ static int log_level = WLR_ERROR; @@ -129,7 +123,6 @@ static const Key keys[] = { /* modifier key function argument */ { MODKEY, XKB_KEY_p, spawn, {.v = menucmd} }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, spawn, {.v = termcmd} }, - { MODKEY, XKB_KEY_b, togglebar, {0} }, { MODKEY, XKB_KEY_j, focusstack, {.i = +1} }, { MODKEY, XKB_KEY_k, focusstack, {.i = -1} }, { MODKEY, XKB_KEY_i, incnmaster, {.i = +1} }, @@ -173,15 +166,7 @@ static const Key keys[] = { }; static const Button buttons[] = { - { ClkLtSymbol, 0, BTN_LEFT, setlayout, {.v = &layouts[0]} }, - { ClkLtSymbol, 0, BTN_RIGHT, setlayout, {.v = &layouts[2]} }, - { ClkTitle, 0, BTN_MIDDLE, zoom, {0} }, - { ClkStatus, 0, BTN_MIDDLE, spawn, {.v = termcmd} }, - { ClkClient, MODKEY, BTN_LEFT, moveresize, {.ui = CurMove} }, - { ClkClient, MODKEY, BTN_MIDDLE, togglefloating, {0} }, - { ClkClient, MODKEY, BTN_RIGHT, moveresize, {.ui = CurResize} }, - { ClkTagBar, 0, BTN_LEFT, view, {0} }, - { ClkTagBar, 0, BTN_RIGHT, toggleview, {0} }, - { ClkTagBar, MODKEY, BTN_LEFT, tag, {0} }, - { ClkTagBar, MODKEY, BTN_RIGHT, toggletag, {0} }, + { MODKEY, BTN_LEFT, moveresize, {.ui = CurMove} }, + { MODKEY, BTN_MIDDLE, togglefloating, {0} }, + { MODKEY, BTN_RIGHT, moveresize, {.ui = CurResize} }, }; diff --git a/drwl.h b/drwl.h deleted file mode 100644 index 21afd21..0000000 --- a/drwl.h +++ /dev/null @@ -1,310 +0,0 @@ -/* - * drwl - https://codeberg.org/sewn/drwl - * - * Copyright (c) 2023-2025 sewn - * Copyright (c) 2024 notchoc - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * The UTF-8 Decoder included is from Bjoern Hoehrmann: - * Copyright (c) 2008-2010 Bjoern Hoehrmann - * See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for details. - */ -#pragma once - -#include -#include -#include - -enum { ColFg, ColBg, ColBorder }; /* colorscheme index */ - -typedef struct fcft_font Fnt; -typedef pixman_image_t Img; - -typedef struct { - Img *image; - Fnt *font; - uint32_t *scheme; -} Drwl; - -#define UTF8_ACCEPT 0 -#define UTF8_REJECT 12 -#define UTF8_INVALID 0xFFFD - -static const uint8_t utf8d[] = { - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, - 10,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3, 11,6,6,6,5,8,8,8,8,8,8,8,8,8,8,8, - - 0,12,24,36,60,96,84,12,12,12,48,72, 12,12,12,12,12,12,12,12,12,12,12,12, - 12, 0,12,12,12,12,12, 0,12, 0,12,12, 12,24,12,12,12,12,12,24,12,24,12,12, - 12,12,12,12,12,12,12,24,12,12,12,12, 12,24,12,12,12,12,12,12,12,24,12,12, - 12,12,12,12,12,12,12,36,12,36,12,12, 12,36,12,12,12,12,12,36,12,36,12,12, - 12,36,12,12,12,12,12,12,12,12,12,12, -}; - -static inline uint32_t -utf8decode(uint32_t *state, uint32_t *codep, uint8_t byte) -{ - uint32_t type = utf8d[byte]; - - *codep = (*state != UTF8_ACCEPT) ? - (byte & 0x3fu) | (*codep << 6) : - (0xff >> type) & (byte); - - *state = utf8d[256 + *state + type]; - return *state; -} - -static int -drwl_init(void) -{ - return fcft_init(FCFT_LOG_COLORIZE_AUTO, 0, FCFT_LOG_CLASS_ERROR); -} - -static Drwl * -drwl_create(void) -{ - Drwl *drwl; - - if (!(drwl = calloc(1, sizeof(Drwl)))) - return NULL; - - return drwl; -} - -static void -drwl_setfont(Drwl *drwl, Fnt *font) -{ - if (drwl) - drwl->font = font; -} - -static void -drwl_setimage(Drwl *drwl, Img *image) -{ - if (drwl) - drwl->image = image; -} - -static Fnt * -drwl_font_create(Drwl *drwl, size_t count, - const char *names[static count], const char *attributes) -{ - Fnt *font = fcft_from_name(count, names, attributes); - if (drwl) - drwl_setfont(drwl, font); - return font; -} - -static void -drwl_font_destroy(Fnt *font) -{ - fcft_destroy(font); -} - -static inline pixman_color_t -convert_color(uint32_t clr) -{ - return (pixman_color_t){ - ((clr >> 24) & 0xFF) * 0x101 * (clr & 0xFF) / 0xFF, - ((clr >> 16) & 0xFF) * 0x101 * (clr & 0xFF) / 0xFF, - ((clr >> 8) & 0xFF) * 0x101 * (clr & 0xFF) / 0xFF, - (clr & 0xFF) * 0x101 - }; -} - -static void -drwl_setscheme(Drwl *drwl, uint32_t *scm) -{ - if (drwl) - drwl->scheme = scm; -} - -static Img * -drwl_image_create(Drwl *drwl, unsigned int w, unsigned int h, uint32_t *bits) -{ - Img *image; - pixman_region32_t clip; - - image = pixman_image_create_bits_no_clear( - PIXMAN_a8r8g8b8, w, h, bits, w * 4); - if (!image) - return NULL; - pixman_region32_init_rect(&clip, 0, 0, w, h); - pixman_image_set_clip_region32(image, &clip); - pixman_region32_fini(&clip); - - if (drwl) - drwl_setimage(drwl, image); - return image; -} - -static void -drwl_rect(Drwl *drwl, - int x, int y, unsigned int w, unsigned int h, - int filled, int invert) -{ - pixman_color_t clr; - if (!drwl || !drwl->scheme || !drwl->image) - return; - - clr = convert_color(drwl->scheme[invert ? ColBg : ColFg]); - if (filled) - pixman_image_fill_rectangles(PIXMAN_OP_SRC, drwl->image, &clr, 1, - &(pixman_rectangle16_t){x, y, w, h}); - else - pixman_image_fill_rectangles(PIXMAN_OP_SRC, drwl->image, &clr, 4, - (pixman_rectangle16_t[4]){ - { x, y, w, 1 }, - { x, y + h - 1, w, 1 }, - { x, y, 1, h }, - { x + w - 1, y, 1, h }}); -} - -static int -drwl_text(Drwl *drwl, - int x, int y, unsigned int w, unsigned int h, - unsigned int lpad, const char *text, int invert) -{ - int ty; - int render = x || y || w || h; - long x_kern; - uint32_t cp = 0, last_cp = 0, state; - pixman_color_t clr; - pixman_image_t *fg_pix = NULL; - int noellipsis = 0; - const struct fcft_glyph *glyph, *eg = NULL; - int fcft_subpixel_mode = FCFT_SUBPIXEL_DEFAULT; - - if (!drwl || (render && (!drwl->scheme || !w || !drwl->image)) || !text || !drwl->font) - return 0; - - if (!render) { - w = invert ? invert : ~invert; - } else { - clr = convert_color(drwl->scheme[invert ? ColBg : ColFg]); - fg_pix = pixman_image_create_solid_fill(&clr); - - drwl_rect(drwl, x, y, w, h, 1, !invert); - - x += lpad; - w -= lpad; - } - - if (render && (drwl->scheme[ColBg] & 0xFF) != 0xFF) - fcft_subpixel_mode = FCFT_SUBPIXEL_NONE; - - if (render) - eg = fcft_rasterize_char_utf32(drwl->font, 0x2026 /* … */, fcft_subpixel_mode); - - for (const char *p = text, *pp; pp = p, *p; p++) { - for (state = UTF8_ACCEPT; *p && - utf8decode(&state, &cp, *p) > UTF8_REJECT; p++) - ; - if (!*p || state == UTF8_REJECT) { - cp = UTF8_INVALID; - if (p > pp) - p--; - } - - glyph = fcft_rasterize_char_utf32(drwl->font, cp, fcft_subpixel_mode); - if (!glyph) - continue; - - x_kern = 0; - if (last_cp) - fcft_kerning(drwl->font, last_cp, cp, &x_kern, NULL); - last_cp = cp; - - ty = y + (h - drwl->font->height) / 2 + drwl->font->ascent; - - if (render && !noellipsis && x_kern + glyph->advance.x + eg->advance.x > w && - *(p + 1) != '\0') { - /* cannot fit ellipsis after current codepoint */ - if (drwl_text(drwl, 0, 0, 0, 0, 0, pp, 0) + x_kern <= w) { - noellipsis = 1; - } else { - w -= eg->advance.x; - pixman_image_composite32( - PIXMAN_OP_OVER, fg_pix, eg->pix, drwl->image, 0, 0, 0, 0, - x + eg->x, ty - eg->y, eg->width, eg->height); - } - } - - if ((x_kern + glyph->advance.x) > w) - break; - - x += x_kern; - - if (render && pixman_image_get_format(glyph->pix) == PIXMAN_a8r8g8b8) - /* pre-rendered glyphs (eg. emoji) */ - pixman_image_composite32( - PIXMAN_OP_OVER, glyph->pix, NULL, drwl->image, 0, 0, 0, 0, - x + glyph->x, ty - glyph->y, glyph->width, glyph->height); - else if (render) - pixman_image_composite32( - PIXMAN_OP_OVER, fg_pix, glyph->pix, drwl->image, 0, 0, 0, 0, - x + glyph->x, ty - glyph->y, glyph->width, glyph->height); - - x += glyph->advance.x; - w -= glyph->advance.x; - } - - if (render) - pixman_image_unref(fg_pix); - - return x + (render ? w : 0); -} - -static unsigned int -drwl_font_getwidth(Drwl *drwl, const char *text) -{ - if (!drwl || !drwl->font || !text) - return 0; - return drwl_text(drwl, 0, 0, 0, 0, 0, text, 0); -} - -static void -drwl_image_destroy(Img *image) -{ - pixman_image_unref(image); -} - -static void -drwl_destroy(Drwl *drwl) -{ - if (drwl->font) - drwl_font_destroy(drwl->font); - if (drwl->image) - drwl_image_destroy(drwl->image); - free(drwl); -} - -static void -drwl_fini(void) -{ - fcft_fini(); -} diff --git a/dwl.c b/dwl.c index 7fe9468..101a45f 100644 --- a/dwl.c +++ b/dwl.c @@ -1,12 +1,10 @@ /* * See LICENSE file for copyright and license details. */ -#include #include #include #include #include -#include #include #include #include @@ -62,7 +60,6 @@ #include #include #include -#include #include #include #include @@ -73,7 +70,6 @@ #endif #include "util.h" -#include "drwl.h" /* macros */ #define MAX(A, B) ((A) > (B) ? (A) : (B)) @@ -82,17 +78,14 @@ #define VISIBLEON(C, M) ((M) && (C)->mon == (M) && ((C)->tags & (M)->tagset[(M)->seltags])) #define LENGTH(X) (sizeof X / sizeof X[0]) #define END(A) ((A) + LENGTH(A)) -#define TAGMASK ((1u << LENGTH(tags)) - 1) +#define TAGMASK ((1u << TAGCOUNT) - 1) #define LISTEN(E, L, H) wl_signal_add((E), ((L)->notify = (H), (L))) #define LISTEN_STATIC(E, H) do { struct wl_listener *_l = ecalloc(1, sizeof(*_l)); _l->notify = (H); wl_signal_add((E), _l); } while (0) -#define TEXTW(mon, text) (drwl_font_getwidth(mon->drw, text) + mon->lrpad) /* enums */ -enum { SchemeNorm, SchemeSel, SchemeUrg }; /* color schemes */ enum { CurNormal, CurPressed, CurMove, CurResize }; /* cursor */ enum { XDGShell, LayerShell, X11 }; /* client types */ enum { LyrBg, LyrBottom, LyrTile, LyrFloat, LyrTop, LyrFS, LyrOverlay, LyrBlock, NUM_LAYERS }; /* scene layers */ -enum { ClkTagBar, ClkLtSymbol, ClkStatus, ClkTitle, ClkClient, ClkRoot }; /* clicks */ typedef union { int i; @@ -102,7 +95,6 @@ typedef union { } Arg; typedef struct { - unsigned int click; unsigned int mod; unsigned int button; void (*func)(const Arg *); @@ -192,19 +184,10 @@ typedef struct { void (*arrange)(Monitor *); } Layout; -typedef struct { - struct wlr_buffer base; - struct wl_listener release; - bool busy; - Img *image; - uint32_t data[]; -} Buffer; - struct Monitor { struct wl_list link; struct wlr_output *wlr_output; struct wlr_scene_output *scene_output; - struct wlr_scene_buffer *scene_buffer; /* bar buffer */ struct wlr_scene_rect *fullscreen_bg; /* See createmon() for info */ struct wl_listener frame; struct wl_listener destroy; @@ -212,11 +195,6 @@ struct Monitor { struct wl_listener destroy_lock_surface; struct wlr_session_lock_surface_v1 *lock_surface; struct wlr_box m; /* monitor area, layout-relative */ - struct { - int width, height; - int real_width, real_height; /* non-scaled */ - float scale; - } b; /* bar area */ struct wlr_box w; /* window area, layout-relative */ struct wl_list layers[4]; /* LayerSurface.link */ const Layout *lt[2]; @@ -228,9 +206,6 @@ struct Monitor { int nmaster; char ltsymbol[16]; int asleep; - Drwl *drw; - Buffer *pool[2]; - int lrpad; }; typedef struct { @@ -273,13 +248,6 @@ static void arrangelayer(Monitor *m, struct wl_list *list, struct wlr_box *usable_area, int exclusive); static void arrangelayers(Monitor *m); static void axisnotify(struct wl_listener *listener, void *data); -static bool baracceptsinput(struct wlr_scene_buffer *buffer, double *sx, double *sy); -static void bufdestroy(struct wlr_buffer *buffer); -static bool bufdatabegin(struct wlr_buffer *buffer, uint32_t flags, - void **data, uint32_t *format, size_t *stride); -static void bufdataend(struct wlr_buffer *buffer); -static Buffer *bufmon(Monitor *m); -static void bufrelease(struct wl_listener *listener, void *data); static void buttonpress(struct wl_listener *listener, void *data); static void chvt(const Arg *arg); static void checkidleinhibitor(struct wlr_surface *exclude); @@ -315,8 +283,6 @@ static void destroypointerconstraint(struct wl_listener *listener, void *data); static void destroysessionlock(struct wl_listener *listener, void *data); static void destroykeyboardgroup(struct wl_listener *listener, void *data); static Monitor *dirtomon(enum wlr_direction dir); -static void drawbar(Monitor *m); -static void drawbars(void); static void focusclient(Client *c, int lift); static void focusmon(const Arg *arg); static void focusstack(const Arg *arg); @@ -345,6 +311,7 @@ static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int static void outputmgrtest(struct wl_listener *listener, void *data); static void pointerfocus(Client *c, struct wlr_surface *surface, double sx, double sy, uint32_t time); +static void printstatus(void); static void powermgrsetmode(struct wl_listener *listener, void *data); static void quit(const Arg *arg); static void rendermon(struct wl_listener *listener, void *data); @@ -365,11 +332,9 @@ static void setsel(struct wl_listener *listener, void *data); static void setup(void); static void spawn(const Arg *arg); static void startdrag(struct wl_listener *listener, void *data); -static int statusin(int fd, unsigned int mask, void *data); static void tag(const Arg *arg); static void tagmon(const Arg *arg); static void tile(Monitor *m); -static void togglebar(const Arg *arg); static void togglefloating(const Arg *arg); static void togglefullscreen(const Arg *arg); static void toggletag(const Arg *arg); @@ -378,7 +343,6 @@ static void unlocksession(struct wl_listener *listener, void *data); static void unmaplayersurfacenotify(struct wl_listener *listener, void *data); static void unmapnotify(struct wl_listener *listener, void *data); static void updatemons(struct wl_listener *listener, void *data); -static void updatebar(Monitor *m); static void updatetitle(struct wl_listener *listener, void *data); static void urgent(struct wl_listener *listener, void *data); static void view(const Arg *arg); @@ -443,15 +407,6 @@ static struct wlr_box sgeom; static struct wl_list mons; static Monitor *selmon; -static char stext[256]; -static struct wl_event_source *status_event_source; - -static const struct wlr_buffer_impl buffer_impl = { - .destroy = bufdestroy, - .begin_data_ptr_access = bufdatabegin, - .end_data_ptr_access = bufdataend, -}; - /* global event handlers */ static struct wl_listener cursor_axis = {.notify = axisnotify}; static struct wl_listener cursor_button = {.notify = buttonpress}; @@ -567,7 +522,7 @@ arrange(Monitor *m) wlr_scene_node_set_enabled(&m->fullscreen_bg->node, (c = focustop(m)) && c->isfullscreen); - strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof(m->ltsymbol)); + strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, LENGTH(m->ltsymbol)); /* We move all clients (except fullscreen and unmanaged) to LyrTile while * in floating layout to avoid "real" floating clients be always on top */ @@ -622,11 +577,6 @@ arrangelayers(Monitor *m) if (!m->wlr_output->enabled) return; - if (m->scene_buffer->node.enabled) { - usable_area.height -= m->b.real_height; - usable_area.y += topbar ? m->b.real_height : 0; - } - /* Arrange exclusive surfaces from top->bottom */ for (i = 3; i >= 0; i--) arrangelayer(m, &m->layers[i], &usable_area, 1); @@ -669,102 +619,17 @@ axisnotify(struct wl_listener *listener, void *data) event->delta_discrete, event->source, event->relative_direction); } -bool -baracceptsinput(struct wlr_scene_buffer *buffer, double *sx, double *sy) -{ - return true; -} - -void -bufdestroy(struct wlr_buffer *wlr_buffer) -{ - Buffer *buf = wl_container_of(wlr_buffer, buf, base); - if (buf->busy) - wl_list_remove(&buf->release.link); - drwl_image_destroy(buf->image); - free(buf); -} - -bool -bufdatabegin(struct wlr_buffer *wlr_buffer, uint32_t flags, - void **data, uint32_t *format, size_t *stride) -{ - Buffer *buf = wl_container_of(wlr_buffer, buf, base); - - if (flags & WLR_BUFFER_DATA_PTR_ACCESS_WRITE) return false; - - *data = buf->data; - *stride = wlr_buffer->width * 4; - *format = DRM_FORMAT_ARGB8888; - - return true; -} - -void -bufdataend(struct wlr_buffer *wlr_buffer) -{ -} - -Buffer * -bufmon(Monitor *m) -{ - size_t i; - Buffer *buf = NULL; - - for (i = 0; i < LENGTH(m->pool); i++) { - if (m->pool[i]) { - if (m->pool[i]->busy) - continue; - buf = m->pool[i]; - break; - } - - buf = ecalloc(1, sizeof(Buffer) + (m->b.width * 4 * m->b.height)); - buf->image = drwl_image_create(NULL, m->b.width, m->b.height, buf->data); - wlr_buffer_init(&buf->base, &buffer_impl, m->b.width, m->b.height); - m->pool[i] = buf; - break; - } - if (!buf) - return NULL; - - buf->busy = true; - LISTEN(&buf->base.events.release, &buf->release, bufrelease); - wlr_buffer_lock(&buf->base); - drwl_setimage(m->drw, buf->image); - return buf; -} - -void -bufrelease(struct wl_listener *listener, void *data) -{ - Buffer *buf = wl_container_of(listener, buf, release); - buf->busy = false; - wl_list_remove(&buf->release.link); -} - void buttonpress(struct wl_listener *listener, void *data) { - unsigned int i = 0, x = 0; - double cx; - unsigned int click; struct wlr_pointer_button_event *event = data; struct wlr_keyboard *keyboard; - struct wlr_scene_node *node; - struct wlr_scene_buffer *buffer; uint32_t mods; - Arg arg = {0}; Client *c; const Button *b; wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); - click = ClkRoot; - xytonode(cursor->x, cursor->y, NULL, &c, NULL, NULL, NULL); - if (c) - click = ClkClient; - switch (event->state) { case WL_POINTER_BUTTON_STATE_PRESSED: cursor_mode = CurPressed; @@ -772,34 +637,17 @@ buttonpress(struct wl_listener *listener, void *data) if (locked) break; - if (!c && !exclusive_focus && - (node = wlr_scene_node_at(&layers[LyrBottom]->node, cursor->x, cursor->y, NULL, NULL)) && - (buffer = wlr_scene_buffer_from_node(node)) && buffer == selmon->scene_buffer) { - cx = (cursor->x - selmon->m.x) * selmon->wlr_output->scale; - do - x += TEXTW(selmon, tags[i]); - while (cx >= x && ++i < LENGTH(tags)); - if (i < LENGTH(tags)) { - click = ClkTagBar; - arg.ui = 1 << i; - } else if (cx < x + TEXTW(selmon, selmon->ltsymbol)) - click = ClkLtSymbol; - else if (cx > selmon->b.width - (TEXTW(selmon, stext) - selmon->lrpad + 2)) { - click = ClkStatus; - } else - click = ClkTitle; - } - /* Change focus if the button was _pressed_ over a client */ xytonode(cursor->x, cursor->y, NULL, &c, NULL, NULL, NULL); - if (click == ClkClient && (!client_is_unmanaged(c) || client_wants_focus(c))) + if (c && (!client_is_unmanaged(c) || client_wants_focus(c))) focusclient(c, 1); keyboard = wlr_seat_get_keyboard(seat); mods = keyboard ? wlr_keyboard_get_modifiers(keyboard) : 0; for (b = buttons; b < END(buttons); b++) { - if (CLEANMASK(mods) == CLEANMASK(b->mod) && event->button == b->button && click == b->click && b->func) { - b->func(click == ClkTagBar && b->arg.i == 0 ? &arg : &b->arg); + if (CLEANMASK(mods) == CLEANMASK(b->mod) && + event->button == b->button && b->func) { + b->func(&b->arg); return; } } @@ -874,8 +722,6 @@ cleanup(void) /* Destroy after the wayland display (when the monitors are already destroyed) to avoid destroying them with an invalid scene output. */ wlr_scene_node_destroy(&scene->tree.node); - - drwl_fini(); } void @@ -891,12 +737,6 @@ cleanupmon(struct wl_listener *listener, void *data) wlr_layer_surface_v1_destroy(l->layer_surface); } - for (i = 0; i < LENGTH(m->pool); i++) - wlr_buffer_drop(&m->pool[i]->base); - - drwl_setimage(m->drw, NULL); - drwl_destroy(m->drw); - wl_list_remove(&m->destroy.link); wl_list_remove(&m->frame.link); wl_list_remove(&m->link); @@ -909,7 +749,6 @@ cleanupmon(struct wl_listener *listener, void *data) closemon(m); wlr_scene_node_destroy(&m->fullscreen_bg->node); - wlr_scene_node_destroy(&m->scene_buffer->node); free(m); } @@ -976,7 +815,7 @@ closemon(Monitor *m) setmon(c, selmon, c->tags); } focusclient(focustop(selmon), 1); - drawbars(); + printstatus(); } void @@ -1228,7 +1067,7 @@ createmon(struct wl_listener *listener, void *data) m->nmaster = r->nmaster; m->lt[0] = r->lt; m->lt[1] = &layouts[LENGTH(layouts) > 1 && r->lt != &layouts[1]]; - strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof(m->ltsymbol)); + strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, LENGTH(m->ltsymbol)); wlr_output_state_set_scale(&state, r->scale); wlr_output_state_set_transform(&state, r->rr); break; @@ -1250,15 +1089,8 @@ createmon(struct wl_listener *listener, void *data) wlr_output_commit_state(wlr_output, &state); wlr_output_state_finish(&state); - if (!(m->drw = drwl_create())) - die("failed to create drwl context"); - - m->scene_buffer = wlr_scene_buffer_create(layers[LyrBottom], NULL); - m->scene_buffer->point_accepts_input = baracceptsinput; - updatebar(m); - wl_list_insert(&mons, &m->link); - drawbars(); + printstatus(); /* The xdg-protocol specifies: * @@ -1568,80 +1400,6 @@ dirtomon(enum wlr_direction dir) return selmon; } -void -drawbar(Monitor *m) -{ - int x, w, tw = 0; - int boxs = m->drw->font->height / 9; - int boxw = m->drw->font->height / 6 + 2; - uint32_t i, occ = 0, urg = 0; - Client *c; - Buffer *buf; - - if (!m->scene_buffer->node.enabled) - return; - if (!(buf = bufmon(m))) - return; - - /* draw status first so it can be overdrawn by tags later */ - if (m == selmon) { /* status is only drawn on selected monitor */ - drwl_setscheme(m->drw, colors[SchemeNorm]); - tw = TEXTW(m, stext) - m->lrpad + 2; /* 2px right padding */ - drwl_text(m->drw, m->b.width - tw, 0, tw, m->b.height, 0, stext, 0); - } - - wl_list_for_each(c, &clients, link) { - if (c->mon != m) - continue; - occ |= c->tags; - if (c->isurgent) - urg |= c->tags; - } - x = 0; - c = focustop(m); - for (i = 0; i < LENGTH(tags); i++) { - w = TEXTW(m, tags[i]); - drwl_setscheme(m->drw, colors[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]); - drwl_text(m->drw, x, 0, w, m->b.height, m->lrpad / 2, tags[i], urg & 1 << i); - if (occ & 1 << i) - drwl_rect(m->drw, x + boxs, boxs, boxw, boxw, - m == selmon && c && c->tags & 1 << i, - urg & 1 << i); - x += w; - } - w = TEXTW(m, m->ltsymbol); - drwl_setscheme(m->drw, colors[SchemeNorm]); - x = drwl_text(m->drw, x, 0, w, m->b.height, m->lrpad / 2, m->ltsymbol, 0); - - if ((w = m->b.width - tw - x) > m->b.height) { - if (c) { - drwl_setscheme(m->drw, colors[m == selmon ? SchemeSel : SchemeNorm]); - drwl_text(m->drw, x, 0, w, m->b.height, m->lrpad / 2, client_get_title(c), 0); - if (c && c->isfloating) - drwl_rect(m->drw, x + boxs, boxs, boxw, boxw, 0, 0); - } else { - drwl_setscheme(m->drw, colors[SchemeNorm]); - drwl_rect(m->drw, x, 0, w, m->b.height, 1, 1); - } - } - - wlr_scene_buffer_set_dest_size(m->scene_buffer, - m->b.real_width, m->b.real_height); - wlr_scene_node_set_position(&m->scene_buffer->node, m->m.x, - m->m.y + (topbar ? 0 : m->m.height - m->b.real_height)); - wlr_scene_buffer_set_buffer(m->scene_buffer, &buf->base); - wlr_buffer_unlock(&buf->base); -} - -void -drawbars(void) -{ - Monitor *m = NULL; - - wl_list_for_each(m, &mons, link) - drawbar(m); -} - void focusclient(Client *c, int lift) { @@ -1676,13 +1434,13 @@ focusclient(Client *c, int lift) /* Don't change border color if there is an exclusive focus or we are * handling a drag operation */ if (!exclusive_focus && !seat->drag) - client_set_border_color(c, (float[])COLOR(colors[SchemeSel][ColBorder])); + client_set_border_color(c, focuscolor); } /* Deactivate old client if focus is changing */ if (old && (!c || client_surface(c) != old)) { /* If an overlay is focused, don't focus or activate the client, - * but only update its position in fstack to render its border with its color + * but only update its position in fstack to render its border with focuscolor * and focus it after the overlay is closed. */ if (old_client_type == LayerShell && wlr_scene_node_coords( &old_l->scene->node, &unused_lx, &unused_ly) @@ -1693,11 +1451,12 @@ focusclient(Client *c, int lift) /* Don't deactivate old client if the new one wants focus, as this causes issues with winecfg * and probably other clients */ } else if (old_c && !client_is_unmanaged(old_c) && (!c || !client_wants_focus(c))) { - client_set_border_color(old_c, (float[])COLOR(colors[SchemeNorm][ColBorder])); + client_set_border_color(old_c, bordercolor); + client_activate_surface(old, 0); } } - drawbars(); + printstatus(); if (!c) { /* With no client, all we have left is to clear focus */ @@ -2011,7 +1770,7 @@ mapnotify(struct wl_listener *listener, void *data) for (i = 0; i < 4; i++) { c->border[i] = wlr_scene_rect_create(c->scene, 0, 0, - (float[])COLOR(colors[c->isurgent ? SchemeUrg : SchemeNorm][ColBorder])); + c->isurgent ? urgentcolor : bordercolor); c->border[i]->node.data = c; } @@ -2034,7 +1793,7 @@ mapnotify(struct wl_listener *listener, void *data) } else { applyrules(c); } - drawbars(); + printstatus(); unset_fullscreen: m = c->mon ? c->mon : xytomon(c->geom.x, c->geom.y); @@ -2327,6 +2086,44 @@ pointerfocus(Client *c, struct wlr_surface *surface, double sx, double sy, wlr_seat_pointer_notify_motion(seat, time, sx, sy); } +void +printstatus(void) +{ + Monitor *m = NULL; + Client *c; + uint32_t occ, urg, sel; + + wl_list_for_each(m, &mons, link) { + occ = urg = 0; + wl_list_for_each(c, &clients, link) { + if (c->mon != m) + continue; + occ |= c->tags; + if (c->isurgent) + urg |= c->tags; + } + if ((c = focustop(m))) { + printf("%s title %s\n", m->wlr_output->name, client_get_title(c)); + printf("%s appid %s\n", m->wlr_output->name, client_get_appid(c)); + printf("%s fullscreen %d\n", m->wlr_output->name, c->isfullscreen); + printf("%s floating %d\n", m->wlr_output->name, c->isfloating); + sel = c->tags; + } else { + printf("%s title \n", m->wlr_output->name); + printf("%s appid \n", m->wlr_output->name); + printf("%s fullscreen \n", m->wlr_output->name); + printf("%s floating \n", m->wlr_output->name); + sel = 0; + } + + printf("%s selmon %u\n", m->wlr_output->name, m == selmon); + printf("%s tags %"PRIu32" %"PRIu32" %"PRIu32" %"PRIu32"\n", + m->wlr_output->name, occ, m->tagset[m->seltags], sel, urg); + printf("%s layout %s\n", m->wlr_output->name, m->ltsymbol); + } + fflush(stdout); +} + void powermgrsetmode(struct wl_listener *listener, void *data) { @@ -2455,14 +2252,22 @@ run(char *startup_cmd) /* Now that the socket exists and the backend is started, run the startup command */ if (startup_cmd) { + int piperw[2]; + if (pipe(piperw) < 0) + die("startup: pipe:"); if ((child_pid = fork()) < 0) die("startup: fork:"); if (child_pid == 0) { - close(STDIN_FILENO); setsid(); + dup2(piperw[0], STDIN_FILENO); + close(piperw[0]); + close(piperw[1]); execl("/bin/sh", "/bin/sh", "-c", startup_cmd, NULL); die("startup: execl:"); } + dup2(piperw[1], STDOUT_FILENO); + close(piperw[1]); + close(piperw[0]); } /* Mark stdout as non-blocking to avoid the startup script @@ -2472,7 +2277,7 @@ run(char *startup_cmd) if (fd_set_nonblock(STDOUT_FILENO) < 0) close(STDOUT_FILENO); - drawbars(); + printstatus(); /* At this point the outputs are initialized, choose initial selmon based on * cursor position, and set default cursor image */ @@ -2538,7 +2343,7 @@ setfloating(Client *c, int floating) (p && p->isfullscreen) ? LyrFS : c->isfloating ? LyrFloat : LyrTile]); arrange(c->mon); - drawbars(); + printstatus(); } void @@ -2561,7 +2366,7 @@ setfullscreen(Client *c, int fullscreen) resize(c, c->prev, 0); } arrange(c->mon); - drawbars(); + printstatus(); } void @@ -2573,9 +2378,9 @@ setlayout(const Arg *arg) selmon->sellt ^= 1; if (arg && arg->v) selmon->lt[selmon->sellt] = (Layout *)arg->v; - strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof(selmon->ltsymbol)); + strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, LENGTH(selmon->ltsymbol)); arrange(selmon); - drawbar(selmon); + printstatus(); } /* arg > 1.0 will set mfact absolutely */ @@ -2648,7 +2453,6 @@ setup(void) for (i = 0; i < (int)LENGTH(sig); i++) sigaction(sig[i], &sa, NULL); - wlr_log_init(log_level, NULL); /* The Wayland display is managed by libwayland. It handles accepting @@ -2844,11 +2648,6 @@ setup(void) wl_signal_add(&output_mgr->events.apply, &output_mgr_apply); wl_signal_add(&output_mgr->events.test, &output_mgr_test); - drwl_init(); - - status_event_source = wl_event_loop_add_fd(wl_display_get_event_loop(dpy), - STDIN_FILENO, WL_EVENT_READABLE, statusin, NULL); - /* Make sure XWayland clients don't connect to the parent X server, * e.g when running in the x11 backend or the wayland backend and the * compositor has Xwayland support */ @@ -2873,8 +2672,6 @@ void spawn(const Arg *arg) { if (fork() == 0) { - close(STDIN_FILENO); - open("/dev/null", O_RDWR); dup2(STDERR_FILENO, STDOUT_FILENO); setsid(); execvp(((char **)arg->v)[0], (char **)arg->v); @@ -2893,30 +2690,6 @@ startdrag(struct wl_listener *listener, void *data) LISTEN_STATIC(&drag->icon->events.destroy, destroydragicon); } -int -statusin(int fd, unsigned int mask, void *data) -{ - char status[256]; - ssize_t n; - - if (mask & WL_EVENT_ERROR) - die("status in event error"); - if (mask & WL_EVENT_HANGUP) - wl_event_source_remove(status_event_source); - - n = read(fd, status, sizeof(status) - 1); - if (n < 0 && errno != EWOULDBLOCK) - die("read:"); - - status[n] = '\0'; - status[strcspn(status, "\n")] = '\0'; - - strncpy(stext, status, sizeof(stext)); - drawbars(); - - return 0; -} - void tag(const Arg *arg) { @@ -2927,7 +2700,7 @@ tag(const Arg *arg) sel->tags = arg->ui & TAGMASK; focusclient(focustop(selmon), 1); arrange(selmon); - drawbars(); + printstatus(); } void @@ -2972,15 +2745,6 @@ tile(Monitor *m) } } -void -togglebar(const Arg *arg) -{ - wlr_scene_node_set_enabled(&selmon->scene_buffer->node, - !selmon->scene_buffer->node.enabled); - arrangelayers(selmon); - drawbars(); -} - void togglefloating(const Arg *arg) { @@ -3009,7 +2773,7 @@ toggletag(const Arg *arg) sel->tags = newtags; focusclient(focustop(selmon), 1); arrange(selmon); - drawbars(); + printstatus(); } void @@ -3022,7 +2786,7 @@ toggleview(const Arg *arg) selmon->tagset[selmon->seltags] = newtagset; focusclient(focustop(selmon), 1); arrange(selmon); - drawbars(); + printstatus(); } void @@ -3070,7 +2834,7 @@ unmapnotify(struct wl_listener *listener, void *data) } wlr_scene_node_destroy(&c->scene->node); - drawbars(); + printstatus(); motionnotify(0, NULL, 0, 0, 0, 0); } @@ -3170,13 +2934,6 @@ updatemons(struct wl_listener *listener, void *data) } } - if (stext[0] == '\0') - strncpy(stext, "dwl-"VERSION, sizeof(stext)); - wl_list_for_each(m, &mons, link) { - updatebar(m); - drawbar(m); - } - /* FIXME: figure out why the cursor image is at 0,0 after turning all * the monitors on. * Move the cursor image where it used to be. It does not generate a @@ -3187,45 +2944,12 @@ updatemons(struct wl_listener *listener, void *data) wlr_output_manager_v1_set_configuration(output_mgr, config); } -void -updatebar(Monitor *m) -{ - size_t i; - int rw, rh; - char fontattrs[12]; - - wlr_output_transformed_resolution(m->wlr_output, &rw, &rh); - m->b.width = rw; - m->b.real_width = (int)((float)m->b.width / m->wlr_output->scale); - - wlr_scene_node_set_enabled(&m->scene_buffer->node, m->wlr_output->enabled ? showbar : 0); - - for (i = 0; i < LENGTH(m->pool); i++) - if (m->pool[i]) { - wlr_buffer_drop(&m->pool[i]->base); - m->pool[i] = NULL; - } - - if (m->b.scale == m->wlr_output->scale && m->drw) - return; - - drwl_font_destroy(m->drw->font); - snprintf(fontattrs, sizeof(fontattrs), "dpi=%.2f", 96. * m->wlr_output->scale); - if (!(drwl_font_create(m->drw, LENGTH(fonts), fonts, fontattrs))) - die("Could not load font"); - - m->b.scale = m->wlr_output->scale; - m->lrpad = m->drw->font->height; - m->b.height = m->drw->font->height + 2; - m->b.real_height = (int)((float)m->b.height / m->wlr_output->scale); -} - void updatetitle(struct wl_listener *listener, void *data) { Client *c = wl_container_of(listener, c, set_title); if (c == focustop(c->mon)) - drawbars(); + printstatus(); } void @@ -3238,10 +2962,10 @@ urgent(struct wl_listener *listener, void *data) return; c->isurgent = 1; - drawbars(); + printstatus(); if (client_surface(c)->mapped) - client_set_border_color(c, (float[])COLOR(colors[SchemeUrg][ColBorder])); + client_set_border_color(c, urgentcolor); } void @@ -3254,7 +2978,7 @@ view(const Arg *arg) selmon->tagset[selmon->seltags] = arg->ui & TAGMASK; focusclient(focustop(selmon), 1); arrange(selmon); - drawbars(); + printstatus(); } void @@ -3295,7 +3019,6 @@ xytonode(double x, double y, struct wlr_surface **psurface, { struct wlr_scene_node *node, *pnode; struct wlr_surface *surface = NULL; - struct wlr_scene_surface *scene_surface = NULL; Client *c = NULL; LayerSurface *l = NULL; int layer; @@ -3304,12 +3027,9 @@ xytonode(double x, double y, struct wlr_surface **psurface, if (!(node = wlr_scene_node_at(&layers[layer]->node, x, y, nx, ny))) continue; - if (node->type == WLR_SCENE_NODE_BUFFER) { - scene_surface = wlr_scene_surface_try_from_buffer( - wlr_scene_buffer_from_node(node)); - if (!scene_surface) continue; - surface = scene_surface->surface; - } + if (node->type == WLR_SCENE_NODE_BUFFER) + surface = wlr_scene_surface_try_from_buffer( + wlr_scene_buffer_from_node(node))->surface; /* Walk the tree to find a node that knows the client */ for (pnode = node; pnode && !c; pnode = &pnode->parent->node) c = pnode->data; @@ -3442,10 +3162,10 @@ sethints(struct wl_listener *listener, void *data) return; c->isurgent = xcb_icccm_wm_hints_get_urgency(c->surface.xwayland->hints); - drawbars(); + printstatus(); if (c->isurgent && surface && surface->mapped) - client_set_border_color(c, (float[])COLOR(colors[SchemeUrg][ColBorder])); + client_set_border_color(c, urgentcolor); } void diff --git a/dwl.c.orig b/dwl.c.orig index 101a45f..7fe9468 100644 --- a/dwl.c.orig +++ b/dwl.c.orig @@ -1,10 +1,12 @@ /* * See LICENSE file for copyright and license details. */ +#include #include #include #include #include +#include #include #include #include @@ -60,6 +62,7 @@ #include #include #include +#include #include #include #include @@ -70,6 +73,7 @@ #endif #include "util.h" +#include "drwl.h" /* macros */ #define MAX(A, B) ((A) > (B) ? (A) : (B)) @@ -78,14 +82,17 @@ #define VISIBLEON(C, M) ((M) && (C)->mon == (M) && ((C)->tags & (M)->tagset[(M)->seltags])) #define LENGTH(X) (sizeof X / sizeof X[0]) #define END(A) ((A) + LENGTH(A)) -#define TAGMASK ((1u << TAGCOUNT) - 1) +#define TAGMASK ((1u << LENGTH(tags)) - 1) #define LISTEN(E, L, H) wl_signal_add((E), ((L)->notify = (H), (L))) #define LISTEN_STATIC(E, H) do { struct wl_listener *_l = ecalloc(1, sizeof(*_l)); _l->notify = (H); wl_signal_add((E), _l); } while (0) +#define TEXTW(mon, text) (drwl_font_getwidth(mon->drw, text) + mon->lrpad) /* enums */ +enum { SchemeNorm, SchemeSel, SchemeUrg }; /* color schemes */ enum { CurNormal, CurPressed, CurMove, CurResize }; /* cursor */ enum { XDGShell, LayerShell, X11 }; /* client types */ enum { LyrBg, LyrBottom, LyrTile, LyrFloat, LyrTop, LyrFS, LyrOverlay, LyrBlock, NUM_LAYERS }; /* scene layers */ +enum { ClkTagBar, ClkLtSymbol, ClkStatus, ClkTitle, ClkClient, ClkRoot }; /* clicks */ typedef union { int i; @@ -95,6 +102,7 @@ typedef union { } Arg; typedef struct { + unsigned int click; unsigned int mod; unsigned int button; void (*func)(const Arg *); @@ -184,10 +192,19 @@ typedef struct { void (*arrange)(Monitor *); } Layout; +typedef struct { + struct wlr_buffer base; + struct wl_listener release; + bool busy; + Img *image; + uint32_t data[]; +} Buffer; + struct Monitor { struct wl_list link; struct wlr_output *wlr_output; struct wlr_scene_output *scene_output; + struct wlr_scene_buffer *scene_buffer; /* bar buffer */ struct wlr_scene_rect *fullscreen_bg; /* See createmon() for info */ struct wl_listener frame; struct wl_listener destroy; @@ -195,6 +212,11 @@ struct Monitor { struct wl_listener destroy_lock_surface; struct wlr_session_lock_surface_v1 *lock_surface; struct wlr_box m; /* monitor area, layout-relative */ + struct { + int width, height; + int real_width, real_height; /* non-scaled */ + float scale; + } b; /* bar area */ struct wlr_box w; /* window area, layout-relative */ struct wl_list layers[4]; /* LayerSurface.link */ const Layout *lt[2]; @@ -206,6 +228,9 @@ struct Monitor { int nmaster; char ltsymbol[16]; int asleep; + Drwl *drw; + Buffer *pool[2]; + int lrpad; }; typedef struct { @@ -248,6 +273,13 @@ static void arrangelayer(Monitor *m, struct wl_list *list, struct wlr_box *usable_area, int exclusive); static void arrangelayers(Monitor *m); static void axisnotify(struct wl_listener *listener, void *data); +static bool baracceptsinput(struct wlr_scene_buffer *buffer, double *sx, double *sy); +static void bufdestroy(struct wlr_buffer *buffer); +static bool bufdatabegin(struct wlr_buffer *buffer, uint32_t flags, + void **data, uint32_t *format, size_t *stride); +static void bufdataend(struct wlr_buffer *buffer); +static Buffer *bufmon(Monitor *m); +static void bufrelease(struct wl_listener *listener, void *data); static void buttonpress(struct wl_listener *listener, void *data); static void chvt(const Arg *arg); static void checkidleinhibitor(struct wlr_surface *exclude); @@ -283,6 +315,8 @@ static void destroypointerconstraint(struct wl_listener *listener, void *data); static void destroysessionlock(struct wl_listener *listener, void *data); static void destroykeyboardgroup(struct wl_listener *listener, void *data); static Monitor *dirtomon(enum wlr_direction dir); +static void drawbar(Monitor *m); +static void drawbars(void); static void focusclient(Client *c, int lift); static void focusmon(const Arg *arg); static void focusstack(const Arg *arg); @@ -311,7 +345,6 @@ static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int static void outputmgrtest(struct wl_listener *listener, void *data); static void pointerfocus(Client *c, struct wlr_surface *surface, double sx, double sy, uint32_t time); -static void printstatus(void); static void powermgrsetmode(struct wl_listener *listener, void *data); static void quit(const Arg *arg); static void rendermon(struct wl_listener *listener, void *data); @@ -332,9 +365,11 @@ static void setsel(struct wl_listener *listener, void *data); static void setup(void); static void spawn(const Arg *arg); static void startdrag(struct wl_listener *listener, void *data); +static int statusin(int fd, unsigned int mask, void *data); static void tag(const Arg *arg); static void tagmon(const Arg *arg); static void tile(Monitor *m); +static void togglebar(const Arg *arg); static void togglefloating(const Arg *arg); static void togglefullscreen(const Arg *arg); static void toggletag(const Arg *arg); @@ -343,6 +378,7 @@ static void unlocksession(struct wl_listener *listener, void *data); static void unmaplayersurfacenotify(struct wl_listener *listener, void *data); static void unmapnotify(struct wl_listener *listener, void *data); static void updatemons(struct wl_listener *listener, void *data); +static void updatebar(Monitor *m); static void updatetitle(struct wl_listener *listener, void *data); static void urgent(struct wl_listener *listener, void *data); static void view(const Arg *arg); @@ -407,6 +443,15 @@ static struct wlr_box sgeom; static struct wl_list mons; static Monitor *selmon; +static char stext[256]; +static struct wl_event_source *status_event_source; + +static const struct wlr_buffer_impl buffer_impl = { + .destroy = bufdestroy, + .begin_data_ptr_access = bufdatabegin, + .end_data_ptr_access = bufdataend, +}; + /* global event handlers */ static struct wl_listener cursor_axis = {.notify = axisnotify}; static struct wl_listener cursor_button = {.notify = buttonpress}; @@ -522,7 +567,7 @@ arrange(Monitor *m) wlr_scene_node_set_enabled(&m->fullscreen_bg->node, (c = focustop(m)) && c->isfullscreen); - strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, LENGTH(m->ltsymbol)); + strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof(m->ltsymbol)); /* We move all clients (except fullscreen and unmanaged) to LyrTile while * in floating layout to avoid "real" floating clients be always on top */ @@ -577,6 +622,11 @@ arrangelayers(Monitor *m) if (!m->wlr_output->enabled) return; + if (m->scene_buffer->node.enabled) { + usable_area.height -= m->b.real_height; + usable_area.y += topbar ? m->b.real_height : 0; + } + /* Arrange exclusive surfaces from top->bottom */ for (i = 3; i >= 0; i--) arrangelayer(m, &m->layers[i], &usable_area, 1); @@ -619,17 +669,102 @@ axisnotify(struct wl_listener *listener, void *data) event->delta_discrete, event->source, event->relative_direction); } +bool +baracceptsinput(struct wlr_scene_buffer *buffer, double *sx, double *sy) +{ + return true; +} + +void +bufdestroy(struct wlr_buffer *wlr_buffer) +{ + Buffer *buf = wl_container_of(wlr_buffer, buf, base); + if (buf->busy) + wl_list_remove(&buf->release.link); + drwl_image_destroy(buf->image); + free(buf); +} + +bool +bufdatabegin(struct wlr_buffer *wlr_buffer, uint32_t flags, + void **data, uint32_t *format, size_t *stride) +{ + Buffer *buf = wl_container_of(wlr_buffer, buf, base); + + if (flags & WLR_BUFFER_DATA_PTR_ACCESS_WRITE) return false; + + *data = buf->data; + *stride = wlr_buffer->width * 4; + *format = DRM_FORMAT_ARGB8888; + + return true; +} + +void +bufdataend(struct wlr_buffer *wlr_buffer) +{ +} + +Buffer * +bufmon(Monitor *m) +{ + size_t i; + Buffer *buf = NULL; + + for (i = 0; i < LENGTH(m->pool); i++) { + if (m->pool[i]) { + if (m->pool[i]->busy) + continue; + buf = m->pool[i]; + break; + } + + buf = ecalloc(1, sizeof(Buffer) + (m->b.width * 4 * m->b.height)); + buf->image = drwl_image_create(NULL, m->b.width, m->b.height, buf->data); + wlr_buffer_init(&buf->base, &buffer_impl, m->b.width, m->b.height); + m->pool[i] = buf; + break; + } + if (!buf) + return NULL; + + buf->busy = true; + LISTEN(&buf->base.events.release, &buf->release, bufrelease); + wlr_buffer_lock(&buf->base); + drwl_setimage(m->drw, buf->image); + return buf; +} + +void +bufrelease(struct wl_listener *listener, void *data) +{ + Buffer *buf = wl_container_of(listener, buf, release); + buf->busy = false; + wl_list_remove(&buf->release.link); +} + void buttonpress(struct wl_listener *listener, void *data) { + unsigned int i = 0, x = 0; + double cx; + unsigned int click; struct wlr_pointer_button_event *event = data; struct wlr_keyboard *keyboard; + struct wlr_scene_node *node; + struct wlr_scene_buffer *buffer; uint32_t mods; + Arg arg = {0}; Client *c; const Button *b; wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); + click = ClkRoot; + xytonode(cursor->x, cursor->y, NULL, &c, NULL, NULL, NULL); + if (c) + click = ClkClient; + switch (event->state) { case WL_POINTER_BUTTON_STATE_PRESSED: cursor_mode = CurPressed; @@ -637,17 +772,34 @@ buttonpress(struct wl_listener *listener, void *data) if (locked) break; + if (!c && !exclusive_focus && + (node = wlr_scene_node_at(&layers[LyrBottom]->node, cursor->x, cursor->y, NULL, NULL)) && + (buffer = wlr_scene_buffer_from_node(node)) && buffer == selmon->scene_buffer) { + cx = (cursor->x - selmon->m.x) * selmon->wlr_output->scale; + do + x += TEXTW(selmon, tags[i]); + while (cx >= x && ++i < LENGTH(tags)); + if (i < LENGTH(tags)) { + click = ClkTagBar; + arg.ui = 1 << i; + } else if (cx < x + TEXTW(selmon, selmon->ltsymbol)) + click = ClkLtSymbol; + else if (cx > selmon->b.width - (TEXTW(selmon, stext) - selmon->lrpad + 2)) { + click = ClkStatus; + } else + click = ClkTitle; + } + /* Change focus if the button was _pressed_ over a client */ xytonode(cursor->x, cursor->y, NULL, &c, NULL, NULL, NULL); - if (c && (!client_is_unmanaged(c) || client_wants_focus(c))) + if (click == ClkClient && (!client_is_unmanaged(c) || client_wants_focus(c))) focusclient(c, 1); keyboard = wlr_seat_get_keyboard(seat); mods = keyboard ? wlr_keyboard_get_modifiers(keyboard) : 0; for (b = buttons; b < END(buttons); b++) { - if (CLEANMASK(mods) == CLEANMASK(b->mod) && - event->button == b->button && b->func) { - b->func(&b->arg); + if (CLEANMASK(mods) == CLEANMASK(b->mod) && event->button == b->button && click == b->click && b->func) { + b->func(click == ClkTagBar && b->arg.i == 0 ? &arg : &b->arg); return; } } @@ -722,6 +874,8 @@ cleanup(void) /* Destroy after the wayland display (when the monitors are already destroyed) to avoid destroying them with an invalid scene output. */ wlr_scene_node_destroy(&scene->tree.node); + + drwl_fini(); } void @@ -737,6 +891,12 @@ cleanupmon(struct wl_listener *listener, void *data) wlr_layer_surface_v1_destroy(l->layer_surface); } + for (i = 0; i < LENGTH(m->pool); i++) + wlr_buffer_drop(&m->pool[i]->base); + + drwl_setimage(m->drw, NULL); + drwl_destroy(m->drw); + wl_list_remove(&m->destroy.link); wl_list_remove(&m->frame.link); wl_list_remove(&m->link); @@ -749,6 +909,7 @@ cleanupmon(struct wl_listener *listener, void *data) closemon(m); wlr_scene_node_destroy(&m->fullscreen_bg->node); + wlr_scene_node_destroy(&m->scene_buffer->node); free(m); } @@ -815,7 +976,7 @@ closemon(Monitor *m) setmon(c, selmon, c->tags); } focusclient(focustop(selmon), 1); - printstatus(); + drawbars(); } void @@ -1067,7 +1228,7 @@ createmon(struct wl_listener *listener, void *data) m->nmaster = r->nmaster; m->lt[0] = r->lt; m->lt[1] = &layouts[LENGTH(layouts) > 1 && r->lt != &layouts[1]]; - strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, LENGTH(m->ltsymbol)); + strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof(m->ltsymbol)); wlr_output_state_set_scale(&state, r->scale); wlr_output_state_set_transform(&state, r->rr); break; @@ -1089,8 +1250,15 @@ createmon(struct wl_listener *listener, void *data) wlr_output_commit_state(wlr_output, &state); wlr_output_state_finish(&state); + if (!(m->drw = drwl_create())) + die("failed to create drwl context"); + + m->scene_buffer = wlr_scene_buffer_create(layers[LyrBottom], NULL); + m->scene_buffer->point_accepts_input = baracceptsinput; + updatebar(m); + wl_list_insert(&mons, &m->link); - printstatus(); + drawbars(); /* The xdg-protocol specifies: * @@ -1400,6 +1568,80 @@ dirtomon(enum wlr_direction dir) return selmon; } +void +drawbar(Monitor *m) +{ + int x, w, tw = 0; + int boxs = m->drw->font->height / 9; + int boxw = m->drw->font->height / 6 + 2; + uint32_t i, occ = 0, urg = 0; + Client *c; + Buffer *buf; + + if (!m->scene_buffer->node.enabled) + return; + if (!(buf = bufmon(m))) + return; + + /* draw status first so it can be overdrawn by tags later */ + if (m == selmon) { /* status is only drawn on selected monitor */ + drwl_setscheme(m->drw, colors[SchemeNorm]); + tw = TEXTW(m, stext) - m->lrpad + 2; /* 2px right padding */ + drwl_text(m->drw, m->b.width - tw, 0, tw, m->b.height, 0, stext, 0); + } + + wl_list_for_each(c, &clients, link) { + if (c->mon != m) + continue; + occ |= c->tags; + if (c->isurgent) + urg |= c->tags; + } + x = 0; + c = focustop(m); + for (i = 0; i < LENGTH(tags); i++) { + w = TEXTW(m, tags[i]); + drwl_setscheme(m->drw, colors[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]); + drwl_text(m->drw, x, 0, w, m->b.height, m->lrpad / 2, tags[i], urg & 1 << i); + if (occ & 1 << i) + drwl_rect(m->drw, x + boxs, boxs, boxw, boxw, + m == selmon && c && c->tags & 1 << i, + urg & 1 << i); + x += w; + } + w = TEXTW(m, m->ltsymbol); + drwl_setscheme(m->drw, colors[SchemeNorm]); + x = drwl_text(m->drw, x, 0, w, m->b.height, m->lrpad / 2, m->ltsymbol, 0); + + if ((w = m->b.width - tw - x) > m->b.height) { + if (c) { + drwl_setscheme(m->drw, colors[m == selmon ? SchemeSel : SchemeNorm]); + drwl_text(m->drw, x, 0, w, m->b.height, m->lrpad / 2, client_get_title(c), 0); + if (c && c->isfloating) + drwl_rect(m->drw, x + boxs, boxs, boxw, boxw, 0, 0); + } else { + drwl_setscheme(m->drw, colors[SchemeNorm]); + drwl_rect(m->drw, x, 0, w, m->b.height, 1, 1); + } + } + + wlr_scene_buffer_set_dest_size(m->scene_buffer, + m->b.real_width, m->b.real_height); + wlr_scene_node_set_position(&m->scene_buffer->node, m->m.x, + m->m.y + (topbar ? 0 : m->m.height - m->b.real_height)); + wlr_scene_buffer_set_buffer(m->scene_buffer, &buf->base); + wlr_buffer_unlock(&buf->base); +} + +void +drawbars(void) +{ + Monitor *m = NULL; + + wl_list_for_each(m, &mons, link) + drawbar(m); +} + void focusclient(Client *c, int lift) { @@ -1434,13 +1676,13 @@ focusclient(Client *c, int lift) /* Don't change border color if there is an exclusive focus or we are * handling a drag operation */ if (!exclusive_focus && !seat->drag) - client_set_border_color(c, focuscolor); + client_set_border_color(c, (float[])COLOR(colors[SchemeSel][ColBorder])); } /* Deactivate old client if focus is changing */ if (old && (!c || client_surface(c) != old)) { /* If an overlay is focused, don't focus or activate the client, - * but only update its position in fstack to render its border with focuscolor + * but only update its position in fstack to render its border with its color * and focus it after the overlay is closed. */ if (old_client_type == LayerShell && wlr_scene_node_coords( &old_l->scene->node, &unused_lx, &unused_ly) @@ -1451,12 +1693,11 @@ focusclient(Client *c, int lift) /* Don't deactivate old client if the new one wants focus, as this causes issues with winecfg * and probably other clients */ } else if (old_c && !client_is_unmanaged(old_c) && (!c || !client_wants_focus(c))) { - client_set_border_color(old_c, bordercolor); - + client_set_border_color(old_c, (float[])COLOR(colors[SchemeNorm][ColBorder])); client_activate_surface(old, 0); } } - printstatus(); + drawbars(); if (!c) { /* With no client, all we have left is to clear focus */ @@ -1770,7 +2011,7 @@ mapnotify(struct wl_listener *listener, void *data) for (i = 0; i < 4; i++) { c->border[i] = wlr_scene_rect_create(c->scene, 0, 0, - c->isurgent ? urgentcolor : bordercolor); + (float[])COLOR(colors[c->isurgent ? SchemeUrg : SchemeNorm][ColBorder])); c->border[i]->node.data = c; } @@ -1793,7 +2034,7 @@ mapnotify(struct wl_listener *listener, void *data) } else { applyrules(c); } - printstatus(); + drawbars(); unset_fullscreen: m = c->mon ? c->mon : xytomon(c->geom.x, c->geom.y); @@ -2086,44 +2327,6 @@ pointerfocus(Client *c, struct wlr_surface *surface, double sx, double sy, wlr_seat_pointer_notify_motion(seat, time, sx, sy); } -void -printstatus(void) -{ - Monitor *m = NULL; - Client *c; - uint32_t occ, urg, sel; - - wl_list_for_each(m, &mons, link) { - occ = urg = 0; - wl_list_for_each(c, &clients, link) { - if (c->mon != m) - continue; - occ |= c->tags; - if (c->isurgent) - urg |= c->tags; - } - if ((c = focustop(m))) { - printf("%s title %s\n", m->wlr_output->name, client_get_title(c)); - printf("%s appid %s\n", m->wlr_output->name, client_get_appid(c)); - printf("%s fullscreen %d\n", m->wlr_output->name, c->isfullscreen); - printf("%s floating %d\n", m->wlr_output->name, c->isfloating); - sel = c->tags; - } else { - printf("%s title \n", m->wlr_output->name); - printf("%s appid \n", m->wlr_output->name); - printf("%s fullscreen \n", m->wlr_output->name); - printf("%s floating \n", m->wlr_output->name); - sel = 0; - } - - printf("%s selmon %u\n", m->wlr_output->name, m == selmon); - printf("%s tags %"PRIu32" %"PRIu32" %"PRIu32" %"PRIu32"\n", - m->wlr_output->name, occ, m->tagset[m->seltags], sel, urg); - printf("%s layout %s\n", m->wlr_output->name, m->ltsymbol); - } - fflush(stdout); -} - void powermgrsetmode(struct wl_listener *listener, void *data) { @@ -2252,22 +2455,14 @@ run(char *startup_cmd) /* Now that the socket exists and the backend is started, run the startup command */ if (startup_cmd) { - int piperw[2]; - if (pipe(piperw) < 0) - die("startup: pipe:"); if ((child_pid = fork()) < 0) die("startup: fork:"); if (child_pid == 0) { + close(STDIN_FILENO); setsid(); - dup2(piperw[0], STDIN_FILENO); - close(piperw[0]); - close(piperw[1]); execl("/bin/sh", "/bin/sh", "-c", startup_cmd, NULL); die("startup: execl:"); } - dup2(piperw[1], STDOUT_FILENO); - close(piperw[1]); - close(piperw[0]); } /* Mark stdout as non-blocking to avoid the startup script @@ -2277,7 +2472,7 @@ run(char *startup_cmd) if (fd_set_nonblock(STDOUT_FILENO) < 0) close(STDOUT_FILENO); - printstatus(); + drawbars(); /* At this point the outputs are initialized, choose initial selmon based on * cursor position, and set default cursor image */ @@ -2343,7 +2538,7 @@ setfloating(Client *c, int floating) (p && p->isfullscreen) ? LyrFS : c->isfloating ? LyrFloat : LyrTile]); arrange(c->mon); - printstatus(); + drawbars(); } void @@ -2366,7 +2561,7 @@ setfullscreen(Client *c, int fullscreen) resize(c, c->prev, 0); } arrange(c->mon); - printstatus(); + drawbars(); } void @@ -2378,9 +2573,9 @@ setlayout(const Arg *arg) selmon->sellt ^= 1; if (arg && arg->v) selmon->lt[selmon->sellt] = (Layout *)arg->v; - strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, LENGTH(selmon->ltsymbol)); + strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof(selmon->ltsymbol)); arrange(selmon); - printstatus(); + drawbar(selmon); } /* arg > 1.0 will set mfact absolutely */ @@ -2453,6 +2648,7 @@ setup(void) for (i = 0; i < (int)LENGTH(sig); i++) sigaction(sig[i], &sa, NULL); + wlr_log_init(log_level, NULL); /* The Wayland display is managed by libwayland. It handles accepting @@ -2648,6 +2844,11 @@ setup(void) wl_signal_add(&output_mgr->events.apply, &output_mgr_apply); wl_signal_add(&output_mgr->events.test, &output_mgr_test); + drwl_init(); + + status_event_source = wl_event_loop_add_fd(wl_display_get_event_loop(dpy), + STDIN_FILENO, WL_EVENT_READABLE, statusin, NULL); + /* Make sure XWayland clients don't connect to the parent X server, * e.g when running in the x11 backend or the wayland backend and the * compositor has Xwayland support */ @@ -2672,6 +2873,8 @@ void spawn(const Arg *arg) { if (fork() == 0) { + close(STDIN_FILENO); + open("/dev/null", O_RDWR); dup2(STDERR_FILENO, STDOUT_FILENO); setsid(); execvp(((char **)arg->v)[0], (char **)arg->v); @@ -2690,6 +2893,30 @@ startdrag(struct wl_listener *listener, void *data) LISTEN_STATIC(&drag->icon->events.destroy, destroydragicon); } +int +statusin(int fd, unsigned int mask, void *data) +{ + char status[256]; + ssize_t n; + + if (mask & WL_EVENT_ERROR) + die("status in event error"); + if (mask & WL_EVENT_HANGUP) + wl_event_source_remove(status_event_source); + + n = read(fd, status, sizeof(status) - 1); + if (n < 0 && errno != EWOULDBLOCK) + die("read:"); + + status[n] = '\0'; + status[strcspn(status, "\n")] = '\0'; + + strncpy(stext, status, sizeof(stext)); + drawbars(); + + return 0; +} + void tag(const Arg *arg) { @@ -2700,7 +2927,7 @@ tag(const Arg *arg) sel->tags = arg->ui & TAGMASK; focusclient(focustop(selmon), 1); arrange(selmon); - printstatus(); + drawbars(); } void @@ -2745,6 +2972,15 @@ tile(Monitor *m) } } +void +togglebar(const Arg *arg) +{ + wlr_scene_node_set_enabled(&selmon->scene_buffer->node, + !selmon->scene_buffer->node.enabled); + arrangelayers(selmon); + drawbars(); +} + void togglefloating(const Arg *arg) { @@ -2773,7 +3009,7 @@ toggletag(const Arg *arg) sel->tags = newtags; focusclient(focustop(selmon), 1); arrange(selmon); - printstatus(); + drawbars(); } void @@ -2786,7 +3022,7 @@ toggleview(const Arg *arg) selmon->tagset[selmon->seltags] = newtagset; focusclient(focustop(selmon), 1); arrange(selmon); - printstatus(); + drawbars(); } void @@ -2834,7 +3070,7 @@ unmapnotify(struct wl_listener *listener, void *data) } wlr_scene_node_destroy(&c->scene->node); - printstatus(); + drawbars(); motionnotify(0, NULL, 0, 0, 0, 0); } @@ -2934,6 +3170,13 @@ updatemons(struct wl_listener *listener, void *data) } } + if (stext[0] == '\0') + strncpy(stext, "dwl-"VERSION, sizeof(stext)); + wl_list_for_each(m, &mons, link) { + updatebar(m); + drawbar(m); + } + /* FIXME: figure out why the cursor image is at 0,0 after turning all * the monitors on. * Move the cursor image where it used to be. It does not generate a @@ -2944,12 +3187,45 @@ updatemons(struct wl_listener *listener, void *data) wlr_output_manager_v1_set_configuration(output_mgr, config); } +void +updatebar(Monitor *m) +{ + size_t i; + int rw, rh; + char fontattrs[12]; + + wlr_output_transformed_resolution(m->wlr_output, &rw, &rh); + m->b.width = rw; + m->b.real_width = (int)((float)m->b.width / m->wlr_output->scale); + + wlr_scene_node_set_enabled(&m->scene_buffer->node, m->wlr_output->enabled ? showbar : 0); + + for (i = 0; i < LENGTH(m->pool); i++) + if (m->pool[i]) { + wlr_buffer_drop(&m->pool[i]->base); + m->pool[i] = NULL; + } + + if (m->b.scale == m->wlr_output->scale && m->drw) + return; + + drwl_font_destroy(m->drw->font); + snprintf(fontattrs, sizeof(fontattrs), "dpi=%.2f", 96. * m->wlr_output->scale); + if (!(drwl_font_create(m->drw, LENGTH(fonts), fonts, fontattrs))) + die("Could not load font"); + + m->b.scale = m->wlr_output->scale; + m->lrpad = m->drw->font->height; + m->b.height = m->drw->font->height + 2; + m->b.real_height = (int)((float)m->b.height / m->wlr_output->scale); +} + void updatetitle(struct wl_listener *listener, void *data) { Client *c = wl_container_of(listener, c, set_title); if (c == focustop(c->mon)) - printstatus(); + drawbars(); } void @@ -2962,10 +3238,10 @@ urgent(struct wl_listener *listener, void *data) return; c->isurgent = 1; - printstatus(); + drawbars(); if (client_surface(c)->mapped) - client_set_border_color(c, urgentcolor); + client_set_border_color(c, (float[])COLOR(colors[SchemeUrg][ColBorder])); } void @@ -2978,7 +3254,7 @@ view(const Arg *arg) selmon->tagset[selmon->seltags] = arg->ui & TAGMASK; focusclient(focustop(selmon), 1); arrange(selmon); - printstatus(); + drawbars(); } void @@ -3019,6 +3295,7 @@ xytonode(double x, double y, struct wlr_surface **psurface, { struct wlr_scene_node *node, *pnode; struct wlr_surface *surface = NULL; + struct wlr_scene_surface *scene_surface = NULL; Client *c = NULL; LayerSurface *l = NULL; int layer; @@ -3027,9 +3304,12 @@ xytonode(double x, double y, struct wlr_surface **psurface, if (!(node = wlr_scene_node_at(&layers[layer]->node, x, y, nx, ny))) continue; - if (node->type == WLR_SCENE_NODE_BUFFER) - surface = wlr_scene_surface_try_from_buffer( - wlr_scene_buffer_from_node(node))->surface; + if (node->type == WLR_SCENE_NODE_BUFFER) { + scene_surface = wlr_scene_surface_try_from_buffer( + wlr_scene_buffer_from_node(node)); + if (!scene_surface) continue; + surface = scene_surface->surface; + } /* Walk the tree to find a node that knows the client */ for (pnode = node; pnode && !c; pnode = &pnode->parent->node) c = pnode->data; @@ -3162,10 +3442,10 @@ sethints(struct wl_listener *listener, void *data) return; c->isurgent = xcb_icccm_wm_hints_get_urgency(c->surface.xwayland->hints); - printstatus(); + drawbars(); if (c->isurgent && surface && surface->mapped) - client_set_border_color(c, urgentcolor); + client_set_border_color(c, (float[])COLOR(colors[SchemeUrg][ColBorder])); } void diff --git a/patches/bar.patch b/patches/bar.patch deleted file mode 100644 index e098118..0000000 --- a/patches/bar.patch +++ /dev/null @@ -1,1271 +0,0 @@ -From d6a2c4e7f0d3108c7a8a1ad6e76a62e854b2f8e1 Mon Sep 17 00:00:00 2001 -From: sewn -Date: Mon, 5 Jan 2026 16:51:14 +0300 -Subject: [PATCH] Implement dwm bar clone - ---- - Makefile | 2 +- - config.def.h | 33 ++-- - drwl.h | 310 +++++++++++++++++++++++++++++++++++ - dwl.c | 444 +++++++++++++++++++++++++++++++++++++++++---------- - 4 files changed, 697 insertions(+), 92 deletions(-) - create mode 100644 drwl.h - -diff --git a/Makefile b/Makefile -index 578194f..279b1c0 100644 ---- a/Makefile -+++ b/Makefile -@@ -12,7 +12,7 @@ DWLDEVCFLAGS = -g -Wpedantic -Wall -Wextra -Wdeclaration-after-statement \ - -Wfloat-conversion - - # CFLAGS / LDFLAGS --PKGS = wayland-server xkbcommon libinput $(XLIBS) -+PKGS = wayland-server xkbcommon libinput pixman-1 fcft $(XLIBS) - DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(WLR_INCS) $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CFLAGS) - LDLIBS = `$(PKG_CONFIG) --libs $(PKGS)` $(WLR_LIBS) -lm $(LIBS) - -diff --git a/config.def.h b/config.def.h -index 8a6eda0..7da50d2 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -7,15 +7,21 @@ - static const int sloppyfocus = 1; /* focus follows mouse */ - static const int bypass_surface_visibility = 0; /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible */ - static const unsigned int borderpx = 1; /* border pixel of windows */ --static const float rootcolor[] = COLOR(0x222222ff); --static const float bordercolor[] = COLOR(0x444444ff); --static const float focuscolor[] = COLOR(0x005577ff); --static const float urgentcolor[] = COLOR(0xff0000ff); -+static const int showbar = 1; /* 0 means no bar */ -+static const int topbar = 1; /* 0 means bottom bar */ -+static const char *fonts[] = {"monospace:size=10"}; -+static const float rootcolor[] = COLOR(0x000000ff); - /* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */ - static const float fullscreen_bg[] = {0.0f, 0.0f, 0.0f, 1.0f}; /* You can also use glsl colors */ -+static uint32_t colors[][3] = { -+ /* fg bg border */ -+ [SchemeNorm] = { 0xbbbbbbff, 0x222222ff, 0x444444ff }, -+ [SchemeSel] = { 0xeeeeeeff, 0x005577ff, 0x005577ff }, -+ [SchemeUrg] = { 0, 0, 0x770000ff }, -+}; - --/* tagging - TAGCOUNT must be no greater than 31 */ --#define TAGCOUNT (9) -+/* tagging */ -+static char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; - - /* logging */ - static int log_level = WLR_ERROR; -@@ -123,6 +129,7 @@ static const Key keys[] = { - /* modifier key function argument */ - { MODKEY, XKB_KEY_p, spawn, {.v = menucmd} }, - { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, spawn, {.v = termcmd} }, -+ { MODKEY, XKB_KEY_b, togglebar, {0} }, - { MODKEY, XKB_KEY_j, focusstack, {.i = +1} }, - { MODKEY, XKB_KEY_k, focusstack, {.i = -1} }, - { MODKEY, XKB_KEY_i, incnmaster, {.i = +1} }, -@@ -166,7 +173,15 @@ static const Key keys[] = { - }; - - static const Button buttons[] = { -- { MODKEY, BTN_LEFT, moveresize, {.ui = CurMove} }, -- { MODKEY, BTN_MIDDLE, togglefloating, {0} }, -- { MODKEY, BTN_RIGHT, moveresize, {.ui = CurResize} }, -+ { ClkLtSymbol, 0, BTN_LEFT, setlayout, {.v = &layouts[0]} }, -+ { ClkLtSymbol, 0, BTN_RIGHT, setlayout, {.v = &layouts[2]} }, -+ { ClkTitle, 0, BTN_MIDDLE, zoom, {0} }, -+ { ClkStatus, 0, BTN_MIDDLE, spawn, {.v = termcmd} }, -+ { ClkClient, MODKEY, BTN_LEFT, moveresize, {.ui = CurMove} }, -+ { ClkClient, MODKEY, BTN_MIDDLE, togglefloating, {0} }, -+ { ClkClient, MODKEY, BTN_RIGHT, moveresize, {.ui = CurResize} }, -+ { ClkTagBar, 0, BTN_LEFT, view, {0} }, -+ { ClkTagBar, 0, BTN_RIGHT, toggleview, {0} }, -+ { ClkTagBar, MODKEY, BTN_LEFT, tag, {0} }, -+ { ClkTagBar, MODKEY, BTN_RIGHT, toggletag, {0} }, - }; -diff --git a/drwl.h b/drwl.h -new file mode 100644 -index 0000000..21afd21 ---- /dev/null -+++ b/drwl.h -@@ -0,0 +1,310 @@ -+/* -+ * drwl - https://codeberg.org/sewn/drwl -+ * -+ * Copyright (c) 2023-2025 sewn -+ * Copyright (c) 2024 notchoc -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining -+ * a copy of this software and associated documentation files (the -+ * "Software"), to deal in the Software without restriction, including -+ * without limitation the rights to use, copy, modify, merge, publish, -+ * distribute, sublicense, and/or sell copies of the Software, and to -+ * permit persons to whom the Software is furnished to do so, subject to -+ * the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ * -+ * The UTF-8 Decoder included is from Bjoern Hoehrmann: -+ * Copyright (c) 2008-2010 Bjoern Hoehrmann -+ * See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for details. -+ */ -+#pragma once -+ -+#include -+#include -+#include -+ -+enum { ColFg, ColBg, ColBorder }; /* colorscheme index */ -+ -+typedef struct fcft_font Fnt; -+typedef pixman_image_t Img; -+ -+typedef struct { -+ Img *image; -+ Fnt *font; -+ uint32_t *scheme; -+} Drwl; -+ -+#define UTF8_ACCEPT 0 -+#define UTF8_REJECT 12 -+#define UTF8_INVALID 0xFFFD -+ -+static const uint8_t utf8d[] = { -+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -+ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -+ 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, -+ 8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, -+ 10,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3, 11,6,6,6,5,8,8,8,8,8,8,8,8,8,8,8, -+ -+ 0,12,24,36,60,96,84,12,12,12,48,72, 12,12,12,12,12,12,12,12,12,12,12,12, -+ 12, 0,12,12,12,12,12, 0,12, 0,12,12, 12,24,12,12,12,12,12,24,12,24,12,12, -+ 12,12,12,12,12,12,12,24,12,12,12,12, 12,24,12,12,12,12,12,12,12,24,12,12, -+ 12,12,12,12,12,12,12,36,12,36,12,12, 12,36,12,12,12,12,12,36,12,36,12,12, -+ 12,36,12,12,12,12,12,12,12,12,12,12, -+}; -+ -+static inline uint32_t -+utf8decode(uint32_t *state, uint32_t *codep, uint8_t byte) -+{ -+ uint32_t type = utf8d[byte]; -+ -+ *codep = (*state != UTF8_ACCEPT) ? -+ (byte & 0x3fu) | (*codep << 6) : -+ (0xff >> type) & (byte); -+ -+ *state = utf8d[256 + *state + type]; -+ return *state; -+} -+ -+static int -+drwl_init(void) -+{ -+ return fcft_init(FCFT_LOG_COLORIZE_AUTO, 0, FCFT_LOG_CLASS_ERROR); -+} -+ -+static Drwl * -+drwl_create(void) -+{ -+ Drwl *drwl; -+ -+ if (!(drwl = calloc(1, sizeof(Drwl)))) -+ return NULL; -+ -+ return drwl; -+} -+ -+static void -+drwl_setfont(Drwl *drwl, Fnt *font) -+{ -+ if (drwl) -+ drwl->font = font; -+} -+ -+static void -+drwl_setimage(Drwl *drwl, Img *image) -+{ -+ if (drwl) -+ drwl->image = image; -+} -+ -+static Fnt * -+drwl_font_create(Drwl *drwl, size_t count, -+ const char *names[static count], const char *attributes) -+{ -+ Fnt *font = fcft_from_name(count, names, attributes); -+ if (drwl) -+ drwl_setfont(drwl, font); -+ return font; -+} -+ -+static void -+drwl_font_destroy(Fnt *font) -+{ -+ fcft_destroy(font); -+} -+ -+static inline pixman_color_t -+convert_color(uint32_t clr) -+{ -+ return (pixman_color_t){ -+ ((clr >> 24) & 0xFF) * 0x101 * (clr & 0xFF) / 0xFF, -+ ((clr >> 16) & 0xFF) * 0x101 * (clr & 0xFF) / 0xFF, -+ ((clr >> 8) & 0xFF) * 0x101 * (clr & 0xFF) / 0xFF, -+ (clr & 0xFF) * 0x101 -+ }; -+} -+ -+static void -+drwl_setscheme(Drwl *drwl, uint32_t *scm) -+{ -+ if (drwl) -+ drwl->scheme = scm; -+} -+ -+static Img * -+drwl_image_create(Drwl *drwl, unsigned int w, unsigned int h, uint32_t *bits) -+{ -+ Img *image; -+ pixman_region32_t clip; -+ -+ image = pixman_image_create_bits_no_clear( -+ PIXMAN_a8r8g8b8, w, h, bits, w * 4); -+ if (!image) -+ return NULL; -+ pixman_region32_init_rect(&clip, 0, 0, w, h); -+ pixman_image_set_clip_region32(image, &clip); -+ pixman_region32_fini(&clip); -+ -+ if (drwl) -+ drwl_setimage(drwl, image); -+ return image; -+} -+ -+static void -+drwl_rect(Drwl *drwl, -+ int x, int y, unsigned int w, unsigned int h, -+ int filled, int invert) -+{ -+ pixman_color_t clr; -+ if (!drwl || !drwl->scheme || !drwl->image) -+ return; -+ -+ clr = convert_color(drwl->scheme[invert ? ColBg : ColFg]); -+ if (filled) -+ pixman_image_fill_rectangles(PIXMAN_OP_SRC, drwl->image, &clr, 1, -+ &(pixman_rectangle16_t){x, y, w, h}); -+ else -+ pixman_image_fill_rectangles(PIXMAN_OP_SRC, drwl->image, &clr, 4, -+ (pixman_rectangle16_t[4]){ -+ { x, y, w, 1 }, -+ { x, y + h - 1, w, 1 }, -+ { x, y, 1, h }, -+ { x + w - 1, y, 1, h }}); -+} -+ -+static int -+drwl_text(Drwl *drwl, -+ int x, int y, unsigned int w, unsigned int h, -+ unsigned int lpad, const char *text, int invert) -+{ -+ int ty; -+ int render = x || y || w || h; -+ long x_kern; -+ uint32_t cp = 0, last_cp = 0, state; -+ pixman_color_t clr; -+ pixman_image_t *fg_pix = NULL; -+ int noellipsis = 0; -+ const struct fcft_glyph *glyph, *eg = NULL; -+ int fcft_subpixel_mode = FCFT_SUBPIXEL_DEFAULT; -+ -+ if (!drwl || (render && (!drwl->scheme || !w || !drwl->image)) || !text || !drwl->font) -+ return 0; -+ -+ if (!render) { -+ w = invert ? invert : ~invert; -+ } else { -+ clr = convert_color(drwl->scheme[invert ? ColBg : ColFg]); -+ fg_pix = pixman_image_create_solid_fill(&clr); -+ -+ drwl_rect(drwl, x, y, w, h, 1, !invert); -+ -+ x += lpad; -+ w -= lpad; -+ } -+ -+ if (render && (drwl->scheme[ColBg] & 0xFF) != 0xFF) -+ fcft_subpixel_mode = FCFT_SUBPIXEL_NONE; -+ -+ if (render) -+ eg = fcft_rasterize_char_utf32(drwl->font, 0x2026 /* … */, fcft_subpixel_mode); -+ -+ for (const char *p = text, *pp; pp = p, *p; p++) { -+ for (state = UTF8_ACCEPT; *p && -+ utf8decode(&state, &cp, *p) > UTF8_REJECT; p++) -+ ; -+ if (!*p || state == UTF8_REJECT) { -+ cp = UTF8_INVALID; -+ if (p > pp) -+ p--; -+ } -+ -+ glyph = fcft_rasterize_char_utf32(drwl->font, cp, fcft_subpixel_mode); -+ if (!glyph) -+ continue; -+ -+ x_kern = 0; -+ if (last_cp) -+ fcft_kerning(drwl->font, last_cp, cp, &x_kern, NULL); -+ last_cp = cp; -+ -+ ty = y + (h - drwl->font->height) / 2 + drwl->font->ascent; -+ -+ if (render && !noellipsis && x_kern + glyph->advance.x + eg->advance.x > w && -+ *(p + 1) != '\0') { -+ /* cannot fit ellipsis after current codepoint */ -+ if (drwl_text(drwl, 0, 0, 0, 0, 0, pp, 0) + x_kern <= w) { -+ noellipsis = 1; -+ } else { -+ w -= eg->advance.x; -+ pixman_image_composite32( -+ PIXMAN_OP_OVER, fg_pix, eg->pix, drwl->image, 0, 0, 0, 0, -+ x + eg->x, ty - eg->y, eg->width, eg->height); -+ } -+ } -+ -+ if ((x_kern + glyph->advance.x) > w) -+ break; -+ -+ x += x_kern; -+ -+ if (render && pixman_image_get_format(glyph->pix) == PIXMAN_a8r8g8b8) -+ /* pre-rendered glyphs (eg. emoji) */ -+ pixman_image_composite32( -+ PIXMAN_OP_OVER, glyph->pix, NULL, drwl->image, 0, 0, 0, 0, -+ x + glyph->x, ty - glyph->y, glyph->width, glyph->height); -+ else if (render) -+ pixman_image_composite32( -+ PIXMAN_OP_OVER, fg_pix, glyph->pix, drwl->image, 0, 0, 0, 0, -+ x + glyph->x, ty - glyph->y, glyph->width, glyph->height); -+ -+ x += glyph->advance.x; -+ w -= glyph->advance.x; -+ } -+ -+ if (render) -+ pixman_image_unref(fg_pix); -+ -+ return x + (render ? w : 0); -+} -+ -+static unsigned int -+drwl_font_getwidth(Drwl *drwl, const char *text) -+{ -+ if (!drwl || !drwl->font || !text) -+ return 0; -+ return drwl_text(drwl, 0, 0, 0, 0, 0, text, 0); -+} -+ -+static void -+drwl_image_destroy(Img *image) -+{ -+ pixman_image_unref(image); -+} -+ -+static void -+drwl_destroy(Drwl *drwl) -+{ -+ if (drwl->font) -+ drwl_font_destroy(drwl->font); -+ if (drwl->image) -+ drwl_image_destroy(drwl->image); -+ free(drwl); -+} -+ -+static void -+drwl_fini(void) -+{ -+ fcft_fini(); -+} -diff --git a/dwl.c b/dwl.c -index 44f3ad9..7b2abf5 100644 ---- a/dwl.c -+++ b/dwl.c -@@ -1,10 +1,12 @@ - /* - * See LICENSE file for copyright and license details. - */ -+#include - #include - #include - #include - #include -+#include - #include - #include - #include -@@ -59,6 +61,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -69,6 +72,7 @@ - #endif - - #include "util.h" -+#include "drwl.h" - - /* macros */ - #define MAX(A, B) ((A) > (B) ? (A) : (B)) -@@ -77,14 +81,17 @@ - #define VISIBLEON(C, M) ((M) && (C)->mon == (M) && ((C)->tags & (M)->tagset[(M)->seltags])) - #define LENGTH(X) (sizeof X / sizeof X[0]) - #define END(A) ((A) + LENGTH(A)) --#define TAGMASK ((1u << TAGCOUNT) - 1) -+#define TAGMASK ((1u << LENGTH(tags)) - 1) - #define LISTEN(E, L, H) wl_signal_add((E), ((L)->notify = (H), (L))) - #define LISTEN_STATIC(E, H) do { struct wl_listener *_l = ecalloc(1, sizeof(*_l)); _l->notify = (H); wl_signal_add((E), _l); } while (0) -+#define TEXTW(mon, text) (drwl_font_getwidth(mon->drw, text) + mon->lrpad) - - /* enums */ -+enum { SchemeNorm, SchemeSel, SchemeUrg }; /* color schemes */ - enum { CurNormal, CurPressed, CurMove, CurResize }; /* cursor */ - enum { XDGShell, LayerShell, X11 }; /* client types */ - enum { LyrBg, LyrBottom, LyrTile, LyrFloat, LyrTop, LyrFS, LyrOverlay, LyrBlock, NUM_LAYERS }; /* scene layers */ -+enum { ClkTagBar, ClkLtSymbol, ClkStatus, ClkTitle, ClkClient, ClkRoot }; /* clicks */ - - typedef union { - int i; -@@ -94,6 +101,7 @@ typedef union { - } Arg; - - typedef struct { -+ unsigned int click; - unsigned int mod; - unsigned int button; - void (*func)(const Arg *); -@@ -183,10 +191,19 @@ typedef struct { - void (*arrange)(Monitor *); - } Layout; - -+typedef struct { -+ struct wlr_buffer base; -+ struct wl_listener release; -+ bool busy; -+ Img *image; -+ uint32_t data[]; -+} Buffer; -+ - struct Monitor { - struct wl_list link; - struct wlr_output *wlr_output; - struct wlr_scene_output *scene_output; -+ struct wlr_scene_buffer *scene_buffer; /* bar buffer */ - struct wlr_scene_rect *fullscreen_bg; /* See createmon() for info */ - struct wl_listener frame; - struct wl_listener destroy; -@@ -194,6 +211,11 @@ struct Monitor { - struct wl_listener destroy_lock_surface; - struct wlr_session_lock_surface_v1 *lock_surface; - struct wlr_box m; /* monitor area, layout-relative */ -+ struct { -+ int width, height; -+ int real_width, real_height; /* non-scaled */ -+ float scale; -+ } b; /* bar area */ - struct wlr_box w; /* window area, layout-relative */ - struct wl_list layers[4]; /* LayerSurface.link */ - const Layout *lt[2]; -@@ -205,6 +227,9 @@ struct Monitor { - int nmaster; - char ltsymbol[16]; - int asleep; -+ Drwl *drw; -+ Buffer *pool[2]; -+ int lrpad; - }; - - typedef struct { -@@ -247,6 +272,13 @@ static void arrangelayer(Monitor *m, struct wl_list *list, - struct wlr_box *usable_area, int exclusive); - static void arrangelayers(Monitor *m); - static void axisnotify(struct wl_listener *listener, void *data); -+static bool baracceptsinput(struct wlr_scene_buffer *buffer, double *sx, double *sy); -+static void bufdestroy(struct wlr_buffer *buffer); -+static bool bufdatabegin(struct wlr_buffer *buffer, uint32_t flags, -+ void **data, uint32_t *format, size_t *stride); -+static void bufdataend(struct wlr_buffer *buffer); -+static Buffer *bufmon(Monitor *m); -+static void bufrelease(struct wl_listener *listener, void *data); - static void buttonpress(struct wl_listener *listener, void *data); - static void chvt(const Arg *arg); - static void checkidleinhibitor(struct wlr_surface *exclude); -@@ -282,6 +314,8 @@ static void destroypointerconstraint(struct wl_listener *listener, void *data); - static void destroysessionlock(struct wl_listener *listener, void *data); - static void destroykeyboardgroup(struct wl_listener *listener, void *data); - static Monitor *dirtomon(enum wlr_direction dir); -+static void drawbar(Monitor *m); -+static void drawbars(void); - static void focusclient(Client *c, int lift); - static void focusmon(const Arg *arg); - static void focusstack(const Arg *arg); -@@ -310,7 +344,6 @@ static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int - static void outputmgrtest(struct wl_listener *listener, void *data); - static void pointerfocus(Client *c, struct wlr_surface *surface, - double sx, double sy, uint32_t time); --static void printstatus(void); - static void powermgrsetmode(struct wl_listener *listener, void *data); - static void quit(const Arg *arg); - static void rendermon(struct wl_listener *listener, void *data); -@@ -331,9 +364,11 @@ static void setsel(struct wl_listener *listener, void *data); - static void setup(void); - static void spawn(const Arg *arg); - static void startdrag(struct wl_listener *listener, void *data); -+static int statusin(int fd, unsigned int mask, void *data); - static void tag(const Arg *arg); - static void tagmon(const Arg *arg); - static void tile(Monitor *m); -+static void togglebar(const Arg *arg); - static void togglefloating(const Arg *arg); - static void togglefullscreen(const Arg *arg); - static void toggletag(const Arg *arg); -@@ -342,6 +377,7 @@ static void unlocksession(struct wl_listener *listener, void *data); - static void unmaplayersurfacenotify(struct wl_listener *listener, void *data); - static void unmapnotify(struct wl_listener *listener, void *data); - static void updatemons(struct wl_listener *listener, void *data); -+static void updatebar(Monitor *m); - static void updatetitle(struct wl_listener *listener, void *data); - static void urgent(struct wl_listener *listener, void *data); - static void view(const Arg *arg); -@@ -406,6 +442,15 @@ static struct wlr_box sgeom; - static struct wl_list mons; - static Monitor *selmon; - -+static char stext[256]; -+static struct wl_event_source *status_event_source; -+ -+static const struct wlr_buffer_impl buffer_impl = { -+ .destroy = bufdestroy, -+ .begin_data_ptr_access = bufdatabegin, -+ .end_data_ptr_access = bufdataend, -+}; -+ - /* global event handlers */ - static struct wl_listener cursor_axis = {.notify = axisnotify}; - static struct wl_listener cursor_button = {.notify = buttonpress}; -@@ -521,7 +566,7 @@ arrange(Monitor *m) - wlr_scene_node_set_enabled(&m->fullscreen_bg->node, - (c = focustop(m)) && c->isfullscreen); - -- strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, LENGTH(m->ltsymbol)); -+ strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof(m->ltsymbol)); - - /* We move all clients (except fullscreen and unmanaged) to LyrTile while - * in floating layout to avoid "real" floating clients be always on top */ -@@ -576,6 +621,11 @@ arrangelayers(Monitor *m) - if (!m->wlr_output->enabled) - return; - -+ if (m->scene_buffer->node.enabled) { -+ usable_area.height -= m->b.real_height; -+ usable_area.y += topbar ? m->b.real_height : 0; -+ } -+ - /* Arrange exclusive surfaces from top->bottom */ - for (i = 3; i >= 0; i--) - arrangelayer(m, &m->layers[i], &usable_area, 1); -@@ -618,17 +668,102 @@ axisnotify(struct wl_listener *listener, void *data) - event->delta_discrete, event->source, event->relative_direction); - } - -+bool -+baracceptsinput(struct wlr_scene_buffer *buffer, double *sx, double *sy) -+{ -+ return true; -+} -+ -+void -+bufdestroy(struct wlr_buffer *wlr_buffer) -+{ -+ Buffer *buf = wl_container_of(wlr_buffer, buf, base); -+ if (buf->busy) -+ wl_list_remove(&buf->release.link); -+ drwl_image_destroy(buf->image); -+ free(buf); -+} -+ -+bool -+bufdatabegin(struct wlr_buffer *wlr_buffer, uint32_t flags, -+ void **data, uint32_t *format, size_t *stride) -+{ -+ Buffer *buf = wl_container_of(wlr_buffer, buf, base); -+ -+ if (flags & WLR_BUFFER_DATA_PTR_ACCESS_WRITE) return false; -+ -+ *data = buf->data; -+ *stride = wlr_buffer->width * 4; -+ *format = DRM_FORMAT_ARGB8888; -+ -+ return true; -+} -+ -+void -+bufdataend(struct wlr_buffer *wlr_buffer) -+{ -+} -+ -+Buffer * -+bufmon(Monitor *m) -+{ -+ size_t i; -+ Buffer *buf = NULL; -+ -+ for (i = 0; i < LENGTH(m->pool); i++) { -+ if (m->pool[i]) { -+ if (m->pool[i]->busy) -+ continue; -+ buf = m->pool[i]; -+ break; -+ } -+ -+ buf = ecalloc(1, sizeof(Buffer) + (m->b.width * 4 * m->b.height)); -+ buf->image = drwl_image_create(NULL, m->b.width, m->b.height, buf->data); -+ wlr_buffer_init(&buf->base, &buffer_impl, m->b.width, m->b.height); -+ m->pool[i] = buf; -+ break; -+ } -+ if (!buf) -+ return NULL; -+ -+ buf->busy = true; -+ LISTEN(&buf->base.events.release, &buf->release, bufrelease); -+ wlr_buffer_lock(&buf->base); -+ drwl_setimage(m->drw, buf->image); -+ return buf; -+} -+ -+void -+bufrelease(struct wl_listener *listener, void *data) -+{ -+ Buffer *buf = wl_container_of(listener, buf, release); -+ buf->busy = false; -+ wl_list_remove(&buf->release.link); -+} -+ - void - buttonpress(struct wl_listener *listener, void *data) - { -+ unsigned int i = 0, x = 0; -+ double cx; -+ unsigned int click; - struct wlr_pointer_button_event *event = data; - struct wlr_keyboard *keyboard; -+ struct wlr_scene_node *node; -+ struct wlr_scene_buffer *buffer; - uint32_t mods; -+ Arg arg = {0}; - Client *c; - const Button *b; - - wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); - -+ click = ClkRoot; -+ xytonode(cursor->x, cursor->y, NULL, &c, NULL, NULL, NULL); -+ if (c) -+ click = ClkClient; -+ - switch (event->state) { - case WL_POINTER_BUTTON_STATE_PRESSED: - cursor_mode = CurPressed; -@@ -636,17 +771,34 @@ buttonpress(struct wl_listener *listener, void *data) - if (locked) - break; - -+ if (!c && !exclusive_focus && -+ (node = wlr_scene_node_at(&layers[LyrBottom]->node, cursor->x, cursor->y, NULL, NULL)) && -+ (buffer = wlr_scene_buffer_from_node(node)) && buffer == selmon->scene_buffer) { -+ cx = (cursor->x - selmon->m.x) * selmon->wlr_output->scale; -+ do -+ x += TEXTW(selmon, tags[i]); -+ while (cx >= x && ++i < LENGTH(tags)); -+ if (i < LENGTH(tags)) { -+ click = ClkTagBar; -+ arg.ui = 1 << i; -+ } else if (cx < x + TEXTW(selmon, selmon->ltsymbol)) -+ click = ClkLtSymbol; -+ else if (cx > selmon->b.width - (TEXTW(selmon, stext) - selmon->lrpad + 2)) { -+ click = ClkStatus; -+ } else -+ click = ClkTitle; -+ } -+ - /* Change focus if the button was _pressed_ over a client */ - xytonode(cursor->x, cursor->y, NULL, &c, NULL, NULL, NULL); -- if (c && (!client_is_unmanaged(c) || client_wants_focus(c))) -+ if (click == ClkClient && (!client_is_unmanaged(c) || client_wants_focus(c))) - focusclient(c, 1); - - keyboard = wlr_seat_get_keyboard(seat); - mods = keyboard ? wlr_keyboard_get_modifiers(keyboard) : 0; - for (b = buttons; b < END(buttons); b++) { -- if (CLEANMASK(mods) == CLEANMASK(b->mod) && -- event->button == b->button && b->func) { -- b->func(&b->arg); -+ if (CLEANMASK(mods) == CLEANMASK(b->mod) && event->button == b->button && click == b->click && b->func) { -+ b->func(click == ClkTagBar && b->arg.i == 0 ? &arg : &b->arg); - return; - } - } -@@ -721,6 +873,8 @@ cleanup(void) - /* Destroy after the wayland display (when the monitors are already destroyed) - to avoid destroying them with an invalid scene output. */ - wlr_scene_node_destroy(&scene->tree.node); -+ -+ drwl_fini(); - } - - void -@@ -736,6 +890,12 @@ cleanupmon(struct wl_listener *listener, void *data) - wlr_layer_surface_v1_destroy(l->layer_surface); - } - -+ for (i = 0; i < LENGTH(m->pool); i++) -+ wlr_buffer_drop(&m->pool[i]->base); -+ -+ drwl_setimage(m->drw, NULL); -+ drwl_destroy(m->drw); -+ - wl_list_remove(&m->destroy.link); - wl_list_remove(&m->frame.link); - wl_list_remove(&m->link); -@@ -748,6 +908,7 @@ cleanupmon(struct wl_listener *listener, void *data) - - closemon(m); - wlr_scene_node_destroy(&m->fullscreen_bg->node); -+ wlr_scene_node_destroy(&m->scene_buffer->node); - free(m); - } - -@@ -814,7 +975,7 @@ closemon(Monitor *m) - setmon(c, selmon, c->tags); - } - focusclient(focustop(selmon), 1); -- printstatus(); -+ drawbars(); - } - - void -@@ -1066,7 +1227,7 @@ createmon(struct wl_listener *listener, void *data) - m->nmaster = r->nmaster; - m->lt[0] = r->lt; - m->lt[1] = &layouts[LENGTH(layouts) > 1 && r->lt != &layouts[1]]; -- strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, LENGTH(m->ltsymbol)); -+ strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof(m->ltsymbol)); - wlr_output_state_set_scale(&state, r->scale); - wlr_output_state_set_transform(&state, r->rr); - break; -@@ -1088,8 +1249,15 @@ createmon(struct wl_listener *listener, void *data) - wlr_output_commit_state(wlr_output, &state); - wlr_output_state_finish(&state); - -+ if (!(m->drw = drwl_create())) -+ die("failed to create drwl context"); -+ -+ m->scene_buffer = wlr_scene_buffer_create(layers[LyrBottom], NULL); -+ m->scene_buffer->point_accepts_input = baracceptsinput; -+ updatebar(m); -+ - wl_list_insert(&mons, &m->link); -- printstatus(); -+ drawbars(); - - /* The xdg-protocol specifies: - * -@@ -1399,6 +1567,80 @@ dirtomon(enum wlr_direction dir) - return selmon; - } - -+void -+drawbar(Monitor *m) -+{ -+ int x, w, tw = 0; -+ int boxs = m->drw->font->height / 9; -+ int boxw = m->drw->font->height / 6 + 2; -+ uint32_t i, occ = 0, urg = 0; -+ Client *c; -+ Buffer *buf; -+ -+ if (!m->scene_buffer->node.enabled) -+ return; -+ if (!(buf = bufmon(m))) -+ return; -+ -+ /* draw status first so it can be overdrawn by tags later */ -+ if (m == selmon) { /* status is only drawn on selected monitor */ -+ drwl_setscheme(m->drw, colors[SchemeNorm]); -+ tw = TEXTW(m, stext) - m->lrpad + 2; /* 2px right padding */ -+ drwl_text(m->drw, m->b.width - tw, 0, tw, m->b.height, 0, stext, 0); -+ } -+ -+ wl_list_for_each(c, &clients, link) { -+ if (c->mon != m) -+ continue; -+ occ |= c->tags; -+ if (c->isurgent) -+ urg |= c->tags; -+ } -+ x = 0; -+ c = focustop(m); -+ for (i = 0; i < LENGTH(tags); i++) { -+ w = TEXTW(m, tags[i]); -+ drwl_setscheme(m->drw, colors[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]); -+ drwl_text(m->drw, x, 0, w, m->b.height, m->lrpad / 2, tags[i], urg & 1 << i); -+ if (occ & 1 << i) -+ drwl_rect(m->drw, x + boxs, boxs, boxw, boxw, -+ m == selmon && c && c->tags & 1 << i, -+ urg & 1 << i); -+ x += w; -+ } -+ w = TEXTW(m, m->ltsymbol); -+ drwl_setscheme(m->drw, colors[SchemeNorm]); -+ x = drwl_text(m->drw, x, 0, w, m->b.height, m->lrpad / 2, m->ltsymbol, 0); -+ -+ if ((w = m->b.width - tw - x) > m->b.height) { -+ if (c) { -+ drwl_setscheme(m->drw, colors[m == selmon ? SchemeSel : SchemeNorm]); -+ drwl_text(m->drw, x, 0, w, m->b.height, m->lrpad / 2, client_get_title(c), 0); -+ if (c && c->isfloating) -+ drwl_rect(m->drw, x + boxs, boxs, boxw, boxw, 0, 0); -+ } else { -+ drwl_setscheme(m->drw, colors[SchemeNorm]); -+ drwl_rect(m->drw, x, 0, w, m->b.height, 1, 1); -+ } -+ } -+ -+ wlr_scene_buffer_set_dest_size(m->scene_buffer, -+ m->b.real_width, m->b.real_height); -+ wlr_scene_node_set_position(&m->scene_buffer->node, m->m.x, -+ m->m.y + (topbar ? 0 : m->m.height - m->b.real_height)); -+ wlr_scene_buffer_set_buffer(m->scene_buffer, &buf->base); -+ wlr_buffer_unlock(&buf->base); -+} -+ -+void -+drawbars(void) -+{ -+ Monitor *m = NULL; -+ -+ wl_list_for_each(m, &mons, link) -+ drawbar(m); -+} -+ - void - focusclient(Client *c, int lift) - { -@@ -1433,13 +1675,13 @@ focusclient(Client *c, int lift) - /* Don't change border color if there is an exclusive focus or we are - * handling a drag operation */ - if (!exclusive_focus && !seat->drag) -- client_set_border_color(c, focuscolor); -+ client_set_border_color(c, (float[])COLOR(colors[SchemeSel][ColBorder])); - } - - /* Deactivate old client if focus is changing */ - if (old && (!c || client_surface(c) != old)) { - /* If an overlay is focused, don't focus or activate the client, -- * but only update its position in fstack to render its border with focuscolor -+ * but only update its position in fstack to render its border with its color - * and focus it after the overlay is closed. */ - if (old_client_type == LayerShell && wlr_scene_node_coords( - &old_l->scene->node, &unused_lx, &unused_ly) -@@ -1450,12 +1692,11 @@ focusclient(Client *c, int lift) - /* Don't deactivate old client if the new one wants focus, as this causes issues with winecfg - * and probably other clients */ - } else if (old_c && !client_is_unmanaged(old_c) && (!c || !client_wants_focus(c))) { -- client_set_border_color(old_c, bordercolor); -- -+ client_set_border_color(old_c, (float[])COLOR(colors[SchemeNorm][ColBorder])); - client_activate_surface(old, 0); - } - } -- printstatus(); -+ drawbars(); - - if (!c) { - /* With no client, all we have left is to clear focus */ -@@ -1769,7 +2010,7 @@ mapnotify(struct wl_listener *listener, void *data) - - for (i = 0; i < 4; i++) { - c->border[i] = wlr_scene_rect_create(c->scene, 0, 0, -- c->isurgent ? urgentcolor : bordercolor); -+ (float[])COLOR(colors[c->isurgent ? SchemeUrg : SchemeNorm][ColBorder])); - c->border[i]->node.data = c; - } - -@@ -1792,7 +2033,7 @@ mapnotify(struct wl_listener *listener, void *data) - } else { - applyrules(c); - } -- printstatus(); -+ drawbars(); - - unset_fullscreen: - m = c->mon ? c->mon : xytomon(c->geom.x, c->geom.y); -@@ -2085,44 +2326,6 @@ pointerfocus(Client *c, struct wlr_surface *surface, double sx, double sy, - wlr_seat_pointer_notify_motion(seat, time, sx, sy); - } - --void --printstatus(void) --{ -- Monitor *m = NULL; -- Client *c; -- uint32_t occ, urg, sel; -- -- wl_list_for_each(m, &mons, link) { -- occ = urg = 0; -- wl_list_for_each(c, &clients, link) { -- if (c->mon != m) -- continue; -- occ |= c->tags; -- if (c->isurgent) -- urg |= c->tags; -- } -- if ((c = focustop(m))) { -- printf("%s title %s\n", m->wlr_output->name, client_get_title(c)); -- printf("%s appid %s\n", m->wlr_output->name, client_get_appid(c)); -- printf("%s fullscreen %d\n", m->wlr_output->name, c->isfullscreen); -- printf("%s floating %d\n", m->wlr_output->name, c->isfloating); -- sel = c->tags; -- } else { -- printf("%s title \n", m->wlr_output->name); -- printf("%s appid \n", m->wlr_output->name); -- printf("%s fullscreen \n", m->wlr_output->name); -- printf("%s floating \n", m->wlr_output->name); -- sel = 0; -- } -- -- printf("%s selmon %u\n", m->wlr_output->name, m == selmon); -- printf("%s tags %"PRIu32" %"PRIu32" %"PRIu32" %"PRIu32"\n", -- m->wlr_output->name, occ, m->tagset[m->seltags], sel, urg); -- printf("%s layout %s\n", m->wlr_output->name, m->ltsymbol); -- } -- fflush(stdout); --} -- - void - powermgrsetmode(struct wl_listener *listener, void *data) - { -@@ -2251,22 +2454,14 @@ run(char *startup_cmd) - - /* Now that the socket exists and the backend is started, run the startup command */ - if (startup_cmd) { -- int piperw[2]; -- if (pipe(piperw) < 0) -- die("startup: pipe:"); - if ((child_pid = fork()) < 0) - die("startup: fork:"); - if (child_pid == 0) { -+ close(STDIN_FILENO); - setsid(); -- dup2(piperw[0], STDIN_FILENO); -- close(piperw[0]); -- close(piperw[1]); - execl("/bin/sh", "/bin/sh", "-c", startup_cmd, NULL); - die("startup: execl:"); - } -- dup2(piperw[1], STDOUT_FILENO); -- close(piperw[1]); -- close(piperw[0]); - } - - /* Mark stdout as non-blocking to avoid the startup script -@@ -2276,7 +2471,7 @@ run(char *startup_cmd) - if (fd_set_nonblock(STDOUT_FILENO) < 0) - close(STDOUT_FILENO); - -- printstatus(); -+ drawbars(); - - /* At this point the outputs are initialized, choose initial selmon based on - * cursor position, and set default cursor image */ -@@ -2342,7 +2537,7 @@ setfloating(Client *c, int floating) - (p && p->isfullscreen) ? LyrFS - : c->isfloating ? LyrFloat : LyrTile]); - arrange(c->mon); -- printstatus(); -+ drawbars(); - } - - void -@@ -2365,7 +2560,7 @@ setfullscreen(Client *c, int fullscreen) - resize(c, c->prev, 0); - } - arrange(c->mon); -- printstatus(); -+ drawbars(); - } - - void -@@ -2377,9 +2572,9 @@ setlayout(const Arg *arg) - selmon->sellt ^= 1; - if (arg && arg->v) - selmon->lt[selmon->sellt] = (Layout *)arg->v; -- strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, LENGTH(selmon->ltsymbol)); -+ strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof(selmon->ltsymbol)); - arrange(selmon); -- printstatus(); -+ drawbar(selmon); - } - - /* arg > 1.0 will set mfact absolutely */ -@@ -2452,6 +2647,7 @@ setup(void) - for (i = 0; i < (int)LENGTH(sig); i++) - sigaction(sig[i], &sa, NULL); - -+ - wlr_log_init(log_level, NULL); - - /* The Wayland display is managed by libwayland. It handles accepting -@@ -2646,6 +2842,11 @@ setup(void) - wl_signal_add(&output_mgr->events.apply, &output_mgr_apply); - wl_signal_add(&output_mgr->events.test, &output_mgr_test); - -+ drwl_init(); -+ -+ status_event_source = wl_event_loop_add_fd(wl_display_get_event_loop(dpy), -+ STDIN_FILENO, WL_EVENT_READABLE, statusin, NULL); -+ - /* Make sure XWayland clients don't connect to the parent X server, - * e.g when running in the x11 backend or the wayland backend and the - * compositor has Xwayland support */ -@@ -2670,6 +2871,8 @@ void - spawn(const Arg *arg) - { - if (fork() == 0) { -+ close(STDIN_FILENO); -+ open("/dev/null", O_RDWR); - dup2(STDERR_FILENO, STDOUT_FILENO); - setsid(); - execvp(((char **)arg->v)[0], (char **)arg->v); -@@ -2688,6 +2891,30 @@ startdrag(struct wl_listener *listener, void *data) - LISTEN_STATIC(&drag->icon->events.destroy, destroydragicon); - } - -+int -+statusin(int fd, unsigned int mask, void *data) -+{ -+ char status[256]; -+ ssize_t n; -+ -+ if (mask & WL_EVENT_ERROR) -+ die("status in event error"); -+ if (mask & WL_EVENT_HANGUP) -+ wl_event_source_remove(status_event_source); -+ -+ n = read(fd, status, sizeof(status) - 1); -+ if (n < 0 && errno != EWOULDBLOCK) -+ die("read:"); -+ -+ status[n] = '\0'; -+ status[strcspn(status, "\n")] = '\0'; -+ -+ strncpy(stext, status, sizeof(stext)); -+ drawbars(); -+ -+ return 0; -+} -+ - void - tag(const Arg *arg) - { -@@ -2698,7 +2925,7 @@ tag(const Arg *arg) - sel->tags = arg->ui & TAGMASK; - focusclient(focustop(selmon), 1); - arrange(selmon); -- printstatus(); -+ drawbars(); - } - - void -@@ -2743,6 +2970,15 @@ tile(Monitor *m) - } - } - -+void -+togglebar(const Arg *arg) -+{ -+ wlr_scene_node_set_enabled(&selmon->scene_buffer->node, -+ !selmon->scene_buffer->node.enabled); -+ arrangelayers(selmon); -+ drawbars(); -+} -+ - void - togglefloating(const Arg *arg) - { -@@ -2771,7 +3007,7 @@ toggletag(const Arg *arg) - sel->tags = newtags; - focusclient(focustop(selmon), 1); - arrange(selmon); -- printstatus(); -+ drawbars(); - } - - void -@@ -2784,7 +3020,7 @@ toggleview(const Arg *arg) - selmon->tagset[selmon->seltags] = newtagset; - focusclient(focustop(selmon), 1); - arrange(selmon); -- printstatus(); -+ drawbars(); - } - - void -@@ -2832,7 +3068,7 @@ unmapnotify(struct wl_listener *listener, void *data) - } - - wlr_scene_node_destroy(&c->scene->node); -- printstatus(); -+ drawbars(); - motionnotify(0, NULL, 0, 0, 0, 0); - } - -@@ -2932,6 +3168,13 @@ updatemons(struct wl_listener *listener, void *data) - } - } - -+ if (stext[0] == '\0') -+ strncpy(stext, "dwl-"VERSION, sizeof(stext)); -+ wl_list_for_each(m, &mons, link) { -+ updatebar(m); -+ drawbar(m); -+ } -+ - /* FIXME: figure out why the cursor image is at 0,0 after turning all - * the monitors on. - * Move the cursor image where it used to be. It does not generate a -@@ -2942,12 +3185,45 @@ updatemons(struct wl_listener *listener, void *data) - wlr_output_manager_v1_set_configuration(output_mgr, config); - } - -+void -+updatebar(Monitor *m) -+{ -+ size_t i; -+ int rw, rh; -+ char fontattrs[12]; -+ -+ wlr_output_transformed_resolution(m->wlr_output, &rw, &rh); -+ m->b.width = rw; -+ m->b.real_width = (int)((float)m->b.width / m->wlr_output->scale); -+ -+ wlr_scene_node_set_enabled(&m->scene_buffer->node, m->wlr_output->enabled ? showbar : 0); -+ -+ for (i = 0; i < LENGTH(m->pool); i++) -+ if (m->pool[i]) { -+ wlr_buffer_drop(&m->pool[i]->base); -+ m->pool[i] = NULL; -+ } -+ -+ if (m->b.scale == m->wlr_output->scale && m->drw) -+ return; -+ -+ drwl_font_destroy(m->drw->font); -+ snprintf(fontattrs, sizeof(fontattrs), "dpi=%.2f", 96. * m->wlr_output->scale); -+ if (!(drwl_font_create(m->drw, LENGTH(fonts), fonts, fontattrs))) -+ die("Could not load font"); -+ -+ m->b.scale = m->wlr_output->scale; -+ m->lrpad = m->drw->font->height; -+ m->b.height = m->drw->font->height + 2; -+ m->b.real_height = (int)((float)m->b.height / m->wlr_output->scale); -+} -+ - void - updatetitle(struct wl_listener *listener, void *data) - { - Client *c = wl_container_of(listener, c, set_title); - if (c == focustop(c->mon)) -- printstatus(); -+ drawbars(); - } - - void -@@ -2960,10 +3236,10 @@ urgent(struct wl_listener *listener, void *data) - return; - - c->isurgent = 1; -- printstatus(); -+ drawbars(); - - if (client_surface(c)->mapped) -- client_set_border_color(c, urgentcolor); -+ client_set_border_color(c, (float[])COLOR(colors[SchemeUrg][ColBorder])); - } - - void -@@ -2976,7 +3252,7 @@ view(const Arg *arg) - selmon->tagset[selmon->seltags] = arg->ui & TAGMASK; - focusclient(focustop(selmon), 1); - arrange(selmon); -- printstatus(); -+ drawbars(); - } - - void -@@ -3017,6 +3293,7 @@ xytonode(double x, double y, struct wlr_surface **psurface, - { - struct wlr_scene_node *node, *pnode; - struct wlr_surface *surface = NULL; -+ struct wlr_scene_surface *scene_surface = NULL; - Client *c = NULL; - LayerSurface *l = NULL; - int layer; -@@ -3025,9 +3302,12 @@ xytonode(double x, double y, struct wlr_surface **psurface, - if (!(node = wlr_scene_node_at(&layers[layer]->node, x, y, nx, ny))) - continue; - -- if (node->type == WLR_SCENE_NODE_BUFFER) -- surface = wlr_scene_surface_try_from_buffer( -- wlr_scene_buffer_from_node(node))->surface; -+ if (node->type == WLR_SCENE_NODE_BUFFER) { -+ scene_surface = wlr_scene_surface_try_from_buffer( -+ wlr_scene_buffer_from_node(node)); -+ if (!scene_surface) continue; -+ surface = scene_surface->surface; -+ } - /* Walk the tree to find a node that knows the client */ - for (pnode = node; pnode && !c; pnode = &pnode->parent->node) - c = pnode->data; -@@ -3160,10 +3440,10 @@ sethints(struct wl_listener *listener, void *data) - return; - - c->isurgent = xcb_icccm_wm_hints_get_urgency(c->surface.xwayland->hints); -- printstatus(); -+ drawbars(); - - if (c->isurgent && surface && surface->mapped) -- client_set_border_color(c, urgentcolor); -+ client_set_border_color(c, (float[])COLOR(colors[SchemeUrg][ColBorder])); - } - - void --- -2.52.0 -