aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-04-25 11:28:44 (GMT)
committerfluxgen <fluxgen>2003-04-25 11:28:44 (GMT)
commitcc528147317df839535fff43f0696caae40a268d (patch)
treecf3063687e694f8b66031e6e5cb471c41bf14c21
parentc318ce9f682e91dceafeb9e9a04421415ffc5404 (diff)
downloadfluxbox_paul-cc528147317df839535fff43f0696caae40a268d.zip
fluxbox_paul-cc528147317df839535fff43f0696caae40a268d.tar.bz2
minor cleaning
-rw-r--r--src/fluxbox.cc52
1 files changed, 26 insertions, 26 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 0a29fb1..e8c2ab1 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.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: fluxbox.cc,v 1.116 2003/04/25 09:07:14 rathnor Exp $ 25// $Id: fluxbox.cc,v 1.117 2003/04/25 11:28:44 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -864,15 +864,15 @@ void Fluxbox::handleButtonEvent(XButtonEvent &be) {
864 if (mx + screen->getWorkspacemenu()->width() > 864 if (mx + screen->getWorkspacemenu()->width() >
865 screen->getWidth()) { 865 screen->getWidth()) {
866 mx = screen->getWidth() - 866 mx = screen->getWidth() -
867 screen->getWorkspacemenu()->width() - 867 screen->getWorkspacemenu()->width() -
868 screen->getBorderWidth(); 868 screen->getWorkspacemenu()->fbwindow().borderWidth();
869 } 869 }
870 870
871 if (my + screen->getWorkspacemenu()->height() > 871 if (my + screen->getWorkspacemenu()->height() >
872 screen->getHeight()) { 872 screen->getHeight()) {
873 my = screen->getHeight() - 873 my = screen->getHeight() -
874 screen->getWorkspacemenu()->height() - 874 screen->getWorkspacemenu()->height() -
875 screen->getBorderWidth(); 875 screen->getWorkspacemenu()->fbwindow().borderWidth();
876 } 876 }
877 screen->getWorkspacemenu()->move(mx, my); 877 screen->getWorkspacemenu()->move(mx, my);
878 878
@@ -894,14 +894,14 @@ void Fluxbox::handleButtonEvent(XButtonEvent &be) {
894 if (mx + screen->getRootmenu()->width() > screen->getWidth()) { 894 if (mx + screen->getRootmenu()->width() > screen->getWidth()) {
895 mx = screen->getWidth() - 895 mx = screen->getWidth() -
896 screen->getRootmenu()->width() - 896 screen->getRootmenu()->width() -
897 screen->getBorderWidth(); 897 screen->getRootmenu()->fbwindow().borderWidth();
898 } 898 }
899 899
900 if (my + screen->getRootmenu()->height() > 900 if (my + screen->getRootmenu()->height() >
901 screen->getHeight()) { 901 screen->getHeight()) {
902 my = screen->getHeight() - 902 my = screen->getHeight() -
903 screen->getRootmenu()->height() - 903 screen->getRootmenu()->height() -
904 screen->getBorderWidth(); 904 screen->getRootmenu()->fbwindow().borderWidth();
905 } 905 }
906 screen->getRootmenu()->move(mx, my); 906 screen->getRootmenu()->move(mx, my);
907 907
@@ -1260,14 +1260,14 @@ void Fluxbox::handleKeyEvent(XKeyEvent &ke) {
1260 if (mx + screen->getRootmenu()->width() > screen->getWidth()) { 1260 if (mx + screen->getRootmenu()->width() > screen->getWidth()) {
1261 mx = screen->getWidth() - 1261 mx = screen->getWidth() -
1262 screen->getRootmenu()->width() - 1262 screen->getRootmenu()->width() -
1263 screen->getBorderWidth(); 1263 screen->getRootmenu()->fbwindow().borderWidth();
1264 } 1264 }
1265 1265
1266 if (my + screen->getRootmenu()->height() > 1266 if (my + screen->getRootmenu()->height() >
1267 screen->getHeight()) { 1267 screen->getHeight()) {
1268 my = screen->getHeight() - 1268 my = screen->getHeight() -
1269 screen->getRootmenu()->height() - 1269 screen->getRootmenu()->height() -
1270 screen->getBorderWidth(); 1270 screen->getRootmenu()->fbwindow().borderWidth();
1271 } 1271 }
1272 screen->getRootmenu()->move(mx, my); 1272 screen->getRootmenu()->move(mx, my);
1273 1273
@@ -1285,29 +1285,29 @@ void Fluxbox::handleKeyEvent(XKeyEvent &ke) {
1285 break; 1285 break;
1286 } 1286 }
1287 case KeyRelease: 1287 case KeyRelease:
1288 { 1288 {
1289 // we ignore most key releases unless we need to use 1289 // we ignore most key releases unless we need to use
1290 // a release to stop something (e.g. window cycling). 1290 // a release to stop something (e.g. window cycling).
1291 1291
1292 // we notify if _all_ of the watched modifiers are released 1292 // we notify if _all_ of the watched modifiers are released
1293 if (watching_screen && watch_keyrelease) { 1293 if (watching_screen && watch_keyrelease) {
1294 // mask the mod of the released key out 1294 // mask the mod of the released key out
1295 // won't mask anything if it isn't a mod 1295 // won't mask anything if it isn't a mod
1296 ke.state &= ~key->keycodeToModmask(ke.keycode); 1296 ke.state &= ~key->keycodeToModmask(ke.keycode);
1297 1297
1298 if ((watch_keyrelease & ke.state) == 0) { 1298 if ((watch_keyrelease & ke.state) == 0) {
1299 1299
1300 watching_screen->notifyReleasedKeys(ke); 1300 watching_screen->notifyReleasedKeys(ke);
1301 XUngrabKeyboard(getXDisplay(), CurrentTime); 1301 XUngrabKeyboard(getXDisplay(), CurrentTime);
1302 1302
1303 // once they are released, we drop the watch 1303 // once they are released, we drop the watch
1304 watching_screen = 0; 1304 watching_screen = 0;
1305 watch_keyrelease = 0; 1305 watch_keyrelease = 0;
1306 }
1306 } 1307 }
1307 }
1308 1308
1309 break; 1309 break;
1310 } 1310 }
1311 default: 1311 default:
1312 break; 1312 break;
1313 } 1313 }