mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-24 09:18:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implement using effective kitty config options for kittens

Browse Source 
Also centralise reading of kitty options
This commit is contained in:
Kovid Goyal
2025-01-05 20:16:43 +05:30
parent 76ebc591db
commit 2d02ff1c5f
7 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kittens/diff/mouse.go
View File

@@ -4,7 +4,6 @@ package diff
import (
"fmt"
"path/filepath"
"strconv"
"strings"
"sync"
@@ -25,7 +24,7 @@ type KittyOpts struct {
Copy_on_select bool
}
func read_relevant_kitty_opts(path string) KittyOpts {
func read_relevant_kitty_opts() KittyOpts {
ans := KittyOpts{Wheel_scroll_multiplier: kitty.KittyConfigDefaults.Wheel_scroll_multiplier}
handle_line := func(key, val string) error {
switch key {
@@ -39,13 +38,12 @@ func read_relevant_kitty_opts(path string) KittyOpts {
}
return nil
}
cp := config.ConfigParser{LineHandler: handle_line}
_ = cp.ParseFiles(path)
config.ReadKittyConfig(handle_line)
return ans
}
var RelevantKittyOpts = sync.OnceValue(func() KittyOpts {
return read_relevant_kitty_opts(filepath.Join(utils.ConfigDir(), "kitty.conf"))
return read_relevant_kitty_opts()
})
func (self *Handler) handle_wheel_event(up bool) {

8
kittens/hints/marks.go
View File

@@ -8,7 +8,6 @@ import (
"errors"
"fmt"
"os/exec"
"path/filepath"
"regexp"
"slices"
"strconv"
@@ -211,7 +210,7 @@ type KittyOpts struct {
Select_by_word_characters string
}
func read_relevant_kitty_opts(path string) KittyOpts {
func read_relevant_kitty_opts() KittyOpts {
ans := KittyOpts{
Select_by_word_characters: kitty.KittyConfigDefaults.Select_by_word_characters,
Url_excluded_characters: kitty.KittyConfigDefaults.Url_excluded_characters}
@@ -228,8 +227,7 @@ func read_relevant_kitty_opts(path string) KittyOpts {
}
return nil
}
cp := config.ConfigParser{LineHandler: handle_line}
_ = cp.ParseFiles(path) // ignore errors and use defaults
config.ReadKittyConfig(handle_line)
if ans.Url_prefixes == nil {
ans.Url_prefixes = utils.NewSetWithItems(kitty.KittyConfigDefaults.Url_prefixes...)
}
@@ -237,7 +235,7 @@ func read_relevant_kitty_opts(path string) KittyOpts {
}
var RelevantKittyOpts = sync.OnceValue(func() KittyOpts {
return read_relevant_kitty_opts(filepath.Join(utils.ConfigDir(), "kitty.conf"))
return read_relevant_kitty_opts()
})
var debugprintln = tty.DebugPrintln

8
kittens/ssh/utils.go
View File

@@ -6,7 +6,6 @@ import (
"fmt"
"io"
"os/exec"
"path/filepath"
"regexp"
"strconv"
"strings"
@@ -225,7 +224,7 @@ type KittyOpts struct {
Term, Shell_integration string
}
func read_relevant_kitty_opts(path string) KittyOpts {
func read_relevant_kitty_opts() KittyOpts {
ans := KittyOpts{Term: kitty.KittyConfigDefaults.Term, Shell_integration: kitty.KittyConfigDefaults.Shell_integration}
handle_line := func(key, val string) error {
switch key {
@@ -236,11 +235,10 @@ func read_relevant_kitty_opts(path string) KittyOpts {
}
return nil
}
cp := config.ConfigParser{LineHandler: handle_line}
cp.ParseFiles(path)
config.ReadKittyConfig(handle_line)
return ans
}
var RelevantKittyOpts = sync.OnceValue(func() KittyOpts {
return read_relevant_kitty_opts(filepath.Join(utils.ConfigDir(), "kitty.conf"))
return read_relevant_kitty_opts()
})

4
kittens/themes/ui.go
View File

@@ -7,7 +7,6 @@ import (
"io"
"kitty"
"maps"
"path/filepath"
"regexp"
"slices"
"strings"
@@ -170,8 +169,7 @@ func ReadKittyColorSettings() map[string]string {
}
return nil
}
cp := config.ConfigParser{LineHandler: handle_line}
cp.ParseFiles(filepath.Join(utils.ConfigDir(), "kitty.conf"))
config.ReadKittyConfig(handle_line)
return settings
}