X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FBaseDisplay.cc;h=f2ac4c7948222d81d3732b15c3901e0c02a99b31;hb=5e3ca8e66586a6dab4793cef04a3de98dc2ecfbe;hp=5b906495bc19fe3dd67bf7e5cdc7b58d28200d08;hpb=ffce7be32582e3e93ca4d18c751f5c4e250a661e;p=chaz%2Fopenbox

diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc
index 5b906495..f2ac4c79 100644
--- a/src/BaseDisplay.cc
+++ b/src/BaseDisplay.cc
@@ -48,10 +48,13 @@
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
 
-#ifdef    STDC_HEADERS
+#ifdef    HAVE_STDLIB_H
 #  include <stdlib.h>
+#endif // HAVE_STDLIB_H
+
+#ifdef    HAVE_STRING_H
 #  include <string.h>
-#endif // STDC_HEADERS
+#endif // HAVE_STRING_H
 
 #ifdef    HAVE_UNISTD_H
 #  include <sys/types.h>
@@ -401,6 +404,9 @@ BaseDisplay::~BaseDisplay(void) {
     timerList->remove(0);
 
   delete timerList;
+  
+  if (application_name != NULL)
+    delete [] application_name;
 
   XCloseDisplay(display);
 }
@@ -574,16 +580,17 @@ void BaseDisplay::ungrabButton(unsigned int button, unsigned int modifiers,
 }
 
 
-ScreenInfo::ScreenInfo(BaseDisplay &d, int num) : basedisplay(d) {
-  screen_number = num;
+ScreenInfo::ScreenInfo(BaseDisplay &d, int num) : basedisplay(d),
+  screen_number(num)
+{
 
   root_window = RootWindow(basedisplay.getXDisplay(), screen_number);
   depth = DefaultDepth(basedisplay.getXDisplay(), screen_number);
 
-  width =
-    WidthOfScreen(ScreenOfDisplay(basedisplay.getXDisplay(), screen_number));
-  height =
-    HeightOfScreen(ScreenOfDisplay(basedisplay.getXDisplay(), screen_number));
+  m_size = Size(WidthOfScreen(ScreenOfDisplay(basedisplay.getXDisplay(),
+                                              screen_number)),
+                HeightOfScreen(ScreenOfDisplay(basedisplay.getXDisplay(),
+                                               screen_number)));
 
   // search for a TrueColor Visual... if we can't find one... we will use the
   // default visual for the screen