aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-07-20 09:49:57 (GMT)
committerfluxgen <fluxgen>2002-07-20 09:49:57 (GMT)
commitcd7b6d1fd5b1ac1614b1431126f266d8651c890c (patch)
treeb7372891f86926a8bdef8c0ea76b8ea07ca23a0b
parenteae52404ec5c51032d96d5786fe96a928c7d588d (diff)
downloadfluxbox-cd7b6d1fd5b1ac1614b1431126f266d8651c890c.zip
fluxbox-cd7b6d1fd5b1ac1614b1431126f266d8651c890c.tar.bz2
minor update
-rw-r--r--src/Tab.cc16
-rw-r--r--src/Toolbar.cc20
2 files changed, 18 insertions, 18 deletions
diff --git a/src/Tab.cc b/src/Tab.cc
index a38542b..efa5652 100644
--- a/src/Tab.cc
+++ b/src/Tab.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: Tab.cc,v 1.27 2002/05/19 15:37:29 fluxgen Exp $ 22// $Id: Tab.cc,v 1.28 2002/07/20 09:49:21 fluxgen Exp $
23 23
24#include "Tab.hh" 24#include "Tab.hh"
25 25
@@ -97,8 +97,8 @@ void Tab::createTabWindow() {
97 XSetWindowAttributes attrib; 97 XSetWindowAttributes attrib;
98 attrib.background_pixmap = None; 98 attrib.background_pixmap = None;
99 attrib.background_pixel = attrib.border_pixel = 99 attrib.background_pixel = attrib.border_pixel =
100 m_win->getScreen()->getWindowStyle()->tab.border_color.getPixel(); 100 m_win->getScreen()->getWindowStyle()->tab.border_color.pixel();
101 attrib.colormap = m_win->getScreen()->getColormap(); 101 attrib.colormap = m_win->getScreen()->colormap();
102 attrib.override_redirect = True; 102 attrib.override_redirect = True;
103 attrib.event_mask = ButtonPressMask | ButtonReleaseMask | 103 attrib.event_mask = ButtonPressMask | ButtonReleaseMask |
104 ButtonMotionMask | ExposureMask | EnterWindowMask; 104 ButtonMotionMask | ExposureMask | EnterWindowMask;
@@ -195,7 +195,7 @@ void Tab::loadTheme() {
195 BTexture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_focus); 195 BTexture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_focus);
196 if (pt->getTexture() == (BImage::FLAT | BImage::SOLID)) { 196 if (pt->getTexture() == (BImage::FLAT | BImage::SOLID)) {
197 m_focus_pm = None; 197 m_focus_pm = None;
198 m_focus_pixel = pt->getColor()->getPixel(); 198 m_focus_pixel = pt->color().pixel();
199 } else 199 } else
200 m_focus_pm = 200 m_focus_pm =
201 image_ctrl->renderImage(m_size_w, m_size_h, pt); 201 image_ctrl->renderImage(m_size_w, m_size_h, pt);
@@ -205,7 +205,7 @@ void Tab::loadTheme() {
205 } else { 205 } else {
206 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 206 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
207 m_focus_pm = None; 207 m_focus_pm = None;
208 m_focus_pixel = texture->getColor()->getPixel(); 208 m_focus_pixel = texture->color().pixel();
209 } else 209 } else
210 m_focus_pm = 210 m_focus_pm =
211 image_ctrl->renderImage(m_size_w, m_size_h, texture); 211 image_ctrl->renderImage(m_size_w, m_size_h, texture);
@@ -219,14 +219,14 @@ void Tab::loadTheme() {
219 BTexture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_unfocus); 219 BTexture *pt = &(m_win->getScreen()->getWindowStyle()->tab.t_unfocus);
220 if (pt->getTexture() == (BImage::FLAT | BImage::SOLID)) { 220 if (pt->getTexture() == (BImage::FLAT | BImage::SOLID)) {
221 m_unfocus_pm = None; 221 m_unfocus_pm = None;
222 m_unfocus_pixel = pt->getColor()->getPixel(); 222 m_unfocus_pixel = pt->color().pixel();
223 } else 223 } else
224 m_unfocus_pm = 224 m_unfocus_pm =
225 image_ctrl->renderImage(m_size_w, m_size_h, pt); 225 image_ctrl->renderImage(m_size_w, m_size_h, pt);
226 } else { 226 } else {
227 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 227 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
228 m_unfocus_pm = None; 228 m_unfocus_pm = None;
229 m_unfocus_pixel = texture->getColor()->getPixel(); 229 m_unfocus_pixel = texture->color().pixel();
230 } else 230 } else
231 m_unfocus_pm = 231 m_unfocus_pm =
232 image_ctrl->renderImage(m_size_w, m_size_h, texture); 232 image_ctrl->renderImage(m_size_w, m_size_h, texture);
@@ -244,7 +244,7 @@ void Tab::decorate() {
244 XSetWindowBorderWidth(m_display, m_tabwin, 244 XSetWindowBorderWidth(m_display, m_tabwin,
245 m_win->getScreen()->getWindowStyle()->tab.border_width); 245 m_win->getScreen()->getWindowStyle()->tab.border_width);
246 XSetWindowBorder(m_display, m_tabwin, 246 XSetWindowBorder(m_display, m_tabwin,
247 m_win->getScreen()->getWindowStyle()->tab.border_color.getPixel()); 247 m_win->getScreen()->getWindowStyle()->tab.border_color.pixel());
248} 248}
249 249
250//-------------- deiconify ----------------- 250//-------------- deiconify -----------------
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 506fb4f..d0bf237 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.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: Toolbar.cc,v 1.23 2002/05/24 11:38:32 fluxgen Exp $ 25// $Id: Toolbar.cc,v 1.24 2002/07/20 09:49:57 fluxgen Exp $
26 26
27// stupid macros needed to access some functions in version 2 of the GNU C 27// stupid macros needed to access some functions in version 2 of the GNU C
28// library 28// library
@@ -107,8 +107,8 @@ iconbar(0)
107 107
108 attrib.background_pixmap = None; 108 attrib.background_pixmap = None;
109 attrib.background_pixel = attrib.border_pixel = 109 attrib.background_pixel = attrib.border_pixel =
110 screen->getBorderColor()->getPixel(); 110 screen->getBorderColor()->pixel();
111 attrib.colormap = screen->getColormap(); 111 attrib.colormap = screen->colormap();
112 attrib.override_redirect = True; 112 attrib.override_redirect = True;
113 attrib.event_mask = ButtonPressMask | ButtonReleaseMask | 113 attrib.event_mask = ButtonPressMask | ButtonReleaseMask |
114 EnterWindowMask | LeaveWindowMask; 114 EnterWindowMask | LeaveWindowMask;
@@ -434,7 +434,7 @@ void Toolbar::reconfigure(void) {
434 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 434 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
435 frame.base = None; 435 frame.base = None;
436 XSetWindowBackground(display, frame.window, 436 XSetWindowBackground(display, frame.window,
437 texture->getColor()->getPixel()); 437 texture->color().pixel());
438 } else { 438 } else {
439 frame.base = 439 frame.base =
440 image_ctrl->renderImage(frame.width, frame.height, texture); 440 image_ctrl->renderImage(frame.width, frame.height, texture);
@@ -447,7 +447,7 @@ void Toolbar::reconfigure(void) {
447 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 447 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
448 frame.label = None; 448 frame.label = None;
449 XSetWindowBackground(display, frame.window_label, 449 XSetWindowBackground(display, frame.window_label,
450 texture->getColor()->getPixel()); 450 texture->color().pixel());
451 } else { 451 } else {
452 frame.label = 452 frame.label =
453 image_ctrl->renderImage(frame.window_label_w, frame.label_h, texture); 453 image_ctrl->renderImage(frame.window_label_w, frame.label_h, texture);
@@ -460,7 +460,7 @@ void Toolbar::reconfigure(void) {
460 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 460 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
461 frame.wlabel = None; 461 frame.wlabel = None;
462 XSetWindowBackground(display, frame.workspace_label, 462 XSetWindowBackground(display, frame.workspace_label,
463 texture->getColor()->getPixel()); 463 texture->color().pixel());
464 } else { 464 } else {
465 frame.wlabel = 465 frame.wlabel =
466 image_ctrl->renderImage(frame.workspace_label_w, frame.label_h, texture); 466 image_ctrl->renderImage(frame.workspace_label_w, frame.label_h, texture);
@@ -473,7 +473,7 @@ void Toolbar::reconfigure(void) {
473 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 473 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
474 frame.clk = None; 474 frame.clk = None;
475 XSetWindowBackground(display, frame.clock, 475 XSetWindowBackground(display, frame.clock,
476 texture->getColor()->getPixel()); 476 texture->color().pixel());
477 } else { 477 } else {
478 frame.clk = 478 frame.clk =
479 image_ctrl->renderImage(frame.clock_w, frame.label_h, texture); 479 image_ctrl->renderImage(frame.clock_w, frame.label_h, texture);
@@ -486,7 +486,7 @@ void Toolbar::reconfigure(void) {
486 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 486 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
487 frame.button = None; 487 frame.button = None;
488 488
489 frame.button_pixel = texture->getColor()->getPixel(); 489 frame.button_pixel = texture->color().pixel();
490 XSetWindowBackground(display, frame.psbutton, frame.button_pixel); 490 XSetWindowBackground(display, frame.psbutton, frame.button_pixel);
491 XSetWindowBackground(display, frame.nsbutton, frame.button_pixel); 491 XSetWindowBackground(display, frame.nsbutton, frame.button_pixel);
492 XSetWindowBackground(display, frame.pwbutton, frame.button_pixel); 492 XSetWindowBackground(display, frame.pwbutton, frame.button_pixel);
@@ -506,14 +506,14 @@ void Toolbar::reconfigure(void) {
506 texture = &(screen->getToolbarStyle()->pressed); 506 texture = &(screen->getToolbarStyle()->pressed);
507 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 507 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
508 frame.pbutton = None; 508 frame.pbutton = None;
509 frame.pbutton_pixel = texture->getColor()->getPixel(); 509 frame.pbutton_pixel = texture->color().pixel();
510 } else 510 } else
511 frame.pbutton = 511 frame.pbutton =
512 image_ctrl->renderImage(frame.button_w, frame.button_w, texture); 512 image_ctrl->renderImage(frame.button_w, frame.button_w, texture);
513 if (tmp) image_ctrl->removeImage(tmp); 513 if (tmp) image_ctrl->removeImage(tmp);
514 514
515 XSetWindowBorder(display, frame.window, 515 XSetWindowBorder(display, frame.window,
516 screen->getBorderColor()->getPixel()); 516 screen->getBorderColor()->pixel());
517 XSetWindowBorderWidth(display, frame.window, screen->getBorderWidth()); 517 XSetWindowBorderWidth(display, frame.window, screen->getBorderWidth());
518 518
519 XClearWindow(display, frame.window); 519 XClearWindow(display, frame.window);