summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/FbTk/Shape.cc13
-rw-r--r--src/FbTk/Shape.hh11
-rw-r--r--src/FbWinFrameTheme.cc2
-rw-r--r--src/Slit.cc4
-rw-r--r--src/SlitClient.hh2
-rw-r--r--src/WinClient.cc2
6 files changed, 16 insertions, 18 deletions
diff --git a/src/FbTk/Shape.cc b/src/FbTk/Shape.cc
index c8cfb46..251d4d4 100644
--- a/src/FbTk/Shape.cc
+++ b/src/FbTk/Shape.cc
@@ -43,6 +43,7 @@
43#endif // SHAPE 43#endif // SHAPE
44 44
45#include <algorithm> 45#include <algorithm>
46#include <vector>
46 47
47using std::min; 48using std::min;
48 49
@@ -92,9 +93,17 @@ Pixmap makePixmap(FbWindow &drawable, const unsigned char rows[]) {
92 return pm.release(); 93 return pm.release();
93} 94}
94 95
96struct CornerPixmaps {
97 FbPixmap topleft;
98 FbPixmap topright;
99 FbPixmap botleft;
100 FbPixmap botright;
95}; 101};
96 102
97std::vector<Shape::CornerPixmaps> Shape::s_corners; 103// unfortunately, we need a separate pixmap per screen
104std::vector<CornerPixmaps> s_corners;
105
106}; // end of anonymous namespace
98 107
99Shape::Shape(FbWindow &win, int shapeplaces): 108Shape::Shape(FbWindow &win, int shapeplaces):
100 m_win(&win), 109 m_win(&win),
@@ -134,7 +143,7 @@ Shape::~Shape() {
134void Shape::initCorners(int screen_num) { 143void Shape::initCorners(int screen_num) {
135 if (s_corners.size() == 0) 144 if (s_corners.size() == 0)
136 s_corners.resize(ScreenCount(App::instance()->display())); 145 s_corners.resize(ScreenCount(App::instance()->display()));
137 146
138 static const unsigned char left_bits[] = { 0xc0, 0xf8, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0xff }; 147 static const unsigned char left_bits[] = { 0xc0, 0xf8, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0xff };
139 static const unsigned char right_bits[] = { 0x03, 0x1f, 0x3f, 0x7f, 0x7f, 0x7f, 0xff, 0xff}; 148 static const unsigned char right_bits[] = { 0x03, 0x1f, 0x3f, 0x7f, 0x7f, 0x7f, 0xff, 0xff};
140 static const unsigned char bottom_left_bits[] = { 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xf8, 0xc0 }; 149 static const unsigned char bottom_left_bits[] = { 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xf8, 0xc0 };
diff --git a/src/FbTk/Shape.hh b/src/FbTk/Shape.hh
index 04382cf..3539959 100644
--- a/src/FbTk/Shape.hh
+++ b/src/FbTk/Shape.hh
@@ -24,8 +24,6 @@
24 24
25#include "FbPixmap.hh" 25#include "FbPixmap.hh"
26 26
27#include <vector>
28
29namespace FbTk { 27namespace FbTk {
30class FbWindow; 28class FbWindow;
31 29
@@ -67,17 +65,8 @@ private:
67 65
68 void initCorners(int screen_num); 66 void initCorners(int screen_num);
69 67
70 struct CornerPixmaps {
71 FbPixmap topleft;
72 FbPixmap topright;
73 FbPixmap botleft;
74 FbPixmap botright;
75 };
76 68
77 // unfortunately, we need a separate pixmap per screen
78 static std::vector<CornerPixmaps> s_corners;
79 int m_shapeplaces; ///< places to shape 69 int m_shapeplaces; ///< places to shape
80
81}; 70};
82 71
83}; // end namespace FbTk 72}; // end namespace FbTk
diff --git a/src/FbWinFrameTheme.cc b/src/FbWinFrameTheme.cc
index 5431532..82a8d13 100644
--- a/src/FbWinFrameTheme.cc
+++ b/src/FbWinFrameTheme.cc
@@ -20,7 +20,7 @@
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22#include "FbWinFrameTheme.hh" 22#include "FbWinFrameTheme.hh"
23#include "App.hh" 23#include "FbTk/App.hh"
24 24
25#include "IconbarTheme.hh" 25#include "IconbarTheme.hh"
26 26
diff --git a/src/Slit.cc b/src/Slit.cc
index e8b6ee0..ecd8280 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -40,11 +40,11 @@
40#include "FbTk/SimpleCommand.hh" 40#include "FbTk/SimpleCommand.hh"
41#include "FbTk/Theme.hh" 41#include "FbTk/Theme.hh"
42#include "FbTk/Transparent.hh" 42#include "FbTk/Transparent.hh"
43#include "MacroCommand.hh" 43#include "FbTk/MacroCommand.hh"
44#include "FbCommands.hh" 44#include "FbCommands.hh"
45#include "Layer.hh" 45#include "Layer.hh"
46#include "LayerMenu.hh" 46#include "LayerMenu.hh"
47#include "XLayer.hh" 47#include "FbTk/XLayer.hh"
48#include "RootTheme.hh" 48#include "RootTheme.hh"
49#include "FbMenu.hh" 49#include "FbMenu.hh"
50 50
diff --git a/src/SlitClient.hh b/src/SlitClient.hh
index 0362d3d..f1ecab3 100644
--- a/src/SlitClient.hh
+++ b/src/SlitClient.hh
@@ -22,7 +22,7 @@
22#ifndef SLITCLIENT_HH 22#ifndef SLITCLIENT_HH
23#define SLITCLIENT_HH 23#define SLITCLIENT_HH
24 24
25#include "NotCopyable.hh" 25#include "FbTk/NotCopyable.hh"
26 26
27#include <X11/Xlib.h> 27#include <X11/Xlib.h>
28#include <string> 28#include <string>
diff --git a/src/WinClient.cc b/src/WinClient.cc
index 68e5600..b6df606 100644
--- a/src/WinClient.cc
+++ b/src/WinClient.cc
@@ -29,7 +29,7 @@
29 29
30#include "Xutil.hh" 30#include "Xutil.hh"
31 31
32#include "EventManager.hh" 32#include "FbTk/EventManager.hh"
33#include "FbTk/MultLayers.hh" 33#include "FbTk/MultLayers.hh"
34 34
35#include <iostream> 35#include <iostream>