aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-03-19 00:16:44 (GMT)
committerfluxgen <fluxgen>2002-03-19 00:16:44 (GMT)
commit02466ab04056d9275e7351400be111a9c4580f26 (patch)
treeeb8c9fbe5edd7859c8a2d8dd000f1cd974952c18
parentf666e3cd77cddea837b3f8810540f061390749c1 (diff)
downloadfluxbox_paul-02466ab04056d9275e7351400be111a9c4580f26.zip
fluxbox_paul-02466ab04056d9275e7351400be111a9c4580f26.tar.bz2
Fixed timer pointer
-rw-r--r--src/fluxbox.cc19
-rw-r--r--src/fluxbox.hh31
2 files changed, 10 insertions, 40 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 612f08e..2ff4b03 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.40 2002/03/18 20:26:32 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.41 2002/03/19 00:16:44 fluxgen Exp $
26 26
27//Use some GNU extensions 27//Use some GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -306,8 +306,8 @@ m_rc_titlebar_left(m_resourcemanager, TitlebarList(&m_titlebar_left[0], &m_title
306m_rc_titlebar_right(m_resourcemanager, TitlebarList(&m_titlebar_right[0], &m_titlebar_right[3]), "session.titlebar.right", "Session.Titlebar.Right"), 306m_rc_titlebar_right(m_resourcemanager, TitlebarList(&m_titlebar_right[0], &m_titlebar_right[3]), "session.titlebar.right", "Session.Titlebar.Right"),
307m_rc_cache_life(m_resourcemanager, 5, "session.cacheLife", "Session.CacheLife"), 307m_rc_cache_life(m_resourcemanager, 5, "session.cacheLife", "Session.CacheLife"),
308m_rc_cache_max(m_resourcemanager, 200, "session.cacheMax", "Session.CacheMax"), 308m_rc_cache_max(m_resourcemanager, 200, "session.cacheMax", "Session.CacheMax"),
309focused_window(0), 309focused_window(0), masked_window(0),
310masked_window(0), 310timer(this),
311no_focus(false), 311no_focus(false),
312rc_file(rc), 312rc_file(rc),
313argv(m_argv), argc(m_argc), 313argv(m_argv), argc(m_argc),
@@ -394,10 +394,9 @@ key(0)
394 XSync(getXDisplay(), False); 394 XSync(getXDisplay(), False);
395 395
396 reconfigure_wait = reread_menu_wait = false; 396 reconfigure_wait = reread_menu_wait = false;
397 397
398 timer = new BTimer(this, this); 398 timer.setTimeout(0);
399 timer->setTimeout(0); 399 timer.fireOnce(True);
400 timer->fireOnce(True);
401 400
402 //create keybindings handler and load keys file 401 //create keybindings handler and load keys file
403 char *keyfilename = StringUtil::expandFilename((*m_rc_keyfile).c_str()); 402 char *keyfilename = StringUtil::expandFilename((*m_rc_keyfile).c_str());
@@ -425,8 +424,6 @@ Fluxbox::~Fluxbox(void) {
425 delete key; 424 delete key;
426 key = 0; 425 key = 0;
427 426
428 delete timer;
429
430 delete screenList; 427 delete screenList;
431 delete menuTimestamps; 428 delete menuTimestamps;
432 429
@@ -2327,7 +2324,7 @@ void Fluxbox::reload_rc(void) {
2327void Fluxbox::reconfigure(void) { 2324void Fluxbox::reconfigure(void) {
2328 reconfigure_wait = true; 2325 reconfigure_wait = true;
2329 2326
2330 if (! timer->isTiming()) timer->start(); 2327 if (! timer.isTiming()) timer.start();
2331} 2328}
2332 2329
2333 2330
@@ -2421,7 +2418,7 @@ void Fluxbox::checkMenu(void) {
2421void Fluxbox::rereadMenu(void) { 2418void Fluxbox::rereadMenu(void) {
2422 reread_menu_wait = True; 2419 reread_menu_wait = True;
2423 2420
2424 if (! timer->isTiming()) timer->start(); 2421 if (! timer.isTiming()) timer.start();
2425} 2422}
2426 2423
2427 2424
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 4ba3e67..361b1f8 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.13 2002/03/01 15:28:56 fluxgen Exp $ 25// $Id: fluxbox.hh,v 1.14 2002/03/19 00:16:44 fluxgen Exp $
26 26
27#ifndef FLUXBOX_HH 27#ifndef FLUXBOX_HH
28#define FLUXBOX_HH 28#define FLUXBOX_HH
@@ -45,42 +45,15 @@
45# endif // HAVE_SYS_TIME_H 45# endif // HAVE_SYS_TIME_H
46#endif // TIME_WITH_SYS_TIME 46#endif // TIME_WITH_SYS_TIME
47 47
48#ifndef _RESOURCE_HH_
49#include "Resource.hh" 48#include "Resource.hh"
50#endif
51
52#ifndef _KEYS_HH_
53#include "Keys.hh" 49#include "Keys.hh"
54#endif
55
56#ifndef _BASEDISPLAY_HH_
57#include "BaseDisplay.hh" 50#include "BaseDisplay.hh"
58#endif
59
60#ifndef _IMAGE_HH_
61#include "Image.hh" 51#include "Image.hh"
62#endif
63
64#ifndef _LINKEDLIST_HH_
65#include "LinkedList.hh" 52#include "LinkedList.hh"
66#endif
67
68#ifndef _TIMER_HH_
69#include "Timer.hh" 53#include "Timer.hh"
70#endif
71
72#ifndef _WINDOW_HH_
73#include "Window.hh" 54#include "Window.hh"
74#endif
75
76#ifndef _TAB_HH_
77#include "Tab.hh" 55#include "Tab.hh"
78#endif
79
80#ifndef _TOOLBAR_HH_
81#include "Toolbar.hh" 56#include "Toolbar.hh"
82#endif
83
84#ifdef SLIT 57#ifdef SLIT
85# include "Slit.hh" 58# include "Slit.hh"
86#endif // SLIT 59#endif // SLIT
@@ -264,7 +237,7 @@ private:
264 LinkedList<BScreen> *screenList; 237 LinkedList<BScreen> *screenList;
265 238
266 FluxboxWindow *focused_window, *masked_window; 239 FluxboxWindow *focused_window, *masked_window;
267 BTimer *timer; 240 BTimer timer;
268 241
269#ifdef HAVE_GETPID 242#ifdef HAVE_GETPID
270 Atom fluxbox_pid; 243 Atom fluxbox_pid;