summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Screen.cc10
-rw-r--r--src/Screen.hh20
2 files changed, 15 insertions, 15 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 281bfdb..3a31a8f 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.56 2002/07/20 09:32:34 fluxgen Exp $ 25// $Id: Screen.cc,v 1.57 2002/07/23 13:47:05 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -823,16 +823,16 @@ void BScreen::changeWorkspaceID(unsigned int id) {
823} 823}
824 824
825 825
826void BScreen::sendToWorkspace(unsigned int id, bool changeWS) { 826void BScreen::sendToWorkspace(unsigned int id, FluxboxWindow *win, bool changeWS) {
827 FluxboxWindow *win;
828 if (! current_workspace || id >= workspacesList.size()) 827 if (! current_workspace || id >= workspacesList.size())
829 return; 828 return;
830 829
830 if (!win)
831 win = fluxbox->getFocusedWindow();
832
831 if (id != current_workspace->workspaceID()) { 833 if (id != current_workspace->workspaceID()) {
832 XSync(fluxbox->getXDisplay(), True); 834 XSync(fluxbox->getXDisplay(), True);
833 835
834 win = fluxbox->getFocusedWindow();
835
836 if (win && win->getScreen() == this && 836 if (win && win->getScreen() == this &&
837 (! win->isStuck())) { 837 (! win->isStuck())) {
838 838
diff --git a/src/Screen.hh b/src/Screen.hh
index 86888e3..d6f87ee 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -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.hh,v 1.37 2002/05/22 00:36:56 fluxgen Exp $ 25// $Id: Screen.hh,v 1.38 2002/07/23 13:47:05 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -91,7 +91,7 @@ public:
91 91
92 inline const GC &getOpGC() const { return theme->getOpGC(); } 92 inline const GC &getOpGC() const { return theme->getOpGC(); }
93 93
94 inline const BColor *getBorderColor(void) const { return &theme->getBorderColor(); } 94 inline const FbTk::Color *getBorderColor(void) const { return &theme->getBorderColor(); }
95 inline BImageControl *getImageControl(void) { return image_control; } 95 inline BImageControl *getImageControl(void) { return image_control; }
96 inline Rootmenu *getRootmenu(void) { return rootmenu; } 96 inline Rootmenu *getRootmenu(void) { return rootmenu; }
97 inline const std::string &getRootCommand(void ) const { return *resource.rootcommand; } 97 inline const std::string &getRootCommand(void ) const { return *resource.rootcommand; }
@@ -210,14 +210,14 @@ public:
210 void removeWorkspaceNames(void); 210 void removeWorkspaceNames(void);
211 void updateWorkspaceNamesAtom(void); 211 void updateWorkspaceNamesAtom(void);
212 212
213 void addWorkspaceName(char *); 213 void addWorkspaceName(const char *name);
214 void addNetizen(Netizen *); 214 void addNetizen(Netizen *net);
215 void removeNetizen(Window); 215 void removeNetizen(Window win);
216 void addIcon(FluxboxWindow *); 216 void addIcon(FluxboxWindow *win);
217 void removeIcon(FluxboxWindow *); 217 void removeIcon(FluxboxWindow *win);
218 void getNameOfWorkspace(unsigned int workspace, char **name); 218 void getNameOfWorkspace(unsigned int workspace, char **name);
219 void changeWorkspaceID(unsigned int); 219 void changeWorkspaceID(unsigned int);
220 void sendToWorkspace(unsigned int workspace, bool changeworkspace=true); 220 void sendToWorkspace(unsigned int workspace, FluxboxWindow *win=0, bool changeworkspace=true);
221 void raiseWindows(Window *workspace_stack, int num); 221 void raiseWindows(Window *workspace_stack, int num);
222 void reassociateWindow(FluxboxWindow *window, unsigned int workspace_id, bool ignore_sticky); 222 void reassociateWindow(FluxboxWindow *window, unsigned int workspace_id, bool ignore_sticky);
223 void prevFocus(int = 0); 223 void prevFocus(int = 0);
@@ -344,8 +344,8 @@ private:
344protected: 344protected:
345 bool parseMenuFile(std::ifstream &, Rootmenu *, int&); 345 bool parseMenuFile(std::ifstream &, Rootmenu *, int&);
346 346
347 bool readDatabaseTexture(char *, char *, BTexture *, unsigned long); 347 bool readDatabaseTexture(char *, char *, FbTk::Texture *, unsigned long);
348 bool readDatabaseColor(char *, char *, BColor *, unsigned long); 348 bool readDatabaseColor(char *, char *, FbTk::Color *, unsigned long);
349 349
350 void readDatabaseFontSet(char *, char *, XFontSet *); 350 void readDatabaseFontSet(char *, char *, XFontSet *);
351 XFontSet createFontSet(char *); 351 XFontSet createFontSet(char *);