CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-05-13 08:26:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

desktop-ui kitten: Re-read config on every file chooser invocation via portal

Browse source 
Allows easily changing the config without needing to restart the kitten
which is difficult to do given its lifetime is managed by the xdg
portals service.
This commit is contained in:
Kovid Goyal 2026-02-03 21:08:55 +05:30
parent 0267a02bb3
commit c0bb8ae2a0
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kittens/desktop_ui/main.go
View file

@ -30,7 +30,7 @@ func load_server_config(opts *ServerOptions) (ans *Config, err error) {
func run_server(opts *ServerOptions) (err error) {
config, err := load_server_config(opts)
if err == nil {
portal, err := NewPortal(config)
portal, err := NewPortal(config, opts)
if err == nil {
err = portal.Start()
if err == nil {

14
kittens/desktop_ui/portal.go
View file

@ -65,6 +65,7 @@ type Portal struct {
settings SettingsMap
lock sync.Mutex
opts *Config
server_options *ServerOptions
file_chooser_first_instance *exec.Cmd
}
@ -75,8 +76,8 @@ func to_color(spec string) (v dbus.Variant, err error) {
return
}
func NewPortal(opts *Config) (p *Portal, err error) {
ans := Portal{opts: opts}
func NewPortal(opts *Config, server_options *ServerOptions) (p *Portal, err error) {
ans := Portal{opts: opts, server_options: server_options}
ans.settings = SettingsMap{
SETTINGS_CANARY_NAMESPACE: map[string]dbus.Variant{
SETTINGS_CANARY_KEY: dbus.MakeVariant("running"),
@ -641,6 +642,14 @@ func (self *Portal) ReadAll(namespaces []string) (ReadAllType, *dbus.Error) {
return values, nil
}
func (self *Portal) reload_portal_settings() {
self.lock.Lock()
defer self.lock.Unlock()
if config, err := load_server_config(self.server_options); err == nil {
self.opts = config
}
}
type vmap map[string]dbus.Variant
type Filter_expression struct {
Ftype uint32
@ -726,6 +735,7 @@ type ChooserResponse struct {
}
func (self *Portal) run_file_chooser(cfd ChooseFilesData) (response uint32, result_dict vmap) {
self.reload_portal_settings()
response = RESPONSE_ENDED
tdir, err := os.MkdirTemp("", "kitty-cfd")
if err != nil {