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.190 by root, Mon May 8 22:17:38 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
… …
379} 403}
380 404
381sub check_size { 405sub check_size {
382 my ($self) = @_; 406 my ($self) = @_;
383 407
408 $self->_check_size;
409 return;
410 #TODO: but needs a vastly more difficult algorithm
411 my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
412
413 $check_size->{$self} = $self;
414
415 $CFClient::UI::ROOT->on_refresh (_check_size => sub {
416 while (%$check_size) {
417 my @widgets = values %$check_size;
418 $_->_check_size
419 for @widgets;
420 }
421 });
422}
423
424sub _check_size {
425 my ($self) = @_;
426
427 delete $CFClient::UI::ROOT->{_check_size}{$self};
428
384 $self->{parent} 429 $self->{parent}
385 or return 1; 430 or return 1;
386 431
387 my ($w, $h) = $self->{user_w} && $self->{user_h} 432 my ($w, $h) = $self->{user_w} && $self->{user_h}
388 ? @$self{qw(user_w user_h)} 433 ? @$self{qw(user_w user_h)}
… …
390 435
391 if ($w != $self->{req_w} || $h != $self->{req_h}) { 436 if ($w != $self->{req_w} || $h != $self->{req_h}) {
392 $self->{req_w} = $w; 437 $self->{req_w} = $w;
393 $self->{req_h} = $h; 438 $self->{req_h} = $h;
394 439
395 $self->{parent}->check_size 440 $self->{parent}->_check_size
396 or $self->size_allocate ( 441 or $self->size_allocate (
397 (List::Util::max $self->{w}, $w), 442 (List::Util::max $self->{w}, $w),
398 (List::Util::max $self->{h}, $h), 443 (List::Util::max $self->{h}, $h),
399 ); 444 );
400 445
… …
405} 450}
406 451
407sub update { 452sub update {
408 my ($self) = @_; 453 my ($self) = @_;
409 454
410 $self->{parent}->update 455 my $update = $CFClient::UI::ROOT->{_update} ||= {};
411 if $self->{parent}; 456
457 $update->{$self} = $self;
458
459 $CFClient::UI::ROOT->on_refresh (_update => sub {
460 while (%$update) {
461 my @widgets = values %$update;
462 %$update = ();
463
464 $_->{parent} && $_->{parent}->update
465 for @widgets;
466 }
467 });
412} 468}
413 469
414sub connect { 470sub connect {
415 my ($self, $signal, $cb) = @_; 471 my ($self, $signal, $cb) = @_;
416 472
… …
506 562
507 $self 563 $self
508} 564}
509 565
510sub add { 566sub add {
511 my ($self, $child) = @_; 567 my ($self, @widgets) = @_;
512 568
513 $child->set_parent ($self); 569 $_->set_parent ($self)
570 for @widgets;
514 571
515 use sort 'stable'; 572 use sort 'stable';
516 573
517 $self->{children} = [ 574 $self->{children} = [
518 sort { $a->{z} <=> $b->{z} } 575 sort { $a->{z} <=> $b->{z} }
519 @{$self->{children}}, $child 576 @{$self->{children}}, @widgets
520 ]; 577 ];
521 578
522 $child->check_size; 579 $_->check_size
580 for @widgets;
581
582 $self->update;
583}
584
585sub children {
586 @{ $_[0]{children} }
523} 587}
524 588
525sub remove { 589sub remove {
526 my ($self, $child) = @_; 590 my ($self, $child) = @_;
527 591
… …
542 606
543 for (@$children) { 607 for (@$children) {
544 delete $_->{parent}; 608 delete $_->{parent};
545 $_->hide; 609 $_->hide;
546 } 610 }
611
612 $self->check_size;
613 $self->update;
547} 614}
548 615
549sub find_widget { 616sub find_widget {
550 my ($self, $x, $y) = @_; 617 my ($self, $x, $y) = @_;
551 618
… …
626} 693}
627 694
628sub update { 695sub update {
629 my ($self) = @_; 696 my ($self) = @_;
630 697
631 # we want to do this delayed... 698 $ROOT->on_refresh ($self => sub { $self->render_child });
632 $self->render_chld;
633 $self->SUPER::update; 699 $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} 700}
645 701
646sub size_allocate { 702sub size_allocate {
647 my ($self, $w, $h) = @_; 703 my ($self, $w, $h) = @_;
648 704
649 $self->child->configure (0, 0, $w, $h); 705 $self->SUPER::size_allocate ($w, $h);
706 $self->update;
707}
650 708
709sub _render {
710 $_[0]{children}[0]->draw;
711}
712
713sub render_child {
714 my ($self) = @_;
715
716 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
717 glClearColor 0, 0, 0, 0;
718 glClear GL_COLOR_BUFFER_BIT;
719
651 $self->render_chld; 720 $self->_render;
721# glColorMask 1, 1, 1, 0;
722# glEnable GL_BLEND;
723# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
724# glRasterPos 0, 0;
725# glCopyPixels 0, 0, $self->{w}, $self->{h};
726# glDisable GL_BLEND;
727# glColorMask 1, 1, 1, 1;
728 };
652} 729}
653 730
654sub _draw { 731sub _draw {
655 my ($self) = @_; 732 my ($self) = @_;
656 733
… …
658 735
659 my $tex = $self->{texture} 736 my $tex = $self->{texture}
660 or return; 737 or return;
661 738
662 glEnable GL_BLEND; 739 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 740 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D; 741 glEnable GL_TEXTURE_2D;
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
743 glColor 0, 0, 0, 1;
666 744
667 $tex->draw_quad (0, 0, $w, $h); 745 $tex->draw_quad (0, 0, $w, $h);
668 746
669 glDisable GL_BLEND; 747 glDisable GL_BLEND;
670 glDisable GL_TEXTURE_2D; 748 glDisable GL_TEXTURE_2D;
… …
674 752
675package CFClient::UI::ViewPort; 753package CFClient::UI::ViewPort;
676 754
677our @ISA = CFClient::UI::Window::; 755our @ISA = CFClient::UI::Window::;
678 756
679sub new { die }
680
681sub size_request { 757sub size_request {
682 my ($self) = @_; 758 my ($self) = @_;
683 759
684 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 760 @$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)}); 761 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
686 762
687 @$self{qw(child_w child_h)} 763 @$self{qw(child_w child_h)}
688} 764}
689 765
690sub _draw { 766sub size_allocate {
691 my ($self) = @_; 767 my ($self, $w, $h) = @_;
692 768
693 $self->{children}[1]->draw; 769 $self->update;
694} 770}
695 771
772sub set_offset {
773 my ($self, $x, $y) = @_;
774
775 $self->{view_x} = int $x;
776 $self->{view_y} = int $y;
777
778 $self->update;
779}
780
781# hmm, this does not work for topleft of $self... but we should not aks for that
782sub _topleft {
783 my ($self, $x, $y) = @_;
784
785 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
786}
787
788sub find_widget {
789 my ($self, $x, $y) = @_;
790
791 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
792 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
793 ) {
794 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
795 } else {
796 $self->CFClient::UI::Base::find_widget ($x, $y)
797 }
798}
799
800sub _render {
801 my ($self) = @_;
802
803 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
804
805 $self->SUPER::_render;
806}
807
808#############################################################################
809
810package CFClient::UI::ScrolledWindow;
811
812our @ISA = CFClient::UI::HBox::;
813
814sub new {
815 my $class = shift;
816
817 my $self;
818
819 my $slider = new CFClient::UI::Slider
820 vertical => 1,
821 range => [0, 0, 1, 0.01], # HACK fix
822 connect_changed => sub {
823 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
824 },
825 ;
826
827 $self = $class->SUPER::new (
828 vp => (new CFClient::UI::ViewPort),
829 slider => $slider,
830 @_,
831 );
832
833 $self->{vp}->add ($self->{scrolled});
834 $self->add ($self->{vp});
835 $self->add ($self->{slider});
836
837 $self
838}
839
840#TODO# update range on size_allocate depeneing on child
841# update viewport offset on scroll
696 842
697############################################################################# 843#############################################################################
698 844
699package CFClient::UI::Frame; 845package CFClient::UI::Frame;
700 846
… …
757 # TODO: user_x, user_y, overwrite moveto? 903 # TODO: user_x, user_y, overwrite moveto?
758 904
759 my $self = $class->SUPER::new ( 905 my $self = $class->SUPER::new (
760 bg => [1, 1, 1, 1], 906 bg => [1, 1, 1, 1],
761 border_bg => [1, 1, 1, 1], 907 border_bg => [1, 1, 1, 1],
762 border => 0.8, 908 border => 0.6,
763 can_events => 1, 909 can_events => 1,
764 @_ 910 @_
765 ); 911 );
766 912
767 $self->{title} &&= new CFClient::UI::Label 913 $self->{title} &&= new CFClient::UI::Label
768 align => 0, 914 align => 0,
769 valign => 1, 915 valign => 1,
770 text => $self->{title}, 916 text => $self->{title},
771 fontsize => 1; 917 fontsize => $self->{border};
772 918
773 $self 919 $self
774} 920}
775 921
776sub border { 922sub border {
… …
801} 947}
802 948
803sub button_down { 949sub button_down {
804 my ($self, $ev, $x, $y) = @_; 950 my ($self, $ev, $x, $y) = @_;
805 951
952 my ($w, $h) = @$self{qw(w h)};
806 my $border = $self->border; 953 my $border = $self->border;
807 954
808 if ($x < $self->{w} && $x >= $self->{w} - $border 955 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
809 && $y < $self->{h} && $y >= $self->{h} - $border) { 956 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
810 957
958 if ($lr & $td) {
959 my ($wx, $wy) = ($self->{x}, $self->{y});
811 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 960 my ($ox, $oy) = ($ev->{x}, $ev->{y});
812 my ($bw, $bh) = ($self->{w}, $self->{h}); 961 my ($bw, $bh) = ($self->{w}, $self->{h});
813 962
963 my $mx = $x < $border;
964 my $my = $y < $border;
965
814 $self->{motion} = sub { 966 $self->{motion} = sub {
815 my ($ev, $x, $y) = @_; 967 my ($ev, $x, $y) = @_;
816 968
817 ($x, $y) = ($ev->{x}, $ev->{y}); 969 my $dx = $ev->{x} - $ox;
970 my $dy = $ev->{y} - $oy;
818 971
819 $self->{user_w} = $bw + $x - $ox; 972 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
820 $self->{user_h} = $bh + $y - $oy; 973 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
974 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
821 $self->check_size; 975 $self->check_size;
822 }; 976 };
823 977
824 } elsif ($x >= 0 && $x < $self->{w} 978 } elsif ($lr ^ $td) {
825 && $y >= 0 && $y < $border) {
826
827 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 979 my ($ox, $oy) = ($ev->{x}, $ev->{y});
828 my ($bx, $by) = ($self->{x}, $self->{y}); 980 my ($bx, $by) = ($self->{x}, $self->{y});
829 981
830 $self->{motion} = sub { 982 $self->{motion} = sub {
831 my ($ev, $x, $y) = @_; 983 my ($ev, $x, $y) = @_;
… …
867 $tex[1]->draw_quad (0, 0, $w, $border); 1019 $tex[1]->draw_quad (0, 0, $w, $border);
868 $tex[3]->draw_quad (0, $border, $border, $ch); 1020 $tex[3]->draw_quad (0, $border, $border, $ch);
869 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1021 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
870 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1022 $tex[4]->draw_quad (0, $h - $border, $w, $border);
871 1023
1024 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
872 my $bg = $tex[0]; 1025 my $bg = $tex[0];
873 1026
874 # TODO: repeat texture not scale 1027 # TODO: repeat texture not scale
875 my $rep_x = $cw / $bg->{w}; 1028 my $rep_x = $cw / $bg->{w};
876 my $rep_y = $ch / $bg->{h}; 1029 my $rep_y = $ch / $bg->{h};
877 1030
878 glColor @{ $self->{bg} }; 1031 glColor @{ $self->{bg} };
879 1032
880 $bg->{s} = $rep_x; 1033 $bg->{s} = $rep_x;
881 $bg->{t} = $rep_y; 1034 $bg->{t} = $rep_y;
882 $bg->{wrap_mode} = 1; 1035 $bg->{wrap_mode} = 1;
883 $bg->draw_quad ($border, $border, $cw, $ch); 1036 $bg->draw_quad ($border, $border, $cw, $ch);
884 1037
885 glDisable GL_TEXTURE_2D; 1038 glDisable GL_TEXTURE_2D;
886 glDisable GL_BLEND; 1039 glDisable GL_BLEND;
1040 }
887 1041
888 $self->{title}->draw if $self->{title}; 1042 $self->{title}->draw if $self->{title};
1043
889 $self->child->draw; 1044 $self->child->draw;
890} 1045}
891 1046
892############################################################################# 1047#############################################################################
893 1048
… …
915 $self->{children}[$y][$x] = $child; 1070 $self->{children}[$y][$x] = $child;
916 1071
917 $child->check_size; 1072 $child->check_size;
918} 1073}
919 1074
1075sub children {
1076 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1077}
1078
920# TODO: move to container class maybe? send childs a signal on removal? 1079# TODO: move to container class maybe? send childs a signal on removal?
921sub clear { 1080sub clear {
922 my ($self) = @_; 1081 my ($self) = @_;
923 1082
924 my $children = delete $self->{children}; 1083 my @children = $self->children;
1084 delete $self->{children};
925 1085
926 for (grep $_, map @$_, grep $_, @$children) { 1086 for (@children) {
927 delete $_->{parent}; 1087 delete $_->{parent};
928 $_->hide; 1088 $_->hide;
929 } 1089 }
930 1090
931 $self->update; 1091 $self->update;
… …
1192 s/</&lt;/g; 1352 s/</&lt;/g;
1193 1353
1194 $_[1] 1354 $_[1]
1195} 1355}
1196 1356
1357sub update {
1358 my ($self) = @_;
1359
1360 delete $self->{texture};
1361 $self->SUPER::update;
1362}
1363
1197sub set_text { 1364sub set_text {
1198 my ($self, $text) = @_; 1365 my ($self, $text) = @_;
1199 1366
1367 return if $self->{text} eq "T$text";
1368 $self->{text} = "T$text";
1369
1200 $self->{layout}->set_text ($text); 1370 $self->{layout}->set_text ($text);
1201 1371
1202 delete $self->{texture}; 1372 delete $self->{texture};
1373 $self->update;
1203 $self->check_size; 1374 $self->check_size;
1204 $self->update;
1205} 1375}
1206 1376
1207sub set_markup { 1377sub set_markup {
1208 my ($self, $markup) = @_; 1378 my ($self, $markup) = @_;
1209 1379
1380 return if $self->{text} eq "M$markup";
1381 $self->{text} = "M$markup";
1382
1210 $self->{layout}->set_markup ($markup); 1383 $self->{layout}->set_markup ($markup);
1211 1384
1212 delete $self->{texture}; 1385 delete $self->{texture};
1386 $self->update;
1213 $self->check_size; 1387 $self->check_size;
1214 $self->update;
1215} 1388}
1216 1389
1217sub size_request { 1390sub size_request {
1218 my ($self) = @_; 1391 my ($self) = @_;
1219 1392
… …
1248sub set_fontsize { 1421sub set_fontsize {
1249 my ($self, $fontsize) = @_; 1422 my ($self, $fontsize) = @_;
1250 1423
1251 $self->{fontsize} = $fontsize; 1424 $self->{fontsize} = $fontsize;
1252 delete $self->{texture}; 1425 delete $self->{texture};
1426
1427 $self->update;
1253 $self->check_size; 1428 $self->check_size;
1254 $self->update;
1255} 1429}
1256 1430
1257sub _draw { 1431sub _draw {
1258 my ($self) = @_; 1432 my ($self) = @_;
1259 1433
… …
1743} 1917}
1744 1918
1745sub set_max { 1919sub set_max {
1746 my ($self, $max) = @_; 1920 my ($self, $max) = @_;
1747 1921
1922 return if $self->{max_val} == $max;
1923
1748 $self->{max_val} = $max; 1924 $self->{max_val} = $max;
1925 $self->update;
1749} 1926}
1750 1927
1751sub set_value { 1928sub set_value {
1752 my ($self, $val, $max) = @_; 1929 my ($self, $val, $max) = @_;
1753 1930
1754 $self->set_max ($max) 1931 $self->set_max ($max)
1755 if defined $max; 1932 if defined $max;
1756 1933
1757 $max = $self->{max_val}; 1934 return if $self->{val} == $val;
1935
1758 $self->{val} = $val; 1936 $self->{val} = $val;
1759
1760 $self->update; 1937 $self->update;
1761} 1938}
1762 1939
1763sub _draw { 1940sub _draw {
1764 my ($self) = @_; 1941 my ($self) = @_;
… …
1847 2024
1848 $self->{value}->set_fontsize ($fsize); 2025 $self->{value}->set_fontsize ($fsize);
1849 $self->{max} ->set_fontsize ($fsize); 2026 $self->{max} ->set_fontsize ($fsize);
1850} 2027}
1851 2028
2029sub set_max {
2030 my ($self, $max) = @_;
2031
2032 $self->{gauge}->set_max ($max);
2033 $self->{max}->set_text ($max);
2034}
2035
1852sub set_value { 2036sub set_value {
1853 my ($self, $val, $max) = @_; 2037 my ($self, $val, $max) = @_;
1854 2038
1855 $self->set_max ($max) 2039 $self->set_max ($max)
1856 if defined $max; 2040 if defined $max;
1857 2041
1858 $self->{gauge}->set_value ($val, $max); 2042 $self->{gauge}->set_value ($val, $max);
1859 $self->{value}->set_text ($val); 2043 $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} 2044}
1868 2045
1869############################################################################# 2046#############################################################################
1870 2047
1871package CFClient::UI::Slider; 2048package CFClient::UI::Slider;
… …
1890 # TODO: calculations are off 2067 # TODO: calculations are off
1891 my $self = $class->SUPER::new ( 2068 my $self = $class->SUPER::new (
1892 fg => [1, 1, 1], 2069 fg => [1, 1, 1],
1893 active_fg => [0, 0, 0], 2070 active_fg => [0, 0, 0],
1894 range => [0, 0, 100, 10], 2071 range => [0, 0, 100, 10],
1895 req_w => 20, 2072 req_w => $::WIDTH / 80,
1896 req_h => 20, 2073 req_h => $::WIDTH / 80,
1897 vertical => 0, 2074 vertical => 0,
1898 can_hover => 1, 2075 can_hover => 1,
1899 inner_pad => 5, 2076 inner_pad => 5,
1900 @_ 2077 @_
1901 ); 2078 );
… …
2025 (new CFClient::UI::Empty expand => 1), 2202 (new CFClient::UI::Empty expand => 1),
2026 (new CFClient::UI::Slider vertical => 1), 2203 (new CFClient::UI::Slider vertical => 1),
2027 ], 2204 ],
2028 ); 2205 );
2029 2206
2030 $self->{children}[1]->connect (changed => sub { 2207 $self->{children}[1]->connect (changed => sub { $self->update });
2031 $self->update;
2032 });
2033 2208
2034 $self 2209 $self
2035} 2210}
2036 2211
2037sub set_fontsize { 2212sub set_fontsize {
… …
2045 my ($self, $text) = @_; 2220 my ($self, $text) = @_;
2046 2221
2047 my $layout = $self->{layout}; 2222 my $layout = $self->{layout};
2048 2223
2049 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2050 $layout->set_width ($self->{w}); 2225 $layout->set_width ($self->{children}[0]{w});
2051 $layout->set_text ($text); 2226 $layout->set_text ($text);
2052 2227
2053 ($layout->size)[1] 2228 ($layout->size)[1]
2054} 2229}
2055 2230
… …
2108 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2109 2284
2110 delete $self->{texture}; 2285 delete $self->{texture};
2111 } 2286 }
2112 2287
2113 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2114 glClearColor 0, 0, 0, 1; 2289 glClearColor 0, 0, 0, 0;
2115 glClear GL_COLOR_BUFFER_BIT; 2290 glClear GL_COLOR_BUFFER_BIT;
2116 2291
2117 glEnable GL_BLEND; 2292 glEnable GL_BLEND;
2118 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2119 glEnable GL_TEXTURE_2D; 2294 glEnable GL_TEXTURE_2D;
… …
2151} 2326}
2152 2327
2153sub _draw { 2328sub _draw {
2154 my ($self) = @_; 2329 my ($self) = @_;
2155 2330
2156 if ($self->{texture}) { 2331 glEnable GL_BLEND;
2332 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2157 glEnable GL_TEXTURE_2D; 2333 glEnable GL_TEXTURE_2D;
2158 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1;
2159 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2336 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2160 glDisable GL_TEXTURE_2D; 2337 glDisable GL_TEXTURE_2D;
2161 } 2338 glDisable GL_BLEND;
2162 2339
2163 $self->{children}[1]->draw; 2340 $self->{children}[1]->draw;
2164 2341
2165} 2342}
2166 2343
… …
2335 2512
2336sub size_request { 2513sub size_request {
2337 (32, 8) 2514 (32, 8)
2338} 2515}
2339 2516
2340sub draw { 2517sub _draw {
2341 my ($self) = @_; 2518 my ($self) = @_;
2342 2519
2520 return unless $::CONN;#d# manage and cache textures differently
2343 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2521 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2344 2522
2523 # TODO animation
2345 if ($tex) { 2524 if ($tex) {
2346 glEnable GL_BLEND; 2525 glEnable GL_BLEND;
2347 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2526 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2348 glEnable GL_TEXTURE_2D; 2527 glEnable GL_TEXTURE_2D;
2349 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2354 } 2533 }
2355} 2534}
2356 2535
2357############################################################################# 2536#############################################################################
2358 2537
2538package CFClient::UI::InventoryItem;
2539
2540our @ISA = CFClient::UI::HBox::;
2541
2542sub new {
2543 my $class = shift;
2544
2545 my %args = @_;
2546
2547 my $item = $args{item};
2548
2549 my $desc = $item->{nrof} < 2
2550 ? $item->{name}
2551 : "$item->{nrof} $item->{name_pl}";
2552
2553
2554 my $self = $class->SUPER::new (
2555 can_hover => 1,
2556 can_events => 1,
2557 tooltip => (CFClient::UI::Label->escape ($desc)
2558 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2559 connect_button_down => sub {
2560 my ($self, $ev, $x, $y) = @_;
2561
2562 # todo: maybe put examine on 1? but should just be a tooltip :(
2563 if ($ev->{button} == 1) {
2564 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2565 } elsif ($ev->{button} == 2) {
2566 $::CONN->send ("apply $item->{tag}");
2567 } elsif ($ev->{button} == 3) {
2568 CFClient::UI::Menu->new (
2569 items => [
2570 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2571 [
2572 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2573 sub { $::CONN->send ("lock $item->{tag}") },
2574 ],
2575 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2576 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2577 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2578 ],
2579 )->popup ($ev);
2580 }
2581
2582 1
2583 },
2584 %args
2585 );
2586 $self->add(new CFClient::UI::Face
2587 can_events => 0,
2588 face => $item->{face},
2589 anim => $item->{anim},
2590 animspeed => $item->{animspeed});
2591 $self->add(new CFClient::UI::Label
2592 can_events => 0,
2593 text => $desc);
2594
2595 $self
2596}
2597
2598#############################################################################
2599
2600package CFClient::UI::Inventory;
2601
2602our @ISA = CFClient::UI::ScrolledWindow::;
2603
2604sub new {
2605 my $class = shift;
2606
2607 my $self = $class->SUPER::new (
2608 scrolled => (new CFClient::UI::VBox),
2609 @_,
2610 );
2611
2612 $self
2613}
2614
2615sub set_items {
2616 my ($self, $items) = @_;
2617
2618 $self->{scrolled}->clear;
2619 return unless $items;
2620
2621 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2622
2623 $self->{real_items} = \@items;
2624
2625 for my $item (@items) {
2626 my $desc = $item->{nrof} < 2
2627 ? $item->{name}
2628 : "$item->{nrof} $item->{name_pl}";
2629
2630 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2631 }
2632
2633# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2634}
2635
2636sub size_request {
2637 my ($self) = @_;
2638 ($self->{req_w}, $self->{req_h});
2639}
2640
2641#############################################################################
2642
2643package CFClient::UI::Menu;
2644
2645our @ISA = CFClient::UI::FancyFrame::;
2646
2647use CFClient::OpenGL;
2648
2649sub new {
2650 my $class = shift;
2651
2652 my $self = $class->SUPER::new (
2653 items => [],
2654 z => 100,
2655 @_,
2656 );
2657
2658 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2659
2660 for my $item (@{ $self->{items} }) {
2661 my ($widget, $cb) = @$item;
2662
2663 # handle various types of items, only text for now
2664 if (!ref $widget) {
2665 $widget = new CFClient::UI::Label
2666 can_hover => 1,
2667 can_events => 1,
2668 text => $widget;
2669 }
2670
2671 $self->{item}{$widget} = $item;
2672
2673 $self->{vbox}->add ($widget);
2674 }
2675
2676 $self
2677}
2678
2679# popup given the event (must be a mouse button down event currently)
2680sub popup {
2681 my ($self, $ev) = @_;
2682
2683 $self->emit ("popdown");
2684
2685 # maybe save $GRAB? must be careful about events...
2686 $GRAB = $self;
2687 $self->{button} = $ev->{button};
2688
2689 $self->show;
2690 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2691}
2692
2693sub mouse_motion {
2694 my ($self, $ev, $x, $y) = @_;
2695
2696 # TODO: should use vbox->find_widget or so
2697 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2698 $self->{hover} = $self->{item}{$HOVER};
2699}
2700
2701sub button_up {
2702 my ($self, $ev, $x, $y) = @_;
2703
2704 if ($ev->{button} == $self->{button}) {
2705 undef $GRAB;
2706 $self->hide;
2707
2708 $self->emit ("popdown");
2709 $self->{hover}[1]->() if $self->{hover};
2710 }
2711}
2712
2713#############################################################################
2714
2359package CFClient::UI::Root; 2715package CFClient::UI::Root;
2360 2716
2361our @ISA = CFClient::UI::Container::; 2717our @ISA = CFClient::UI::Container::;
2362 2718
2363use CFClient::OpenGL; 2719use CFClient::OpenGL;
2364 2720
2365sub check_size { 2721sub check_size {
2366 my ($self) = @_; 2722 my ($self) = @_;
2367 2723
2368 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2724 $self->configure (0, 0, $self->{w}, $self->{h});
2369} 2725}
2370 2726
2371sub size_request { 2727sub size_request {
2372 ($::WIDTH, $::HEIGHT) 2728 my ($self) = @_;
2729
2730 ($self->{w}, $self->{h})
2731}
2732
2733sub size_allocate {
2734 my ($self, $w, $h) = @_;
2735
2736 my $old_w = $self->{old_w};
2737 my $old_h = $self->{old_h};
2738
2739 if ($old_w && $old_h) {
2740 for my $child ($self->children) {
2741 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2742 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2743 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2744 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2745 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2746 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2747 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2748 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2749 }
2750 }
2751
2752 $self->{old_w} = $w;
2753 $self->{old_h} = $h;
2373} 2754}
2374 2755
2375sub configure { 2756sub configure {
2376 my ($self, $x, $y, $w, $h) = @_; 2757 my ($self, $x, $y, $w, $h) = @_;
2377 2758
2378 $self->SUPER::configure ($x, $y, $w, $h); 2759 $self->SUPER::configure ($x, $y, $w, $h);
2379 2760
2380 for my $child (@{$self->{children}}) { 2761 for my $child ($self->children) {
2381 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2762 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2382 2763
2383 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2764 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2384 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2765 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2385 $child->configure ($X, $Y, $W,$H); 2766 $child->configure ($X, $Y, $W, $H);
2386 } 2767 }
2387} 2768}
2388 2769
2389sub _topleft { 2770sub _topleft {
2390 my ($self, $x, $y) = @_; 2771 my ($self, $x, $y) = @_;

Diff Legend

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