aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Theme.cc32
-rw-r--r--src/Theme.hh9
2 files changed, 21 insertions, 20 deletions
diff --git a/src/Theme.cc b/src/Theme.cc
index b924855..b41c859 100644
--- a/src/Theme.cc
+++ b/src/Theme.cc
@@ -21,15 +21,8 @@
21// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 21// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
22// DEALINGS IN THE SOFTWARE. 22// DEALINGS IN THE SOFTWARE.
23 23
24// $Id: Theme.cc,v 1.35 2002/11/25 14:07:21 fluxgen Exp $ 24// $Id: Theme.cc,v 1.36 2002/11/30 20:14:04 fluxgen Exp $
25 25
26#ifndef _GNU_SOURCE
27#define _GNU_SOURCE
28#endif // _GNU_SOURCE
29
30#ifdef HAVE_CONFIG_H
31# include "config.h"
32#endif //HAVE_CONFIG_H_
33 26
34#include "Theme.hh" 27#include "Theme.hh"
35 28
@@ -37,12 +30,23 @@
37#include "Basemenu.hh" 30#include "Basemenu.hh"
38#include "StringUtil.hh" 31#include "StringUtil.hh"
39 32
33#ifndef _GNU_SOURCE
34#define _GNU_SOURCE
35#endif // _GNU_SOURCE
36
37#ifdef HAVE_CONFIG_H
38#include "config.h"
39#endif //HAVE_CONFIG_H_
40
40#include <X11/Xresource.h> 41#include <X11/Xresource.h>
41 42
42#ifdef HAVE_CTYPE_H 43#ifdef HAVE_CTYPE_H
43# include <ctype.h> 44#include <ctype.h>
44#endif // HAVE_CTYPE_H 45#endif // HAVE_CTYPE_H
45 46
47// note: obsolete
48extern void bexec(const char *command, char *displaystring);
49
46#include <cstdio> 50#include <cstdio>
47#include <cstdarg> 51#include <cstdarg>
48#include <string> 52#include <string>
@@ -51,21 +55,15 @@ using namespace std;
51 55
52Theme::Theme(Display *display, Window rootwindow, Colormap colormap, 56Theme::Theme(Display *display, Window rootwindow, Colormap colormap,
53 int screennum, BImageControl *ic, const char *filename, const char *rootcommand): 57 int screennum, BImageControl *ic, const char *filename, const char *rootcommand):
54m_imagecontrol(ic),
55m_display(display), 58m_display(display),
56m_colormap(colormap), 59m_colormap(colormap),
57m_screennum(screennum), 60m_screennum(screennum),
58m_rootcommand(rootcommand==0 ? "" : rootcommand) //we dont want to send 0-pointer to std::string 61m_rootcommand(rootcommand==0 ? "" : rootcommand) //we dont want to send 0-pointer to std::string
59{ 62{
60#ifdef DEBUG
61 cerr<<__FILE__<<"("<<__LINE__<<"): Creating."<<endl;
62#endif //DEBUG
63 //default settings
64
65 load(filename); 63 load(filename);
64
66 //-------- create gc for the styles ------------ 65 //-------- create gc for the styles ------------
67 66
68
69 XGCValues gcv; 67 XGCValues gcv;
70 unsigned long gc_value_mask = GCForeground; 68 unsigned long gc_value_mask = GCForeground;
71 69
diff --git a/src/Theme.hh b/src/Theme.hh
index e7d4536..3cdf5ff 100644
--- a/src/Theme.hh
+++ b/src/Theme.hh
@@ -22,19 +22,23 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Theme.hh,v 1.18 2002/11/25 14:07:21 fluxgen Exp $ 25// $Id: Theme.hh,v 1.19 2002/11/30 20:14:04 fluxgen Exp $
26 26
27#ifndef THEME_HH 27#ifndef THEME_HH
28#define THEME_HH 28#define THEME_HH
29 29
30#include "Image.hh"
31#include "DrawUtil.hh" 30#include "DrawUtil.hh"
32#include "Font.hh" 31#include "Font.hh"
32#include "Color.hh"
33#include "Texture.hh"
33 34
34#include <X11/Xlib.h> 35#include <X11/Xlib.h>
35#include <X11/Xresource.h> 36#include <X11/Xresource.h>
36 37
37#include <string> 38#include <string>
39
40class BImageControl;
41
38/** 42/**
39 Main theme class, holds themes for 43 Main theme class, holds themes for
40 Window, toolbar, slit, menu and the rootCommand, for a specific screen. 44 Window, toolbar, slit, menu and the rootCommand, for a specific screen.
@@ -143,7 +147,6 @@ private:
143 unsigned int m_bevel_width, m_border_width, m_handle_width, m_frame_width; 147 unsigned int m_bevel_width, m_border_width, m_handle_width, m_frame_width;
144 FbTk::Color m_border_color; 148 FbTk::Color m_border_color;
145 GC m_opgc; 149 GC m_opgc;
146 BImageControl *m_imagecontrol;
147 Display *m_display; 150 Display *m_display;
148 XrmDatabase m_database; 151 XrmDatabase m_database;
149 Colormap m_colormap; 152 Colormap m_colormap;