nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added resource session.screen<N>.slit.acceptKdeDockapps

Browse source
This commit is contained in:
Mark Tiefenbruck 2007-12-24 22:36:22 -08:00
parent 9daf464b28
commit 1bcc966153
4 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
(Format: Year/Month/Day) (Format: Year/Month/Day)
Changes for 1.0.1: 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: *07/12/23:
* Added new style items window.(un)focus.border{Width,Color} (Mark) * Added new style items window.(un)focus.border{Width,Color} (Mark)
FbWinFrameTheme.cc/hh FbWinFrame.cc FbWinFrameTheme.cc/hh FbWinFrame.cc

4
src/Screen.cc
View file

@ -1278,7 +1278,7 @@ bool BScreen::addKdeDockapp(Window client) {
FbTk::EventManager *evm = FbTk::EventManager::instance(); FbTk::EventManager *evm = FbTk::EventManager::instance();
if (handler == 0) { if (handler == 0) {
#ifdef SLIT #ifdef SLIT
if (slit() != 0) if (slit() != 0 && slit()->acceptKdeDockapp())
slit()->addClient(client); slit()->addClient(client);
else else
#endif // SLIT #endif // SLIT
@ -1311,7 +1311,7 @@ FluxboxWindow *BScreen::createWindow(Window client) {
if (winclient->initial_state == WithdrawnState) { if (winclient->initial_state == WithdrawnState) {
delete winclient; delete winclient;
#ifdef SLIT #ifdef SLIT
if (slit()) if (slit() && !isKdeDockapp(client))
slit()->addClient(client); slit()->addClient(client);
#endif // SLIT #endif // SLIT
return 0; return 0;

5
src/Slit.cc
View file

@ -286,6 +286,8 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename)
m_strut(0), m_strut(0),
// resources // resources
// lock in first resource // 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, m_rc_auto_hide(scr.resourceManager().lock(), false,
scr.name() + ".slit.autoHide", scr.altName() + ".Slit.AutoHide"), scr.name() + ".slit.autoHide", scr.altName() + ".Slit.AutoHide"),
// TODO: this resource name must change // TODO: this resource name must change
@ -442,6 +444,9 @@ void Slit::addClient(Window w) {
if (w == None) if (w == None)
return; return;
if (!acceptKdeDockapp() && screen().isKdeDockapp(w))
return;
// Look for slot in client list by name // Look for slot in client list by name
SlitClient *client = 0; SlitClient *client = 0;
string match_name; string match_name;

3
src/Slit.hh
View file

@ -112,6 +112,7 @@ public:
int layerNumber() const { return m_layeritem->getLayerNum(); } int layerNumber() const { return m_layeritem->getLayerNum(); }
inline bool isHidden() const { return m_hidden; } 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 bool doAutoHide() const { return *m_rc_auto_hide; }
inline Direction direction() const { return *m_rc_direction; } inline Direction direction() const { return *m_rc_direction; }
inline Placement placement() const { return *m_rc_placement; } inline Placement placement() const { return *m_rc_placement; }
@ -173,7 +174,7 @@ private:
static unsigned int s_eventmask; static unsigned int s_eventmask;
Strut *m_strut; 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::Placement> m_rc_placement;
FbTk::Resource<Slit::Direction> m_rc_direction; FbTk::Resource<Slit::Direction> m_rc_direction;
FbTk::Resource<int> m_rc_alpha, m_rc_on_head; FbTk::Resource<int> m_rc_alpha, m_rc_on_head;