Sivecano/dwl - Change BFWKVWAIUKHCZVRA62GW6QZUEUKQLW365HUWIVKTEIPJNJSOZBAQC

let's not alienate the dwm folks

Fix style.

Created by Devin J. Pohly on December 24, 2020

BFWKVWAIUKHCZVRA62GW6QZUEUKQLW365HUWIVKTEIPJNJSOZBAQC

Dependencies

In channels

main

Change contents

Insertion in dwl.c at line 158 [7.4]

[5.19]

[6.14763]


typedef struct {
	uint32_t singular_anchor;
	uint32_t anchor_triplet;
	int *positive_axis;
	int *negative_axis;
	int margin;
} Edge;

Insertion in dwl.c at line 407 [7.4]
[6.15855]
[8.4]
```
	Edge edges[4];
```

Replacement in dwl.c at line 412 [7.4]

∅:D[8.36] → [6.15855:15978]

B:BD[6.15855] → [6.15855:15978]

B:BD[6.15978] → [8.37:1328]

	struct {
		uint32_t singular_anchor;
		uint32_t anchor_triplet;
		int *positive_axis;
		int *negative_axis;
		int margin;
	} edges[] = {
		// Top
		{
			.singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP,
			.anchor_triplet =
				ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
				ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
				ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP,
			.positive_axis = &usable_area->y,
			.negative_axis = &usable_area->height,
			.margin = margin_top,
		},
		// Bottom
		{
			.singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
			.anchor_triplet =
				ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
				ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
				ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
			.positive_axis = NULL,
			.negative_axis = &usable_area->height,
			.margin = margin_bottom,
		},
		// Left
		{
			.singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT,
			.anchor_triplet =
				ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
				ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
				ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
			.positive_axis = &usable_area->x,
			.negative_axis = &usable_area->width,
			.margin = margin_left,
		},
		// Right
		{
			.singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT,
			.anchor_triplet =
				ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
				ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
				ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
			.positive_axis = NULL,
			.negative_axis = &usable_area->width,
			.margin = margin_right,
		},
	};

[8.36]

[6.17352]

	// Top
	edges[0].singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP;
	edges[0].anchor_triplet = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
		ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
		ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP;
	edges[0].positive_axis = &usable_area->y;
	edges[0].negative_axis = &usable_area->height;
	edges[0].margin = margin_top;
	// Bottom
	edges[1].singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
	edges[1].anchor_triplet = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
		ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
		ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
	edges[1].positive_axis = NULL;
	edges[1].negative_axis = &usable_area->height;
	edges[1].margin = margin_bottom;
	// Left
	edges[2].singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT;
	edges[2].anchor_triplet = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
		ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
		ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
	edges[2].positive_axis = &usable_area->x;
	edges[2].negative_axis = &usable_area->width;
	edges[2].margin = margin_left;
	// Right
	edges[3].singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
	edges[3].anchor_triplet = ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
		ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
		ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
	edges[3].positive_axis = NULL;
	edges[3].negative_axis = &usable_area->width;
	edges[3].margin = margin_right;

Insertion in dwl.c at line 465 [7.4]

[8.1357]

[9.834]

	unsigned int i, newtags = 0;
	const Rule *r;
	Monitor *mon = selmon, *m;

Deletion in dwl.c at line 484 [7.4]

B:BD[10.528] → [8.1358:1432]

	unsigned int i, newtags = 0;
	const Rule *r;
	Monitor *mon = selmon, *m;

Insertion in dwl.c at line 517 [7.4]
[5.353]
[6.18167]
```
		struct wlr_box bounds;
```

Insertion in dwl.c at line 522 [7.4]

[6.18266]

[6.18475]

		const uint32_t both_horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
			| ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
		const uint32_t both_vert = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP
			| ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;

Replacement in dwl.c at line 530 [7.4]

B:BD[6.18538] → [8.1433:1518]

		struct wlr_box bounds = state->exclusive_zone == -1 ?
			full_area : *usable_area;

[6.18538]

[6.18605]

		bounds = state->exclusive_zone == -1 ? full_area : *usable_area;

Deletion in dwl.c at line 533 [7.4]

B:BD[6.18627] → [8.1519:1624]

		const uint32_t both_horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
			| ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;

Deletion in dwl.c at line 544 [7.4]

B:BD[6.19037] → [8.1625:1729]

		const uint32_t both_vert = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP
			| ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;

Insertion in dwl.c at line 588 [7.4]

[11.74]

[6.20759]

	uint32_t layers_above_shell[] = {
		ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY,
		ZWLR_LAYER_SHELL_V1_LAYER_TOP,
	};
	size_t nlayers = LENGTH(layers_above_shell);
	LayerSurface *layersurface;
	struct wlr_keyboard *kb = wlr_seat_get_keyboard(seat);

Deletion in dwl.c at line 622 [7.4]

B:BD[6.21996] → [8.1730:1970]

	uint32_t layers_above_shell[] = {
		ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY,
		ZWLR_LAYER_SHELL_V1_LAYER_TOP,
	};
	size_t nlayers = LENGTH(layers_above_shell);
	LayerSurface *layersurface;
	struct wlr_keyboard *kb = wlr_seat_get_keyboard(seat);

Insertion in dwl.c at line 654 [7.4]

[12.3537]

[13.2561]

	struct wlr_keyboard *keyboard;
	uint32_t mods;
	Client *c;
	const Button *b;

Deletion in dwl.c at line 664 [7.4]
B:BD[14.116] → [8.1971:1984]
```
		Client *c;
```

Replacement in dwl.c at line 667 [7.4]

B:BD[14.297] → [8.1985:2123]

		struct wlr_keyboard* keyboard = wlr_seat_get_keyboard(seat);
		uint32_t mods = wlr_keyboard_get_modifiers(keyboard);
		const Button *b;

[14.297]

[15.71]

		keyboard = wlr_seat_get_keyboard(seat);
		mods = wlr_keyboard_get_modifiers(keyboard);

Insertion in dwl.c at line 735 [7.4]
[16.70]
[17.232]
```
	int nmons, i = 0;
```
Replacement in dwl.c at line 743 [7.4]
B:BD[16.72] → [8.2124:2167]
```
	int nmons = wl_list_length(&mons), i = 0;
```
[16.72]
[18.3]
```
	nmons = wl_list_length(&mons);
```
Insertion in dwl.c at line 773 [7.4]
[5.966]
[6.22958]
```
	Monitor *m;
```
Replacement in dwl.c at line 778 [7.4]
B:BD[6.22988] → [8.2168:2200]
```
	Monitor *m = wlr_output->data;
```
[6.22988]
[6.23011]
```
	m = wlr_output->data;
```

Insertion in dwl.c at line 802 [7.4]

[12.4586]

[8.2201]

	struct xkb_context *context;
	struct xkb_keymap *keymap;

Replacement in dwl.c at line 808 [7.4]

B:BD[19.61] → [8.2257:2400]

	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
	struct xkb_keymap *keymap = xkb_map_new_from_names(context, &xkb_rules,

[19.61]

[12.4984]

	context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
	keymap = xkb_map_new_from_names(context, &xkb_rules,

Insertion in dwl.c at line 837 [7.4]

[12.7188]

	Monitor *m;
	const MonitorRule *r;
	size_t nlayers;
	Monitor *moni, *insertmon = NULL;
	int x = 0;

Replacement in dwl.c at line 850 [7.4]

B:BD[20.137] → [8.2401:2457]

	Monitor *m = wlr_output->data = calloc(1, sizeof(*m));

[20.137]

[21.1789]

	m = wlr_output->data = calloc(1, sizeof(*m));

Replacement in dwl.c at line 854 [7.4]

B:BD[22.39] → [22.39:104]

	for (const MonitorRule *r = monrules; r < END(monrules); r++) {

[22.39]

[23.1]

	for (r = monrules; r < END(monrules); r++) {

Deletion in dwl.c at line 874 [7.4]
B:BD[24.2] → [22.137:184]
```
	Monitor *moni, *insertmon = NULL;
	int x = 0;
```
Replacement in dwl.c at line 903 [7.4]
B:BD[6.23267] → [8.2482:2519]
```
	size_t nlayers = LENGTH(m->layers);
```
[6.23267]
[25.3]
```
	nlayers = LENGTH(m->layers);
```

Insertion in dwl.c at line 963 [7.4]

[5.1273]

[6.23554]

	LayerSurface *layersurface;
	Monitor *m;
	struct wlr_layer_surface_v1_state old_state;

Deletion in dwl.c at line 970 [7.4]
B:BD[6.23635] → [6.23635:23636]
B:BD[6.23636] → [8.2520:2583]
```
	LayerSurface *layersurface = calloc(1, sizeof(LayerSurface));
```
Insertion in dwl.c at line 971 [7.4]
[6.23695]
[26.674]
```
	layersurface = calloc(1, sizeof(LayerSurface));
```
Deletion in dwl.c at line 984 [7.4]
∅:D[5.2063] → [6.24205:24206]
B:BD[6.24205] → [6.24205:24206]
B:BD[6.24206] → [8.2584:2631]
```
	Monitor *m = wlr_layer_surface->output->data;
```
Insertion in dwl.c at line 985 [7.4]
[6.24241]
[5.2103]
```
	m = wlr_layer_surface->output->data;
```

Replacement in dwl.c at line 991 [7.4]

B:BD[6.24423] → [8.2632:2707]

	struct wlr_layer_surface_v1_state old_state = wlr_layer_surface->current;

[6.24423]

[5.2239]

	old_state = wlr_layer_surface->current;

Insertion in dwl.c at line 1162 [7.4]

[27.184]

[28.2]

	struct wlr_surface *old = seat->keyboard_state.focused_surface;
	struct wlr_keyboard *kb;

Deletion in dwl.c at line 1171 [7.4]

B:BD[29.432] → [8.2767:2833]

	struct wlr_surface *old = seat->keyboard_state.focused_surface;

Replacement in dwl.c at line 1215 [7.4]

B:BD[30.209] → [8.2834:2890]

	struct wlr_keyboard *kb = wlr_seat_get_keyboard(seat);

[30.209]

[2.853]

	kb = wlr_seat_get_keyboard(seat);

Insertion in dwl.c at line 1294 [7.4]
[12.11702]
[12.11702]
```
	uint32_t caps;
```
Insertion in dwl.c at line 1307 [7.4]
[12.11899]
[12.11899]
Replacement in dwl.c at line 1312 [7.4]
∅:D[31.222] → [8.2891:2936]
B:BD[32.166] → [8.2891:2936]
```
	uint32_t caps = WL_SEAT_CAPABILITY_POINTER;
```
[31.222]
[33.582]
```
	caps = WL_SEAT_CAPABILITY_POINTER;
```

Insertion in dwl.c at line 1489 [7.4]

[34.1596]

[3.4]

	double sx = 0, sy = 0;
	struct wlr_surface *surface = NULL;
	Client *c = NULL;

Deletion in dwl.c at line 1515 [7.4]

B:BD[7.13393] → [8.2972:3052]

	struct wlr_surface *surface = NULL;
	double sx = 0, sy = 0;
	Client *c = NULL;

Replacement in dwl.c at line 1639 [7.4]
B:BD[35.341] → [8.3053:3078]
∅:D[8.3078] → [35.341:361]
B:BD[35.341] → [35.341:361]
```
					Arg ar = {.i = -1};
					focusmon(&ar);
```
[35.341]
[35.361]
```
					focusmon(&(Arg) {.i = -1});
```

Insertion in dwl.c at line 1672 [7.4]

[36.2150]

[37.63]

	struct timespec now;
	int internal_call = !time;

Replacement in dwl.c at line 1685 [7.4]
B:BD[38.142] → [4.1803:1831]
∅:D[4.1831] → [39.33:70]
B:BD[39.33] → [39.33:70]
```
	int internal_call = !time;
	if (!time) {
		struct timespec now;
```
[38.142]
[39.70]
```
	if (internal_call) {
```

Insertion in dwl.c at line 1724 [7.4]

[7.18944]

	double ox = 0, oy = 0;
	struct wlr_box obox;
	float matrix[9];
	enum wl_output_transform transform;

Deletion in dwl.c at line 1742 [7.4]
B:BD[7.19698] → [8.3079:3103]
```
	double ox = 0, oy = 0;
```

Replacement in dwl.c at line 1746 [7.4]

B:BD[7.19985] → [8.3104:3259]

	struct wlr_box obox = {
		.x = ox + rdata->x + sx,
		.y = oy + rdata->y + sy,
		.width = surface->current.width,
		.height = surface->current.height,
	};

[7.19985]

[40.153]

	obox.x = ox + rdata->x + sx;
	obox.y = oy + rdata->y + sy;
	obox.width = surface->current.width;
	obox.height = surface->current.height;

Replacement in dwl.c at line 1763 [7.4]

B:BD[7.20700] → [8.3260:3377]

	float matrix[9];
	enum wl_output_transform transform = wlr_output_transform_invert(
			surface->current.transform);

[7.20700]

[41.514]

	transform = wlr_output_transform_invert(surface->current.transform);

Insertion in dwl.c at line 1853 [7.4]
[34.2350]
[7.21316]
```
	Client *c;
	int render = 1;
```
Deletion in dwl.c at line 1864 [7.4]
B:BD[42.596] → [8.3979:3991]
B:BD[8.3991] → [4.2226:2243]
```
	Client *c;
	int render = 1;
```

Insertion in dwl.c at line 1913 [7.4]

[43.201]

[44.914]

	struct wlr_box *bbox = interact ? &sgeom : &c->mon->w;

Deletion in dwl.c at line 1918 [7.4]
B:BD[44.987] → [8.4009:4065]
```
	struct wlr_box *bbox = interact ? &sgeom : &c->mon->w;
```
Insertion in dwl.c at line 1934 [7.4]
[45.97]
[45.123]
```
	pid_t startup_pid = -1;
```
Deletion in dwl.c at line 1961 [7.4]
B:BD[8.4067] → [8.4067:4092]
```
	pid_t startup_pid = -1;
```
Replacement in dwl.c at line 1962 [7.4]
B:BD[45.685] → [8.4093:4123]
```
		pid_t startup_pid = fork();
```
[45.685]
[46.307]
```
		startup_pid = fork();
```
Insertion in dwl.c at line 2042 [7.4]
[47.299]
[47.310]
```
	float f;
```

Replacement in dwl.c at line 2046 [7.4]

B:BD[47.370] → [8.4126:4191]

	float f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;

[47.370]

[47.429]

	f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;

Insertion in dwl.c at line 2347 [7.4]
[48.109]
[48.132]
```
	unsigned int newtags;
```

Replacement in dwl.c at line 2351 [7.4]

B:BD[48.181] → [8.4192:4249]

	unsigned int newtags = sel->tags ^ (arg->ui & TAGMASK);

[48.181]

[48.225]

	newtags = sel->tags ^ (arg->ui & TAGMASK);

Replacement in config.mk at line 5 [9.4900]

B:BD[9.4954] → [9.4954:5056]

CFLAGS ?= -g -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare -Wno-error=unused-function

[9.4954]

[9.5056]

CFLAGS ?= -g -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare -Wno-error=unused-function -Wdeclaration-after-statement

let's not alienate the dwm folks

Dependencies

In channels

Change contents

Insertion in dwl.c at line 158 [7.4]

Insertion in dwl.c at line 407 [7.4]

Replacement in dwl.c at line 412 [7.4]

Insertion in dwl.c at line 465 [7.4]

Deletion in dwl.c at line 484 [7.4]

Insertion in dwl.c at line 517 [7.4]

Insertion in dwl.c at line 522 [7.4]

Replacement in dwl.c at line 530 [7.4]

Deletion in dwl.c at line 533 [7.4]

Deletion in dwl.c at line 544 [7.4]

Insertion in dwl.c at line 588 [7.4]

Deletion in dwl.c at line 622 [7.4]

Insertion in dwl.c at line 654 [7.4]

Deletion in dwl.c at line 664 [7.4]

Replacement in dwl.c at line 667 [7.4]

Insertion in dwl.c at line 735 [7.4]

Replacement in dwl.c at line 743 [7.4]

Insertion in dwl.c at line 773 [7.4]

Replacement in dwl.c at line 778 [7.4]

Insertion in dwl.c at line 802 [7.4]

Replacement in dwl.c at line 808 [7.4]

Insertion in dwl.c at line 837 [7.4]

Replacement in dwl.c at line 850 [7.4]

Replacement in dwl.c at line 854 [7.4]

Deletion in dwl.c at line 874 [7.4]

Replacement in dwl.c at line 903 [7.4]

Insertion in dwl.c at line 963 [7.4]

Deletion in dwl.c at line 970 [7.4]

Insertion in dwl.c at line 971 [7.4]

Deletion in dwl.c at line 984 [7.4]

Insertion in dwl.c at line 985 [7.4]

Replacement in dwl.c at line 991 [7.4]

Insertion in dwl.c at line 1162 [7.4]

Deletion in dwl.c at line 1171 [7.4]

Replacement in dwl.c at line 1215 [7.4]

Insertion in dwl.c at line 1294 [7.4]

Insertion in dwl.c at line 1307 [7.4]

Replacement in dwl.c at line 1312 [7.4]

Insertion in dwl.c at line 1489 [7.4]

Deletion in dwl.c at line 1515 [7.4]

Replacement in dwl.c at line 1639 [7.4]

Insertion in dwl.c at line 1672 [7.4]

Replacement in dwl.c at line 1685 [7.4]

Insertion in dwl.c at line 1724 [7.4]

Deletion in dwl.c at line 1742 [7.4]

Replacement in dwl.c at line 1746 [7.4]

Replacement in dwl.c at line 1763 [7.4]

Insertion in dwl.c at line 1853 [7.4]

Deletion in dwl.c at line 1864 [7.4]

Insertion in dwl.c at line 1913 [7.4]

Deletion in dwl.c at line 1918 [7.4]

Insertion in dwl.c at line 1934 [7.4]

Deletion in dwl.c at line 1961 [7.4]

Replacement in dwl.c at line 1962 [7.4]

Insertion in dwl.c at line 2042 [7.4]

Replacement in dwl.c at line 2046 [7.4]

Insertion in dwl.c at line 2347 [7.4]

Replacement in dwl.c at line 2351 [7.4]

Replacement in config.mk at line 5 [9.4900]