aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-08-13 21:19:00 (GMT)
committerfluxgen <fluxgen>2002-08-13 21:19:00 (GMT)
commite7f5d341bc713762caceb3e3a570306df94629e5 (patch)
tree309170931fde46448d133ef21a7b640488401028 /src/fluxbox.hh
parent7b02be7b19fbd696c2ca804d77bd28532956eac4 (diff)
downloadfluxbox_pavel-e7f5d341bc713762caceb3e3a570306df94629e5.zip
fluxbox_pavel-e7f5d341bc713762caceb3e3a570306df94629e5.tar.bz2
removed friend main
Diffstat (limited to 'src/fluxbox.hh')
-rw-r--r--src/fluxbox.hh23
1 files changed, 10 insertions, 13 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index ecc9e0f..a8de98c 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.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: fluxbox.hh,v 1.23 2002/08/11 20:36:43 fluxgen Exp $ 25// $Id: fluxbox.hh,v 1.24 2002/08/13 21:18:17 fluxgen Exp $
26 26
27#ifndef FLUXBOX_HH 27#ifndef FLUXBOX_HH
28#define FLUXBOX_HH 28#define FLUXBOX_HH
@@ -69,20 +69,21 @@
69*/ 69*/
70class Fluxbox : public BaseDisplay, public TimeoutHandler { 70class Fluxbox : public BaseDisplay, public TimeoutHandler {
71public: 71public:
72 Fluxbox(int argc, char **argv, const char * dpy_name= 0, const char *rc = 0);
73 virtual ~Fluxbox();
72 74
73 75 static Fluxbox *instance() { return singleton; }
74 static Fluxbox *instance(int m_argc=0, char **m_argv=0, char *dpy_name=0, char *rc=0);
75 76
76 inline bool useTabs() { return *m_rc_tabs; } 77 inline bool useTabs() { return *m_rc_tabs; }
77 inline bool useIconBar() { return *m_rc_iconbar; } 78 inline bool useIconBar() { return *m_rc_iconbar; }
78 inline void saveTabs(bool value) { *m_rc_tabs = value; } 79 inline void saveTabs(bool value) { *m_rc_tabs = value; }
79 inline void saveIconBar(bool value) { m_rc_iconbar = value; } 80 inline void saveIconBar(bool value) { m_rc_iconbar = value; }
80#ifdef HAVE_GETPID 81#ifdef HAVE_GETPID
81 inline const Atom &getFluxboxPidAtom() const { return fluxbox_pid; } 82 inline Atom getFluxboxPidAtom() const { return fluxbox_pid; }
82 #ifdef KDE 83 #ifdef KDE
83 //For KDE dock applets 84 //For KDE dock applets
84 inline const Atom &getKWM1DockwindowAtom() const { return kwm1_dockwindow; } //KDE v1.x 85 inline Atom getKWM1DockwindowAtom() const { return kwm1_dockwindow; } //KDE v1.x
85 inline const Atom &getKWM2DockwindowAtom() const { return kwm2_dockwindow; } //KDE v2.x 86 inline Atom getKWM2DockwindowAtom() const { return kwm2_dockwindow; } //KDE v2.x
86 #endif 87 #endif
87#endif // HAVE_GETPID 88#endif // HAVE_GETPID
88 89
@@ -232,7 +233,8 @@ private:
232 bool no_focus, reconfigure_wait, reread_menu_wait; 233 bool no_focus, reconfigure_wait, reread_menu_wait;
233 Time last_time; 234 Time last_time;
234 Window masked; 235 Window masked;
235 char *rc_file, **argv; 236 std::string rc_file; ///< resource filename
237 char **argv;
236 int argc; 238 int argc;
237 Keys *key; 239 Keys *key;
238 std::string slitlist_path; 240 std::string slitlist_path;
@@ -240,7 +242,6 @@ private:
240 static Fluxbox::Titlebar m_titlebar_left[], m_titlebar_right[]; 242 static Fluxbox::Titlebar m_titlebar_left[], m_titlebar_right[];
241 243
242protected: 244protected:
243 Fluxbox(int, char **, char * = 0, char * = 0);
244 char *getRcFilename(); 245 char *getRcFilename();
245 void getDefaultDataFilename(char *, std::string &); 246 void getDefaultDataFilename(char *, std::string &);
246 void load_rc(); 247 void load_rc();
@@ -250,11 +251,7 @@ protected:
250 void real_reconfigure(); 251 void real_reconfigure();
251 252
252 virtual void process_event(XEvent *); 253 virtual void process_event(XEvent *);
253 //only main should be able to creat new blackbox object 254 static Fluxbox *singleton;
254 //TODO this must be removed!
255 friend int main(int,char **);
256 static Fluxbox *singleton; //singleton object ( can only be destroyed by main )
257 virtual ~Fluxbox();
258 255
259}; 256};
260 257