Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mapping: eliminate "self" naming convention

Browse Source
This commit is contained in:
Isaac Freund 2024-03-14 12:22:15 +01:00
parent 904b623b84
commit 28f30b2571
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
river/Mapping.zig
View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
const Self = @This(); const Mapping = @This();
const std = @import("std"); const std = @import("std");
const wlr = @import("wlroots"); const wlr = @import("wlroots");
@ -42,14 +42,14 @@ pub fn init(
modifiers: wlr.Keyboard.ModifierMask, modifiers: wlr.Keyboard.ModifierMask,
command_args: []const []const u8, command_args: []const []const u8,
options: Options, options: Options,
) !Self { ) !Mapping {
const owned_args = try util.gpa.alloc([:0]u8, command_args.len); const owned_args = try util.gpa.alloc([:0]u8, command_args.len);
errdefer util.gpa.free(owned_args); errdefer util.gpa.free(owned_args);
for (command_args, 0..) |arg, i| { for (command_args, 0..) |arg, i| {
errdefer for (owned_args[0..i]) |a| util.gpa.free(a); errdefer for (owned_args[0..i]) |a| util.gpa.free(a);
owned_args[i] = try util.gpa.dupeZ(u8, arg); owned_args[i] = try util.gpa.dupeZ(u8, arg);
} }
return Self{ return Mapping{
.keysym = keysym, .keysym = keysym,
.modifiers = modifiers, .modifiers = modifiers,
.command_args = owned_args, .command_args = owned_args,
@ -57,28 +57,28 @@ pub fn init(
}; };
} }
pub fn deinit(self: Self) void { pub fn deinit(mapping: Mapping) void {
for (self.command_args) |arg| util.gpa.free(arg); for (mapping.command_args) |arg| util.gpa.free(arg);
util.gpa.free(self.command_args); util.gpa.free(mapping.command_args);
} }
/// Compare mapping with given keycode, modifiers and keyboard state /// Compare mapping with given keycode, modifiers and keyboard state
pub fn match( pub fn match(
self: Self, mapping: Mapping,
keycode: xkb.Keycode, keycode: xkb.Keycode,
modifiers: wlr.Keyboard.ModifierMask, modifiers: wlr.Keyboard.ModifierMask,
released: bool, released: bool,
xkb_state: *xkb.State, xkb_state: *xkb.State,
method: enum { no_translate, translate }, method: enum { no_translate, translate },
) bool { ) bool {
if (released != self.options.release) return false; if (released != mapping.options.release) return false;
const keymap = xkb_state.getKeymap(); const keymap = xkb_state.getKeymap();
// If the mapping has no pinned layout, use the active layout. // If the mapping has no pinned layout, use the active layout.
// It doesn't matter if the index is out of range, since xkbcommon // It doesn't matter if the index is out of range, since xkbcommon
// will fall back to the active layout if so. // will fall back to the active layout if so.
const layout_index = self.options.layout_index orelse xkb_state.keyGetLayout(keycode); const layout_index = mapping.options.layout_index orelse xkb_state.keyGetLayout(keycode);
switch (method) { switch (method) {
.no_translate => { .no_translate => {
@ -90,9 +90,9 @@ pub fn match(
0, 0,
); );
if (@as(u32, @bitCast(modifiers)) == @as(u32, @bitCast(self.modifiers))) { if (@as(u32, @bitCast(modifiers)) == @as(u32, @bitCast(mapping.modifiers))) {
for (keysyms) |sym| { for (keysyms) |sym| {
if (sym == self.keysym) { if (sym == mapping.keysym) {
return true; return true;
} }
} }
@ -111,9 +111,9 @@ pub fn match(
const consumed = xkb_state.keyGetConsumedMods2(keycode, .xkb); const consumed = xkb_state.keyGetConsumedMods2(keycode, .xkb);
const modifiers_translated = @as(u32, @bitCast(modifiers)) & ~consumed; const modifiers_translated = @as(u32, @bitCast(modifiers)) & ~consumed;
if (modifiers_translated == @as(u32, @bitCast(self.modifiers))) { if (modifiers_translated == @as(u32, @bitCast(mapping.modifiers))) {
for (keysyms_translated) |sym| { for (keysyms_translated) |sym| {
if (sym == self.keysym) { if (sym == mapping.keysym) {
return true; return true;
} }
} }