Compare commits
5 Commits
3cc22de712
...
548fac74e1
Author | SHA1 | Date | |
---|---|---|---|
548fac74e1 | |||
|
569f554016 | ||
|
b59c7f6a2e | ||
|
f1639ba9d5 | ||
|
8bd3442575 |
15
Makefile
15
Makefile
@ -14,9 +14,9 @@ DWLCFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` $(DWLCPPFLAGS) $(DWLDEVCFLAGS) $(CF
|
|||||||
LDLIBS = `$(PKG_CONFIG) --libs $(PKGS)` $(LIBS)
|
LDLIBS = `$(PKG_CONFIG) --libs $(PKGS)` $(LIBS)
|
||||||
|
|
||||||
all: dwl
|
all: dwl
|
||||||
dwl: dwl.o util.o
|
dwl: dwl.o util.o net-tapesoftware-dwl-wm-unstable-v1-protocol.o
|
||||||
$(CC) dwl.o util.o $(LDLIBS) $(LDFLAGS) $(DWLCFLAGS) -o $@
|
$(CC) dwl.o util.o net-tapesoftware-dwl-wm-unstable-v1-protocol.o $(LDLIBS) $(LDFLAGS) $(DWLCFLAGS) -o $@
|
||||||
dwl.o: dwl.c config.mk config.h client.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h
|
dwl.o: dwl.c config.mk config.h client.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h net-tapesoftware-dwl-wm-unstable-v1-protocol.h
|
||||||
util.o: util.c util.h
|
util.o: util.c util.h
|
||||||
|
|
||||||
# wayland-scanner is a tool which generates C headers and rigging for Wayland
|
# wayland-scanner is a tool which generates C headers and rigging for Wayland
|
||||||
@ -32,6 +32,15 @@ wlr-layer-shell-unstable-v1-protocol.h:
|
|||||||
$(WAYLAND_SCANNER) server-header \
|
$(WAYLAND_SCANNER) server-header \
|
||||||
protocols/wlr-layer-shell-unstable-v1.xml $@
|
protocols/wlr-layer-shell-unstable-v1.xml $@
|
||||||
|
|
||||||
|
# install rules
|
||||||
|
net-tapesoftware-dwl-wm-unstable-v1-protocol.h: protocols/net-tapesoftware-dwl-wm-unstable-v1.xml
|
||||||
|
$(WAYLAND_SCANNER) server-header \
|
||||||
|
protocols/net-tapesoftware-dwl-wm-unstable-v1.xml $@
|
||||||
|
net-tapesoftware-dwl-wm-unstable-v1-protocol.c: protocols/net-tapesoftware-dwl-wm-unstable-v1.xml
|
||||||
|
$(WAYLAND_SCANNER) private-code \
|
||||||
|
protocols/net-tapesoftware-dwl-wm-unstable-v1.xml $@
|
||||||
|
net-tapesoftware-dwl-wm-unstable-v1-protocol.o: net-tapesoftware-dwl-wm-unstable-v1-protocol.h
|
||||||
|
|
||||||
config.h:
|
config.h:
|
||||||
cp config.def.h $@
|
cp config.def.h $@
|
||||||
clean:
|
clean:
|
||||||
|
4
client.h
4
client.h
@ -304,7 +304,9 @@ toplevel_from_popup(struct wlr_xdg_popup *popup)
|
|||||||
while (1) {
|
while (1) {
|
||||||
switch (surface->role) {
|
switch (surface->role) {
|
||||||
case WLR_XDG_SURFACE_ROLE_POPUP:
|
case WLR_XDG_SURFACE_ROLE_POPUP:
|
||||||
if (wlr_surface_is_layer_surface(surface->popup->parent))
|
if (!surface->popup->parent)
|
||||||
|
return NULL;
|
||||||
|
else if (wlr_surface_is_layer_surface(surface->popup->parent))
|
||||||
return wlr_layer_surface_v1_from_wlr_surface(surface->popup->parent)->data;
|
return wlr_layer_surface_v1_from_wlr_surface(surface->popup->parent)->data;
|
||||||
else if (!wlr_surface_is_xdg_surface(surface->popup->parent))
|
else if (!wlr_surface_is_xdg_surface(surface->popup->parent))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -86,8 +86,9 @@ LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE
|
|||||||
static const enum libinput_config_accel_profile accel_profile = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE;
|
static const enum libinput_config_accel_profile accel_profile = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE;
|
||||||
static const double accel_speed = 0.0;
|
static const double accel_speed = 0.0;
|
||||||
|
|
||||||
/* If you want to use the windows key change this to WLR_MODIFIER_LOGO */
|
/* If you want to use the windows key for MODKEY, use WLR_MODIFIER_LOGO */
|
||||||
#define MODKEY WLR_MODIFIER_ALT
|
#define MODKEY WLR_MODIFIER_ALT
|
||||||
|
|
||||||
#define TAGKEYS(KEY,SKEY,TAG) \
|
#define TAGKEYS(KEY,SKEY,TAG) \
|
||||||
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
|
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
|
||||||
{ MODKEY|WLR_MODIFIER_CTRL, KEY, toggleview, {.ui = 1 << TAG} }, \
|
{ MODKEY|WLR_MODIFIER_CTRL, KEY, toggleview, {.ui = 1 << TAG} }, \
|
||||||
|
236
dwl.c
236
dwl.c
@ -48,6 +48,7 @@
|
|||||||
#include <wlr/types/wlr_xdg_shell.h>
|
#include <wlr/types/wlr_xdg_shell.h>
|
||||||
#include <wlr/util/log.h>
|
#include <wlr/util/log.h>
|
||||||
#include <xkbcommon/xkbcommon.h>
|
#include <xkbcommon/xkbcommon.h>
|
||||||
|
#include "net-tapesoftware-dwl-wm-unstable-v1-protocol.h"
|
||||||
#ifdef XWAYLAND
|
#ifdef XWAYLAND
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
#include <wlr/xwayland.h>
|
#include <wlr/xwayland.h>
|
||||||
@ -152,6 +153,7 @@ typedef struct {
|
|||||||
struct wlr_box geom;
|
struct wlr_box geom;
|
||||||
Monitor *mon;
|
Monitor *mon;
|
||||||
struct wlr_scene_node *scene;
|
struct wlr_scene_node *scene;
|
||||||
|
struct wlr_scene_node *popups;
|
||||||
struct wl_list link;
|
struct wl_list link;
|
||||||
int mapped;
|
int mapped;
|
||||||
struct wlr_layer_surface_v1 *layer_surface;
|
struct wlr_layer_surface_v1 *layer_surface;
|
||||||
@ -167,6 +169,12 @@ typedef struct {
|
|||||||
void (*arrange)(Monitor *);
|
void (*arrange)(Monitor *);
|
||||||
} Layout;
|
} Layout;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
struct wl_list link;
|
||||||
|
struct wl_resource *resource;
|
||||||
|
struct Monitor *monitor;
|
||||||
|
} DwlWmMonitor;
|
||||||
|
|
||||||
struct Monitor {
|
struct Monitor {
|
||||||
struct wl_list link;
|
struct wl_list link;
|
||||||
struct wlr_output *wlr_output;
|
struct wlr_output *wlr_output;
|
||||||
@ -176,6 +184,7 @@ struct Monitor {
|
|||||||
struct wlr_box m; /* monitor area, layout-relative */
|
struct wlr_box m; /* monitor area, layout-relative */
|
||||||
struct wlr_box w; /* window area, layout-relative */
|
struct wlr_box w; /* window area, layout-relative */
|
||||||
struct wl_list layers[4]; /* LayerSurface::link */
|
struct wl_list layers[4]; /* LayerSurface::link */
|
||||||
|
struct wl_list dwl_wm_monitor_link;
|
||||||
const Layout *lt[2];
|
const Layout *lt[2];
|
||||||
unsigned int seltags;
|
unsigned int seltags;
|
||||||
unsigned int sellt;
|
unsigned int sellt;
|
||||||
@ -296,6 +305,10 @@ static struct wlr_scene_node *xytonode(double x, double y, struct wlr_surface **
|
|||||||
Client **pc, LayerSurface **pl, double *nx, double *ny);
|
Client **pc, LayerSurface **pl, double *nx, double *ny);
|
||||||
static void zoom(const Arg *arg);
|
static void zoom(const Arg *arg);
|
||||||
|
|
||||||
|
static void dwl_wm_bind(struct wl_client *client, void *data,
|
||||||
|
uint32_t version, uint32_t id);
|
||||||
|
static void dwl_wm_printstatus(Monitor *monitor);
|
||||||
|
|
||||||
/* variables */
|
/* variables */
|
||||||
static const char broken[] = "broken";
|
static const char broken[] = "broken";
|
||||||
static const char *cursor_image = "left_ptr";
|
static const char *cursor_image = "left_ptr";
|
||||||
@ -583,6 +596,7 @@ arrangelayer(Monitor *m, struct wl_list *list, struct wlr_box *usable_area, int
|
|||||||
state->margin.top, state->margin.right,
|
state->margin.top, state->margin.right,
|
||||||
state->margin.bottom, state->margin.left);
|
state->margin.bottom, state->margin.left);
|
||||||
wlr_scene_node_set_position(layersurface->scene, box.x, box.y);
|
wlr_scene_node_set_position(layersurface->scene, box.x, box.y);
|
||||||
|
wlr_scene_node_set_position(layersurface->popups, box.x, box.y);
|
||||||
wlr_layer_surface_v1_configure(wlr_layer_surface, box.width, box.height);
|
wlr_layer_surface_v1_configure(wlr_layer_surface, box.width, box.height);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -760,6 +774,7 @@ cleanupkeyboard(struct wl_listener *listener, void *data)
|
|||||||
void
|
void
|
||||||
cleanupmon(struct wl_listener *listener, void *data)
|
cleanupmon(struct wl_listener *listener, void *data)
|
||||||
{
|
{
|
||||||
|
DwlWmMonitor *mon, *montmp;
|
||||||
Monitor *m = wl_container_of(listener, m, destroy);
|
Monitor *m = wl_container_of(listener, m, destroy);
|
||||||
LayerSurface *l, *tmp;
|
LayerSurface *l, *tmp;
|
||||||
int i;
|
int i;
|
||||||
@ -776,6 +791,10 @@ cleanupmon(struct wl_listener *listener, void *data)
|
|||||||
wl_list_remove(&m->link);
|
wl_list_remove(&m->link);
|
||||||
m->wlr_output->data = NULL;
|
m->wlr_output->data = NULL;
|
||||||
wlr_output_layout_remove(output_layout, m->wlr_output);
|
wlr_output_layout_remove(output_layout, m->wlr_output);
|
||||||
|
wl_list_for_each_safe(mon, montmp, &m->dwl_wm_monitor_link, link) {
|
||||||
|
wl_resource_set_user_data(mon->resource, NULL);
|
||||||
|
free(mon);
|
||||||
|
}
|
||||||
wlr_scene_output_destroy(m->scene_output);
|
wlr_scene_output_destroy(m->scene_output);
|
||||||
|
|
||||||
closemon(m);
|
closemon(m);
|
||||||
@ -823,10 +842,14 @@ commitlayersurfacenotify(struct wl_listener *listener, void *data)
|
|||||||
if (layers[wlr_layer_surface->current.layer] != layersurface->scene->parent) {
|
if (layers[wlr_layer_surface->current.layer] != layersurface->scene->parent) {
|
||||||
wlr_scene_node_reparent(layersurface->scene,
|
wlr_scene_node_reparent(layersurface->scene,
|
||||||
layers[wlr_layer_surface->current.layer]);
|
layers[wlr_layer_surface->current.layer]);
|
||||||
|
wlr_scene_node_reparent(layersurface->popups,
|
||||||
|
layers[wlr_layer_surface->current.layer]);
|
||||||
wl_list_remove(&layersurface->link);
|
wl_list_remove(&layersurface->link);
|
||||||
wl_list_insert(&layersurface->mon->layers[wlr_layer_surface->current.layer],
|
wl_list_insert(&layersurface->mon->layers[wlr_layer_surface->current.layer],
|
||||||
&layersurface->link);
|
&layersurface->link);
|
||||||
}
|
}
|
||||||
|
if (wlr_layer_surface->current.layer < ZWLR_LAYER_SHELL_V1_LAYER_TOP)
|
||||||
|
wlr_scene_node_reparent(layersurface->popups, layers[LyrTop]);
|
||||||
|
|
||||||
if (wlr_layer_surface->current.committed == 0
|
if (wlr_layer_surface->current.committed == 0
|
||||||
&& layersurface->mapped == wlr_layer_surface->mapped)
|
&& layersurface->mapped == wlr_layer_surface->mapped)
|
||||||
@ -920,10 +943,11 @@ createlayersurface(struct wl_listener *listener, void *data)
|
|||||||
layersurface->mon = wlr_layer_surface->output->data;
|
layersurface->mon = wlr_layer_surface->output->data;
|
||||||
wlr_layer_surface->data = layersurface;
|
wlr_layer_surface->data = layersurface;
|
||||||
|
|
||||||
layersurface->scene = wlr_layer_surface->surface->data =
|
layersurface->scene = wlr_scene_subsurface_tree_create(
|
||||||
wlr_scene_subsurface_tree_create(layers[wlr_layer_surface->pending.layer],
|
layers[wlr_layer_surface->pending.layer], wlr_layer_surface->surface);
|
||||||
wlr_layer_surface->surface);
|
|
||||||
layersurface->scene->data = layersurface;
|
layersurface->scene->data = layersurface;
|
||||||
|
layersurface->popups = wlr_layer_surface->surface->data =
|
||||||
|
&wlr_scene_tree_create(layers[wlr_layer_surface->pending.layer])->node;
|
||||||
|
|
||||||
wl_list_insert(&layersurface->mon->layers[wlr_layer_surface->pending.layer],
|
wl_list_insert(&layersurface->mon->layers[wlr_layer_surface->pending.layer],
|
||||||
&layersurface->link);
|
&layersurface->link);
|
||||||
@ -947,6 +971,7 @@ createmon(struct wl_listener *listener, void *data)
|
|||||||
const MonitorRule *r;
|
const MonitorRule *r;
|
||||||
size_t i;
|
size_t i;
|
||||||
Monitor *m = wlr_output->data = ecalloc(1, sizeof(*m));
|
Monitor *m = wlr_output->data = ecalloc(1, sizeof(*m));
|
||||||
|
wl_list_init(&m->dwl_wm_monitor_link);
|
||||||
m->wlr_output = wlr_output;
|
m->wlr_output = wlr_output;
|
||||||
|
|
||||||
wlr_output_init_render(wlr_output, alloc, drw);
|
wlr_output_init_render(wlr_output, alloc, drw);
|
||||||
@ -1009,14 +1034,10 @@ createnotify(struct wl_listener *listener, void *data)
|
|||||||
if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) {
|
if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) {
|
||||||
struct wlr_box box;
|
struct wlr_box box;
|
||||||
LayerSurface *l = toplevel_from_popup(xdg_surface->popup);
|
LayerSurface *l = toplevel_from_popup(xdg_surface->popup);
|
||||||
|
if (!xdg_surface->popup->parent)
|
||||||
|
return;
|
||||||
xdg_surface->surface->data = wlr_scene_xdg_surface_create(
|
xdg_surface->surface->data = wlr_scene_xdg_surface_create(
|
||||||
xdg_surface->popup->parent->data, xdg_surface);
|
xdg_surface->popup->parent->data, xdg_surface);
|
||||||
/* Raise to top layer if the inmediate parent of the popup is on
|
|
||||||
* bottom/background layer, which will cause popups appear below the
|
|
||||||
* x{dg,wayland} clients */
|
|
||||||
if (wlr_surface_is_layer_surface(xdg_surface->popup->parent) && l
|
|
||||||
&& l->layer_surface->current.layer < ZWLR_LAYER_SHELL_V1_LAYER_TOP)
|
|
||||||
wlr_scene_node_reparent(xdg_surface->surface->data, layers[LyrTop]);
|
|
||||||
/* Probably the check of `l` is useless, the only thing that can be NULL
|
/* Probably the check of `l` is useless, the only thing that can be NULL
|
||||||
* is its monitor */
|
* is its monitor */
|
||||||
if (!l || !l->mon)
|
if (!l || !l->mon)
|
||||||
@ -1158,7 +1179,7 @@ dirtomon(enum wlr_direction dir)
|
|||||||
return next->data;
|
return next->data;
|
||||||
if (wlr_output_layout_get(output_layout, selmon->wlr_output)
|
if (wlr_output_layout_get(output_layout, selmon->wlr_output)
|
||||||
&& (next = wlr_output_layout_farthest_output(output_layout,
|
&& (next = wlr_output_layout_farthest_output(output_layout,
|
||||||
dir ^ (WLR_DIRECTION_LEFT|WLR_DIRECTION_RIGHT),
|
dir ^ (WLR_DIRECTION_UP|WLR_DIRECTION_DOWN|WLR_DIRECTION_LEFT|WLR_DIRECTION_RIGHT),
|
||||||
selmon->wlr_output, selmon->m.x, selmon->m.y)))
|
selmon->wlr_output, selmon->m.x, selmon->m.y)))
|
||||||
return next->data;
|
return next->data;
|
||||||
return selmon;
|
return selmon;
|
||||||
@ -1763,6 +1784,7 @@ printstatus(void)
|
|||||||
printf("%s tags %u %u %u %u\n", m->wlr_output->name, occ, m->tagset[m->seltags],
|
printf("%s tags %u %u %u %u\n", m->wlr_output->name, occ, m->tagset[m->seltags],
|
||||||
sel, urg);
|
sel, urg);
|
||||||
printf("%s layout %s\n", m->wlr_output->name, m->lt[m->sellt]->symbol);
|
printf("%s layout %s\n", m->wlr_output->name, m->lt[m->sellt]->symbol);
|
||||||
|
dwl_wm_printstatus(m);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2213,6 +2235,7 @@ setup(void)
|
|||||||
wl_signal_add(&output_mgr->events.test, &output_mgr_test);
|
wl_signal_add(&output_mgr->events.test, &output_mgr_test);
|
||||||
|
|
||||||
wlr_scene_set_presentation(scene, wlr_presentation_create(dpy, backend));
|
wlr_scene_set_presentation(scene, wlr_presentation_create(dpy, backend));
|
||||||
|
wl_global_create(dpy, &znet_tapesoftware_dwl_wm_v1_interface, 1, NULL, dwl_wm_bind);
|
||||||
|
|
||||||
#ifdef XWAYLAND
|
#ifdef XWAYLAND
|
||||||
/*
|
/*
|
||||||
@ -2262,9 +2285,6 @@ void
|
|||||||
startdrag(struct wl_listener *listener, void *data)
|
startdrag(struct wl_listener *listener, void *data)
|
||||||
{
|
{
|
||||||
struct wlr_drag *drag = data;
|
struct wlr_drag *drag = data;
|
||||||
/* During drag the focus isn't sent to clients, this causes that
|
|
||||||
* we don't update border color acording the pointer coordinates */
|
|
||||||
focusclient(NULL, 0);
|
|
||||||
|
|
||||||
if (!drag->icon)
|
if (!drag->icon)
|
||||||
return;
|
return;
|
||||||
@ -2726,3 +2746,193 @@ main(int argc, char *argv[])
|
|||||||
usage:
|
usage:
|
||||||
die("Usage: %s [-v] [-s startup command]", argv[0]);
|
die("Usage: %s [-v] [-s startup command]", argv[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* dwl_wm_monitor_v1 */
|
||||||
|
static void
|
||||||
|
dwl_wm_monitor_handle_release(struct wl_client *client, struct wl_resource *resource)
|
||||||
|
{
|
||||||
|
wl_resource_destroy(resource);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
dwl_wm_monitor_handle_destroy(struct wl_resource *resource)
|
||||||
|
{
|
||||||
|
DwlWmMonitor *mon = wl_resource_get_user_data(resource);
|
||||||
|
if (mon) {
|
||||||
|
wl_list_remove(&mon->link);
|
||||||
|
free(mon);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
dwl_wm_printstatus_to(Monitor *m, const DwlWmMonitor *mon)
|
||||||
|
{
|
||||||
|
Client *c, *focused;
|
||||||
|
int tagmask, state, numclients, focused_client;
|
||||||
|
focused = focustop(m);
|
||||||
|
znet_tapesoftware_dwl_wm_monitor_v1_send_selected(mon->resource, m == selmon);
|
||||||
|
|
||||||
|
for (int tag = 0; tag<LENGTH(tags); tag++) {
|
||||||
|
numclients = state = 0;
|
||||||
|
focused_client = -1;
|
||||||
|
tagmask = 1 << tag;
|
||||||
|
if ((tagmask & m->tagset[m->seltags]) != 0)
|
||||||
|
state = state | ZNET_TAPESOFTWARE_DWL_WM_MONITOR_V1_TAG_STATE_ACTIVE;
|
||||||
|
wl_list_for_each(c, &clients, link) {
|
||||||
|
if (c->mon != m)
|
||||||
|
continue;
|
||||||
|
if (!(c->tags & tagmask))
|
||||||
|
continue;
|
||||||
|
if (c == focused)
|
||||||
|
focused_client = numclients;
|
||||||
|
numclients++;
|
||||||
|
if (c->isurgent)
|
||||||
|
state = state | ZNET_TAPESOFTWARE_DWL_WM_MONITOR_V1_TAG_STATE_URGENT;
|
||||||
|
}
|
||||||
|
znet_tapesoftware_dwl_wm_monitor_v1_send_tag(mon->resource,
|
||||||
|
tag, state, numclients, focused_client);
|
||||||
|
}
|
||||||
|
znet_tapesoftware_dwl_wm_monitor_v1_send_layout(mon->resource, m->lt[m->sellt] - layouts);
|
||||||
|
znet_tapesoftware_dwl_wm_monitor_v1_send_title(mon->resource,
|
||||||
|
focused ? client_get_title(focused) : "");
|
||||||
|
znet_tapesoftware_dwl_wm_monitor_v1_send_frame(mon->resource);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
dwl_wm_printstatus(Monitor *m)
|
||||||
|
{
|
||||||
|
DwlWmMonitor *mon;
|
||||||
|
wl_list_for_each(mon, &m->dwl_wm_monitor_link, link) {
|
||||||
|
dwl_wm_printstatus_to(m, mon);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
dwl_wm_monitor_handle_set_tags(struct wl_client *client, struct wl_resource *resource,
|
||||||
|
uint32_t t, uint32_t toggle_tagset)
|
||||||
|
{
|
||||||
|
DwlWmMonitor *mon;
|
||||||
|
Monitor *m;
|
||||||
|
mon = wl_resource_get_user_data(resource);
|
||||||
|
if (!mon)
|
||||||
|
return;
|
||||||
|
m = mon->monitor;
|
||||||
|
if ((t & TAGMASK) == m->tagset[m->seltags])
|
||||||
|
return;
|
||||||
|
if (toggle_tagset)
|
||||||
|
m->seltags ^= 1;
|
||||||
|
if (t & TAGMASK)
|
||||||
|
m->tagset[m->seltags] = t & TAGMASK;
|
||||||
|
|
||||||
|
focusclient(focustop(m), 1);
|
||||||
|
arrange(m);
|
||||||
|
printstatus();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
dwl_wm_monitor_handle_set_layout(struct wl_client *client, struct wl_resource *resource,
|
||||||
|
uint32_t layout)
|
||||||
|
{
|
||||||
|
DwlWmMonitor *mon;
|
||||||
|
Monitor *m;
|
||||||
|
mon = wl_resource_get_user_data(resource);
|
||||||
|
if (!mon)
|
||||||
|
return;
|
||||||
|
m = mon->monitor;
|
||||||
|
if (layout >= LENGTH(layouts))
|
||||||
|
return;
|
||||||
|
if (layout != m->lt[m->sellt] - layouts)
|
||||||
|
m->sellt ^= 1;
|
||||||
|
|
||||||
|
m->lt[m->sellt] = &layouts[layout];
|
||||||
|
arrange(m);
|
||||||
|
printstatus();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
dwl_wm_monitor_handle_set_client_tags(struct wl_client *client, struct wl_resource *resource,
|
||||||
|
uint32_t and, uint32_t xor)
|
||||||
|
{
|
||||||
|
DwlWmMonitor *mon;
|
||||||
|
Client *sel;
|
||||||
|
unsigned int newtags;
|
||||||
|
mon = wl_resource_get_user_data(resource);
|
||||||
|
if (!mon)
|
||||||
|
return;
|
||||||
|
sel = focustop(mon->monitor);
|
||||||
|
if (!sel)
|
||||||
|
return;
|
||||||
|
newtags = (sel->tags & and) ^ xor;
|
||||||
|
if (newtags) {
|
||||||
|
sel->tags = newtags;
|
||||||
|
focusclient(focustop(selmon), 1);
|
||||||
|
arrange(selmon);
|
||||||
|
printstatus();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct znet_tapesoftware_dwl_wm_monitor_v1_interface dwl_wm_monitor_implementation = {
|
||||||
|
.release = dwl_wm_monitor_handle_release,
|
||||||
|
.set_tags = dwl_wm_monitor_handle_set_tags,
|
||||||
|
.set_layout = dwl_wm_monitor_handle_set_layout,
|
||||||
|
.set_client_tags = dwl_wm_monitor_handle_set_client_tags,
|
||||||
|
};
|
||||||
|
|
||||||
|
/* dwl_wm_v1 */
|
||||||
|
static void
|
||||||
|
dwl_wm_handle_release(struct wl_client *client, struct wl_resource *resource)
|
||||||
|
{
|
||||||
|
wl_resource_destroy(resource);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
dwl_wm_handle_get_monitor(struct wl_client *client, struct wl_resource *resource,
|
||||||
|
uint32_t id, struct wl_resource *output)
|
||||||
|
{
|
||||||
|
DwlWmMonitor *dwl_wm_monitor;
|
||||||
|
struct wlr_output *wlr_output = wlr_output_from_resource(output);
|
||||||
|
struct Monitor *m = wlr_output->data;
|
||||||
|
struct wl_resource *dwlOutputResource = wl_resource_create(client,
|
||||||
|
&znet_tapesoftware_dwl_wm_monitor_v1_interface, wl_resource_get_version(resource), id);
|
||||||
|
if (!resource) {
|
||||||
|
wl_client_post_no_memory(client);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
dwl_wm_monitor = calloc(1, sizeof(DwlWmMonitor));
|
||||||
|
dwl_wm_monitor->resource = dwlOutputResource;
|
||||||
|
dwl_wm_monitor->monitor = m;
|
||||||
|
wl_resource_set_implementation(dwlOutputResource, &dwl_wm_monitor_implementation,
|
||||||
|
dwl_wm_monitor, dwl_wm_monitor_handle_destroy);
|
||||||
|
wl_list_insert(&m->dwl_wm_monitor_link, &dwl_wm_monitor->link);
|
||||||
|
dwl_wm_printstatus_to(m, dwl_wm_monitor);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
dwl_wm_handle_destroy(struct wl_resource *resource)
|
||||||
|
{
|
||||||
|
/* no state to destroy */
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct znet_tapesoftware_dwl_wm_v1_interface dwl_wm_implementation = {
|
||||||
|
.release = dwl_wm_handle_release,
|
||||||
|
.get_monitor = dwl_wm_handle_get_monitor,
|
||||||
|
};
|
||||||
|
|
||||||
|
static void
|
||||||
|
dwl_wm_bind(struct wl_client *client, void *data,
|
||||||
|
uint32_t version, uint32_t id)
|
||||||
|
{
|
||||||
|
struct wl_resource *resource = wl_resource_create(client,
|
||||||
|
&znet_tapesoftware_dwl_wm_v1_interface, version, id);
|
||||||
|
if (!resource) {
|
||||||
|
wl_client_post_no_memory(client);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
wl_resource_set_implementation(resource, &dwl_wm_implementation, NULL, dwl_wm_handle_destroy);
|
||||||
|
|
||||||
|
for (int i = 0; i < LENGTH(tags); i++)
|
||||||
|
znet_tapesoftware_dwl_wm_v1_send_tag(resource, tags[i]);
|
||||||
|
for (int i = 0; i < LENGTH(layouts); i++)
|
||||||
|
znet_tapesoftware_dwl_wm_v1_send_layout(resource, layouts[i].symbol);
|
||||||
|
}
|
||||||
|
164
protocols/net-tapesoftware-dwl-wm-unstable-v1.xml
Normal file
164
protocols/net-tapesoftware-dwl-wm-unstable-v1.xml
Normal file
@ -0,0 +1,164 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<protocol name="net_tapesoftware_dwl_wm_unstable_v1">
|
||||||
|
<copyright>
|
||||||
|
Copyright (c) 2021 Raphael Robatsch
|
||||||
|
|
||||||
|
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 (including the
|
||||||
|
next paragraph) 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.
|
||||||
|
</copyright>
|
||||||
|
|
||||||
|
<interface name="znet_tapesoftware_dwl_wm_v1" version="1">
|
||||||
|
<description summary="control the dwl state">
|
||||||
|
This interface is exposed as a global in the wl_registry.
|
||||||
|
|
||||||
|
Clients can use this protocol to receive updates of the window manager
|
||||||
|
state (active tags, active layout, and focused window).
|
||||||
|
Clients can also control this state.
|
||||||
|
|
||||||
|
After binding, the client will receive the available tags and layouts
|
||||||
|
with the 'tag' and 'layout' events. These can be used in subsequent
|
||||||
|
dwl_wm_monitor_v1.set_tags/set_layout requests, and to interpret the
|
||||||
|
dwl_wm_monitor_v1.layout/tag events.
|
||||||
|
</description>
|
||||||
|
|
||||||
|
<request name="release" type="destructor">
|
||||||
|
<description summary="release dwl_wm">
|
||||||
|
This request indicates that the client will not use the dwl_wm
|
||||||
|
object any more. Objects that have been created through this instance
|
||||||
|
are not affected.
|
||||||
|
</description>
|
||||||
|
</request>
|
||||||
|
|
||||||
|
<request name="get_monitor">
|
||||||
|
<description summary="gets a dwl monitor from an output">
|
||||||
|
Gets a dwl monitor for the specified output. The window manager
|
||||||
|
state on the output can be controlled using the monitor.
|
||||||
|
</description>
|
||||||
|
<arg name="id" type="new_id" interface="znet_tapesoftware_dwl_wm_monitor_v1" />
|
||||||
|
<arg name="output" type="object" interface="wl_output" />
|
||||||
|
</request>
|
||||||
|
|
||||||
|
<event name="tag">
|
||||||
|
<description summary="announces the presence of a tag">
|
||||||
|
This event is sent immediately after binding.
|
||||||
|
A roundtrip after binding guarantees that the client has received all tags.
|
||||||
|
</description>
|
||||||
|
<arg name="name" type="string"/>
|
||||||
|
</event>
|
||||||
|
|
||||||
|
<event name="layout">
|
||||||
|
<description summary="announces the presence of a layout">
|
||||||
|
This event is sent immediately after binding.
|
||||||
|
A roundtrip after binding guarantees that the client has received all layouts.
|
||||||
|
</description>
|
||||||
|
<arg name="name" type="string"/>
|
||||||
|
</event>
|
||||||
|
</interface>
|
||||||
|
|
||||||
|
<interface name="znet_tapesoftware_dwl_wm_monitor_v1" version="1">
|
||||||
|
<description summary="control one monitor">
|
||||||
|
Observes and controls one monitor.
|
||||||
|
|
||||||
|
Events are double-buffered: Clients should cache all events and only
|
||||||
|
redraw themselves once the 'frame' event is sent.
|
||||||
|
|
||||||
|
Requests are not double-buffered: The compositor will update itself
|
||||||
|
immediately.
|
||||||
|
</description>
|
||||||
|
|
||||||
|
<enum name="tag_state">
|
||||||
|
<entry name="none" value="0" summary="no state"/>
|
||||||
|
<entry name="active" value="1" summary="tag is active"/>
|
||||||
|
<entry name="urgent" value="2" summary="tag has at least one urgent client"/>
|
||||||
|
</enum>
|
||||||
|
|
||||||
|
<request name="release" type="destructor">
|
||||||
|
<description summary="release dwl_monitor">
|
||||||
|
This request indicates that the client is done with this dwl_monitor.
|
||||||
|
All further requests are ignored.
|
||||||
|
</description>
|
||||||
|
</request>
|
||||||
|
|
||||||
|
<event name="selected">
|
||||||
|
<description summary="updates the selected state of the monitor">
|
||||||
|
If 'selected' is nonzero, this monitor is the currently selected one.
|
||||||
|
</description>
|
||||||
|
<arg name="selected" type="uint"/>
|
||||||
|
</event>
|
||||||
|
|
||||||
|
<event name="tag">
|
||||||
|
<description summary="updates the state of one tag">
|
||||||
|
Announces the update of a tag. num_clients and focused_client can be
|
||||||
|
used to draw client indicators.
|
||||||
|
</description>
|
||||||
|
<arg name="tag" type="uint" summary="index of a tag received by the dwl_wm_v1.tag event." />
|
||||||
|
<arg name="state" type="uint" enum="tag_state"/>
|
||||||
|
<arg name="num_clients" type="uint" summary="number of clients on this tag"/>
|
||||||
|
<arg name="focused_client" type="int" summary="out of num_clients. -1 if there is no focused client"/>
|
||||||
|
</event>
|
||||||
|
|
||||||
|
<event name="layout">
|
||||||
|
<description summary="updates the selected layout">
|
||||||
|
Announces the update of the selected layout.
|
||||||
|
</description>
|
||||||
|
<arg name="layout" type="uint" summary="index of a layout received by the dwl_wm_v1.layout event."/>
|
||||||
|
</event>
|
||||||
|
|
||||||
|
<event name="title">
|
||||||
|
<description summary="updates the focused client">
|
||||||
|
Announces the update of the selected client.
|
||||||
|
</description>
|
||||||
|
<arg name="title" type="string"/>
|
||||||
|
</event>
|
||||||
|
|
||||||
|
<event name="frame">
|
||||||
|
<description summary="end of status update sequence">
|
||||||
|
Sent after all other events belonging to the status update has been sent.
|
||||||
|
Clients should redraw themselves now.
|
||||||
|
</description>
|
||||||
|
</event>
|
||||||
|
|
||||||
|
<request name="set_tags">
|
||||||
|
<description summary="sets the active tags on this monitor.">
|
||||||
|
Changes are applied immediately.
|
||||||
|
</description>
|
||||||
|
<arg name="tagmask" type="uint" summary="bitmask of the tags that should be set."/>
|
||||||
|
<arg name="toggle_tagset" type="uint"/>
|
||||||
|
</request>
|
||||||
|
|
||||||
|
<request name="set_client_tags">
|
||||||
|
<description summary="updates the tags of the focused client.">
|
||||||
|
tags are updated as follows:
|
||||||
|
new_tags = (current_tags AND and_tags) XOR xor_tags
|
||||||
|
|
||||||
|
Changes are applied immediately.
|
||||||
|
</description>
|
||||||
|
<arg name="and_tags" type="uint"/>
|
||||||
|
<arg name="xor_tags" type="uint"/>
|
||||||
|
</request>
|
||||||
|
|
||||||
|
<request name="set_layout">
|
||||||
|
<description summary="sets the active layout on this monitor.">
|
||||||
|
Changes are applied immediately.
|
||||||
|
</description>
|
||||||
|
<arg name="layout" type="uint" summary="index of a layout received by the dwl_wm_v1.layout event."/>
|
||||||
|
</request>
|
||||||
|
</interface>
|
||||||
|
</protocol>
|
Loading…
Reference in New Issue
Block a user