Sivecano/dwl - Change YUZIWFDRC7OPGBBLI7Z77RMT3PTXEV2JAHQXKANK74WN25434GUQC

Style: use early-return to clarify code

Use an early return to avoid indenting the main logic instead of wrapping the tail of a function in an if statement.

No functional change, except for a handful of places where printstatus() was being called spuriously (tag, toggletag, toggleview).

ΔSLOC: 0

Created by Devin J. Pohly on July 21, 2023

YUZIWFDRC7OPGBBLI7Z77RMT3PTXEV2JAHQXKANK74WN25434GUQC

Dependencies

In channels

main

Change contents

Replacement in dwl.c at line 1135 [5.4]

B:BD[2.2993] → [2.2993:3387]

	if (lock_surface->surface == seat->keyboard_state.focused_surface) {
		if (locked && cur_lock && !wl_list_empty(&cur_lock->surfaces)) {
			surface = wl_container_of(cur_lock->surfaces.next, surface, link);
			client_notify_enter(surface->surface, wlr_seat_get_keyboard(seat));
		} else if (!locked) {
			focusclient(focustop(selmon), 1);
		} else {
			wlr_seat_keyboard_clear_focus(seat);
		}

[2.2993]

[2.3387]

	if (lock_surface->surface != seat->keyboard_state.focused_surface)
		return;
	if (locked && cur_lock && !wl_list_empty(&cur_lock->surfaces)) {
		surface = wl_container_of(cur_lock->surfaces.next, surface, link);
		client_notify_enter(surface->surface, wlr_seat_get_keyboard(seat));
	} else if (!locked) {
		focusclient(focustop(selmon), 1);
	} else {
		wlr_seat_keyboard_clear_focus(seat);

Replacement in dwl.c at line 1450 [5.4]

∅:D[4.658] → [6.17067:17278]

B:BD[6.17067] → [6.17067:17278]

	if (!handled) {
		/* Pass unhandled keycodes along to the client. */
		wlr_seat_set_keyboard(seat, kb->wlr_keyboard);
		wlr_seat_keyboard_notify_key(seat, event->time_msec,
			event->keycode, event->state);
	}

[4.658]

[6.17278]

	if (handled)
		return;
	/* Pass unhandled keycodes along to the client. */
	wlr_seat_set_keyboard(seat, kb->wlr_keyboard);
	wlr_seat_keyboard_notify_key(seat, event->time_msec,
		event->keycode, event->state);

Replacement in dwl.c at line 1482 [5.4]

B:BD[4.720] → [4.720:882]

	if (kb->nsyms && kb->wlr_keyboard->repeat_info.rate > 0) {
		wl_event_source_timer_update(kb->key_repeat_source,
				1000 / kb->wlr_keyboard->repeat_info.rate);

[4.720]

[4.882]

	if (!kb->nsyms || kb->wlr_keyboard->repeat_info.rate <= 0)
		return 0;

Replacement in dwl.c at line 1485 [5.4]

B:BD[4.883] → [4.883:961]

		for (i = 0; i < kb->nsyms; i++)
			keybinding(kb->mods, kb->keysyms[i]);
	}

[4.883]

[4.961]

	wl_event_source_timer_update(kb->key_repeat_source,
			1000 / kb->wlr_keyboard->repeat_info.rate);
	for (i = 0; i < kb->nsyms; i++)
		keybinding(kb->mods, kb->keysyms[i]);

Replacement in dwl.c at line 2338 [5.4]

∅:D[7.108] → [6.46420:46544]

B:BD[6.46420] → [6.46420:46544]

	if (sel && arg->ui & TAGMASK) {
		sel->tags = arg->ui & TAGMASK;
		focusclient(focustop(selmon), 1);
		arrange(selmon);
	}

[7.108]

[6.46544]

	if (!sel || (arg->ui & TAGMASK) == 0)
		return;
	sel->tags = arg->ui & TAGMASK;
	focusclient(focustop(selmon), 1);
	arrange(selmon);

Replacement in dwl.c at line 2413 [5.4]

B:BD[6.47918] → [6.47918:48015]

	if (newtags) {
		sel->tags = newtags;
		focusclient(focustop(selmon), 1);
		arrange(selmon);
	}

[6.47918]

[6.48015]

	if (!newtags)
		return;
	sel->tags = newtags;
	focusclient(focustop(selmon), 1);
	arrange(selmon);

Replacement in dwl.c at line 2427 [5.4]

B:BD[6.48163] → [6.48163:48286]

	if (newtagset) {
		selmon->tagset[selmon->seltags] = newtagset;
		focusclient(focustop(selmon), 1);
		arrange(selmon);
	}

[6.48163]

[6.48286]

	if (!newtagset)
		return;
	selmon->tagset[selmon->seltags] = newtagset;
	focusclient(focustop(selmon), 1);
	arrange(selmon);

Replacement in dwl.c at line 2589 [5.4]
B:BD[3.59] → [3.59:94]
∅:D[3.94] → [6.52269:52308]
∅:D[8.272] → [6.52269:52308]
∅:D[7.385] → [6.52269:52308]
∅:D[9.1023] → [6.52269:52308]
B:BD[6.52269] → [6.52269:52308]
```
	if (c && c != focustop(selmon)) {
		c->isurgent = 1;
		printstatus();
	}
```
[3.59]
[6.52308]
```
	if (!c || c == focustop(selmon))
		return;
	c->isurgent = 1;
	printstatus();
```

Replacement in dwl.c at line 2752 [5.4]

B:BD[6.56759] → [7.424:454]

∅:D[7.454] → [6.56784:56880]

B:BD[6.56784] → [6.56784:56880]

	if (c != focustop(selmon)) {
		c->isurgent = xcb_icccm_wm_hints_get_urgency(c->surface.xwayland->hints);
		printstatus();
	}

[6.56759]

[6.57471]

	if (c == focustop(selmon))
		return;
	c->isurgent = xcb_icccm_wm_hints_get_urgency(c->surface.xwayland->hints);
	printstatus();