Nulo/river
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Correct a few function names to camelCase

Browse source
This commit is contained in:
Isaac Freund 2020-03-25 16:29:30 +01:00
parent ac0c0449dc
commit 6c12c23cdb
No known key found for this signature in database
GPG key ID: 86DED400DDFD7A11
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/keyboard.zig
View file

@ -94,7 +94,7 @@ pub const Keyboard = struct {
// process it as a compositor keybinding. // process it as a compositor keybinding.
var i: usize = 0; var i: usize = 0;
while (i < nsyms) { while (i < nsyms) {
handled = keyboard.seat.server.handle_keybinding(syms.?[i]); handled = keyboard.seat.server.handleKeybinding(syms.?[i]);
if (handled) { if (handled) {
break; break;
} }

10
src/server.zig
View file

@ -63,10 +63,10 @@ pub const Server = struct {
try self.seat.init(self); try self.seat.init(self);
// Register our listeners for new outputs and xdg_surfaces. // Register our listeners for new outputs and xdg_surfaces.
self.listen_new_output.notify = handle_new_output; self.listen_new_output.notify = handleNewOutput;
c.wl_signal_add(&self.wlr_backend.events.new_output, &self.listen_new_output); c.wl_signal_add(&self.wlr_backend.events.new_output, &self.listen_new_output);
self.listen_new_xdg_surface.notify = handle_new_xdg_surface; self.listen_new_xdg_surface.notify = handleNewXdgSurface;
c.wl_signal_add(&self.wlr_xdg_shell.events.new_surface, &self.listen_new_xdg_surface); c.wl_signal_add(&self.wlr_xdg_shell.events.new_surface, &self.listen_new_xdg_surface);
} }
@ -101,7 +101,7 @@ pub const Server = struct {
c.wl_display_run(self.wl_display); c.wl_display_run(self.wl_display);
} }
pub fn handle_keybinding(self: *Self, sym: c.xkb_keysym_t) bool { pub fn handleKeybinding(self: *Self, sym: c.xkb_keysym_t) bool {
// Here we handle compositor keybindings. This is when the compositor is // Here we handle compositor keybindings. This is when the compositor is
// processing keys, rather than passing them on to the client for its own // processing keys, rather than passing them on to the client for its own
// processing. // processing.
@ -125,13 +125,13 @@ pub const Server = struct {
return true; return true;
} }
fn handle_new_output(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void { fn handleNewOutput(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
const server = @fieldParentPtr(Server, "listen_new_output", listener.?); const server = @fieldParentPtr(Server, "listen_new_output", listener.?);
const wlr_output = @ptrCast(*c.wlr_output, @alignCast(@alignOf(*c.wlr_output), data)); const wlr_output = @ptrCast(*c.wlr_output, @alignCast(@alignOf(*c.wlr_output), data));
server.root.addOutput(wlr_output); server.root.addOutput(wlr_output);
} }
fn handle_new_xdg_surface(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void { fn handleNewXdgSurface(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
// This event is raised when wlr_xdg_shell receives a new xdg surface from a // This event is raised when wlr_xdg_shell receives a new xdg surface from a
// client, either a toplevel (application window) or popup. // client, either a toplevel (application window) or popup.
const server = @fieldParentPtr(Server, "listen_new_xdg_surface", listener.?); const server = @fieldParentPtr(Server, "listen_new_xdg_surface", listener.?);