aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-07-20 09:35:01 (GMT)
committerfluxgen <fluxgen>2002-07-20 09:35:01 (GMT)
commiteae52404ec5c51032d96d5786fe96a928c7d588d (patch)
tree59ac8991564ae4d2e102e90567ad0949392cf7c7
parent5c4fe96fc1973a02d6180330da449205fac2ef9b (diff)
downloadfluxbox_pavel-eae52404ec5c51032d96d5786fe96a928c7d588d.zip
fluxbox_pavel-eae52404ec5c51032d96d5786fe96a928c7d588d.tar.bz2
minor update
-rw-r--r--src/Screen.cc20
-rw-r--r--src/Slit.cc10
2 files changed, 15 insertions, 15 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index fb03d5a..281bfdb 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
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: Screen.cc,v 1.55 2002/07/10 14:51:32 fluxgen Exp $ 25// $Id: Screen.cc,v 1.56 2002/07/20 09:32:34 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -268,7 +268,7 @@ resource(rm, screenname, altscreenname)
268 fluxbox->getSessionCursor()); 268 fluxbox->getSessionCursor());
269 269
270 image_control = 270 image_control =
271 new BImageControl(fluxbox, this, true, fluxbox->getColorsPerChannel(), 271 new BImageControl(fluxbox, this, true, fluxbox->colorsPerChannel(),
272 fluxbox->getCacheLife(), fluxbox->getCacheMax()); 272 fluxbox->getCacheLife(), fluxbox->getCacheMax());
273 image_control->installRootColormap(); 273 image_control->installRootColormap();
274 root_colormap_installed = true; 274 root_colormap_installed = true;
@@ -276,7 +276,7 @@ resource(rm, screenname, altscreenname)
276 fluxbox->load_rc(this); 276 fluxbox->load_rc(this);
277 277
278 image_control->setDither(*resource.image_dither); 278 image_control->setDither(*resource.image_dither);
279 theme = new Theme(getBaseDisplay()->getXDisplay(), getRootWindow(), getColormap(), getScreenNumber(), 279 theme = new Theme(getBaseDisplay()->getXDisplay(), getRootWindow(), colormap(), getScreenNumber(),
280 image_control, fluxbox->getStyleFilename(), getRootCommand().c_str()); 280 image_control, fluxbox->getStyleFilename(), getRootCommand().c_str());
281 281
282 #ifdef GNOME 282 #ifdef GNOME
@@ -320,8 +320,8 @@ resource(rm, screenname, altscreenname)
320 320
321 XSetWindowAttributes attrib; 321 XSetWindowAttributes attrib;
322 unsigned long mask = CWBorderPixel | CWColormap | CWSaveUnder; 322 unsigned long mask = CWBorderPixel | CWColormap | CWSaveUnder;
323 attrib.border_pixel = getBorderColor()->getPixel(); 323 attrib.border_pixel = getBorderColor()->pixel();
324 attrib.colormap = getColormap(); 324 attrib.colormap = colormap();
325 attrib.save_under = true; 325 attrib.save_under = true;
326 326
327 geom_window = 327 geom_window =
@@ -335,7 +335,7 @@ resource(rm, screenname, altscreenname)
335 (BImage::FLAT | BImage::SOLID)) { 335 (BImage::FLAT | BImage::SOLID)) {
336 geom_pixmap = None; 336 geom_pixmap = None;
337 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, 337 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
338 theme->getWindowStyle().t_focus.getColor()->getPixel()); 338 theme->getWindowStyle().t_focus.color().pixel());
339 } else { 339 } else {
340 geom_pixmap = image_control->renderImage(geom_w, geom_h, 340 geom_pixmap = image_control->renderImage(geom_w, geom_h,
341 &theme->getWindowStyle().t_focus); 341 &theme->getWindowStyle().t_focus);
@@ -347,7 +347,7 @@ resource(rm, screenname, altscreenname)
347 (BImage::FLAT | BImage::SOLID)) { 347 (BImage::FLAT | BImage::SOLID)) {
348 geom_pixmap = None; 348 geom_pixmap = None;
349 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, 349 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
350 theme->getWindowStyle().l_focus.getColor()->getPixel()); 350 theme->getWindowStyle().l_focus.color().pixel());
351 } else { 351 } else {
352 geom_pixmap = image_control->renderImage(geom_w, geom_h, 352 geom_pixmap = image_control->renderImage(geom_w, geom_h,
353 &theme->getWindowStyle().l_focus); 353 &theme->getWindowStyle().l_focus);
@@ -586,7 +586,7 @@ void BScreen::reconfigure(void) {
586 (BImage::FLAT | BImage::SOLID)) { 586 (BImage::FLAT | BImage::SOLID)) {
587 geom_pixmap = None; 587 geom_pixmap = None;
588 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, 588 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
589 theme->getWindowStyle().t_focus.getColor()->getPixel()); 589 theme->getWindowStyle().t_focus.color().pixel());
590 } else { 590 } else {
591 geom_pixmap = image_control->renderImage(geom_w, geom_h, 591 geom_pixmap = image_control->renderImage(geom_w, geom_h,
592 &theme->getWindowStyle().t_focus); 592 &theme->getWindowStyle().t_focus);
@@ -598,7 +598,7 @@ void BScreen::reconfigure(void) {
598 (BImage::FLAT | BImage::SOLID)) { 598 (BImage::FLAT | BImage::SOLID)) {
599 geom_pixmap = None; 599 geom_pixmap = None;
600 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window, 600 XSetWindowBackground(getBaseDisplay()->getXDisplay(), geom_window,
601 theme->getWindowStyle().l_focus.getColor()->getPixel()); 601 theme->getWindowStyle().l_focus.color().pixel());
602 } else { 602 } else {
603 geom_pixmap = image_control->renderImage(geom_w, geom_h, 603 geom_pixmap = image_control->renderImage(geom_w, geom_h,
604 &theme->getWindowStyle().l_focus); 604 &theme->getWindowStyle().l_focus);
@@ -611,7 +611,7 @@ void BScreen::reconfigure(void) {
611 XSetWindowBorderWidth(getBaseDisplay()->getXDisplay(), geom_window, 611 XSetWindowBorderWidth(getBaseDisplay()->getXDisplay(), geom_window,
612 theme->getBorderWidth()); 612 theme->getBorderWidth());
613 XSetWindowBorder(getBaseDisplay()->getXDisplay(), geom_window, 613 XSetWindowBorder(getBaseDisplay()->getXDisplay(), geom_window,
614 theme->getBorderColor().getPixel()); 614 theme->getBorderColor().pixel());
615 615
616 //reconfigure menus 616 //reconfigure menus
617 workspacemenu->reconfigure(); 617 workspacemenu->reconfigure();
diff --git a/src/Slit.cc b/src/Slit.cc
index a033bae..aee357f 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Slit.cc,v 1.16 2002/07/19 16:10:18 fluxgen Exp $ 22// $Id: Slit.cc,v 1.17 2002/07/20 09:35:01 fluxgen Exp $
23 23
24//use GNU extensions 24//use GNU extensions
25#ifndef _GNU_SOURCE 25#ifndef _GNU_SOURCE
@@ -112,8 +112,8 @@ Slit::Slit(BScreen *scr):screen(scr), timer(this), slitmenu(*this) {
112 CWColormap | CWOverrideRedirect | CWEventMask; 112 CWColormap | CWOverrideRedirect | CWEventMask;
113 attrib.background_pixmap = None; 113 attrib.background_pixmap = None;
114 attrib.background_pixel = attrib.border_pixel = 114 attrib.background_pixel = attrib.border_pixel =
115 screen->getBorderColor()->getPixel(); 115 screen->getBorderColor()->pixel();
116 attrib.colormap = screen->getColormap(); 116 attrib.colormap = screen->colormap();
117 attrib.override_redirect = True; 117 attrib.override_redirect = True;
118 attrib.event_mask = SubstructureRedirectMask | ButtonPressMask | 118 attrib.event_mask = SubstructureRedirectMask | ButtonPressMask |
119 EnterWindowMask | LeaveWindowMask; 119 EnterWindowMask | LeaveWindowMask;
@@ -398,7 +398,7 @@ void Slit::reconfigure(void) {
398 398
399 XSetWindowBorderWidth(display ,frame.window, screen->getBorderWidth()); 399 XSetWindowBorderWidth(display ,frame.window, screen->getBorderWidth());
400 XSetWindowBorder(display, frame.window, 400 XSetWindowBorder(display, frame.window,
401 screen->getBorderColor()->getPixel()); 401 screen->getBorderColor()->pixel());
402 402
403 //did we actually use slit slots 403 //did we actually use slit slots
404 if (num_windows == 0) 404 if (num_windows == 0)
@@ -412,7 +412,7 @@ void Slit::reconfigure(void) {
412 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 412 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
413 frame.pixmap = None; 413 frame.pixmap = None;
414 XSetWindowBackground(display, frame.window, 414 XSetWindowBackground(display, frame.window,
415 texture->getColor()->getPixel()); 415 texture->color().pixel());
416 } else { 416 } else {
417 frame.pixmap = image_ctrl->renderImage(frame.width, frame.height, 417 frame.pixmap = image_ctrl->renderImage(frame.width, frame.height,
418 texture); 418 texture);