hiro/spectrwm
1
0
Fork 0
mirror of https://github.com/vale981/spectrwm synced 2025-03-04 17:31:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Mouse button mapping config option, by levaidaniel"

Browse source 
This reverts commit e0e24c4fa6.
This commit is contained in:
Reginald Kennedy 2015-02-23 17:11:59 +08:00
parent 7709861107
commit 79df455b47
2 changed files with 0 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
spectrwm.1
View file

@ -369,12 +369,6 @@ This setting is not retained at restart.
.It Ic modkey
Change mod key.
Mod1 is generally the ALT key and Mod4 is the windows key on a PC.
.It Ic move_button
Change mouse button used for moving windows.
But1 is the left, But2 is the middle and But3 is the right mouse button.
.It Ic resize_button
Change mouse button used for resizing windows.
But1 is the left, But2 is the middle and But3 is the right mouse button.
.It Ic name
Set the name of a workspace at start-of-day.
Defined in the format

80
spectrwm.c
View file

@ -334,8 +334,6 @@ int term_width = 0;
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;
@ -1130,8 +1128,6 @@ int setautorun(const char *, const char *, int);
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);
@ -1179,7 +1175,6 @@ void unmap_window(struct ws_win *);
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 *);
@ -6841,31 +6836,6 @@ update_modkey(unsigned int mod)
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)
@ -8366,48 +8336,6 @@ setconfmodkey(const char *selector, const char *value, int flags)
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)
{
@ -8657,8 +8585,6 @@ struct config_option configopt[] = {
{ "layout", setlayout, 0 },
{ "maximize_hide_bar", setconfvalue, SWM_S_MAXIMIZE_HIDE_BAR },
{ "modkey", setconfmodkey, 0 },
{ "move_button", setconfmousebuttonmove, 0 },
{ "resize_button", setconfmousebuttonresize, 0 },
{ "program", setconfspawn, 0 },
{ "quirk", setconfquirk, 0 },
{ "region", setconfregion, 0 },
@ -8824,12 +8750,6 @@ conf_load(const char *filename, int keymapping)
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);