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

dont pass an unused parameter, and return an unused value

Browse source
This commit is contained in:
Dana Jansens 2002-08-21 09:23:00 +00:00
parent 75f124a2bb
commit d7a655137b
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Window.cc
View file

@ -3065,7 +3065,6 @@ 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;
@ -3074,7 +3073,7 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
if (screen->doOpaqueMove()) { if (screen->doOpaqueMove()) {
if (screen->doWorkspaceWarping()) if (screen->doWorkspaceWarping())
warp = doWorkspaceWarping(x_root, y_root, dx, dy); doWorkspaceWarping(x_root, y_root, dx);
configure(dx, dy, frame.rect.width(), frame.rect.height()); configure(dx, dy, frame.rect.width(), frame.rect.height());
} else { } else {
@ -3086,7 +3085,7 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
frame.changing.height() - 1); frame.changing.height() - 1);
if (screen->doWorkspaceWarping()) if (screen->doWorkspaceWarping())
warp = doWorkspaceWarping(x_root, y_root, dx, dy); doWorkspaceWarping(x_root, y_root, dx);
frame.changing.setPos(dx, dy); frame.changing.setPos(dx, dy);
@ -3102,8 +3101,7 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
} }
bool BlackboxWindow::doWorkspaceWarping(int x_root, int y_root, void BlackboxWindow::doWorkspaceWarping(int x_root, int y_root, int &dx) {
int &dx, int dy) {
// workspace warping // workspace warping
bool warp = False; bool warp = False;
unsigned int dest = screen->getCurrentWorkspaceID(); unsigned int dest = screen->getCurrentWorkspaceID();
@ -3120,7 +3118,7 @@ bool BlackboxWindow::doWorkspaceWarping(int x_root, int y_root,
else dest = 0; else dest = 0;
} }
if (! warp) if (! warp)
return False; return;
bool focus = flags.focused; // had focus while moving? bool focus = flags.focused; // had focus while moving?
@ -3133,11 +3131,6 @@ bool BlackboxWindow::doWorkspaceWarping(int x_root, int y_root,
dx -= screen->getRect().width() - 1; dx -= screen->getRect().width() - 1;
} }
/*
We grab the X server here so that we dont end up magically grabbing
a different window dring the warp.
*/
if (! flags.stuck) if (! flags.stuck)
screen->reassociateWindow(this, dest, False); screen->reassociateWindow(this, dest, False);
screen->changeWorkspaceID(dest); screen->changeWorkspaceID(dest);
@ -3154,7 +3147,6 @@ bool BlackboxWindow::doWorkspaceWarping(int x_root, int y_root,
if (focus) if (focus)
setInputFocus(); setInputFocus();
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);
bool doWorkspaceWarping(int x_root, int y_root, int &dx, int dy); void doWorkspaceWarping(int x_root, int y_root, int &dx);
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);