about summary refs log tree commit diff stats
path: root/src/server
diff options
context:
space:
mode:
authorbptato <nincsnevem662@gmail.com>2024-12-15 16:04:16 +0100
committerbptato <nincsnevem662@gmail.com>2024-12-15 16:04:16 +0100
commit95d4b768819171d0115bded82b30977dfbe26bfc (patch)
tree5393267bf6ace1ee10263a77b274eab85dd66cca /src/server
parent9a395719047950fa33ec1699d8f14597e0f4c35d (diff)
downloadchawan-95d4b768819171d0115bded82b30977dfbe26bfc.tar.gz
chabookmark fixes & improvements
* correct action on M-b
* add external.bookmark option
* move openFileExpand functionality into unquote
* add menu items
* update docs
Diffstat (limited to 'src/server')
-rw-r--r--src/server/forkserver.nim3
-rw-r--r--src/server/loader.nim2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/server/forkserver.nim b/src/server/forkserver.nim
index 3a3fe9ab..5fedf484 100644
--- a/src/server/forkserver.nim
+++ b/src/server/forkserver.nim
@@ -45,7 +45,8 @@ proc loadConfig*(forkserver: ForkServer; config: Config): int =
       cgiDir: seq[string](config.external.cgi_dir),
       tmpdir: config.external.tmpdir,
       sockdir: config.external.sockdir,
-      configdir: config.dir
+      configdir: config.dir,
+      bookmark: config.external.bookmark
     ))
   var r = forkserver.istream.initPacketReader()
   var process: int
diff --git a/src/server/loader.nim b/src/server/loader.nim
index 45c41f1c..60e37610 100644
--- a/src/server/loader.nim
+++ b/src/server/loader.nim
@@ -272,6 +272,7 @@ type
     tmpdir*: string
     sockdir*: string
     configdir*: string
+    bookmark*: string
 
 func isPrivileged(ctx: LoaderContext; client: ClientData): bool =
   return ctx.pagerClient == client
@@ -1428,6 +1429,7 @@ proc initLoaderContext(fd: cint; config: LoaderConfig): LoaderContext =
   putEnv("CHA_INSECURE_SSL_NO_VERIFY", "0")
   putEnv("CHA_TMP_DIR", config.tmpdir)
   putEnv("CHA_CONFIG_DIR", config.configdir)
+  putEnv("CHA_BOOKMARK", config.bookmark)
   return ctx
 
 # This is only called when an OutputHandle could not read enough of one (or