From 32bf14b3bd2220442696344de463b3447dd007ea Mon Sep 17 00:00:00 2001 From: fluxgen Date: Fri, 20 Jun 2003 01:25:26 +0000 Subject: some refactoring --- src/SlitClient.cc | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/SlitClient.hh | 74 +++++++++++++++++++++++++++++++ src/SlitTheme.hh | 47 ++++++++++++++++++++ 3 files changed, 249 insertions(+) create mode 100644 src/SlitClient.cc create mode 100644 src/SlitClient.hh create mode 100644 src/SlitTheme.hh diff --git a/src/SlitClient.cc b/src/SlitClient.cc new file mode 100644 index 0000000..74a10a4 --- /dev/null +++ b/src/SlitClient.cc @@ -0,0 +1,128 @@ +// SlitClient.cc for fluxbox +// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net) +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. + +// $Id: SlitClient.cc,v 1.1 2003/06/20 01:25:26 fluxgen Exp $ + +#include "SlitClient.hh" + +#include "I18n.hh" +#include "Screen.hh" +#include "App.hh" + +#include +#include + +namespace { + +void getWMName(BScreen *screen, Window window, std::string& name) { + name = ""; + + if (screen == 0 || window == None) + return; + + Display *display = FbTk::App::instance()->display(); + + XTextProperty text_prop; + char **list; + int num; + I18n *i18n = I18n::instance(); + + if (XGetWMName(display, window, &text_prop)) { + if (text_prop.value && text_prop.nitems > 0) { + if (text_prop.encoding != XA_STRING) { + + text_prop.nitems = strlen((char *) text_prop.value); + + if ((XmbTextPropertyToTextList(display, &text_prop, + &list, &num) == Success) && + (num > 0) && *list) { + name = static_cast(*list); + XFreeStringList(list); + } else + name = (char *)text_prop.value; + + } else + name = (char *)text_prop.value; + } else { // default name + name = i18n->getMessage( + FBNLS::WindowSet, FBNLS::WindowUnnamed, + "Unnamed"); + } + } else { + // default name + name = i18n->getMessage( + FBNLS::WindowSet, FBNLS::WindowUnnamed, + "Unnamed"); + } + +} + +}; // end anonymous namespace + +SlitClient::SlitClient(BScreen *screen, Window win) { + initialize(screen, win); +} + +SlitClient::SlitClient(const char *name):m_match_name(name == 0 ? "" : name) { + initialize(); +} + + +void SlitClient::initialize(BScreen *screen, Window win) { + // Now we pre-initialize a list of slit clients with names for + // comparison with incoming client windows. This allows the slit + // to maintain a sorted order based on a saved window name list. + // Incoming windows not found in the list are appended. Matching + // duplicates are inserted after the last found instance of the + // matching name. + + m_client_window = win; + m_window = m_icon_window = None; + move(0, 0); + resize(0, 0); + + if (matchName().empty()) + getWMName(screen, clientWindow(), m_match_name); + m_visible = true; +} + +void SlitClient::disableEvents() { + if (window() == 0) + return; + Display *disp = FbTk::App::instance()->display(); + XSelectInput(disp, window(), NoEventMask); +} + +void SlitClient::enableEvents() { + if (window() == 0) + return; + Display *disp = FbTk::App::instance()->display(); + XSelectInput(disp, window(), StructureNotifyMask | + SubstructureNotifyMask | EnterWindowMask); +} + +void SlitClient::hide() { + XUnmapWindow(FbTk::App::instance()->display(), window()); +} + +void SlitClient::show() { + XMapWindow(FbTk::App::instance()->display(), window()); +} diff --git a/src/SlitClient.hh b/src/SlitClient.hh new file mode 100644 index 0000000..5719ab0 --- /dev/null +++ b/src/SlitClient.hh @@ -0,0 +1,74 @@ +// SlitClient.hh for fluxbox +// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net) +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. + +// $Id: SlitClient.hh,v 1.1 2003/06/20 01:25:26 fluxgen Exp $ + +#ifndef SLITCLIENT_HH +#define SLITCLIENT_HH + +#include "NotCopyable.hh" + +#include + +#include + +class BScreen; + +/// holds slit client info +class SlitClient: private FbTk::NotCopyable { +public: + /// For adding an actual window + SlitClient(BScreen *screen, Window win); + /// For adding a placeholder + explicit SlitClient(const char *name); + + inline const std::string &matchName() const { return m_match_name; } + inline Window window() const { return m_window; } + inline Window clientWindow() const { return m_client_window; } + inline Window iconWindow() const { return m_icon_window; } + inline int x() const { return m_x; } + inline int y() const { return m_y; } + inline unsigned int width() const { return m_width; } + inline unsigned int height() const { return m_height; } + bool visible() const { return m_visible; } + + + void setIconWindow(Window win) { m_icon_window = win; } + void setWindow(Window win) { m_window = win; } + void move(int x, int y) { m_x = x; m_y = y; } + void resize(unsigned int width, unsigned int height) { m_width = width; m_height = height; } + void hide(); + void show(); + void setVisible(bool value) { m_visible = value; } + + void initialize(BScreen *screen = 0, Window win= None); + void disableEvents(); + void enableEvents(); + +private: + std::string m_match_name; + Window m_window, m_client_window, m_icon_window; + int m_x, m_y; + unsigned int m_width, m_height; + bool m_visible; ///< wheter the client should be visible or not +}; + +#endif // SLITCLIENT_HH diff --git a/src/SlitTheme.hh b/src/SlitTheme.hh new file mode 100644 index 0000000..7266734 --- /dev/null +++ b/src/SlitTheme.hh @@ -0,0 +1,47 @@ +// SlitTheme.hh for fluxbox +// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net) +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. + +// $Id: SlitTheme.hh,v 1.1 2003/06/20 01:25:26 fluxgen Exp $ + +#ifndef SLITTHEME_HH +#define SLITTHEME_HH + +#include "Theme.hh" +#include "Slit.hh" + +class SlitTheme:public FbTk::Theme { +public: + explicit SlitTheme(Slit &slit):FbTk::Theme(slit.screen().screenNumber()), + m_slit(slit), + m_texture(*this, "slit", "Slit") { + // default texture type + m_texture->setType(FbTk::Texture::SOLID); + } + void reconfigTheme() { + m_slit.reconfigure(); + } + const FbTk::Texture &texture() const { return *m_texture; } +private: + Slit &m_slit; + FbTk::ThemeItem m_texture; +}; + +#endif // SLITTHEME_HH -- cgit v0.11.2