aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-02-09 14:11:14 (GMT)
committerrathnor <rathnor>2003-02-09 14:11:14 (GMT)
commite3b99d4e485591df52b2398fce9adbcece2b9917 (patch)
tree44c14c5160e07e1af0671e141ae99cc1f2e66609 /src/fluxbox.cc
parent1a04cf1ce2649400d41c43024bd163a059cc426d (diff)
downloadfluxbox-e3b99d4e485591df52b2398fce9adbcece2b9917.zip
fluxbox-e3b99d4e485591df52b2398fce9adbcece2b9917.tar.bz2
fixing up of layer code
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 5b0f3c0..9d23793 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.94 2003/02/03 13:57:08 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.95 2003/02/09 14:11:13 rathnor Exp $
26 26
27 27
28#include "fluxbox.hh" 28#include "fluxbox.hh"
@@ -702,7 +702,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
702 win = tab->getWindow(); 702 win = tab->getWindow();
703 if (win->getScreen()->isSloppyFocus() && (! win->isFocused()) && 703 if (win->getScreen()->isSloppyFocus() && (! win->isFocused()) &&
704 (! no_focus)) { 704 (! no_focus)) {
705 win->getScreen()->raiseWindow(win); 705 win->raise();
706 706
707 grab(); 707 grab();
708 708
@@ -1122,10 +1122,10 @@ void Fluxbox::handleKeyEvent(XKeyEvent &ke) {
1122 if (focused_window && focused_window->getTab()) { 1122 if (focused_window && focused_window->getTab()) {
1123 Tab *tab = focused_window->getTab(); 1123 Tab *tab = focused_window->getTab();
1124 if (tab->next()) { 1124 if (tab->next()) {
1125 screen->raiseWindow(tab->next()->getWindow()); 1125 tab->next()->getWindow()->raise();
1126 tab->next()->getWindow()->setInputFocus(); 1126 tab->next()->getWindow()->setInputFocus();
1127 } else { 1127 } else {
1128 screen->raiseWindow(tab->first()->getWindow()); 1128 tab->first()->getWindow()->raise();
1129 tab->first()->getWindow()->setInputFocus(); 1129 tab->first()->getWindow()->setInputFocus();
1130 } 1130 }
1131 } 1131 }
@@ -1134,10 +1134,10 @@ void Fluxbox::handleKeyEvent(XKeyEvent &ke) {
1134 if (focused_window && focused_window->getTab()) { 1134 if (focused_window && focused_window->getTab()) {
1135 Tab *tab = focused_window->getTab(); 1135 Tab *tab = focused_window->getTab();
1136 if (tab->prev()) { 1136 if (tab->prev()) {
1137 screen->raiseWindow(tab->prev()->getWindow()); 1137 tab->prev()->getWindow()->raise();
1138 tab->prev()->getWindow()->setInputFocus(); 1138 tab->prev()->getWindow()->setInputFocus();
1139 } else { 1139 } else {
1140 screen->raiseWindow(tab->last()->getWindow()); 1140 tab->last()->getWindow()->raise();
1141 tab->last()->getWindow()->setInputFocus(); 1141 tab->last()->getWindow()->setInputFocus();
1142 } 1142 }
1143 } 1143 }
@@ -1145,14 +1145,14 @@ void Fluxbox::handleKeyEvent(XKeyEvent &ke) {
1145 case Keys::FIRSTTAB: 1145 case Keys::FIRSTTAB:
1146 if (focused_window && focused_window->getTab()) { 1146 if (focused_window && focused_window->getTab()) {
1147 Tab *tab = focused_window->getTab(); 1147 Tab *tab = focused_window->getTab();
1148 screen->raiseWindow(tab->first()->getWindow()); 1148 tab->first()->getWindow()->raise();
1149 tab->first()->getWindow()->setInputFocus(); 1149 tab->first()->getWindow()->setInputFocus();
1150 } 1150 }
1151 break; 1151 break;
1152 case Keys::LASTTAB: 1152 case Keys::LASTTAB:
1153 if (focused_window && focused_window->getTab()) { 1153 if (focused_window && focused_window->getTab()) {
1154 Tab *tab = focused_window->getTab(); 1154 Tab *tab = focused_window->getTab();
1155 screen->raiseWindow(tab->last()->getWindow()); 1155 tab->last()->getWindow()->raise();
1156 tab->last()->getWindow()->setInputFocus(); 1156 tab->last()->getWindow()->setInputFocus();
1157 } 1157 }
1158 break; 1158 break;
@@ -1250,16 +1250,16 @@ void Fluxbox::doWindowAction(Keys::KeyAction action, const int param) {
1250 focused_window->lower(); 1250 focused_window->lower();
1251 break; 1251 break;
1252 case Keys::RAISELAYER: 1252 case Keys::RAISELAYER:
1253 focused_window->getScreen()->raiseWindowLayer(focused_window); 1253 focused_window->raiseLayer();
1254 break; 1254 break;
1255 case Keys::LOWERLAYER: 1255 case Keys::LOWERLAYER:
1256 focused_window->getScreen()->lowerWindowLayer(focused_window); 1256 focused_window->lowerLayer();
1257 break; 1257 break;
1258 case Keys::TOPLAYER: 1258 case Keys::TOPLAYER:
1259 focused_window->getScreen()->moveWindowToLayer(focused_window,getBottomLayer()); 1259 focused_window->moveToLayer(getBottomLayer());
1260 break; 1260 break;
1261 case Keys::BOTTOMLAYER: 1261 case Keys::BOTTOMLAYER:
1262 focused_window->getScreen()->moveWindowToLayer(focused_window,getTopLayer()); 1262 focused_window->moveToLayer(getTopLayer());
1263 break; 1263 break;
1264 case Keys::CLOSE: 1264 case Keys::CLOSE:
1265 focused_window->close(); 1265 focused_window->close();