Sivecano/dwl - Change JTZBFGPCDJDJWECXH2LLXY3SUAQNCP45HLJQKG3V7XGTPLD634WAC

implement ext-session-lock-v1

Created by Leonardo Hernández Hernández on February 13, 2022

JTZBFGPCDJDJWECXH2LLXY3SUAQNCP45HLJQKG3V7XGTPLD634WAC

Dependencies

In channels

main

Change contents

Insertion in dwl.c at line 43 [5.4]
[3.49]
[4.6]
```
#include <wlr/types/wlr_session_lock_v1.h>
```

Replacement in dwl.c at line 77 [5.4]

B:BD[6.80] → [2.5:122]

enum { LyrBg, LyrBottom, LyrTop, LyrOverlay, LyrTile, LyrFloat, LyrFS, LyrDragIcon, NUM_LAYERS }; /* scene layers */

[6.80]

[7.1]

enum { LyrBg, LyrBottom, LyrTop, LyrOverlay, LyrTile, LyrFloat, LyrFS, LyrDragIcon, LyrBlock, NUM_LAYERS }; /* scene layers */

Insertion in dwl.c at line 177 [5.4]

[8.30]

[9.1]

	struct wl_listener destroy_lock_surface;
	struct wlr_session_lock_surface_v1 *lock_surface;

Insertion in dwl.c at line 207 [5.4]

[10.115]

[11.39]


typedef struct {
	struct wlr_scene_tree *scene;
	struct wlr_session_lock_v1 *lock;
	struct wl_listener new_surface;
	struct wl_listener unlock;
	struct wl_listener destroy;
} SessionLock;

Insertion in dwl.c at line 237 [5.4]

[12.80]

[13.680]

static void createlocksurface(struct wl_listener *listener, void *data);

Insertion in dwl.c at line 245 [5.4]

[14.240]

[15.544]

static void destroylock(SessionLock *lock, int unlocked);
static void destroylocksurface(struct wl_listener *listener, void *data);

Insertion in dwl.c at line 248 [5.4]

[15.613]

[16.4]

static void destroysessionlock(struct wl_listener *listener, void *data);
static void destroysessionmgr(struct wl_listener *listener, void *data);

Insertion in dwl.c at line 262 [5.4]

[17.41]

[14.241]

static void locksession(struct wl_listener *listener, void *data);

Insertion in dwl.c at line 302 [5.4]

[18.80]

[14.379]

static void unlocksession(struct wl_listener *listener, void *data);

Insertion in dwl.c at line 319 [5.4]
[19.36]
[20.6]
```
static int locked;
```

Insertion in dwl.c at line 343 [5.4]

[21.308]

[21.519]


static struct wlr_session_lock_manager_v1 *session_lock_mgr;
static struct wlr_scene_rect *locked_bg;
static struct wlr_session_lock_v1 *cur_lock;

Insertion in dwl.c at line 382 [5.4]

[22.354]

[23.524]

static struct wl_listener session_lock_create_lock = {.notify = locksession};
static struct wl_listener session_lock_mgr_destroy = {.notify = destroysessionmgr};

Replacement in dwl.c at line 533 [5.4]

B:BD[24.22117] → [25.599:667]

B:BD[25.667] → [26.6:35]

			if (layersurface->layer_surface->current.keyboard_interactive &&
					layersurface->mapped) {

[24.22117]

[27.259]

			if (!locked && layersurface->layer_surface->current.keyboard_interactive
					&& layersurface->mapped) {

Insertion in dwl.c at line 573 [5.4]

[28.30]

[29.53]

		cursor_mode = CurPressed;
		if (locked)
			break;

Deletion in dwl.c at line 591 [5.4]
B:BD[30.333] → [31.72:100]
```
		cursor_mode = CurPressed;
```

Replacement in dwl.c at line 594 [5.4]

B:BD[15.4019] → [31.101:164]

		if (cursor_mode != CurNormal && cursor_mode != CurPressed) {

[15.4019]

[29.709]

		if (!locked && cursor_mode != CurNormal && cursor_mode != CurPressed) {

Insertion in dwl.c at line 858 [5.4]

[32.2687]

}
void
createlocksurface(struct wl_listener *listener, void *data)
{
	SessionLock *lock = wl_container_of(listener, lock, new_surface);
	struct wlr_session_lock_surface_v1 *lock_surface = data;
	Monitor *m = lock_surface->output->data;
	struct wlr_scene_tree *scene_tree = lock_surface->surface->data =
		wlr_scene_subsurface_tree_create(lock->scene, lock_surface->surface);
	m->lock_surface = lock_surface;
	wlr_scene_node_set_position(&scene_tree->node, m->m.x, m->m.y);
	wlr_session_lock_surface_v1_configure(lock_surface, m->m.width, m->m.height);
	LISTEN(&lock_surface->events.destroy, &m->destroy_lock_surface, destroylocksurface);
	if (m == selmon)
		client_notify_enter(lock_surface->surface, wlr_seat_get_keyboard(seat));

Insertion in dwl.c at line 1081 [5.4]

[32.9876]

}
void
destroylock(SessionLock *lock, int unlock)
{
	wlr_seat_keyboard_notify_clear_focus(seat);
	if ((locked = !unlock))
		goto destroy;
	wlr_scene_node_set_enabled(&locked_bg->node, 0);
	focusclient(focustop(selmon), 0);
	motionnotify(0);
destroy:
	wl_list_remove(&lock->new_surface.link);
	wl_list_remove(&lock->unlock.link);
	wl_list_remove(&lock->destroy.link);
	wlr_scene_node_destroy(&lock->scene->node);
	cur_lock = NULL;
	free(lock);

Insertion in dwl.c at line 1106 [5.4]

[32.9884]

destroylocksurface(struct wl_listener *listener, void *data)
{
	Monitor *m = wl_container_of(listener, m, destroy_lock_surface);
	struct wlr_session_lock_surface_v1 *surface, *lock_surface = m->lock_surface;
	m->lock_surface = NULL;
	wl_list_remove(&m->destroy_lock_surface.link);
	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);
		}
	}
}
void

Insertion in dwl.c at line 1144 [5.4]

[32.10422]

}
void
destroysessionlock(struct wl_listener *listener, void *data)
{
	SessionLock *lock = wl_container_of(listener, lock, destroy);
	destroylock(lock, 0);
}
void
destroysessionmgr(struct wl_listener *listener, void *data)
{
	wl_list_remove(&session_lock_create_lock.link);
	wl_list_remove(&session_lock_mgr_destroy.link);

Insertion in dwl.c at line 1182 [5.4]
[32.11079]
[32.11079]
```
	if (locked)
		return;
```

Replacement in dwl.c at line 1387 [5.4]

B:BD[32.16890] → [32.16890:16932]

	if (!input_inhibit_mgr->active_inhibitor

[32.16890]

[32.16932]

	if (!locked && !input_inhibit_mgr->active_inhibitor

Insertion in dwl.c at line 1427 [5.4]

[32.18070]

locksession(struct wl_listener *listener, void *data)
{
	struct wlr_session_lock_v1 *session_lock = data;
	SessionLock *lock;
	wlr_scene_node_set_enabled(&locked_bg->node, 1);
	if (cur_lock) {
		wlr_session_lock_v1_destroy(session_lock);
		return;
	}
	lock = ecalloc(1, sizeof(*lock));
	focusclient(NULL, 0);
	lock->scene = wlr_scene_tree_create(layers[LyrBlock]);
	cur_lock = lock->lock = session_lock;
	locked = 1;
	session_lock->data = lock;
	LISTEN(&session_lock->events.new_surface, &lock->new_surface, createlocksurface);
	LISTEN(&session_lock->events.destroy, &lock->destroy, destroysessionlock);
	LISTEN(&session_lock->events.unlock, &lock->unlock, unlocksession);
	wlr_session_lock_v1_send_locked(session_lock);
}
void

Insertion in dwl.c at line 2121 [5.4]

[32.39934]

	layers[LyrBlock] = wlr_scene_tree_create(&scene->tree);

Insertion in dwl.c at line 2186 [5.4]

[32.42537]

	session_lock_mgr = wlr_session_lock_manager_v1_create(dpy);
	wl_signal_add(&session_lock_mgr->events.new_lock, &session_lock_create_lock);
	wl_signal_add(&session_lock_mgr->events.destroy, &session_lock_mgr_destroy);
	locked_bg = wlr_scene_rect_create(layers[LyrBlock], sgeom.width, sgeom.height,
			(float [4]){0.1, 0.1, 0.1, 1.0});
	wlr_scene_node_set_enabled(&locked_bg->node, 0);

Insertion in dwl.c at line 2395 [5.4]

[32.48310]

unlocksession(struct wl_listener *listener, void *data)
{
	SessionLock *lock = wl_container_of(listener, lock, unlock);
	destroylock(lock, 1);
}
void

Insertion in dwl.c at line 2484 [5.4]

[32.50920]

	wlr_scene_rect_set_size(locked_bg, sgeom.width, sgeom.height);

Insertion in dwl.c at line 2502 [5.4]

[32.51518]

		if (m->lock_surface) {
			struct wlr_scene_tree *scene_tree = m->lock_surface->surface->data;
			wlr_scene_node_set_position(&scene_tree->node, m->m.x, m->m.y);
			wlr_session_lock_surface_v1_configure(m->lock_surface, m->m.width,
					m->m.height);
		}

Replacement in dwl.c at line 2515 [5.4]
B:BD[32.51679] → [32.51679:51723]
```
	if (selmon && selmon->wlr_output->enabled)
```
[32.51679]
[32.51723]
```
	if (selmon && selmon->wlr_output->enabled) {
```

Insertion in dwl.c at line 2519 [5.4]

[32.51832]

		if (selmon->lock_surface)
			client_notify_enter(selmon->lock_surface->surface,
					wlr_seat_get_keyboard(seat));
	}

Replacement in dwl.c at line 2583 [5.4]

B:BD[32.53202] → [2.1153:1242]

	int focus_order[] = { LyrOverlay, LyrTop, LyrFS, LyrFloat, LyrTile, LyrBottom, LyrBg };

[32.53202]

[32.53284]

	int focus_order[] = { LyrBlock, LyrOverlay, LyrTop, LyrFS, LyrFloat, LyrTile, LyrBottom, LyrBg };