From c813fd0f49eb4d715fb2c2bbe92ca24dd1eb9175 Mon Sep 17 00:00:00 2001 From: Tapasweni Pathak Date: Mon, 15 Jul 2019 05:12:50 +0530 Subject: [PATCH 1/7] Update https://www.qubes-os.org/doc/config-files/ --- user/advanced-configuration/config-files.md | 108 ++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/user/advanced-configuration/config-files.md b/user/advanced-configuration/config-files.md index ca1fc3f0..66ef70c0 100644 --- a/user/advanced-configuration/config-files.md +++ b/user/advanced-configuration/config-files.md @@ -95,6 +95,43 @@ global: { #secure_paste_sequence = "Ctrl-Shift-v"; #windows_count_limit = 500; #audio_low_latency = false; + #screen + #root_win + #root_width + #root_height + #context + #frame_gc + #tray_gc + #tint_h + #inter_appviewer_lock_fd + #domid + #target_domid + #agent_version + #cmdline_color + #label_color_rgb + #cmdline_icon + #icon_data + #icon_data_len + #label_index + #screen_window + #clipboard_requested + #windows_count + #log_level + #nofork + #invisible + #kill_on_connect + #allow_utf8_titles + #allow_fullscreen + #copy_seq_mask + #paste_seq_mask + #qrexec_clipboard + #use_kdialog + #audio_low_latency + #prefix_titles + #trayicon_mode + #trayicon_border + #trayicon_tint_reduce_saturation + #trayicon_tint_whitehack }; # most of setting can be set per-VM basis @@ -127,3 +164,74 @@ Currently supported settings: - `audio_low_latency` - force low-latency audio mode (about 40ms compared to 200-500ms by default). Note that this will cause much higher CPU usage in dom0. +- `screen` - Points on default screen + +- `root_win` - Root attributes + +- `root_width` - Size of root window + +- `context` - context for pixmap operations + +- `frame_gc` - graphics context for painting window frame + +- `tray_gc` - graphic context for painting tray background, only in + TRAY_BACKGROUND mode + +- `tint_h` - precomputed H and S for tray coloring - only in TRAY_TINT mode + +- `inter_appviewer_lock_fd` - FD of lock file used to synchronize shared memory + access + +- `domid` - Xen domain id (GUI) + +- `target_domid` - Xen domain id (VM) - can differ from domid when GUI is + stubdom + +- `cmdline_color` - color of frame + +- `label_color_rgb` - color of the frame in RGB + +- `cmdline_icon` - icon hint for WM + +- `icon_data` - loaded icon image, ready for \_NEW\_WM\_ICON property + +- `icon_data_len` - size of icon\_data, in sizeof(\*icon\_data) units + +- `label_index` - label (frame color) hint for WM + +- `screen_window` - window of whole VM screen + +- `clipboard_requested` - if clippoard content was requested by dom0 + +- `clipboard_xevent_time` - timestamp of keypress which triggered last + copy/paste + +- `windows_count` - created window count + +- `nofork` - do not fork into background - used during guid restart + +- `invisible` - do not show any VM window + +- `kill_on_connect` - pid to kill when connection to gui agent is established + +- `allow_utf8_titles` - allow UTF-8 chars in window title + +- `copy_seq_mask` - modifiers mask for secure-copy key sequence + +- `paste_seq_mask` - modifiers mask for secure-paste key sequence + +- `qrexec_clipboard` - 0: use GUI protocol to fetch/put clipboard, 1: use qrexec + +- `use_kdialog` - use kdialog for prompts (default on KDE) or zenity (default on + non-KDE) + +- `trayicon_mode` - trayicon coloring mode + +- `trayicon_border` - position of trayicon border - 0 - no border, 1 - at the + edges, 2 - 1px from the edges + +- `trayicon_tint_reduce_saturation` - trayicon\_tint\_reduce\_saturation + +- `trayicon_tint_whitehack` - replace white pixels with almost-white 0xfefefe + (available only for "tint" mode) + From 46f681a2d05cd4267d87b7a4dbe490dbc48d8551 Mon Sep 17 00:00:00 2001 From: Tapasweni Pathak Date: Mon, 15 Jul 2019 05:44:13 +0530 Subject: [PATCH 2/7] Fix variables --- user/advanced-configuration/config-files.md | 115 +------------------- 1 file changed, 6 insertions(+), 109 deletions(-) diff --git a/user/advanced-configuration/config-files.md b/user/advanced-configuration/config-files.md index 66ef70c0..dc2957b7 100644 --- a/user/advanced-configuration/config-files.md +++ b/user/advanced-configuration/config-files.md @@ -95,43 +95,9 @@ global: { #secure_paste_sequence = "Ctrl-Shift-v"; #windows_count_limit = 500; #audio_low_latency = false; - #screen - #root_win - #root_width - #root_height - #context - #frame_gc - #tray_gc - #tint_h - #inter_appviewer_lock_fd - #domid - #target_domid - #agent_version - #cmdline_color - #label_color_rgb - #cmdline_icon - #icon_data - #icon_data_len - #label_index - #screen_window - #clipboard_requested - #windows_count - #log_level - #nofork - #invisible - #kill_on_connect - #allow_utf8_titles - #allow_fullscreen - #copy_seq_mask - #paste_seq_mask - #qrexec_clipboard - #use_kdialog - #audio_low_latency - #prefix_titles - #trayicon_mode - #trayicon_border - #trayicon_tint_reduce_saturation - #trayicon_tint_whitehack + #log_level = info; + #trayicon_mode = "border1"; + #startup_timeout = 91; }; # most of setting can be set per-VM basis @@ -159,79 +125,10 @@ Currently supported settings: - `secure_copy_sequence` and `secure_paste_sequence` - key sequences used to trigger secure copy and paste. -- `windows_count_limit` - limit on concurrent windows. - -- `audio_low_latency` - force low-latency audio mode (about 40ms compared to 200-500ms by default). - Note that this will cause much higher CPU usage in dom0. - -- `screen` - Points on default screen - -- `root_win` - Root attributes - -- `root_width` - Size of root window - -- `context` - context for pixmap operations - -- `frame_gc` - graphics context for painting window frame - -- `tray_gc` - graphic context for painting tray background, only in - TRAY_BACKGROUND mode - -- `tint_h` - precomputed H and S for tray coloring - only in TRAY_TINT mode - -- `inter_appviewer_lock_fd` - FD of lock file used to synchronize shared memory - access - -- `domid` - Xen domain id (GUI) - -- `target_domid` - Xen domain id (VM) - can differ from domid when GUI is - stubdom - -- `cmdline_color` - color of frame - -- `label_color_rgb` - color of the frame in RGB - -- `cmdline_icon` - icon hint for WM - -- `icon_data` - loaded icon image, ready for \_NEW\_WM\_ICON property - -- `icon_data_len` - size of icon\_data, in sizeof(\*icon\_data) units - -- `label_index` - label (frame color) hint for WM - -- `screen_window` - window of whole VM screen - -- `clipboard_requested` - if clippoard content was requested by dom0 - -- `clipboard_xevent_time` - timestamp of keypress which triggered last - copy/paste - -- `windows_count` - created window count - -- `nofork` - do not fork into background - used during guid restart - -- `invisible` - do not show any VM window - -- `kill_on_connect` - pid to kill when connection to gui agent is established - -- `allow_utf8_titles` - allow UTF-8 chars in window title - -- `copy_seq_mask` - modifiers mask for secure-copy key sequence - -- `paste_seq_mask` - modifiers mask for secure-paste key sequence - -- `qrexec_clipboard` - 0: use GUI protocol to fetch/put clipboard, 1: use qrexec - -- `use_kdialog` - use kdialog for prompts (default on KDE) or zenity (default on - non-KDE) - `trayicon_mode` - trayicon coloring mode -- `trayicon_border` - position of trayicon border - 0 - no border, 1 - at the - edges, 2 - 1px from the edges - -- `trayicon_tint_reduce_saturation` - trayicon\_tint\_reduce\_saturation - -- `trayicon_tint_whitehack` - replace white pixels with almost-white 0xfefefe - (available only for "tint" mode) +- `log level` - log level defines the log options log can take. This can be + `ERROR`, `WARN`, `INFO`, `DEBUG`, `LOG_LEVEL_MAX`. +- `startup_timeout` - The timeout for startup. From df0093d4f85d03f63a94ef62bab5591a3f6b44f2 Mon Sep 17 00:00:00 2001 From: Tapasweni Pathak Date: Tue, 16 Jul 2019 20:00:01 +0530 Subject: [PATCH 3/7] Add proper description for config parameters --- user/advanced-configuration/config-files.md | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/user/advanced-configuration/config-files.md b/user/advanced-configuration/config-files.md index dc2957b7..28f75a22 100644 --- a/user/advanced-configuration/config-files.md +++ b/user/advanced-configuration/config-files.md @@ -126,9 +126,18 @@ Currently supported settings: - `secure_copy_sequence` and `secure_paste_sequence` - key sequences used to trigger secure copy and paste. -- `trayicon_mode` - trayicon coloring mode +- `trayicon_mode` - defines the trayicon coloring mode. Options are + - `bg` - color full icon background to the VM color + - `border1` - add 1px border at the icon edges + - `border2` - add 1px border 1px from the icon edges + - `tint` - tinttint icon to the VM color, can be used with additional + modifiers (you can enable multiple of them) + - `tint+border1,tint+border2` - same as tint, but also add a border + - `tint+saturation50` - same as tint, but reduce icon saturation by 50% + - `tint+whitehack` - same as tint, but change white pixels (0xffffff) to + almost-white (0xfefefe) -- `log level` - log level defines the log options log can take. This can be - `ERROR`, `WARN`, `INFO`, `DEBUG`, `LOG_LEVEL_MAX`. +- `log level` - log level defines the log options log can take. log level can + have a value of 0(only errors), 1(some basic messages), 2(debug). - `startup_timeout` - The timeout for startup. From 4d2a8a4e9b5c15f27e4ba15127367686e61559e7 Mon Sep 17 00:00:00 2001 From: Tapasweni Pathak Date: Tue, 16 Jul 2019 20:10:14 +0530 Subject: [PATCH 4/7] Fix spaces issue --- user/advanced-configuration/config-files.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/user/advanced-configuration/config-files.md b/user/advanced-configuration/config-files.md index 28f75a22..7a54714e 100644 --- a/user/advanced-configuration/config-files.md +++ b/user/advanced-configuration/config-files.md @@ -128,13 +128,13 @@ Currently supported settings: - `trayicon_mode` - defines the trayicon coloring mode. Options are - `bg` - color full icon background to the VM color - - `border1` - add 1px border at the icon edges - - `border2` - add 1px border 1px from the icon edges - - `tint` - tinttint icon to the VM color, can be used with additional + - `border1` - add 1px border at the icon edges + - `border2` - add 1px border 1px from the icon edges + - `tint` - tinttint icon to the VM color, can be used with additional modifiers (you can enable multiple of them) - - `tint+border1,tint+border2` - same as tint, but also add a border - - `tint+saturation50` - same as tint, but reduce icon saturation by 50% - - `tint+whitehack` - same as tint, but change white pixels (0xffffff) to + - `tint+border1,tint+border2` - same as tint, but also add a border + - `tint+saturation50` - same as tint, but reduce icon saturation by 50% + - `tint+whitehack` - same as tint, but change white pixels (0xffffff) to almost-white (0xfefefe) - `log level` - log level defines the log options log can take. log level can From f4e84c8eaf0044fbd24de349b130074375cee81a Mon Sep 17 00:00:00 2001 From: Tapasweni Pathak Date: Thu, 18 Jul 2019 02:08:57 +0530 Subject: [PATCH 5/7] Fix Travis CI issue --- user/advanced-configuration/config-files.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/user/advanced-configuration/config-files.md b/user/advanced-configuration/config-files.md index 7a54714e..3e10cc9b 100644 --- a/user/advanced-configuration/config-files.md +++ b/user/advanced-configuration/config-files.md @@ -127,15 +127,15 @@ Currently supported settings: - `trayicon_mode` - defines the trayicon coloring mode. Options are - - `bg` - color full icon background to the VM color - - `border1` - add 1px border at the icon edges - - `border2` - add 1px border 1px from the icon edges - - `tint` - tinttint icon to the VM color, can be used with additional - modifiers (you can enable multiple of them) - - `tint+border1,tint+border2` - same as tint, but also add a border - - `tint+saturation50` - same as tint, but reduce icon saturation by 50% - - `tint+whitehack` - same as tint, but change white pixels (0xffffff) to - almost-white (0xfefefe) + - `bg` - color full icon background to the VM color + - `border1` - add 1px border at the icon edges + - `border2` - add 1px border 1px from the icon edges + - `tint` - tinttint icon to the VM color, can be used with additional + modifiers (you can enable multiple of them) + - `tint+border1,tint+border2` - same as tint, but also add a border + - `tint+saturation50` - same as tint, but reduce icon saturation by 50% + - `tint+whitehack` - same as tint, but change white pixels (0xffffff) to + almost-white (0xfefefe) - `log level` - log level defines the log options log can take. log level can have a value of 0(only errors), 1(some basic messages), 2(debug). From 9427e1bb21c35b0ef4f322635af649a6898a15df Mon Sep 17 00:00:00 2001 From: Tapasweni Pathak Date: Fri, 19 Jul 2019 13:02:51 +0530 Subject: [PATCH 6/7] Added audio_low_latency and dom0 line --- user/advanced-configuration/config-files.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user/advanced-configuration/config-files.md b/user/advanced-configuration/config-files.md index 3e10cc9b..5b2c6aef 100644 --- a/user/advanced-configuration/config-files.md +++ b/user/advanced-configuration/config-files.md @@ -125,6 +125,9 @@ Currently supported settings: - `secure_copy_sequence` and `secure_paste_sequence` - key sequences used to trigger secure copy and paste. +- `audio_low_latency` - force low-latency audio mode (about 40ms compared to 200-500ms by default). + Note that this will cause much higher CPU usage in dom0. It's enabled by + default, disabling it may save CPU in dom0. - `trayicon_mode` - defines the trayicon coloring mode. Options are - `bg` - color full icon background to the VM color From 88ac06094b704840d75eef0ff87d0d16ebdbd442 Mon Sep 17 00:00:00 2001 From: Tapasweni Pathak Date: Fri, 19 Jul 2019 13:03:56 +0530 Subject: [PATCH 7/7] Add log_level as 1 remove info --- user/advanced-configuration/config-files.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/advanced-configuration/config-files.md b/user/advanced-configuration/config-files.md index 5b2c6aef..aea1f614 100644 --- a/user/advanced-configuration/config-files.md +++ b/user/advanced-configuration/config-files.md @@ -95,7 +95,7 @@ global: { #secure_paste_sequence = "Ctrl-Shift-v"; #windows_count_limit = 500; #audio_low_latency = false; - #log_level = info; + #log_level = 1; #trayicon_mode = "border1"; #startup_timeout = 91; };