aboutsummaryrefslogtreecommitdiff
path: root/src/Slit.cc
diff options
context:
space:
mode:
authorTomas Janousek <tomi@nomi.cz>2008-01-28 08:58:23 (GMT)
committerTomas Janousek <tomi@nomi.cz>2008-01-28 08:58:23 (GMT)
commit880209a43821c8f56e4a46b2debf7a72f68658c8 (patch)
tree22f68473e939c1cf8cb838ece3943e4184ff7392 /src/Slit.cc
parenta61b37da70e0cd1556617c56890455ef89ee1fb0 (diff)
parent5c85fcbe648b5b4581db1ca2303d5f849a63c28c (diff)
downloadfluxbox_pavel-880209a43821c8f56e4a46b2debf7a72f68658c8.zip
fluxbox_pavel-880209a43821c8f56e4a46b2debf7a72f68658c8.tar.bz2
Merge branch 'xinerama_randr'
Diffstat (limited to 'src/Slit.cc')
-rw-r--r--src/Slit.cc15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/Slit.cc b/src/Slit.cc
index 3f371c1..ecd8280 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -48,10 +48,6 @@
48#include "RootTheme.hh" 48#include "RootTheme.hh"
49#include "FbMenu.hh" 49#include "FbMenu.hh"
50 50
51#ifdef XINERAMA
52#include "Xinerama.hh"
53#endif // XINERAMA
54
55#include "SlitTheme.hh" 51#include "SlitTheme.hh"
56#include "SlitClient.hh" 52#include "SlitClient.hh"
57#include "Xutil.hh" 53#include "Xutil.hh"
@@ -270,6 +266,9 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename)
270 m_slitmenu(scr.menuTheme(), 266 m_slitmenu(scr.menuTheme(),
271 scr.imageControl(), 267 scr.imageControl(),
272 *scr.layerManager().getLayer(Layer::MENU)), 268 *scr.layerManager().getLayer(Layer::MENU)),
269#ifdef XINERAMA
270 m_xineramaheadmenu(0),
271#endif // XINERAMA
273 frame(scr.rootWindow()), 272 frame(scr.rootWindow()),
274 //For KDE dock applets 273 //For KDE dock applets
275 m_kwm1_dockwindow(XInternAtom(FbTk::App::instance()->display(), 274 m_kwm1_dockwindow(XInternAtom(FbTk::App::instance()->display(),
@@ -482,8 +481,7 @@ void Slit::addClient(Window w) {
482 if (wmhints != 0) { 481 if (wmhints != 0) {
483 if ((wmhints->flags & IconWindowHint) && 482 if ((wmhints->flags & IconWindowHint) &&
484 (wmhints->icon_window != None)) { 483 (wmhints->icon_window != None)) {
485 XMoveWindow(disp, client->clientWindow(), screen().width() + 10, 484 XMoveWindow(disp, client->clientWindow(), -100, -100);
486 screen().height() + 10);
487 XMapWindow(disp, client->clientWindow()); 485 XMapWindow(disp, client->clientWindow());
488 client->setIconWindow(wmhints->icon_window); 486 client->setIconWindow(wmhints->icon_window);
489 client->setWindow(client->iconWindow()); 487 client->setWindow(client->iconWindow());
@@ -1113,6 +1111,10 @@ void Slit::exposeEvent(XExposeEvent &ev) {
1113 1111
1114void Slit::update(FbTk::Subject *subj) { 1112void Slit::update(FbTk::Subject *subj) {
1115 reconfigure(); 1113 reconfigure();
1114#ifdef XINERAMA
1115 if (subj == &m_screen.resizeSig() && m_xineramaheadmenu)
1116 m_xineramaheadmenu->reloadHeads();
1117#endif // XINERAMA
1116} 1118}
1117 1119
1118void Slit::clearWindow() { 1120void Slit::clearWindow() {
@@ -1254,6 +1256,7 @@ void Slit::setupMenu() {
1254#ifdef XINERAMA 1256#ifdef XINERAMA
1255 if (screen().hasXinerama()) { 1257 if (screen().hasXinerama()) {
1256 m_slitmenu.insert(_FB_XTEXT(Menu, OnHead, "On Head...", "Title of On Head menu"), 1258 m_slitmenu.insert(_FB_XTEXT(Menu, OnHead, "On Head...", "Title of On Head menu"),
1259 m_xineramaheadmenu =
1257 new XineramaHeadMenu<Slit>( 1260 new XineramaHeadMenu<Slit>(
1258 screen().menuTheme(), 1261 screen().menuTheme(),
1259 screen(), 1262 screen(),