deon/glava
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Temporarily disable glava-config by default

Browse Source
This commit is contained in:
Jarcode
2019-09-09 14:05:26 -07:00
parent 5ff291fe51
commit aa875b2a81
4 changed files with 110 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
glava-config/config.lua
View File

@@ -2,7 +2,8 @@ local lfs = require "lfs"
local mappings = require "glava-config.mappings"
local config = {
Profile = { mt = {} }
Profile = { mt = {} },
PROFILES_DIR = "profiles"
}
config.Profile.__index = config.Profile
@@ -19,16 +20,20 @@ local function path_split(str, sep)
end
-- Concatenates paths such that duplicate path separators are removed.
-- Can be used on non-split arguments
-- Can be used on non-split arguments, and resolves `..` syntax
local function path_concat(...)
local ret = {}
for _, v in ipairs({...}) do
for _, e in ipairs(path_split(v, "/")) do
if e ~= "" or #ret == 0 then
if e == ".." and #ret >= 1 then
ret[#ret] = nil
else
ret[#ret + 1] = e
end
end
end
end
return table.concat(ret, "/")
end
@@ -66,27 +71,12 @@ local function none(...) return ... end
local MATCH_ENTRY_PATTERN = "^%s*%#(%a+)%s+(%a+)"
local MATCH_DATA_PREFIX = "^%s*%#%a+%s+%a+"
local MATCH_TYPES = {
["float"] = {
pattern = "(%d+.?%d*)",
cast = tonumber,
serialize = tostring
}, ["int"] = {
pattern = "(%d+)",
cast = tonumber,
serialize = function(x) tostring(math.floor(x)) end
}, ["color-expr"] = {
pattern = "(.+)",
cast = none,
serialize = none
}, ["expr"] = {
pattern = "(.+)",
cast = none,
serialize = none
}, ["ident"] = {
pattern = "(%w+)",
cast = none,
serialize = none
}, ["string"] = {
["float"] = { pattern = "(%d+.?%d*)" },
["int"] = { pattern = "(%d+)" },
["color-expr"] = { pattern = "(.+)" },
["expr"] = { pattern = "(.+)" },
["ident"] = { pattern = "(%a%w*)" },
["string"] = {
pattern = "(.+)",
cast = unquote,
-- Read-ahead function to generate a fixed-width pattern
@@ -195,18 +185,22 @@ local function unwrap(ret, err)
end
function config.Profile:__call(args)
local self = { name = args.name }
local self = { name = args.name or ".." }
self:rebuild()
return setmetatable(self, config.Profile)
end
function config.Profile:rename(new)
error("not implemented")
end
function config.Profile:get_path()
return path_concat(glava.config_path, config.PROFILES_DIR, self.name)
end
function config.Profile:rebuild()
self.store = {}
self.path = path_concat(glava.config_path, "profiles", self.name)
self.path = path_concat(glava.config_path, config.PROFILES_DIR, self.name)
unwrap(create_p(self.path, "directory", true))
local unbuilt = {}
for k, _ in pairs(mappings) do
@@ -252,7 +246,7 @@ function config.Profile:rebuild_file(file, path, phony)
_, i, match = string.find(at, "%s*" .. MATCH_TYPES[v].transform(match))
end
if default == nil or fstore[key][t] == nil then
fstore[key][t] = MATCH_TYPES[v].cast(match)
fstore[key][t] = MATCH_TYPES[v].cast and MATCH_TYPES[v].cast(match) or match
end
at = string.sub(at, 1, i)
else break end
@@ -297,7 +291,7 @@ function config.Profile:sync_file(fname)
local parts = { string.format("#%s", string.gsub(k, ":", " ")) }
local field = fmap[k].field_type
for i, e in ipairs(type(field) == "table" and field or { field }) do
parts[#parts + 1] = MATCH_TYPES[e].serialize(v[i])
parts[#parts + 1] = MATCH_TYPES[e].serialize and MATCH_TYPES[e].serialize(v[i]) or v[i]
end
local serialized = table.concat(parts, " ")
if v.line then buf[line] = serialized

97
glava-config/window.lua
View File

@@ -101,6 +101,13 @@ return function()
return unpack(ret)
end
local function link(tbl)
for _, v in ipairs(tbl) do
v:get_style_context():add_class("linked")
end
return unpack(tbl)
end
local function ComboBoxFixed(tbl)
local inst = Gtk.ComboBoxText { id = tbl.id }
for _, v in pairs(tbl) do
@@ -222,7 +229,7 @@ return function()
end
-- Generators for producing widgets (and their layouts) that bind to configuration values
-- note: `get_data` returns _formatted_ data, such that it can be written directly in GLSL
-- note: `get_data` returns stringified data
local widget_generators
widget_generators = {
-- A switch to represent a true/false value
@@ -268,7 +275,7 @@ return function()
if attrs.translate then
text = attrs.translate[text]
end
return (not attrs._ignore_format) and string.format("\"%s\"", text) or text
return text
end,
connect = function(f)
-- Note: the underlying widget can be `GtkComboBoxText` or `GtkEntry`;
@@ -279,7 +286,6 @@ return function()
end,
-- Entry for a valid C/GLSL identity, may have predefined selections
["ident"] = function(attrs)
attrs._ignore_format = true
local s = widget_generators.string(attrs)
-- Set fixed-width font if the users enter/select identifiers by their name,
-- rather than a description to indicate it's a GLSL identity
@@ -333,7 +339,7 @@ return function()
return {
widget = wrap_label(widget, attrs.label),
set_data = function(x)
widget:set_value(x)
widget:set_text(x)
return true
end,
get_data = function() return widget:get_text() end,
@@ -359,7 +365,7 @@ return function()
return {
widget = wrap_label(apply { vexpand = false, widget }, attrs.label),
set_data = function(x)
widget:set_value(x)
widget:set_text(x)
return true
end,
get_data = function() return widget:get_text() end,
@@ -418,7 +424,7 @@ return function()
spacing = 0,
entry, btn
}
widget:get_style_context():add_class("linked")
link { widget }
widget = wrap_label(widget, attrs.label)
function btn:on_clicked()
local c_change_staged = false
@@ -645,7 +651,6 @@ return function()
-- Extra widget for special service/autostart functionality
local ServiceView = function(self)
local switch = Gtk.Switch {
id = "autostart_enabled",
sensitive = false,
hexpand = false
}
@@ -681,7 +686,7 @@ return function()
return ConfigView {
{ "Enabled", Gtk.Box { Gtk.Box { hexpand = true }, switch } },
{ "Autostart Method", method }
}
}, switch
end
-- Produce a widget containing a scroll area full of widgets bound to
@@ -737,16 +742,27 @@ return function()
end
args[#args + 1] = { tab_label = v.name, ConfigView(layout) }
end
local service, chk = ServiceView(self)
args[#args + 1] = {
tab_label = "Autostart",
name ~= "Default" and ServiceView(self) or
name ~= "Default" and service or
Gtk.Box {
valign = "CENTER",
orientation = "VERTICAL",
spacing = 8,
Gtk.Label {
label = "Autostart options are not available for the default user profile."
} }
},
Gtk.Button {
hexpand = false,
halign = "CENTER",
label = "Show Profiles"
} } }
args.expand = true
notebook = Gtk.Notebook(args)
notebook:show_all()
self.widget = notebook
self.autostart_enabled = chk
function self:rename(new)
self.name = new
end
@@ -767,9 +783,10 @@ return function()
border_width = 5,
Gtk.Box {
orientation = "HORIZONTAL",
spacing = 8,
spacing = 6,
homogeneous = false,
Gtk.Box {
hexpand = false,
orientation = "VERTICAL",
spacing = 5,
Gtk.ScrolledWindow {
@@ -798,31 +815,53 @@ return function()
activatable = ItemColumn.ACTIVABLE,
visible = ItemColumn.VISIBLE
} } } } } },
(function()
local box = Gtk.Box {
homogeneous = true,
link {
Gtk.Box {
hexpand = true,
bind {
reload = Gtk.Button {
label = "Reload",
Gtk.Image {
icon_name = "view-refresh-symbolic"
} },
},
bind {
add = Gtk.Button {
label = "New",
halign = "FILL",
hexpand = true,
label = "Create Profile",
} },
bind {
remove = Gtk.Button {
label = "Delete",
halign = "END",
sensitive = false,
} } }
box:get_style_context():add_class("linked")
return box
end)(),
Gtk.Image {
icon_name = "user-trash-symbolic"
} } } } } },
Gtk.Box {
orientation = "VERTICAL",
spacing = 6,
link {
Gtk.Box {
Gtk.ToggleButton {
Gtk.Image {
icon_name = "view-paged-symbolic"
},
on_clicked = function()
--
end
},
bind {
display_path = Gtk.Entry {
-- todo: bind to config
text = "~/.config/glava/rc.glsl",
editable = false,
hexpand = true
} } } },
bind {
stack_view = Gtk.Stack {
expand = true,
transition_type = Gtk.StackTransitionType.CROSSFADE
} } } }
} } } } }
local selection = binds.view:get_selection()
selection.mode = 'SINGLE'
@@ -872,15 +911,12 @@ return function()
function binds.toggle_renderer:on_toggled(path_string)
local path = Gtk.TreePath.new_from_string(path_string)
if view_registry[item_store[path][ItemColumn.PROFILE]]
.widget:get_children()[1].autostart_enabled.active
if view_registry[item_store[path][ItemColumn.PROFILE]].autostart_enabled.active
~= not item_store[path][ItemColumn.ENABLED] then
view_registry[item_store[path][ItemColumn.PROFILE]]
.widget:get_children()[1].autostart_enabled:activate()
view_registry[item_store[path][ItemColumn.PROFILE]].autostart_enabled:activate()
end
item_store[path][ItemColumn.ENABLED] =
view_registry[item_store[path][ItemColumn.PROFILE]]
.widget:get_children()[1].autostart_enabled.active
view_registry[item_store[path][ItemColumn.PROFILE]].autostart_enabled.active
end
function binds.add:on_clicked()
@@ -889,7 +925,8 @@ return function()
[ItemColumn.PROFILE] = profile_name,
[ItemColumn.ENABLED] = false,
[ItemColumn.ACTIVABLE] = false,
[ItemColumn.VISIBLE] = true
[ItemColumn.VISIBLE] = true,
[ItemColumn.WEIGHT] = 400
}
local view = ProfileView(profile_name)
item_store:append(entry)
@@ -912,7 +949,7 @@ return function()
spacing = 8,
border_width = 8,
Gtk.Image {
icon_name = "dialog-warning",
icon_name = "dialog-warning-symbolic",
icon_size = Gtk.IconSize.DIALOG,
},
Gtk.Label {

3
glava/render.c
View File

@@ -1061,7 +1061,8 @@ struct glava_renderer* rd_new(const char** paths, const char* entry,
},
{ .name = "nativeonly", .fmt = "b",
.handler = RHANDLER(name, args, {
fprintf(stderr, "WARNING: `nativeonly` is deprecated, use `#if PREMULTIPLY_ALPHA == 1`!\n");
fprintf(stderr, "WARNING: `nativeonly` is deprecated,"
" use `#if PREMULTIPLY_ALPHA == 1`!\n");
if (current)
current->nativeonly = *(bool*) args[0];
else {

2
meson_options.txt
View File

@@ -8,7 +8,7 @@ option('glad', type: 'boolean', value: false,
description: 'Download and build GLAD headers (non-reproducable)')
option('disable_obs', type: 'boolean', value: false,
description: 'Disable OBS Studio plugin support')
option('disable_config', type: 'boolean', value: false,
option('disable_config', type: 'boolean', value: true,
description: 'Skip building GLava GTK+ configuration tool')
option('shader_install_dir', type: 'string', value: '/etc/xdg',
description: 'GLSL config/module system install directory')