summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Screen.cc3
-rw-r--r--src/Screen.hh6
-rw-r--r--src/Window.cc21
3 files changed, 19 insertions, 11 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index d96029e..50cbd5d 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.52 2002/05/17 16:30:24 fluxgen Exp $ 25// $Id: Screen.cc,v 1.53 2002/05/19 17:56:55 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -203,6 +203,7 @@ tab_rotate_vertical(rm, true, scrname+".tab.rotatevertical", altscrname+".Tab.Ro
203sloppy_window_grouping(rm, true, scrname+".sloppywindowgrouping", altscrname+".SloppyWindowGrouping"), 203sloppy_window_grouping(rm, true, scrname+".sloppywindowgrouping", altscrname+".SloppyWindowGrouping"),
204workspace_warping(rm, true, scrname+".workspacewarping", altscrname+".WorkspaceWarping"), 204workspace_warping(rm, true, scrname+".workspacewarping", altscrname+".WorkspaceWarping"),
205desktop_wheeling(rm, true, scrname+".desktopwheeling", altscrname+".DesktopWheeling"), 205desktop_wheeling(rm, true, scrname+".desktopwheeling", altscrname+".DesktopWheeling"),
206show_window_pos(rm, true, scrname+".showwindowposition", altscrname+".ShowWindowPosition"),
206focus_last(rm, true, scrname+".focusLastWindow", altscrname+".FocusLastWindow"), 207focus_last(rm, true, scrname+".focusLastWindow", altscrname+".FocusLastWindow"),
207focus_new(rm, true, scrname+".focusNewWindows", altscrname+".FocusNewWindows"), 208focus_new(rm, true, scrname+".focusNewWindows", altscrname+".FocusNewWindows"),
208rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"), 209rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"),
diff --git a/src/Screen.hh b/src/Screen.hh
index 8ae34fe..27957ce 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.hh,v 1.35 2002/05/17 11:55:02 fluxgen Exp $ 25// $Id: Screen.hh,v 1.36 2002/05/19 17:56:55 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -87,6 +87,7 @@ public:
87 inline bool doFullMax(void) { return *resource.full_max; } 87 inline bool doFullMax(void) { return *resource.full_max; }
88 inline bool doFocusNew(void) { return *resource.focus_new; } 88 inline bool doFocusNew(void) { return *resource.focus_new; }
89 inline bool doFocusLast(void) { return *resource.focus_last; } 89 inline bool doFocusLast(void) { return *resource.focus_last; }
90 inline bool doShowWindowPos(void) { return *resource.show_window_pos; }
90 91
91 inline const GC &getOpGC() const { return theme->getOpGC(); } 92 inline const GC &getOpGC() const { return theme->getOpGC(); }
92 93
@@ -300,7 +301,8 @@ private:
300 image_dither, opaque_move, full_max, 301 image_dither, opaque_move, full_max,
301 max_over_slit, tab_rotate_vertical, 302 max_over_slit, tab_rotate_vertical,
302 sloppy_window_grouping, workspace_warping, 303 sloppy_window_grouping, workspace_warping,
303 desktop_wheeling, focus_last, focus_new; 304 desktop_wheeling, show_window_pos,
305 focus_last, focus_new;
304 Resource<std::string> rootcommand; 306 Resource<std::string> rootcommand;
305 bool auto_raise, sloppy_focus, semi_sloppy_focus, 307 bool auto_raise, sloppy_focus, semi_sloppy_focus,
306 ordered_dither; 308 ordered_dither;
diff --git a/src/Window.cc b/src/Window.cc
index 47dc808..2823fdd 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.cc,v 1.52 2002/05/17 16:35:58 fluxgen Exp $ 25// $Id: Window.cc,v 1.53 2002/05/19 17:56:55 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -1805,7 +1805,8 @@ bool FluxboxWindow::setInputFocus(void) {
1805 Fluxbox *fluxbox = Fluxbox::instance(); 1805 Fluxbox *fluxbox = Fluxbox::instance();
1806 BaseDisplay::GrabGuard gg(*fluxbox); 1806 BaseDisplay::GrabGuard gg(*fluxbox);
1807 fluxbox->grab(); 1807 fluxbox->grab();
1808 if (! validateClient()) return false; 1808 if (! validateClient())
1809 return false;
1809 1810
1810 bool ret = false; 1811 bool ret = false;
1811 1812
@@ -2689,7 +2690,7 @@ void FluxboxWindow::restoreGravity(void) {
2689bool FluxboxWindow::isLowerTab(void) const { 2690bool FluxboxWindow::isLowerTab(void) const {
2690 Tab* chkTab = (tab ? tab->first() : 0); 2691 Tab* chkTab = (tab ? tab->first() : 0);
2691 while (chkTab) { 2692 while (chkTab) {
2692 FluxboxWindow* chkWin = chkTab->getWindow(); 2693 const FluxboxWindow* chkWin = chkTab->getWindow();
2693 if (chkWin && chkWin != this && 2694 if (chkWin && chkWin != this &&
2694 timercmp(&chkWin->lastFocusTime, &lastFocusTime, >)) 2695 timercmp(&chkWin->lastFocusTime, &lastFocusTime, >))
2695 return true; 2696 return true;
@@ -3338,7 +3339,8 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent *me) {
3338 configure(dx, dy, frame.width, frame.height); 3339 configure(dx, dy, frame.width, frame.height);
3339 } 3340 }
3340 3341
3341 screen->showPosition(dx, dy); 3342 if (screen->doShowWindowPos())
3343 screen->showPosition(dx, dy);
3342 } 3344 }
3343 } else if (functions.resize && 3345 } else if (functions.resize &&
3344 (((me->state & Button1Mask) && (me->window == frame.right_grip || 3346 (((me->state & Button1Mask) && (me->window == frame.right_grip ||
@@ -3377,7 +3379,8 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent *me) {
3377 frame.resize_x, frame.resize_y, 3379 frame.resize_x, frame.resize_y,
3378 frame.resize_w, frame.resize_h); 3380 frame.resize_w, frame.resize_h);
3379 3381
3380 screen->showGeometry(gx, gy); 3382 if (screen->doShowWindowPos())
3383 screen->showGeometry(gx, gy);
3381 } 3384 }
3382 } 3385 }
3383} 3386}
@@ -3515,7 +3518,8 @@ void FluxboxWindow::startMoving(Window win) {
3515 frame.resize_h = ((shaded) ? frame.title_h : frame.height) + 3518 frame.resize_h = ((shaded) ? frame.title_h : frame.height) +
3516 screen->getBorderWidth2x(); 3519 screen->getBorderWidth2x();
3517 3520
3518 screen->showPosition(frame.x, frame.y); 3521 if (screen->doShowWindowPos())
3522 screen->showPosition(frame.x, frame.y);
3519 3523
3520 XDrawRectangle(display, screen->getRootWindow(), screen->getOpGC(), 3524 XDrawRectangle(display, screen->getRootWindow(), screen->getOpGC(),
3521 frame.move_x, frame.move_y, 3525 frame.move_x, frame.move_y,
@@ -3565,8 +3569,9 @@ void FluxboxWindow::startResizing(XMotionEvent *me, bool left) {
3565 left_fixsize(&gx, &gy); 3569 left_fixsize(&gx, &gy);
3566 else 3570 else
3567 right_fixsize(&gx, &gy); 3571 right_fixsize(&gx, &gy);
3568 3572
3569 screen->showGeometry(gx, gy); 3573 if (screen->doShowWindowPos())
3574 screen->showGeometry(gx, gy);
3570 3575
3571 XDrawRectangle(display, screen->getRootWindow(), screen->getOpGC(), 3576 XDrawRectangle(display, screen->getRootWindow(), screen->getOpGC(),
3572 frame.resize_x, frame.resize_y, 3577 frame.resize_x, frame.resize_y,