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.173 by root, Tue Apr 25 10:30:48 2006 UTC vs.
Revision 1.192 by root, Tue May 9 22:49:32 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 }
… …
224 $self->{y} = $y; 232 $self->{y} = $y;
225 $self->update; 233 $self->update;
226 } 234 }
227 235
228 if ($self->{w} != $w || $self->{h} != $h) { 236 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w; 237 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230 $self->{h} = $h;
231
232 $self->size_allocate ($w, $h);
233 $self->update;
234 } 238 }
235} 239}
236 240
237sub size_allocate { 241sub size_allocate {
238 # nothing to be done 242 # nothing to be done
239} 243}
240 244
241sub children { 245sub children {
242} 246}
243 247
244# call when resoltuion changes etc. 248# call when resolution changes etc.
245sub reconfigure { 249sub reconfigure {
246 my ($self) = @_; 250 my ($self) = @_;
247 251
248 $_->reconfigure 252 $_->reconfigure
249 for $self->children; 253 for $self->children;
250 254
251 $_->check_size; 255 $self->check_size;
256 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257 $self->update;
252} 258}
253 259
254sub set_max_size { 260sub set_max_size {
255 my ($self, $w, $h) = @_; 261 my ($self, $w, $h) = @_;
256 262
257 delete $self->{max_w}; $self->{max_w} = $w if $w; 263 delete $self->{max_w}; $self->{max_w} = $w if $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h; 264 delete $self->{max_h}; $self->{max_h} = $h if $h;
259}
260
261# return top left coordinates
262sub _topleft {
263 my ($self, $x, $y) = @_;
264
265 $self->{parent}
266 or Carp::confess "no parent widget in _topleft\n";#d#
267
268 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
269} 265}
270 266
271# translate global coordinates to local coordinate system 267# translate global coordinates to local coordinate system
272sub coord2local { 268sub coord2local {
273 my ($self, $x, $y) = @_; 269 my ($self, $x, $y) = @_;
274 270
275 my ($X, $Y) = $self->_topleft; 271 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
276 ($x - $X, $y - $Y)
277} 272}
278 273
279# translate local coordinates to global coordinate system 274# translate local coordinates to global coordinate system
280sub coord2global { 275sub coord2global {
281 my ($self, $x, $y) = @_; 276 my ($self, $x, $y) = @_;
282 277
283 my ($X, $Y) = $self->_topleft; 278 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
284 ($x + $X, $y + $Y)
285} 279}
286 280
287sub focus_in { 281sub focus_in {
288 my ($self) = @_; 282 my ($self) = @_;
289 283
… …
386} 380}
387 381
388sub set_parent { 382sub set_parent {
389 my ($self, $parent) = @_; 383 my ($self, $parent) = @_;
390 384
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
391 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
392} 387}
393 388
394sub check_size { 389sub check_size {
395 my ($self) = @_; 390 my ($self) = @_;
396 391
397 $self->{parent} 392 $CFClient::UI::ROOT->{check_size}{$self} = $self;
398 or return 1;
399
400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
403
404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
405 $self->{req_w} = $w;
406 $self->{req_h} = $h;
407
408 $self->{parent}->check_size
409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
417 }
418} 393}
419 394
420sub update { 395sub update {
421 my ($self) = @_; 396 my ($self) = @_;
422 397
… …
519 494
520 $self 495 $self
521} 496}
522 497
523sub add { 498sub add {
524 my ($self, $child) = @_; 499 my ($self, @widgets) = @_;
525 500
526 $child->set_parent ($self); 501 $_->set_parent ($self)
502 for @widgets;
527 503
528 use sort 'stable'; 504 use sort 'stable';
529 505
530 $self->{children} = [ 506 $self->{children} = [
531 sort { $a->{z} <=> $b->{z} } 507 sort { $a->{z} <=> $b->{z} }
532 @{$self->{children}}, $child 508 @{$self->{children}}, @widgets
533 ]; 509 ];
534 510
535 $child->check_size; 511 $_->check_size
512 for @widgets;
513
514 $self->update;
536} 515}
537 516
538sub children { 517sub children {
539 @{ $_[0]{children} } 518 @{ $_[0]{children} }
540} 519}
… …
559 538
560 for (@$children) { 539 for (@$children) {
561 delete $_->{parent}; 540 delete $_->{parent};
562 $_->hide; 541 $_->hide;
563 } 542 }
543
544 $self->check_size;
545 $self->update;
564} 546}
565 547
566sub find_widget { 548sub find_widget {
567 my ($self, $x, $y) = @_; 549 my ($self, $x, $y) = @_;
568 550
… …
643} 625}
644 626
645sub update { 627sub update {
646 my ($self) = @_; 628 my ($self) = @_;
647 629
648 # we want to do this delayed... 630 $ROOT->on_refresh ($self => sub { $self->render_child });
649 $self->render_chld;
650 $self->SUPER::update; 631 $self->SUPER::update;
651}
652
653sub render_chld {
654 my ($self) = @_;
655
656 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
657 glClearColor 0, 0, 0, 1;
658 glClear GL_COLOR_BUFFER_BIT;
659 $self->child->draw;
660 };
661} 632}
662 633
663sub size_allocate { 634sub size_allocate {
664 my ($self, $w, $h) = @_; 635 my ($self, $w, $h) = @_;
665 636
666 $self->child->configure (0, 0, $w, $h); 637 $self->SUPER::size_allocate ($w, $h);
638 $self->update;
639}
667 640
641sub _render {
642 $_[0]{children}[0]->draw;
643}
644
645sub render_child {
646 my ($self) = @_;
647
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT;
651
668 $self->render_chld; 652 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 };
669} 661}
670 662
671sub _draw { 663sub _draw {
672 my ($self) = @_; 664 my ($self) = @_;
673 665
… …
675 667
676 my $tex = $self->{texture} 668 my $tex = $self->{texture}
677 or return; 669 or return;
678 670
679 glEnable GL_BLEND; 671 glEnable GL_BLEND;
680 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
681 glEnable GL_TEXTURE_2D; 673 glEnable GL_TEXTURE_2D;
682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1;
683 676
684 $tex->draw_quad (0, 0, $w, $h); 677 $tex->draw_quad (0, 0, $w, $h);
685 678
686 glDisable GL_BLEND; 679 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
… …
691 684
692package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
693 686
694our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
695 688
696sub new { die }
697
698sub size_request { 689sub size_request {
699 my ($self) = @_; 690 my ($self) = @_;
700 691
701 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
703 694
704 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
705} 696}
706 697
707sub _draw { 698sub size_allocate {
708 my ($self) = @_; 699 my ($self, $w, $h) = @_;
709 700
710 $self->{children}[1]->draw; 701 $self->update;
711} 702}
712 703
704sub set_offset {
705 my ($self, $x, $y) = @_;
706
707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
709
710 $self->update;
711}
712
713# hmm, this does not work for topleft of $self... but we should not ask for that
714sub coord2local {
715 my ($self, $x, $y) = @_;
716
717 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
718}
719
720sub coord2global {
721 my ($self, $x, $y) = @_;
722
723 $x = List::Util::min $self->{w}, $x - $self->{view_x};
724 $y = List::Util::min $self->{h}, $y - $self->{view_y};
725
726 $self->SUPER::coord2global ($x, $y)
727}
728
729sub find_widget {
730 my ($self, $x, $y) = @_;
731
732 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
733 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
734 ) {
735 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
736 } else {
737 $self->CFClient::UI::Base::find_widget ($x, $y)
738 }
739}
740
741sub _render {
742 my ($self) = @_;
743
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745
746 $self->SUPER::_render;
747}
748
749#############################################################################
750
751package CFClient::UI::ScrolledWindow;
752
753our @ISA = CFClient::UI::HBox::;
754
755sub new {
756 my $class = shift;
757
758 my $self;
759
760 my $slider = new CFClient::UI::Slider
761 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 },
766 ;
767
768 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort),
770 slider => $slider,
771 @_,
772 );
773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
778 $self
779}
780
781#TODO# update range on size_allocate depeneing on child
782# update viewport offset on scroll
713 783
714############################################################################# 784#############################################################################
715 785
716package CFClient::UI::Frame; 786package CFClient::UI::Frame;
717 787
… …
774 # TODO: user_x, user_y, overwrite moveto? 844 # TODO: user_x, user_y, overwrite moveto?
775 845
776 my $self = $class->SUPER::new ( 846 my $self = $class->SUPER::new (
777 bg => [1, 1, 1, 1], 847 bg => [1, 1, 1, 1],
778 border_bg => [1, 1, 1, 1], 848 border_bg => [1, 1, 1, 1],
779 border => 0.8, 849 border => 0.6,
780 can_events => 1, 850 can_events => 1,
781 @_ 851 @_
782 ); 852 );
783 853
784 $self->{title} &&= new CFClient::UI::Label 854 $self->{title} &&= new CFClient::UI::Label
785 align => 0, 855 align => 0,
786 valign => 1, 856 valign => 1,
787 text => $self->{title}, 857 text => $self->{title},
788 fontsize => 1; 858 fontsize => $self->{border};
789 859
790 $self 860 $self
791} 861}
792 862
793sub border { 863sub border {
… …
818} 888}
819 889
820sub button_down { 890sub button_down {
821 my ($self, $ev, $x, $y) = @_; 891 my ($self, $ev, $x, $y) = @_;
822 892
893 my ($w, $h) = @$self{qw(w h)};
823 my $border = $self->border; 894 my $border = $self->border;
824 895
825 if ($x < $self->{w} && $x >= $self->{w} - $border 896 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
826 && $y < $self->{h} && $y >= $self->{h} - $border) { 897 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
827 898
899 if ($lr & $td) {
900 my ($wx, $wy) = ($self->{x}, $self->{y});
828 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 901 my ($ox, $oy) = ($ev->{x}, $ev->{y});
829 my ($bw, $bh) = ($self->{w}, $self->{h}); 902 my ($bw, $bh) = ($self->{w}, $self->{h});
830 903
904 my $mx = $x < $border;
905 my $my = $y < $border;
906
831 $self->{motion} = sub { 907 $self->{motion} = sub {
832 my ($ev, $x, $y) = @_; 908 my ($ev, $x, $y) = @_;
833 909
834 ($x, $y) = ($ev->{x}, $ev->{y}); 910 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy;
835 912
836 $self->{user_w} = $bw + $x - $ox; 913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
837 $self->{user_h} = $bh + $y - $oy; 914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
838 $self->check_size; 916 $self->check_size;
839 }; 917 };
840 918
841 } elsif ($x >= 0 && $x < $self->{w} 919 } elsif ($lr ^ $td) {
842 && $y >= 0 && $y < $border) {
843
844 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 920 my ($ox, $oy) = ($ev->{x}, $ev->{y});
845 my ($bx, $by) = ($self->{x}, $self->{y}); 921 my ($bx, $by) = ($self->{x}, $self->{y});
846 922
847 $self->{motion} = sub { 923 $self->{motion} = sub {
848 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
… …
884 $tex[1]->draw_quad (0, 0, $w, $border); 960 $tex[1]->draw_quad (0, 0, $w, $border);
885 $tex[3]->draw_quad (0, $border, $border, $ch); 961 $tex[3]->draw_quad (0, $border, $border, $ch);
886 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
887 $tex[4]->draw_quad (0, $h - $border, $w, $border); 963 $tex[4]->draw_quad (0, $h - $border, $w, $border);
888 964
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
889 my $bg = $tex[0]; 966 my $bg = $tex[0];
890 967
891 # TODO: repeat texture not scale 968 # TODO: repeat texture not scale
892 my $rep_x = $cw / $bg->{w}; 969 my $rep_x = $cw / $bg->{w};
893 my $rep_y = $ch / $bg->{h}; 970 my $rep_y = $ch / $bg->{h};
894 971
895 glColor @{ $self->{bg} }; 972 glColor @{ $self->{bg} };
896 973
897 $bg->{s} = $rep_x; 974 $bg->{s} = $rep_x;
898 $bg->{t} = $rep_y; 975 $bg->{t} = $rep_y;
899 $bg->{wrap_mode} = 1; 976 $bg->{wrap_mode} = 1;
900 $bg->draw_quad ($border, $border, $cw, $ch); 977 $bg->draw_quad ($border, $border, $cw, $ch);
901 978
902 glDisable GL_TEXTURE_2D; 979 glDisable GL_TEXTURE_2D;
903 glDisable GL_BLEND; 980 glDisable GL_BLEND;
981 }
904 982
905 $self->{title}->draw if $self->{title}; 983 $self->{title}->draw if $self->{title};
984
906 $self->child->draw; 985 $self->child->draw;
907} 986}
908 987
909############################################################################# 988#############################################################################
910 989
… …
1221 1300
1222 delete $self->{texture}; 1301 delete $self->{texture};
1223 $self->SUPER::update; 1302 $self->SUPER::update;
1224} 1303}
1225 1304
1226sub reconfigure {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230}
1231
1232sub set_text { 1305sub set_text {
1233 my ($self, $text) = @_; 1306 my ($self, $text) = @_;
1234 1307
1235 return if $self->{text} eq "T$text"; 1308 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text"; 1309 $self->{text} = "T$text";
1237 1310
1238 $self->{layout}->set_text ($text); 1311 $self->{layout}->set_text ($text);
1239 1312
1240 delete $self->{texture};
1241 $self->update; 1313 $self->update;
1242 $self->check_size; 1314 $self->check_size;
1243} 1315}
1244 1316
1245sub set_markup { 1317sub set_markup {
… …
1248 return if $self->{text} eq "M$markup"; 1320 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup"; 1321 $self->{text} = "M$markup";
1250 1322
1251 $self->{layout}->set_markup ($markup); 1323 $self->{layout}->set_markup ($markup);
1252 1324
1253 delete $self->{texture};
1254 $self->update; 1325 $self->update;
1255 $self->check_size; 1326 $self->check_size;
1256} 1327}
1257 1328
1258sub size_request { 1329sub size_request {
… …
1289sub set_fontsize { 1360sub set_fontsize {
1290 my ($self, $fontsize) = @_; 1361 my ($self, $fontsize) = @_;
1291 1362
1292 $self->{fontsize} = $fontsize; 1363 $self->{fontsize} = $fontsize;
1293 delete $self->{texture}; 1364 delete $self->{texture};
1365
1366 $self->update;
1294 $self->check_size; 1367 $self->check_size;
1295 $self->update;
1296} 1368}
1297 1369
1298sub _draw { 1370sub _draw {
1299 my ($self) = @_; 1371 my ($self) = @_;
1300 1372
… …
1934 # TODO: calculations are off 2006 # TODO: calculations are off
1935 my $self = $class->SUPER::new ( 2007 my $self = $class->SUPER::new (
1936 fg => [1, 1, 1], 2008 fg => [1, 1, 1],
1937 active_fg => [0, 0, 0], 2009 active_fg => [0, 0, 0],
1938 range => [0, 0, 100, 10], 2010 range => [0, 0, 100, 10],
1939 req_w => 20, 2011 req_w => $::WIDTH / 80,
1940 req_h => 20, 2012 req_h => $::WIDTH / 80,
1941 vertical => 0, 2013 vertical => 0,
1942 can_hover => 1, 2014 can_hover => 1,
1943 inner_pad => 5, 2015 inner_pad => 5,
1944 @_ 2016 @_
1945 ); 2017 );
… …
2069 (new CFClient::UI::Empty expand => 1), 2141 (new CFClient::UI::Empty expand => 1),
2070 (new CFClient::UI::Slider vertical => 1), 2142 (new CFClient::UI::Slider vertical => 1),
2071 ], 2143 ],
2072 ); 2144 );
2073 2145
2074 $self->{children}[1]->connect (changed => sub { 2146 $self->{children}[1]->connect (changed => sub { $self->update });
2075 $self->update;
2076 });
2077 2147
2078 $self 2148 $self
2079} 2149}
2080 2150
2081sub set_fontsize { 2151sub set_fontsize {
… …
2089 my ($self, $text) = @_; 2159 my ($self, $text) = @_;
2090 2160
2091 my $layout = $self->{layout}; 2161 my $layout = $self->{layout};
2092 2162
2093 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2163 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094 $layout->set_width ($self->{w}); 2164 $layout->set_width ($self->{children}[0]{w});
2095 $layout->set_text ($text); 2165 $layout->set_text ($text);
2096 2166
2097 ($layout->size)[1] 2167 ($layout->size)[1]
2098} 2168}
2099 2169
… …
2152 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2222 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2153 2223
2154 delete $self->{texture}; 2224 delete $self->{texture};
2155 } 2225 }
2156 2226
2157 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2227 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2158 glClearColor 0, 0, 0, 1; 2228 glClearColor 0, 0, 0, 0;
2159 glClear GL_COLOR_BUFFER_BIT; 2229 glClear GL_COLOR_BUFFER_BIT;
2160 2230
2161 glEnable GL_BLEND; 2231 glEnable GL_BLEND;
2162 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2163 glEnable GL_TEXTURE_2D; 2233 glEnable GL_TEXTURE_2D;
… …
2195} 2265}
2196 2266
2197sub _draw { 2267sub _draw {
2198 my ($self) = @_; 2268 my ($self) = @_;
2199 2269
2200 if ($self->{texture}) { 2270 glEnable GL_BLEND;
2271 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2201 glEnable GL_TEXTURE_2D; 2272 glEnable GL_TEXTURE_2D;
2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1; 2274 glColor 1, 1, 1, 1;
2204 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2275 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2205 glDisable GL_TEXTURE_2D; 2276 glDisable GL_TEXTURE_2D;
2206 } 2277 glDisable GL_BLEND;
2207 2278
2208 $self->{children}[1]->draw; 2279 $self->{children}[1]->draw;
2209 2280
2210} 2281}
2211 2282
… …
2380 2451
2381sub size_request { 2452sub size_request {
2382 (32, 8) 2453 (32, 8)
2383} 2454}
2384 2455
2385sub draw { 2456sub _draw {
2386 my ($self) = @_; 2457 my ($self) = @_;
2387 2458
2459 return unless $::CONN;#d# manage and cache textures differently
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2389 2461
2462 # TODO animation
2390 if ($tex) { 2463 if ($tex) {
2391 glEnable GL_BLEND; 2464 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D; 2466 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2399 } 2472 }
2400} 2473}
2401 2474
2402############################################################################# 2475#############################################################################
2403 2476
2477package CFClient::UI::InventoryItem;
2478
2479our @ISA = CFClient::UI::HBox::;
2480
2481sub new {
2482 my $class = shift;
2483
2484 my %args = @_;
2485
2486 my $item = delete $args{item};
2487
2488 my $desc = $item->{nrof} < 2
2489 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}";
2491
2492
2493 my $self = $class->SUPER::new (
2494 can_hover => 1,
2495 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc)
2497 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498 connect_button_down => sub {
2499 my ($self, $ev, $x, $y) = @_;
2500
2501 # todo: maybe put examine on 1? but should just be a tooltip :(
2502 if ($ev->{button} == 1) {
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517 ],
2518 )->popup ($ev);
2519 }
2520
2521 1
2522 },
2523 %args
2524 );
2525
2526 $self->add (new CFClient::UI::Face
2527 can_events => 0,
2528 face => $item->{face},
2529 anim => $item->{anim},
2530 animspeed => $item->{animspeed},
2531 );
2532
2533 $self->add (new CFClient::UI::Label
2534 can_events => 0,
2535 text => $desc,
2536 );
2537
2538 $self
2539}
2540
2541#############################################################################
2542
2543package CFClient::UI::Inventory;
2544
2545our @ISA = CFClient::UI::ScrolledWindow::;
2546
2547sub new {
2548 my $class = shift;
2549
2550 my $self = $class->SUPER::new (
2551 scrolled => (new CFClient::UI::VBox),
2552 @_,
2553 );
2554
2555 $self
2556}
2557
2558sub set_items {
2559 my ($self, $items) = @_;
2560
2561 $self->{scrolled}->clear;
2562 return unless $items;
2563
2564 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2565
2566 $self->{real_items} = \@items;
2567
2568 for my $item (@items) {
2569 my $desc = $item->{nrof} < 2
2570 ? $item->{name}
2571 : "$item->{nrof} $item->{name_pl}";
2572
2573 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2574 }
2575
2576# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2577}
2578
2579sub size_request {
2580 my ($self) = @_;
2581 ($self->{req_w}, $self->{req_h});
2582}
2583
2584#############################################################################
2585
2586package CFClient::UI::Menu;
2587
2588our @ISA = CFClient::UI::FancyFrame::;
2589
2590use CFClient::OpenGL;
2591
2592sub new {
2593 my $class = shift;
2594
2595 my $self = $class->SUPER::new (
2596 items => [],
2597 z => 100,
2598 @_,
2599 );
2600
2601 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2602
2603 for my $item (@{ $self->{items} }) {
2604 my ($widget, $cb) = @$item;
2605
2606 # handle various types of items, only text for now
2607 if (!ref $widget) {
2608 $widget = new CFClient::UI::Label
2609 can_hover => 1,
2610 can_events => 1,
2611 text => $widget;
2612 }
2613
2614 $self->{item}{$widget} = $item;
2615
2616 $self->{vbox}->add ($widget);
2617 }
2618
2619 $self
2620}
2621
2622# popup given the event (must be a mouse button down event currently)
2623sub popup {
2624 my ($self, $ev) = @_;
2625
2626 $self->emit ("popdown");
2627
2628 # maybe save $GRAB? must be careful about events...
2629 $GRAB = $self;
2630 $self->{button} = $ev->{button};
2631
2632 $self->show;
2633 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2634}
2635
2636sub mouse_motion {
2637 my ($self, $ev, $x, $y) = @_;
2638
2639 # TODO: should use vbox->find_widget or so
2640 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2641 $self->{hover} = $self->{item}{$HOVER};
2642}
2643
2644sub button_up {
2645 my ($self, $ev, $x, $y) = @_;
2646
2647 if ($ev->{button} == $self->{button}) {
2648 undef $GRAB;
2649 $self->hide;
2650
2651 $self->emit ("popdown");
2652 $self->{hover}[1]->() if $self->{hover};
2653 }
2654}
2655
2656#############################################################################
2657
2404package CFClient::UI::Root; 2658package CFClient::UI::Root;
2405 2659
2406our @ISA = CFClient::UI::Container::; 2660our @ISA = CFClient::UI::Container::;
2407 2661
2408use CFClient::OpenGL; 2662use CFClient::OpenGL;
2409 2663
2410sub check_size { 2664sub new {
2411 my ($self) = @_; 2665 my $class = shift;
2412 2666
2413 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2667 $class->SUPER::new (
2414} 2668 @_,
2415 2669 )
2416sub size_request {
2417 ($::WIDTH, $::HEIGHT)
2418} 2670}
2419 2671
2420sub configure { 2672sub configure {
2421 my ($self, $x, $y, $w, $h) = @_; 2673 my ($self, $x, $y, $w, $h) = @_;
2422 2674
2423 $self->SUPER::configure ($x, $y, $w, $h); 2675 $self->{w} = $w;
2676 $self->{h} = $h;
2677}
2424 2678
2679sub check_size {
2680 my ($self) = @_;
2681
2682 $self->size_allocate ($self->{w}, $self->{h})
2683 if $self->{w};
2684}
2685
2686sub size_request {
2687 my ($self) = @_;
2688
2689 ($self->{w}, $self->{h})
2690}
2691
2692sub size_allocate {
2693 my ($self, $w, $h) = @_;
2694
2695 my $old_w = $self->{old_w};
2696 my $old_h = $self->{old_h};
2697
2698 if ($old_w && $old_h) {
2699 for my $child ($self->children) {
2700 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2701 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2702 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2703 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2704 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2705 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2706 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2707 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2708 }
2709 }
2710
2425 for my $child (@{$self->{children}}) { 2711 for my $child ($self->children) {
2426 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2712 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2427 2713
2428 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2714 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2429 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2715 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2430 $child->configure ($X, $Y, $W,$H); 2716 $child->configure ($X, $Y, $W, $H);
2431 } 2717 }
2432}
2433 2718
2434sub _topleft { 2719 $self->{old_w} = $w;
2720 $self->{old_h} = $h;
2721}
2722
2723sub coord2local {
2435 my ($self, $x, $y) = @_; 2724 my ($self, $x, $y) = @_;
2436 2725
2437 ($x, $y) 2726 ($x, $y)
2438} 2727}
2439 2728
2729sub coord2global {
2730 my ($self, $x, $y) = @_;
2731
2732 ($x, $y)
2733}
2734
2440sub update { 2735sub update {
2441 my ($self) = @_; 2736 my ($self) = @_;
2442 2737
2443 $self->check_size; 2738 $self->check_size;
2444 ::refresh (); 2739 $::WANT_REFRESH++;
2445} 2740}
2446 2741
2447sub add { 2742sub add {
2448 my ($self, $child) = @_; 2743 my ($self, $child) = @_;
2449 2744
2450 # integerize window positions 2745 # integerise window positions
2451 $child->{x} = int $child->{x}; 2746 $child->{x} = int $child->{x};
2452 $child->{y} = int $child->{y}; 2747 $child->{y} = int $child->{y};
2453 2748
2454 $self->SUPER::add ($child); 2749 $self->SUPER::add ($child);
2455} 2750}
… …
2458 my ($self, $id, $cb) = @_; 2753 my ($self, $id, $cb) = @_;
2459 2754
2460 $self->{refresh_hook}{$id} = $cb; 2755 $self->{refresh_hook}{$id} = $cb;
2461} 2756}
2462 2757
2463sub draw { 2758sub draw {
2464 my ($self) = @_; 2759 my ($self) = @_;
2465 2760
2761 if ($self->{check_size}) {
2762 my @queue = ([], []);
2763
2764 for (;;) {
2765 if ($self->{check_size}) {
2766 # heuristic: check containers last
2767 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2768 for values %{delete $self->{check_size}}
2769 }
2770
2771 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2772
2773 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2774 ? @$widget{qw(user_w user_h)}
2775 : $widget->size_request;
2776
2777 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2778 $widget->{req_w} = $w;
2779 $widget->{req_h} = $h;
2780
2781 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2782
2783 $widget->{parent}->check_size
2784 if $widget->{parent};
2785 }
2786 }
2787 }
2788
2789 while ($self->{size_alloc}) {
2790 for (values %{delete $self->{size_alloc}}) {
2791 my ($widget, $w, $h) = @$_;
2792
2793 $widget->{w} = $w;
2794 $widget->{h} = $h;
2795 $widget->size_allocate ($w, $h);
2796 $widget->emit (size_allocate => $w, $h);
2797 }
2798 }
2799
2466 while (my $rcb = delete $self->{refresh_hook}) { 2800 while ($self->{refresh_hook}) {
2467 $_->() for values %$rcb; 2801 $_->()
2802 for values %{delete $self->{refresh_hook}};
2468 } 2803 }
2469 2804
2470 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2805 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2471 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2806 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2472 glClear GL_COLOR_BUFFER_BIT; 2807 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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