aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-02-16 17:57:54 (GMT)
committerrathnor <rathnor>2003-02-16 17:57:54 (GMT)
commit79aec8465f8a1e618034ac08fa2d55fcca09eb5a (patch)
tree38b171d9f1e49dd04fdc30fcddf5d2caeb1d97a1 /src/Screen.cc
parent9a82a5b1dc3cacafbdda7b54fb9ebf71ef526be3 (diff)
downloadfluxbox_pavel-79aec8465f8a1e618034ac08fa2d55fcca09eb5a.zip
fluxbox_pavel-79aec8465f8a1e618034ac08fa2d55fcca09eb5a.tar.bz2
Fixed gnome init problems (Simon)
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 4650fad..85b2e12 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.108 2003/02/16 16:45:23 fluxgen Exp $ 25// $Id: Screen.cc,v 1.109 2003/02/16 17:57:54 rathnor Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -1105,7 +1105,11 @@ FluxboxWindow *BScreen::createWindow(Window client) {
1105 Fluxbox::instance()->saveWindowSearch(client, win); 1105 Fluxbox::instance()->saveWindowSearch(client, win);
1106 Fluxbox::instance()->attachSignals(*win); 1106 Fluxbox::instance()->attachSignals(*win);
1107 setupWindowActions(*win); 1107 setupWindowActions(*win);
1108 } 1108 }
1109 if (win->getWorkspaceNumber() == getCurrentWorkspaceID() || win->isStuck()) {
1110 win->show();
1111 XSync(FbTk::App::instance()->display(), False);
1112 }
1109 return win; 1113 return win;
1110} 1114}
1111 1115
@@ -1127,8 +1131,8 @@ void BScreen::setupWindowActions(FluxboxWindow &win) {
1127 CommandRef close_cmd(new WindowCmd(win, &FluxboxWindow::close)); 1131 CommandRef close_cmd(new WindowCmd(win, &FluxboxWindow::close));
1128 CommandRef shade_cmd(new WindowCmd(win, &FluxboxWindow::shade)); 1132 CommandRef shade_cmd(new WindowCmd(win, &FluxboxWindow::shade));
1129 CommandRef raise_cmd(new WindowCmd(win, &FluxboxWindow::raise)); 1133 CommandRef raise_cmd(new WindowCmd(win, &FluxboxWindow::raise));
1134 CommandRef lower_cmd(new WindowCmd(win, &FluxboxWindow::lower));
1130 CommandRef raise_and_focus_cmd(new WindowCmd(win, &FluxboxWindow::raiseAndFocus)); 1135 CommandRef raise_and_focus_cmd(new WindowCmd(win, &FluxboxWindow::raiseAndFocus));
1131 CommandRef lower_cmd(new WindowCmd(win, &FluxboxWindow::raise));
1132 CommandRef stick_cmd(new WindowCmd(win, &FluxboxWindow::stick)); 1136 CommandRef stick_cmd(new WindowCmd(win, &FluxboxWindow::stick));
1133 CommandRef show_menu_cmd(new WindowCmd(win, &FluxboxWindow::popupMenu)); 1137 CommandRef show_menu_cmd(new WindowCmd(win, &FluxboxWindow::popupMenu));
1134 1138
@@ -1138,7 +1142,6 @@ void BScreen::setupWindowActions(FluxboxWindow &win) {
1138 // get titlebar configuration 1142 // get titlebar configuration
1139 const vector<Fluxbox::Titlebar> *dir = &Fluxbox::instance()->getTitlebarLeft(); 1143 const vector<Fluxbox::Titlebar> *dir = &Fluxbox::instance()->getTitlebarLeft();
1140 for (char c=0; c<2; c++) { 1144 for (char c=0; c<2; c++) {
1141
1142 for (size_t i=0; i< dir->size(); ++i) { 1145 for (size_t i=0; i< dir->size(); ++i) {
1143 //create new buttons 1146 //create new buttons
1144 FbTk::Button *newbutton = 0; 1147 FbTk::Button *newbutton = 0;
@@ -1324,7 +1327,6 @@ void BScreen::reassociateGroup(FluxboxWindow *w, unsigned int wkspc_id, bool ign
1324 } 1327 }
1325} 1328}
1326 1329
1327
1328void BScreen::reassociateWindow(FluxboxWindow *w, unsigned int wkspc_id, bool ignore_sticky) { 1330void BScreen::reassociateWindow(FluxboxWindow *w, unsigned int wkspc_id, bool ignore_sticky) {
1329 if (! w) return; 1331 if (! w) return;
1330 1332
@@ -1338,6 +1340,7 @@ void BScreen::reassociateWindow(FluxboxWindow *w, unsigned int wkspc_id, bool ig
1338 if (w->getWorkspaceNumber() == wkspc_id) 1340 if (w->getWorkspaceNumber() == wkspc_id)
1339 return; 1341 return;
1340 1342
1343
1341 if (w->isIconic()) { 1344 if (w->isIconic()) {
1342 removeIcon(w); 1345 removeIcon(w);
1343 getWorkspace(wkspc_id)->addWindow(w); 1346 getWorkspace(wkspc_id)->addWindow(w);