Add overflow widget. The top level folder wibox overrides the default awesome one. Fix bluez crashing awesome when no bluetooth
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
local awful = require("awful")
|
||||
local gears = require("gears")
|
||||
local dbus_proxy = require("dbus_proxy")
|
||||
local lgi = require("lgi")
|
||||
@@ -41,83 +42,91 @@ return function()
|
||||
end
|
||||
end
|
||||
|
||||
local ObjectManager = dbus_proxy.Proxy:new {
|
||||
bus = dbus_proxy.Bus.SYSTEM,
|
||||
name = "org.bluez",
|
||||
interface = "org.freedesktop.DBus.ObjectManager",
|
||||
path = "/"
|
||||
}
|
||||
awful.spawn.easy_async_with_shell(
|
||||
"lsusb | grep Bluetooth",
|
||||
function(stdout)
|
||||
stdout = stdout:gsub("\n", "")
|
||||
if stdout ~= "" or stdout == nil then
|
||||
local ObjectManager = dbus_proxy.Proxy:new {
|
||||
bus = dbus_proxy.Bus.SYSTEM,
|
||||
name = "org.bluez",
|
||||
interface = "org.freedesktop.DBus.ObjectManager",
|
||||
path = "/"
|
||||
}
|
||||
|
||||
local Adapter = dbus_proxy.Proxy:new {
|
||||
bus = dbus_proxy.Bus.SYSTEM,
|
||||
name = "org.bluez",
|
||||
interface = "org.bluez.Adapter1",
|
||||
path = "/org/bluez/hci0"
|
||||
}
|
||||
local Adapter = dbus_proxy.Proxy:new {
|
||||
bus = dbus_proxy.Bus.SYSTEM,
|
||||
name = "org.bluez",
|
||||
interface = "org.bluez.Adapter1",
|
||||
path = "/org/bluez/hci0"
|
||||
}
|
||||
|
||||
local AdapterProperties = dbus_proxy.Proxy:new {
|
||||
bus = dbus_proxy.Bus.SYSTEM,
|
||||
name = "org.bluez",
|
||||
interface = "org.freedesktop.DBus.Properties",
|
||||
path = "/org/bluez/hci0"
|
||||
}
|
||||
local AdapterProperties = dbus_proxy.Proxy:new {
|
||||
bus = dbus_proxy.Bus.SYSTEM,
|
||||
name = "org.bluez",
|
||||
interface = "org.freedesktop.DBus.Properties",
|
||||
path = "/org/bluez/hci0"
|
||||
}
|
||||
|
||||
ObjectManager:connect_signal(
|
||||
function(interface)
|
||||
get_device_info(interface)
|
||||
end,
|
||||
"InterfacesAdded"
|
||||
)
|
||||
ObjectManager:connect_signal(
|
||||
function(interface)
|
||||
get_device_info(interface)
|
||||
end,
|
||||
"InterfacesAdded"
|
||||
)
|
||||
|
||||
ObjectManager:connect_signal(
|
||||
function(interface)
|
||||
awesome.emit_signal("device_removed", interface)
|
||||
end,
|
||||
"InterfacesRemoved"
|
||||
)
|
||||
ObjectManager:connect_signal(
|
||||
function(interface)
|
||||
awesome.emit_signal("device_removed", interface)
|
||||
end,
|
||||
"InterfacesRemoved"
|
||||
)
|
||||
|
||||
Adapter:connect_signal(
|
||||
function(data)
|
||||
if data.Powered ~= nil then
|
||||
awesome.emit_signal("state", data.Powered)
|
||||
Adapter:connect_signal(
|
||||
function(data)
|
||||
if data.Powered ~= nil then
|
||||
awesome.emit_signal("state", data.Powered)
|
||||
end
|
||||
end,
|
||||
"PropertiesChanged"
|
||||
)
|
||||
|
||||
AdapterProperties:connect_signal(
|
||||
function(data)
|
||||
if data.Powered ~= nil then
|
||||
awesome.emit_signal("state", data.Powered)
|
||||
if data.Powered then
|
||||
Adapter:StartDiscovery()
|
||||
end
|
||||
end
|
||||
end,
|
||||
"PropertiesChanged"
|
||||
)
|
||||
|
||||
awesome.connect_signal("toggle_bluetooth",
|
||||
function()
|
||||
local is_powered = Adapter.Powered
|
||||
Adapter:Set(
|
||||
"org.bluez.Adapter1",
|
||||
"Powered",
|
||||
lgi.GLib.Variant("b", not is_powered)
|
||||
)
|
||||
Adapter.Powered = { signature = "b", value = not is_powered }
|
||||
awesome.emit_signal("state", Adapter.Powered)
|
||||
end)
|
||||
|
||||
gears.timer.delayed_call(
|
||||
function()
|
||||
local objects = ObjectManager:GetManagedObjects()
|
||||
|
||||
for object_path, _ in pairs(objects) do
|
||||
get_device_info(object_path)
|
||||
end
|
||||
|
||||
awesome.emit_signal("state", Adapter.Powered)
|
||||
end
|
||||
)
|
||||
end
|
||||
end,
|
||||
"PropertiesChanged"
|
||||
)
|
||||
|
||||
AdapterProperties:connect_signal(
|
||||
function(data)
|
||||
if data.Powered ~= nil then
|
||||
awesome.emit_signal("state", data.Powered)
|
||||
if data.Powered then
|
||||
Adapter:StartDiscovery()
|
||||
end
|
||||
end
|
||||
end,
|
||||
"PropertiesChanged"
|
||||
)
|
||||
|
||||
awesome.connect_signal("toggle_bluetooth",
|
||||
function()
|
||||
local is_powered = Adapter.Powered
|
||||
Adapter:Set(
|
||||
"org.bluez.Adapter1",
|
||||
"Powered",
|
||||
lgi.GLib.Variant("b", not is_powered)
|
||||
)
|
||||
Adapter.Powered = { signature = "b", value = not is_powered }
|
||||
awesome.emit_signal("state", Adapter.Powered)
|
||||
end)
|
||||
|
||||
gears.timer.delayed_call(
|
||||
function()
|
||||
local objects = ObjectManager:GetManagedObjects()
|
||||
|
||||
for object_path, _ in pairs(objects) do
|
||||
get_device_info(object_path)
|
||||
end
|
||||
|
||||
awesome.emit_signal("state", Adapter.Powered)
|
||||
end
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user