M src/Window.cc → src/Window.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.cc,v 1.32 2002/03/18 19:58:06 fluxgen Exp $
+// $Id: Window.cc,v 1.33 2002/03/19 00:15:58 fluxgen Exp $
 
 //use GNU extensions
 #ifndef	 _GNU_SOURCE
@@ -69,7 +69,7 @@ moving(false), resizing(false), shaded(false), maximized(false),
 visible(false), iconic(false), transient(false), focused(false),
 stuck(false), modal(false), send_focus_message(false), managed(false),
 screen(0),
-timer(0),
+timer(this),
 display(0),
 lastButtonPressTime(0),
 windowmenu(0),
@@ -185,9 +185,9 @@ client.width = wattrib.width;
 	client.height = wattrib.height;
 	client.old_bw = wattrib.border_width;
 
-	timer = new BTimer(fluxbox, this);
-	timer->setTimeout(fluxbox->getAutoRaiseDelay());
-	timer->fireOnce(true);
+
+	timer.setTimeout(fluxbox->getAutoRaiseDelay());
+	timer.fireOnce(true);
 
 	getBlackboxHints();
 	if (! client.blackbox_hint)
@@ -403,12 +403,6 @@ if (workspace_number != -1 && window_number != -1)
 		screen->getWorkspace(workspace_number)->removeWindow(this);
 	else if (iconic)
 		screen->removeIcon(this);
-	
-	if (timer) {
-		if (timer->isTiming()) timer->stop();
-		delete timer;
-		timer = 0;
-	}
 
 	if (windowmenu)
 		delete windowmenu;
@@ -1947,7 +1941,7 @@ }
 
 			if ((screen->isSloppyFocus() || screen->isSemiSloppyFocus())
 					&& screen->doAutoRaise())
-				timer->start();
+				timer.start();
 
 			ret = true;
 		}
@@ -2439,8 +2433,8 @@ XSetWindowBorder(display, frame.plate, frame.uborder_pixel);
 	}
 
 	if ((screen->isSloppyFocus() || screen->isSemiSloppyFocus()) &&
-			screen->doAutoRaise() && timer!=0 )
-		timer->stop();
+			screen->doAutoRaise())
+		timer.stop();
 }
 
 

M src/Window.hh → src/Window.hh

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.hh,v 1.12 2002/03/18 19:58:06 fluxgen Exp $
+// $Id: Window.hh,v 1.13 2002/03/19 00:15:58 fluxgen Exp $
 
 #ifndef	 WINDOW_HH
 #define	 WINDOW_HH
@@ -223,7 +223,7 @@
 	bool moving, resizing, shaded, maximized, visible, iconic, transient,
 		focused, stuck, modal, send_focus_message, managed;
 	BScreen *screen;
-	BTimer *timer;
+	BTimer timer;
 	Display *display;
 	BaseDisplay::BlackboxAttributes blackbox_attrib;