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

Updated texture constant and changed the include guard

Browse source
This commit is contained in:
fluxgen 2001-12-29 10:40:51 +00:00
parent a75bfa59d2
commit c4bedc7c29
2 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Screen.cc
View file

@ -244,9 +244,9 @@ BScreen::BScreen(Fluxbox *b, int scrn) : ScreenInfo(b, scrn) {
InputOutput, getVisual(), mask, &attrib); InputOutput, getVisual(), mask, &attrib);
geom_visible = False; geom_visible = False;
if (theme->getWindowStyle().l_focus.getTexture() & BImage_ParentRelative) { if (theme->getWindowStyle().l_focus.getTexture() & BImage::PARENTRELATIVE) {
if (theme->getWindowStyle().t_focus.getTexture() == if (theme->getWindowStyle().t_focus.getTexture() ==
(BImage_Flat | BImage_Solid)) { (BImage::FLAT | BImage::SOLID)) {
geom_pixmap = None; geom_pixmap = None;
XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
theme->getWindowStyle().t_focus.getColor()->getPixel()); theme->getWindowStyle().t_focus.getColor()->getPixel());
@ -258,7 +258,7 @@ BScreen::BScreen(Fluxbox *b, int scrn) : ScreenInfo(b, scrn) {
} }
} else { } else {
if (theme->getWindowStyle().l_focus.getTexture() == if (theme->getWindowStyle().l_focus.getTexture() ==
(BImage_Flat | BImage_Solid)) { (BImage::FLAT | BImage::SOLID)) {
geom_pixmap = None; geom_pixmap = None;
XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
theme->getWindowStyle().l_focus.getColor()->getPixel()); theme->getWindowStyle().l_focus.getColor()->getPixel());
@ -458,9 +458,9 @@ void BScreen::reconfigure(void) {
geom_h += getBevelWidth()*2; geom_h += getBevelWidth()*2;
Pixmap tmp = geom_pixmap; Pixmap tmp = geom_pixmap;
if (theme->getWindowStyle().l_focus.getTexture() & BImage_ParentRelative) { if (theme->getWindowStyle().l_focus.getTexture() & BImage::PARENTRELATIVE) {
if (theme->getWindowStyle().t_focus.getTexture() == if (theme->getWindowStyle().t_focus.getTexture() ==
(BImage_Flat | BImage_Solid)) { (BImage::FLAT | BImage::SOLID)) {
geom_pixmap = None; geom_pixmap = None;
XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
theme->getWindowStyle().t_focus.getColor()->getPixel()); theme->getWindowStyle().t_focus.getColor()->getPixel());
@ -472,7 +472,7 @@ void BScreen::reconfigure(void) {
} }
} else { } else {
if (theme->getWindowStyle().l_focus.getTexture() == if (theme->getWindowStyle().l_focus.getTexture() ==
(BImage_Flat | BImage_Solid)) { (BImage::FLAT | BImage::SOLID)) {
geom_pixmap = None; geom_pixmap = None;
XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
theme->getWindowStyle().l_focus.getColor()->getPixel()); theme->getWindowStyle().l_focus.getColor()->getPixel());

13
src/Screen.hh
View file

@ -24,8 +24,8 @@
#ifndef __Screen_hh #ifndef _SCREEN_HH_
#define __Screen_hh #define _SCREEN_HH_
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xresource.h> #include <X11/Xresource.h>
@ -302,15 +302,10 @@ private:
LinkedList<Workspace> *workspacesList; LinkedList<Workspace> *workspacesList;
struct resource { struct resource {
// WindowStyle wstyle;
// ToolbarStyle tstyle;
// MenuStyle mstyle;
Bool toolbar_on_top, toolbar_auto_hide, sloppy_focus, auto_raise, Bool toolbar_on_top, toolbar_auto_hide, sloppy_focus, auto_raise,
auto_edge_balance, image_dither, ordered_dither, opaque_move, full_max, auto_edge_balance, image_dither, ordered_dither, opaque_move, full_max,
focus_new, focus_last, tab_rotate_vertical, semi_sloppy_focus; focus_new, focus_last, tab_rotate_vertical, semi_sloppy_focus;
// BColor border_color;
// XrmDatabase stylerc;
int workspaces, toolbar_placement, toolbar_width_percent, placement_policy, int workspaces, toolbar_placement, toolbar_width_percent, placement_policy,
edge_snap_threshold, row_direction, col_direction; edge_snap_threshold, row_direction, col_direction;
@ -322,8 +317,6 @@ private:
int slit_placement, slit_direction; int slit_placement, slit_direction;
#endif // SLIT #endif // SLIT
// unsigned int handle_width, frame_width,
// border_width, border_width_2x;
#ifdef HAVE_STRFTIME #ifdef HAVE_STRFTIME
char *strftime_format; char *strftime_format;
@ -352,4 +345,4 @@ protected:
}; };
#endif // __Screen_hh #endif // _SCREEN_HH_