feat(i3): Added option to sort by workspaces by index

This commit is contained in:
Michael Carlberg 2016-10-12 04:14:06 +02:00
parent 774dec5d17
commit cba62e7b8e
2 changed files with 18 additions and 1 deletions

View File

@ -698,6 +698,11 @@ See [the bspwm module](#module-internalbspwm) for details on `label-dimmed`.
; Limit the amount of chars to output for each workspace name ; Limit the amount of chars to output for each workspace name
; Default: 0 ; Default: 0
wsname-maxlen = 2 wsname-maxlen = 2
; Sort the workspaces by index instead of the default
; sorting that groups the workspaces by output
; Default: false
index-sort = true
~~~ ~~~
##### Extra formatting (example) ##### Extra formatting (example)

View File

@ -59,6 +59,7 @@ namespace modules {
void setup() { void setup() {
// Load configuration values {{{ // Load configuration values {{{
GET_CONFIG_VALUE(name(), m_indexsort, "index-sort");
GET_CONFIG_VALUE(name(), m_pinworkspaces, "pin-workspaces"); GET_CONFIG_VALUE(name(), m_pinworkspaces, "pin-workspaces");
GET_CONFIG_VALUE(name(), m_wsname_maxlen, "wsname-maxlen"); GET_CONFIG_VALUE(name(), m_wsname_maxlen, "wsname-maxlen");
@ -127,6 +128,7 @@ namespace modules {
try { try {
auto workspaces = ipc.get_workspaces(); auto workspaces = ipc.get_workspaces();
vector<shared_ptr<i3ipc::workspace_t>> sorted = workspaces;
string focused_output; string focused_output;
bool output_unfocused = false; bool output_unfocused = false;
@ -139,7 +141,16 @@ namespace modules {
if (focused_output != m_bar.monitor->name) if (focused_output != m_bar.monitor->name)
output_unfocused = true; output_unfocused = true;
for (auto&& workspace : workspaces) { if (m_indexsort) {
using ws_t = shared_ptr<i3ipc::workspace_t>;
// clang-format off
sort(sorted.begin(), sorted.end(), [](ws_t ws1, ws_t ws2){
return ws1->num < ws2->num;
});
// clang-format on
}
for (auto&& workspace : sorted) {
if (m_pinworkspaces && workspace->output != m_bar.monitor->name) if (m_pinworkspaces && workspace->output != m_bar.monitor->name)
continue; continue;
@ -226,6 +237,7 @@ namespace modules {
vector<i3_workspace_t> m_workspaces; vector<i3_workspace_t> m_workspaces;
iconset_t m_icons; iconset_t m_icons;
bool m_indexsort = false;
bool m_pinworkspaces = false; bool m_pinworkspaces = false;
size_t m_wsname_maxlen = 0; size_t m_wsname_maxlen = 0;