From aa203586202981836856d9cf9088620ae866185d Mon Sep 17 00:00:00 2001 From: Albert Safin Date: Fri, 26 Oct 2018 15:40:59 +0700 Subject: [PATCH 1/3] Export I3SOCK (#3476) --- src/startup.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/startup.c b/src/startup.c index 6302d811e..c5b7ad5da 100644 --- a/src/startup.c +++ b/src/startup.c @@ -190,6 +190,7 @@ void start_application(const char *command, bool no_startup_id) { /* Setup the environment variable(s) */ if (!no_startup_id) sn_launcher_context_setup_child_process(context); + setenv("I3SOCK", current_socketpath, 1); execl(_PATH_BSHELL, _PATH_BSHELL, "-c", command, NULL); /* not reached */ From 3463406df7aa1472efad9643e6799d0f5e9d66e8 Mon Sep 17 00:00:00 2001 From: Connor E <38229097+c-edw@users.noreply.github.com> Date: Tue, 13 Nov 2018 08:46:16 +0000 Subject: [PATCH 2/3] Update userguide docs for strip_workspace_*. --- docs/userguide | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/userguide b/docs/userguide index 635c70541..8a44e2248 100644 --- a/docs/userguide +++ b/docs/userguide @@ -1628,14 +1628,16 @@ buttons. This is useful if you want to have a named workspace that stays in order on the bar according to its number without displaying the number prefix. When +strip_workspace_numbers+ is set to +yes+, any workspace that has a name of -the form "[n]:[NAME]" will display only the name. You could use this, for +the form "[n][:][NAME]" will display only the name. You could use this, for instance, to display Roman numerals rather than digits by naming your workspaces to "1:I", "2:II", "3:III", "4:IV", ... When +strip_workspace_name+ is set to +yes+, any workspace that has a name of -the form "[n]:[NAME]" will display only the number. +the form "[n][:][NAME]" will display only the number. -The default is to display the full name within the workspace button. +The default is to display the full name within the workspace button. Be aware +that the colon in the workspace name is optional, so `[n][NAME]` will also +have the the workspace name and number stripped correctly. *Syntax*: ------------------------------ From a84b30f8a995c38aa88b3333703595e052d650ab Mon Sep 17 00:00:00 2001 From: Orestis Floros Date: Thu, 15 Nov 2018 13:48:14 +0200 Subject: [PATCH 3/3] randr.c: Fix regression with focusing NULL container This was introduced in db3b9e41874400958cf85b461a5d1ff04a398fa3 which removed the NULL check for next. Fixes #3523. --- src/randr.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/randr.c b/src/randr.c index c0dec7f68..fb127ab56 100644 --- a/src/randr.c +++ b/src/randr.c @@ -974,10 +974,12 @@ void randr_disable_output(Output *output) { } } - /* Restore focus after con_detach / con_attach */ - DLOG("now focusing next = %p\n", next); - con_focus(next); - workspace_show(con_get_workspace(next)); + /* Restore focus after con_detach / con_attach. next can be NULL, see #3523. */ + if (next) { + DLOG("now focusing next = %p\n", next); + con_focus(next); + workspace_show(con_get_workspace(next)); + } /* 3: move the dock clients to the first output */ Con *child;