summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakir <akir>2004-08-30 12:21:18 (GMT)
committerakir <akir>2004-08-30 12:21:18 (GMT)
commitca99e775f48774df9d021ff59acb9312aba7e223 (patch)
treefca232c3942e5770b96b32b6995750b6e0936c90
parentdc762a7c4df89213487b8c255f0db6fdb7230e1f (diff)
downloadfluxbox_lack-ca99e775f48774df9d021ff59acb9312aba7e223.zip
fluxbox_lack-ca99e775f48774df9d021ff59acb9312aba7e223.tar.bz2
closes bug 977054
-rw-r--r--ChangeLog4
-rw-r--r--src/FbCommands.cc17
2 files changed, 12 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index b9cc46c..954dcba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.10: 2Changes for 0.9.10:
3*04/08/30: 3*04/08/30:
4 * Close bug #1013735, #1012314 (Mathias) 4 * Close bug #1013735, #1012314, #977054 (Mathias)
5 Screen.cc Slit.cc 5 Screen.cc Slit.cc FbCommands.cc
6 * Fix bug in menu-closing with keys (Mathias) 6 * Fix bug in menu-closing with keys (Mathias)
7 FbTk/Menu.cc 7 FbTk/Menu.cc
8*04/08/29: 8*04/08/29:
diff --git a/src/FbCommands.cc b/src/FbCommands.cc
index a2a1aa8..8186e71 100644
--- a/src/FbCommands.cc
+++ b/src/FbCommands.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: FbCommands.cc,v 1.25 2004/07/19 13:52:15 fluxgen Exp $ 22// $Id: FbCommands.cc,v 1.26 2004/08/30 12:19:52 akir Exp $
23 23
24#include "FbCommands.hh" 24#include "FbCommands.hh"
25#include "fluxbox.hh" 25#include "fluxbox.hh"
@@ -123,7 +123,8 @@ void SetStyleCmd::execute() {
123} 123}
124 124
125void ShowRootMenuCmd::execute() { 125void ShowRootMenuCmd::execute() {
126 BScreen *screen = Fluxbox::instance()->mouseScreen(); 126 Fluxbox *fb = Fluxbox::instance();
127 BScreen *screen = fb->mouseScreen();
127 if (screen == 0) 128 if (screen == 0)
128 return; 129 return;
129 130
@@ -134,7 +135,7 @@ void ShowRootMenuCmd::execute() {
134 int wx, wy; 135 int wx, wy;
135 unsigned int mask; 136 unsigned int mask;
136 137
137 if (XQueryPointer(FbTk::App::instance()->display(), 138 if (XQueryPointer(fb->display(),
138 screen->rootWindow().window(), &root_ret, &window_ret, 139 screen->rootWindow().window(), &root_ret, &window_ret,
139 &rx, &ry, &wx, &wy, &mask) ) { 140 &rx, &ry, &wx, &wy, &mask) ) {
140 141
@@ -142,19 +143,20 @@ void ShowRootMenuCmd::execute() {
142 rx-= screen->getRootmenu().width()/2; 143 rx-= screen->getRootmenu().width()/2;
143 screen->getRootmenu().move(rx, ry); 144 screen->getRootmenu().move(rx, ry);
144 } 145 }
145 146 fb->checkMenu();
146 screen->getRootmenu().show(); 147 screen->getRootmenu().show();
147 screen->getRootmenu().grabInputFocus(); 148 screen->getRootmenu().grabInputFocus();
148 149
149} 150}
150 151
151void ShowWorkspaceMenuCmd::execute() { 152void ShowWorkspaceMenuCmd::execute() {
152 BScreen *screen = Fluxbox::instance()->mouseScreen(); 153
154 Fluxbox *fb = Fluxbox::instance();
155 BScreen *screen = fb->mouseScreen();
153 if (screen == 0) 156 if (screen == 0)
154 return; 157 return;
155 158
156 159
157
158 Window root_ret; 160 Window root_ret;
159 Window window_ret; 161 Window window_ret;
160 162
@@ -162,7 +164,7 @@ void ShowWorkspaceMenuCmd::execute() {
162 int wx, wy; 164 int wx, wy;
163 unsigned int mask; 165 unsigned int mask;
164 166
165 if ( XQueryPointer(FbTk::App::instance()->display(), 167 if ( XQueryPointer(fb->display(),
166 screen->rootWindow().window(), &root_ret, &window_ret, 168 screen->rootWindow().window(), &root_ret, &window_ret,
167 &rx, &ry, &wx, &wy, &mask) ) { 169 &rx, &ry, &wx, &wy, &mask) ) {
168 170
@@ -170,6 +172,7 @@ void ShowWorkspaceMenuCmd::execute() {
170 rx-= screen->getWorkspacemenu().width()/2; 172 rx-= screen->getWorkspacemenu().width()/2;
171 screen->getWorkspacemenu().move(rx, ry); 173 screen->getWorkspacemenu().move(rx, ry);
172 } 174 }
175 fb->checkMenu();
173 screen->getWorkspacemenu().show(); 176 screen->getWorkspacemenu().show();
174 screen->getWorkspacemenu().grabInputFocus(); 177 screen->getWorkspacemenu().grabInputFocus();
175 178