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

Diff Legend

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