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.172 by root, Tue Apr 25 09:52:04 2006 UTC vs.
Revision 1.188 by root, Mon May 8 21:16:09 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
239} 248}
240 249
241sub children { 250sub children {
251}
252
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
242} 263}
243 264
244sub set_max_size { 265sub set_max_size {
245 my ($self, $w, $h) = @_; 266 my ($self, $w, $h) = @_;
246 267
… …
509 530
510 $self 531 $self
511} 532}
512 533
513sub add { 534sub add {
514 my ($self, $child) = @_; 535 my ($self, @widgets) = @_;
515 536
516 $child->set_parent ($self); 537 $_->set_parent ($self)
538 for @widgets;
517 539
518 use sort 'stable'; 540 use sort 'stable';
519 541
520 $self->{children} = [ 542 $self->{children} = [
521 sort { $a->{z} <=> $b->{z} } 543 sort { $a->{z} <=> $b->{z} }
522 @{$self->{children}}, $child 544 @{$self->{children}}, @widgets
523 ]; 545 ];
524 546
525 $child->check_size; 547 $_->check_size
548 for @widgets;
549
550 $self->update;
526} 551}
527 552
528sub children { 553sub children {
529 @{ $_[0]{children} } 554 @{ $_[0]{children} }
530} 555}
… …
549 574
550 for (@$children) { 575 for (@$children) {
551 delete $_->{parent}; 576 delete $_->{parent};
552 $_->hide; 577 $_->hide;
553 } 578 }
579
580 $self->check_size;
581 $self->update;
554} 582}
555 583
556sub find_widget { 584sub find_widget {
557 my ($self, $x, $y) = @_; 585 my ($self, $x, $y) = @_;
558 586
… …
633} 661}
634 662
635sub update { 663sub update {
636 my ($self) = @_; 664 my ($self) = @_;
637 665
638 # we want to do this delayed... 666 $ROOT->on_refresh ($self => sub { $self->render_child });
639 $self->render_chld;
640 $self->SUPER::update; 667 $self->SUPER::update;
641}
642
643sub render_chld {
644 my ($self) = @_;
645
646 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
647 glClearColor 0, 0, 0, 1;
648 glClear GL_COLOR_BUFFER_BIT;
649 $self->child->draw;
650 };
651} 668}
652 669
653sub size_allocate { 670sub size_allocate {
654 my ($self, $w, $h) = @_; 671 my ($self, $w, $h) = @_;
655 672
656 $self->child->configure (0, 0, $w, $h); 673 $self->SUPER::size_allocate ($w, $h);
674 $self->update;
675}
657 676
677sub _render {
678 $_[0]{children}[0]->draw;
679}
680
681sub render_child {
682 my ($self) = @_;
683
684 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
685 glClearColor 0, 0, 0, 0;
686 glClear GL_COLOR_BUFFER_BIT;
687
658 $self->render_chld; 688 $self->_render;
689# glColorMask 1, 1, 1, 0;
690# glEnable GL_BLEND;
691# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
692# glRasterPos 0, 0;
693# glCopyPixels 0, 0, $self->{w}, $self->{h};
694# glDisable GL_BLEND;
695# glColorMask 1, 1, 1, 1;
696 };
659} 697}
660 698
661sub _draw { 699sub _draw {
662 my ($self) = @_; 700 my ($self) = @_;
663 701
… …
665 703
666 my $tex = $self->{texture} 704 my $tex = $self->{texture}
667 or return; 705 or return;
668 706
669 glEnable GL_BLEND; 707 glEnable GL_BLEND;
670 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 708 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
671 glEnable GL_TEXTURE_2D; 709 glEnable GL_TEXTURE_2D;
672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 710 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
711 glColor 0, 0, 0, 1;
673 712
674 $tex->draw_quad (0, 0, $w, $h); 713 $tex->draw_quad (0, 0, $w, $h);
675 714
676 glDisable GL_BLEND; 715 glDisable GL_BLEND;
677 glDisable GL_TEXTURE_2D; 716 glDisable GL_TEXTURE_2D;
… …
681 720
682package CFClient::UI::ViewPort; 721package CFClient::UI::ViewPort;
683 722
684our @ISA = CFClient::UI::Window::; 723our @ISA = CFClient::UI::Window::;
685 724
686sub new { die }
687
688sub size_request { 725sub size_request {
689 my ($self) = @_; 726 my ($self) = @_;
690 727
691 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 728 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
692 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 729 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
693 730
694 @$self{qw(child_w child_h)} 731 @$self{qw(child_w child_h)}
695} 732}
696 733
697sub _draw { 734sub size_allocate {
698 my ($self) = @_; 735 my ($self, $w, $h) = @_;
699 736
700 $self->{children}[1]->draw; 737 $self->update;
701} 738}
702 739
740sub set_offset {
741 my ($self, $x, $y) = @_;
742
743 $self->{view_x} = int $x;
744 $self->{view_y} = int $y;
745
746 $self->update;
747}
748
749# hmm, this does not work for topleft of $self... but we should not aks for that
750sub _topleft {
751 my ($self, $x, $y) = @_;
752
753 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
754}
755
756sub find_widget {
757 my ($self, $x, $y) = @_;
758
759 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
760 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
761 ) {
762 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
763 } else {
764 $self->CFClient::UI::Base::find_widget ($x, $y)
765 }
766}
767
768sub _render {
769 my ($self) = @_;
770
771 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
772
773 $self->SUPER::_render;
774}
775
776#############################################################################
777
778package CFClient::UI::ScrolledWindow;
779
780our @ISA = CFClient::UI::HBox::;
781
782sub new {
783 my $class = shift;
784
785 my $self;
786
787 my $slider = new CFClient::UI::Slider
788 vertical => 1,
789 range => [0, 0, 1, 0.01], # HACK fix
790 connect_changed => sub {
791 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
792 },
793 ;
794
795 $self = $class->SUPER::new (
796 vp => (new CFClient::UI::ViewPort),
797 slider => $slider,
798 @_,
799 );
800
801 $self->{vp}->add ($self->{scrolled});
802 $self->add ($self->{vp});
803 $self->add ($self->{slider});
804
805 $self
806}
807
808#TODO# update range on size_allocate depeneing on child
809# update viewport offset on scroll
703 810
704############################################################################# 811#############################################################################
705 812
706package CFClient::UI::Frame; 813package CFClient::UI::Frame;
707 814
… …
764 # TODO: user_x, user_y, overwrite moveto? 871 # TODO: user_x, user_y, overwrite moveto?
765 872
766 my $self = $class->SUPER::new ( 873 my $self = $class->SUPER::new (
767 bg => [1, 1, 1, 1], 874 bg => [1, 1, 1, 1],
768 border_bg => [1, 1, 1, 1], 875 border_bg => [1, 1, 1, 1],
769 border => 0.8, 876 border => 0.6,
770 can_events => 1, 877 can_events => 1,
771 @_ 878 @_
772 ); 879 );
773 880
774 $self->{title} &&= new CFClient::UI::Label 881 $self->{title} &&= new CFClient::UI::Label
775 align => 0, 882 align => 0,
776 valign => 1, 883 valign => 1,
777 text => $self->{title}, 884 text => $self->{title},
778 fontsize => 1; 885 fontsize => $self->{border};
779 886
780 $self 887 $self
781} 888}
782 889
783sub border { 890sub border {
… …
808} 915}
809 916
810sub button_down { 917sub button_down {
811 my ($self, $ev, $x, $y) = @_; 918 my ($self, $ev, $x, $y) = @_;
812 919
920 my ($w, $h) = @$self{qw(w h)};
813 my $border = $self->border; 921 my $border = $self->border;
814 922
815 if ($x < $self->{w} && $x >= $self->{w} - $border 923 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
816 && $y < $self->{h} && $y >= $self->{h} - $border) { 924 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
817 925
926 if ($lr & $td) {
927 my ($wx, $wy) = ($self->{x}, $self->{y});
818 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 928 my ($ox, $oy) = ($ev->{x}, $ev->{y});
819 my ($bw, $bh) = ($self->{w}, $self->{h}); 929 my ($bw, $bh) = ($self->{w}, $self->{h});
820 930
931 my $mx = $x < $border;
932 my $my = $y < $border;
933
821 $self->{motion} = sub { 934 $self->{motion} = sub {
822 my ($ev, $x, $y) = @_; 935 my ($ev, $x, $y) = @_;
823 936
824 ($x, $y) = ($ev->{x}, $ev->{y}); 937 my $dx = $ev->{x} - $ox;
938 my $dy = $ev->{y} - $oy;
825 939
826 $self->{user_w} = $bw + $x - $ox; 940 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
827 $self->{user_h} = $bh + $y - $oy; 941 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
942 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
828 $self->check_size; 943 $self->check_size;
829 }; 944 };
830 945
831 } elsif ($x >= 0 && $x < $self->{w} 946 } elsif ($lr ^ $td) {
832 && $y >= 0 && $y < $border) {
833
834 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 947 my ($ox, $oy) = ($ev->{x}, $ev->{y});
835 my ($bx, $by) = ($self->{x}, $self->{y}); 948 my ($bx, $by) = ($self->{x}, $self->{y});
836 949
837 $self->{motion} = sub { 950 $self->{motion} = sub {
838 my ($ev, $x, $y) = @_; 951 my ($ev, $x, $y) = @_;
… …
874 $tex[1]->draw_quad (0, 0, $w, $border); 987 $tex[1]->draw_quad (0, 0, $w, $border);
875 $tex[3]->draw_quad (0, $border, $border, $ch); 988 $tex[3]->draw_quad (0, $border, $border, $ch);
876 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 989 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
877 $tex[4]->draw_quad (0, $h - $border, $w, $border); 990 $tex[4]->draw_quad (0, $h - $border, $w, $border);
878 991
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
879 my $bg = $tex[0]; 993 my $bg = $tex[0];
880 994
881 # TODO: repeat texture not scale 995 # TODO: repeat texture not scale
882 my $rep_x = $cw / $bg->{w}; 996 my $rep_x = $cw / $bg->{w};
883 my $rep_y = $ch / $bg->{h}; 997 my $rep_y = $ch / $bg->{h};
884 998
885 glColor @{ $self->{bg} }; 999 glColor @{ $self->{bg} };
886 1000
887 $bg->{s} = $rep_x; 1001 $bg->{s} = $rep_x;
888 $bg->{t} = $rep_y; 1002 $bg->{t} = $rep_y;
889 $bg->{wrap_mode} = 1; 1003 $bg->{wrap_mode} = 1;
890 $bg->draw_quad ($border, $border, $cw, $ch); 1004 $bg->draw_quad ($border, $border, $cw, $ch);
891 1005
892 glDisable GL_TEXTURE_2D; 1006 glDisable GL_TEXTURE_2D;
893 glDisable GL_BLEND; 1007 glDisable GL_BLEND;
1008 }
894 1009
895 $self->{title}->draw if $self->{title}; 1010 $self->{title}->draw if $self->{title};
1011
896 $self->child->draw; 1012 $self->child->draw;
897} 1013}
898 1014
899############################################################################# 1015#############################################################################
900 1016
… …
1204 s/</&lt;/g; 1320 s/</&lt;/g;
1205 1321
1206 $_[1] 1322 $_[1]
1207} 1323}
1208 1324
1325sub update {
1326 my ($self) = @_;
1327
1328 delete $self->{texture};
1329 $self->SUPER::update;
1330}
1331
1209sub set_text { 1332sub set_text {
1210 my ($self, $text) = @_; 1333 my ($self, $text) = @_;
1211 1334
1335 return if $self->{text} eq "T$text";
1336 $self->{text} = "T$text";
1337
1212 $self->{layout}->set_text ($text); 1338 $self->{layout}->set_text ($text);
1213 1339
1214 delete $self->{texture}; 1340 delete $self->{texture};
1341 $self->update;
1215 $self->check_size; 1342 $self->check_size;
1216 $self->update;
1217} 1343}
1218 1344
1219sub set_markup { 1345sub set_markup {
1220 my ($self, $markup) = @_; 1346 my ($self, $markup) = @_;
1221 1347
1348 return if $self->{text} eq "M$markup";
1349 $self->{text} = "M$markup";
1350
1222 $self->{layout}->set_markup ($markup); 1351 $self->{layout}->set_markup ($markup);
1223 1352
1224 delete $self->{texture}; 1353 delete $self->{texture};
1354 $self->update;
1225 $self->check_size; 1355 $self->check_size;
1226 $self->update;
1227} 1356}
1228 1357
1229sub size_request { 1358sub size_request {
1230 my ($self) = @_; 1359 my ($self) = @_;
1231 1360
… …
1260sub set_fontsize { 1389sub set_fontsize {
1261 my ($self, $fontsize) = @_; 1390 my ($self, $fontsize) = @_;
1262 1391
1263 $self->{fontsize} = $fontsize; 1392 $self->{fontsize} = $fontsize;
1264 delete $self->{texture}; 1393 delete $self->{texture};
1394
1395 $self->update;
1265 $self->check_size; 1396 $self->check_size;
1266 $self->update;
1267} 1397}
1268 1398
1269sub _draw { 1399sub _draw {
1270 my ($self) = @_; 1400 my ($self) = @_;
1271 1401
… …
1755} 1885}
1756 1886
1757sub set_max { 1887sub set_max {
1758 my ($self, $max) = @_; 1888 my ($self, $max) = @_;
1759 1889
1890 return if $self->{max_val} == $max;
1891
1760 $self->{max_val} = $max; 1892 $self->{max_val} = $max;
1893 $self->update;
1761} 1894}
1762 1895
1763sub set_value { 1896sub set_value {
1764 my ($self, $val, $max) = @_; 1897 my ($self, $val, $max) = @_;
1765 1898
1766 $self->set_max ($max) 1899 $self->set_max ($max)
1767 if defined $max; 1900 if defined $max;
1768 1901
1769 $max = $self->{max_val}; 1902 return if $self->{val} == $val;
1903
1770 $self->{val} = $val; 1904 $self->{val} = $val;
1771
1772 $self->update; 1905 $self->update;
1773} 1906}
1774 1907
1775sub _draw { 1908sub _draw {
1776 my ($self) = @_; 1909 my ($self) = @_;
… …
1859 1992
1860 $self->{value}->set_fontsize ($fsize); 1993 $self->{value}->set_fontsize ($fsize);
1861 $self->{max} ->set_fontsize ($fsize); 1994 $self->{max} ->set_fontsize ($fsize);
1862} 1995}
1863 1996
1997sub set_max {
1998 my ($self, $max) = @_;
1999
2000 $self->{gauge}->set_max ($max);
2001 $self->{max}->set_text ($max);
2002}
2003
1864sub set_value { 2004sub set_value {
1865 my ($self, $val, $max) = @_; 2005 my ($self, $val, $max) = @_;
1866 2006
1867 $self->set_max ($max) 2007 $self->set_max ($max)
1868 if defined $max; 2008 if defined $max;
1869 2009
1870 $self->{gauge}->set_value ($val, $max); 2010 $self->{gauge}->set_value ($val, $max);
1871 $self->{value}->set_text ($val); 2011 $self->{value}->set_text ($val);
1872}
1873
1874sub set_max {
1875 my ($self, $max) = @_;
1876
1877 $self->{gauge}->set_max ($max);
1878 $self->{max}->set_text ($max);
1879} 2012}
1880 2013
1881############################################################################# 2014#############################################################################
1882 2015
1883package CFClient::UI::Slider; 2016package CFClient::UI::Slider;
… …
1902 # TODO: calculations are off 2035 # TODO: calculations are off
1903 my $self = $class->SUPER::new ( 2036 my $self = $class->SUPER::new (
1904 fg => [1, 1, 1], 2037 fg => [1, 1, 1],
1905 active_fg => [0, 0, 0], 2038 active_fg => [0, 0, 0],
1906 range => [0, 0, 100, 10], 2039 range => [0, 0, 100, 10],
1907 req_w => 20, 2040 req_w => $::WIDTH / 80,
1908 req_h => 20, 2041 req_h => $::WIDTH / 80,
1909 vertical => 0, 2042 vertical => 0,
1910 can_hover => 1, 2043 can_hover => 1,
1911 inner_pad => 5, 2044 inner_pad => 5,
1912 @_ 2045 @_
1913 ); 2046 );
… …
2037 (new CFClient::UI::Empty expand => 1), 2170 (new CFClient::UI::Empty expand => 1),
2038 (new CFClient::UI::Slider vertical => 1), 2171 (new CFClient::UI::Slider vertical => 1),
2039 ], 2172 ],
2040 ); 2173 );
2041 2174
2042 $self->{children}[1]->connect (changed => sub { 2175 $self->{children}[1]->connect (changed => sub { $self->update });
2043 $self->update;
2044 });
2045 2176
2046 $self 2177 $self
2047} 2178}
2048 2179
2049sub set_fontsize { 2180sub set_fontsize {
… …
2057 my ($self, $text) = @_; 2188 my ($self, $text) = @_;
2058 2189
2059 my $layout = $self->{layout}; 2190 my $layout = $self->{layout};
2060 2191
2061 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2062 $layout->set_width ($self->{w}); 2193 $layout->set_width ($self->{children}[0]{w});
2063 $layout->set_text ($text); 2194 $layout->set_text ($text);
2064 2195
2065 ($layout->size)[1] 2196 ($layout->size)[1]
2066} 2197}
2067 2198
… …
2120 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2121 2252
2122 delete $self->{texture}; 2253 delete $self->{texture};
2123 } 2254 }
2124 2255
2125 $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 {
2126 glClearColor 0, 0, 0, 1; 2257 glClearColor 0, 0, 0, 0;
2127 glClear GL_COLOR_BUFFER_BIT; 2258 glClear GL_COLOR_BUFFER_BIT;
2128 2259
2129 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
2130 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2131 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
… …
2163} 2294}
2164 2295
2165sub _draw { 2296sub _draw {
2166 my ($self) = @_; 2297 my ($self) = @_;
2167 2298
2168 if ($self->{texture}) { 2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2169 glEnable GL_TEXTURE_2D; 2301 glEnable GL_TEXTURE_2D;
2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171 glColor 1, 1, 1, 1; 2303 glColor 1, 1, 1, 1;
2172 $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});
2173 glDisable GL_TEXTURE_2D; 2305 glDisable GL_TEXTURE_2D;
2174 } 2306 glDisable GL_BLEND;
2175 2307
2176 $self->{children}[1]->draw; 2308 $self->{children}[1]->draw;
2177 2309
2178} 2310}
2179 2311
… …
2348 2480
2349sub size_request { 2481sub size_request {
2350 (32, 8) 2482 (32, 8)
2351} 2483}
2352 2484
2353sub draw { 2485sub _draw {
2354 my ($self) = @_; 2486 my ($self) = @_;
2355 2487
2488 return unless $::CONN;#d# manage and cache textures differently
2356 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2489 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2357 2490
2491 # TODO animation
2358 if ($tex) { 2492 if ($tex) {
2359 glEnable GL_BLEND; 2493 glEnable GL_BLEND;
2360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361 glEnable GL_TEXTURE_2D; 2495 glEnable GL_TEXTURE_2D;
2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2367 } 2501 }
2368} 2502}
2369 2503
2370############################################################################# 2504#############################################################################
2371 2505
2506package CFClient::UI::InventoryItem;
2507
2508our @ISA = CFClient::UI::HBox::;
2509
2510sub new {
2511 my $class = shift;
2512
2513 my %args = @_;
2514
2515 my $item = $args{item};
2516
2517 my $desc = $item->{nrof} < 2
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520
2521
2522 my $self = $class->SUPER::new (
2523 can_hover => 1,
2524 can_events => 1,
2525 tooltip => (CFClient::UI::Label->escape ($desc)
2526 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2527 connect_button_down => sub {
2528 my ($self, $ev, $x, $y) = @_;
2529
2530 # todo: maybe put examine on 1? but should just be a tooltip :(
2531 if ($ev->{button} == 1) {
2532 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2533 } elsif ($ev->{button} == 2) {
2534 $::CONN->send ("apply $item->{tag}");
2535 } elsif ($ev->{button} == 3) {
2536 CFClient::UI::Menu->new (
2537 items => [
2538 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2539 [
2540 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2541 sub { $::CONN->send ("lock $item->{tag}") },
2542 ],
2543 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2544 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2545 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2546 ],
2547 )->popup ($ev);
2548 }
2549
2550 1
2551 },
2552 %args
2553 );
2554 $self->add(new CFClient::UI::Face
2555 can_events => 0,
2556 face => $item->{face},
2557 anim => $item->{anim},
2558 animspeed => $item->{animspeed});
2559 $self->add(new CFClient::UI::Label
2560 can_events => 0,
2561 text => $desc);
2562
2563 $self
2564}
2565
2566#############################################################################
2567
2568package CFClient::UI::Inventory;
2569
2570our @ISA = CFClient::UI::ScrolledWindow::;
2571
2572sub new {
2573 my $class = shift;
2574
2575 my $self = $class->SUPER::new (
2576 scrolled => (new CFClient::UI::VBox),
2577 @_,
2578 );
2579
2580 $self
2581}
2582
2583sub set_items {
2584 my ($self, $items) = @_;
2585
2586 $self->{scrolled}->clear;
2587 return unless $items;
2588
2589 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2590
2591 $self->{real_items} = \@items;
2592
2593 for my $item (@items) {
2594 my $desc = $item->{nrof} < 2
2595 ? $item->{name}
2596 : "$item->{nrof} $item->{name_pl}";
2597
2598 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2599 }
2600
2601# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2602}
2603
2604sub size_request {
2605 my ($self) = @_;
2606 ($self->{req_w}, $self->{req_h});
2607}
2608
2609#############################################################################
2610
2611package CFClient::UI::Menu;
2612
2613our @ISA = CFClient::UI::FancyFrame::;
2614
2615use CFClient::OpenGL;
2616
2617sub new {
2618 my $class = shift;
2619
2620 my $self = $class->SUPER::new (
2621 items => [],
2622 z => 100,
2623 @_,
2624 );
2625
2626 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2627
2628 for my $item (@{ $self->{items} }) {
2629 my ($widget, $cb) = @$item;
2630
2631 # handle various types of items, only text for now
2632 if (!ref $widget) {
2633 $widget = new CFClient::UI::Label
2634 can_hover => 1,
2635 can_events => 1,
2636 text => $widget;
2637 }
2638
2639 $self->{item}{$widget} = $item;
2640
2641 $self->{vbox}->add ($widget);
2642 }
2643
2644 $self
2645}
2646
2647# popup given the event (must be a mouse button down event currently)
2648sub popup {
2649 my ($self, $ev) = @_;
2650
2651 $self->emit ("popdown");
2652
2653 # maybe save $GRAB? must be careful about events...
2654 $GRAB = $self;
2655 $self->{button} = $ev->{button};
2656
2657 $self->show;
2658 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2659}
2660
2661sub mouse_motion {
2662 my ($self, $ev, $x, $y) = @_;
2663
2664 # TODO: should use vbox->find_widget or so
2665 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2666 $self->{hover} = $self->{item}{$HOVER};
2667}
2668
2669sub button_up {
2670 my ($self, $ev, $x, $y) = @_;
2671
2672 if ($ev->{button} == $self->{button}) {
2673 undef $GRAB;
2674 $self->hide;
2675
2676 $self->emit ("popdown");
2677 $self->{hover}[1]->() if $self->{hover};
2678 }
2679}
2680
2681#############################################################################
2682
2372package CFClient::UI::Root; 2683package CFClient::UI::Root;
2373 2684
2374our @ISA = CFClient::UI::Container::; 2685our @ISA = CFClient::UI::Container::;
2375 2686
2376use CFClient::OpenGL; 2687use CFClient::OpenGL;
2377 2688
2378sub check_size { 2689sub check_size {
2379 my ($self) = @_; 2690 my ($self) = @_;
2380 2691
2381 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2692 $self->configure (0, 0, $self->{w}, $self->{h});
2382} 2693}
2383 2694
2384sub size_request { 2695sub size_request {
2385 ($::WIDTH, $::HEIGHT) 2696 my ($self) = @_;
2697
2698 ($self->{w}, $self->{h})
2699}
2700
2701sub size_allocate {
2702 my ($self, $w, $h) = @_;
2703
2704 my $old_w = $self->{old_w};
2705 my $old_h = $self->{old_h};
2706
2707 if ($old_w && $old_h) {
2708 for my $child ($self->children) {
2709 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2710 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2711 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2712 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2713 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2714 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2715 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2716 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2717 }
2718 }
2719
2720 $self->{old_w} = $w;
2721 $self->{old_h} = $h;
2386} 2722}
2387 2723
2388sub configure { 2724sub configure {
2389 my ($self, $x, $y, $w, $h) = @_; 2725 my ($self, $x, $y, $w, $h) = @_;
2390 2726
2391 $self->SUPER::configure ($x, $y, $w, $h); 2727 $self->SUPER::configure ($x, $y, $w, $h);
2392 2728
2393 for my $child (@{$self->{children}}) { 2729 for my $child ($self->children) {
2394 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2730 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2395 2731
2396 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2732 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2397 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2733 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2398 $child->configure ($X, $Y, $W,$H); 2734 $child->configure ($X, $Y, $W, $H);
2399 } 2735 }
2400} 2736}
2401 2737
2402sub _topleft { 2738sub _topleft {
2403 my ($self, $x, $y) = @_; 2739 my ($self, $x, $y) = @_;

Diff Legend

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