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

Add delay to send configure notify in virtual edge and

Browse Source 
fix a bug in move window with keyboard.
This commit is contained in:
id
2000-11-25 21:06:31 +00:00
parent 4eb26a0bd3
commit 1f22c07051
2 changed files with 288 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

443
src/moveres.c
View File

@@ -1258,249 +1258,266 @@ wKeyboardMoveResizeWindow(WWindow *wwin)
ww=w; ww=w;
wh=h; wh=h;
while(1) { while(1) {
/* /*
looper.ox=off_x; looper.ox=off_x;
looper.oy=off_y; looper.oy=off_y;
*/ */
WMMaskEvent(dpy, KeyPressMask | ButtonReleaseMask do {
| ButtonPressMask | ExposureMask, &event); WMMaskEvent(dpy, KeyPressMask | ButtonReleaseMask
if (wwin->flags.shaded || scr->selected_windows) { | ButtonPressMask | ExposureMask, &event);
if(scr->selected_windows) if (event.type == Expose) {
drawFrames(wwin,scr->selected_windows,off_x,off_y); WMHandleEvent(&event);
else drawTransparentFrame(wwin, src_x+off_x, src_y+off_y, w, h);
/*** I HATE EDGE RESISTANCE - ]d ***/
}
else {
drawTransparentFrame(wwin, src_x+off_x, src_y+off_y, ww, wh);
}
if(ctrlmode)
showGeometry(wwin, src_x+off_x, src_y+off_y, src_x+off_x+ww, src_y+off_y+wh,0);
XUngrabServer(dpy);
XSync(dpy, False);
switch (event.type) {
case KeyPress:
/* accelerate */
if (event.xkey.time - lastTime > 50) {
kspeed/=(1 + (event.xkey.time - lastTime)/100);
} else {
if (kspeed < 20) {
kspeed++;
} }
} } while (event.type == Expose);
if (kspeed < _KS) kspeed = _KS;
lastTime = event.xkey.time;
if (event.xkey.state & ControlMask && !wwin->flags.shaded) {
ctrlmode=1; while (XCheckTypedEvent(dpy, Expose, &event)) {
wUnselectWindows(scr); WMHandleEvent(&event);
}
if (wwin->flags.shaded || scr->selected_windows) {
if(scr->selected_windows)
drawFrames(wwin,scr->selected_windows,off_x,off_y);
else drawTransparentFrame(wwin, src_x+off_x, src_y+off_y, w, h);
/*** I HATE EDGE RESISTANCE - ]d ***/
} }
else { else {
ctrlmode=0; drawTransparentFrame(wwin, src_x+off_x, src_y+off_y, ww, wh);
} }
if (event.xkey.keycode == shiftl || event.xkey.keycode == shiftr) {
if (ctrlmode)
cycleGeometryDisplay(wwin, src_x+off_x, src_y+off_y, ww, wh, 0);
else
cyclePositionDisplay(wwin, src_x+off_x, src_y+off_y, ww, wh);
}
else {
keysym = XLookupKeysym(&event.xkey, 0); if(ctrlmode)
switch (keysym) { showGeometry(wwin, src_x+off_x, src_y+off_y, src_x+off_x+ww, src_y+off_y+wh,0);
case XK_Return:
done=2; XUngrabServer(dpy);
XSync(dpy, False);
switch (event.type) {
case KeyPress:
/* accelerate */
if (event.xkey.time - lastTime > 50) {
kspeed/=(1 + (event.xkey.time - lastTime)/100);
} else {
if (kspeed < 20) {
kspeed++;
}
}
if (kspeed < _KS) kspeed = _KS;
lastTime = event.xkey.time;
if (event.xkey.state & ControlMask && !wwin->flags.shaded) {
ctrlmode=1;
wUnselectWindows(scr);
}
else {
ctrlmode=0;
}
if (event.xkey.keycode == shiftl || event.xkey.keycode == shiftr) {
if (ctrlmode)
cycleGeometryDisplay(wwin, src_x+off_x, src_y+off_y, ww, wh, 0);
else
cyclePositionDisplay(wwin, src_x+off_x, src_y+off_y, ww, wh);
}
else {
keysym = XLookupKeysym(&event.xkey, 0);
switch (keysym) {
case XK_Return:
done=2;
break;
case XK_Escape:
done=1;
break;
case XK_Up:
#ifdef XK_KP_Up
case XK_KP_Up:
#endif
case XK_k:
if (ctrlmode){
if (moment != UP)
h = wh;
h-=kspeed;
moment = UP;
if (h < 1) h = 1;
}
else off_y-=kspeed;
break;
case XK_Down:
#ifdef XK_KP_Down
case XK_KP_Down:
#endif
case XK_j:
if (ctrlmode){
if (moment != DOWN)
h = wh;
h+=kspeed;
moment = DOWN;
}
else off_y+=kspeed;
break;
case XK_Left:
#ifdef XK_KP_Left
case XK_KP_Left:
#endif
case XK_h:
if (ctrlmode) {
if (moment != LEFT)
w = ww;
w-=kspeed;
if (w < 1) w = 1;
moment = LEFT;
}
else off_x-=kspeed;
break;
case XK_Right:
#ifdef XK_KP_Right
case XK_KP_Right:
#endif
case XK_l:
if (ctrlmode) {
if (moment != RIGHT)
w = ww;
w+=kspeed;
moment = RIGHT;
}
else off_x+=kspeed;
break;
}
ww=w;wh=h;
wh-=vert_border;
wWindowConstrainSize(wwin, &ww, &wh);
wh+=vert_border;
if (wPreferences.ws_cycle){
if (src_x + off_x + ww < 20){
if(!scr->current_workspace) {
wWorkspaceChange(scr, scr->workspace_count-1);
}
else wWorkspaceChange(scr, scr->current_workspace-1);
off_x += scr_width;
}
else if (src_x + off_x + 20 > scr_width){
if(scr->current_workspace == scr->workspace_count-1) {
wWorkspaceChange(scr, 0);
}
else wWorkspaceChange(scr, scr->current_workspace+1);
off_x -= scr_width;
}
}
else {
if (src_x + off_x + ww < 20)
off_x = 20 - ww - src_x;
else if (src_x + off_x + 20 > scr_width)
off_x = scr_width - 20 - src_x;
}
if (src_y + off_y + wh < 20) {
off_y = 20 - wh - src_y;
}
else if (src_y + off_y + 20 > scr_height) {
off_y = scr_height - 20 - src_y;
}
}
break; break;
case XK_Escape: case ButtonPress:
case ButtonRelease:
done=1; done=1;
break; break;
case XK_Up: case Expose:
#ifdef XK_KP_Up WMHandleEvent(&event);
case XK_KP_Up: while (XCheckTypedEvent(dpy, Expose, &event)) {
#endif WMHandleEvent(&event);
case XK_k:
if (ctrlmode){
if (moment != UP)
h = wh;
h-=kspeed;
moment = UP;
if (h < 1) h = 1;
} }
else off_y-=kspeed;
break; break;
case XK_Down:
#ifdef XK_KP_Down
case XK_KP_Down:
#endif
case XK_j:
if (ctrlmode){
if (moment != DOWN)
h = wh;
h+=kspeed;
moment = DOWN;
}
else off_y+=kspeed;
break;
case XK_Left:
#ifdef XK_KP_Left
case XK_KP_Left:
#endif
case XK_h:
if (ctrlmode) {
if (moment != LEFT)
w = ww;
w-=kspeed;
if (w < 1) w = 1;
moment = LEFT;
}
else off_x-=kspeed;
break;
case XK_Right:
#ifdef XK_KP_Right
case XK_KP_Right:
#endif
case XK_l:
if (ctrlmode) {
if (moment != RIGHT)
w = ww;
w+=kspeed;
moment = RIGHT;
}
else off_x+=kspeed;
break;
}
ww=w;wh=h; default:
wh-=vert_border; WMHandleEvent(&event);
wWindowConstrainSize(wwin, &ww, &wh); break;
wh+=vert_border; }
if (wPreferences.ws_cycle){ XGrabServer(dpy);
if (src_x + off_x + ww < 20){ /*xxx*/
if(!scr->current_workspace) {
wWorkspaceChange(scr, scr->workspace_count-1);
}
else wWorkspaceChange(scr, scr->current_workspace-1);
off_x += scr_width;
}
else if (src_x + off_x + 20 > scr_width){
if(scr->current_workspace == scr->workspace_count-1) {
wWorkspaceChange(scr, 0);
}
else wWorkspaceChange(scr, scr->current_workspace+1);
off_x -= scr_width;
}
}
else {
if (src_x + off_x + ww < 20)
off_x = 20 - ww - src_x;
else if (src_x + off_x + 20 > scr_width)
off_x = scr_width - 20 - src_x;
}
if (src_y + off_y + wh < 20) { if (wwin->flags.shaded && !scr->selected_windows){
off_y = 20 - wh - src_y; moveGeometryDisplayCentered(scr, src_x+off_x + w/2, src_y+off_y + h/2);
} } else {
else if (src_y + off_y + 20 > scr_height) { if (ctrlmode) {
off_y = scr_height - 20 - src_y; WMUnmapWidget(scr->gview);
mapGeometryDisplay(wwin, src_x+off_x, src_y+off_y, ww, wh);
} else if(!scr->selected_windows) {
WMUnmapWidget(scr->gview);
mapPositionDisplay(wwin, src_x+off_x, src_y+off_y, ww, wh);
} }
} }
break;
case ButtonPress:
case ButtonRelease:
done=1;
break;
default:
WMHandleEvent(&event);
break;
}
XGrabServer(dpy); if (wwin->flags.shaded || scr->selected_windows) {
/*xxx*/ if (scr->selected_windows)
drawFrames(wwin,scr->selected_windows,off_x,off_y);
if (wwin->flags.shaded && !scr->selected_windows){ else
moveGeometryDisplayCentered(scr, src_x+off_x + w/2, src_y+off_y + h/2); drawTransparentFrame(wwin, src_x+off_x, src_y+off_y, w, h);
} else { } else {
if (ctrlmode) { drawTransparentFrame(wwin, src_x+off_x, src_y+off_y, ww, wh);
WMUnmapWidget(scr->gview); }
mapGeometryDisplay(wwin, src_x+off_x, src_y+off_y, ww, wh);
} else if(!scr->selected_windows) {
WMUnmapWidget(scr->gview);
mapPositionDisplay(wwin, src_x+off_x, src_y+off_y, ww, wh);
}
}
if (wwin->flags.shaded || scr->selected_windows) {
if (scr->selected_windows)
drawFrames(wwin,scr->selected_windows,off_x,off_y);
else
drawTransparentFrame(wwin, src_x+off_x, src_y+off_y, w, h);
} else {
drawTransparentFrame(wwin, src_x+off_x, src_y+off_y, ww, wh);
}
if (ctrlmode) { if (ctrlmode) {
showGeometry(wwin, src_x+off_x, src_y+off_y, src_x+off_x+ww, src_y+off_y+wh,0); showGeometry(wwin, src_x+off_x, src_y+off_y, src_x+off_x+ww, src_y+off_y+wh,0);
} else if(!scr->selected_windows) } else if(!scr->selected_windows)
showPosition(wwin, src_x+off_x, src_y+off_y); showPosition(wwin, src_x+off_x, src_y+off_y);
/**/ /**/
if(done){ if (done) {
scr->keymove_tick=0; scr->keymove_tick=0;
/* /*
WMDeleteTimerWithClientData(&looper); WMDeleteTimerWithClientData(&looper);
*/ */
if (wwin->flags.shaded || scr->selected_windows) { if (wwin->flags.shaded || scr->selected_windows) {
if(scr->selected_windows) if(scr->selected_windows)
drawFrames(wwin,scr->selected_windows,off_x,off_y); drawFrames(wwin,scr->selected_windows,off_x,off_y);
else drawTransparentFrame(wwin, src_x+off_x, src_y+off_y, w, h); else drawTransparentFrame(wwin, src_x+off_x, src_y+off_y, w, h);
} }
else { else {
drawTransparentFrame(wwin, src_x+off_x, src_y+off_y, ww, wh); drawTransparentFrame(wwin, src_x+off_x, src_y+off_y, ww, wh);
} }
if (ctrlmode) { if (ctrlmode) {
showGeometry(wwin, src_x+off_x, src_y+off_y, src_x+off_x+ww, src_y+off_y+wh,0); showGeometry(wwin, src_x+off_x, src_y+off_y, src_x+off_x+ww, src_y+off_y+wh,0);
WMUnmapWidget(scr->gview); WMUnmapWidget(scr->gview);
} else } else
WMUnmapWidget(scr->gview); WMUnmapWidget(scr->gview);
XUngrabKeyboard(dpy, CurrentTime); XUngrabKeyboard(dpy, CurrentTime);
XUngrabPointer(dpy, CurrentTime); XUngrabPointer(dpy, CurrentTime);
XUngrabServer(dpy); XUngrabServer(dpy);
if(done==2) { if(done==2) {
if (wwin->flags.shaded || scr->selected_windows) { if (wwin->flags.shaded || scr->selected_windows) {
if (!scr->selected_windows) { if (!scr->selected_windows) {
wWindowMove(wwin, src_x+off_x, src_y+off_y); wWindowMove(wwin, src_x+off_x, src_y+off_y);
wWindowSynthConfigureNotify(wwin); wWindowSynthConfigureNotify(wwin);
} else { } else {
int i; int i;
WMBag *bag = scr->selected_windows; WMBag *bag = scr->selected_windows;
doWindowMove(wwin,scr->selected_windows,off_x,off_y); doWindowMove(wwin,scr->selected_windows,off_x,off_y);
for (i = 0; i < WMGetBagItemCount(bag); i++) { for (i = 0; i < WMGetBagItemCount(bag); i++) {
wWindowSynthConfigureNotify(WMGetFromBag(bag, i)); wWindowSynthConfigureNotify(WMGetFromBag(bag, i));
} }
} }
} else { } else {
if (wwin->client.width != ww) if (wwin->client.width != ww)
wwin->flags.user_changed_width = 1; wwin->flags.user_changed_width = 1;
if (wwin->client.height != wh - vert_border) if (wwin->client.height != wh - vert_border)
wwin->flags.user_changed_height = 1; wwin->flags.user_changed_height = 1;
wWindowConfigure(wwin, src_x+off_x, src_y+off_y, wWindowConfigure(wwin, src_x+off_x, src_y+off_y,
ww, wh - vert_border); ww, wh - vert_border);
wWindowSynthConfigureNotify(wwin); wWindowSynthConfigureNotify(wwin);
} }
wWindowChangeWorkspace(wwin, scr->current_workspace); wWindowChangeWorkspace(wwin, scr->current_workspace);
wSetFocusTo(scr, wwin); wSetFocusTo(scr, wwin);
} }
return 1; return 1;
} }
} }
} }

27
src/workspace.c
View File

@@ -744,13 +744,30 @@ void updateWorkspaceGeometry(WScreen *scr, int workspace, int *view_x, int *view
} }
typedef struct _delay_configure {
WWindow *wwin;
int delay_count;
} _delay_configure;
void _sendConfigureNotify (_delay_configure *delay) {
WWindow *wwin;
delay->delay_count--;
if (!delay->delay_count) {
for (wwin = delay->wwin; wwin; wwin = wwin->prev) {
wWindowSynthConfigureNotify(wwin);
}
}
}
Bool wWorkspaceSetViewPort(WScreen *scr, int workspace, int view_x, int view_y) Bool wWorkspaceSetViewPort(WScreen *scr, int workspace, int view_x, int view_y)
{ {
Bool adjust_flag = False; Bool adjust_flag = False;
int diff_x, diff_y; int diff_x, diff_y;
static _delay_configure delay_configure = {NULL, 0};
WWindow *wwin; WWindow *wwin;
printf("wWorkspaceSetViewPort %d %d\n", view_x, view_y); /*printf("wWorkspaceSetViewPort %d %d\n", view_x, view_y);*/
updateWorkspaceGeometry(scr, workspace, &view_x, &view_y); updateWorkspaceGeometry(scr, workspace, &view_x, &view_y);
@@ -780,12 +797,16 @@ Bool wWorkspaceSetViewPort(WScreen *scr, int workspace, int view_x, int view_y)
scr->workspaces[workspace]->view_y = view_y; scr->workspaces[workspace]->view_y = view_y;
for( wwin = scr->focused_window; wwin; wwin = wwin->prev) { for (wwin = scr->focused_window; wwin; wwin = wwin->prev) {
if (wwin->frame->workspace == workspace) { if (wwin->frame->workspace == workspace) {
wWindowMove(wwin, wwin->frame_x + diff_x, wwin->frame_y + diff_y); wWindowMove(wwin, wwin->frame_x + diff_x, wwin->frame_y + diff_y);
wWindowSynthConfigureNotify(wwin);
} }
} }
if (1) { /* if delay*/
delay_configure.delay_count++;
delay_configure.wwin = scr->focused_window;
WMAddTimerHandler(200, (WMCallback *)_sendConfigureNotify, &delay_configure);
}
return adjust_flag; return adjust_flag;
} }