qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove duplicate mouse functions and instead use the kbfunc ones. No

Browse Source 
user visable changes at this point, but they'll merge at an appropriate
time.
This commit is contained in:
okan 2014-01-30 14:40:21 +00:00
parent d5979e3ab6
commit 06d9319772
3 changed files with 8 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/cwm/calmwm.h
View File

@ -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.251 2014/01/29 22:30:00 okan Exp $
* $OpenBSD: calmwm.h,v 1.252 2014/01/30 14:40:21 okan Exp $
*/
#ifndef _CALMWM_H_
@ -482,18 +482,10 @@ void kbfunc_ssh(struct client_ctx *, union arg *);
void kbfunc_term(struct client_ctx *, union arg *);
void kbfunc_tile(struct client_ctx *, union arg *);
void mousefunc_client_cyclegroup(struct client_ctx *,
union arg *);
void mousefunc_client_grouptoggle(struct client_ctx *,
union arg *);
void mousefunc_client_hide(struct client_ctx *,
union arg *);
void mousefunc_client_lower(struct client_ctx *,
union arg *);
void mousefunc_client_move(struct client_ctx *,
union arg *);
void mousefunc_client_raise(struct client_ctx *,
union arg *);
void mousefunc_client_resize(struct client_ctx *,
union arg *);
void mousefunc_menu_cmd(struct client_ctx *, union arg *);

12
app/cwm/conf.c
View File

@ -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.167 2014/01/29 22:30:00 okan Exp $
* $OpenBSD: conf.c,v 1.168 2014/01/30 14:40:21 okan Exp $
*/
#include <sys/param.h>
@ -557,14 +557,14 @@ static const struct {
int flags;
union arg argument;
} name_to_mousefunc[] = {
{ "window_lower", kbfunc_client_lower, CWM_WIN, {0} },
{ "window_raise", kbfunc_client_raise, CWM_WIN, {0} },
{ "window_hide", kbfunc_client_hide, CWM_WIN, {0} },
{ "cyclegroup", kbfunc_client_cyclegroup, 0, {.i = CWM_CYCLE} },
{ "rcyclegroup", kbfunc_client_cyclegroup, 0, {.i = CWM_RCYCLE} },
{ "window_move", mousefunc_client_move, CWM_WIN, {0} },
{ "window_resize", mousefunc_client_resize, CWM_WIN, {0} },
{ "window_grouptoggle", mousefunc_client_grouptoggle, CWM_WIN, {0} },
{ "window_lower", mousefunc_client_lower, CWM_WIN, {0} },
{ "window_raise", mousefunc_client_raise, CWM_WIN, {0} },
{ "window_hide", mousefunc_client_hide, CWM_WIN, {0} },
{ "cyclegroup", mousefunc_client_cyclegroup, 0, {.i = CWM_CYCLE} },
{ "rcyclegroup", mousefunc_client_cyclegroup, 0, {.i = CWM_RCYCLE} },
{ "menu_group", mousefunc_menu_group, 0, {0} },
{ "menu_unhide", mousefunc_menu_unhide, 0, {0} },
{ "menu_cmd", mousefunc_menu_cmd, 0, {0} },

27
app/cwm/mousefunc.c
View File

@ -16,7 +16,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $OpenBSD: mousefunc.c,v 1.69 2014/01/29 22:30:00 okan Exp $
* $OpenBSD: mousefunc.c,v 1.70 2014/01/30 14:40:21 okan Exp $
*/
#include <sys/param.h>
@ -178,31 +178,6 @@ mousefunc_client_grouptoggle(struct client_ctx *cc, union arg *arg)
group_sticky_toggle_enter(cc);
}
void
mousefunc_client_lower(struct client_ctx *cc, union arg *arg)
{
client_ptrsave(cc);
client_lower(cc);
}
void
mousefunc_client_raise(struct client_ctx *cc, union arg *arg)
{
client_raise(cc);
}
void
mousefunc_client_hide(struct client_ctx *cc, union arg *arg)
{
client_hide(cc);
}
void
mousefunc_client_cyclegroup(struct client_ctx *cc, union arg *arg)
{
group_cycle(cc->sc, arg->i);
}
void
mousefunc_menu_group(struct client_ctx *cc, union arg *arg)
{