Crylia/japanese-srs-trainer-wanikani
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rewrote a lot of stuff especially the bluetooth module. fixed some errors

Browse Source
This commit is contained in:
Rene Kievits
2022-09-21 21:10:17 +02:00
parent 3d8b240ef0
commit b5c6dc31f7
59 changed files with 1138 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awesome/src/widgets/audio.lua
View File

@@ -7,6 +7,10 @@ local dpi = require("beautiful").xresources.apply_dpi
local gears = require("gears")
local wibox = require("wibox")
local capi = {
awesome = awesome,
}
-- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/audio/"
@@ -55,7 +59,7 @@ return function(s)
widget = wibox.container.background
}
awesome.connect_signal(
capi.awesome.connect_signal(
"audio::get",
function(muted, volume)
if muted then
@@ -95,8 +99,8 @@ return function(s)
audio_widget:connect_signal(
"button::press",
function()
awesome.emit_signal("volume_controller::toggle", s)
awesome.emit_signal("volume_controller::toggle:keygrabber")
capi.awesome.emit_signal("volume_controller::toggle", s)
capi.awesome.emit_signal("volume_controller::toggle:keygrabber")
end
)

6
awesome/src/widgets/battery.lua
View File

@@ -11,7 +11,9 @@ local naughty = require("naughty")
local upower_glib = lgi.require("UPowerGlib")
local wibox = require("wibox")
require("src.core.signals")
local capi = {
awesome = awesome,
}
-- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/battery/"
@@ -195,7 +197,7 @@ return function(battery_kind)
battery_widget:get_children_by_id("icon")[1].image = gears.surface.load_uncached(gears.color.recolor_image(icondir ..
icon .. '.svg', Theme_config.battery.fg))
awesome.emit_signal("update::battery_widget", battery_percentage, icondir .. icon .. ".svg")
capi.awesome.emit_signal("update::battery_widget", battery_percentage, icondir .. icon .. ".svg")
end

10
awesome/src/widgets/bluetooth.lua
View File

@@ -8,6 +8,10 @@ local dpi = require("beautiful").xresources.apply_dpi
local gears = require("gears")
local wibox = require("wibox")
local capi = {
awesome = awesome,
}
-- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/bluetooth/"
@@ -42,7 +46,7 @@ return function(s)
-- Hover signal to change color when mouse is over
Hover_signal(bluetooth_widget)
awesome.connect_signal("state", function(state)
capi.awesome.connect_signal("state", function(state)
if state then
bluetooth_widget:get_children_by_id("icon")[1]:set_image(gears.color.recolor_image(icondir .. "bluetooth-on.svg",
Theme_config.bluetooth.fg))
@@ -56,9 +60,9 @@ return function(s)
"button::press",
function(_, _, _, key)
if key == 1 then
awesome.emit_signal("bluetooth_controller::toggle", s)
capi.awesome.emit_signal("bluetooth_controller::toggle", s)
else
awesome.emit_signal("toggle_bluetooth")
capi.awesome.emit_signal("toggle_bluetooth")
end
end
)

14
awesome/src/widgets/cpu_info.lua
View File

@@ -11,6 +11,10 @@ local wibox = require("wibox")
local color = require("src.lib.color")
local rubato = require("src.lib.rubato")
local capi = {
awesome = awesome,
}
local icon_dir = awful.util.getdir("config") .. "src/assets/icons/cpu/"
--TODO: Add tooltip with more CPU and per core information
@@ -145,7 +149,7 @@ return function(widget, _)
widget = wibox.container.background
}
awesome.connect_signal(
capi.awesome.connect_signal(
"update::cpu_usage",
function(usage)
cpu_usage_widget.container.cpu_layout.label.text = usage .. "%"
@@ -172,7 +176,7 @@ return function(widget, _)
r_timed_cpu_bg.target, g_timed_cpu_bg.target, b_timed_cpu_bg.target = color.utils.hex_to_rgba(newbg)
end
awesome.connect_signal(
capi.awesome.connect_signal(
"update::cpu_temp",
function(temp)
local temp_icon
@@ -191,18 +195,18 @@ return function(widget, _)
cpu_temp.container.cpu_layout.icon_margin.icon_layout.icon:set_image(temp_icon)
set_bg(temp_color)
cpu_temp.container.cpu_layout.label.text = math.floor(temp) .. "°C"
awesome.emit_signal("update::cpu_temp_widget", temp, temp_icon)
capi.awesome.emit_signal("update::cpu_temp_widget", temp, temp_icon)
end
)
awesome.connect_signal(
capi.awesome.connect_signal(
"update::cpu_freq_average",
function(average)
cpu_clock.container.cpu_layout.label.text = average .. "Mhz"
end
)
awesome.connect_signal(
capi.awesome.connect_signal(
"update::cpu_freq_core",
function(freq)
cpu_clock.container.cpu_layout.label.text = freq .. "Mhz"

6
awesome/src/widgets/date.lua
View File

@@ -9,6 +9,10 @@ local gears = require("gears")
local wibox = require("wibox")
require("src.core.signals")
local capi = {
awesome = awesome,
}
-- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/date/"
@@ -65,7 +69,7 @@ return function()
date_widget:buttons {
gears.table.join(
awful.button({}, 1, function()
awesome.emit_signal("calendar::toggle", date_widget)
capi.awesome.emit_signal("calendar::toggle", date_widget)
end)
)
}

8
awesome/src/widgets/gpu_info.lua
View File

@@ -11,6 +11,10 @@ local wibox = require("wibox")
local color = require("src.lib.color")
local rubato = require("src.lib.rubato")
local capi = {
awesome = awesome,
}
local icon_dir = awful.util.getdir("config") .. "src/assets/icons/cpu/"
return function(widget)
@@ -104,7 +108,7 @@ return function(widget)
Hover_signal(gpu_usage_widget)
-- GPU Utilization
awesome.connect_signal(
capi.awesome.connect_signal(
"update::gpu_usage",
function(stdout)
gpu_usage_widget.container.gpu_layout.label.text = stdout:gsub("\n", "") .. "%"
@@ -134,7 +138,7 @@ return function(widget)
end
-- GPU Temperature
awesome.connect_signal(
capi.awesome.connect_signal(
"update::gpu_temp",
function(stdout)

29
awesome/src/widgets/kblayout.lua
View File

@@ -8,6 +8,11 @@ local dpi = require("beautiful").xresources.apply_dpi
local gears = require("gears")
local wibox = require("wibox")
local capi = {
awesome = awesome,
mousegrabber = mousegrabber,
}
-- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/kblayout/"
@@ -61,7 +66,7 @@ return function(s)
function(stdout)
local layout = stdout:gsub("\n", "")
kblayout_widget.container.kblayout_layout.label.text = layout
awesome.emit_signal("update::background:kblayout")
capi.awesome.emit_signal("update::background:kblayout")
end
)
end
@@ -216,7 +221,7 @@ return function(s)
Hover_signal(kb_layout_item)
awesome.connect_signal(
capi.awesome.connect_signal(
"update::background:kblayout",
function()
awful.spawn.easy_async_with_shell(
@@ -244,8 +249,8 @@ return function(s)
awful.spawn.easy_async_with_shell(
"setxkbmap " .. keymap,
function()
awesome.emit_signal("kblayout::hide:kbmenu")
mousegrabber.stop()
capi.awesome.emit_signal("kblayout::hide:kbmenu")
capi.mousegrabber.stop()
get_kblayout()
end
)
@@ -294,11 +299,11 @@ return function(s)
kb_menu_widget:connect_signal(
"mouse::leave",
function()
mousegrabber.run(
capi.mousegrabber.run(
function()
kblayout_widget.bg = Theme_config.kblayout.bg
awesome.emit_signal("kblayout::hide:kbmenu")
mousegrabber.stop()
capi.awesome.emit_signal("kblayout::hide:kbmenu")
capi.mousegrabber.stop()
return true
end,
"arrow"
@@ -344,7 +349,7 @@ return function(s)
)
end
awesome.connect_signal(
capi.awesome.connect_signal(
"kblayout::toggle",
function()
toggle_kb_layout()
@@ -358,15 +363,15 @@ return function(s)
autostart = false,
stop_event = 'release',
keypressed_callback = function(self, mod, key, command)
awesome.emit_signal("kblayout::hide:kbmenu")
mousegrabber.stop()
capi.awesome.emit_signal("kblayout::hide:kbmenu")
capi.mousegrabber.stop()
end
}
kblayout_widget:connect_signal(
"button::press",
function()
mousegrabber.stop()
capi.mousegrabber.stop()
if kb_menu_widget.visible then
kb_menu_widget.visible = false
kblayout_keygrabber:stop()
@@ -377,7 +382,7 @@ return function(s)
end
)
awesome.connect_signal(
capi.awesome.connect_signal(
"kblayout::hide:kbmenu",
function()
kb_menu_widget.visible = false

8
awesome/src/widgets/network.lua
View File

@@ -9,6 +9,10 @@ local gears = require("gears")
local naughty = require("naughty")
local wibox = require("wibox")
local capi = {
awesome = awesome,
}
-- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/network/"
@@ -159,7 +163,7 @@ return function()
local icon = "wifi-strength"
if not stdout:match("Connected but no internet") then
if startup or reconnect_startup then
awesome.emit_signal("system::network_connected")
capi.awesome.emit_signal("system::network_connected")
end
icon = icon .. '-' .. tostring(strength)
update_wireless_data(true)
@@ -219,7 +223,7 @@ return function()
else
update_tooltip("You are connected to:\nEthernet Interface <b>" .. interfaces.lan_interface .. "</b>")
if startup or reconnect_startup then
awesome.emit_signal("system::network_connected")
capi.awesome.emit_signal("system::network_connected")
notify_connected()
update_startup()
end

6
awesome/src/widgets/power.lua
View File

@@ -8,6 +8,10 @@ local dpi = require("beautiful").xresources.apply_dpi
local gears = require("gears")
local wibox = require("wibox")
local capi = {
awesome = awesome,
}
-- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/power/"
@@ -55,7 +59,7 @@ return function()
power_widget:connect_signal(
"button::release",
function()
awesome.emit_signal("module::powermenu:show")
capi.awesome.emit_signal("module::powermenu:show")
end
)

6
awesome/src/widgets/ram_info.lua
View File

@@ -9,6 +9,10 @@ local gears = require("gears")
local watch = awful.widget.watch
local wibox = require("wibox")
local capi = {
awesome = awesome,
}
local icon_dir = awful.util.getdir("config") .. "src/assets/icons/cpu/"
return function()
@@ -57,7 +61,7 @@ return function()
Hover_signal(ram_widget)
awesome.connect_signal(
capi.awesome.connect_signal(
"update::ram_widget",
function(MemTotal, MemFree, MemAvailable)
local ram_string = tostring(string.format("%.1f", ((MemTotal - MemAvailable) / 1024 / 1024)) ..

8
awesome/src/widgets/systray.lua
View File

@@ -7,6 +7,10 @@ local dpi = require("beautiful").xresources.apply_dpi
local gears = require("gears")
local wibox = require("wibox")
local capi = {
awesome = awesome,
}
Theme.bg_systray = Theme_config.systray.bg
Theme.systray_icon_spacing = dpi(10)
@@ -29,8 +33,8 @@ return function(s)
bg = Theme_config.systray.bg
}
awesome.connect_signal("systray::update", function()
local num_entries = awesome.systray()
capi.awesome.connect_signal("systray::update", function()
local num_entries = capi.awesome.systray()
if num_entries == 0 then
systray.container.st:set_margins(0)

19
awesome/src/widgets/taglist.lua
View File

@@ -8,8 +8,11 @@ local awful = require("awful")
local gears = require("gears")
local dpi = require("beautiful").xresources.apply_dpi
local color = require("src.lib.color")
local rubato = require("src.lib.rubato")
local capi = {
client = client,
}
local modkey = User_config.modkey
local list_update = function(widget, buttons, _, _, objects)
widget:reset()
@@ -142,8 +145,8 @@ return function(s)
{ modkey },
1,
function(t)
if client.focus then
client.focus:move_to_tag(t)
if capi.client.focus then
capi.client.focus:move_to_tag(t)
end
end
),
@@ -151,8 +154,8 @@ return function(s)
{},
3,
function(t)
if client.focus then
client.focus:toggle_tag(t)
if capi.client.focus then
capi.client.focus:toggle_tag(t)
end
end
),
@@ -160,8 +163,8 @@ return function(s)
{ modkey },
3,
function(t)
if client.focus then
client.focus:toggle_tag(t)
if capi.client.focus then
capi.client.focus:toggle_tag(t)
end
end
),

9
awesome/src/widgets/tasklist.lua
View File

@@ -8,8 +8,9 @@ local wibox = require('wibox')
local dpi = require('beautiful').xresources.apply_dpi
local gears = require('gears')
local color = require("src.lib.color")
local rubato = require("src.lib.rubato")
local capi = {
client = client,
}
local list_update = function(widget, buttons, label, _, objects)
widget:reset()
@@ -94,7 +95,7 @@ local list_update = function(widget, buttons, label, _, objects)
local text, _ = label(object, task_widget.container.layout_it.title)
if object == client.focus then
if object == capi.client.focus then
if text == nil or text == '' then
task_widget.container.layout_it.title:set_margins(0)
else
@@ -136,7 +137,7 @@ return function(s)
{},
1,
function(c)
if c == client.focus then
if c == capi.client.focus then
c.minimized = true
else
c.minimized = false