pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(i3): Surround ws names with quotes (#1798)

Browse Source 
Fixes #1797
This commit is contained in:
Jérôme BOULMIER 2019-06-04 17:34:16 -04:00 committed by Patrick Ziegler
parent 5be532c51b
commit c650513b67
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/modules/i3.hpp
View File

@ -56,6 +56,8 @@ namespace modules {
bool input(string&& cmd); bool input(string&& cmd);
private: private:
static string make_workspace_command(const string& workspace);
static constexpr const char* DEFAULT_TAGS{"<label-state> <label-mode>"}; static constexpr const char* DEFAULT_TAGS{"<label-state> <label-mode>"};
static constexpr const char* DEFAULT_MODE{"default"}; static constexpr const char* DEFAULT_MODE{"default"};
static constexpr const char* DEFAULT_WS_ICON{"ws-icon-default"}; static constexpr const char* DEFAULT_WS_ICON{"ws-icon-default"};
@ -92,6 +94,6 @@ namespace modules {
unique_ptr<i3_util::connection_t> m_ipc; unique_ptr<i3_util::connection_t> m_ipc;
}; };
} } // namespace modules
POLYBAR_NS_END POLYBAR_NS_END

12
src/modules/i3.cpp
View File

@ -231,7 +231,7 @@ namespace modules {
if (cmd.compare(0, strlen(EVENT_CLICK), EVENT_CLICK) == 0) { if (cmd.compare(0, strlen(EVENT_CLICK), EVENT_CLICK) == 0) {
cmd.erase(0, strlen(EVENT_CLICK)); cmd.erase(0, strlen(EVENT_CLICK));
m_log.info("%s: Sending workspace focus command to ipc handler", name()); m_log.info("%s: Sending workspace focus command to ipc handler", name());
conn.send_command("workspace " + cmd); conn.send_command(make_workspace_command(cmd));
return true; return true;
} }
@ -257,14 +257,14 @@ namespace modules {
if (scrolldir == "next" && (m_wrap || next(current_ws) != workspaces.end())) { if (scrolldir == "next" && (m_wrap || next(current_ws) != workspaces.end())) {
if (!(*current_ws)->focused) { if (!(*current_ws)->focused) {
m_log.info("%s: Sending workspace focus command to ipc handler", name()); m_log.info("%s: Sending workspace focus command to ipc handler", name());
conn.send_command("workspace " + (*current_ws)->name); conn.send_command(make_workspace_command((*current_ws)->name));
} }
m_log.info("%s: Sending workspace next_on_output command to ipc handler", name()); m_log.info("%s: Sending workspace next_on_output command to ipc handler", name());
conn.send_command("workspace next_on_output"); conn.send_command("workspace next_on_output");
} else if (scrolldir == "prev" && (m_wrap || current_ws != workspaces.begin())) { } else if (scrolldir == "prev" && (m_wrap || current_ws != workspaces.begin())) {
if (!(*current_ws)->focused) { if (!(*current_ws)->focused) {
m_log.info("%s: Sending workspace focus command to ipc handler", name()); m_log.info("%s: Sending workspace focus command to ipc handler", name());
conn.send_command("workspace " + (*current_ws)->name); conn.send_command(make_workspace_command((*current_ws)->name));
} }
m_log.info("%s: Sending workspace prev_on_output command to ipc handler", name()); m_log.info("%s: Sending workspace prev_on_output command to ipc handler", name());
conn.send_command("workspace prev_on_output"); conn.send_command("workspace prev_on_output");
@ -276,6 +276,10 @@ namespace modules {
return true; return true;
} }
}
string i3_module::make_workspace_command(const string& workspace) {
return "workspace \"" + workspace + "\"";
}
} // namespace modules
POLYBAR_NS_END POLYBAR_NS_END