Mark/awesomewm
1
1
Fork 0
Code Issues 12 Pull Requests Projects Releases Wiki Activity

Reworked config, added module autoloader

Browse Source
This commit is contained in:
Mark
2022-07-16 19:06:55 -07:00
parent 9da54839fb
commit 2c034c36ed
20 changed files with 256 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ibus/init.lua
View File

@ -2,7 +2,7 @@ local util = require("modules.ibus.util")
return {
widgets = {
ibus = require("modules.ibus.widget").widget
keymap = require("modules.ibus.widget").widget
},
keybinds = require("modules.ibus.keybinds"),

4
modules/ibus/popup.lua
View File

@ -14,7 +14,7 @@ popup.widget = wibox.widget {
}
for k, l in pairs(conf.ibus_language_list) do
for k, l in pairs(config.ibus.language_list) do
l["widget_checkbox"] = wibox.widget {
checked = false,
@ -49,7 +49,7 @@ end
popup.update = function()
-- Update checkmarks
for _, l in pairs(conf.ibus_language_list) do
for _, l in pairs(config.ibus.language_list) do
if (util.current_engine == l["ibus_engine"]) then
l["widget_text"].bg = "#FF0000"
else

10
modules/ibus/util.lua
View File

@ -15,9 +15,9 @@ util.get = function(callback)
util.current_engine = string.gsub(stdout, "\n", "")
util.current_engine_index = nil
-- Find the current engine's index in conf.ibus_language_list.
-- Find the current engine's index in config.ibus.language_list.
-- If it is not there, util.current_engine_index will be nil.
for k, v in pairs(conf.ibus_language_list) do
for k, v in pairs(config.ibus.language_list) do
if (v["ibus_engine"] == util.current_engine) then
util.current_engine_index = k
end
@ -45,11 +45,11 @@ end
util.set = function(language_index, callback)
-- engine is an index of the language list above
local engine = conf.ibus_language_list[language_index]["ibus_engine"]
local engine = config.ibus.language_list[language_index]["ibus_engine"]
-- Get required engine, if one is given
local requires_engine
for k, v in pairs(conf.ibus_language_list) do
for k, v in pairs(config.ibus.language_list) do
if (v["ibus_engine"] == engine) then
requires_engine = v["requires_engine"]
end
@ -81,7 +81,7 @@ end
-- Calls util.set(callback) with next language in list.
util.next = function(callback)
if (util.current_engine_index == nil) or (util.current_engine_index == #conf.ibus_language_list) then
if (util.current_engine_index == nil) or (util.current_engine_index == #config.ibus.language_list) then
util.current_engine_index = 1
else
util.current_engine_index = util.current_engine_index + 1

2
modules/ibus/widget.lua
View File

@ -53,7 +53,7 @@ widget.widget:connect_signal("mouse::leave", function(result)
end)
widget.update = function()
widget.ibus_indicator_text.markup = conf.ibus_language_list[util.current_engine_index]["indicator_code"]
widget.ibus_indicator_text.markup = config.ibus.language_list[util.current_engine_index]["indicator_code"]
widget.xkb_indicator_text.markup = util.current_xkbmap
end