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

Add a wrapper based upon xevent handlers around client move/resize for key and

Browse Source 
mouse bindings.
This commit is contained in:
okan 2016-11-15 00:07:03 +00:00
parent d18539103e
commit 706ee11014
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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.331 2016/11/14 21:25:59 okan Exp $
* $OpenBSD: calmwm.h,v 1.332 2016/11/15 00:07:03 okan Exp $
*/
#ifndef _CALMWM_H_
@ -463,7 +463,9 @@ void screen_assert_clients_within(struct screen_ctx *);
void kbfunc_cwm_status(void *, union arg *, enum xev);
void kbfunc_ptrmove(void *, union arg *, enum xev);
void kbfunc_client_move(void *, union arg *, enum xev);
void kbfunc_client_move_key(void *, union arg *, enum xev);
void kbfunc_client_resize(void *, union arg *, enum xev);
void kbfunc_client_resize_key(void *, union arg *, enum xev);
void kbfunc_client_delete(void *, union arg *, enum xev);
void kbfunc_client_lower(void *, union arg *, enum xev);
void kbfunc_client_raise(void *, union arg *, enum xev);

6
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.222 2016/11/14 21:25:59 okan Exp $
* $OpenBSD: conf.c,v 1.223 2016/11/15 00:07:03 okan Exp $
*/
#include <sys/types.h>
@ -177,8 +177,8 @@ static const struct {
{ "window_lower", kbfunc_client_lower, CWM_CONTEXT_CC, {0} },
{ "window_raise", kbfunc_client_raise, CWM_CONTEXT_CC, {0} },
{ "window_hide", kbfunc_client_hide, CWM_CONTEXT_CC, {0} },
{ "window_move", mousefunc_client_move, CWM_CONTEXT_CC, {0} },
{ "window_resize", mousefunc_client_resize, CWM_CONTEXT_CC, {0} },
{ "window_move", kbfunc_client_move, CWM_CONTEXT_CC, {0} },
{ "window_resize", kbfunc_client_resize, CWM_CONTEXT_CC, {0} },
{ "window_grouptoggle", kbfunc_client_toggle_group, CWM_CONTEXT_CC, {0} },
{ "menu_group", kbfunc_menu_group, CWM_CONTEXT_SC, {0} },
{ "menu_unhide", kbfunc_menu_client, CWM_CONTEXT_SC, {0} },

24
app/cwm/kbfunc.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: kbfunc.c,v 1.134 2016/10/24 20:44:08 okan Exp $
* $OpenBSD: kbfunc.c,v 1.135 2016/11/15 00:07:03 okan Exp $
*/
#include <sys/types.h>
@ -85,6 +85,17 @@ kbfunc_ptrmove(void *ctx, union arg *arg, enum xev xev)
void
kbfunc_client_move(void *ctx, union arg *arg, enum xev xev)
{
int m = (xev == CWM_XEV_BTN);
if (m)
mousefunc_client_move(ctx, arg, xev);
else
kbfunc_client_move_key(ctx, arg, xev);
}
void
kbfunc_client_move_key(void *ctx, union arg *arg, enum xev xev)
{
struct client_ctx *cc = ctx;
struct screen_ctx *sc = cc->sc;
@ -139,6 +150,17 @@ kbfunc_client_move(void *ctx, union arg *arg, enum xev xev)
void
kbfunc_client_resize(void *ctx, union arg *arg, enum xev xev)
{
int m = (xev == CWM_XEV_BTN);
if (m)
mousefunc_client_resize(ctx, arg, xev);
else
kbfunc_client_resize_key(ctx, arg, xev);
}
void
kbfunc_client_resize_key(void *ctx, union arg *arg, enum xev xev)
{
struct client_ctx *cc = ctx;
unsigned int mx = 0, my = 0;