aboutsummaryrefslogtreecommitdiff
path: root/src/Theme.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-10-13 22:37:14 (GMT)
committerfluxgen <fluxgen>2002-10-13 22:37:14 (GMT)
commit90efb8d2cf3f8d5e15f99c4c0044126d14a24049 (patch)
tree74e2258e18f3cf52e07309d772cc87433d5e6a54 /src/Theme.hh
parent25f7f0034524fea4fbd455b17fef8288ffd0aa54 (diff)
downloadfluxbox-90efb8d2cf3f8d5e15f99c4c0044126d14a24049.zip
fluxbox-90efb8d2cf3f8d5e15f99c4c0044126d14a24049.tar.bz2
updated to match new font system
Diffstat (limited to 'src/Theme.hh')
-rw-r--r--src/Theme.hh37
1 files changed, 9 insertions, 28 deletions
diff --git a/src/Theme.hh b/src/Theme.hh
index bf3ccd4..f48b8c0 100644
--- a/src/Theme.hh
+++ b/src/Theme.hh
@@ -1,6 +1,9 @@
1// Theme.hh for fluxbox 1// Theme.hh for fluxbox
2// Copyright (c) 2001-2002 Henrik Kinnunen (fluxgen@linuxmail.org) 2// Copyright (c) 2001-2002 Henrik Kinnunen (fluxgen@linuxmail.org)
3// 3//
4// A lot of the base code is taken from Screen.hh in Blackbox 0.61.1
5// Screen.cc - Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
6//
4// Permission is hereby granted, free of charge, to any person obtaining a 7// Permission is hereby granted, free of charge, to any person obtaining a
5// copy of this software and associated documentation files (the "Software"), 8// copy of this software and associated documentation files (the "Software"),
6// to deal in the Software without restriction, including without limitation 9// to deal in the Software without restriction, including without limitation
@@ -13,34 +16,13 @@
13// 16//
14// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 17// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 18// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 19// 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 20// 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 21// 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 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
21//
22// A lot of the base code is taken from Screen.hh in Blackbox 0.61.1
23// Screen.cc - Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
24//
25// Permission is hereby granted, free of charge, to any person obtaining a
26// copy of this software and associated documentation files (the "Software"),
27// to deal in the Software without restriction, including without limitation
28// the rights to use, copy, modify, merge, publish, distribute, sublicense,
29// and/or sell copies of the Software, and to permit persons to whom the
30// Software is furnished to do so, subject to the following conditions:
31//
32// The above copyright notice and this permission notice shall be included in
33// all copies or substantial portions of the Software.
34//
35// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
36// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
37// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
38// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
39// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
40// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
41// DEALINGS IN THE SOFTWARE.
42 24
43// $Id: Theme.hh,v 1.13 2002/08/04 15:55:13 fluxgen Exp $ 25// $Id: Theme.hh,v 1.14 2002/10/13 22:34:03 fluxgen Exp $
44 26
45#ifndef THEME_HH 27#ifndef THEME_HH
46#define THEME_HH 28#define THEME_HH
@@ -57,8 +39,7 @@
57 Main theme class, holds themes for 39 Main theme class, holds themes for
58 Window, toolbar, slit, menu and the rootCommand, for a specific screen. 40 Window, toolbar, slit, menu and the rootCommand, for a specific screen.
59*/ 41*/
60class Theme 42class Theme {
61{
62public: 43public:
63 44
64 Theme(Display *display, Window rootwindow, Colormap colormap, 45 Theme(Display *display, Window rootwindow, Colormap colormap,
@@ -67,8 +48,8 @@ public:
67 48
68 49
69 typedef struct MenuStyle { 50 typedef struct MenuStyle {
70 MenuStyle(Display *display):titlefont(display, "fixed"), 51 MenuStyle():titlefont("fixed"),
71 framefont(display, "fixed") { } 52 framefont("fixed") { }
72 FbTk::Color t_text, f_text, h_text, d_text; 53 FbTk::Color t_text, f_text, h_text, d_text;
73 FbTk::Texture title, frame, hilite; 54 FbTk::Texture title, frame, hilite;
74 GC t_text_gc, f_text_gc, h_text_gc, d_text_gc, hilite_gc; 55 GC t_text_gc, f_text_gc, h_text_gc, d_text_gc, hilite_gc;
@@ -142,7 +123,7 @@ private:
142 void freeWindowStyle(); 123 void freeWindowStyle();
143 void freeTabStyle(); 124 void freeTabStyle();
144 void freeToolbarStyle(); 125 void freeToolbarStyle();
145 126 void loadFontFromDatabase(FbTk::Font &dest, const char *name, const char *altname);
146 bool readDatabaseTexture(char *, char *, FbTk::Texture *, unsigned long); 127 bool readDatabaseTexture(char *, char *, FbTk::Texture *, unsigned long);
147 bool readDatabaseColor(char *, char *, FbTk::Color *, unsigned long); 128 bool readDatabaseColor(char *, char *, FbTk::Color *, unsigned long);
148 129