/*
- * Copyright (c) 2009-2012 Marco Peereboom <marco@peereboom.us>
+ * Copyright (c) 2009-2015 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2009-2011 Ryan McBride <mcbride@countersiege.com>
* Copyright (c) 2009 Darrin Chandler <dwchandler@stilyagin.com>
* Copyright (c) 2009 Pierre-Yves Ritschard <pyr@spootnik.org>
* Copyright (c) 2010 Tuukka Kataja <stuge@xor.fi>
* Copyright (c) 2011 Jason L. Wright <jason@thought.net>
- * Copyright (c) 2011-2014 Reginald Kennedy <rk@rejii.com>
+ * Copyright (c) 2011-2015 Reginald Kennedy <rk@rejii.com>
* Copyright (c) 2011-2012 Lawrence Teo <lteo@lteo.net>
* Copyright (c) 2011-2012 Tiago Cunha <tcunha@gmx.com>
- * Copyright (c) 2012-2013 David Hill <dhill@mindcry.org>
+ * Copyright (c) 2012-2015 David Hill <dhill@mindcry.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
int font_adjusted = 0;
unsigned int mod_key = MODKEY;
bool warp_pointer = false;
+unsigned int mouse_button_move = XCB_BUTTON_INDEX_1;
+unsigned int mouse_button_resize = XCB_BUTTON_INDEX_3;
/* dmenu search */
struct swm_region *search_r;
#define SWM_ARG_ID_FLIPLAYOUT (24)
#define SWM_ARG_ID_STACKRESET (30)
#define SWM_ARG_ID_STACKINIT (31)
+#define SWM_ARG_ID_STACKBALANCE (32)
#define SWM_ARG_ID_CYCLEWS_UP (40)
#define SWM_ARG_ID_CYCLEWS_DOWN (41)
#define SWM_ARG_ID_CYCLERG_UP (42)
KF_STACK_INC,
KF_STACK_DEC,
KF_STACK_RESET,
+ KF_STACK_BALANCE,
KF_SWAP_MAIN,
KF_SWAP_NEXT,
KF_SWAP_PREV,
int setconfbinding(const char *, const char *, int);
int setconfcolor(const char *, const char *, int);
int setconfmodkey(const char *, const char *, int);
+int setconfmousebuttonmove(const char *, const char *, int);
+int setconfmousebuttonresize(const char *, const char *, int);
int setconfquirk(const char *, const char *, int);
int setconfregion(const char *, const char *, int);
int setconfspawn(const char *, const char *, int);
void updatenumlockmask(void);
void update_floater(struct ws_win *);
void update_modkey(unsigned int);
+unsigned char update_mousebutton(unsigned char, unsigned int);
void update_win_stacking(struct ws_win *);
void update_window(struct ws_win *);
void update_window_color(struct ws_win *);
ws->l_state.vertical_mwin = 1;
ws->l_state.vertical_stacks = 1;
break;
+ case SWM_ARG_ID_STACKBALANCE:
+ ws->l_state.vertical_msize = SWM_V_SLICE / (ws->l_state.vertical_stacks + 1);
+ break;
case SWM_ARG_ID_MASTERSHRINK:
if (ws->l_state.vertical_msize > 1)
ws->l_state.vertical_msize--;
ws->l_state.horizontal_msize = SWM_H_SLICE / 2;
ws->l_state.horizontal_stacks = 1;
break;
+ case SWM_ARG_ID_STACKBALANCE:
+ ws->l_state.horizontal_msize = SWM_H_SLICE / (ws->l_state.horizontal_stacks + 1);
+ break;
case SWM_ARG_ID_MASTERSHRINK:
if (ws->l_state.horizontal_msize > 1)
ws->l_state.horizontal_msize--;
{ "stack_inc", stack_config, {.id = SWM_ARG_ID_STACKINC} },
{ "stack_dec", stack_config, {.id = SWM_ARG_ID_STACKDEC} },
{ "stack_reset", stack_config, {.id = SWM_ARG_ID_STACKRESET} },
+ { "stack_balance", stack_config, {.id = SWM_ARG_ID_STACKBALANCE} },
{ "swap_main", swapwin, {.id = SWM_ARG_ID_SWAPMAIN} },
{ "swap_next", swapwin, {.id = SWM_ARG_ID_SWAPNEXT} },
{ "swap_prev", swapwin, {.id = SWM_ARG_ID_SWAPPREV} },
buttons[i].mask = mod;
}
+unsigned char
+update_mousebutton(unsigned char type, unsigned int but)
+{
+ int i;
+
+ switch (type) {
+ case 0:
+ mouse_button_move = but;
+ break;
+ case 1:
+ mouse_button_resize = but;
+ break;
+ }
+
+ for (i = 0; i < LENGTH(buttons); i++) {
+ if (buttons[i].func == move)
+ buttons[i].button = mouse_button_move;
+
+ if (buttons[i].func == resize)
+ buttons[i].button = mouse_button_resize;
+ }
+
+ return(1);
+}
+
int
spawn_expand(struct swm_region *r, union arg *args, const char *spawn_name,
char ***ret_args)
setkeybinding(MODKEY_SHIFT, XK_comma, KF_STACK_INC, NULL);
setkeybinding(MODKEY_SHIFT, XK_period, KF_STACK_DEC, NULL);
setkeybinding(MODKEY_SHIFT, XK_space, KF_STACK_RESET, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_h, KF_STACK_BALANCE, NULL);
setkeybinding(MODKEY, XK_Return, KF_SWAP_MAIN, NULL);
setkeybinding(MODKEY_SHIFT, XK_j, KF_SWAP_NEXT, NULL);
setkeybinding(MODKEY_SHIFT, XK_k, KF_SWAP_PREV, NULL);
return (0);
}
+int
+setconfmousebuttonmove(const char *selector, const char *value, int flags)
+{
+ /* suppress unused warnings since vars are needed */
+ (void)selector;
+ (void)flags;
+
+ if (strncasecmp(value, "But1", strlen("But1")) == 0) {
+ if (!update_mousebutton(0, XCB_BUTTON_INDEX_1))
+ return (1);
+ } else if (strncasecmp(value, "But2", strlen("But2")) == 0) {
+ if (!update_mousebutton(0, XCB_BUTTON_INDEX_2))
+ return (1);
+ } else if (strncasecmp(value, "But3", strlen("But3")) == 0) {
+ if (!update_mousebutton(0, XCB_BUTTON_INDEX_3))
+ return (1);
+ } else
+ return (1);
+ return (0);
+}
+
+int
+setconfmousebuttonresize(const char *selector, const char *value, int flags)
+{
+ /* suppress unused warnings since vars are needed */
+ (void)selector;
+ (void)flags;
+
+ if (strncasecmp(value, "But1", strlen("But1")) == 0) {
+ if (!update_mousebutton(1, XCB_BUTTON_INDEX_1))
+ return (1);
+ } else if (strncasecmp(value, "But2", strlen("But2")) == 0) {
+ if (!update_mousebutton(1, XCB_BUTTON_INDEX_2))
+ return (1);
+ } else if (strncasecmp(value, "But3", strlen("But3")) == 0) {
+ if (!update_mousebutton(1, XCB_BUTTON_INDEX_3))
+ return (1);
+ } else
+ return (1);
+ return (0);
+}
+
int
setconfcolor(const char *selector, const char *value, int flags)
{
{ "keyboard_mapping", setkeymapping, 0 },
{ "layout", setlayout, 0 },
{ "modkey", setconfmodkey, 0 },
+ { "move_button", setconfmousebuttonmove, 0 },
+ { "resize_button", setconfmousebuttonresize, 0 },
{ "program", setconfspawn, 0 },
{ "quirk", setconfquirk, 0 },
{ "region", setconfregion, 0 },
if (line)
free(line);
fclose(config);
+
+ if (mouse_button_move == mouse_button_resize) {
+ add_startup_exception("%s: move and resize mouse buttons match",
+ filename);
+ }
+
DNPRINTF(SWM_D_CONF, "conf_load: end\n");
return (0);