nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

warping works!

Browse source
This commit is contained in:
Dana Jansens 2002-08-21 08:59:28 +00:00
parent a9bfdcaa06
commit 9d40660bce
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/Window.cc
View file

@ -3065,6 +3065,7 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
assert(flags.moving); assert(flags.moving);
assert(blackbox->getChangingWindow() == this); assert(blackbox->getChangingWindow() == this);
bool warp = False;
int dx = x_root - frame.grab_x, dy = y_root - frame.grab_y; int dx = x_root - frame.grab_x, dy = y_root - frame.grab_y;
dx -= frame.border_w; dx -= frame.border_w;
dy -= frame.border_w; dy -= frame.border_w;
@ -3072,6 +3073,9 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
doWindowSnapping(dx, dy); doWindowSnapping(dx, dy);
if (screen->doOpaqueMove()) { if (screen->doOpaqueMove()) {
if (screen->doWorkspaceWarping())
warp = doWorkspaceWarping(x_root, y_root, dx, dy);
configure(dx, dy, frame.rect.width(), frame.rect.height()); configure(dx, dy, frame.rect.width(), frame.rect.height());
} else { } else {
XDrawRectangle(blackbox->getXDisplay(), screen->getRootWindow(), XDrawRectangle(blackbox->getXDisplay(), screen->getRootWindow(),
@ -3081,6 +3085,9 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
frame.changing.width() - 1, frame.changing.width() - 1,
frame.changing.height() - 1); frame.changing.height() - 1);
if (screen->doWorkspaceWarping())
warp = doWorkspaceWarping(x_root, y_root, dx, dy);
frame.changing.setPos(dx, dy); frame.changing.setPos(dx, dy);
XDrawRectangle(blackbox->getXDisplay(), screen->getRootWindow(), XDrawRectangle(blackbox->getXDisplay(), screen->getRootWindow(),
@ -3091,14 +3098,11 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
frame.changing.height() - 1); frame.changing.height() - 1);
} }
if (screen->doWorkspaceWarping())
doWorkspaceWarping(x_root, y_root, dx, dy);
screen->showPosition(dx, dy); screen->showPosition(dx, dy);
} }
void BlackboxWindow::doWorkspaceWarping(int x_root, int y_root, bool BlackboxWindow::doWorkspaceWarping(int x_root, int y_root,
int &dx, int dy) { int &dx, int dy) {
// workspace warping // workspace warping
bool warp = False; bool warp = False;
@ -3116,9 +3120,7 @@ void BlackboxWindow::doWorkspaceWarping(int x_root, int y_root,
else dest = 0; else dest = 0;
} }
if (! warp) if (! warp)
return; return False;
endMove();
bool focus = flags.focused; // had focus while moving? bool focus = flags.focused; // had focus while moving?
@ -3135,24 +3137,24 @@ void BlackboxWindow::doWorkspaceWarping(int x_root, int y_root,
We grab the X server here so that we dont end up magically grabbing We grab the X server here so that we dont end up magically grabbing
a different window dring the warp. a different window dring the warp.
*/ */
XGrabServer(blackbox->getXDisplay());
if (! flags.stuck) if (! flags.stuck)
screen->reassociateWindow(this, dest, False); screen->reassociateWindow(this, dest, False);
screen->changeWorkspaceID(dest); screen->changeWorkspaceID(dest);
configure(dx, dy, frame.rect.width(), frame.rect.height()); XUngrabPointer(blackbox->getXDisplay(), CurrentTime);
XWarpPointer(blackbox->getXDisplay(), None, XWarpPointer(blackbox->getXDisplay(), None,
screen->getRootWindow(), 0, 0, 0, 0, screen->getRootWindow(), 0, 0, 0, 0,
dest_x, y_root); dest_x, y_root);
XGrabPointer(blackbox->getXDisplay(), frame.window, False,
XUngrabServer(blackbox->getXDisplay()); PointerMotionMask | ButtonReleaseMask,
GrabModeAsync, GrabModeAsync,
None, blackbox->getMoveCursor(), CurrentTime);
if (focus) if (focus)
setInputFocus(); setInputFocus();
beginMove(dest_x, y_root); return True;
} }

2
src/Window.hh
View file

@ -296,7 +296,7 @@ private:
void setState(unsigned long new_state); void setState(unsigned long new_state);
void upsize(void); void upsize(void);
void doMove(int x_root, int y_root); void doMove(int x_root, int y_root);
void doWorkspaceWarping(int x_root, int y_root, int &dx, int dy); bool doWorkspaceWarping(int x_root, int y_root, int &dx, int dy);
void doWindowSnapping(int &dx, int &dy); void doWindowSnapping(int &dx, int &dy);
void endMove(void); void endMove(void);
void doResize(int x_root, int y_root); void doResize(int x_root, int y_root);