added resource session.screen<N>.slit.acceptKdeDockapps
Mark Tiefenbruck mark@fluxbox.org
4 files changed,
12 insertions(+),
3 deletions(-)
M
ChangeLog
→
ChangeLog
@@ -1,5 +1,8 @@
(Format: Year/Month/Day) Changes for 1.0.1: +*07/12/25: + * Added resource session.screen<N>.slit.acceptKdeDockapps: <boolean> (Mark) + Screen.cc Slit.cc/hh *07/12/23: * Added new style items window.(un)focus.border{Width,Color} (Mark) FbWinFrameTheme.cc/hh FbWinFrame.cc
M
src/Screen.cc
→
src/Screen.cc
@@ -1278,7 +1278,7 @@ FbTk::EventHandler *evh = 0;
FbTk::EventManager *evm = FbTk::EventManager::instance(); if (handler == 0) { #ifdef SLIT - if (slit() != 0) + if (slit() != 0 && slit()->acceptKdeDockapp()) slit()->addClient(client); else #endif // SLIT@@ -1311,7 +1311,7 @@
if (winclient->initial_state == WithdrawnState) { delete winclient; #ifdef SLIT - if (slit()) + if (slit() && !isKdeDockapp(client)) slit()->addClient(client); #endif // SLIT return 0;
M
src/Slit.cc
→
src/Slit.cc
@@ -286,6 +286,8 @@ m_slit_theme(new SlitTheme(scr.rootWindow().screenNumber())),
m_strut(0), // resources // lock in first resource + m_rc_kde_dockapp(scr.resourceManager(), true, + scr.name() + ".slit.acceptKdeDockapps", scr.altName() + ".Slit.AcceptKdeDockapps"), m_rc_auto_hide(scr.resourceManager().lock(), false, scr.name() + ".slit.autoHide", scr.altName() + ".Slit.AutoHide"), // TODO: this resource name must change@@ -440,6 +442,9 @@ cerr<<__FILE__": addClient(w = 0x"<<hex<<w<<dec<<")"<<endl;
#endif // DEBUG // Can't add non existent window if (w == None) + return; + + if (!acceptKdeDockapp() && screen().isKdeDockapp(w)) return; // Look for slot in client list by name
M
src/Slit.hh
→
src/Slit.hh
@@ -112,6 +112,7 @@
int layerNumber() const { return m_layeritem->getLayerNum(); } inline bool isHidden() const { return m_hidden; } + inline bool acceptKdeDockapp() const { return *m_rc_kde_dockapp; } inline bool doAutoHide() const { return *m_rc_auto_hide; } inline Direction direction() const { return *m_rc_direction; } inline Placement placement() const { return *m_rc_placement; }@@ -173,7 +174,7 @@ std::auto_ptr<SlitTheme> m_slit_theme;
static unsigned int s_eventmask; Strut *m_strut; - FbTk::Resource<bool> m_rc_auto_hide, m_rc_maximize_over; + FbTk::Resource<bool> m_rc_kde_dockapp, m_rc_auto_hide, m_rc_maximize_over; FbTk::Resource<Slit::Placement> m_rc_placement; FbTk::Resource<Slit::Direction> m_rc_direction; FbTk::Resource<int> m_rc_alpha, m_rc_on_head;