Merge changes from v1

Author: serebit

meson.build

@@ -18,7 +18,7 @@ dep_argparse = dependency('argparse', version: '>= 3.0', fallback: ['argparse'])
 dep_wayland_protocols = dependency('wayland-protocols', version: '>= 1.31')
 dep_wayland_scanner = dependency('wayland-scanner')
 dep_wayland_server = dependency('wayland-server')
-dep_wlroots = dependency('wlroots', version: ['>= 0.18', '< 0.19.0'], fallback: ['wlroots'], default_options: ['examples=false'])
+dep_wlroots = dependency('wlroots-0.18', version: ['>= 0.18.0', '< 0.19.0'], fallback: 'wlroots', default_options: ['examples=false'])
 dep_xcb = dependency('xcb')
 dep_xkbcommon = dependency('xkbcommon')
 

src/foreign_toplevel.cpp

@@ -9,57 +9,70 @@
 #include "wlr-wrap-end.hpp"
 
 static void foreign_toplevel_handle_request_maximize_notify(wl_listener* listener, void* data) {
+	wlr_log(WLR_DEBUG, "wlr_foreign_toplevel_handle_v1.events.request_maximize(listener=%p, data=%p)", (void*) listener, data);
+
 	if (data == nullptr) {
 		wlr_log(WLR_ERROR, "No data passed to wlr_foreign_toplevel_handle_v1.events.request_maximize");
 		return;
 	}
 
-	const ForeignToplevelHandle& handle = magpie_container_of(listener, handle, request_activate);
+	const ForeignToplevelHandle& handle = magpie_container_of(listener, handle, request_maximize);
 	const auto& event = *static_cast<wlr_foreign_toplevel_handle_v1_maximized_event*>(data);
 
 	const auto placement = event.maximized ? VIEW_PLACEMENT_MAXIMIZED : VIEW_PLACEMENT_STACKING;
 	handle.view.set_placement(placement);
 }
 
 static void foreign_toplevel_handle_request_fullscreen_notify(wl_listener* listener, void* data) {
+	wlr_log(
+		WLR_DEBUG, "wlr_foreign_toplevel_handle_v1.events.request_fullscreen(listener=%p, data=%p)", (void*) listener, data);
+
 	if (data == nullptr) {
 		wlr_log(WLR_ERROR, "No data passed to wlr_foreign_toplevel_handle_v1.events.request_fullscreen");
 		return;
 	}
 
-	const ForeignToplevelHandle& handle = magpie_container_of(listener, handle, request_activate);
+	const ForeignToplevelHandle& handle = magpie_container_of(listener, handle, request_fullscreen);
 	const auto& event = *static_cast<wlr_foreign_toplevel_handle_v1_maximized_event*>(data);
 
 	const auto placement = event.maximized ? VIEW_PLACEMENT_FULLSCREEN : VIEW_PLACEMENT_STACKING;
 	handle.view.set_placement(placement);
 }
 
 static void foreign_toplevel_handle_request_minimize_notify(wl_listener* listener, void* data) {
+	wlr_log(WLR_DEBUG, "wlr_foreign_toplevel_handle_v1.events.request_minimize(listener=%p, data=%p)", (void*) listener, data);
+
 	if (data == nullptr) {
 		wlr_log(WLR_ERROR, "No data passed to wlr_foreign_toplevel_handle_v1.events.request_minimize");
 		return;
 	}
 
-	const ForeignToplevelHandle& handle = magpie_container_of(listener, handle, request_activate);
+	const ForeignToplevelHandle& handle = magpie_container_of(listener, handle, request_minimize);
 	const auto& event = *static_cast<wlr_foreign_toplevel_handle_v1_minimized_event*>(data);
 
 	handle.view.set_minimized(event.minimized);
 }
 
-static void foreign_toplevel_handle_request_activate_notify(wl_listener* listener, void*) {
+static void foreign_toplevel_handle_request_activate_notify(wl_listener* listener, [[maybe_unused]] void* data) {
+	wlr_log(WLR_DEBUG, "wlr_foreign_toplevel_handle_v1.events.request_activate(listener=%p, data=%p)", (void*) listener, data);
+
 	const ForeignToplevelHandle& handle = magpie_container_of(listener, handle, request_activate);
 
 	handle.view.set_minimized(false);
 	handle.view.get_server().focus_view(std::dynamic_pointer_cast<View>(handle.view.shared_from_this()));
 }
 
-static void foreign_toplevel_handle_request_close_notify(wl_listener* listener, void*) {
+static void foreign_toplevel_handle_request_close_notify(wl_listener* listener, [[maybe_unused]] void* data) {
+	wlr_log(WLR_DEBUG, "wlr_foreign_toplevel_handle_v1.events.request_close(listener=%p, data=%p)", (void*) listener, data);
+
 	const ForeignToplevelHandle& handle = magpie_container_of(listener, handle, request_close);
 
 	handle.view.close();
 }
 
 static void foreign_toplevel_handle_set_rectangle_notify(wl_listener* listener, void* data) {
+	wlr_log(WLR_DEBUG, "wlr_foreign_toplevel_handle_v1.events.set_rectangle(listener=%p, data=%p)", (void*) listener, data);
+
 	if (data == nullptr) {
 		wlr_log(WLR_ERROR, "No data passed to wlr_foreign_toplevel_handle_v1.events.set_rectangle");
 		return;

src/input/constraint.cpp

@@ -7,9 +7,12 @@
 
 #include "wlr-wrap-start.hpp"
 #include <wlr/types/wlr_compositor.h>
+#include <wlr/util/log.h>
 #include "wlr-wrap-end.hpp"
 
-static void constraint_destroy_notify(wl_listener* listener, void*) {
+static void constraint_destroy_notify(wl_listener* listener, [[maybe_unused]] void* data) {
+	wlr_log(WLR_DEBUG, "wlr_pointer_constraint_v1.events.destroy(listener=%p, data=%p)", (void*) listener, data);
+
 	PointerConstraint& constraint = magpie_container_of(listener, constraint, destroy);
 
 	auto& current_constraint = constraint.seat.current_constraint;

src/input/cursor.cpp

@@ -50,23 +50,23 @@ void Cursor::process_resize(const uint32_t time) const {
 	int32_t new_top = seat.server.grab_geobox.y;
 	int32_t new_bottom = seat.server.grab_geobox.y + seat.server.grab_geobox.height;
 
-	if (seat.server.resize_edges & WLR_EDGE_TOP) {
+	if ((seat.server.resize_edges & WLR_EDGE_TOP) != 0) {
 		new_top = static_cast<int32_t>(std::round(border_y));
 		if (new_top >= new_bottom) {
 			new_top = new_bottom - 1;
 		}
-	} else if (seat.server.resize_edges & WLR_EDGE_BOTTOM) {
+	} else if ((seat.server.resize_edges & WLR_EDGE_BOTTOM) != 0) {
 		new_bottom = static_cast<int32_t>(std::round(border_y));
 		if (new_bottom <= new_top) {
 			new_bottom = new_top + 1;
 		}
 	}
-	if (seat.server.resize_edges & WLR_EDGE_LEFT) {
+	if ((seat.server.resize_edges & WLR_EDGE_LEFT) != 0) {
 		new_left = static_cast<int32_t>(std::round(border_x));
 		if (new_left >= new_right) {
 			new_left = new_right - 1;
 		}
-	} else if (seat.server.resize_edges & WLR_EDGE_RIGHT) {
+	} else if ((seat.server.resize_edges & WLR_EDGE_RIGHT) != 0) {
 		new_right = static_cast<int32_t>(std::round(border_x));
 		if (new_right <= new_left) {
 			new_right = new_left + 1;
@@ -106,8 +106,10 @@ void Cursor::process_move(const uint32_t time) {
 /* This event is forwarded by the cursor when a pointer emits an axis event,
  * for example when you move the scroll wheel. */
 static void cursor_axis_notify(wl_listener* listener, void* data) {
+	wlr_log(WLR_DEBUG, "wlr_cursor.events.axis(listener=%p, data=%p)", (void*) listener, data);
+
 	if (data == nullptr) {
-		wlr_log(WLR_ERROR, "No data passed to wlr_cursor.events.cursor_axis");
+		wlr_log(WLR_ERROR, "No data passed to wlr_cursor.events.axis");
 		return;
 	}
 
@@ -123,7 +125,7 @@ static void cursor_axis_notify(wl_listener* listener, void* data) {
  * event. Frame events are sent after regular pointer events to group
  * multiple events together. For instance, two axis events may happen at the
  * same time, in which case a frame event won't be sent in between. */
-static void cursor_frame_notify(wl_listener* listener, void*) {
+static void cursor_frame_notify(wl_listener* listener, [[maybe_unused]] void* data) {
 	Cursor& cursor = magpie_container_of(listener, cursor, frame);
 
 	/* Notify the client with pointer focus of the frame event. */
@@ -145,7 +147,8 @@ static void cursor_motion_absolute_notify(wl_listener* listener, void* data) {
 	Cursor& cursor = magpie_container_of(listener, cursor, motion_absolute);
 	const auto* event = static_cast<wlr_pointer_motion_absolute_event*>(data);
 
-	double lx, ly;
+	double lx;
+	double ly;
 	wlr_cursor_absolute_to_layout_coords(&cursor.wlr, &event->pointer->base, event->x, event->y, &lx, &ly);
 
 	double dx = lx - cursor.wlr.x;
@@ -165,6 +168,8 @@ static void cursor_motion_absolute_notify(wl_listener* listener, void* data) {
 
 /* This event is forwarded by the cursor when a pointer emits a button event. */
 static void cursor_button_notify(wl_listener* listener, void* data) {
+	wlr_log(WLR_DEBUG, "wlr_cursor.events.button(listener=%p, data=%p)", (void*) listener, data);
+
 	if (data == nullptr) {
 		wlr_log(WLR_ERROR, "No data passed to wlr_cursor.events.button");
 		return;
@@ -177,7 +182,8 @@ static void cursor_button_notify(wl_listener* listener, void* data) {
 
 	/* Notify the client with pointer focus that a button press has occurred */
 	wlr_seat_pointer_notify_button(server.seat->wlr, event->time_msec, event->button, event->state);
-	double sx, sy;
+	double sx;
+	double sy;
 
 	wlr_surface* surface = nullptr;
 	auto magpie_surface = server.surface_at(cursor.wlr.x, cursor.wlr.y, &surface, &sx, &sy).lock();
@@ -189,7 +195,7 @@ static void cursor_button_notify(wl_listener* listener, void* data) {
 		}
 	} else if (magpie_surface != nullptr && magpie_surface->is_view()) {
 		/* Focus that client if the button was _pressed_ */
-		server.focus_view(std::dynamic_pointer_cast<View>(magpie_surface), surface);
+		server.focus_view(std::dynamic_pointer_cast<View>(magpie_surface));
 	} else {
 		server.focus_view(nullptr);
 	}
@@ -222,8 +228,10 @@ static void cursor_motion_notify(wl_listener* listener, void* data) {
 }
 
 static void gesture_pinch_begin_notify(wl_listener* listener, void* data) {
+	wlr_log(WLR_DEBUG, "wlr_cursor.events.gesture_pinch_begin(listener=%p, data=%p)", (void*) listener, data);
+
 	if (data == nullptr) {
-		wlr_log(WLR_ERROR, "No data passed to wlr_cursor.events.pinch_begin");
+		wlr_log(WLR_ERROR, "No data passed to wlr_cursor.events.gesture_pinch_begin");
 		return;
 	}
 
@@ -235,7 +243,7 @@ static void gesture_pinch_begin_notify(wl_listener* listener, void* data) {
 
 static void gesture_pinch_update_notify(wl_listener* listener, void* data) {
 	if (data == nullptr) {
-		wlr_log(WLR_ERROR, "No data passed to wlr_cursor.events.pinch_update");
+		wlr_log(WLR_ERROR, "No data passed to wlr_cursor.events.gesture_pinch_update");
 		return;
 	}
 
@@ -247,8 +255,10 @@ static void gesture_pinch_update_notify(wl_listener* listener, void* data) {
 }
 
 static void gesture_pinch_end_notify(wl_listener* listener, void* data) {
+	wlr_log(WLR_DEBUG, "wlr_cursor.events.gesture_pinch_end(listener=%p, data=%p)", (void*) listener, data);
+
 	if (data == nullptr) {
-		wlr_log(WLR_ERROR, "No data passed to wlr_cursor.events.pinch_end");
+		wlr_log(WLR_ERROR, "No data passed to wlr_cursor.events.gesture_pinch_end");
 		return;
 	}
 
@@ -259,8 +269,10 @@ static void gesture_pinch_end_notify(wl_listener* listener, void* data) {
 }
 
 static void gesture_swipe_begin_notify(wl_listener* listener, void* data) {
+	wlr_log(WLR_DEBUG, "wlr_cursor.events.gesture_swipe_begin(listener=%p, data=%p)", (void*) listener, data);
+
 	if (data == nullptr) {
-		wlr_log(WLR_ERROR, "No data passed to wlr_cursor.events.swipe_begin");
+		wlr_log(WLR_ERROR, "No data passed to wlr_cursor.events.gesture_swipe_begin");
 		return;
 	}
 
@@ -272,7 +284,7 @@ static void gesture_swipe_begin_notify(wl_listener* listener, void* data) {
 
 static void gesture_swipe_update_notify(wl_listener* listener, void* data) {
 	if (data == nullptr) {
-		wlr_log(WLR_ERROR, "No data passed to wlr_cursor.events.swipe_update");
+		wlr_log(WLR_ERROR, "No data passed to wlr_cursor.events.gesture_swipe_update");
 		return;
 	}
 
@@ -283,8 +295,10 @@ static void gesture_swipe_update_notify(wl_listener* listener, void* data) {
 }
 
 static void gesture_swipe_end_notify(wl_listener* listener, void* data) {
+	wlr_log(WLR_DEBUG, "wlr_cursor.events.gesture_swipe_end(listener=%p, data=%p)", (void*) listener, data);
+
 	if (data == nullptr) {
-		wlr_log(WLR_ERROR, "No data passed to wlr_cursor.events.swipe_end");
+		wlr_log(WLR_ERROR, "No data passed to wlr_cursor.events.gesture_swipe_end");
 		return;
 	}
 
@@ -295,8 +309,10 @@ static void gesture_swipe_end_notify(wl_listener* listener, void* data) {
 }
 
 static void gesture_hold_begin_notify(wl_listener* listener, void* data) {
+	wlr_log(WLR_DEBUG, "wlr_cursor.events.gesture_hold_begin(listener=%p, data=%p)", (void*) listener, data);
+
 	if (data == nullptr) {
-		wlr_log(WLR_ERROR, "No data passed to wlr_cursor.events.hold_begin");
+		wlr_log(WLR_ERROR, "No data passed to wlr_cursor.events.gesture_hold_begin");
 		return;
 	}
 
@@ -307,8 +323,10 @@ static void gesture_hold_begin_notify(wl_listener* listener, void* data) {
 }
 
 static void gesture_hold_end_notify(wl_listener* listener, void* data) {
+	wlr_log(WLR_DEBUG, "wlr_cursor.events.gesture_hold_end(listener=%p, data=%p)", (void*) listener, data);
+
 	if (data == nullptr) {
-		wlr_log(WLR_ERROR, "No data passed to wlr_cursor.events.hold_end");
+		wlr_log(WLR_ERROR, "No data passed to wlr_cursor.events.gesture_hold_end");
 		return;
 	}
 
@@ -319,6 +337,8 @@ static void gesture_hold_end_notify(wl_listener* listener, void* data) {
 }
 
 static void request_set_shape_notify(wl_listener* listener, void* data) {
+	wlr_log(WLR_DEBUG, "wlr_cursor.events.set_shape(listener=%p, data=%p)", (void*) listener, data);
+
 	if (data == nullptr) {
 		wlr_log(WLR_ERROR, "No data passed to wlr_cursor.events.set_shape");
 		return;
@@ -412,7 +432,8 @@ void Cursor::process_motion(const uint32_t time) {
 	}
 
 	/* Otherwise, find the view under the pointer and send the event along. */
-	double sx, sy;
+	double sx;
+	double sy;
 	wlr_surface* surface = nullptr;
 	auto magpie_surface = seat.server.surface_at(wlr.x, wlr.y, &surface, &sx, &sy).lock();
 	if (magpie_surface == nullptr) {
@@ -464,7 +485,7 @@ void Cursor::warp_to_constraint(const PointerConstraint& constraint) const {
 		return;
 	}
 
-	if (constraint.wlr.current.committed & WLR_POINTER_CONSTRAINT_V1_STATE_CURSOR_HINT) {
+	if ((constraint.wlr.current.committed & WLR_POINTER_CONSTRAINT_V1_STATE_CURSOR_HINT) != 0) {
 		const double x = constraint.wlr.current.cursor_hint.x;
 		const double y = constraint.wlr.current.cursor_hint.y;
 

src/input/cursor.hpp

@@ -25,7 +25,6 @@ class Cursor final : public std::enable_shared_from_this<Cursor> {
 		wl_listener button = {};
 		wl_listener axis = {};
 		wl_listener frame = {};
-		wl_listener new_constraint = {};
 		wl_listener gesture_pinch_begin = {};
 		wl_listener gesture_pinch_update = {};
 		wl_listener gesture_pinch_end = {};

src/input/keyboard.cpp

@@ -18,7 +18,9 @@
 /* This event is raised by the keyboard base wlr_input_device to signal
  * the destruction of the wlr_keyboard. It will no longer receive events
  * and should be destroyed. */
-static void keyboard_handle_destroy(wl_listener* listener, void*) {
+static void keyboard_handle_destroy(wl_listener* listener, [[maybe_unused]] void* data) {
+	wlr_log(WLR_DEBUG, "wlr_keyboard.events.destroy(listener=%p, data=%p)", (void*) listener, data);
+
 	Keyboard& keyboard = magpie_container_of(listener, keyboard, destroy);
 
 	auto& keyboards = keyboard.seat.keyboards;
@@ -51,6 +53,8 @@ static bool handle_compositor_keybinding(const Keyboard& keyboard, const uint32_
 
 /* This event is raised when a key is pressed or released. */
 static void keyboard_handle_key(wl_listener* listener, void* data) {
+	wlr_log(WLR_DEBUG, "wlr_keyboard.events.key(listener=%p, data=%p)", (void*) listener, data);
+
 	if (data == nullptr) {
 		wlr_log(WLR_ERROR, "No data passed to wlr_keyboard.events.key");
 		return;
@@ -71,7 +75,7 @@ static void keyboard_handle_key(wl_listener* listener, void* data) {
 	bool handled = false;
 	const uint32_t modifiers = wlr_keyboard_get_modifiers(&keyboard.wlr);
 	if (event->state == WL_KEYBOARD_KEY_STATE_PRESSED) {
-		if (modifiers & WLR_MODIFIER_ALT) {
+		if ((modifiers & WLR_MODIFIER_ALT) != 0) {
 			/* If alt is held down and this button was _pressed_, we attempt to
 			 * process it as a compositor keybinding. */
 			for (int32_t i = 0; i < nsyms; i++) {
@@ -89,7 +93,7 @@ static void keyboard_handle_key(wl_listener* listener, void* data) {
 
 /* This event is raised when a modifier key, such as shift or alt, is
  * pressed. We simply communicate this to the client. */
-static void keyboard_handle_modifiers(wl_listener* listener, void*) {
+static void keyboard_handle_modifiers(wl_listener* listener, [[maybe_unused]] void* data) {
 	Keyboard& keyboard = magpie_container_of(listener, keyboard, modifiers);
 
 	/*