aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2001-12-29 10:40:51 (GMT)
committerfluxgen <fluxgen>2001-12-29 10:40:51 (GMT)
commitc4bedc7c2907a07b20f23bb26db7b2ca0b038d69 (patch)
tree08ae82d1656c1ef350741a5d74caec9f6aae45c0
parenta75bfa59d256fe4fa6e68665e00fe3ade08c04f7 (diff)
downloadfluxbox-c4bedc7c2907a07b20f23bb26db7b2ca0b038d69.zip
fluxbox-c4bedc7c2907a07b20f23bb26db7b2ca0b038d69.tar.bz2
Updated texture constant and changed the include guard
-rw-r--r--src/Screen.cc12
-rw-r--r--src/Screen.hh13
2 files changed, 9 insertions, 16 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index bcada25..160c379 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -244,9 +244,9 @@ BScreen::BScreen(Fluxbox *b, int scrn) : ScreenInfo(b, scrn) {
244 InputOutput, getVisual(), mask, &attrib); 244 InputOutput, getVisual(), mask, &attrib);
245 geom_visible = False; 245 geom_visible = False;
246 246
247 if (theme->getWindowStyle().l_focus.getTexture() & BImage_ParentRelative) { 247 if (theme->getWindowStyle().l_focus.getTexture() & BImage::PARENTRELATIVE) {
248 if (theme->getWindowStyle().t_focus.getTexture() == 248 if (theme->getWindowStyle().t_focus.getTexture() ==
249 (BImage_Flat | BImage_Solid)) { 249 (BImage::FLAT | BImage::SOLID)) {
250 geom_pixmap = None; 250 geom_pixmap = None;
251 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, 251 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
252 theme->getWindowStyle().t_focus.getColor()->getPixel()); 252 theme->getWindowStyle().t_focus.getColor()->getPixel());
@@ -258,7 +258,7 @@ BScreen::BScreen(Fluxbox *b, int scrn) : ScreenInfo(b, scrn) {
258 } 258 }
259 } else { 259 } else {
260 if (theme->getWindowStyle().l_focus.getTexture() == 260 if (theme->getWindowStyle().l_focus.getTexture() ==
261 (BImage_Flat | BImage_Solid)) { 261 (BImage::FLAT | BImage::SOLID)) {
262 geom_pixmap = None; 262 geom_pixmap = None;
263 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, 263 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
264 theme->getWindowStyle().l_focus.getColor()->getPixel()); 264 theme->getWindowStyle().l_focus.getColor()->getPixel());
@@ -458,9 +458,9 @@ void BScreen::reconfigure(void) {
458 geom_h += getBevelWidth()*2; 458 geom_h += getBevelWidth()*2;
459 459
460 Pixmap tmp = geom_pixmap; 460 Pixmap tmp = geom_pixmap;
461 if (theme->getWindowStyle().l_focus.getTexture() & BImage_ParentRelative) { 461 if (theme->getWindowStyle().l_focus.getTexture() & BImage::PARENTRELATIVE) {
462 if (theme->getWindowStyle().t_focus.getTexture() == 462 if (theme->getWindowStyle().t_focus.getTexture() ==
463 (BImage_Flat | BImage_Solid)) { 463 (BImage::FLAT | BImage::SOLID)) {
464 geom_pixmap = None; 464 geom_pixmap = None;
465 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, 465 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
466 theme->getWindowStyle().t_focus.getColor()->getPixel()); 466 theme->getWindowStyle().t_focus.getColor()->getPixel());
@@ -472,7 +472,7 @@ void BScreen::reconfigure(void) {
472 } 472 }
473 } else { 473 } else {
474 if (theme->getWindowStyle().l_focus.getTexture() == 474 if (theme->getWindowStyle().l_focus.getTexture() ==
475 (BImage_Flat | BImage_Solid)) { 475 (BImage::FLAT | BImage::SOLID)) {
476 geom_pixmap = None; 476 geom_pixmap = None;
477 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, 477 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
478 theme->getWindowStyle().l_focus.getColor()->getPixel()); 478 theme->getWindowStyle().l_focus.getColor()->getPixel());
diff --git a/src/Screen.hh b/src/Screen.hh
index 9c2b5af..91a824f 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -24,8 +24,8 @@
24 24
25 25
26 26
27#ifndef __Screen_hh 27#ifndef _SCREEN_HH_
28#define __Screen_hh 28#define _SCREEN_HH_
29 29
30#include <X11/Xlib.h> 30#include <X11/Xlib.h>
31#include <X11/Xresource.h> 31#include <X11/Xresource.h>
@@ -302,15 +302,10 @@ private:
302 LinkedList<Workspace> *workspacesList; 302 LinkedList<Workspace> *workspacesList;
303 303
304 struct resource { 304 struct resource {
305// WindowStyle wstyle;
306// ToolbarStyle tstyle;
307// MenuStyle mstyle;
308 305
309 Bool toolbar_on_top, toolbar_auto_hide, sloppy_focus, auto_raise, 306 Bool toolbar_on_top, toolbar_auto_hide, sloppy_focus, auto_raise,
310 auto_edge_balance, image_dither, ordered_dither, opaque_move, full_max, 307 auto_edge_balance, image_dither, ordered_dither, opaque_move, full_max,
311 focus_new, focus_last, tab_rotate_vertical, semi_sloppy_focus; 308 focus_new, focus_last, tab_rotate_vertical, semi_sloppy_focus;
312// BColor border_color;
313// XrmDatabase stylerc;
314 309
315 int workspaces, toolbar_placement, toolbar_width_percent, placement_policy, 310 int workspaces, toolbar_placement, toolbar_width_percent, placement_policy,
316 edge_snap_threshold, row_direction, col_direction; 311 edge_snap_threshold, row_direction, col_direction;
@@ -322,8 +317,6 @@ private:
322 int slit_placement, slit_direction; 317 int slit_placement, slit_direction;
323#endif // SLIT 318#endif // SLIT
324 319
325 // unsigned int handle_width, frame_width,
326 // border_width, border_width_2x;
327 320
328#ifdef HAVE_STRFTIME 321#ifdef HAVE_STRFTIME
329 char *strftime_format; 322 char *strftime_format;
@@ -352,4 +345,4 @@ protected:
352}; 345};
353 346
354 347
355#endif // __Screen_hh 348#endif // _SCREEN_HH_