summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-03-19 00:15:58 (GMT)
committerfluxgen <fluxgen>2002-03-19 00:15:58 (GMT)
commitf666e3cd77cddea837b3f8810540f061390749c1 (patch)
tree3c221445b68d26b77974e863549d3a411693ec58
parentc52f13c5f2150e314db0723ba02f447be672e296 (diff)
downloadfluxbox_lack-f666e3cd77cddea837b3f8810540f061390749c1.zip
fluxbox_lack-f666e3cd77cddea837b3f8810540f061390749c1.tar.bz2
fixed timer pointer
-rw-r--r--src/Window.cc22
-rw-r--r--src/Window.hh4
2 files changed, 10 insertions, 16 deletions
diff --git a/src/Window.cc b/src/Window.cc
index be6fcc8..d41b77e 100644
--- a/src/Window.cc
+++ b/src/Window.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: Window.cc,v 1.32 2002/03/18 19:58:06 fluxgen Exp $ 25// $Id: Window.cc,v 1.33 2002/03/19 00:15:58 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -69,7 +69,7 @@ moving(false), resizing(false), shaded(false), maximized(false),
69visible(false), iconic(false), transient(false), focused(false), 69visible(false), iconic(false), transient(false), focused(false),
70stuck(false), modal(false), send_focus_message(false), managed(false), 70stuck(false), modal(false), send_focus_message(false), managed(false),
71screen(0), 71screen(0),
72timer(0), 72timer(this),
73display(0), 73display(0),
74lastButtonPressTime(0), 74lastButtonPressTime(0),
75windowmenu(0), 75windowmenu(0),
@@ -185,9 +185,9 @@ tab(0)
185 client.height = wattrib.height; 185 client.height = wattrib.height;
186 client.old_bw = wattrib.border_width; 186 client.old_bw = wattrib.border_width;
187 187
188 timer = new BTimer(fluxbox, this); 188
189 timer->setTimeout(fluxbox->getAutoRaiseDelay()); 189 timer.setTimeout(fluxbox->getAutoRaiseDelay());
190 timer->fireOnce(true); 190 timer.fireOnce(true);
191 191
192 getBlackboxHints(); 192 getBlackboxHints();
193 if (! client.blackbox_hint) 193 if (! client.blackbox_hint)
@@ -403,12 +403,6 @@ FluxboxWindow::~FluxboxWindow(void) {
403 screen->getWorkspace(workspace_number)->removeWindow(this); 403 screen->getWorkspace(workspace_number)->removeWindow(this);
404 else if (iconic) 404 else if (iconic)
405 screen->removeIcon(this); 405 screen->removeIcon(this);
406
407 if (timer) {
408 if (timer->isTiming()) timer->stop();
409 delete timer;
410 timer = 0;
411 }
412 406
413 if (windowmenu) 407 if (windowmenu)
414 delete windowmenu; 408 delete windowmenu;
@@ -1947,7 +1941,7 @@ bool FluxboxWindow::setInputFocus(void) {
1947 1941
1948 if ((screen->isSloppyFocus() || screen->isSemiSloppyFocus()) 1942 if ((screen->isSloppyFocus() || screen->isSemiSloppyFocus())
1949 && screen->doAutoRaise()) 1943 && screen->doAutoRaise())
1950 timer->start(); 1944 timer.start();
1951 1945
1952 ret = true; 1946 ret = true;
1953 } 1947 }
@@ -2439,8 +2433,8 @@ void FluxboxWindow::setFocusFlag(bool focus) {
2439 } 2433 }
2440 2434
2441 if ((screen->isSloppyFocus() || screen->isSemiSloppyFocus()) && 2435 if ((screen->isSloppyFocus() || screen->isSemiSloppyFocus()) &&
2442 screen->doAutoRaise() && timer!=0 ) 2436 screen->doAutoRaise())
2443 timer->stop(); 2437 timer.stop();
2444} 2438}
2445 2439
2446 2440
diff --git a/src/Window.hh b/src/Window.hh
index cdab73c..5bf7232 100644
--- a/src/Window.hh
+++ b/src/Window.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: Window.hh,v 1.12 2002/03/18 19:58:06 fluxgen Exp $ 25// $Id: Window.hh,v 1.13 2002/03/19 00:15:58 fluxgen Exp $
26 26
27#ifndef WINDOW_HH 27#ifndef WINDOW_HH
28#define WINDOW_HH 28#define WINDOW_HH
@@ -223,7 +223,7 @@ private:
223 bool moving, resizing, shaded, maximized, visible, iconic, transient, 223 bool moving, resizing, shaded, maximized, visible, iconic, transient,
224 focused, stuck, modal, send_focus_message, managed; 224 focused, stuck, modal, send_focus_message, managed;
225 BScreen *screen; 225 BScreen *screen;
226 BTimer *timer; 226 BTimer timer;
227 Display *display; 227 Display *display;
228 BaseDisplay::BlackboxAttributes blackbox_attrib; 228 BaseDisplay::BlackboxAttributes blackbox_attrib;
229 229