diff options
author | fluxgen <fluxgen> | 2002-07-19 21:35:37 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-07-19 21:35:37 (GMT) |
commit | 45acae5e763314e63adcf5c78744a70199ab7be2 (patch) | |
tree | 3393f33ff5dcda12a06eac2cb7f4a969b3ed5567 /src | |
parent | 89faf228eab2332cae4dc41e3fc734de25f2db21 (diff) | |
download | fluxbox-45acae5e763314e63adcf5c78744a70199ab7be2.zip fluxbox-45acae5e763314e63adcf5c78744a70199ab7be2.tar.bz2 |
updated to match image new function names
Diffstat (limited to 'src')
-rw-r--r-- | src/Window.cc | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/Window.cc b/src/Window.cc index bb95ad2..0d840e3 100644 --- a/src/Window.cc +++ b/src/Window.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: Window.cc,v 1.61 2002/07/13 21:37:52 fluxgen Exp $ | 25 | // $Id: Window.cc,v 1.62 2002/07/19 21:35:37 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
@@ -483,7 +483,7 @@ Window FluxboxWindow::createToplevelWindow( | |||
483 | CWOverrideRedirect | CWEventMask; | 483 | CWOverrideRedirect | CWEventMask; |
484 | 484 | ||
485 | attrib_create.background_pixmap = None; | 485 | attrib_create.background_pixmap = None; |
486 | attrib_create.colormap = screen->getColormap(); | 486 | attrib_create.colormap = screen->colormap(); |
487 | attrib_create.override_redirect = True; | 487 | attrib_create.override_redirect = True; |
488 | attrib_create.event_mask = ButtonPressMask | ButtonReleaseMask | | 488 | attrib_create.event_mask = ButtonPressMask | ButtonReleaseMask | |
489 | ButtonMotionMask | EnterWindowMask; | 489 | ButtonMotionMask | EnterWindowMask; |
@@ -612,7 +612,7 @@ void FluxboxWindow::decorate() { | |||
612 | BTexture *texture = &(screen->getWindowStyle()->b_focus); | 612 | BTexture *texture = &(screen->getWindowStyle()->b_focus); |
613 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { | 613 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { |
614 | frame.fbutton = None; | 614 | frame.fbutton = None; |
615 | frame.fbutton_pixel = texture->getColor()->getPixel(); | 615 | frame.fbutton_pixel = texture->color().pixel(); |
616 | } else | 616 | } else |
617 | frame.fbutton = | 617 | frame.fbutton = |
618 | image_ctrl->renderImage(frame.button_w, frame.button_h, texture); | 618 | image_ctrl->renderImage(frame.button_w, frame.button_h, texture); |
@@ -622,7 +622,7 @@ void FluxboxWindow::decorate() { | |||
622 | texture = &(screen->getWindowStyle()->b_unfocus); | 622 | texture = &(screen->getWindowStyle()->b_unfocus); |
623 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { | 623 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { |
624 | frame.ubutton = None; | 624 | frame.ubutton = None; |
625 | frame.ubutton_pixel = texture->getColor()->getPixel(); | 625 | frame.ubutton_pixel = texture->color().pixel(); |
626 | } else | 626 | } else |
627 | frame.ubutton = | 627 | frame.ubutton = |
628 | image_ctrl->renderImage(frame.button_w, frame.button_h, texture); | 628 | image_ctrl->renderImage(frame.button_w, frame.button_h, texture); |
@@ -632,7 +632,7 @@ void FluxboxWindow::decorate() { | |||
632 | texture = &(screen->getWindowStyle()->b_pressed); | 632 | texture = &(screen->getWindowStyle()->b_pressed); |
633 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { | 633 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { |
634 | frame.pbutton = None; | 634 | frame.pbutton = None; |
635 | frame.pbutton_pixel = texture->getColor()->getPixel(); | 635 | frame.pbutton_pixel = texture->color().pixel(); |
636 | } else | 636 | } else |
637 | frame.pbutton = | 637 | frame.pbutton = |
638 | image_ctrl->renderImage(frame.button_w, frame.button_h, texture); | 638 | image_ctrl->renderImage(frame.button_w, frame.button_h, texture); |
@@ -643,7 +643,7 @@ void FluxboxWindow::decorate() { | |||
643 | texture = &(screen->getWindowStyle()->t_focus); | 643 | texture = &(screen->getWindowStyle()->t_focus); |
644 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { | 644 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { |
645 | frame.ftitle = None; | 645 | frame.ftitle = None; |
646 | frame.ftitle_pixel = texture->getColor()->getPixel(); | 646 | frame.ftitle_pixel = texture->color().pixel(); |
647 | } else | 647 | } else |
648 | frame.ftitle = | 648 | frame.ftitle = |
649 | image_ctrl->renderImage(frame.width, frame.title_h, texture); | 649 | image_ctrl->renderImage(frame.width, frame.title_h, texture); |
@@ -655,22 +655,22 @@ void FluxboxWindow::decorate() { | |||
655 | texture = &(screen->getWindowStyle()->t_unfocus); | 655 | texture = &(screen->getWindowStyle()->t_unfocus); |
656 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { | 656 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { |
657 | frame.utitle = None; | 657 | frame.utitle = None; |
658 | frame.utitle_pixel = texture->getColor()->getPixel(); | 658 | frame.utitle_pixel = texture->color().pixel(); |
659 | } else | 659 | } else |
660 | frame.utitle = | 660 | frame.utitle = |
661 | image_ctrl->renderImage(frame.width, frame.title_h, texture); | 661 | image_ctrl->renderImage(frame.width, frame.title_h, texture); |
662 | if (tmp) image_ctrl->removeImage(tmp); | 662 | if (tmp) image_ctrl->removeImage(tmp); |
663 | 663 | ||
664 | XSetWindowBorder(display, frame.title, | 664 | XSetWindowBorder(display, frame.title, |
665 | screen->getBorderColor()->getPixel()); | 665 | screen->getBorderColor()->pixel()); |
666 | 666 | ||
667 | decorateLabel(); | 667 | decorateLabel(); |
668 | 668 | ||
669 | } | 669 | } |
670 | 670 | ||
671 | if (decorations.border) { | 671 | if (decorations.border) { |
672 | frame.fborder_pixel = screen->getWindowStyle()->f_focus.getPixel(); | 672 | frame.fborder_pixel = screen->getWindowStyle()->f_focus.pixel(); |
673 | frame.uborder_pixel = screen->getWindowStyle()->f_unfocus.getPixel(); | 673 | frame.uborder_pixel = screen->getWindowStyle()->f_unfocus.pixel(); |
674 | } | 674 | } |
675 | 675 | ||
676 | if (decorations.handle) { | 676 | if (decorations.handle) { |
@@ -678,7 +678,7 @@ void FluxboxWindow::decorate() { | |||
678 | texture = &(screen->getWindowStyle()->h_focus); | 678 | texture = &(screen->getWindowStyle()->h_focus); |
679 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { | 679 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { |
680 | frame.fhandle = None; | 680 | frame.fhandle = None; |
681 | frame.fhandle_pixel = texture->getColor()->getPixel(); | 681 | frame.fhandle_pixel = texture->color().pixel(); |
682 | } else | 682 | } else |
683 | frame.fhandle = | 683 | frame.fhandle = |
684 | image_ctrl->renderImage(frame.width, frame.handle_h, texture); | 684 | image_ctrl->renderImage(frame.width, frame.handle_h, texture); |
@@ -688,7 +688,7 @@ void FluxboxWindow::decorate() { | |||
688 | texture = &(screen->getWindowStyle()->h_unfocus); | 688 | texture = &(screen->getWindowStyle()->h_unfocus); |
689 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { | 689 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { |
690 | frame.uhandle = None; | 690 | frame.uhandle = None; |
691 | frame.uhandle_pixel = texture->getColor()->getPixel(); | 691 | frame.uhandle_pixel = texture->color().pixel(); |
692 | } else | 692 | } else |
693 | frame.uhandle = | 693 | frame.uhandle = |
694 | image_ctrl->renderImage(frame.width, frame.handle_h, texture); | 694 | image_ctrl->renderImage(frame.width, frame.handle_h, texture); |
@@ -699,7 +699,7 @@ void FluxboxWindow::decorate() { | |||
699 | texture = &(screen->getWindowStyle()->g_focus); | 699 | texture = &(screen->getWindowStyle()->g_focus); |
700 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { | 700 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { |
701 | frame.fgrip = None; | 701 | frame.fgrip = None; |
702 | frame.fgrip_pixel = texture->getColor()->getPixel(); | 702 | frame.fgrip_pixel = texture->color().pixel(); |
703 | } else | 703 | } else |
704 | frame.fgrip = | 704 | frame.fgrip = |
705 | image_ctrl->renderImage(frame.grip_w, frame.grip_h, texture); | 705 | image_ctrl->renderImage(frame.grip_w, frame.grip_h, texture); |
@@ -710,22 +710,22 @@ void FluxboxWindow::decorate() { | |||
710 | texture = &(screen->getWindowStyle()->g_unfocus); | 710 | texture = &(screen->getWindowStyle()->g_unfocus); |
711 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { | 711 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { |
712 | frame.ugrip = None; | 712 | frame.ugrip = None; |
713 | frame.ugrip_pixel = texture->getColor()->getPixel(); | 713 | frame.ugrip_pixel = texture->color().pixel(); |
714 | } else | 714 | } else |
715 | frame.ugrip = | 715 | frame.ugrip = |
716 | image_ctrl->renderImage(frame.grip_w, frame.grip_h, texture); | 716 | image_ctrl->renderImage(frame.grip_w, frame.grip_h, texture); |
717 | if (tmp) image_ctrl->removeImage(tmp); | 717 | if (tmp) image_ctrl->removeImage(tmp); |
718 | 718 | ||
719 | XSetWindowBorder(display, frame.handle, | 719 | XSetWindowBorder(display, frame.handle, |
720 | screen->getBorderColor()->getPixel()); | 720 | screen->getBorderColor()->pixel()); |
721 | XSetWindowBorder(display, frame.left_grip, | 721 | XSetWindowBorder(display, frame.left_grip, |
722 | screen->getBorderColor()->getPixel()); | 722 | screen->getBorderColor()->pixel()); |
723 | XSetWindowBorder(display, frame.right_grip, | 723 | XSetWindowBorder(display, frame.right_grip, |
724 | screen->getBorderColor()->getPixel()); | 724 | screen->getBorderColor()->pixel()); |
725 | } | 725 | } |
726 | 726 | ||
727 | XSetWindowBorder(display, frame.window, | 727 | XSetWindowBorder(display, frame.window, |
728 | screen->getBorderColor()->getPixel()); | 728 | screen->getBorderColor()->pixel()); |
729 | } | 729 | } |
730 | 730 | ||
731 | 731 | ||
@@ -734,7 +734,7 @@ void FluxboxWindow::decorateLabel() { | |||
734 | BTexture *texture = &(screen->getWindowStyle()->l_focus); | 734 | BTexture *texture = &(screen->getWindowStyle()->l_focus); |
735 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { | 735 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { |
736 | frame.flabel = None; | 736 | frame.flabel = None; |
737 | frame.flabel_pixel = texture->getColor()->getPixel(); | 737 | frame.flabel_pixel = texture->color().pixel(); |
738 | } else | 738 | } else |
739 | frame.flabel = image_ctrl->renderImage(frame.label_w, frame.label_h, texture); | 739 | frame.flabel = image_ctrl->renderImage(frame.label_w, frame.label_h, texture); |
740 | 740 | ||
@@ -744,7 +744,7 @@ void FluxboxWindow::decorateLabel() { | |||
744 | texture = &(screen->getWindowStyle()->l_unfocus); | 744 | texture = &(screen->getWindowStyle()->l_unfocus); |
745 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { | 745 | if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { |
746 | frame.ulabel = None; | 746 | frame.ulabel = None; |
747 | frame.ulabel_pixel = texture->getColor()->getPixel(); | 747 | frame.ulabel_pixel = texture->color().pixel(); |
748 | } else | 748 | } else |
749 | frame.ulabel = image_ctrl->renderImage(frame.label_w, frame.label_h, texture); | 749 | frame.ulabel = image_ctrl->renderImage(frame.label_w, frame.label_h, texture); |
750 | 750 | ||