Delay scaling of percentage values.

The config file code now delays calculation of percentage values until
`config_fix_percentages()` is called. This allows the config file to be
parsed before output configuration is complete, thus allowing `--output`
and `--late-keyboard-init` to be specified in the config file.

5 files changed, 42 insertions, 20 deletions

diff --git a/doc/config b/doc/config
index bb7c232..8d9d743 100644
--- a/doc/config
+++ b/doc/config
@@ -95,6 +95,10 @@
 #
 ### Window positioning
 #
+	# The name of the output to appear on. An empty string will use the
+	# default output chosen by the compositor.
+	output = ""
+
 	# Location on screen to anchor the window to.
 	#
 	# Supported values: top-left, top, top-right, right, bottom-right,
@@ -120,3 +124,9 @@
 	# If true, directly launch applications on selection when in drun mode.
 	# Otherwise, just print the command line to stdout.
 	drun-launch = false
+
+	# Delay keyboard initialisation until after the first draw to screen.
+	# This option is experimental, and will cause tofi to miss keypresses
+	# for a short time after launch. The only reason to use this option is
+	# performance on slow systems.
+	late-keyboard-init = false
diff --git a/doc/tofi.1.md b/doc/tofi.1.md
index b3dee5c..8d3c960 100644
--- a/doc/tofi.1.md
+++ b/doc/tofi.1.md
@@ -42,17 +42,6 @@ a future version of tofi.
 
 > Specify path to custom config file.
 
-**--output** \<name\>
-
-> Select the output to appear on.
-
-**--late-keyboard-init**
-
-> Delay keyboard initialisation until after the first draw to screen.
-> This option is experimental, and will cause tofi to miss keypresses
-> for a short time after launch. The only reason to use this option is
-> performance on slow systems.
-
 All config file options described in **tofi**(5) are also accepted, in
 the form **--key=value**.
 
diff --git a/doc/tofi.1.scd b/doc/tofi.1.scd
index f85e18d..8b6618d 100644
--- a/doc/tofi.1.scd
+++ b/doc/tofi.1.scd
@@ -39,15 +39,6 @@ nothing, and may be removed in a future version of tofi.
 *-c, --config* <path>
 	Specify path to custom config file.
 
-*--output* <name>
-	Select the output to appear on.
-
-*--late-keyboard-init*
-	Delay keyboard initialisation until after the first draw to screen.
-	This option is experimental, and will cause tofi to miss keypresses
-	for a short time after launch. The only reason to use this option is
-	performance on slow systems.
-
 All config file options described in *tofi*(5) are also accepted, in the form
 *--key=value*.
 
diff --git a/doc/tofi.5.md b/doc/tofi.5.md
index c425b1b..23f4cb2 100644
--- a/doc/tofi.5.md
+++ b/doc/tofi.5.md
@@ -154,6 +154,14 @@ options.
 >
 > Default: center
 
+**output**=*name*
+
+> The name of the output to appear on, if multiple outputs are present.
+> If empty, the compositor will choose which output to display the
+> window on (usually the currently focused output).
+>
+> Default: ""
+
 **margin-top**=*px\|%*
 
 > Offset from top of screen. See **PERCENTAGE VALUES** for more
@@ -256,6 +264,15 @@ options.
 >
 > Default: true
 
+**late-keyboard-init**=*true\|false*
+
+> Delay keyboard initialisation until after the first draw to screen.
+> This option is experimental, and will cause tofi to miss keypresses
+> for a short time after launch. The only reason to use this option is
+> performance on slow systems.
+>
+> Default: false
+
 # COLORS
 
 Colors can be specified in the form *RGB*, *RGBA*, *RRGGBB* or
diff --git a/doc/tofi.5.scd b/doc/tofi.5.scd
index 9841b1f..c36f98c 100644
--- a/doc/tofi.5.scd
+++ b/doc/tofi.5.scd
@@ -135,6 +135,13 @@ options.
 
 	Default: center
 
+*output*=_name_
+	The name of the output to appear on, if multiple outputs are present.
+	If empty, the compositor will choose which output to display the window
+	on (usually the currently focused output).
+
+	Default: ""
+
 *margin-top*=_px|%_
 	Offset from top of screen. See *PERCENTAGE VALUES* for more
 	information. Only has an effect when anchored to the top of the screen.
@@ -222,6 +229,14 @@ options.
 
 	Default: true
 
+*late-keyboard-init*=_true|false_
+	Delay keyboard initialisation until after the first draw to screen.
+	This option is experimental, and will cause tofi to miss keypresses
+	for a short time after launch. The only reason to use this option is
+	performance on slow systems.
+
+	Default: false
+
 # COLORS
 
 Colors can be specified in the form _RGB_, _RGBA_, _RRGGBB_ or _RRGGBBAA_,