aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc17
1 files changed, 4 insertions, 13 deletions
diff --git a/src/Window.cc b/src/Window.cc
index a8613c3..b7f78cf 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -503,7 +503,7 @@ void FluxboxWindow::init() {
503 503
504 restoreAttributes(); 504 restoreAttributes();
505 505
506 if (m_workspace_number < 0 || m_workspace_number >= screen().getCount()) 506 if (m_workspace_number < 0 || m_workspace_number >= screen().numberOfWorkspaces())
507 m_workspace_number = screen().currentWorkspaceID(); 507 m_workspace_number = screen().currentWorkspaceID();
508 508
509 bool place_window = (m_old_pos_x == 0); 509 bool place_window = (m_old_pos_x == 0);
@@ -2198,7 +2198,7 @@ void FluxboxWindow::restoreAttributes() {
2198 } 2198 }
2199 2199
2200 if (( m_blackbox_attrib.workspace != screen().currentWorkspaceID()) && 2200 if (( m_blackbox_attrib.workspace != screen().currentWorkspaceID()) &&
2201 ( m_blackbox_attrib.workspace < screen().getCount())) 2201 ( m_blackbox_attrib.workspace < screen().numberOfWorkspaces()))
2202 m_workspace_number = m_blackbox_attrib.workspace; 2202 m_workspace_number = m_blackbox_attrib.workspace;
2203 2203
2204 if (m_blackbox_attrib.flags & ATTRIB_OMNIPRESENT && 2204 if (m_blackbox_attrib.flags & ATTRIB_OMNIPRESENT &&
@@ -2267,8 +2267,6 @@ void FluxboxWindow::popupMenu() {
2267 return; 2267 return;
2268 } 2268 }
2269 2269
2270 WindowCmd<void>::setWindow(this);
2271
2272 menu().disableTitle(); 2270 menu().disableTitle();
2273 int menu_y = frame().titlebar().height() + frame().titlebar().borderWidth(); 2271 int menu_y = frame().titlebar().height() + frame().titlebar().borderWidth();
2274 if (!decorations.titlebar) // if we don't have any titlebar 2272 if (!decorations.titlebar) // if we don't have any titlebar
@@ -2278,13 +2276,6 @@ void FluxboxWindow::popupMenu() {
2278 showMenu(m_last_button_x, menu_y + frame().y()); 2276 showMenu(m_last_button_x, menu_y + frame().y());
2279} 2277}
2280 2278
2281/**
2282 Determine if this is the lowest tab of them all
2283*/
2284bool FluxboxWindow::isLowerTab() const {
2285 cerr<<__FILE__<<"(FluxboxWindow::isLowerTab()) TODO!"<<endl;
2286 return true;
2287}
2288 2279
2289/** 2280/**
2290 Redirect any unhandled event to our handlers 2281 Redirect any unhandled event to our handlers
@@ -2754,12 +2745,12 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
2754 if (me.x_root >= int(screen().width()) - warpPad - 1 && 2745 if (me.x_root >= int(screen().width()) - warpPad - 1 &&
2755 moved_x > 0) { 2746 moved_x > 0) {
2756 //warp right 2747 //warp right
2757 new_id = (cur_id + 1) % screen().getCount(); 2748 new_id = (cur_id + 1) % screen().numberOfWorkspaces();
2758 dx = - me.x_root; // move mouse back to x=0 2749 dx = - me.x_root; // move mouse back to x=0
2759 } else if (me.x_root <= warpPad && 2750 } else if (me.x_root <= warpPad &&
2760 moved_x < 0) { 2751 moved_x < 0) {
2761 //warp left 2752 //warp left
2762 new_id = (cur_id + screen().getCount() - 1) % screen().getCount(); 2753 new_id = (cur_id + screen().numberOfWorkspaces() - 1) % screen().numberOfWorkspaces();
2763 dx = screen().width() - me.x_root-1; // move mouse to screen width - 1 2754 dx = screen().width() - me.x_root-1; // move mouse to screen width - 1
2764 } 2755 }
2765 if (new_id != cur_id) { 2756 if (new_id != cur_id) {