nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

not using imagecontrol

Browse source
This commit is contained in:
fluxgen 2002-11-30 20:14:04 +00:00
parent 5754cfd26e
commit 5a5f274ac7
2 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/Theme.cc
View file

@ -21,15 +21,8 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Theme.cc,v 1.35 2002/11/25 14:07:21 fluxgen Exp $ // $Id: Theme.cc,v 1.36 2002/11/30 20:14:04 fluxgen Exp $
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif // _GNU_SOURCE
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif //HAVE_CONFIG_H_
#include "Theme.hh" #include "Theme.hh"
@ -37,12 +30,23 @@
#include "Basemenu.hh" #include "Basemenu.hh"
#include "StringUtil.hh" #include "StringUtil.hh"
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif // _GNU_SOURCE
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif //HAVE_CONFIG_H_
#include <X11/Xresource.h> #include <X11/Xresource.h>
#ifdef HAVE_CTYPE_H #ifdef HAVE_CTYPE_H
# include <ctype.h> #include <ctype.h>
#endif // HAVE_CTYPE_H #endif // HAVE_CTYPE_H
// note: obsolete
extern void bexec(const char *command, char *displaystring);
#include <cstdio> #include <cstdio>
#include <cstdarg> #include <cstdarg>
#include <string> #include <string>
@ -51,20 +55,14 @@ using namespace std;
Theme::Theme(Display *display, Window rootwindow, Colormap colormap, Theme::Theme(Display *display, Window rootwindow, Colormap colormap,
int screennum, BImageControl *ic, const char *filename, const char *rootcommand): int screennum, BImageControl *ic, const char *filename, const char *rootcommand):
m_imagecontrol(ic),
m_display(display), m_display(display),
m_colormap(colormap), m_colormap(colormap),
m_screennum(screennum), m_screennum(screennum),
m_rootcommand(rootcommand==0 ? "" : rootcommand) //we dont want to send 0-pointer to std::string m_rootcommand(rootcommand==0 ? "" : rootcommand) //we dont want to send 0-pointer to std::string
{ {
#ifdef DEBUG
cerr<<__FILE__<<"("<<__LINE__<<"): Creating."<<endl;
#endif //DEBUG
//default settings
load(filename); load(filename);
//-------- create gc for the styles ------------
//-------- create gc for the styles ------------
XGCValues gcv; XGCValues gcv;
unsigned long gc_value_mask = GCForeground; unsigned long gc_value_mask = GCForeground;

9
src/Theme.hh
View file

@ -22,19 +22,23 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Theme.hh,v 1.18 2002/11/25 14:07:21 fluxgen Exp $ // $Id: Theme.hh,v 1.19 2002/11/30 20:14:04 fluxgen Exp $
#ifndef THEME_HH #ifndef THEME_HH
#define THEME_HH #define THEME_HH
#include "Image.hh"
#include "DrawUtil.hh" #include "DrawUtil.hh"
#include "Font.hh" #include "Font.hh"
#include "Color.hh"
#include "Texture.hh"
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xresource.h> #include <X11/Xresource.h>
#include <string> #include <string>
class BImageControl;
/** /**
Main theme class, holds themes for Main theme class, holds themes for
Window, toolbar, slit, menu and the rootCommand, for a specific screen. Window, toolbar, slit, menu and the rootCommand, for a specific screen.
@ -143,7 +147,6 @@ private:
unsigned int m_bevel_width, m_border_width, m_handle_width, m_frame_width; unsigned int m_bevel_width, m_border_width, m_handle_width, m_frame_width;
FbTk::Color m_border_color; FbTk::Color m_border_color;
GC m_opgc; GC m_opgc;
BImageControl *m_imagecontrol;
Display *m_display; Display *m_display;
XrmDatabase m_database; XrmDatabase m_database;
Colormap m_colormap; Colormap m_colormap;