Sivecano/dwl - Change FUZEZTLBNTVGUNLBGFLMVZOHLGMMHFPQD7USP4JYMGGVXBL2EUBQC

use output layout for dirtomon

No need to track our own order; wlroots has a reasonable default for us already.

Created by Devin J. Pohly on January 6, 2021

FUZEZTLBNTVGUNLBGFLMVZOHLGMMHFPQD7USP4JYMGGVXBL2EUBQC

Dependencies

In channels

main

Change contents

Replacement in dwl.c at line 238 [5.4]
∅:D[3.105] → [4.1:36]
∅:D[6.108] → [4.1:36]
∅:D[7.279] → [4.1:36]
B:BD[8.613] → [4.1:36]
```
static Monitor *dirtomon(int dir);
```
[7.279]
[9.96]
```
static Monitor *dirtomon(enum wlr_direction dir);
```
Replacement in dwl.c at line 1099 [5.4]
B:BD[4.171] → [4.171:189]
```
dirtomon(int dir)
```
[4.171]
[4.189]
```
dirtomon(enum wlr_direction dir)
```

Replacement in dwl.c at line 1101 [5.4]

B:BD[4.191] → [4.191:501]

B:BD[4.501] → [10.109:112]

	Monitor *m;
	if (dir > 0) {
		if (selmon->link.next == &mons)
			return wl_container_of(mons.next, m, link);
		return wl_container_of(selmon->link.next, m, link);
	} else {
		if (selmon->link.prev == &mons)
			return wl_container_of(mons.prev, m, link);
		return wl_container_of(selmon->link.prev, m, link);
	}

[4.191]

[10.112]

	struct wlr_output *next;
	if ((next = wlr_output_layout_adjacent_output(output_layout,
			dir, selmon->wlr_output, selmon->m.x, selmon->m.y)))
		return next->data;
	if ((next = wlr_output_layout_farthest_output(output_layout,
			dir ^ (WLR_DIRECTION_LEFT|WLR_DIRECTION_RIGHT),
			selmon->wlr_output, selmon->m.x, selmon->m.y)))
		return next->data;
	return selmon;

Deletion in config.def.h at line 35 [5.36369]

B:BD[11.46] → [2.353:482]

	/* the order in which monitors are defined here affects the order in which
	 * focusmon and tagmon cycle trough the monitors */

Replacement in config.def.h at line 88 [5.36369]

B:BD[12.1577] → [4.950:1266]

	{ MODKEY,                    XKB_KEY_comma,      focusmon,       {.i = -1} },
	{ MODKEY,                    XKB_KEY_period,     focusmon,       {.i = +1} },
	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less,       tagmon,         {.i = -1} },
	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater,    tagmon,         {.i = +1} },

[12.1577]

	{ MODKEY,                    XKB_KEY_comma,      focusmon,       {.i = WLR_DIRECTION_LEFT} },
	{ MODKEY,                    XKB_KEY_period,     focusmon,       {.i = WLR_DIRECTION_RIGHT} },
	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less,       tagmon,         {.i = WLR_DIRECTION_LEFT} },
	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater,    tagmon,         {.i = WLR_DIRECTION_RIGHT} },