aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-06-20 01:25:26 (GMT)
committerfluxgen <fluxgen>2003-06-20 01:25:26 (GMT)
commit32bf14b3bd2220442696344de463b3447dd007ea (patch)
tree0b3ddf7cf7a1a87d3dac2988114b7f6bfde31225
parent76f111395952414f6e2e9bd1b416d6e1091ec6cd (diff)
downloadfluxbox_paul-32bf14b3bd2220442696344de463b3447dd007ea.zip
fluxbox_paul-32bf14b3bd2220442696344de463b3447dd007ea.tar.bz2
some refactoring
-rw-r--r--src/SlitClient.cc128
-rw-r--r--src/SlitClient.hh74
-rw-r--r--src/SlitTheme.hh47
3 files changed, 249 insertions, 0 deletions
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 @@
1// SlitClient.cc for fluxbox
2// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
3//
4// Permission is hereby granted, free of charge, to any person obtaining a
5// copy of this software and associated documentation files (the "Software"),
6// to deal in the Software without restriction, including without limitation
7// the rights to use, copy, modify, merge, publish, distribute, sublicense,
8// and/or sell copies of the Software, and to permit persons to whom the
9// Software is furnished to do so, subject to the following conditions:
10//
11// The above copyright notice and this permission notice shall be included in
12// all copies or substantial portions of the Software.
13//
14// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE.
21
22// $Id: SlitClient.cc,v 1.1 2003/06/20 01:25:26 fluxgen Exp $
23
24#include "SlitClient.hh"
25
26#include "I18n.hh"
27#include "Screen.hh"
28#include "App.hh"
29
30#include <X11/Xutil.h>
31#include <X11/Xatom.h>
32
33namespace {
34
35void getWMName(BScreen *screen, Window window, std::string& name) {
36 name = "";
37
38 if (screen == 0 || window == None)
39 return;
40
41 Display *display = FbTk::App::instance()->display();
42
43 XTextProperty text_prop;
44 char **list;
45 int num;
46 I18n *i18n = I18n::instance();
47
48 if (XGetWMName(display, window, &text_prop)) {
49 if (text_prop.value && text_prop.nitems > 0) {
50 if (text_prop.encoding != XA_STRING) {
51
52 text_prop.nitems = strlen((char *) text_prop.value);
53
54 if ((XmbTextPropertyToTextList(display, &text_prop,
55 &list, &num) == Success) &&
56 (num > 0) && *list) {
57 name = static_cast<char *>(*list);
58 XFreeStringList(list);
59 } else
60 name = (char *)text_prop.value;
61
62 } else
63 name = (char *)text_prop.value;
64 } else { // default name
65 name = i18n->getMessage(
66 FBNLS::WindowSet, FBNLS::WindowUnnamed,
67 "Unnamed");
68 }
69 } else {
70 // default name
71 name = i18n->getMessage(
72 FBNLS::WindowSet, FBNLS::WindowUnnamed,
73 "Unnamed");
74 }
75
76}
77
78}; // end anonymous namespace
79
80SlitClient::SlitClient(BScreen *screen, Window win) {
81 initialize(screen, win);
82}
83
84SlitClient::SlitClient(const char *name):m_match_name(name == 0 ? "" : name) {
85 initialize();
86}
87
88
89void SlitClient::initialize(BScreen *screen, Window win) {
90 // Now we pre-initialize a list of slit clients with names for
91 // comparison with incoming client windows. This allows the slit
92 // to maintain a sorted order based on a saved window name list.
93 // Incoming windows not found in the list are appended. Matching
94 // duplicates are inserted after the last found instance of the
95 // matching name.
96
97 m_client_window = win;
98 m_window = m_icon_window = None;
99 move(0, 0);
100 resize(0, 0);
101
102 if (matchName().empty())
103 getWMName(screen, clientWindow(), m_match_name);
104 m_visible = true;
105}
106
107void SlitClient::disableEvents() {
108 if (window() == 0)
109 return;
110 Display *disp = FbTk::App::instance()->display();
111 XSelectInput(disp, window(), NoEventMask);
112}
113
114void SlitClient::enableEvents() {
115 if (window() == 0)
116 return;
117 Display *disp = FbTk::App::instance()->display();
118 XSelectInput(disp, window(), StructureNotifyMask |
119 SubstructureNotifyMask | EnterWindowMask);
120}
121
122void SlitClient::hide() {
123 XUnmapWindow(FbTk::App::instance()->display(), window());
124}
125
126void SlitClient::show() {
127 XMapWindow(FbTk::App::instance()->display(), window());
128}
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 @@
1// SlitClient.hh for fluxbox
2// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
3//
4// Permission is hereby granted, free of charge, to any person obtaining a
5// copy of this software and associated documentation files (the "Software"),
6// to deal in the Software without restriction, including without limitation
7// the rights to use, copy, modify, merge, publish, distribute, sublicense,
8// and/or sell copies of the Software, and to permit persons to whom the
9// Software is furnished to do so, subject to the following conditions:
10//
11// The above copyright notice and this permission notice shall be included in
12// all copies or substantial portions of the Software.
13//
14// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE.
21
22// $Id: SlitClient.hh,v 1.1 2003/06/20 01:25:26 fluxgen Exp $
23
24#ifndef SLITCLIENT_HH
25#define SLITCLIENT_HH
26
27#include "NotCopyable.hh"
28
29#include <X11/Xlib.h>
30
31#include <string>
32
33class BScreen;
34
35/// holds slit client info
36class SlitClient: private FbTk::NotCopyable {
37public:
38 /// For adding an actual window
39 SlitClient(BScreen *screen, Window win);
40 /// For adding a placeholder
41 explicit SlitClient(const char *name);
42
43 inline const std::string &matchName() const { return m_match_name; }
44 inline Window window() const { return m_window; }
45 inline Window clientWindow() const { return m_client_window; }
46 inline Window iconWindow() const { return m_icon_window; }
47 inline int x() const { return m_x; }
48 inline int y() const { return m_y; }
49 inline unsigned int width() const { return m_width; }
50 inline unsigned int height() const { return m_height; }
51 bool visible() const { return m_visible; }
52
53
54 void setIconWindow(Window win) { m_icon_window = win; }
55 void setWindow(Window win) { m_window = win; }
56 void move(int x, int y) { m_x = x; m_y = y; }
57 void resize(unsigned int width, unsigned int height) { m_width = width; m_height = height; }
58 void hide();
59 void show();
60 void setVisible(bool value) { m_visible = value; }
61
62 void initialize(BScreen *screen = 0, Window win= None);
63 void disableEvents();
64 void enableEvents();
65
66private:
67 std::string m_match_name;
68 Window m_window, m_client_window, m_icon_window;
69 int m_x, m_y;
70 unsigned int m_width, m_height;
71 bool m_visible; ///< wheter the client should be visible or not
72};
73
74#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 @@
1// SlitTheme.hh for fluxbox
2// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
3//
4// Permission is hereby granted, free of charge, to any person obtaining a
5// copy of this software and associated documentation files (the "Software"),
6// to deal in the Software without restriction, including without limitation
7// the rights to use, copy, modify, merge, publish, distribute, sublicense,
8// and/or sell copies of the Software, and to permit persons to whom the
9// Software is furnished to do so, subject to the following conditions:
10//
11// The above copyright notice and this permission notice shall be included in
12// all copies or substantial portions of the Software.
13//
14// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE.
21
22// $Id: SlitTheme.hh,v 1.1 2003/06/20 01:25:26 fluxgen Exp $
23
24#ifndef SLITTHEME_HH
25#define SLITTHEME_HH
26
27#include "Theme.hh"
28#include "Slit.hh"
29
30class SlitTheme:public FbTk::Theme {
31public:
32 explicit SlitTheme(Slit &slit):FbTk::Theme(slit.screen().screenNumber()),
33 m_slit(slit),
34 m_texture(*this, "slit", "Slit") {
35 // default texture type
36 m_texture->setType(FbTk::Texture::SOLID);
37 }
38 void reconfigTheme() {
39 m_slit.reconfigure();
40 }
41 const FbTk::Texture &texture() const { return *m_texture; }
42private:
43 Slit &m_slit;
44 FbTk::ThemeItem<FbTk::Texture> m_texture;
45};
46
47#endif // SLITTHEME_HH