2 files changed, 19 insertions(+), 18 deletions(-)

M config.def.h
M dwl.c

@@ 47,18 47,18 @@ static const Layout layouts[] = {
 */
 /* NOTE: ALWAYS add a fallback rule, even if you are completely sure it won't be used */
 static const MonitorRule monrules[] = {
-	/* name       scale rotate/reflect                x    y */
+	/* name   scale  rotate/reflect                x    y */
 	/* example of a HiDPI laptop monitor:
-	{ "eDP-1",    2,    WL_OUTPUT_TRANSFORM_NORMAL,   -1,  -1 },
+	{ "eDP-1",    2, WL_OUTPUT_TRANSFORM_NORMAL,   -1,  -1 },
 	*/
 	/* defaults */
-	{ NULL,       1,    WL_OUTPUT_TRANSFORM_NORMAL,   -1,  -1 },
+	{ NULL,       1, WL_OUTPUT_TRANSFORM_NORMAL,   -1,  -1 },
 };
 
 static const TagRule tagrules[] = {
-    /* tag     mfact      nmaster   layout */
-	/* defaults */
-    { 0,       0.55,      1,        &layouts[0] }
+  /* tag     mfact      nmaster   layout */
+  /* defaults */
+  { 0,       0.55,      1,        &layouts[0] }
 };
 
 /* keyboard */

@@ 1673,15 1673,14 @@ dwl_ipc_output_set_layout(struct wl_client *client, struct wl_resource *resource
 	if (!ipc_output)
 		return;
 
-	monitor = ipc_output->mon;
 	if (index >= LENGTH(layouts))
 		return;
-	if (index != monitor->lt[monitor->sellt] - layouts)
-		monitor->sellt ^= 1;
 
-	monitor->lt[monitor->sellt] = &layouts[index];
-	arrange(monitor);
-	printstatus();
+	monitor = selmon;
+	selmon = ipc_output->mon;
+	setlayout(&(Arg){.v = &layouts[index]});
+	selmon = monitor;
+	focusclient(focustop(selmon), 1);
 }
 
 void


@@ 1698,13 1697,14 @@ dwl_ipc_output_set_tags(struct wl_client *client, struct wl_resource *resource, 
 
 	if (!newtags || newtags == monitor->tagset[monitor->seltags])
 		return;
-	if (toggle_tagset)
-		monitor->seltags ^= 1;
+	/* if (!toggle_tagset) */
+	/* 	monitor->seltags ^= 1; */
 
-	monitor->tagset[monitor->seltags] = newtags;
-	focusclient(focustop(monitor), 1);
-	arrange(monitor);
-	printstatus();
+	monitor = selmon;
+	selmon = ipc_output->mon;
+	view(&(Arg){.ui = newtags});
+	selmon = monitor;
+	focusclient(focustop(selmon), 1);
 }
 
 void


@@ 3818,6 3818,7 @@ zoom(const Arg *arg)
 }
 
 #ifdef XWAYLAND
+
 void
 activatex11(struct wl_listener *listener, void *data)
 {