summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorOkan Demirmen <okan@cvs.openbsd.org>2011-06-24 05:30:43 +0000
committerOkan Demirmen <okan@cvs.openbsd.org>2011-06-24 05:30:43 +0000
commit4e3b0b87941a7440727ec39245ecd062a558d893 (patch)
tree6c7f4138d0442f3843da85e00fe597950337e91b /app
parentb83ea834e2a77dff39893181e68d9442fd55ba40 (diff)
collapse client and group {r,}cycle defines since they are really
the same thing. ok oga@
Diffstat (limited to 'app')
-rw-r--r--app/cwm/calmwm.h8
-rw-r--r--app/cwm/conf.c6
2 files changed, 5 insertions, 9 deletions
diff --git a/app/cwm/calmwm.h b/app/cwm/calmwm.h
index b8734063b..ac577a452 100644
--- a/app/cwm/calmwm.h
+++ b/app/cwm/calmwm.h
@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $OpenBSD: calmwm.h,v 1.126 2011/05/15 17:58:47 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.127 2011/06/24 05:30:42 okan Exp $
*/
#ifndef _CALMWM_H_
@@ -67,14 +67,10 @@
#define CWM_EXEC_PROGRAM 0x0001
#define CWM_EXEC_WM 0x0002
-/* client cycle */
+/* cycle */
#define CWM_CYCLE 0
#define CWM_RCYCLE 1
-/* group cycle */
-#define CWM_CYCLEGROUP 0
-#define CWM_RCYCLEGROUP 1
-
#define KBTOGROUP(X) ((X) - 1)
union arg {
diff --git a/app/cwm/conf.c b/app/cwm/conf.c
index 0536ac310..fac1ef3a0 100644
--- a/app/cwm/conf.c
+++ b/app/cwm/conf.c
@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $OpenBSD: conf.c,v 1.79 2011/05/11 13:53:51 okan Exp $
+ * $OpenBSD: conf.c,v 1.80 2011/06/24 05:30:42 okan Exp $
*/
#include <sys/param.h>
@@ -356,8 +356,8 @@ static struct {
{ "movetogroup9", kbfunc_client_movetogroup, KBFLAG_NEEDCLIENT,
{.i = 9} },
{ "nogroup", kbfunc_client_nogroup, 0, {0} },
- { "cyclegroup", kbfunc_client_cyclegroup, 0, {.i = CWM_CYCLEGROUP} },
- { "rcyclegroup", kbfunc_client_cyclegroup, 0, {.i = CWM_RCYCLEGROUP} },
+ { "cyclegroup", kbfunc_client_cyclegroup, 0, {.i = CWM_CYCLE} },
+ { "rcyclegroup", kbfunc_client_cyclegroup, 0, {.i = CWM_RCYCLE} },
{ "grouptoggle", kbfunc_client_grouptoggle, KBFLAG_NEEDCLIENT, {0}},
{ "maximize", kbfunc_client_maximize, KBFLAG_NEEDCLIENT, {0} },
{ "vmaximize", kbfunc_client_vmaximize, KBFLAG_NEEDCLIENT, {0} },