openbox3_LDADD=../otk/libotk.a @LIBINTL@
-openbox3_SOURCES= client.cc frame.cc screen.cc openbox.cc \
+openbox3_SOURCES= client.cc frame.cc bbscreen.cc openbox.cc \
bbwindow.cc workspace.cc blackbox.cc \
main.cc xeventhandler.cc
#include <string>
using std::string;
-#include "screen.hh"
+#include "bbscreen.hh"
#include "otk/font.hh"
#include "otk/gccache.hh"
#include "otk/image.hh"
#include "font.hh"
#include "gccache.hh"
#include "image.hh"
-#include "screen.hh"
+#include "bbscreen.hh"
#include "bbwindow.hh"
#include "workspace.hh"
#include "otk/gccache.hh"
#include "otk/image.hh"
#include "otk/assassin.hh"
-#include "screen.hh"
+#include "bbscreen.hh"
#include "otk/util.hh"
#include "bbwindow.hh"
#include "workspace.hh"
#endif
#include "client.hh"
-#include "screen.hh"
+#include "bbscreen.hh"
#include "openbox.hh"
#include "otk/display.hh"
#include "otk/property.hh"
#include <X11/Xlib.h>
}
-#include <string>
-
#include "client.hh"
#include "otk/strut.hh"
#include "otk/rect.hh"
#include "otk/screeninfo.hh"
#include "otk/style.hh"
+#include <string>
+
namespace ob {
//! Holds and decorates a frame around an OBClient (client window)
#include "blackbox.hh"
#include "otk/font.hh"
#include "otk/display.hh"
-#include "screen.hh"
+#include "bbscreen.hh"
#include "otk/util.hh"
#include "bbwindow.hh"
#include "workspace.hh"
// XXX: REMOVE THIS SOON!!#!
#include "blackbox.hh"
-#include "screen.hh"
+#include "bbscreen.hh"
extern "C" {
#include <X11/Xlib.h>