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.167 by elmex, Mon Apr 24 08:44:23 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
… …
246} 270}
247 271
248# return top left coordinates 272# return top left coordinates
249sub _topleft { 273sub _topleft {
250 my ($self, $x, $y) = @_; 274 my ($self, $x, $y) = @_;
275
276 $self->{parent}
277 or Carp::confess "no parent widget in _topleft\n";#d#
251 278
252 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
253} 280}
254 281
255# translate global coordinates to local coordinate system 282# translate global coordinates to local coordinate system
… …
376} 403}
377 404
378sub check_size { 405sub check_size {
379 my ($self) = @_; 406 my ($self) = @_;
380 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
381 $self->{parent} 428 $self->{parent}
382 or return 1; 429 or return 1;
383 430
384 my ($w, $h) = $self->{user_w} && $self->{user_h} 431 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)} 432 ? @$self{qw(user_w user_h)}
… …
387 434
388 if ($w != $self->{req_w} || $h != $self->{req_h}) { 435 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w; 436 $self->{req_w} = $w;
390 $self->{req_h} = $h; 437 $self->{req_h} = $h;
391 438
392 $self->{parent}->check_size 439 $self->{parent}->_check_size
393 or $self->size_allocate ( 440 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w), 441 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h), 442 (List::Util::max $self->{h}, $h),
396 ); 443 );
397 444
… …
402} 449}
403 450
404sub update { 451sub update {
405 my ($self) = @_; 452 my ($self) = @_;
406 453
407 $self->{parent}->update 454 my $update = $CFClient::UI::ROOT->{_update} ||= {};
408 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 });
409} 467}
410 468
411sub connect { 469sub connect {
412 my ($self, $signal, $cb) = @_; 470 my ($self, $signal, $cb) = @_;
413 471
… …
503 561
504 $self 562 $self
505} 563}
506 564
507sub add { 565sub add {
508 my ($self, $child) = @_; 566 my ($self, @widgets) = @_;
509 567
510 $child->set_parent ($self); 568 $_->set_parent ($self)
569 for @widgets;
511 570
512 use sort 'stable'; 571 use sort 'stable';
513 572
514 $self->{children} = [ 573 $self->{children} = [
515 sort { $a->{z} <=> $b->{z} } 574 sort { $a->{z} <=> $b->{z} }
516 @{$self->{children}}, $child 575 @{$self->{children}}, @widgets
517 ]; 576 ];
518 577
519 $child->check_size; 578 $_->check_size
579 for @widgets;
580
581 $self->update;
582}
583
584sub children {
585 @{ $_[0]{children} }
520} 586}
521 587
522sub remove { 588sub remove {
523 my ($self, $child) = @_; 589 my ($self, $child) = @_;
524 590
… …
539 605
540 for (@$children) { 606 for (@$children) {
541 delete $_->{parent}; 607 delete $_->{parent};
542 $_->hide; 608 $_->hide;
543 } 609 }
610
611 $self->check_size;
612 $self->update;
544} 613}
545 614
546sub find_widget { 615sub find_widget {
547 my ($self, $x, $y) = @_; 616 my ($self, $x, $y) = @_;
548 617
… …
623} 692}
624 693
625sub update { 694sub update {
626 my ($self) = @_; 695 my ($self) = @_;
627 696
628 # we want to do this delayed... 697 $ROOT->on_refresh ($self => sub { $self->render_child });
629 $self->render_chld;
630 $self->SUPER::update; 698 $self->SUPER::update;
631}
632
633sub render_chld {
634 my ($self) = @_;
635
636 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
637 glClearColor 0, 0, 0, 1;
638 glClear GL_COLOR_BUFFER_BIT;
639 $self->child->draw;
640 };
641} 699}
642 700
643sub size_allocate { 701sub size_allocate {
644 my ($self, $w, $h) = @_; 702 my ($self, $w, $h) = @_;
645 703
646 $self->child->configure (0, 0, $w, $h); 704 $self->SUPER::size_allocate ($w, $h);
705 $self->update;
706}
647 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
648 $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 };
649} 728}
650 729
651sub _draw { 730sub _draw {
652 my ($self) = @_; 731 my ($self) = @_;
653 732
… …
655 734
656 my $tex = $self->{texture} 735 my $tex = $self->{texture}
657 or return; 736 or return;
658 737
659 glEnable GL_BLEND; 738 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 739 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 740 glEnable GL_TEXTURE_2D;
662 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;
663 743
664 $tex->draw_quad (0, 0, $w, $h); 744 $tex->draw_quad (0, 0, $w, $h);
665 745
666 glDisable GL_BLEND; 746 glDisable GL_BLEND;
667 glDisable GL_TEXTURE_2D; 747 glDisable GL_TEXTURE_2D;
… …
671 751
672package CFClient::UI::ViewPort; 752package CFClient::UI::ViewPort;
673 753
674our @ISA = CFClient::UI::Window::; 754our @ISA = CFClient::UI::Window::;
675 755
676sub new { die }
677
678sub size_request { 756sub size_request {
679 my ($self) = @_; 757 my ($self) = @_;
680 758
681 @$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)};
682 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 760 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
683 761
684 @$self{qw(child_w child_h)} 762 @$self{qw(child_w child_h)}
685} 763}
686 764
687sub _draw { 765sub size_allocate {
688 my ($self) = @_; 766 my ($self, $w, $h) = @_;
689 767
690 $self->{children}[1]->draw; 768 $self->update;
691} 769}
692 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
693 841
694############################################################################# 842#############################################################################
695 843
696package CFClient::UI::Frame; 844package CFClient::UI::Frame;
697 845
… …
754 # TODO: user_x, user_y, overwrite moveto? 902 # TODO: user_x, user_y, overwrite moveto?
755 903
756 my $self = $class->SUPER::new ( 904 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1], 905 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1], 906 border_bg => [1, 1, 1, 1],
759 border => 0.8, 907 border => 0.6,
760 can_events => 1, 908 can_events => 1,
761 @_ 909 @_
762 ); 910 );
763 911
764 $self->{title} &&= new CFClient::UI::Label 912 $self->{title} &&= new CFClient::UI::Label
765 align => 0, 913 align => 0,
766 valign => 1, 914 valign => 1,
767 text => $self->{title}, 915 text => $self->{title},
768 fontsize => 1; 916 fontsize => $self->{border};
769 917
770 $self 918 $self
771} 919}
772 920
773sub border { 921sub border {
… …
798} 946}
799 947
800sub button_down { 948sub button_down {
801 my ($self, $ev, $x, $y) = @_; 949 my ($self, $ev, $x, $y) = @_;
802 950
951 my ($w, $h) = @$self{qw(w h)};
803 my $border = $self->border; 952 my $border = $self->border;
804 953
805 if ($x < $self->{w} && $x >= $self->{w} - $border 954 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806 && $y < $self->{h} && $y >= $self->{h} - $border) { 955 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807 956
957 if ($lr & $td) {
958 my ($wx, $wy) = ($self->{x}, $self->{y});
808 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 959 my ($ox, $oy) = ($ev->{x}, $ev->{y});
809 my ($bw, $bh) = ($self->{w}, $self->{h}); 960 my ($bw, $bh) = ($self->{w}, $self->{h});
810 961
962 my $mx = $x < $border;
963 my $my = $y < $border;
964
811 $self->{motion} = sub { 965 $self->{motion} = sub {
812 my ($ev, $x, $y) = @_; 966 my ($ev, $x, $y) = @_;
813 967
814 ($x, $y) = ($ev->{x}, $ev->{y}); 968 my $dx = $ev->{x} - $ox;
969 my $dy = $ev->{y} - $oy;
815 970
816 $self->{user_w} = $bw + $x - $ox; 971 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
817 $self->{user_h} = $bh + $y - $oy; 972 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
973 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
818 $self->check_size; 974 $self->check_size;
819 }; 975 };
820 976
821 } elsif ($x >= 0 && $x < $self->{w} 977 } elsif ($lr ^ $td) {
822 && $y >= 0 && $y < $border) {
823
824 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 978 my ($ox, $oy) = ($ev->{x}, $ev->{y});
825 my ($bx, $by) = ($self->{x}, $self->{y}); 979 my ($bx, $by) = ($self->{x}, $self->{y});
826 980
827 $self->{motion} = sub { 981 $self->{motion} = sub {
828 my ($ev, $x, $y) = @_; 982 my ($ev, $x, $y) = @_;
… …
864 $tex[1]->draw_quad (0, 0, $w, $border); 1018 $tex[1]->draw_quad (0, 0, $w, $border);
865 $tex[3]->draw_quad (0, $border, $border, $ch); 1019 $tex[3]->draw_quad (0, $border, $border, $ch);
866 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1020 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
867 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1021 $tex[4]->draw_quad (0, $h - $border, $w, $border);
868 1022
1023 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
869 my $bg = $tex[0]; 1024 my $bg = $tex[0];
870 1025
871 # TODO: repeat texture not scale 1026 # TODO: repeat texture not scale
872 my $rep_x = $cw / $bg->{w}; 1027 my $rep_x = $cw / $bg->{w};
873 my $rep_y = $ch / $bg->{h}; 1028 my $rep_y = $ch / $bg->{h};
874 1029
875 glColor @{ $self->{bg} }; 1030 glColor @{ $self->{bg} };
876 1031
877 $bg->{s} = $rep_x; 1032 $bg->{s} = $rep_x;
878 $bg->{t} = $rep_y; 1033 $bg->{t} = $rep_y;
879 $bg->{wrap_mode} = 1; 1034 $bg->{wrap_mode} = 1;
880 $bg->draw_quad ($border, $border, $cw, $ch); 1035 $bg->draw_quad ($border, $border, $cw, $ch);
881 1036
882 glDisable GL_TEXTURE_2D; 1037 glDisable GL_TEXTURE_2D;
883 glDisable GL_BLEND; 1038 glDisable GL_BLEND;
1039 }
884 1040
885 $self->{title}->draw if $self->{title}; 1041 $self->{title}->draw if $self->{title};
1042
886 $self->child->draw; 1043 $self->child->draw;
887} 1044}
888 1045
889############################################################################# 1046#############################################################################
890 1047
… …
912 $self->{children}[$y][$x] = $child; 1069 $self->{children}[$y][$x] = $child;
913 1070
914 $child->check_size; 1071 $child->check_size;
915} 1072}
916 1073
1074sub children {
1075 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1076}
1077
917# 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?
918sub clear { 1079sub clear {
919 my ($self) = @_; 1080 my ($self) = @_;
920 1081
921 my $children = delete $self->{children}; 1082 my @children = $self->children;
1083 delete $self->{children};
922 1084
923 for (grep $_, map @$_, grep $_, @$children) { 1085 for (@children) {
924 delete $_->{parent}; 1086 delete $_->{parent};
925 $_->hide; 1087 $_->hide;
926 } 1088 }
927 1089
928 $self->update; 1090 $self->update;
… …
1189 s/</&lt;/g; 1351 s/</&lt;/g;
1190 1352
1191 $_[1] 1353 $_[1]
1192} 1354}
1193 1355
1356sub update {
1357 my ($self) = @_;
1358
1359 delete $self->{texture};
1360 $self->SUPER::update;
1361}
1362
1194sub set_text { 1363sub set_text {
1195 my ($self, $text) = @_; 1364 my ($self, $text) = @_;
1196 1365
1366 return if $self->{text} eq "T$text";
1367 $self->{text} = "T$text";
1368
1197 $self->{layout}->set_text ($text); 1369 $self->{layout}->set_text ($text);
1198 1370
1199 delete $self->{texture}; 1371 delete $self->{texture};
1372 $self->update;
1200 $self->check_size; 1373 $self->check_size;
1201 $self->update;
1202} 1374}
1203 1375
1204sub set_markup { 1376sub set_markup {
1205 my ($self, $markup) = @_; 1377 my ($self, $markup) = @_;
1206 1378
1379 return if $self->{text} eq "M$markup";
1380 $self->{text} = "M$markup";
1381
1207 $self->{layout}->set_markup ($markup); 1382 $self->{layout}->set_markup ($markup);
1208 1383
1209 delete $self->{texture}; 1384 delete $self->{texture};
1385 $self->update;
1210 $self->check_size; 1386 $self->check_size;
1211 $self->update;
1212} 1387}
1213 1388
1214sub size_request { 1389sub size_request {
1215 my ($self) = @_; 1390 my ($self) = @_;
1216 1391
… …
1245sub set_fontsize { 1420sub set_fontsize {
1246 my ($self, $fontsize) = @_; 1421 my ($self, $fontsize) = @_;
1247 1422
1248 $self->{fontsize} = $fontsize; 1423 $self->{fontsize} = $fontsize;
1249 delete $self->{texture}; 1424 delete $self->{texture};
1425
1426 $self->update;
1250 $self->check_size; 1427 $self->check_size;
1251 $self->update;
1252} 1428}
1253 1429
1254sub _draw { 1430sub _draw {
1255 my ($self) = @_; 1431 my ($self) = @_;
1256 1432
… …
1469 1645
1470 if ($sym == 13) { 1646 if ($sym == 13) {
1471 unshift @{$self->{history}}, 1647 unshift @{$self->{history}},
1472 my $txt = $self->get_text; 1648 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1; 1649 $self->{history_pointer} = -1;
1650 $self->{history_saveback} = '';
1474 $self->emit (activate => $txt); 1651 $self->emit (activate => $txt);
1475 $self->update; 1652 $self->update;
1476 1653
1477 } elsif ($sym == CFClient::SDLK_UP) { 1654 } elsif ($sym == CFClient::SDLK_UP) {
1478 if ($self->{history_pointer} < 0) { 1655 if ($self->{history_pointer} < 0) {
1479 $self->{history_saveback} = $self->get_text; 1656 $self->{history_saveback} = $self->get_text;
1480 } 1657 }
1658 if (@{$self->{history} || []} > 0) {
1481 $self->{history_pointer}++; 1659 $self->{history_pointer}++;
1482 if ($self->{history_pointer} >= @{$self->{history}}) { 1660 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1483 $self->{history_pointer} = @{$self->{history}} - 1; 1661 $self->{history_pointer} = @{$self->{history} || []} - 1;
1662 }
1663 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1484 } 1664 }
1485 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1486 1665
1487 } elsif ($sym == CFClient::SDLK_DOWN) { 1666 } elsif ($sym == CFClient::SDLK_DOWN) {
1488 $self->{history_pointer}--; 1667 $self->{history_pointer}--;
1489 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1668 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490 1669
… …
1737} 1916}
1738 1917
1739sub set_max { 1918sub set_max {
1740 my ($self, $max) = @_; 1919 my ($self, $max) = @_;
1741 1920
1921 return if $self->{max_val} == $max;
1922
1742 $self->{max_val} = $max; 1923 $self->{max_val} = $max;
1924 $self->update;
1743} 1925}
1744 1926
1745sub set_value { 1927sub set_value {
1746 my ($self, $val, $max) = @_; 1928 my ($self, $val, $max) = @_;
1747 1929
1748 $self->set_max ($max) 1930 $self->set_max ($max)
1749 if defined $max; 1931 if defined $max;
1750 1932
1751 $max = $self->{max_val}; 1933 return if $self->{val} == $val;
1934
1752 $self->{val} = $val; 1935 $self->{val} = $val;
1753
1754 $self->update; 1936 $self->update;
1755} 1937}
1756 1938
1757sub _draw { 1939sub _draw {
1758 my ($self) = @_; 1940 my ($self) = @_;
… …
1821 2003
1822sub new { 2004sub new {
1823 my ($class, %arg) = @_; 2005 my ($class, %arg) = @_;
1824 2006
1825 my $self = $class->SUPER::new ( 2007 my $self = $class->SUPER::new (
1826 tooltip => $arg{type}, 2008 tooltip => $arg{type},
1827 can_hover => 1, 2009 can_hover => 1,
2010 can_events => 1,
1828 %arg, 2011 %arg,
1829 ); 2012 );
1830 2013
1831 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2014 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1832 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2015 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1840 2023
1841 $self->{value}->set_fontsize ($fsize); 2024 $self->{value}->set_fontsize ($fsize);
1842 $self->{max} ->set_fontsize ($fsize); 2025 $self->{max} ->set_fontsize ($fsize);
1843} 2026}
1844 2027
2028sub set_max {
2029 my ($self, $max) = @_;
2030
2031 $self->{gauge}->set_max ($max);
2032 $self->{max}->set_text ($max);
2033}
2034
1845sub set_value { 2035sub set_value {
1846 my ($self, $val, $max) = @_; 2036 my ($self, $val, $max) = @_;
1847 2037
1848 $self->set_max ($max) 2038 $self->set_max ($max)
1849 if defined $max; 2039 if defined $max;
1850 2040
1851 $self->{gauge}->set_value ($val, $max); 2041 $self->{gauge}->set_value ($val, $max);
1852 $self->{value}->set_text ($val); 2042 $self->{value}->set_text ($val);
1853}
1854
1855sub set_max {
1856 my ($self, $max) = @_;
1857
1858 $self->{gauge}->set_max ($max);
1859 $self->{max}->set_text ($max);
1860} 2043}
1861 2044
1862############################################################################# 2045#############################################################################
1863 2046
1864package CFClient::UI::Slider; 2047package CFClient::UI::Slider;
… …
1883 # TODO: calculations are off 2066 # TODO: calculations are off
1884 my $self = $class->SUPER::new ( 2067 my $self = $class->SUPER::new (
1885 fg => [1, 1, 1], 2068 fg => [1, 1, 1],
1886 active_fg => [0, 0, 0], 2069 active_fg => [0, 0, 0],
1887 range => [0, 0, 100, 10], 2070 range => [0, 0, 100, 10],
1888 req_w => 20, 2071 req_w => $::WIDTH / 80,
1889 req_h => 20, 2072 req_h => $::WIDTH / 80,
1890 vertical => 0, 2073 vertical => 0,
1891 can_hover => 1, 2074 can_hover => 1,
1892 inner_pad => 5, 2075 inner_pad => 5,
1893 @_ 2076 @_
1894 ); 2077 );
… …
2018 (new CFClient::UI::Empty expand => 1), 2201 (new CFClient::UI::Empty expand => 1),
2019 (new CFClient::UI::Slider vertical => 1), 2202 (new CFClient::UI::Slider vertical => 1),
2020 ], 2203 ],
2021 ); 2204 );
2022 2205
2023 $self->{children}[1]->connect (changed => sub { 2206 $self->{children}[1]->connect (changed => sub { $self->update });
2024 $self->update;
2025 });
2026 2207
2027 $self 2208 $self
2028} 2209}
2029 2210
2030sub set_fontsize { 2211sub set_fontsize {
… …
2038 my ($self, $text) = @_; 2219 my ($self, $text) = @_;
2039 2220
2040 my $layout = $self->{layout}; 2221 my $layout = $self->{layout};
2041 2222
2042 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2223 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2043 $layout->set_width ($self->{w}); 2224 $layout->set_width ($self->{children}[0]{w});
2044 $layout->set_text ($text); 2225 $layout->set_text ($text);
2045 2226
2046 ($layout->size)[1] 2227 ($layout->size)[1]
2047} 2228}
2048 2229
… …
2101 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2282 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2102 2283
2103 delete $self->{texture}; 2284 delete $self->{texture};
2104 } 2285 }
2105 2286
2106 $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 {
2107 glClearColor 0, 0, 0, 1; 2288 glClearColor 0, 0, 0, 0;
2108 glClear GL_COLOR_BUFFER_BIT; 2289 glClear GL_COLOR_BUFFER_BIT;
2109 2290
2110 glEnable GL_BLEND; 2291 glEnable GL_BLEND;
2111 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2292 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2112 glEnable GL_TEXTURE_2D; 2293 glEnable GL_TEXTURE_2D;
… …
2144} 2325}
2145 2326
2146sub _draw { 2327sub _draw {
2147 my ($self) = @_; 2328 my ($self) = @_;
2148 2329
2149 if ($self->{texture}) { 2330 glEnable GL_BLEND;
2331 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2150 glEnable GL_TEXTURE_2D; 2332 glEnable GL_TEXTURE_2D;
2151 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;
2152 $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});
2153 glDisable GL_TEXTURE_2D; 2336 glDisable GL_TEXTURE_2D;
2154 } 2337 glDisable GL_BLEND;
2155 2338
2156 $self->{children}[1]->draw; 2339 $self->{children}[1]->draw;
2157 2340
2158} 2341}
2159 2342
… …
2328 2511
2329sub size_request { 2512sub size_request {
2330 (32, 8) 2513 (32, 8)
2331} 2514}
2332 2515
2333sub draw { 2516sub _draw {
2334 my ($self) = @_; 2517 my ($self) = @_;
2335 2518
2519 return unless $::CONN;#d# manage and cache textures differently
2336 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2520 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2337 2521
2522 # TODO animation
2338 if ($tex) { 2523 if ($tex) {
2339 glEnable GL_BLEND; 2524 glEnable GL_BLEND;
2340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2525 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341 glEnable GL_TEXTURE_2D; 2526 glEnable GL_TEXTURE_2D;
2342 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2347 } 2532 }
2348} 2533}
2349 2534
2350############################################################################# 2535#############################################################################
2351 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
2352package CFClient::UI::Root; 2714package CFClient::UI::Root;
2353 2715
2354our @ISA = CFClient::UI::Container::; 2716our @ISA = CFClient::UI::Container::;
2355 2717
2356use CFClient::OpenGL; 2718use CFClient::OpenGL;
2357 2719
2358sub check_size { 2720sub check_size {
2359 my ($self) = @_; 2721 my ($self) = @_;
2360 2722
2361 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2723 $self->configure (0, 0, $self->{w}, $self->{h});
2362} 2724}
2363 2725
2364sub size_request { 2726sub size_request {
2365 ($::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;
2366} 2753}
2367 2754
2368sub configure { 2755sub configure {
2369 my ($self, $x, $y, $w, $h) = @_; 2756 my ($self, $x, $y, $w, $h) = @_;
2370 2757
2371 $self->SUPER::configure ($x, $y, $w, $h); 2758 $self->SUPER::configure ($x, $y, $w, $h);
2372 2759
2373 for my $child (@{$self->{children}}) { 2760 for my $child ($self->children) {
2374 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)};
2375 2762
2376 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2763 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2377 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2764 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2378 $child->configure ($X, $Y, $W,$H); 2765 $child->configure ($X, $Y, $W, $H);
2379 } 2766 }
2380} 2767}
2381 2768
2382sub _topleft { 2769sub _topleft {
2383 my ($self, $x, $y) = @_; 2770 my ($self, $x, $y) = @_;

Diff Legend

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