mirror of
https://github.com/MezzalunaWM/Mezzaluna.git
synced 2026-03-07 19:49:53 -05:00
fix merge breaking stuff
This commit is contained in:
parent
3cf05f2d9a
commit
f636efdfe9
4 changed files with 54 additions and 37 deletions
|
|
@ -11,19 +11,25 @@ mez.path.config = mez.fs.joinpath(env_conf, "mez", "init.lua")
|
|||
package.path = package.path..";"..mez.fs.joinpath(env_conf, "mez", "lua", "?.lua")
|
||||
|
||||
-- this is an example
|
||||
mez.api.add_keymap("alt", "a", function()
|
||||
print("hello from my keymap")
|
||||
end)
|
||||
mez.input.add_keymap("alt", "a", {
|
||||
press = function()
|
||||
print("hello from my keymap")
|
||||
end
|
||||
})
|
||||
|
||||
mez.api.add_keymap("alt", "t", function()
|
||||
print("spawning foot")
|
||||
mez.api.spawn("foot")
|
||||
end)
|
||||
mez.input.add_keymap("alt", "Return", {
|
||||
press = function()
|
||||
print("spawning foot")
|
||||
mez.api.spawn("foot")
|
||||
end
|
||||
})
|
||||
|
||||
mez.api.add_keymap("alt", "p", function()
|
||||
print("spawning foot")
|
||||
mez.api.spawn("wmenu-run")
|
||||
end)
|
||||
mez.api.add_keymap("alt", "p", {
|
||||
press = function()
|
||||
print("spawning foot")
|
||||
mez.api.spawn("wmenu-run")
|
||||
end
|
||||
})
|
||||
|
||||
-- mez.input.add_keymap("alt", "a", {
|
||||
-- press = function()
|
||||
|
|
|
|||
30
src/lua/api.zig
Normal file
30
src/lua/api.zig
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
const std = @import("std");
|
||||
const zlua = @import("zlua");
|
||||
|
||||
const gpa = std.heap.c_allocator;
|
||||
|
||||
const env_map = &@import("../main.zig").env_map;
|
||||
|
||||
pub fn spawn(L: *zlua.Lua) i32 {
|
||||
const nargs: i32 = L.getTop();
|
||||
|
||||
if (nargs < 1) {
|
||||
L.raiseErrorStr("Expected at least one arguments", .{});
|
||||
return 0;
|
||||
}
|
||||
|
||||
L.checkType(1, .string);
|
||||
|
||||
const cmd = L.toString(1) catch {
|
||||
L.raiseErrorStr("Lua error check your config", .{});
|
||||
return 0;
|
||||
};
|
||||
|
||||
var child = std.process.Child.init(&[_][]const u8{ "/bin/sh", "-c", cmd }, gpa);
|
||||
child.env_map = env_map;
|
||||
child.spawn() catch {
|
||||
std.log.err("Unable to spawn process \"{s}\"", .{cmd});
|
||||
};
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -9,7 +9,6 @@ const wlr = @import("wlroots");
|
|||
|
||||
const gpa = std.heap.c_allocator;
|
||||
const server = &@import("../main.zig").server;
|
||||
const env_map = &@import("../main.zig").env_map;
|
||||
|
||||
pub fn add_keymap(L: *zlua.Lua) i32 {
|
||||
const nargs: i32 = L.getTop();
|
||||
|
|
@ -26,7 +25,7 @@ pub fn add_keymap(L: *zlua.Lua) i32 {
|
|||
|
||||
var keymap: Keymap = undefined;
|
||||
keymap.options = .{
|
||||
.on_release = false,
|
||||
.repeat = true,
|
||||
};
|
||||
|
||||
const mod = L.toString(1) catch {
|
||||
|
|
@ -98,27 +97,3 @@ pub fn get_keybind(L: *zlua.Lua) i32 {
|
|||
_ = L;
|
||||
return 0;
|
||||
}
|
||||
|
||||
pub fn spawn(L: *zlua.Lua) i32 {
|
||||
const nargs: i32 = L.getTop();
|
||||
|
||||
if (nargs < 1) {
|
||||
L.raiseErrorStr("Expected at least one arguments", .{});
|
||||
return 0;
|
||||
}
|
||||
|
||||
L.checkType(1, .string);
|
||||
|
||||
const cmd = L.toString(1) catch {
|
||||
L.raiseErrorStr("Lua error check your config", .{});
|
||||
return 0;
|
||||
};
|
||||
|
||||
var child = std.process.Child.init(&[_][]const u8{ "/bin/sh", "-c", cmd }, gpa);
|
||||
child.env_map = env_map;
|
||||
child.spawn() catch {
|
||||
std.log.err("Unable to spawn process \"{s}\"", .{cmd});
|
||||
};
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ const zlua = @import("zlua");
|
|||
const Bridge = @import("bridge.zig");
|
||||
const Fs = @import("fs.zig");
|
||||
const Input = @import("input.zig");
|
||||
const Api = @import("api.zig");
|
||||
|
||||
const gpa = std.heap.c_allocator;
|
||||
|
||||
|
|
@ -63,6 +64,11 @@ pub fn init(self: *Lua) !void {
|
|||
self.state.newLib(input_funcs);
|
||||
self.state.setField(-2, "input");
|
||||
}
|
||||
{
|
||||
const api_funcs = zlua.fnRegsFromType(Api);
|
||||
self.state.newLib(api_funcs);
|
||||
self.state.setField(-2, "api");
|
||||
}
|
||||
}
|
||||
|
||||
loadRuntimeDir(self) catch |err| {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue