From 608ea90f1e57d59c817ae60af801f43ab36d6e1a Mon Sep 17 00:00:00 2001 From: Derek Stevens Date: Thu, 4 Mar 2021 00:18:10 -0500 Subject: [PATCH] config.h, menu.c: remove unused config option, add virtual desktop names to config.h --- config.h | 24 +++++++++++++++++++++--- menu.c | 15 +-------------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/config.h b/config.h index 778a84c..749ecd3 100644 --- a/config.h +++ b/config.h @@ -38,9 +38,6 @@ #define VIRTHEADER "virtual" #define VIRTMSG "[%s]" -/* Deny focus to autostuck windows? (eg xosview, clock) */ -#define NOFOCUS - /* Modifier key and associated modifier bits; * Shift = (1<<0) * Lock = (1<<1) @@ -113,4 +110,25 @@ 0 \ } +/* Names for the virtual desktops. You can define all 12, or only + * as many as you use. + * Remember the backslash at the end of non-terminating lines! + */ + +#define VIRTUALLIST {\ + "One", \ + "Two", \ + "Three", \ + "Four", \ + "Five", \ + "Six", \ + "Seven", \ + "Eight", \ + "Nine", \ + "Ten", \ + "Eleven", \ + "Twelve", \ + 0 \ +} + // clang-format on diff --git a/menu.c b/menu.c index 9dd279c..591d337 100644 --- a/menu.c +++ b/menu.c @@ -27,20 +27,7 @@ int reversehide = 1; Client* currents[NUMVIRTUALS] = {NULL, NULL, NULL, NULL}; -char* b2items[NUMVIRTUALS + 1] = { - "One", - "Two", - "Three", - "Four", - "Five", - "Six", - "Seven", - "Eight", - "Nine", - "Ten", - "Eleven", - "Twelve", - 0}; +char* b2items[NUMVIRTUALS + 1] = VIRTUALLIST; Menu b2menu = {b2items};