ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.401 by root, Sat Jul 21 20:05:37 2007 UTC vs.
Revision 1.414 by root, Mon Jul 23 17:54:14 2007 UTC

… …
593 593
594# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless. 595# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597 597
598sub draw { 598#sub draw {
599 my ($self) = @_; 599#CFPlus.xs
600
601 return unless $self->{h} && $self->{w};
602
603 # update screen rectangle
604 local $draw_x = $draw_x + $self->{x};
605 local $draw_y = $draw_y + $self->{y};
606
607 # skip widgets that are entirely outside the drawing area
608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
610
611 glPushMatrix;
612 glTranslate $self->{x}, $self->{y}, 0;
613
614 if ($self == $HOVER && $self->{can_hover}) {
615 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
616 glEnable GL_BLEND;
617 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
618 glBegin GL_QUADS;
619 glVertex 0 , 0;
620 glVertex $self->{w}, 0;
621 glVertex $self->{w}, $self->{h};
622 glVertex 0 , $self->{h};
623 glEnd;
624 glDisable GL_BLEND;
625 }
626
627 if ($ENV{CFPLUS_DEBUG} & 1) {
628 glPushMatrix;
629 glColor 1, 1, 0, 1;
630 glTranslate 0.375, 0.375;
631 glBegin GL_LINE_LOOP;
632 glVertex 0 , 0;
633 glVertex $self->{w} - 1, 0;
634 glVertex $self->{w} - 1, $self->{h} - 1;
635 glVertex 0 , $self->{h} - 1;
636 glEnd;
637 glPopMatrix;
638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
639 }
640
641 $self->_draw;
642 glPopMatrix;
643}
644 600
645sub _draw { 601sub _draw {
646 my ($self) = @_; 602 my ($self) = @_;
647 603
648 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
… …
769 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
770 ]; 726 ];
771 727
772 $self->realloc; 728 $self->realloc;
773 729
730 $self->emit (c_add => \@widgets);
731
774 map $_+0, @widgets 732 map $_+0, @widgets
775} 733}
776 734
777sub children { 735sub children {
778 @{ $_[0]{children} } 736 @{ $_[0]{children} }
779} 737}
780 738
781sub remove { 739sub remove {
782 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
783 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
784 delete $child->{parent}; 745 delete $child->{parent};
785 $child->hide; 746 $child->hide;
786
787 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
788 749
789 $self->realloc; 750 $self->realloc;
790} 751}
791 752
792sub clear { 753sub clear {
… …
820} 781}
821 782
822sub _draw { 783sub _draw {
823 my ($self) = @_; 784 my ($self) = @_;
824 785
825 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
826} 787}
827 788
828############################################################################# 789#############################################################################
829 790
830package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
… …
840} 801}
841 802
842sub add { 803sub add {
843 my ($self, $child) = @_; 804 my ($self, $child) = @_;
844 805
845 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
846 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
847} 808}
848 809
849sub remove { 810sub remove {
850 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
… …
992 $self->{view_x} = $x; 953 $self->{view_x} = $x;
993 $self->{view_y} = $y; 954 $self->{view_y} = $y;
994 955
995 $self->emit (changed => $x, $y); 956 $self->emit (changed => $x, $y);
996 $self->update; 957 $self->update;
958 }
959}
960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
997 } 976 }
998} 977}
999 978
1000# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
1001sub coord2local { 980sub coord2local {
… …
1114 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1115 1094
1116 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1117} 1096}
1118 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1119sub update_slider { 1102sub update_slider {
1120 my ($self) = @_; 1103 my ($self) = @_;
1121 1104
1122 my $child = ($self->{vp} or return)->child; 1105 my $child = ($self->{vp} or return)->child;
1123 1106
… …
1730 1713
1731use List::Util qw(min max); 1714use List::Util qw(min max);
1732 1715
1733our @ISA = CFPlus::UI::Container::; 1716our @ISA = CFPlus::UI::Container::;
1734 1717
1735sub add_fixed {
1736 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1737
1738 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1739 $self->SUPER::add ($child);
1740}
1741
1742sub _scale($$$) { 1718sub _scale($$$) {
1743 my ($mode, $val, $max) = @_; 1719 my ($rel, $val, $max) = @_;
1744 1720
1745 $mode eq "abs" ? $val 1721 $rel ? $val * $max : $val
1746 : $mode eq "rel" ? $val * $max
1747 : 0
1748} 1722}
1749 1723
1750sub size_request { 1724sub size_request {
1751 my ($self) = @_; 1725 my ($self) = @_;
1752 1726
1753 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1754 1728
1755 # determine overall size by querying abs widgets 1729 # determine overall size by querying abs widgets
1756 for my $child ($self->visible_children) { 1730 for my $child ($self->visible_children) {
1757 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1758 1734
1759 if ($pos eq "abs") {
1760 $w = _scale $size, $w, $child->{req_w};
1761 $h = _scale $size, $h, $child->{req_h};
1762
1763 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1764 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1765 } 1737 }
1766 } 1738 }
1767 1739
1768 my $W = $x2 - $x1; 1740 my $W = $x2 - $x1;
1769 my $H = $y2 - $y1; 1741 my $H = $y2 - $y1;
1770 1742
1771 # now layout remaining widgets 1743 # now layout remaining widgets
1772 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1773 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1774 1748
1775 if ($pos ne "abs") {
1776 $x = _scale $pos, $x, $W;
1777 $y = _scale $pos, $x, $H;
1778 $w = _scale $size, $w, $child->{req_w};
1779 $h = _scale $size, $h, $child->{req_h};
1780
1781 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1782 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1783 } 1751 }
1784 } 1752 }
1785 1753
1786 my $W = $x2 - $x1; 1754 my $W = $x2 - $x1;
1787 my $H = $y2 - $y1; 1755 my $H = $y2 - $y1;
… …
1791 1759
1792sub invoke_size_allocate { 1760sub invoke_size_allocate {
1793 my ($self, $W, $H) = @_; 1761 my ($self, $W, $H) = @_;
1794 1762
1795 for my $child ($self->visible_children) { 1763 for my $child ($self->visible_children) {
1796 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1797 1766
1798 $x = _scale $pos, $x, $W; 1767 $x += $child->{c_halign} * $child->{req_w};
1799 $y = _scale $pos, $x, $H; 1768 $y += $child->{c_valign} * $child->{req_h};
1800 $w = _scale $size, $w, $child->{req_w};
1801 $h = _scale $size, $h, $child->{req_h};
1802 1769
1803 $child->configure ($x, $y, $w, $h); 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1804 } 1771 }
1805 1772
1806 1 1773 1
1807} 1774}
1808 1775
… …
1812 1779
1813our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1814 1781
1815sub size_request { 1782sub size_request {
1816 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1817 1786
1818 $self->{vertical} 1787 $self->{vertical}
1819 ? ( 1788 ? (
1820 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1821 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1822 ) 1791 )
1823 : ( 1792 : (
1824 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1825 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1826 ) 1795 )
1827} 1796}
1828 1797
1829sub invoke_size_allocate { 1798sub invoke_size_allocate {
1830 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
2071 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2072 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2073 : ($self->{h} - $size->[1]) * 0.5); 2042 : ($self->{h} - $size->[1]) * 0.5);
2074 }; 2043 };
2075 2044
2076 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2045# unless ($self->{list}) {
2077 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2046# $self->{list} = CFPlus::OpenGL::glGenList;
2047# CFPlus::OpenGL::glNewList $self->{list};
2048# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2049# CFPlus::OpenGL::glEndList;
2050# }
2051#
2052# CFPlus::OpenGL::glCallList $self->{list};
2078 2053
2079 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2080} 2055}
2056
2057#sub destroy {
2058# my ($self) = @_;
2059#
2060# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2061#
2062# $self->SUPER::destroy;
2063#}
2081 2064
2082############################################################################# 2065#############################################################################
2083 2066
2084package CFPlus::UI::EntryBase; 2067package CFPlus::UI::EntryBase;
2085 2068
… …
2870 2853
2871 $self->SUPER::invoke_button_down ($ev, $x, $y); 2854 $self->SUPER::invoke_button_down ($ev, $x, $y);
2872 2855
2873 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2856 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2874 2857
2875 $self->invoke_mouse_motion ($ev, $x, $y) 2858 $self->invoke_mouse_motion ($ev, $x, $y);
2859
2860 1
2876} 2861}
2877 2862
2878sub invoke_mouse_motion { 2863sub invoke_mouse_motion {
2879 my ($self, $ev, $x, $y) = @_; 2864 my ($self, $ev, $x, $y) = @_;
2880 2865
… …
2900 2885
2901 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2886 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2902 2887
2903 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2888 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2904 2889
2905 ! ! $delta 2890 1
2906} 2891}
2907 2892
2908sub update { 2893sub update {
2909 my ($self) = @_; 2894 my ($self) = @_;
2910 2895
… …
3041} 3026}
3042 3027
3043sub size_request { 3028sub size_request {
3044 my ($self) = @_; 3029 my ($self) = @_;
3045 3030
3046 my ($empty, $slider) = @{ $self->{children} }; 3031 my ($empty, $slider) = $self->visible_children;
3047 3032
3048 local $self->{children} = [$empty, $slider]; 3033 local $self->{children} = [$empty, $slider];
3049 $self->SUPER::size_request 3034 $self->SUPER::size_request
3050} 3035}
3051 3036
… …
3483 3468
3484 if ($self->{anim} && $self->{animspeed}) { 3469 if ($self->{anim} && $self->{animspeed}) {
3485 CFPlus::weaken (my $widget = $self); 3470 CFPlus::weaken (my $widget = $self);
3486 3471
3487 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3472 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3488 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3473 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3489 $self->{timer} = Event->timer ( 3474 $self->{timer} = Event->timer (
3490 parked => 1, 3475 parked => 1,
3491 cb => sub { 3476 cb => sub {
3492 return unless $::CONN && $widget; 3477 return unless $::CONN && $widget;
3493 3478
… …
3530 3515
3531 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3532 if ($anim && @$anim) { 3517 if ($anim && @$anim) {
3533 delete $self->{wait_face}; 3518 delete $self->{wait_face};
3534 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3519 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3520 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3535 } 3521 }
3536 } 3522 }
3537} 3523}
3538 3524
3539sub size_request { 3525sub size_request {
3540 my ($self) = @_; 3526 my ($self) = @_;
3541 3527
3542 if ($::CONN) { 3528 if ($::CONN) {
3543 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3529 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3544 if (my $tex = $::CONN->{texture}[$faceid]) { 3530 if (my $tex = $::CONN->{texture}[$faceid]) {
3531 $self->{tex} = $tex;
3545 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3532 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3546 } else { 3533 } else {
3547 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3534 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3548 $self->realloc; 3535 $self->realloc;
3549 }); 3536 });
… …
3571} 3558}
3572 3559
3573sub _draw { 3560sub _draw {
3574 my ($self) = @_; 3561 my ($self) = @_;
3575 3562
3576 return unless $::CONN;
3577
3578 $self->SUPER::_draw; 3563 $self->SUPER::_draw;
3579 3564
3580 my $faceid = $::CONN->{faceid}[$self->{face}] 3565 if (my $tex = $self->{tex}) {
3581 or return;
3582
3583 my $tex = $::CONN->{texture}[$faceid];
3584
3585 if ($tex) {
3586 glEnable GL_TEXTURE_2D; 3566 glEnable GL_TEXTURE_2D;
3587 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3588 glColor 0, 0, 0, 1; 3568 glColor 0, 0, 0, 1;
3589 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3569 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3590 glDisable GL_TEXTURE_2D; 3570 glDisable GL_TEXTURE_2D;
… …
3792 ); 3772 );
3793 3773
3794 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3774 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3795 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3775 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3796 3776
3777 {
3778 Scalar::Util::weaken (my $wself = $self);
3779
3780 $self->{multiplexer}->connect (c_add => sub {
3781 my ($mplex, $widgets) = @_;
3782
3783 for my $child (@$widgets) {
3784 Scalar::Util::weaken $child;
3785 $child->{c_tab_} ||= do {
3786 my $tab =
3787 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3788 ? $child->{c_tab}
3789 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3790
3791 $tab->connect (activate => sub {
3792 $wself->set_current_page ($child);
3793 });
3794
3795 $tab
3796 };
3797
3798 $self->{buttonbar}->add ($child->{c_tab_});
3799 }
3800 });
3801
3802 $self->{multiplexer}->connect (c_remove => sub {
3803 my ($mplex, $widgets) = @_;
3804
3805 for my $child (@$widgets) {
3806 $wself->{buttonbar}->remove ($child->{c_tab_});
3807 }
3808 });
3809 }
3810
3797 $self 3811 $self
3798} 3812}
3799 3813
3800sub add { 3814sub add {
3815 my ($self, @widgets) = @_;
3816
3817 $self->{multiplexer}->add (@widgets)
3818}
3819
3820sub remove {
3821 my ($self, @widgets) = @_;
3822
3823 $self->{multiplexer}->remove (@widgets)
3824}
3825
3826sub add_tab {
3801 my ($self, $title, $widget, $tooltip) = @_; 3827 my ($self, $title, $widget, $tooltip) = @_;
3802 3828
3803 CFPlus::weaken $self; 3829 $title = [$title, $tooltip] unless ref $title;
3830 $widget->{c_tab} = $title;
3804 3831
3805 $self->{buttonbar}->add (new CFPlus::UI::Button
3806 markup => $title,
3807 tooltip => $tooltip,
3808 on_activate => sub { $self->set_current_page ($widget) },
3809 );
3810
3811 $self->{multiplexer}->add ($widget); 3832 $self->add ($widget);
3812} 3833}
3813 3834
3814sub get_current_page { 3835sub get_current_page {
3815 my ($self) = @_; 3836 my ($self) = @_;
3816 3837

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines