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.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
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 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
239} 263}
240 264
241sub set_max_size { 265sub set_max_size {
242 my ($self, $w, $h) = @_; 266 my ($self, $w, $h) = @_;
243 267
… …
506 530
507 $self 531 $self
508} 532}
509 533
510sub add { 534sub add {
511 my ($self, $child) = @_; 535 my ($self, @widgets) = @_;
512 536
513 $child->set_parent ($self); 537 $_->set_parent ($self)
538 for @widgets;
514 539
515 use sort 'stable'; 540 use sort 'stable';
516 541
517 $self->{children} = [ 542 $self->{children} = [
518 sort { $a->{z} <=> $b->{z} } 543 sort { $a->{z} <=> $b->{z} }
519 @{$self->{children}}, $child 544 @{$self->{children}}, @widgets
520 ]; 545 ];
521 546
522 $child->check_size; 547 $_->check_size
548 for @widgets;
549
550 $self->update;
551}
552
553sub children {
554 @{ $_[0]{children} }
523} 555}
524 556
525sub remove { 557sub remove {
526 my ($self, $child) = @_; 558 my ($self, $child) = @_;
527 559
… …
542 574
543 for (@$children) { 575 for (@$children) {
544 delete $_->{parent}; 576 delete $_->{parent};
545 $_->hide; 577 $_->hide;
546 } 578 }
579
580 $self->check_size;
581 $self->update;
547} 582}
548 583
549sub find_widget { 584sub find_widget {
550 my ($self, $x, $y) = @_; 585 my ($self, $x, $y) = @_;
551 586
… …
626} 661}
627 662
628sub update { 663sub update {
629 my ($self) = @_; 664 my ($self) = @_;
630 665
631 # we want to do this delayed... 666 $ROOT->on_refresh ($self => sub { $self->render_child });
632 $self->render_chld;
633 $self->SUPER::update; 667 $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} 668}
645 669
646sub size_allocate { 670sub size_allocate {
647 my ($self, $w, $h) = @_; 671 my ($self, $w, $h) = @_;
648 672
649 $self->child->configure (0, 0, $w, $h); 673 $self->SUPER::size_allocate ($w, $h);
674 $self->update;
675}
650 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
651 $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 };
652} 697}
653 698
654sub _draw { 699sub _draw {
655 my ($self) = @_; 700 my ($self) = @_;
656 701
… …
658 703
659 my $tex = $self->{texture} 704 my $tex = $self->{texture}
660 or return; 705 or return;
661 706
662 glEnable GL_BLEND; 707 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 708 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D; 709 glEnable GL_TEXTURE_2D;
665 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;
666 712
667 $tex->draw_quad (0, 0, $w, $h); 713 $tex->draw_quad (0, 0, $w, $h);
668 714
669 glDisable GL_BLEND; 715 glDisable GL_BLEND;
670 glDisable GL_TEXTURE_2D; 716 glDisable GL_TEXTURE_2D;
… …
674 720
675package CFClient::UI::ViewPort; 721package CFClient::UI::ViewPort;
676 722
677our @ISA = CFClient::UI::Window::; 723our @ISA = CFClient::UI::Window::;
678 724
679sub new { die }
680
681sub size_request { 725sub size_request {
682 my ($self) = @_; 726 my ($self) = @_;
683 727
684 @$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)};
685 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 729 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
686 730
687 @$self{qw(child_w child_h)} 731 @$self{qw(child_w child_h)}
688} 732}
689 733
690sub _draw { 734sub size_allocate {
691 my ($self) = @_; 735 my ($self, $w, $h) = @_;
692 736
693 $self->{children}[1]->draw; 737 $self->update;
694} 738}
695 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
696 810
697############################################################################# 811#############################################################################
698 812
699package CFClient::UI::Frame; 813package CFClient::UI::Frame;
700 814
… …
757 # TODO: user_x, user_y, overwrite moveto? 871 # TODO: user_x, user_y, overwrite moveto?
758 872
759 my $self = $class->SUPER::new ( 873 my $self = $class->SUPER::new (
760 bg => [1, 1, 1, 1], 874 bg => [1, 1, 1, 1],
761 border_bg => [1, 1, 1, 1], 875 border_bg => [1, 1, 1, 1],
762 border => 0.8, 876 border => 0.6,
763 can_events => 1, 877 can_events => 1,
764 @_ 878 @_
765 ); 879 );
766 880
767 $self->{title} &&= new CFClient::UI::Label 881 $self->{title} &&= new CFClient::UI::Label
768 align => 0, 882 align => 0,
769 valign => 1, 883 valign => 1,
770 text => $self->{title}, 884 text => $self->{title},
771 fontsize => 1; 885 fontsize => $self->{border};
772 886
773 $self 887 $self
774} 888}
775 889
776sub border { 890sub border {
… …
801} 915}
802 916
803sub button_down { 917sub button_down {
804 my ($self, $ev, $x, $y) = @_; 918 my ($self, $ev, $x, $y) = @_;
805 919
920 my ($w, $h) = @$self{qw(w h)};
806 my $border = $self->border; 921 my $border = $self->border;
807 922
808 if ($x < $self->{w} && $x >= $self->{w} - $border 923 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
809 && $y < $self->{h} && $y >= $self->{h} - $border) { 924 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
810 925
926 if ($lr & $td) {
927 my ($wx, $wy) = ($self->{x}, $self->{y});
811 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 928 my ($ox, $oy) = ($ev->{x}, $ev->{y});
812 my ($bw, $bh) = ($self->{w}, $self->{h}); 929 my ($bw, $bh) = ($self->{w}, $self->{h});
813 930
931 my $mx = $x < $border;
932 my $my = $y < $border;
933
814 $self->{motion} = sub { 934 $self->{motion} = sub {
815 my ($ev, $x, $y) = @_; 935 my ($ev, $x, $y) = @_;
816 936
817 ($x, $y) = ($ev->{x}, $ev->{y}); 937 my $dx = $ev->{x} - $ox;
938 my $dy = $ev->{y} - $oy;
818 939
819 $self->{user_w} = $bw + $x - $ox; 940 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
820 $self->{user_h} = $bh + $y - $oy; 941 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
942 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
821 $self->check_size; 943 $self->check_size;
822 }; 944 };
823 945
824 } elsif ($x >= 0 && $x < $self->{w} 946 } elsif ($lr ^ $td) {
825 && $y >= 0 && $y < $border) {
826
827 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 947 my ($ox, $oy) = ($ev->{x}, $ev->{y});
828 my ($bx, $by) = ($self->{x}, $self->{y}); 948 my ($bx, $by) = ($self->{x}, $self->{y});
829 949
830 $self->{motion} = sub { 950 $self->{motion} = sub {
831 my ($ev, $x, $y) = @_; 951 my ($ev, $x, $y) = @_;
… …
867 $tex[1]->draw_quad (0, 0, $w, $border); 987 $tex[1]->draw_quad (0, 0, $w, $border);
868 $tex[3]->draw_quad (0, $border, $border, $ch); 988 $tex[3]->draw_quad (0, $border, $border, $ch);
869 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 989 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
870 $tex[4]->draw_quad (0, $h - $border, $w, $border); 990 $tex[4]->draw_quad (0, $h - $border, $w, $border);
871 991
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
872 my $bg = $tex[0]; 993 my $bg = $tex[0];
873 994
874 # TODO: repeat texture not scale 995 # TODO: repeat texture not scale
875 my $rep_x = $cw / $bg->{w}; 996 my $rep_x = $cw / $bg->{w};
876 my $rep_y = $ch / $bg->{h}; 997 my $rep_y = $ch / $bg->{h};
877 998
878 glColor @{ $self->{bg} }; 999 glColor @{ $self->{bg} };
879 1000
880 $bg->{s} = $rep_x; 1001 $bg->{s} = $rep_x;
881 $bg->{t} = $rep_y; 1002 $bg->{t} = $rep_y;
882 $bg->{wrap_mode} = 1; 1003 $bg->{wrap_mode} = 1;
883 $bg->draw_quad ($border, $border, $cw, $ch); 1004 $bg->draw_quad ($border, $border, $cw, $ch);
884 1005
885 glDisable GL_TEXTURE_2D; 1006 glDisable GL_TEXTURE_2D;
886 glDisable GL_BLEND; 1007 glDisable GL_BLEND;
1008 }
887 1009
888 $self->{title}->draw if $self->{title}; 1010 $self->{title}->draw if $self->{title};
1011
889 $self->child->draw; 1012 $self->child->draw;
890} 1013}
891 1014
892############################################################################# 1015#############################################################################
893 1016
… …
915 $self->{children}[$y][$x] = $child; 1038 $self->{children}[$y][$x] = $child;
916 1039
917 $child->check_size; 1040 $child->check_size;
918} 1041}
919 1042
1043sub children {
1044 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1045}
1046
920# TODO: move to container class maybe? send childs a signal on removal? 1047# TODO: move to container class maybe? send childs a signal on removal?
921sub clear { 1048sub clear {
922 my ($self) = @_; 1049 my ($self) = @_;
923 1050
924 my $children = delete $self->{children}; 1051 my @children = $self->children;
1052 delete $self->{children};
925 1053
926 for (grep $_, map @$_, grep $_, @$children) { 1054 for (@children) {
927 delete $_->{parent}; 1055 delete $_->{parent};
928 $_->hide; 1056 $_->hide;
929 } 1057 }
930 1058
931 $self->update; 1059 $self->update;
… …
1192 s/</&lt;/g; 1320 s/</&lt;/g;
1193 1321
1194 $_[1] 1322 $_[1]
1195} 1323}
1196 1324
1325sub update {
1326 my ($self) = @_;
1327
1328 delete $self->{texture};
1329 $self->SUPER::update;
1330}
1331
1197sub set_text { 1332sub set_text {
1198 my ($self, $text) = @_; 1333 my ($self, $text) = @_;
1199 1334
1335 return if $self->{text} eq "T$text";
1336 $self->{text} = "T$text";
1337
1200 $self->{layout}->set_text ($text); 1338 $self->{layout}->set_text ($text);
1201 1339
1202 delete $self->{texture}; 1340 delete $self->{texture};
1341 $self->update;
1203 $self->check_size; 1342 $self->check_size;
1204 $self->update;
1205} 1343}
1206 1344
1207sub set_markup { 1345sub set_markup {
1208 my ($self, $markup) = @_; 1346 my ($self, $markup) = @_;
1209 1347
1348 return if $self->{text} eq "M$markup";
1349 $self->{text} = "M$markup";
1350
1210 $self->{layout}->set_markup ($markup); 1351 $self->{layout}->set_markup ($markup);
1211 1352
1212 delete $self->{texture}; 1353 delete $self->{texture};
1354 $self->update;
1213 $self->check_size; 1355 $self->check_size;
1214 $self->update;
1215} 1356}
1216 1357
1217sub size_request { 1358sub size_request {
1218 my ($self) = @_; 1359 my ($self) = @_;
1219 1360
… …
1248sub set_fontsize { 1389sub set_fontsize {
1249 my ($self, $fontsize) = @_; 1390 my ($self, $fontsize) = @_;
1250 1391
1251 $self->{fontsize} = $fontsize; 1392 $self->{fontsize} = $fontsize;
1252 delete $self->{texture}; 1393 delete $self->{texture};
1394
1395 $self->update;
1253 $self->check_size; 1396 $self->check_size;
1254 $self->update;
1255} 1397}
1256 1398
1257sub _draw { 1399sub _draw {
1258 my ($self) = @_; 1400 my ($self) = @_;
1259 1401
… …
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
2488 return unless $::CONN;#d# manage and cache textures differently
2342 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2489 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2343 2490
2491 # TODO animation
2344 if ($tex) { 2492 if ($tex) {
2345 glEnable GL_BLEND; 2493 glEnable GL_BLEND;
2346 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2347 glEnable GL_TEXTURE_2D; 2495 glEnable GL_TEXTURE_2D;
2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2353 } 2501 }
2354} 2502}
2355 2503
2356############################################################################# 2504#############################################################################
2357 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
2358package CFClient::UI::Root; 2683package CFClient::UI::Root;
2359 2684
2360our @ISA = CFClient::UI::Container::; 2685our @ISA = CFClient::UI::Container::;
2361 2686
2362use CFClient::OpenGL; 2687use CFClient::OpenGL;
2363 2688
2364sub check_size { 2689sub check_size {
2365 my ($self) = @_; 2690 my ($self) = @_;
2366 2691
2367 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2692 $self->configure (0, 0, $self->{w}, $self->{h});
2368} 2693}
2369 2694
2370sub size_request { 2695sub size_request {
2371 ($::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;
2372} 2722}
2373 2723
2374sub configure { 2724sub configure {
2375 my ($self, $x, $y, $w, $h) = @_; 2725 my ($self, $x, $y, $w, $h) = @_;
2376 2726
2377 $self->SUPER::configure ($x, $y, $w, $h); 2727 $self->SUPER::configure ($x, $y, $w, $h);
2378 2728
2379 for my $child (@{$self->{children}}) { 2729 for my $child ($self->children) {
2380 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)};
2381 2731
2382 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2732 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2383 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2733 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2384 $child->configure ($X, $Y, $W,$H); 2734 $child->configure ($X, $Y, $W, $H);
2385 } 2735 }
2386} 2736}
2387 2737
2388sub _topleft { 2738sub _topleft {
2389 my ($self, $x, $y) = @_; 2739 my ($self, $x, $y) = @_;

Diff Legend

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