summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonardo Hernández Hernández <leohdz172@proton.me>2023-12-10 23:44:33 -0600
committerLeonardo Hernández Hernández <leohdz172@proton.me>2023-12-10 23:46:49 -0600
commit49bfe927030b4747deded43656b4fe417c157123 (patch)
treeb8042ec2dbe377cf79ce3e64b76f6e9f2367cd85
parentc88960751d7e422ad7eca1672c00ee09515e5095 (diff)
merge X11Managed and X11Unmanaged into X11
now that client_is_unmanaged() checks the wlr struct we don't need to keep track of it ourselves
-rw-r--r--client.h2
-rw-r--r--dwl.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/client.h b/client.h
index 68e7534..dded687 100644
--- a/client.h
+++ b/client.h
@@ -10,7 +10,7 @@ static inline int
client_is_x11(Client *c)
{
#ifdef XWAYLAND
- return c->type == X11Managed || c->type == X11Unmanaged;
+ return c->type == X11;
#endif
return 0;
}
diff --git a/dwl.c b/dwl.c
index c4fb703..8b58a86 100644
--- a/dwl.c
+++ b/dwl.c
@@ -74,7 +74,7 @@
/* enums */
enum { CurNormal, CurPressed, CurMove, CurResize }; /* cursor */
-enum { XDGShell, LayerShell, X11Managed, X11Unmanaged }; /* client types */
+enum { XDGShell, LayerShell, X11 }; /* client types */
enum { LyrBg, LyrBottom, LyrTile, LyrFloat, LyrFS, LyrTop, LyrOverlay, LyrBlock, NUM_LAYERS }; /* scene layers */
#ifdef XWAYLAND
enum { NetWMWindowTypeDialog, NetWMWindowTypeSplash, NetWMWindowTypeToolbar,
@@ -2746,7 +2746,7 @@ activatex11(struct wl_listener *listener, void *data)
Client *c = wl_container_of(listener, c, activate);
/* Only "managed" windows can be activated */
- if (c->type == X11Managed)
+ if (!client_is_unmanaged(c))
wlr_xwayland_surface_activate(c->surface.xwayland, 1);
}
@@ -2766,7 +2766,7 @@ configurex11(struct wl_listener *listener, void *data)
struct wlr_xwayland_surface_configure_event *event = data;
if (!c->mon)
return;
- if (c->isfloating || c->type == X11Unmanaged)
+ if (c->isfloating || client_is_unmanaged(c))
resize(c, (struct wlr_box){.x = event->x, .y = event->y,
.width = event->width, .height = event->height}, 0);
else
@@ -2782,7 +2782,7 @@ createnotifyx11(struct wl_listener *listener, void *data)
/* Allocate a Client for this surface */
c = xsurface->data = ecalloc(1, sizeof(*c));
c->surface.xwayland = xsurface;
- c->type = xsurface->override_redirect ? X11Unmanaged : X11Managed;
+ c->type = X11;
c->bw = borderpx;
/* Listen to the various events it can emit */