M src/BaseDisplay.hh → src/BaseDisplay.hh

@@ -22,12 +22,11 @@ // 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: BaseDisplay.hh,v 1.14 2002/03/18 15:28:25 fluxgen Exp $
+// $Id: BaseDisplay.hh,v 1.15 2002/03/18 23:39:53 fluxgen Exp $
 
 #ifndef	 BASEDISPLAY_HH
 #define	 BASEDISPLAY_HH
 
-#include "Timer.hh"
 #include "NotCopyable.hh"
 #include "FbAtoms.hh"
 #include <X11/Xlib.h>
@@ -77,9 +76,9 @@ 
 
 	inline ScreenInfo *getScreenInfo(int s)	{ return screenInfoList[s]; }
 
-	inline const Bool &hasShapeExtensions(void) const { return shape.extensions; }
-	inline const bool &doShutdown(void) const { return m_shutdown; }
-	inline const bool &isStartup(void) const { return m_startup; }
+	inline const bool hasShapeExtensions(void) const { return shape.extensions; }
+	inline const bool doShutdown(void) const { return m_shutdown; }
+	inline const bool isStartup(void) const { return m_startup; }
 
 	inline const Cursor &getSessionCursor(void) const { return cursor.session; }
 	inline const Cursor &getMoveCursor(void) const { return cursor.move; }
@@ -91,8 +90,8 @@ 
 	inline const char *getXDisplayName(void) const	{ return const_cast<const char *>(m_display_name); }
 	inline const char *getApplicationName(void) const { return const_cast<const char *>(m_app_name); }
 
-	inline const int &getNumberOfScreens(void) const { return number_of_screens; }
-	inline const int &getShapeEventBase(void) const	{ return shape.event_basep; }
+	inline const int getNumberOfScreens(void) const { return number_of_screens; }
+	inline const int getShapeEventBase(void) const	{ return shape.event_basep; }
 
 	inline void shutdown(void) { m_shutdown = true; }
 	inline void run(void) { m_startup = m_shutdown = false; }
@@ -102,8 +101,6 @@ 
 	void grab(void);
 	void ungrab(void);
 	void eventLoop(void);
-	void addTimer(BTimer *);
-	void removeTimer(BTimer *);
 
 	// another pure virtual... this is used to handle signals that BaseDisplay
 	// doesn't understand itself
@@ -128,24 +125,18 @@ 
 	struct shape {
 		Bool extensions;
 		int event_basep, error_basep;
-	} shape;
-
-	
+	} shape;	
 
 	bool m_startup, m_shutdown;
 	Display *m_display;
 
     typedef std::vector<ScreenInfo *> ScreenInfoList;
-    ScreenInfoList screenInfoList;
-
-    typedef std::list<BTimer *> TimerList;
-    TimerList timerList;
+    ScreenInfoList screenInfoList;    
 
 	char *m_display_name, *m_app_name;
 	int number_of_screens, m_server_grabs, colors_per_channel;
 
-protected:
-	
+protected:	
 	virtual void process_event(XEvent *) = 0;
 
 };
@@ -161,11 +152,11 @@ inline Visual *getVisual(void) { return visual; }
 	inline const Window &getRootWindow(void) const { return root_window; }
 	inline const Colormap &getColormap(void) const { return colormap; }
 
-	inline const int &getDepth(void) const { return depth; }
-	inline const int &getScreenNumber(void) const { return screen_number; }
+	inline const int getDepth(void) const { return depth; }
+	inline const int getScreenNumber(void) const { return screen_number; }
 
-	inline const unsigned int &getWidth(void) const { return width; }
-	inline const unsigned int &getHeight(void) const { return height; }
+	inline const unsigned int getWidth(void) const { return width; }
+	inline const unsigned int getHeight(void) const { return height; }
 
 private:
 	BaseDisplay *basedisplay;
@@ -176,8 +167,7 @@ 
 	int depth, screen_number;
 	unsigned int width, height;
 
-
 };
 
 
-#endif // __BaseDisplay_hh
+#endif // BASEDISPLAY_HH