1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798991001011021031041051061071081091101111121131141151161171181191201211221231241251261271281291301311321331341351361371381391401411421431441451461471481491501511521531541551561571581591601611621631641651661671681691701711721731741751761771781791801811821831841851861871881891901911921931941951961971981992002012022032042052062072082092102112122132142152162172182192202212222232242252262272282292302312322332342352362372382392402412422432442452462472482492502512522532542552562572582592602612622632642652662672682692702712722732742752762772782792802812822832842852862872882892902912922932942952962972982993003013023033043053063073083093103113123133143153163173183193203213223233243253263273283293303313323333343353363373383393403413423433443453463473483493503513523533543553563573583593603613623633643653663673683693703713723733743753763773783793803813823833843853863873883893903913923933943953963973983994004014024034044054064074084094104114124134144154164174184194204214224234244254264274284294304314324334344354364374384394404414424434444454464474484494504514524534544554564574584594604614624634644654664674684694704714724734744754764774784794804814824834844854864874884894904914924934944954964974984995005015025035045055065075085095105115125135145155165175185195205215225235245255265275285295305315325335345355365375385395405415425435445455465475485495505515525535545555565575585595605615625635645655665675685695705715725735745755765775785795805815825835845855865875885895905915925935945955965975985996006016026036046056066076086096106116126136146156166176186196206216226236246256266276286296306316326336346356366376386396406416426436446456466476486496506516526536546556566576586596606616626636646656666676686696706716726736746756766776786796806816826836846856866876886896906916926936946956966976986997007017027037047057067077087097107117127137147157167177187197207217227237247257267277287297307317327337347357367377387397407417427437447457467477487497507517527537547557567577587597607617627637647657667677687697707717727737747757767777787797807817827837847857867877887897907917927937947957967977987998008018028038048058068078088098108118128138148158168178188198208218228238248258268278288298308318328338348358368378388398408418428438448458468478488498508518528538548558568578588598608618628638648658668678688698708718728738748758768778788798808818828838848858868878888898908918928938948958968978988999009019029039049059069079089099109119129139149159169179189199209219229239249259269279289299309319329339349359369379389399409419429439449459469479489499509519529539549559569579589599609619629639649659669679689699709719729739749759769779789799809819829839849859869879889899909919929939949959969979989991000100110021003100410051006100710081009101010111012101310141015101610171018101910201021102210231024102510261027102810291030103110321033103410351036103710381039104010411042104310441045104610471048104910501051105210531054105510561057105810591060106110621063106410651066106710681069107010711072107310741075107610771078107910801081108210831084108510861087108810891090109110921093109410951096109710981099110011011102110311041105110611071108110911101111111211131114111511161117111811191120112111221123112411251126112711281129113011311132113311341135113611371138113911401141114211431144114511461147114811491150115111521153115411551156115711581159116011611162116311641165116611671168116911701171117211731174117511761177117811791180118111821183118411851186118711881189119011911192119311941195119611971198119912001201120212031204120512061207120812091210121112121213121412151216121712181219122012211222122312241225122612271228122912301231123212331234123512361237123812391240124112421243124412451246 |
- From 85e40afc2ad8acba453ce8c57233542e340c1c2b Mon Sep 17 00:00:00 2001
- From: sewn <sewn@disroot.org>
- Date: Fri, 23 Aug 2024 09:42:04 +0300
- Subject: [PATCH] Implement dwm bar clone
- ---
- Makefile | 2 +-
- config.def.h | 31 +++-
- drwl.h | 311 ++++++++++++++++++++++++++++++++++++
- dwl.c | 442 +++++++++++++++++++++++++++++++++++++++++----------
- 4 files changed, 691 insertions(+), 95 deletions(-)
- create mode 100644 drwl.h
- diff --git a/Makefile b/Makefile
- index 0d651e7..2a11396 100644
- --- a/Makefile
- +++ b/Makefile
- @@ -12,7 +12,7 @@ DWLDEVCFLAGS = -g -pedantic -Wall -Wextra -Wdeclaration-after-statement \
- -Wfloat-conversion
-
- # CFLAGS / LDFLAGS
- -PKGS = wlroots wayland-server xkbcommon libinput $(XLIBS)
- +PKGS = wlroots wayland-server xkbcommon libinput pixman-1 fcft $(XLIBS)
- DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CFLAGS)
- LDLIBS = `$(PKG_CONFIG) --libs $(PKGS)` -lm $(LIBS)
-
- diff --git a/config.def.h b/config.def.h
- index 22d2171..5d1dc2b 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.1f, 0.1f, 0.1f, 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)
- +static char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
-
- /* logging */
- static int log_level = WLR_ERROR;
- @@ -127,6 +133,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} },
- @@ -170,7 +177,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..b06a736
- --- /dev/null
- +++ b/drwl.h
- @@ -0,0 +1,311 @@
- +/*
- + * drwl - https://codeberg.org/sewn/drwl
- + *
- + * Copyright (c) 2023-2024 sewn <sewn@disroot.org>
- + * Copyright (c) 2024 notchoc <notchoc@disroot.org>
- + *
- + * 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 <bjoern@hoehrmann.de>
- + * See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for details.
- + */
- +#pragma once
- +
- +#include <stdlib.h>
- +#include <fcft/fcft.h>
- +#include <pixman-1/pixman.h>
- +
- +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)
- +{
- + fcft_set_scaling_filter(FCFT_SCALING_FILTER_LANCZOS3);
- + 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 145fd01..ab1bc31 100644
- --- a/dwl.c
- +++ b/dwl.c
- @@ -5,6 +5,7 @@
- #include <libinput.h>
- #include <linux/input-event-codes.h>
- #include <math.h>
- +#include <libdrm/drm_fourcc.h>
- #include <signal.h>
- #include <stdio.h>
- #include <stdlib.h>
- @@ -57,6 +58,7 @@
- #include <wlr/types/wlr_xdg_decoration_v1.h>
- #include <wlr/types/wlr_xdg_output_v1.h>
- #include <wlr/types/wlr_xdg_shell.h>
- +#include <wlr/interfaces/wlr_buffer.h>
- #include <wlr/util/log.h>
- #include <wlr/util/region.h>
- #include <xkbcommon/xkbcommon.h>
- @@ -67,6 +69,7 @@
- #endif
-
- #include "util.h"
- +#include "drwl.h"
-
- /* macros */
- #define MAX(A, B) ((A) > (B) ? (A) : (B))
- @@ -75,14 +78,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 { static struct wl_listener _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 */
- #ifdef XWAYLAND
- enum { NetWMWindowTypeDialog, NetWMWindowTypeSplash, NetWMWindowTypeToolbar,
- NetWMWindowTypeUtility, NetLast }; /* EWMH atoms */
- @@ -96,6 +102,7 @@ typedef union {
- } Arg;
-
- typedef struct {
- + unsigned int click;
- unsigned int mod;
- unsigned int button;
- void (*func)(const Arg *);
- @@ -185,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;
- @@ -196,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];
- @@ -207,6 +228,9 @@ struct Monitor {
- int nmaster;
- char ltsymbol[16];
- int asleep;
- + Drwl *drw;
- + Buffer *pool[2];
- + int lrpad;
- };
-
- typedef struct {
- @@ -249,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);
- @@ -282,6 +313,8 @@ static void destroysessionlock(struct wl_listener *listener, void *data);
- static void destroysessionmgr(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);
- @@ -309,7 +342,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 +363,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 +376,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);
- @@ -408,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,
- +};
- +
- #ifdef XWAYLAND
- static void activatex11(struct wl_listener *listener, void *data);
- static void associatex11(struct wl_listener *listener, void *data);
- @@ -548,6 +592,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);
- @@ -590,17 +639,102 @@ axisnotify(struct wl_listener *listener, void *data)
- event->delta_discrete, event->source);
- }
-
- +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 WLR_BUTTON_PRESSED:
- cursor_mode = CurPressed;
- @@ -608,17 +742,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;
- }
- }
- @@ -689,6 +840,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
- @@ -704,6 +857,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);
- @@ -714,6 +873,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);
- }
-
- @@ -743,7 +903,7 @@ closemon(Monitor *m)
- setmon(c, selmon, c->tags);
- }
- focusclient(focustop(selmon), 1);
- - printstatus();
- + drawbars();
- }
-
- void
- @@ -980,8 +1140,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:
- *
- @@ -1312,6 +1479,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)
- {
- @@ -1347,13 +1588,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)
- @@ -1364,12 +1605,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 */
- @@ -1666,7 +1906,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;
- }
-
- @@ -1689,7 +1929,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);
- @@ -1982,46 +2222,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;
- - const char *appid, *title;
- -
- - 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))) {
- - title = client_get_title(c);
- - appid = client_get_appid(c);
- - printf("%s title %s\n", m->wlr_output->name, title ? title : broken);
- - printf("%s appid %s\n", m->wlr_output->name, appid ? appid : broken);
- - 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)
- @@ -2175,30 +2375,17 @@ 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 people who does not close stdin
- - * nor consumes it in their startup script getting dwl frozen */
- - 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 */
- @@ -2262,7 +2449,7 @@ setfloating(Client *c, int floating)
- wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen
- ? LyrFS : c->isfloating ? LyrFloat : LyrTile]);
- arrange(c->mon);
- - printstatus();
- + drawbars();
- }
-
- void
- @@ -2285,7 +2472,7 @@ setfullscreen(Client *c, int fullscreen)
- resize(c, c->prev, 0);
- }
- arrange(c->mon);
- - printstatus();
- + drawbars();
- }
-
- void
- @@ -2310,7 +2497,7 @@ setlayout(const Arg *arg)
- selmon->lt[selmon->sellt] = (Layout *)arg->v;
- strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, LENGTH(selmon->ltsymbol));
- arrange(selmon);
- - printstatus();
- + drawbar(selmon);
- }
-
- /* arg > 1.0 will set mfact absolutely */
- @@ -2383,6 +2570,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
- @@ -2569,6 +2757,11 @@ setup(void)
-
- wlr_scene_set_presentation(scene, wlr_presentation_create(dpy, backend));
-
- + 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 */
- @@ -2593,6 +2786,7 @@ void
- spawn(const Arg *arg)
- {
- if (fork() == 0) {
- + close(STDIN_FILENO);
- dup2(STDERR_FILENO, STDOUT_FILENO);
- setsid();
- execvp(((char **)arg->v)[0], (char **)arg->v);
- @@ -2611,6 +2805,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[1024];
- + 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)
- {
- @@ -2621,7 +2839,7 @@ tag(const Arg *arg)
- sel->tags = arg->ui & TAGMASK;
- focusclient(focustop(selmon), 1);
- arrange(selmon);
- - printstatus();
- + drawbars();
- }
-
- void
- @@ -2666,6 +2884,14 @@ tile(Monitor *m)
- }
- }
-
- +void
- +togglebar(const Arg *arg)
- +{
- + wlr_scene_node_set_enabled(&selmon->scene_buffer->node,
- + !selmon->scene_buffer->node.enabled);
- + arrangelayers(selmon);
- +}
- +
- void
- togglefloating(const Arg *arg)
- {
- @@ -2694,7 +2920,7 @@ toggletag(const Arg *arg)
- sel->tags = newtags;
- focusclient(focustop(selmon), 1);
- arrange(selmon);
- - printstatus();
- + drawbars();
- }
-
- void
- @@ -2707,7 +2933,7 @@ toggleview(const Arg *arg)
- selmon->tagset[selmon->seltags] = newtagset;
- focusclient(focustop(selmon), 1);
- arrange(selmon);
- - printstatus();
- + drawbars();
- }
-
- void
- @@ -2755,7 +2981,7 @@ unmapnotify(struct wl_listener *listener, void *data)
- }
-
- wlr_scene_node_destroy(&c->scene->node);
- - printstatus();
- + drawbars();
- motionnotify(0, NULL, 0, 0, 0, 0);
- }
-
- @@ -2855,6 +3081,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
- @@ -2865,12 +3098,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
- @@ -2883,10 +3149,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
- @@ -2899,7 +3165,7 @@ view(const Arg *arg)
- selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
- focusclient(focustop(selmon), 1);
- arrange(selmon);
- - printstatus();
- + drawbars();
- }
-
- void
- @@ -2940,6 +3206,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;
- @@ -2948,9 +3215,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;
- @@ -3089,10 +3359,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.46.0
|