gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00
Code Issues Projects Releases Wiki Activity

Add KEY_CONTROL_WINDOW_WEIGHT to keyboard move window code and bugs fixes.

Browse Source
This commit is contained in:
id
1999-04-23 07:12:01 +00:00
parent 553c61ee3b
commit a8b7216c31
2 changed files with 132 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/moveres.c
View File

@@ -1118,8 +1118,6 @@ updateWindowPosition(WWindow *wwin, MoveData *data, Bool doResistance,
} }
#if 0 #if 0
typedef struct _looper { typedef struct _looper {
WWindow *wwin; WWindow *wwin;
@@ -1152,7 +1150,8 @@ _keyloop(_looper *lpr){
} }
#endif #endif
#define _KS 20
#define _KS KEY_CONTROL_WINDOW_WEIGHT
int int
wKeyboardMoveResizeWindow(WWindow *wwin) wKeyboardMoveResizeWindow(WWindow *wwin)
@@ -1168,9 +1167,10 @@ wKeyboardMoveResizeWindow(WWindow *wwin)
int src_x = wwin->frame_x; int src_x = wwin->frame_x;
int src_y = wwin->frame_y; int src_y = wwin->frame_y;
int done,off_x,off_y,ww,wh; int done,off_x,off_y,ww,wh;
int kspeed = 1; int kspeed = _KS;
Time lastTime = 0; Time lastTime = 0;
KeySym keysym=NoSymbol; KeySym keysym=NoSymbol;
int moment=0;
KeyCode shiftl,shiftr,ctrll,ctrlmode; KeyCode shiftl,shiftr,ctrll,ctrlmode;
/* /*
@@ -1236,29 +1236,32 @@ wKeyboardMoveResizeWindow(WWindow *wwin)
case KeyPress: case KeyPress:
/* accelerate */ /* accelerate */
if (event.xkey.time - lastTime > 50) { if (event.xkey.time - lastTime > 50) {
kspeed = 1; kspeed/=(1 + (event.xkey.time - lastTime)/100);
} else { } else {
if (kspeed < 20) if (kspeed < 20) {
kspeed++; kspeed++;
} }
}
if (kspeed < _KS) kspeed = _KS;
lastTime = event.xkey.time; lastTime = event.xkey.time;
if (event.xkey.state & ControlMask && !wwin->flags.shaded){ if (event.xkey.state & ControlMask && !wwin->flags.shaded) {
ctrlmode=1; ctrlmode=1;
wUnselectWindows(scr); wUnselectWindows(scr);
} }
else { else {
ctrlmode=0; ctrlmode=0;
} }
if (event.xkey.keycode == shiftl || event.xkey.keycode == shiftr){ if (event.xkey.keycode == shiftl || event.xkey.keycode == shiftr) {
if(ctrlmode) if (ctrlmode)
cycleGeometryDisplay(wwin, src_x+off_x, src_y+off_y, ww, wh, 0); cycleGeometryDisplay(wwin, src_x+off_x, src_y+off_y, ww, wh, 0);
else else
cyclePositionDisplay(wwin, src_x+off_x, src_y+off_y, ww, wh); cyclePositionDisplay(wwin, src_x+off_x, src_y+off_y, ww, wh);
} }
else { else {
keysym = XLookupKeysym(&event.xkey, 0); keysym = XLookupKeysym(&event.xkey, 0);
switch(keysym){ switch (keysym) {
case XK_Return: case XK_Return:
done=2; done=2;
break; break;
@@ -1269,7 +1272,11 @@ wKeyboardMoveResizeWindow(WWindow *wwin)
case XK_KP_Up: case XK_KP_Up:
case XK_k: case XK_k:
if (ctrlmode){ if (ctrlmode){
if (moment != UP)
h = wh;
h-=kspeed; h-=kspeed;
moment = UP;
if (h < 1) h = 1;
} }
else off_y-=kspeed; else off_y-=kspeed;
break; break;
@@ -1277,34 +1284,45 @@ wKeyboardMoveResizeWindow(WWindow *wwin)
case XK_KP_Down: case XK_KP_Down:
case XK_j: case XK_j:
if (ctrlmode){ if (ctrlmode){
if (moment != DOWN)
h = wh;
h+=kspeed; h+=kspeed;
moment = DOWN;
} }
else off_y+=kspeed; else off_y+=kspeed;
break; break;
case XK_Left: case XK_Left:
case XK_KP_Left: case XK_KP_Left:
case XK_h: case XK_h:
if (ctrlmode){ if (ctrlmode) {
if (moment != LEFT)
w = ww;
w-=kspeed; w-=kspeed;
if (w < 1) w = 1;
moment = LEFT;
} }
else off_x-=kspeed; else off_x-=kspeed;
break; break;
case XK_Right: case XK_Right:
case XK_KP_Right: case XK_KP_Right:
case XK_l: case XK_l:
if (ctrlmode){ if (ctrlmode) {
if (moment != RIGHT)
w = ww;
w+=kspeed; w+=kspeed;
moment = RIGHT;
} }
else off_x+=kspeed; else off_x+=kspeed;
break; break;
} }
ww=w;wh=h; ww=w;wh=h;
wh-=vert_border; wh-=vert_border;
wWindowConstrainSize(wwin, &ww, &wh); wWindowConstrainSize(wwin, &ww, &wh);
wh+=vert_border; wh+=vert_border;
if (wPreferences.ws_cycle){ if (wPreferences.ws_cycle){
if (src_x + off_x + wwin->frame->core->width < 20){ if (src_x + off_x + ww < 20){
if(!scr->current_workspace) { if(!scr->current_workspace) {
wWorkspaceChange(scr, scr->workspace_count-1); wWorkspaceChange(scr, scr->workspace_count-1);
} }
@@ -1320,17 +1338,18 @@ wKeyboardMoveResizeWindow(WWindow *wwin)
} }
} }
else { else {
if (src_x + off_x + wwin->frame->core->width < 20) if (src_x + off_x + ww < 20)
off_x = 20 - wwin->frame->core->width - src_x; off_x = 20 - ww - src_x;
else if (src_x + off_x + 20 > scr_width) else if (src_x + off_x + 20 > scr_width)
off_x = scr_width - 20 - src_x; off_x = scr_width - 20 - src_x;
} }
if (src_y + off_y + wwin->frame->core->height < 20) if (src_y + off_y + wh < 20) {
off_y = 20 - wwin->frame->core->height - src_y; off_y = 20 - wh - src_y;
else if (src_y + off_y + 20 > scr_height) }
else if (src_y + off_y + 20 > scr_height) {
off_y = scr_height - 20 - src_y; off_y = scr_height - 20 - src_y;
}
} }
break; break;
case ButtonPress: case ButtonPress:

1
src/wconfig.h.in
View File

@@ -475,6 +475,7 @@
#define MOVE_THRESHOLD 5 /* how many pixels to move before dragging windows #define MOVE_THRESHOLD 5 /* how many pixels to move before dragging windows
* and other objects */ * and other objects */
#define KEY_CONTROL_WINDOW_WEIGHT 1
#define HRESIZE_THRESHOLD 3 #define HRESIZE_THRESHOLD 3