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.170 by root, Mon Apr 24 11:45:17 2006 UTC vs.
Revision 1.184 by root, Wed May 3 19:56:05 2006 UTC

… …
24 my $tip = $widget->{tooltip}; 24 my $tip = $widget->{tooltip};
25 25
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 27
28 $TOOLTIP->set_markup ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
31 } 39 }
32 40
33 return; 41 return;
34 } 42 }
35 } 43 }
… …
229 $self->{w} = $w; 237 $self->{w} = $w;
230 $self->{h} = $h; 238 $self->{h} = $h;
231 239
232 $self->size_allocate ($w, $h); 240 $self->size_allocate ($w, $h);
233 $self->update; 241 $self->update;
242 $self->emit (size_allocate => $w, $h);
234 } 243 }
235} 244}
236 245
237sub size_allocate { 246sub size_allocate {
238 # nothing to be done 247 # nothing to be done
248}
249
250sub children {
251}
252
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $_->check_size;
239} 261}
240 262
241sub set_max_size { 263sub set_max_size {
242 my ($self, $w, $h) = @_; 264 my ($self, $w, $h) = @_;
243 265
… …
518 sort { $a->{z} <=> $b->{z} } 540 sort { $a->{z} <=> $b->{z} }
519 @{$self->{children}}, $child 541 @{$self->{children}}, $child
520 ]; 542 ];
521 543
522 $child->check_size; 544 $child->check_size;
545 $self->update;
546}
547
548sub children {
549 @{ $_[0]{children} }
523} 550}
524 551
525sub remove { 552sub remove {
526 my ($self, $child) = @_; 553 my ($self, $child) = @_;
527 554
… …
542 569
543 for (@$children) { 570 for (@$children) {
544 delete $_->{parent}; 571 delete $_->{parent};
545 $_->hide; 572 $_->hide;
546 } 573 }
574
575 $self->check_size;
576 $self->update;
547} 577}
548 578
549sub find_widget { 579sub find_widget {
550 my ($self, $x, $y) = @_; 580 my ($self, $x, $y) = @_;
551 581
… …
626} 656}
627 657
628sub update { 658sub update {
629 my ($self) = @_; 659 my ($self) = @_;
630 660
631 # we want to do this delayed... 661 $ROOT->on_refresh ($self => sub { $self->render_child });
632 $self->render_chld;
633 $self->SUPER::update; 662 $self->SUPER::update;
634}
635
636sub render_chld {
637 my ($self) = @_;
638
639 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
640 glClearColor 0, 0, 0, 1;
641 glClear GL_COLOR_BUFFER_BIT;
642 $self->child->draw;
643 };
644} 663}
645 664
646sub size_allocate { 665sub size_allocate {
647 my ($self, $w, $h) = @_; 666 my ($self, $w, $h) = @_;
648 667
649 $self->child->configure (0, 0, $w, $h); 668 $self->SUPER::size_allocate ($w, $h);
669 $self->update;
670}
650 671
672sub _render {
673 $_[0]{children}[0]->draw;
674}
675
676sub render_child {
677 my ($self) = @_;
678
679 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
680 glClearColor 0, 0, 0, 0;
681 glClear GL_COLOR_BUFFER_BIT;
682
651 $self->render_chld; 683 $self->_render;
684# glColorMask 1, 1, 1, 0;
685# glEnable GL_BLEND;
686# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
687# glRasterPos 0, 0;
688# glCopyPixels 0, 0, $self->{w}, $self->{h};
689# glDisable GL_BLEND;
690# glColorMask 1, 1, 1, 1;
691 };
652} 692}
653 693
654sub _draw { 694sub _draw {
655 my ($self) = @_; 695 my ($self) = @_;
656 696
… …
658 698
659 my $tex = $self->{texture} 699 my $tex = $self->{texture}
660 or return; 700 or return;
661 701
662 glEnable GL_BLEND; 702 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D; 704 glEnable GL_TEXTURE_2D;
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1;
666 707
667 $tex->draw_quad (0, 0, $w, $h); 708 $tex->draw_quad (0, 0, $w, $h);
668 709
669 glDisable GL_BLEND; 710 glDisable GL_BLEND;
670 glDisable GL_TEXTURE_2D; 711 glDisable GL_TEXTURE_2D;
… …
674 715
675package CFClient::UI::ViewPort; 716package CFClient::UI::ViewPort;
676 717
677our @ISA = CFClient::UI::Window::; 718our @ISA = CFClient::UI::Window::;
678 719
679sub new { die }
680
681sub size_request { 720sub size_request {
682 my ($self) = @_; 721 my ($self) = @_;
683 722
684 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 723 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
685 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 724 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
686 725
687 @$self{qw(child_w child_h)} 726 @$self{qw(child_w child_h)}
688} 727}
689 728
690sub _draw { 729sub size_allocate {
691 my ($self) = @_; 730 my ($self, $w, $h) = @_;
692 731
693 $self->{children}[1]->draw; 732 $self->update;
694} 733}
695 734
735sub set_offset {
736 my ($self, $x, $y) = @_;
737
738 $self->{view_x} = int $x;
739 $self->{view_y} = int $y;
740
741 $self->update;
742}
743
744# hmm, this does not work for topleft of $self... but we should not aks for that
745sub _topleft {
746 my ($self, $x, $y) = @_;
747
748 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
749}
750
751sub find_widget {
752 my ($self, $x, $y) = @_;
753
754 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
755 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
756 ) {
757 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
758 } else {
759 $self->CFClient::UI::Base::find_widget ($x, $y)
760 }
761}
762
763sub _render {
764 my ($self) = @_;
765
766 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
767
768 $self->SUPER::_render;
769}
770
771#############################################################################
772
773package CFClient::UI::ScrolledWindow;
774
775our @ISA = CFClient::UI::HBox::;
776
777sub new {
778 my $class = shift;
779
780 my $self;
781
782 my $slider = new CFClient::UI::Slider
783 vertical => 1,
784 range => [0, 0, 1, 0.01], # HACK fix
785 connect_changed => sub {
786 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
787 },
788 ;
789
790 $self = $class->SUPER::new (
791 vp => (new CFClient::UI::ViewPort),
792 slider => $slider,
793 @_,
794 );
795
796 $self->{vp}->add ($self->{scrolled});
797 $self->add ($self->{vp});
798 $self->add ($self->{slider});
799
800 $self
801}
802
803#TODO# update range on size_allocate depeneing on child
804# update viewport offset on scroll
696 805
697############################################################################# 806#############################################################################
698 807
699package CFClient::UI::Frame; 808package CFClient::UI::Frame;
700 809
… …
757 # TODO: user_x, user_y, overwrite moveto? 866 # TODO: user_x, user_y, overwrite moveto?
758 867
759 my $self = $class->SUPER::new ( 868 my $self = $class->SUPER::new (
760 bg => [1, 1, 1, 1], 869 bg => [1, 1, 1, 1],
761 border_bg => [1, 1, 1, 1], 870 border_bg => [1, 1, 1, 1],
762 border => 0.8, 871 border => 0.6,
763 can_events => 1, 872 can_events => 1,
764 @_ 873 @_
765 ); 874 );
766 875
767 $self->{title} &&= new CFClient::UI::Label 876 $self->{title} &&= new CFClient::UI::Label
768 align => 0, 877 align => 0,
769 valign => 1, 878 valign => 1,
770 text => $self->{title}, 879 text => $self->{title},
771 fontsize => 1; 880 fontsize => $self->{border};
772 881
773 $self 882 $self
774} 883}
775 884
776sub border { 885sub border {
… …
801} 910}
802 911
803sub button_down { 912sub button_down {
804 my ($self, $ev, $x, $y) = @_; 913 my ($self, $ev, $x, $y) = @_;
805 914
915 my ($w, $h) = @$self{qw(w h)};
806 my $border = $self->border; 916 my $border = $self->border;
807 917
808 if ($x < $self->{w} && $x >= $self->{w} - $border 918 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
809 && $y < $self->{h} && $y >= $self->{h} - $border) { 919 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
810 920
921 if ($lr & $td) {
922 my ($wx, $wy) = ($self->{x}, $self->{y});
811 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 923 my ($ox, $oy) = ($ev->{x}, $ev->{y});
812 my ($bw, $bh) = ($self->{w}, $self->{h}); 924 my ($bw, $bh) = ($self->{w}, $self->{h});
813 925
926 my $mx = $x < $border;
927 my $my = $y < $border;
928
814 $self->{motion} = sub { 929 $self->{motion} = sub {
815 my ($ev, $x, $y) = @_; 930 my ($ev, $x, $y) = @_;
816 931
817 ($x, $y) = ($ev->{x}, $ev->{y}); 932 my $dx = $ev->{x} - $ox;
933 my $dy = $ev->{y} - $oy;
818 934
819 $self->{user_w} = $bw + $x - $ox; 935 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
820 $self->{user_h} = $bh + $y - $oy; 936 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
937 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
821 $self->check_size; 938 $self->check_size;
822 }; 939 };
823 940
824 } elsif ($x >= 0 && $x < $self->{w} 941 } elsif ($lr ^ $td) {
825 && $y >= 0 && $y < $border) {
826
827 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 942 my ($ox, $oy) = ($ev->{x}, $ev->{y});
828 my ($bx, $by) = ($self->{x}, $self->{y}); 943 my ($bx, $by) = ($self->{x}, $self->{y});
829 944
830 $self->{motion} = sub { 945 $self->{motion} = sub {
831 my ($ev, $x, $y) = @_; 946 my ($ev, $x, $y) = @_;
… …
867 $tex[1]->draw_quad (0, 0, $w, $border); 982 $tex[1]->draw_quad (0, 0, $w, $border);
868 $tex[3]->draw_quad (0, $border, $border, $ch); 983 $tex[3]->draw_quad (0, $border, $border, $ch);
869 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 984 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
870 $tex[4]->draw_quad (0, $h - $border, $w, $border); 985 $tex[4]->draw_quad (0, $h - $border, $w, $border);
871 986
987 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
872 my $bg = $tex[0]; 988 my $bg = $tex[0];
873 989
874 # TODO: repeat texture not scale 990 # TODO: repeat texture not scale
875 my $rep_x = $cw / $bg->{w}; 991 my $rep_x = $cw / $bg->{w};
876 my $rep_y = $ch / $bg->{h}; 992 my $rep_y = $ch / $bg->{h};
877 993
878 glColor @{ $self->{bg} }; 994 glColor @{ $self->{bg} };
879 995
880 $bg->{s} = $rep_x; 996 $bg->{s} = $rep_x;
881 $bg->{t} = $rep_y; 997 $bg->{t} = $rep_y;
882 $bg->{wrap_mode} = 1; 998 $bg->{wrap_mode} = 1;
883 $bg->draw_quad ($border, $border, $cw, $ch); 999 $bg->draw_quad ($border, $border, $cw, $ch);
884 1000
885 glDisable GL_TEXTURE_2D; 1001 glDisable GL_TEXTURE_2D;
886 glDisable GL_BLEND; 1002 glDisable GL_BLEND;
1003 }
887 1004
888 $self->{title}->draw if $self->{title}; 1005 $self->{title}->draw if $self->{title};
1006
889 $self->child->draw; 1007 $self->child->draw;
890} 1008}
891 1009
892############################################################################# 1010#############################################################################
893 1011
… …
915 $self->{children}[$y][$x] = $child; 1033 $self->{children}[$y][$x] = $child;
916 1034
917 $child->check_size; 1035 $child->check_size;
918} 1036}
919 1037
1038sub children {
1039 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040}
1041
920# TODO: move to container class maybe? send childs a signal on removal? 1042# TODO: move to container class maybe? send childs a signal on removal?
921sub clear { 1043sub clear {
922 my ($self) = @_; 1044 my ($self) = @_;
923 1045
924 my $children = delete $self->{children}; 1046 my @children = $self->children;
1047 delete $self->{children};
925 1048
926 for (grep $_, map @$_, grep $_, @$children) { 1049 for (@children) {
927 delete $_->{parent}; 1050 delete $_->{parent};
928 $_->hide; 1051 $_->hide;
929 } 1052 }
930 1053
931 $self->update; 1054 $self->update;
… …
1192 s/</&lt;/g; 1315 s/</&lt;/g;
1193 1316
1194 $_[1] 1317 $_[1]
1195} 1318}
1196 1319
1320sub update {
1321 my ($self) = @_;
1322
1323 delete $self->{texture};
1324 $self->SUPER::update;
1325}
1326
1327sub reconfigure {
1328 my ($self) = @_;
1329
1330 delete $self->{texture};
1331}
1332
1197sub set_text { 1333sub set_text {
1198 my ($self, $text) = @_; 1334 my ($self, $text) = @_;
1199 1335
1336 return if $self->{text} eq "T$text";
1337 $self->{text} = "T$text";
1338
1200 $self->{layout}->set_text ($text); 1339 $self->{layout}->set_text ($text);
1201 1340
1202 delete $self->{texture}; 1341 delete $self->{texture};
1342 $self->update;
1203 $self->check_size; 1343 $self->check_size;
1204 $self->update;
1205} 1344}
1206 1345
1207sub set_markup { 1346sub set_markup {
1208 my ($self, $markup) = @_; 1347 my ($self, $markup) = @_;
1209 1348
1349 return if $self->{text} eq "M$markup";
1350 $self->{text} = "M$markup";
1351
1210 $self->{layout}->set_markup ($markup); 1352 $self->{layout}->set_markup ($markup);
1211 1353
1212 delete $self->{texture}; 1354 delete $self->{texture};
1355 $self->update;
1213 $self->check_size; 1356 $self->check_size;
1214 $self->update;
1215} 1357}
1216 1358
1217sub size_request { 1359sub size_request {
1218 my ($self) = @_; 1360 my ($self) = @_;
1219 1361
… …
1743} 1885}
1744 1886
1745sub set_max { 1887sub set_max {
1746 my ($self, $max) = @_; 1888 my ($self, $max) = @_;
1747 1889
1890 return if $self->{max_val} == $max;
1891
1748 $self->{max_val} = $max; 1892 $self->{max_val} = $max;
1893 $self->update;
1749} 1894}
1750 1895
1751sub set_value { 1896sub set_value {
1752 my ($self, $val, $max) = @_; 1897 my ($self, $val, $max) = @_;
1753 1898
1754 $self->set_max ($max) 1899 $self->set_max ($max)
1755 if defined $max; 1900 if defined $max;
1756 1901
1757 $max = $self->{max_val}; 1902 return if $self->{val} == $val;
1903
1758 $self->{val} = $val; 1904 $self->{val} = $val;
1759
1760 $self->update; 1905 $self->update;
1761} 1906}
1762 1907
1763sub _draw { 1908sub _draw {
1764 my ($self) = @_; 1909 my ($self) = @_;
… …
1827 1972
1828sub new { 1973sub new {
1829 my ($class, %arg) = @_; 1974 my ($class, %arg) = @_;
1830 1975
1831 my $self = $class->SUPER::new ( 1976 my $self = $class->SUPER::new (
1832 tooltip => $arg{type}, 1977 tooltip => $arg{type},
1833 can_hover => 1, 1978 can_hover => 1,
1979 can_events => 1,
1834 %arg, 1980 %arg,
1835 ); 1981 );
1836 1982
1837 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1983 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1838 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1984 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1846 1992
1847 $self->{value}->set_fontsize ($fsize); 1993 $self->{value}->set_fontsize ($fsize);
1848 $self->{max} ->set_fontsize ($fsize); 1994 $self->{max} ->set_fontsize ($fsize);
1849} 1995}
1850 1996
1997sub set_max {
1998 my ($self, $max) = @_;
1999
2000 $self->{gauge}->set_max ($max);
2001 $self->{max}->set_text ($max);
2002}
2003
1851sub set_value { 2004sub set_value {
1852 my ($self, $val, $max) = @_; 2005 my ($self, $val, $max) = @_;
1853 2006
1854 $self->set_max ($max) 2007 $self->set_max ($max)
1855 if defined $max; 2008 if defined $max;
1856 2009
1857 $self->{gauge}->set_value ($val, $max); 2010 $self->{gauge}->set_value ($val, $max);
1858 $self->{value}->set_text ($val); 2011 $self->{value}->set_text ($val);
1859}
1860
1861sub set_max {
1862 my ($self, $max) = @_;
1863
1864 $self->{gauge}->set_max ($max);
1865 $self->{max}->set_text ($max);
1866} 2012}
1867 2013
1868############################################################################# 2014#############################################################################
1869 2015
1870package CFClient::UI::Slider; 2016package CFClient::UI::Slider;
… …
1889 # TODO: calculations are off 2035 # TODO: calculations are off
1890 my $self = $class->SUPER::new ( 2036 my $self = $class->SUPER::new (
1891 fg => [1, 1, 1], 2037 fg => [1, 1, 1],
1892 active_fg => [0, 0, 0], 2038 active_fg => [0, 0, 0],
1893 range => [0, 0, 100, 10], 2039 range => [0, 0, 100, 10],
1894 req_w => 20, 2040 req_w => $::WIDTH / 80,
1895 req_h => 20, 2041 req_h => $::WIDTH / 80,
1896 vertical => 0, 2042 vertical => 0,
1897 can_hover => 1, 2043 can_hover => 1,
1898 inner_pad => 5, 2044 inner_pad => 5,
1899 @_ 2045 @_
1900 ); 2046 );
… …
2024 (new CFClient::UI::Empty expand => 1), 2170 (new CFClient::UI::Empty expand => 1),
2025 (new CFClient::UI::Slider vertical => 1), 2171 (new CFClient::UI::Slider vertical => 1),
2026 ], 2172 ],
2027 ); 2173 );
2028 2174
2029 $self->{children}[1]->connect (changed => sub { 2175 $self->{children}[1]->connect (changed => sub { $self->update });
2030 $self->update;
2031 });
2032 2176
2033 $self 2177 $self
2034} 2178}
2035 2179
2036sub set_fontsize { 2180sub set_fontsize {
… …
2044 my ($self, $text) = @_; 2188 my ($self, $text) = @_;
2045 2189
2046 my $layout = $self->{layout}; 2190 my $layout = $self->{layout};
2047 2191
2048 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2049 $layout->set_width ($self->{w}); 2193 $layout->set_width ($self->{children}[0]{w});
2050 $layout->set_text ($text); 2194 $layout->set_text ($text);
2051 2195
2052 ($layout->size)[1] 2196 ($layout->size)[1]
2053} 2197}
2054 2198
… …
2107 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2108 2252
2109 delete $self->{texture}; 2253 delete $self->{texture};
2110 } 2254 }
2111 2255
2112 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2256 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2113 glClearColor 0, 0, 0, 1; 2257 glClearColor 0, 0, 0, 0;
2114 glClear GL_COLOR_BUFFER_BIT; 2258 glClear GL_COLOR_BUFFER_BIT;
2115 2259
2116 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
2117 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2118 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
… …
2150} 2294}
2151 2295
2152sub _draw { 2296sub _draw {
2153 my ($self) = @_; 2297 my ($self) = @_;
2154 2298
2155 if ($self->{texture}) { 2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2156 glEnable GL_TEXTURE_2D; 2301 glEnable GL_TEXTURE_2D;
2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303 glColor 1, 1, 1, 1;
2158 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2304 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2159 glDisable GL_TEXTURE_2D; 2305 glDisable GL_TEXTURE_2D;
2160 } 2306 glDisable GL_BLEND;
2161 2307
2162 $self->{children}[1]->draw; 2308 $self->{children}[1]->draw;
2163 2309
2164} 2310}
2165 2311
… …
2334 2480
2335sub size_request { 2481sub size_request {
2336 (32, 8) 2482 (32, 8)
2337} 2483}
2338 2484
2339sub draw { 2485sub _draw {
2340 my ($self) = @_; 2486 my ($self) = @_;
2341 2487
2342 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2488 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2343 2489
2490 # TODO animation
2344 if ($tex) { 2491 if ($tex) {
2345 glEnable GL_BLEND; 2492 glEnable GL_BLEND;
2346 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2493 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2347 glEnable GL_TEXTURE_2D; 2494 glEnable GL_TEXTURE_2D;
2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2495 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2353 } 2500 }
2354} 2501}
2355 2502
2356############################################################################# 2503#############################################################################
2357 2504
2505package CFClient::UI::Menu;
2506
2507our @ISA = CFClient::UI::FancyFrame::;
2508
2509use CFClient::OpenGL;
2510
2511sub new {
2512 my $class = shift;
2513
2514 my $self = $class->SUPER::new (
2515 items => [],
2516 z => 100,
2517 @_,
2518 );
2519
2520 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2521
2522 for my $item (@{ $self->{items} }) {
2523 my ($widget, $cb) = @$item;
2524
2525 # handle various types of items, only text for now
2526 if (!ref $widget) {
2527 $widget = new CFClient::UI::Label
2528 can_hover => 1,
2529 can_events => 1,
2530 text => $widget;
2531 }
2532
2533 $self->{item}{$widget} = $item;
2534
2535 $self->{vbox}->add ($widget);
2536 }
2537
2538 $self
2539}
2540
2541# popup given the event (must be a mouse button down event currently)
2542sub popup {
2543 my ($self, $ev) = @_;
2544
2545 $self->emit ("popdown");
2546
2547 # maybe save $GRAB? must be careful about events...
2548 $GRAB = $self;
2549 $self->{button} = $ev->{button};
2550
2551 $self->show;
2552 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2553}
2554
2555sub mouse_motion {
2556 my ($self, $ev, $x, $y) = @_;
2557
2558 # TODO: should use vbox->find_widget or so
2559 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2560 $self->{hover} = $self->{item}{$HOVER};
2561}
2562
2563sub button_up {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 if ($ev->{button} == $self->{button}) {
2567 undef $GRAB;
2568 $self->hide;
2569
2570 $self->emit ("popdown");
2571 $self->{hover}[1]->() if $self->{hover};
2572 }
2573}
2574
2575#############################################################################
2576
2358package CFClient::UI::Root; 2577package CFClient::UI::Root;
2359 2578
2360our @ISA = CFClient::UI::Container::; 2579our @ISA = CFClient::UI::Container::;
2361 2580
2362use CFClient::OpenGL; 2581use CFClient::OpenGL;
… …
2434 $self->_draw; 2653 $self->_draw;
2435} 2654}
2436 2655
2437############################################################################# 2656#############################################################################
2438 2657
2658package CFClient::UI::InventoryItem;
2659
2660our @ISA = CFClient::UI::HBox::;
2661
2662sub new {
2663 my $class = shift;
2664
2665 my %args = @_;
2666
2667 my $item = $args{item};
2668
2669 my $desc = $item->{nrof} < 2
2670 ? $item->{name}
2671 : "$item->{nrof} $item->{name_pl}";
2672
2673
2674 my $self = $class->SUPER::new (
2675 can_hover => 1,
2676 can_events => 1,
2677 tooltip => (CFClient::UI::Label->escape ($desc)
2678 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2679 connect_button_down => sub {
2680 my ($self, $ev, $x, $y) = @_;
2681
2682 # todo: maybe put examine on 1? but should just be a tooltip :(
2683 if ($ev->{button} == 1) {
2684 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2685 } elsif ($ev->{button} == 2) {
2686 $::CONN->send ("apply $item->{tag}");
2687 } elsif ($ev->{button} == 3) {
2688 CFClient::UI::Menu->new (
2689 items => [
2690 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2691 [
2692 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2693 sub { $::CONN->send ("lock $item->{tag}") },
2694 ],
2695 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2696 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2697 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2698 ],
2699 )->popup ($ev);
2700 }
2701
2702 1
2703 },
2704 %args
2705 );
2706 $self->add(new CFClient::UI::Face
2707 can_events => 0,
2708 face => $item->{face},
2709 anim => $item->{anim},
2710 animspeed => $item->{animspeed});
2711 $self->add(new CFClient::UI::Label
2712 can_events => 0,
2713 text => $desc);
2714
2715 $self
2716}
2717
2718#############################################################################
2719
2720package CFClient::UI::Inventory;
2721
2722our @ISA = CFClient::UI::ScrolledWindow::;
2723
2724sub new {
2725 my $class = shift;
2726
2727 my $self = $class->SUPER::new (
2728 scrolled => (new CFClient::UI::VBox),
2729 @_,
2730 );
2731
2732 $self
2733}
2734
2735sub set_items {
2736 my ($self, $items) = @_;
2737
2738 $self->{scrolled}->clear;
2739 return unless $items;
2740
2741 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2742
2743 $self->{real_items} = \@items;
2744
2745 for my $item (@items) {
2746 my $desc = $item->{nrof} < 2
2747 ? $item->{name}
2748 : "$item->{nrof} $item->{name_pl}";
2749
2750 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2751 }
2752
2753# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754}
2755
2756sub size_request {
2757 my ($self) = @_;
2758 ($self->{req_w}, $self->{req_h});
2759}
2760
2761#############################################################################
2762
2439package CFClient::UI; 2763package CFClient::UI;
2440 2764
2441$ROOT = new CFClient::UI::Root; 2765$ROOT = new CFClient::UI::Root;
2442$TOOLTIP = new CFClient::UI::Tooltip; 2766$TOOLTIP = new CFClient::UI::Tooltip;
2443 2767

Diff Legend

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