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.191 by root, Tue May 9 22:27:53 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
245sub children {
246}
247
248# call when resolution changes etc.
249sub reconfigure {
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $self->size_allocate ($self->{w}, $self->{h});
257 $self->update;
258}
259
241sub set_max_size { 260sub set_max_size {
242 my ($self, $w, $h) = @_; 261 my ($self, $w, $h) = @_;
243 262
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 263 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 264 delete $self->{max_h}; $self->{max_h} = $h if $h;
246}
247
248# return top left coordinates
249sub _topleft {
250 my ($self, $x, $y) = @_;
251
252 $self->{parent}
253 or Carp::confess "no parent widget in _topleft\n";#d#
254
255 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
256} 265}
257 266
258# translate global coordinates to local coordinate system 267# translate global coordinates to local coordinate system
259sub coord2local { 268sub coord2local {
260 my ($self, $x, $y) = @_; 269 my ($self, $x, $y) = @_;
261 270
262 my ($X, $Y) = $self->_topleft; 271 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
263 ($x - $X, $y - $Y)
264} 272}
265 273
266# translate local coordinates to global coordinate system 274# translate local coordinates to global coordinate system
267sub coord2global { 275sub coord2global {
268 my ($self, $x, $y) = @_; 276 my ($self, $x, $y) = @_;
269 277
270 my ($X, $Y) = $self->_topleft; 278 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
271 ($x + $X, $y + $Y)
272} 279}
273 280
274sub focus_in { 281sub focus_in {
275 my ($self) = @_; 282 my ($self) = @_;
276 283
… …
373} 380}
374 381
375sub set_parent { 382sub set_parent {
376 my ($self, $parent) = @_; 383 my ($self, $parent) = @_;
377 384
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
378 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
379} 387}
380 388
381sub check_size { 389sub check_size {
382 my ($self) = @_; 390 my ($self) = @_;
383 391
384 $self->{parent} 392 $CFClient::UI::ROOT->{check_size}{$self} = $self;
385 or return 1;
386
387 my ($w, $h) = $self->{user_w} && $self->{user_h}
388 ? @$self{qw(user_w user_h)}
389 : $self->size_request;
390
391 if ($w != $self->{req_w} || $h != $self->{req_h}) {
392 $self->{req_w} = $w;
393 $self->{req_h} = $h;
394
395 $self->{parent}->check_size
396 or $self->size_allocate (
397 (List::Util::max $self->{w}, $w),
398 (List::Util::max $self->{h}, $h),
399 );
400
401 1
402 } else {
403 0
404 }
405} 393}
406 394
407sub update { 395sub update {
408 my ($self) = @_; 396 my ($self) = @_;
409 397
… …
506 494
507 $self 495 $self
508} 496}
509 497
510sub add { 498sub add {
511 my ($self, $child) = @_; 499 my ($self, @widgets) = @_;
512 500
513 $child->set_parent ($self); 501 $_->set_parent ($self)
502 for @widgets;
514 503
515 use sort 'stable'; 504 use sort 'stable';
516 505
517 $self->{children} = [ 506 $self->{children} = [
518 sort { $a->{z} <=> $b->{z} } 507 sort { $a->{z} <=> $b->{z} }
519 @{$self->{children}}, $child 508 @{$self->{children}}, @widgets
520 ]; 509 ];
521 510
522 $child->check_size; 511 $_->check_size
512 for @widgets;
513
514 $self->update;
515}
516
517sub children {
518 @{ $_[0]{children} }
523} 519}
524 520
525sub remove { 521sub remove {
526 my ($self, $child) = @_; 522 my ($self, $child) = @_;
527 523
… …
542 538
543 for (@$children) { 539 for (@$children) {
544 delete $_->{parent}; 540 delete $_->{parent};
545 $_->hide; 541 $_->hide;
546 } 542 }
543
544 $self->check_size;
545 $self->update;
547} 546}
548 547
549sub find_widget { 548sub find_widget {
550 my ($self, $x, $y) = @_; 549 my ($self, $x, $y) = @_;
551 550
… …
626} 625}
627 626
628sub update { 627sub update {
629 my ($self) = @_; 628 my ($self) = @_;
630 629
631 # we want to do this delayed... 630 $ROOT->on_refresh ($self => sub { $self->render_child });
632 $self->render_chld;
633 $self->SUPER::update; 631 $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} 632}
645 633
646sub size_allocate { 634sub size_allocate {
647 my ($self, $w, $h) = @_; 635 my ($self, $w, $h) = @_;
648 636
649 $self->child->configure (0, 0, $w, $h); 637 $self->SUPER::size_allocate ($w, $h);
638 $self->update;
639}
650 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
651 $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 };
652} 661}
653 662
654sub _draw { 663sub _draw {
655 my ($self) = @_; 664 my ($self) = @_;
656 665
… …
658 667
659 my $tex = $self->{texture} 668 my $tex = $self->{texture}
660 or return; 669 or return;
661 670
662 glEnable GL_BLEND; 671 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D; 673 glEnable GL_TEXTURE_2D;
665 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;
666 676
667 $tex->draw_quad (0, 0, $w, $h); 677 $tex->draw_quad (0, 0, $w, $h);
668 678
669 glDisable GL_BLEND; 679 glDisable GL_BLEND;
670 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
… …
674 684
675package CFClient::UI::ViewPort; 685package CFClient::UI::ViewPort;
676 686
677our @ISA = CFClient::UI::Window::; 687our @ISA = CFClient::UI::Window::;
678 688
679sub new { die }
680
681sub size_request { 689sub size_request {
682 my ($self) = @_; 690 my ($self) = @_;
683 691
684 @$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)};
685 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
686 694
687 @$self{qw(child_w child_h)} 695 @$self{qw(child_w child_h)}
688} 696}
689 697
690sub _draw { 698sub size_allocate {
691 my ($self) = @_; 699 my ($self, $w, $h) = @_;
692 700
693 $self->{children}[1]->draw; 701 $self->update;
694} 702}
695 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
696 783
697############################################################################# 784#############################################################################
698 785
699package CFClient::UI::Frame; 786package CFClient::UI::Frame;
700 787
… …
757 # TODO: user_x, user_y, overwrite moveto? 844 # TODO: user_x, user_y, overwrite moveto?
758 845
759 my $self = $class->SUPER::new ( 846 my $self = $class->SUPER::new (
760 bg => [1, 1, 1, 1], 847 bg => [1, 1, 1, 1],
761 border_bg => [1, 1, 1, 1], 848 border_bg => [1, 1, 1, 1],
762 border => 0.8, 849 border => 0.6,
763 can_events => 1, 850 can_events => 1,
764 @_ 851 @_
765 ); 852 );
766 853
767 $self->{title} &&= new CFClient::UI::Label 854 $self->{title} &&= new CFClient::UI::Label
768 align => 0, 855 align => 0,
769 valign => 1, 856 valign => 1,
770 text => $self->{title}, 857 text => $self->{title},
771 fontsize => 1; 858 fontsize => $self->{border};
772 859
773 $self 860 $self
774} 861}
775 862
776sub border { 863sub border {
… …
801} 888}
802 889
803sub button_down { 890sub button_down {
804 my ($self, $ev, $x, $y) = @_; 891 my ($self, $ev, $x, $y) = @_;
805 892
893 my ($w, $h) = @$self{qw(w h)};
806 my $border = $self->border; 894 my $border = $self->border;
807 895
808 if ($x < $self->{w} && $x >= $self->{w} - $border 896 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
809 && $y < $self->{h} && $y >= $self->{h} - $border) { 897 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
810 898
899 if ($lr & $td) {
900 my ($wx, $wy) = ($self->{x}, $self->{y});
811 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 901 my ($ox, $oy) = ($ev->{x}, $ev->{y});
812 my ($bw, $bh) = ($self->{w}, $self->{h}); 902 my ($bw, $bh) = ($self->{w}, $self->{h});
813 903
904 my $mx = $x < $border;
905 my $my = $y < $border;
906
814 $self->{motion} = sub { 907 $self->{motion} = sub {
815 my ($ev, $x, $y) = @_; 908 my ($ev, $x, $y) = @_;
816 909
817 ($x, $y) = ($ev->{x}, $ev->{y}); 910 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy;
818 912
819 $self->{user_w} = $bw + $x - $ox; 913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
820 $self->{user_h} = $bh + $y - $oy; 914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
821 $self->check_size; 916 $self->check_size;
822 }; 917 };
823 918
824 } elsif ($x >= 0 && $x < $self->{w} 919 } elsif ($lr ^ $td) {
825 && $y >= 0 && $y < $border) {
826
827 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 920 my ($ox, $oy) = ($ev->{x}, $ev->{y});
828 my ($bx, $by) = ($self->{x}, $self->{y}); 921 my ($bx, $by) = ($self->{x}, $self->{y});
829 922
830 $self->{motion} = sub { 923 $self->{motion} = sub {
831 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
… …
867 $tex[1]->draw_quad (0, 0, $w, $border); 960 $tex[1]->draw_quad (0, 0, $w, $border);
868 $tex[3]->draw_quad (0, $border, $border, $ch); 961 $tex[3]->draw_quad (0, $border, $border, $ch);
869 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
870 $tex[4]->draw_quad (0, $h - $border, $w, $border); 963 $tex[4]->draw_quad (0, $h - $border, $w, $border);
871 964
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
872 my $bg = $tex[0]; 966 my $bg = $tex[0];
873 967
874 # TODO: repeat texture not scale 968 # TODO: repeat texture not scale
875 my $rep_x = $cw / $bg->{w}; 969 my $rep_x = $cw / $bg->{w};
876 my $rep_y = $ch / $bg->{h}; 970 my $rep_y = $ch / $bg->{h};
877 971
878 glColor @{ $self->{bg} }; 972 glColor @{ $self->{bg} };
879 973
880 $bg->{s} = $rep_x; 974 $bg->{s} = $rep_x;
881 $bg->{t} = $rep_y; 975 $bg->{t} = $rep_y;
882 $bg->{wrap_mode} = 1; 976 $bg->{wrap_mode} = 1;
883 $bg->draw_quad ($border, $border, $cw, $ch); 977 $bg->draw_quad ($border, $border, $cw, $ch);
884 978
885 glDisable GL_TEXTURE_2D; 979 glDisable GL_TEXTURE_2D;
886 glDisable GL_BLEND; 980 glDisable GL_BLEND;
981 }
887 982
888 $self->{title}->draw if $self->{title}; 983 $self->{title}->draw if $self->{title};
984
889 $self->child->draw; 985 $self->child->draw;
890} 986}
891 987
892############################################################################# 988#############################################################################
893 989
… …
915 $self->{children}[$y][$x] = $child; 1011 $self->{children}[$y][$x] = $child;
916 1012
917 $child->check_size; 1013 $child->check_size;
918} 1014}
919 1015
1016sub children {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018}
1019
920# TODO: move to container class maybe? send childs a signal on removal? 1020# TODO: move to container class maybe? send childs a signal on removal?
921sub clear { 1021sub clear {
922 my ($self) = @_; 1022 my ($self) = @_;
923 1023
924 my $children = delete $self->{children}; 1024 my @children = $self->children;
1025 delete $self->{children};
925 1026
926 for (grep $_, map @$_, grep $_, @$children) { 1027 for (@children) {
927 delete $_->{parent}; 1028 delete $_->{parent};
928 $_->hide; 1029 $_->hide;
929 } 1030 }
930 1031
931 $self->update; 1032 $self->update;
… …
1192 s/</&lt;/g; 1293 s/</&lt;/g;
1193 1294
1194 $_[1] 1295 $_[1]
1195} 1296}
1196 1297
1298sub update {
1299 my ($self) = @_;
1300
1301 delete $self->{texture};
1302 $self->SUPER::update;
1303}
1304
1197sub set_text { 1305sub set_text {
1198 my ($self, $text) = @_; 1306 my ($self, $text) = @_;
1199 1307
1308 return if $self->{text} eq "T$text";
1309 $self->{text} = "T$text";
1310
1200 $self->{layout}->set_text ($text); 1311 $self->{layout}->set_text ($text);
1201 1312
1202 delete $self->{texture}; 1313 $self->update;
1203 $self->check_size; 1314 $self->check_size;
1204 $self->update;
1205} 1315}
1206 1316
1207sub set_markup { 1317sub set_markup {
1208 my ($self, $markup) = @_; 1318 my ($self, $markup) = @_;
1209 1319
1320 return if $self->{text} eq "M$markup";
1321 $self->{text} = "M$markup";
1322
1210 $self->{layout}->set_markup ($markup); 1323 $self->{layout}->set_markup ($markup);
1211 1324
1212 delete $self->{texture}; 1325 $self->update;
1213 $self->check_size; 1326 $self->check_size;
1214 $self->update;
1215} 1327}
1216 1328
1217sub size_request { 1329sub size_request {
1218 my ($self) = @_; 1330 my ($self) = @_;
1219 1331
… …
1248sub set_fontsize { 1360sub set_fontsize {
1249 my ($self, $fontsize) = @_; 1361 my ($self, $fontsize) = @_;
1250 1362
1251 $self->{fontsize} = $fontsize; 1363 $self->{fontsize} = $fontsize;
1252 delete $self->{texture}; 1364 delete $self->{texture};
1365
1366 $self->update;
1253 $self->check_size; 1367 $self->check_size;
1254 $self->update;
1255} 1368}
1256 1369
1257sub _draw { 1370sub _draw {
1258 my ($self) = @_; 1371 my ($self) = @_;
1259 1372
… …
1743} 1856}
1744 1857
1745sub set_max { 1858sub set_max {
1746 my ($self, $max) = @_; 1859 my ($self, $max) = @_;
1747 1860
1861 return if $self->{max_val} == $max;
1862
1748 $self->{max_val} = $max; 1863 $self->{max_val} = $max;
1864 $self->update;
1749} 1865}
1750 1866
1751sub set_value { 1867sub set_value {
1752 my ($self, $val, $max) = @_; 1868 my ($self, $val, $max) = @_;
1753 1869
1754 $self->set_max ($max) 1870 $self->set_max ($max)
1755 if defined $max; 1871 if defined $max;
1756 1872
1757 $max = $self->{max_val}; 1873 return if $self->{val} == $val;
1874
1758 $self->{val} = $val; 1875 $self->{val} = $val;
1759
1760 $self->update; 1876 $self->update;
1761} 1877}
1762 1878
1763sub _draw { 1879sub _draw {
1764 my ($self) = @_; 1880 my ($self) = @_;
… …
1847 1963
1848 $self->{value}->set_fontsize ($fsize); 1964 $self->{value}->set_fontsize ($fsize);
1849 $self->{max} ->set_fontsize ($fsize); 1965 $self->{max} ->set_fontsize ($fsize);
1850} 1966}
1851 1967
1968sub set_max {
1969 my ($self, $max) = @_;
1970
1971 $self->{gauge}->set_max ($max);
1972 $self->{max}->set_text ($max);
1973}
1974
1852sub set_value { 1975sub set_value {
1853 my ($self, $val, $max) = @_; 1976 my ($self, $val, $max) = @_;
1854 1977
1855 $self->set_max ($max) 1978 $self->set_max ($max)
1856 if defined $max; 1979 if defined $max;
1857 1980
1858 $self->{gauge}->set_value ($val, $max); 1981 $self->{gauge}->set_value ($val, $max);
1859 $self->{value}->set_text ($val); 1982 $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} 1983}
1868 1984
1869############################################################################# 1985#############################################################################
1870 1986
1871package CFClient::UI::Slider; 1987package CFClient::UI::Slider;
… …
1890 # TODO: calculations are off 2006 # TODO: calculations are off
1891 my $self = $class->SUPER::new ( 2007 my $self = $class->SUPER::new (
1892 fg => [1, 1, 1], 2008 fg => [1, 1, 1],
1893 active_fg => [0, 0, 0], 2009 active_fg => [0, 0, 0],
1894 range => [0, 0, 100, 10], 2010 range => [0, 0, 100, 10],
1895 req_w => 20, 2011 req_w => $::WIDTH / 80,
1896 req_h => 20, 2012 req_h => $::WIDTH / 80,
1897 vertical => 0, 2013 vertical => 0,
1898 can_hover => 1, 2014 can_hover => 1,
1899 inner_pad => 5, 2015 inner_pad => 5,
1900 @_ 2016 @_
1901 ); 2017 );
… …
2025 (new CFClient::UI::Empty expand => 1), 2141 (new CFClient::UI::Empty expand => 1),
2026 (new CFClient::UI::Slider vertical => 1), 2142 (new CFClient::UI::Slider vertical => 1),
2027 ], 2143 ],
2028 ); 2144 );
2029 2145
2030 $self->{children}[1]->connect (changed => sub { 2146 $self->{children}[1]->connect (changed => sub { $self->update });
2031 $self->update;
2032 });
2033 2147
2034 $self 2148 $self
2035} 2149}
2036 2150
2037sub set_fontsize { 2151sub set_fontsize {
… …
2045 my ($self, $text) = @_; 2159 my ($self, $text) = @_;
2046 2160
2047 my $layout = $self->{layout}; 2161 my $layout = $self->{layout};
2048 2162
2049 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2163 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2050 $layout->set_width ($self->{w}); 2164 $layout->set_width ($self->{children}[0]{w});
2051 $layout->set_text ($text); 2165 $layout->set_text ($text);
2052 2166
2053 ($layout->size)[1] 2167 ($layout->size)[1]
2054} 2168}
2055 2169
… …
2108 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2222 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2109 2223
2110 delete $self->{texture}; 2224 delete $self->{texture};
2111 } 2225 }
2112 2226
2113 $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 {
2114 glClearColor 0, 0, 0, 1; 2228 glClearColor 0, 0, 0, 0;
2115 glClear GL_COLOR_BUFFER_BIT; 2229 glClear GL_COLOR_BUFFER_BIT;
2116 2230
2117 glEnable GL_BLEND; 2231 glEnable GL_BLEND;
2118 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2119 glEnable GL_TEXTURE_2D; 2233 glEnable GL_TEXTURE_2D;
… …
2151} 2265}
2152 2266
2153sub _draw { 2267sub _draw {
2154 my ($self) = @_; 2268 my ($self) = @_;
2155 2269
2156 if ($self->{texture}) { 2270 glEnable GL_BLEND;
2271 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2157 glEnable GL_TEXTURE_2D; 2272 glEnable GL_TEXTURE_2D;
2158 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274 glColor 1, 1, 1, 1;
2159 $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});
2160 glDisable GL_TEXTURE_2D; 2276 glDisable GL_TEXTURE_2D;
2161 } 2277 glDisable GL_BLEND;
2162 2278
2163 $self->{children}[1]->draw; 2279 $self->{children}[1]->draw;
2164 2280
2165} 2281}
2166 2282
… …
2335 2451
2336sub size_request { 2452sub size_request {
2337 (32, 8) 2453 (32, 8)
2338} 2454}
2339 2455
2340sub draw { 2456sub _draw {
2341 my ($self) = @_; 2457 my ($self) = @_;
2342 2458
2459 return unless $::CONN;#d# manage and cache textures differently
2343 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2344 2461
2462 # TODO animation
2345 if ($tex) { 2463 if ($tex) {
2346 glEnable GL_BLEND; 2464 glEnable GL_BLEND;
2347 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2348 glEnable GL_TEXTURE_2D; 2466 glEnable GL_TEXTURE_2D;
2349 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2354 } 2472 }
2355} 2473}
2356 2474
2357############################################################################# 2475#############################################################################
2358 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 = $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 $self->add(new CFClient::UI::Face
2526 can_events => 0,
2527 face => $item->{face},
2528 anim => $item->{anim},
2529 animspeed => $item->{animspeed});
2530 $self->add(new CFClient::UI::Label
2531 can_events => 0,
2532 text => $desc);
2533
2534 $self
2535}
2536
2537#############################################################################
2538
2539package CFClient::UI::Inventory;
2540
2541our @ISA = CFClient::UI::ScrolledWindow::;
2542
2543sub new {
2544 my $class = shift;
2545
2546 my $self = $class->SUPER::new (
2547 scrolled => (new CFClient::UI::VBox),
2548 @_,
2549 );
2550
2551 $self
2552}
2553
2554sub set_items {
2555 my ($self, $items) = @_;
2556
2557 $self->{scrolled}->clear;
2558 return unless $items;
2559
2560 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2561
2562 $self->{real_items} = \@items;
2563
2564 for my $item (@items) {
2565 my $desc = $item->{nrof} < 2
2566 ? $item->{name}
2567 : "$item->{nrof} $item->{name_pl}";
2568
2569 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2570 }
2571
2572# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2573}
2574
2575sub size_request {
2576 my ($self) = @_;
2577 ($self->{req_w}, $self->{req_h});
2578}
2579
2580#############################################################################
2581
2582package CFClient::UI::Menu;
2583
2584our @ISA = CFClient::UI::FancyFrame::;
2585
2586use CFClient::OpenGL;
2587
2588sub new {
2589 my $class = shift;
2590
2591 my $self = $class->SUPER::new (
2592 items => [],
2593 z => 100,
2594 @_,
2595 );
2596
2597 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2598
2599 for my $item (@{ $self->{items} }) {
2600 my ($widget, $cb) = @$item;
2601
2602 # handle various types of items, only text for now
2603 if (!ref $widget) {
2604 $widget = new CFClient::UI::Label
2605 can_hover => 1,
2606 can_events => 1,
2607 text => $widget;
2608 }
2609
2610 $self->{item}{$widget} = $item;
2611
2612 $self->{vbox}->add ($widget);
2613 }
2614
2615 $self
2616}
2617
2618# popup given the event (must be a mouse button down event currently)
2619sub popup {
2620 my ($self, $ev) = @_;
2621
2622 $self->emit ("popdown");
2623
2624 # maybe save $GRAB? must be careful about events...
2625 $GRAB = $self;
2626 $self->{button} = $ev->{button};
2627
2628 $self->show;
2629 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2630}
2631
2632sub mouse_motion {
2633 my ($self, $ev, $x, $y) = @_;
2634
2635 # TODO: should use vbox->find_widget or so
2636 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2637 $self->{hover} = $self->{item}{$HOVER};
2638}
2639
2640sub button_up {
2641 my ($self, $ev, $x, $y) = @_;
2642
2643 if ($ev->{button} == $self->{button}) {
2644 undef $GRAB;
2645 $self->hide;
2646
2647 $self->emit ("popdown");
2648 $self->{hover}[1]->() if $self->{hover};
2649 }
2650}
2651
2652#############################################################################
2653
2359package CFClient::UI::Root; 2654package CFClient::UI::Root;
2360 2655
2361our @ISA = CFClient::UI::Container::; 2656our @ISA = CFClient::UI::Container::;
2362 2657
2363use CFClient::OpenGL; 2658use CFClient::OpenGL;
2364 2659
2365sub check_size { 2660sub new {
2366 my ($self) = @_; 2661 my $class = shift;
2367 2662
2368 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2663 $class->SUPER::new (
2369} 2664 @_,
2370 2665 )
2371sub size_request {
2372 ($::WIDTH, $::HEIGHT)
2373} 2666}
2374 2667
2375sub configure { 2668sub configure {
2376 my ($self, $x, $y, $w, $h) = @_; 2669 my ($self, $x, $y, $w, $h) = @_;
2377 2670
2378 $self->SUPER::configure ($x, $y, $w, $h); 2671 $self->{w} = $w;
2672 $self->{h} = $h;
2673}
2379 2674
2675sub check_size {
2676 my ($self) = @_;
2677
2678 $self->size_allocate ($self->{w}, $self->{h})
2679 if $self->{w};
2680}
2681
2682sub size_request {
2683 my ($self) = @_;
2684
2685 ($self->{w}, $self->{h})
2686}
2687
2688sub size_allocate {
2689 my ($self, $w, $h) = @_;
2690
2691 my $old_w = $self->{old_w};
2692 my $old_h = $self->{old_h};
2693
2694 if ($old_w && $old_h) {
2695 for my $child ($self->children) {
2696 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2697 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2698 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2699 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2700 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2701 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2702 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2703 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2704 }
2705 }
2706
2380 for my $child (@{$self->{children}}) { 2707 for my $child ($self->children) {
2381 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2708 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2382 2709
2383 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2710 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2384 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2711 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2385 $child->configure ($X, $Y, $W,$H); 2712 $child->configure ($X, $Y, $W, $H);
2386 } 2713 }
2387}
2388 2714
2389sub _topleft { 2715 $self->{old_w} = $w;
2716 $self->{old_h} = $h;
2717}
2718
2719sub coord2local {
2390 my ($self, $x, $y) = @_; 2720 my ($self, $x, $y) = @_;
2391 2721
2392 ($x, $y) 2722 ($x, $y)
2393} 2723}
2394 2724
2725sub coord2global {
2726 my ($self, $x, $y) = @_;
2727
2728 ($x, $y)
2729}
2730
2395sub update { 2731sub update {
2396 my ($self) = @_; 2732 my ($self) = @_;
2397 2733
2398 $self->check_size; 2734 $self->check_size;
2399 ::refresh (); 2735 $::WANT_REFRESH++;
2400} 2736}
2401 2737
2402sub add { 2738sub add {
2403 my ($self, $child) = @_; 2739 my ($self, $child) = @_;
2404 2740
2405 # integerize window positions 2741 # integerise window positions
2406 $child->{x} = int $child->{x}; 2742 $child->{x} = int $child->{x};
2407 $child->{y} = int $child->{y}; 2743 $child->{y} = int $child->{y};
2408 2744
2409 $self->SUPER::add ($child); 2745 $self->SUPER::add ($child);
2410} 2746}
… …
2413 my ($self, $id, $cb) = @_; 2749 my ($self, $id, $cb) = @_;
2414 2750
2415 $self->{refresh_hook}{$id} = $cb; 2751 $self->{refresh_hook}{$id} = $cb;
2416} 2752}
2417 2753
2418sub draw { 2754sub draw {
2419 my ($self) = @_; 2755 my ($self) = @_;
2420 2756
2757 if ($self->{check_size}) {
2758 my @queue = ([], []);
2759
2760 for (;;) {
2761 if ($self->{check_size}) {
2762 # heuristic: check containers last
2763 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2764 for values %{delete $self->{check_size}}
2765 }
2766
2767 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2768
2769 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2770 ? @$widget{qw(user_w user_h)}
2771 : $widget->size_request;
2772
2773 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2774 $widget->{req_w} = $w;
2775 $widget->{req_h} = $h;
2776
2777 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2778
2779 $widget->{parent}->check_size
2780 if $widget->{parent};
2781 }
2782 }
2783 }
2784
2785 while ($self->{size_alloc}) {
2786 for (values %{delete $self->{size_alloc}}) {
2787 my ($widget, $w, $h) = @$_;
2788
2789 $widget->{w} = $w;
2790 $widget->{h} = $h;
2791 $widget->size_allocate ($w, $h);
2792 $widget->emit (size_allocate => $w, $h);
2793 }
2794 }
2795
2421 while (my $rcb = delete $self->{refresh_hook}) { 2796 while ($self->{refresh_hook}) {
2422 $_->() for values %$rcb; 2797 $_->()
2798 for values %{delete $self->{refresh_hook}};
2423 } 2799 }
2424 2800
2425 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2801 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2426 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2802 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2427 glClear GL_COLOR_BUFFER_BIT; 2803 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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