e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Enable move/resize using keyboard. 

SVN revision: 39015
This commit is contained in:
Kim Woelders 2009-02-14 11:09:06 +00:00
parent b18416800b
commit 64311e0acb
6 changed files with 138 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
COMPLIANCE
View File

@ -47,8 +47,9 @@ Other Root Window Messages
[+] _NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT
[+] _NET_WM_MOVERESIZE_SIZE_LEFT
[+] _NET_WM_MOVERESIZE_MOVE
[ ] _NET_WM_MOVERESIZE_SIZE_KEYBOARD
[ ] _NET_WM_MOVERESIZE_MOVE_KEYBOARD
[+] _NET_WM_MOVERESIZE_SIZE_KEYBOARD
[+] _NET_WM_MOVERESIZE_MOVE_KEYBOARD
[+] _NET_WM_MOVERESIZE_CANCEL
[ ] _NET_RESTACK_WINDOW
[ ] _NET_REQUEST_FRAME_EXTENTS

3
src/ewins.c
View File

@ -2260,6 +2260,9 @@ EwinHandleEventsToplevel(Win win __UNUSED__, XEvent * ev, void *prm)
switch (ev->type)
{
case KeyPress:
ActionsHandleKey(XLookupKeysym(&ev->xkey, 0));
break;
case ButtonPress:
ActionsCheck("BUTTONBINDINGS", ewin, ev);
break;

1
src/ewins.h
View File

@ -456,6 +456,7 @@ int ActionResizeStart(EWin * ewin, int kbd, int hv);
int ActionsSuspend(void);
int ActionsResume(void);
void ActionsHandleKey(unsigned int key);
void ActionsHandleMotion(void);
int ActionsEnd(EWin * ewin);

10
src/ewmh.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2003-2008 Kim Woelders
* Copyright (C) 2003-2009 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -43,6 +43,7 @@
#define _NET_WM_MOVERESIZE_MOVE 8
#define _NET_WM_MOVERESIZE_SIZE_KEYBOARD 9
#define _NET_WM_MOVERESIZE_MOVE_KEYBOARD 10
#define _NET_WM_MOVERESIZE_CANCEL 11
/* Window state property change actions */
#define _NET_WM_STATE_REMOVE 0
@ -1044,10 +1045,13 @@ EWMH_ProcessClientClientMessage(EWin * ewin, XClientMessageEvent * ev)
break;
case _NET_WM_MOVERESIZE_SIZE_KEYBOARD:
/* doResize(NULL); */
ActionResizeStart(ewin, 1, MODE_RESIZE);
break;
case _NET_WM_MOVERESIZE_MOVE_KEYBOARD:
/* doMove(NULL); */
ActionMoveStart(ewin, 1, 0, 0);
break;
case _NET_WM_MOVERESIZE_CANCEL:
ActionsEnd(ewin);
break;
}
return 1;

10
src/ipc.c
View File

@ -562,6 +562,10 @@ IpcWinop(const WinOp * wop, EWin * ewin, const char *prm)
{
ActionMoveStart(ewin, 0, 0, Mode.nogroup);
}
else if (!strcmp(param1, "kbd"))
{
ActionMoveStart(ewin, 1, 0, Mode.nogroup);
}
else if (!strcmp(param1, "?"))
{
IpcPrintf("window location: %d %d", EoGetX(ewin), EoGetY(ewin));
@ -598,6 +602,10 @@ IpcWinop(const WinOp * wop, EWin * ewin, const char *prm)
{
ActionResizeStart(ewin, 0, MODE_RESIZE_V);
}
else if (!strcmp(param1, "kbd"))
{
ActionResizeStart(ewin, 1, MODE_RESIZE);
}
else if (!strcmp(param1, "?"))
{
IpcPrintf("window size: %d %d", ewin->client.w, ewin->client.h);
@ -1553,7 +1561,7 @@ static const IpcItem IPCArray[] = {
#endif
" win_op <windowid> desk <desktochangeto/next/prev>\n"
" win_op <windowid> area <x> <y>\n"
" win_op <windowid> <move/size> <x> <y>\n"
" win_op <windowid> <move/size> <x> <y> or <kbd/ptr>\n"
" (you can use ? and ?? to retreive client and frame locations)\n"
" win_op <windowid> <mr/sr> <x> <y> (incremental move/size)\n"
" win_op <windowid> toggle_<width/height/size> <conservative/available/xinerama>\n"

127
src/moveresize.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2008 Kim Woelders
* Copyright (C) 2004-2009 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -33,16 +33,19 @@
#include "hints.h"
#include "timers.h"
#include "xwin.h"
#include <X11/keysym.h>
static struct {
EWin *ewin;
int mode;
char mode;
char using_kbd;
char nogroup;
char grab_server;
int start_x, start_y;
int cur_x, cur_y;
int win_x, win_y, win_w, win_h;
int swapcoord_x, swapcoord_y;
int resize_detail;
char nogroup;
char grab_server;
} Mode_mr;
static int
@ -77,7 +80,7 @@ EwinShapeSet(EWin * ewin)
}
int
ActionMoveStart(EWin * ewin, int kbd __UNUSED__, int constrained, int nogroup)
ActionMoveStart(EWin * ewin, int kbd, int constrained, int nogroup)
{
EWin **gwins;
int i, num, cx, cy;
@ -86,19 +89,23 @@ ActionMoveStart(EWin * ewin, int kbd __UNUSED__, int constrained, int nogroup)
return 0;
Mode_mr.ewin = ewin;
Mode_mr.using_kbd = kbd;
Mode_mr.nogroup = nogroup;
EventsGetXY(&cx, &cy);
SoundPlay(SOUND_MOVE_START);
GrabPointerSet(EoGetWin(ewin), ECSR_ACT_MOVE, 1);
if (kbd)
GrabKeyboardSet(EoGetWin(ewin));
else
GrabPointerSet(EoGetWin(ewin), ECSR_ACT_MOVE, 1);
Mode.mode = MODE_MOVE_PENDING;
Mode.constrained = constrained;
Mode_mr.start_x = cx;
Mode_mr.start_y = cy;
Mode_mr.start_x = Mode_mr.cur_x = cx;
Mode_mr.start_y = Mode_mr.cur_y = cy;
Mode_mr.win_x = Mode_mr.start_x - (EoGetX(ewin) + EoGetX(EoGetDesk(ewin)));
Mode_mr.win_y = Mode_mr.start_y - (EoGetY(ewin) + EoGetY(EoGetDesk(ewin)));
@ -142,6 +149,7 @@ ActionMoveEnd(EWin * ewin)
if (ewin && ewin != Mode_mr.ewin)
return 0;
GrabKeyboardRelease();
GrabPointerRelease();
SoundPlay(SOUND_MOVE_STOP);
@ -287,7 +295,7 @@ ActionMoveResume(void)
#define RD_V(hv) (((hv) ) & 0xff)
int
ActionResizeStart(EWin * ewin, int kbd __UNUSED__, int hv)
ActionResizeStart(EWin * ewin, int kbd, int hv)
{
int x, y, w, h, ww, hh, cx, cy;
unsigned int csr;
@ -304,6 +312,7 @@ ActionResizeStart(EWin * ewin, int kbd __UNUSED__, int hv)
if (Conf.movres.mode_resize < 0 || Conf.movres.mode_resize > 4)
Conf.movres.mode_resize = 0;
Mode_mr.mode = Conf.movres.mode_resize;
Mode_mr.using_kbd = kbd;
Mode_mr.grab_server = _NeedServerGrab(Mode_mr.mode);
if (Mode_mr.grab_server)
{
@ -323,6 +332,12 @@ ActionResizeStart(EWin * ewin, int kbd __UNUSED__, int hv)
default:
case MODE_RESIZE:
Mode.mode = hv;
if (kbd)
{
Mode_mr.resize_detail = 0;
csr = ECSR_ACT_RESIZE_BR;
break;
}
x = cx - EoGetX(ewin);
y = cy - EoGetY(ewin);
w = EoGetW(ewin) >> 1;
@ -404,14 +419,17 @@ ActionResizeStart(EWin * ewin, int kbd __UNUSED__, int hv)
break;
}
Mode_mr.start_x = cx;
Mode_mr.start_y = cy;
Mode_mr.start_x = Mode_mr.cur_x = cx;
Mode_mr.start_y = Mode_mr.cur_y = cy;
Mode_mr.win_x = EoGetX(ewin);
Mode_mr.win_y = EoGetY(ewin);
Mode_mr.win_w = ewin->client.w;
Mode_mr.win_h = ewin->client.h;
GrabPointerSet(EoGetWin(ewin), csr, 1);
if (kbd)
GrabKeyboardSet(EoGetWin(ewin));
else
GrabPointerSet(EoGetWin(ewin), csr, 1);
EwinShapeSet(ewin);
ewin->state.show_coords = 1;
@ -429,6 +447,7 @@ ActionResizeEnd(EWin * ewin)
Mode.mode = MODE_NONE;
GrabKeyboardRelease();
GrabPointerRelease();
SoundPlay(SOUND_RESIZE_STOP);
@ -747,6 +766,90 @@ ActionResizeHandleMotion(void)
DrawEwinShape(ewin, Conf.movres.mode_resize, x, y, w, h, 1, 0);
}
void
ActionsHandleKey(unsigned int key)
{
EWin *ewin;
int resize, delta, end = 0;
ewin = Mode_mr.ewin;
if (!ewin)
return;
resize = Mode.mode == MODE_RESIZE ||
Mode.mode == MODE_RESIZE_H || Mode.mode == MODE_RESIZE_V;
Mode.events.px = Mode_mr.cur_x;
Mode.events.py = Mode_mr.cur_y;
delta = 5;
switch (key)
{
default:
return;
case XK_Escape:
Mode_mr.cur_x = Mode_mr.start_x;
Mode_mr.cur_y = Mode_mr.start_y;
case XK_Return:
end = 1;
break;
case XK_Left:
if (!RD_H(Mode_mr.resize_detail))
Mode_mr.resize_detail |= RD(1, 0);
if (resize && ewin->icccm.w_inc > delta)
delta = ewin->icccm.w_inc;
Mode_mr.cur_x -= delta;
break;
case XK_Right:
if (!RD_H(Mode_mr.resize_detail))
Mode_mr.resize_detail |= RD(2, 0);
if (resize && ewin->icccm.w_inc > delta)
delta = ewin->icccm.w_inc;
Mode_mr.cur_x += delta;
break;
case XK_Up:
if (!RD_V(Mode_mr.resize_detail))
Mode_mr.resize_detail |= RD(0, 1);
if (resize && ewin->icccm.h_inc > delta)
delta = ewin->icccm.h_inc;
Mode_mr.cur_y -= delta;
break;
case XK_Down:
if (!RD_V(Mode_mr.resize_detail))
Mode_mr.resize_detail |= RD(0, 2);
if (resize && ewin->icccm.h_inc > delta)
delta = ewin->icccm.h_inc;
Mode_mr.cur_y += delta;
break;
}
Mode_mr.using_kbd = 2;
Mode.events.mx = Mode_mr.cur_x;
Mode.events.my = Mode_mr.cur_y;
switch (Mode.mode)
{
case MODE_MOVE_PENDING:
case MODE_MOVE:
ActionMoveHandleMotion();
if (end)
ActionMoveEnd(NULL);
break;
case MODE_RESIZE:
case MODE_RESIZE_H:
case MODE_RESIZE_V:
ActionResizeHandleMotion();
if (end)
ActionResizeEnd(NULL);
break;
default:
break;
}
}
void
ActionsHandleMotion(void)
{