Wayland compositor (wlroots)
git clone https://git.lucas.co/cce-compositor.git
Make Seat a toplevel struct
src/command.zig | 2 +-
src/command/close_view.zig | 2 +-
src/command/exit_compositor.zig | 2 +-
src/command/focus_output.zig | 2 +-
src/command/focus_tags.zig | 2 +-
src/command/focus_view.zig | 2 +-
src/command/modify_master_count.zig | 2 +-
src/command/modify_master_factor.zig | 2 +-
src/command/send_to_output.zig | 2 +-
src/command/set_view_tags.zig | 2 +-
src/command/spawn.zig | 2 +-
src/command/toggle_float.zig | 2 +-
src/command/toggle_tags.zig | 2 +-
src/command/toggle_view_tags.zig | 2 +-
src/command/zoom.zig | 2 +-
src/cursor.zig | 2 +-
src/input_manager.zig | 2 +-
src/keyboard.zig | 2 +-
src/seat.zig | 438 +++++++++++++++++------------------
19 files changed, 236 insertions(+), 238 deletions(-)
diff --git a/src/command.zig b/src/command.zig
index d14831a..0c46c86 100644
--- a/src/command.zig
+++ b/src/command.zig
@@ -1,4 +1,4 @@
-const Seat = @import("seat.zig").Seat;
+const Seat = @import("seat.zig");
pub const Direction = enum {
Next,
diff --git a/src/command/close_view.zig b/src/command/close_view.zig
index 1724b57..774307a 100644
--- a/src/command/close_view.zig
+++ b/src/command/close_view.zig
@@ -1,7 +1,7 @@
const c = @import("../c.zig");
const Arg = @import("../command.zig").Arg;
-const Seat = @import("../seat.zig").Seat;
+const Seat = @import("../seat.zig");
/// Close the focused view, if any.
pub fn close_view(seat: *Seat, arg: Arg) void {
diff --git a/src/command/exit_compositor.zig b/src/command/exit_compositor.zig
index ff620ee..215f17f 100644
--- a/src/command/exit_compositor.zig
+++ b/src/command/exit_compositor.zig
@@ -1,7 +1,7 @@
const c = @import("../c.zig");
const Arg = @import("../command.zig").Arg;
-const Seat = @import("../seat.zig").Seat;
+const Seat = @import("../seat.zig");
/// Exit the compositor, terminating the wayland session.
pub fn exitCompositor(seat: *Seat, arg: Arg) void {
diff --git a/src/command/focus_output.zig b/src/command/focus_output.zig
index 368bb96..a574dba 100644
--- a/src/command/focus_output.zig
+++ b/src/command/focus_output.zig
@@ -3,7 +3,7 @@ const std = @import("std");
const Arg = @import("../command.zig").Arg;
const Output = @import("../output.zig").Output;
-const Seat = @import("../seat.zig").Seat;
+const Seat = @import("../seat.zig");
/// Focus either the next or the previous output, depending on the bool passed.
/// Does nothing if there is only one output.
diff --git a/src/command/focus_tags.zig b/src/command/focus_tags.zig
index 941a129..be2ce74 100644
--- a/src/command/focus_tags.zig
+++ b/src/command/focus_tags.zig
@@ -1,7 +1,7 @@
const c = @import("../c.zig");
const Arg = @import("../command.zig").Arg;
-const Seat = @import("../seat.zig").Seat;
+const Seat = @import("../seat.zig");
/// Switch focus to the passed tags.
pub fn focusTags(seat: *Seat, arg: Arg) void {
diff --git a/src/command/focus_view.zig b/src/command/focus_view.zig
index ec51b83..fce180f 100644
--- a/src/command/focus_view.zig
+++ b/src/command/focus_view.zig
@@ -1,7 +1,7 @@
const c = @import("../c.zig");
const Arg = @import("../command.zig").Arg;
-const Seat = @import("../seat.zig").Seat;
+const Seat = @import("../seat.zig");
const View = @import("../view.zig").View;
const ViewStack = @import("../view_stack.zig").ViewStack;
diff --git a/src/command/modify_master_count.zig b/src/command/modify_master_count.zig
index 6c64091..70a8ea5 100644
--- a/src/command/modify_master_count.zig
+++ b/src/command/modify_master_count.zig
@@ -2,7 +2,7 @@ const c = @import("../c.zig");
const std = @import("std");
const Arg = @import("../command.zig").Arg;
-const Seat = @import("../seat.zig").Seat;
+const Seat = @import("../seat.zig");
/// Modify the number of master views
pub fn modifyMasterCount(seat: *Seat, arg: Arg) void {
diff --git a/src/command/modify_master_factor.zig b/src/command/modify_master_factor.zig
index c522485..7c14fb8 100644
--- a/src/command/modify_master_factor.zig
+++ b/src/command/modify_master_factor.zig
@@ -2,7 +2,7 @@ const c = @import("../c.zig");
const std = @import("std");
const Arg = @import("../command.zig").Arg;
-const Seat = @import("../seat.zig").Seat;
+const Seat = @import("../seat.zig");
/// Modify the percent of the width of the screen that the master views occupy.
pub fn modifyMasterFactor(seat: *Seat, arg: Arg) void {
diff --git a/src/command/send_to_output.zig b/src/command/send_to_output.zig
index b626f93..e64d606 100644
--- a/src/command/send_to_output.zig
+++ b/src/command/send_to_output.zig
@@ -3,7 +3,7 @@ const std = @import("std");
const Arg = @import("../command.zig").Arg;
const Output = @import("../output.zig").Output;
-const Seat = @import("../seat.zig").Seat;
+const Seat = @import("../seat.zig");
/// Send the focused view to the the next or the previous output, depending on
/// the bool passed. Does nothing if there is only one output.
diff --git a/src/command/set_view_tags.zig b/src/command/set_view_tags.zig
index 7bc4d87..7c6c942 100644
--- a/src/command/set_view_tags.zig
+++ b/src/command/set_view_tags.zig
@@ -1,7 +1,7 @@
const c = @import("../c.zig");
const Arg = @import("../command.zig").Arg;
-const Seat = @import("../seat.zig").Seat;
+const Seat = @import("../seat.zig");
/// Set the tags of the focused view.
pub fn setViewTags(seat: *Seat, arg: Arg) void {
diff --git a/src/command/spawn.zig b/src/command/spawn.zig
index 495cb94..e4cfdd6 100644
--- a/src/command/spawn.zig
+++ b/src/command/spawn.zig
@@ -3,7 +3,7 @@ const std = @import("std");
const Arg = @import("../command.zig").Arg;
const Log = @import("../log.zig").Log;
-const Seat = @import("../seat.zig").Seat;
+const Seat = @import("../seat.zig");
/// Spawn a program.
pub fn spawn(seat: *Seat, arg: Arg) void {
diff --git a/src/command/toggle_float.zig b/src/command/toggle_float.zig
index 38250b8..33a83fb 100644
--- a/src/command/toggle_float.zig
+++ b/src/command/toggle_float.zig
@@ -1,7 +1,7 @@
const c = @import("../c.zig");
const Arg = @import("../command.zig").Arg;
-const Seat = @import("../seat.zig").Seat;
+const Seat = @import("../seat.zig");
/// Make the focused view float or stop floating, depending on its current
/// state.
diff --git a/src/command/toggle_tags.zig b/src/command/toggle_tags.zig
index 16bf4e5..c64b323 100644
--- a/src/command/toggle_tags.zig
+++ b/src/command/toggle_tags.zig
@@ -1,7 +1,7 @@
const c = @import("../c.zig");
const Arg = @import("../command.zig").Arg;
-const Seat = @import("../seat.zig").Seat;
+const Seat = @import("../seat.zig");
/// Toggle focus of the passsed tags.
pub fn toggleTags(seat: *Seat, arg: Arg) void {
diff --git a/src/command/toggle_view_tags.zig b/src/command/toggle_view_tags.zig
index a4845f1..0553152 100644
--- a/src/command/toggle_view_tags.zig
+++ b/src/command/toggle_view_tags.zig
@@ -1,7 +1,7 @@
const c = @import("../c.zig");
const Arg = @import("../command.zig").Arg;
-const Seat = @import("../seat.zig").Seat;
+const Seat = @import("../seat.zig");
/// Toggle the passed tags of the focused view
pub fn toggleViewTags(seat: *Seat, arg: Arg) void {
diff --git a/src/command/zoom.zig b/src/command/zoom.zig
index b24683e..456fc7c 100644
--- a/src/command/zoom.zig
+++ b/src/command/zoom.zig
@@ -1,7 +1,7 @@
const c = @import("../c.zig");
const Arg = @import("../command.zig").Arg;
-const Seat = @import("../seat.zig").Seat;
+const Seat = @import("../seat.zig");
const View = @import("../view.zig").View;
const ViewStack = @import("../view_stack.zig").ViewStack;
diff --git a/src/cursor.zig b/src/cursor.zig
index ba1537c..aabbe10 100644
--- a/src/cursor.zig
+++ b/src/cursor.zig
@@ -4,7 +4,7 @@ const c = @import("c.zig");
const LayerSurface = @import("layer_surface.zig").LayerSurface;
const Log = @import("log.zig").Log;
const Output = @import("output.zig").Output;
-const Seat = @import("seat.zig").Seat;
+const Seat = @import("seat.zig");
const View = @import("view.zig").View;
const ViewStack = @import("view_stack.zig").ViewStack;
diff --git a/src/input_manager.zig b/src/input_manager.zig
index 4a4f841..561e9fa 100644
--- a/src/input_manager.zig
+++ b/src/input_manager.zig
@@ -5,7 +5,7 @@ const std = @import("std");
const c = @import("c.zig");
const Log = @import("log.zig").Log;
-const Seat = @import("seat.zig").Seat;
+const Seat = @import("seat.zig");
const Server = @import("server.zig");
const default_seat_name = "default";
diff --git a/src/keyboard.zig b/src/keyboard.zig
index 3cd8fb2..313a984 100644
--- a/src/keyboard.zig
+++ b/src/keyboard.zig
@@ -2,7 +2,7 @@ const std = @import("std");
const c = @import("c.zig");
const Log = @import("log.zig").Log;
-const Seat = @import("seat.zig").Seat;
+const Seat = @import("seat.zig");
pub const Keyboard = struct {
const Self = @This();
diff --git a/src/seat.zig b/src/seat.zig
index 8a365c7..cfbcd56 100644
--- a/src/seat.zig
+++ b/src/seat.zig
@@ -1,3 +1,5 @@
+const Self = @This();
+
const c = @import("c.zig");
const std = @import("std");
@@ -15,269 +17,265 @@ const FocusTarget = union(enum) {
none: void,
};
-pub const Seat = struct {
- const Self = @This();
-
- input_manager: *InputManager,
- wlr_seat: *c.wlr_seat,
-
- /// Multiple mice are handled by the same Cursor
- cursor: Cursor,
+input_manager: *InputManager,
+wlr_seat: *c.wlr_seat,
- /// Mulitple keyboards are handled separately
- keyboards: std.TailQueue(Keyboard),
+/// Multiple mice are handled by the same Cursor
+cursor: Cursor,
- /// Currently focused output, may be the noop output if no
- focused_output: *Output,
+/// Mulitple keyboards are handled separately
+keyboards: std.TailQueue(Keyboard),
- /// Currently focused view if any
- focused_view: ?*View,
+/// Currently focused output, may be the noop output if no
+focused_output: *Output,
- /// Stack of views in most recently focused order
- /// If there is a currently focused view, it is on top.
- focus_stack: ViewStack(*View),
+/// Currently focused view if any
+focused_view: ?*View,
- /// Currently focused layer, if any. While this is non-null, no views may
- /// recieve focus.
- focused_layer: ?*LayerSurface,
+/// Stack of views in most recently focused order
+/// If there is a currently focused view, it is on top.
+focus_stack: ViewStack(*View),
- listen_request_set_selection: c.wl_listener,
+/// Currently focused layer, if any. While this is non-null, no views may
+/// recieve focus.
+focused_layer: ?*LayerSurface,
- pub fn init(self: *Self, input_manager: *InputManager, name: []const u8) !void {
- self.input_manager = input_manager;
+listen_request_set_selection: c.wl_listener,
- // This will be automatically destroyed when the display is destroyed
- self.wlr_seat = c.wlr_seat_create(input_manager.server.wl_display, name.ptr) orelse
- return error.CantCreateWlrSeat;
+pub fn init(self: *Self, input_manager: *InputManager, name: []const u8) !void {
+ self.input_manager = input_manager;
- try self.cursor.init(self);
- errdefer self.cursor.destroy();
+ // This will be automatically destroyed when the display is destroyed
+ self.wlr_seat = c.wlr_seat_create(input_manager.server.wl_display, name.ptr) orelse
+ return error.CantCreateWlrSeat;
- self.keyboards = std.TailQueue(Keyboard).init();
+ try self.cursor.init(self);
+ errdefer self.cursor.destroy();
- self.focused_output = &self.input_manager.server.root.noop_output;
+ self.keyboards = std.TailQueue(Keyboard).init();
- self.focused_view = null;
+ self.focused_output = &self.input_manager.server.root.noop_output;
- self.focus_stack.init();
+ self.focused_view = null;
- self.focused_layer = null;
+ self.focus_stack.init();
- self.listen_request_set_selection.notify = handleRequestSetSelection;
- c.wl_signal_add(&self.wlr_seat.events.request_set_selection, &self.listen_request_set_selection);
- }
+ self.focused_layer = null;
- pub fn deinit(self: *Self) void {
- self.cursor.deinit();
+ self.listen_request_set_selection.notify = handleRequestSetSelection;
+ c.wl_signal_add(&self.wlr_seat.events.request_set_selection, &self.listen_request_set_selection);
+}
- while (self.keyboards.pop()) |node| {
- self.input_manager.server.allocator.destroy(node);
- }
+pub fn deinit(self: *Self) void {
+ self.cursor.deinit();
- while (self.focus_stack.first) |node| {
- self.focus_stack.remove(node);
- self.input_manager.server.allocator.destroy(node);
- }
+ while (self.keyboards.pop()) |node| {
+ self.input_manager.server.allocator.destroy(node);
}
- /// Set the current focus. If a visible view is passed it will be focused.
- /// If null is passed, the first visible view in the focus stack will be focused.
- pub fn focus(self: *Self, _view: ?*View) void {
- var view = _view;
-
- // While a layer surface is focused, views may not recieve focus
- if (self.focused_layer != null) {
- std.debug.assert(self.focused_view == null);
- return;
- }
-
- // If view is null or not currently visible
- if (if (view) |v|
- v.output != self.focused_output or
- v.current_tags & self.focused_output.current_focused_tags == 0
- else
- true) {
- // Set view to the first currently visible view on in the focus stack if any
- var it = ViewStack(*View).iterator(
- self.focus_stack.first,
- self.focused_output.current_focused_tags,
- );
- view = while (it.next()) |node| {
- if (node.view.output == self.focused_output) {
- break node.view;
- }
- } else null;
- }
-
- if (view) |view_to_focus| {
- // Find or allocate a new node in the focus stack for the target view
- var it = self.focus_stack.first;
- while (it) |node| : (it = node.next) {
- // If the view is found, move it to the top of the stack
- if (node.view == view_to_focus) {
- const new_focus_node = self.focus_stack.remove(node);
- self.focus_stack.push(node);
- break;
- }
- } else {
- // The view is not in the stack, so allocate a new node and prepend it
- const new_focus_node = self.input_manager.server.allocator.create(
- ViewStack(*View).Node,
- ) catch unreachable;
- new_focus_node.view = view_to_focus;
- self.focus_stack.push(new_focus_node);
- }
-
- // Focus the target view
- self.setFocusRaw(.{ .view = view_to_focus });
- } else {
- // Otherwise clear the focus
- self.setFocusRaw(.{ .none = {} });
- }
+ while (self.focus_stack.first) |node| {
+ self.focus_stack.remove(node);
+ self.input_manager.server.allocator.destroy(node);
}
+}
- /// Switch focus to the target, handling unfocus and input inhibition
- /// properly. This should only be called directly if dealing with layers.
- pub fn setFocusRaw(self: *Self, focus_target: FocusTarget) void {
- // If the target is already focused, do nothing
- if (switch (focus_target) {
- .view => |target_view| target_view == self.focused_view,
- .layer => |target_layer| target_layer == self.focused_layer,
- .none => false,
- }) {
- return;
- }
+/// Set the current focus. If a visible view is passed it will be focused.
+/// If null is passed, the first visible view in the focus stack will be focused.
+pub fn focus(self: *Self, _view: ?*View) void {
+ var view = _view;
- // Obtain the target wlr_surface
- const target_wlr_surface = switch (focus_target) {
- .view => |target_view| target_view.wlr_surface.?,
- .layer => |target_layer| target_layer.wlr_layer_surface.surface.?,
- .none => null,
- };
-
- // If input is not allowed on the target surface (e.g. due to an active
- // input inhibitor) do not set focus. If there is no target surface we
- // still clear the focus.
- if (if (target_wlr_surface) |wlr_surface|
- self.input_manager.inputAllowed(wlr_surface)
- else
- true) {
- // First clear the current focus
- if (self.focused_view) |current_focus| {
- std.debug.assert(self.focused_layer == null);
- current_focus.setFocused(false);
- self.focused_view = null;
- }
- if (self.focused_layer) |current_focus| {
- std.debug.assert(self.focused_view == null);
- self.focused_layer = null;
- }
- c.wlr_seat_keyboard_clear_focus(self.wlr_seat);
-
- // Set the new focus
- switch (focus_target) {
- .view => |target_view| {
- std.debug.assert(self.focused_output == target_view.output);
- target_view.setFocused(true);
- self.focused_view = target_view;
- },
- .layer => |target_layer| blk: {
- std.debug.assert(self.focused_output == target_layer.output);
- self.focused_layer = target_layer;
- },
- .none => {},
- }
+ // While a layer surface is focused, views may not recieve focus
+ if (self.focused_layer != null) {
+ std.debug.assert(self.focused_view == null);
+ return;
+ }
- // Tell wlroots to send the new keyboard focus if we have a target
- if (target_wlr_surface) |wlr_surface| {
- const keyboard: *c.wlr_keyboard = c.wlr_seat_get_keyboard(self.wlr_seat);
- c.wlr_seat_keyboard_notify_enter(
- self.wlr_seat,
- wlr_surface,
- &keyboard.keycodes,
- keyboard.num_keycodes,
- &keyboard.modifiers,
- );
+ // If view is null or not currently visible
+ if (if (view) |v|
+ v.output != self.focused_output or
+ v.current_tags & self.focused_output.current_focused_tags == 0
+ else
+ true) {
+ // Set view to the first currently visible view on in the focus stack if any
+ var it = ViewStack(*View).iterator(
+ self.focus_stack.first,
+ self.focused_output.current_focused_tags,
+ );
+ view = while (it.next()) |node| {
+ if (node.view.output == self.focused_output) {
+ break node.view;
}
- }
+ } else null;
}
- /// Handle the unmapping of a view, removing it from the focus stack and
- /// setting the focus if needed.
- pub fn handleViewUnmap(self: *Self, view: *View) void {
- // Remove the node from the focus stack and destroy it.
+ if (view) |view_to_focus| {
+ // Find or allocate a new node in the focus stack for the target view
var it = self.focus_stack.first;
while (it) |node| : (it = node.next) {
- if (node.view == view) {
- self.focus_stack.remove(node);
- self.input_manager.server.allocator.destroy(node);
+ // If the view is found, move it to the top of the stack
+ if (node.view == view_to_focus) {
+ const new_focus_node = self.focus_stack.remove(node);
+ self.focus_stack.push(node);
break;
}
+ } else {
+ // The view is not in the stack, so allocate a new node and prepend it
+ const new_focus_node = self.input_manager.server.allocator.create(
+ ViewStack(*View).Node,
+ ) catch unreachable;
+ new_focus_node.view = view_to_focus;
+ self.focus_stack.push(new_focus_node);
}
- // If the unmapped view is focused, choose a new focus
+ // Focus the target view
+ self.setFocusRaw(.{ .view = view_to_focus });
+ } else {
+ // Otherwise clear the focus
+ self.setFocusRaw(.{ .none = {} });
+ }
+}
+
+/// Switch focus to the target, handling unfocus and input inhibition
+/// properly. This should only be called directly if dealing with layers.
+pub fn setFocusRaw(self: *Self, focus_target: FocusTarget) void {
+ // If the target is already focused, do nothing
+ if (switch (focus_target) {
+ .view => |target_view| target_view == self.focused_view,
+ .layer => |target_layer| target_layer == self.focused_layer,
+ .none => false,
+ }) {
+ return;
+ }
+
+ // Obtain the target wlr_surface
+ const target_wlr_surface = switch (focus_target) {
+ .view => |target_view| target_view.wlr_surface.?,
+ .layer => |target_layer| target_layer.wlr_layer_surface.surface.?,
+ .none => null,
+ };
+
+ // If input is not allowed on the target surface (e.g. due to an active
+ // input inhibitor) do not set focus. If there is no target surface we
+ // still clear the focus.
+ if (if (target_wlr_surface) |wlr_surface|
+ self.input_manager.inputAllowed(wlr_surface)
+ else
+ true) {
+ // First clear the current focus
if (self.focused_view) |current_focus| {
- if (current_focus == view) {
- self.focus(null);
- }
+ std.debug.assert(self.focused_layer == null);
+ current_focus.setFocused(false);
+ self.focused_view = null;
+ }
+ if (self.focused_layer) |current_focus| {
+ std.debug.assert(self.focused_view == null);
+ self.focused_layer = null;
+ }
+ c.wlr_seat_keyboard_clear_focus(self.wlr_seat);
+
+ // Set the new focus
+ switch (focus_target) {
+ .view => |target_view| {
+ std.debug.assert(self.focused_output == target_view.output);
+ target_view.setFocused(true);
+ self.focused_view = target_view;
+ },
+ .layer => |target_layer| blk: {
+ std.debug.assert(self.focused_output == target_layer.output);
+ self.focused_layer = target_layer;
+ },
+ .none => {},
}
- }
- /// Handle any user-defined keybinding for the passed keysym and modifiers
- /// Returns true if the key was handled
- pub fn handleKeybinding(self: *Self, keysym: c.xkb_keysym_t, modifiers: u32) bool {
- for (self.input_manager.server.config.keybinds.items) |keybind| {
- if (modifiers == keybind.modifiers and keysym == keybind.keysym) {
- // Execute the bound command
- keybind.command(self, keybind.arg);
- return true;
- }
+ // Tell wlroots to send the new keyboard focus if we have a target
+ if (target_wlr_surface) |wlr_surface| {
+ const keyboard: *c.wlr_keyboard = c.wlr_seat_get_keyboard(self.wlr_seat);
+ c.wlr_seat_keyboard_notify_enter(
+ self.wlr_seat,
+ wlr_surface,
+ &keyboard.keycodes,
+ keyboard.num_keycodes,
+ &keyboard.modifiers,
+ );
}
- return false;
}
-
- /// Add a newly created input device to the seat and update the reported
- /// capabilities.
- pub fn addDevice(self: *Self, device: *c.wlr_input_device) !void {
- switch (device.type) {
- .WLR_INPUT_DEVICE_KEYBOARD => self.addKeyboard(device) catch unreachable,
- .WLR_INPUT_DEVICE_POINTER => self.addPointer(device),
- else => {},
+}
+
+/// Handle the unmapping of a view, removing it from the focus stack and
+/// setting the focus if needed.
+pub fn handleViewUnmap(self: *Self, view: *View) void {
+ // Remove the node from the focus stack and destroy it.
+ var it = self.focus_stack.first;
+ while (it) |node| : (it = node.next) {
+ if (node.view == view) {
+ self.focus_stack.remove(node);
+ self.input_manager.server.allocator.destroy(node);
+ break;
}
+ }
- // We need to let the wlr_seat know what our capabilities are, which is
- // communiciated to the client. We always have a cursor, even if
- // there are no pointer devices, so we always include that capability.
- var caps = @intCast(u32, c.WL_SEAT_CAPABILITY_POINTER);
- // if list not empty
- if (self.keyboards.len > 0) {
- caps |= @intCast(u32, c.WL_SEAT_CAPABILITY_KEYBOARD);
+ // If the unmapped view is focused, choose a new focus
+ if (self.focused_view) |current_focus| {
+ if (current_focus == view) {
+ self.focus(null);
}
- c.wlr_seat_set_capabilities(self.wlr_seat, caps);
}
-
- fn addKeyboard(self: *Self, device: *c.wlr_input_device) !void {
- c.wlr_seat_set_keyboard(self.wlr_seat, device);
-
- const node = try self.keyboards.allocateNode(self.input_manager.server.allocator);
- try node.data.init(self, device);
- self.keyboards.append(node);
+}
+
+/// Handle any user-defined keybinding for the passed keysym and modifiers
+/// Returns true if the key was handled
+pub fn handleKeybinding(self: *Self, keysym: c.xkb_keysym_t, modifiers: u32) bool {
+ for (self.input_manager.server.config.keybinds.items) |keybind| {
+ if (modifiers == keybind.modifiers and keysym == keybind.keysym) {
+ // Execute the bound command
+ keybind.command(self, keybind.arg);
+ return true;
+ }
}
-
- fn addPointer(self: Self, device: *c.struct_wlr_input_device) void {
- // We don't do anything special with pointers. All of our pointer handling
- // is proxied through wlr_cursor. On another compositor, you might take this
- // opportunity to do libinput configuration on the device to set
- // acceleration, etc.
- c.wlr_cursor_attach_input_device(self.cursor.wlr_cursor, device);
+ return false;
+}
+
+/// Add a newly created input device to the seat and update the reported
+/// capabilities.
+pub fn addDevice(self: *Self, device: *c.wlr_input_device) !void {
+ switch (device.type) {
+ .WLR_INPUT_DEVICE_KEYBOARD => self.addKeyboard(device) catch unreachable,
+ .WLR_INPUT_DEVICE_POINTER => self.addPointer(device),
+ else => {},
}
- fn handleRequestSetSelection(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
- const self = @fieldParentPtr(Self, "listen_request_set_selection", listener.?);
- const event = @ptrCast(
- *c.wlr_seat_request_set_selection_event,
- @alignCast(@alignOf(*c.wlr_seat_request_set_selection_event), data),
- );
- c.wlr_seat_set_selection(self.wlr_seat, event.source, event.serial);
+ // We need to let the wlr_seat know what our capabilities are, which is
+ // communiciated to the client. We always have a cursor, even if
+ // there are no pointer devices, so we always include that capability.
+ var caps = @intCast(u32, c.WL_SEAT_CAPABILITY_POINTER);
+ // if list not empty
+ if (self.keyboards.len > 0) {
+ caps |= @intCast(u32, c.WL_SEAT_CAPABILITY_KEYBOARD);
}
-};
+ c.wlr_seat_set_capabilities(self.wlr_seat, caps);
+}
+
+fn addKeyboard(self: *Self, device: *c.wlr_input_device) !void {
+ c.wlr_seat_set_keyboard(self.wlr_seat, device);
+
+ const node = try self.keyboards.allocateNode(self.input_manager.server.allocator);
+ try node.data.init(self, device);
+ self.keyboards.append(node);
+}
+
+fn addPointer(self: Self, device: *c.struct_wlr_input_device) void {
+ // We don't do anything special with pointers. All of our pointer handling
+ // is proxied through wlr_cursor. On another compositor, you might take this
+ // opportunity to do libinput configuration on the device to set
+ // acceleration, etc.
+ c.wlr_cursor_attach_input_device(self.cursor.wlr_cursor, device);
+}
+
+fn handleRequestSetSelection(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
+ const self = @fieldParentPtr(Self, "listen_request_set_selection", listener.?);
+ const event = @ptrCast(
+ *c.wlr_seat_request_set_selection_event,
+ @alignCast(@alignOf(*c.wlr_seat_request_set_selection_event), data),
+ );
+ c.wlr_seat_set_selection(self.wlr_seat, event.source, event.serial);
+}