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.171 by root, Mon Apr 24 11:54:26 2006 UTC vs.
Revision 1.185 by root, Mon May 8 17:23:08 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) = @_;
… …
1847 1992
1848 $self->{value}->set_fontsize ($fsize); 1993 $self->{value}->set_fontsize ($fsize);
1849 $self->{max} ->set_fontsize ($fsize); 1994 $self->{max} ->set_fontsize ($fsize);
1850} 1995}
1851 1996
1997sub set_max {
1998 my ($self, $max) = @_;
1999
2000 $self->{gauge}->set_max ($max);
2001 $self->{max}->set_text ($max);
2002}
2003
1852sub set_value { 2004sub set_value {
1853 my ($self, $val, $max) = @_; 2005 my ($self, $val, $max) = @_;
1854 2006
1855 $self->set_max ($max) 2007 $self->set_max ($max)
1856 if defined $max; 2008 if defined $max;
1857 2009
1858 $self->{gauge}->set_value ($val, $max); 2010 $self->{gauge}->set_value ($val, $max);
1859 $self->{value}->set_text ($val); 2011 $self->{value}->set_text ($val);
1860}
1861
1862sub set_max {
1863 my ($self, $max) = @_;
1864
1865 $self->{gauge}->set_max ($max);
1866 $self->{max}->set_text ($max);
1867} 2012}
1868 2013
1869############################################################################# 2014#############################################################################
1870 2015
1871package CFClient::UI::Slider; 2016package CFClient::UI::Slider;
… …
1890 # TODO: calculations are off 2035 # TODO: calculations are off
1891 my $self = $class->SUPER::new ( 2036 my $self = $class->SUPER::new (
1892 fg => [1, 1, 1], 2037 fg => [1, 1, 1],
1893 active_fg => [0, 0, 0], 2038 active_fg => [0, 0, 0],
1894 range => [0, 0, 100, 10], 2039 range => [0, 0, 100, 10],
1895 req_w => 20, 2040 req_w => $::WIDTH / 80,
1896 req_h => 20, 2041 req_h => $::WIDTH / 80,
1897 vertical => 0, 2042 vertical => 0,
1898 can_hover => 1, 2043 can_hover => 1,
1899 inner_pad => 5, 2044 inner_pad => 5,
1900 @_ 2045 @_
1901 ); 2046 );
… …
2025 (new CFClient::UI::Empty expand => 1), 2170 (new CFClient::UI::Empty expand => 1),
2026 (new CFClient::UI::Slider vertical => 1), 2171 (new CFClient::UI::Slider vertical => 1),
2027 ], 2172 ],
2028 ); 2173 );
2029 2174
2030 $self->{children}[1]->connect (changed => sub { 2175 $self->{children}[1]->connect (changed => sub { $self->update });
2031 $self->update;
2032 });
2033 2176
2034 $self 2177 $self
2035} 2178}
2036 2179
2037sub set_fontsize { 2180sub set_fontsize {
… …
2045 my ($self, $text) = @_; 2188 my ($self, $text) = @_;
2046 2189
2047 my $layout = $self->{layout}; 2190 my $layout = $self->{layout};
2048 2191
2049 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2050 $layout->set_width ($self->{w}); 2193 $layout->set_width ($self->{children}[0]{w});
2051 $layout->set_text ($text); 2194 $layout->set_text ($text);
2052 2195
2053 ($layout->size)[1] 2196 ($layout->size)[1]
2054} 2197}
2055 2198
… …
2108 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2109 2252
2110 delete $self->{texture}; 2253 delete $self->{texture};
2111 } 2254 }
2112 2255
2113 $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 {
2114 glClearColor 0, 0, 0, 1; 2257 glClearColor 0, 0, 0, 0;
2115 glClear GL_COLOR_BUFFER_BIT; 2258 glClear GL_COLOR_BUFFER_BIT;
2116 2259
2117 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
2118 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2119 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
… …
2151} 2294}
2152 2295
2153sub _draw { 2296sub _draw {
2154 my ($self) = @_; 2297 my ($self) = @_;
2155 2298
2156 if ($self->{texture}) { 2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2157 glEnable GL_TEXTURE_2D; 2301 glEnable GL_TEXTURE_2D;
2158 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;
2159 $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});
2160 glDisable GL_TEXTURE_2D; 2305 glDisable GL_TEXTURE_2D;
2161 } 2306 glDisable GL_BLEND;
2162 2307
2163 $self->{children}[1]->draw; 2308 $self->{children}[1]->draw;
2164 2309
2165} 2310}
2166 2311
… …
2335 2480
2336sub size_request { 2481sub size_request {
2337 (32, 8) 2482 (32, 8)
2338} 2483}
2339 2484
2340sub draw { 2485sub _draw {
2341 my ($self) = @_; 2486 my ($self) = @_;
2342 2487
2488 return unless $::CONN;#d# manage and cache textures differently
2343 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2489 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2344 2490
2491 # TODO animation
2345 if ($tex) { 2492 if ($tex) {
2346 glEnable GL_BLEND; 2493 glEnable GL_BLEND;
2347 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2348 glEnable GL_TEXTURE_2D; 2495 glEnable GL_TEXTURE_2D;
2349 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2354 } 2501 }
2355} 2502}
2356 2503
2357############################################################################# 2504#############################################################################
2358 2505
2506package CFClient::UI::Menu;
2507
2508our @ISA = CFClient::UI::FancyFrame::;
2509
2510use CFClient::OpenGL;
2511
2512sub new {
2513 my $class = shift;
2514
2515 my $self = $class->SUPER::new (
2516 items => [],
2517 z => 100,
2518 @_,
2519 );
2520
2521 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2522
2523 for my $item (@{ $self->{items} }) {
2524 my ($widget, $cb) = @$item;
2525
2526 # handle various types of items, only text for now
2527 if (!ref $widget) {
2528 $widget = new CFClient::UI::Label
2529 can_hover => 1,
2530 can_events => 1,
2531 text => $widget;
2532 }
2533
2534 $self->{item}{$widget} = $item;
2535
2536 $self->{vbox}->add ($widget);
2537 }
2538
2539 $self
2540}
2541
2542# popup given the event (must be a mouse button down event currently)
2543sub popup {
2544 my ($self, $ev) = @_;
2545
2546 $self->emit ("popdown");
2547
2548 # maybe save $GRAB? must be careful about events...
2549 $GRAB = $self;
2550 $self->{button} = $ev->{button};
2551
2552 $self->show;
2553 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2554}
2555
2556sub mouse_motion {
2557 my ($self, $ev, $x, $y) = @_;
2558
2559 # TODO: should use vbox->find_widget or so
2560 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2561 $self->{hover} = $self->{item}{$HOVER};
2562}
2563
2564sub button_up {
2565 my ($self, $ev, $x, $y) = @_;
2566
2567 if ($ev->{button} == $self->{button}) {
2568 undef $GRAB;
2569 $self->hide;
2570
2571 $self->emit ("popdown");
2572 $self->{hover}[1]->() if $self->{hover};
2573 }
2574}
2575
2576#############################################################################
2577
2359package CFClient::UI::Root; 2578package CFClient::UI::Root;
2360 2579
2361our @ISA = CFClient::UI::Container::; 2580our @ISA = CFClient::UI::Container::;
2362 2581
2363use CFClient::OpenGL; 2582use CFClient::OpenGL;
… …
2435 $self->_draw; 2654 $self->_draw;
2436} 2655}
2437 2656
2438############################################################################# 2657#############################################################################
2439 2658
2659package CFClient::UI::InventoryItem;
2660
2661our @ISA = CFClient::UI::HBox::;
2662
2663sub new {
2664 my $class = shift;
2665
2666 my %args = @_;
2667
2668 my $item = $args{item};
2669
2670 my $desc = $item->{nrof} < 2
2671 ? $item->{name}
2672 : "$item->{nrof} $item->{name_pl}";
2673
2674
2675 my $self = $class->SUPER::new (
2676 can_hover => 1,
2677 can_events => 1,
2678 tooltip => (CFClient::UI::Label->escape ($desc)
2679 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2680 connect_button_down => sub {
2681 my ($self, $ev, $x, $y) = @_;
2682
2683 # todo: maybe put examine on 1? but should just be a tooltip :(
2684 if ($ev->{button} == 1) {
2685 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2686 } elsif ($ev->{button} == 2) {
2687 $::CONN->send ("apply $item->{tag}");
2688 } elsif ($ev->{button} == 3) {
2689 CFClient::UI::Menu->new (
2690 items => [
2691 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2692 [
2693 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2694 sub { $::CONN->send ("lock $item->{tag}") },
2695 ],
2696 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2697 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2698 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2699 ],
2700 )->popup ($ev);
2701 }
2702
2703 1
2704 },
2705 %args
2706 );
2707 $self->add(new CFClient::UI::Face
2708 can_events => 0,
2709 face => $item->{face},
2710 anim => $item->{anim},
2711 animspeed => $item->{animspeed});
2712 $self->add(new CFClient::UI::Label
2713 can_events => 0,
2714 text => $desc);
2715
2716 $self
2717}
2718
2719#############################################################################
2720
2721package CFClient::UI::Inventory;
2722
2723our @ISA = CFClient::UI::ScrolledWindow::;
2724
2725sub new {
2726 my $class = shift;
2727
2728 my $self = $class->SUPER::new (
2729 scrolled => (new CFClient::UI::VBox),
2730 @_,
2731 );
2732
2733 $self
2734}
2735
2736sub set_items {
2737 my ($self, $items) = @_;
2738
2739 $self->{scrolled}->clear;
2740 return unless $items;
2741
2742 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2743
2744 $self->{real_items} = \@items;
2745
2746 for my $item (@items) {
2747 my $desc = $item->{nrof} < 2
2748 ? $item->{name}
2749 : "$item->{nrof} $item->{name_pl}";
2750
2751 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2752 }
2753
2754# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2755}
2756
2757sub size_request {
2758 my ($self) = @_;
2759 ($self->{req_w}, $self->{req_h});
2760}
2761
2762#############################################################################
2763
2440package CFClient::UI; 2764package CFClient::UI;
2441 2765
2442$ROOT = new CFClient::UI::Root; 2766$ROOT = new CFClient::UI::Root;
2443$TOOLTIP = new CFClient::UI::Tooltip; 2767$TOOLTIP = new CFClient::UI::Tooltip;
2444 2768

Diff Legend

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