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.197 by root, Fri May 12 01:47:04 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
23 24
24 my $tip = $widget->{tooltip}; 25 my $tip = $widget->{tooltip};
25 26
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 27 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 28
28 $TOOLTIP->set_markup ($widget->{tooltip}); 29 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
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);
39 $TOOLTIP->check_size;
40 $TOOLTIP->update;
31 } 41 }
32 42
33 return; 43 return;
34 } 44 }
35 } 45 }
… …
224 $self->{y} = $y; 234 $self->{y} = $y;
225 $self->update; 235 $self->update;
226 } 236 }
227 237
228 if ($self->{w} != $w || $self->{h} != $h) { 238 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w; 239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230 $self->{h} = $h;
231
232 $self->size_allocate ($w, $h);
233 $self->update;
234 } 240 }
235} 241}
236 242
237sub size_allocate { 243sub size_allocate {
238 # nothing to be done 244 # nothing to be done
239} 245}
240 246
247sub children {
248}
249
250# call when resolution changes etc.
251sub reconfigure {
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size;
258 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259 $self->update;
260}
261
241sub set_max_size { 262sub set_max_size {
242 my ($self, $w, $h) = @_; 263 my ($self, $w, $h) = @_;
243 264
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 265 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 266 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} 267}
257 268
258# translate global coordinates to local coordinate system 269# translate global coordinates to local coordinate system
259sub coord2local { 270sub coord2local {
260 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
261 272
262 my ($X, $Y) = $self->_topleft; 273 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
263 ($x - $X, $y - $Y)
264} 274}
265 275
266# translate local coordinates to global coordinate system 276# translate local coordinates to global coordinate system
267sub coord2global { 277sub coord2global {
268 my ($self, $x, $y) = @_; 278 my ($self, $x, $y) = @_;
269 279
270 my ($X, $Y) = $self->_topleft; 280 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
271 ($x + $X, $y + $Y)
272} 281}
273 282
274sub focus_in { 283sub focus_in {
275 my ($self) = @_; 284 my ($self) = @_;
276 285
… …
374 383
375sub set_parent { 384sub set_parent {
376 my ($self, $parent) = @_; 385 my ($self, $parent) = @_;
377 386
378 Scalar::Util::weaken ($self->{parent} = $parent); 387 Scalar::Util::weaken ($self->{parent} = $parent);
388
389 $self->check_size
390 unless exists $self->{req_w};
379} 391}
380 392
381sub check_size { 393sub check_size {
382 my ($self) = @_; 394 my ($self, $forced) = @_;
383 395
384 $self->{parent} 396 $self->{force_alloc} = 1 if $forced;
385 or return 1; 397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
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} 398}
406 399
407sub update { 400sub update {
408 my ($self) = @_; 401 my ($self) = @_;
409 402
… …
506 499
507 $self 500 $self
508} 501}
509 502
510sub add { 503sub add {
511 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
512 505
513 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
514 508
515 use sort 'stable'; 509 use sort 'stable';
516 510
517 $self->{children} = [ 511 $self->{children} = [
518 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
519 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
520 ]; 514 ];
521 515
522 $child->check_size; 516 $self->check_size (1);
517 $self->update;
518}
519
520sub children {
521 @{ $_[0]{children} }
523} 522}
524 523
525sub remove { 524sub remove {
526 my ($self, $child) = @_; 525 my ($self, $child) = @_;
527 526
… …
542 541
543 for (@$children) { 542 for (@$children) {
544 delete $_->{parent}; 543 delete $_->{parent};
545 $_->hide; 544 $_->hide;
546 } 545 }
546
547 $self->check_size;
548 $self->update;
547} 549}
548 550
549sub find_widget { 551sub find_widget {
550 my ($self, $x, $y) = @_; 552 my ($self, $x, $y) = @_;
551 553
… …
626} 628}
627 629
628sub update { 630sub update {
629 my ($self) = @_; 631 my ($self) = @_;
630 632
631 # we want to do this delayed... 633 $ROOT->on_refresh ($self => sub { $self->render_child });
632 $self->render_chld;
633 $self->SUPER::update; 634 $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} 635}
645 636
646sub size_allocate { 637sub size_allocate {
647 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
648 639
649 $self->child->configure (0, 0, $w, $h); 640 $self->SUPER::size_allocate ($w, $h);
641 $self->update;
642}
650 643
644sub _render {
645 $_[0]{children}[0]->draw;
646}
647
648sub render_child {
649 my ($self) = @_;
650
651 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT;
654
651 $self->render_chld; 655 $self->_render;
656# glColorMask 1, 1, 1, 0;
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 };
652} 664}
653 665
654sub _draw { 666sub _draw {
655 my ($self) = @_; 667 my ($self) = @_;
656 668
657 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
658 670
659 my $tex = $self->{texture} 671 my $tex = $self->{texture}
660 or return; 672 or return;
661 673
662 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1;
666 677
667 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
668 679
669 glDisable GL_BLEND;
670 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
671} 681}
672 682
673############################################################################# 683#############################################################################
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) = @_;
696 706
697############################################################################# 707 $self->{view_x} = int $x;
708 $self->{view_y} = int $y;
698 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
699package CFClient::UI::Frame; 751package CFClient::UI::ScrolledWindow;
700 752
701our @ISA = CFClient::UI::Bin::; 753our @ISA = CFClient::UI::HBox::;
702
703use CFClient::OpenGL;
704 754
705sub new { 755sub new {
706 my $class = shift; 756 my $class = shift;
707 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
708 my $self = $class->SUPER::new ( 768 $self = $class->SUPER::new (
709 bg => [1, 1, 1, 1], 769 vp => (new CFClient::UI::ViewPort),
710 border_bg => [1, 1, 1, 1], 770 slider => $slider,
711 border => 0.8,
712 @_ 771 @_,
713 ); 772 );
714 773
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
715 $self 778 $self
716} 779}
717 780
718sub _draw { 781#TODO# update range on size_allocate depeneing on child
719 my ($self) = @_; 782# update viewport offset on scroll
720 783
721 my ($w, $h) = ($self->{w}, $self->{h}); 784#############################################################################
722 785
723 glEnable GL_BLEND; 786package CFClient::UI::Frame;
724 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
725 glEnable GL_TEXTURE_2D;
726 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
727 787
728# glBegin GL_QUADS; 788our @ISA = CFClient::UI::Bin::;
729# glColor 0, 0, 0, 0;
730# glVertex 0 , 0;
731# glVertex 0 , $h;
732# glVertex $w, $h;
733# glVertex $w, 0;
734# glEnd;
735 789
736 790use CFClient::OpenGL;
737 $self->child->draw;
738 glDisable GL_BLEND;
739 glDisable GL_TEXTURE_2D;
740}
741 791
742############################################################################# 792#############################################################################
743 793
744package CFClient::UI::FancyFrame; 794package CFClient::UI::FancyFrame;
745 795
… …
757 # TODO: user_x, user_y, overwrite moveto? 807 # TODO: user_x, user_y, overwrite moveto?
758 808
759 my $self = $class->SUPER::new ( 809 my $self = $class->SUPER::new (
760 bg => [1, 1, 1, 1], 810 bg => [1, 1, 1, 1],
761 border_bg => [1, 1, 1, 1], 811 border_bg => [1, 1, 1, 1],
762 border => 0.8, 812 border => 0.6,
763 can_events => 1, 813 can_events => 1,
764 @_ 814 @_
765 ); 815 );
766 816
767 $self->{title} &&= new CFClient::UI::Label 817 $self->{title} &&= new CFClient::UI::Label
768 align => 0, 818 align => 0,
769 valign => 1, 819 valign => 1,
770 text => $self->{title}, 820 text => $self->{title},
771 fontsize => 1; 821 fontsize => $self->{border};
772 822
773 $self 823 $self
774} 824}
775 825
776sub border { 826sub border {
… …
801} 851}
802 852
803sub button_down { 853sub button_down {
804 my ($self, $ev, $x, $y) = @_; 854 my ($self, $ev, $x, $y) = @_;
805 855
856 my ($w, $h) = @$self{qw(w h)};
806 my $border = $self->border; 857 my $border = $self->border;
807 858
808 if ($x < $self->{w} && $x >= $self->{w} - $border 859 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
809 && $y < $self->{h} && $y >= $self->{h} - $border) { 860 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
810 861
862 if ($lr & $td) {
863 my ($wx, $wy) = ($self->{x}, $self->{y});
811 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 864 my ($ox, $oy) = ($ev->{x}, $ev->{y});
812 my ($bw, $bh) = ($self->{w}, $self->{h}); 865 my ($bw, $bh) = ($self->{w}, $self->{h});
813 866
867 my $mx = $x < $border;
868 my $my = $y < $border;
869
814 $self->{motion} = sub { 870 $self->{motion} = sub {
815 my ($ev, $x, $y) = @_; 871 my ($ev, $x, $y) = @_;
816 872
817 ($x, $y) = ($ev->{x}, $ev->{y}); 873 my $dx = $ev->{x} - $ox;
874 my $dy = $ev->{y} - $oy;
818 875
819 $self->{user_w} = $bw + $x - $ox; 876 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
820 $self->{user_h} = $bh + $y - $oy; 877 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
878 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
821 $self->check_size; 879 $self->check_size;
822 }; 880 };
823 881
824 } elsif ($x >= 0 && $x < $self->{w} 882 } elsif ($lr ^ $td) {
825 && $y >= 0 && $y < $border) {
826
827 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 883 my ($ox, $oy) = ($ev->{x}, $ev->{y});
828 my ($bx, $by) = ($self->{x}, $self->{y}); 884 my ($bx, $by) = ($self->{x}, $self->{y});
829 885
830 $self->{motion} = sub { 886 $self->{motion} = sub {
831 my ($ev, $x, $y) = @_; 887 my ($ev, $x, $y) = @_;
… …
854 my ($self) = @_; 910 my ($self) = @_;
855 911
856 my ($w, $h ) = ($self->{w}, $self->{h}); 912 my ($w, $h ) = ($self->{w}, $self->{h});
857 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 913 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
858 914
859 glEnable GL_BLEND;
860 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
861 glEnable GL_TEXTURE_2D; 915 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
863 917
864 my $border = $self->border; 918 my $border = $self->border;
865 919
866 glColor @{ $self->{border_bg} }; 920 glColor @{ $self->{border_bg} };
867 $tex[1]->draw_quad (0, 0, $w, $border); 921 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
868 $tex[3]->draw_quad (0, $border, $border, $ch); 922 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
869 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 923 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
870 $tex[4]->draw_quad (0, $h - $border, $w, $border); 924 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
871 925
926 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
872 my $bg = $tex[0]; 927 my $bg = $tex[0];
873 928
874 # TODO: repeat texture not scale 929 # TODO: repeat texture not scale
875 my $rep_x = $cw / $bg->{w}; 930 my $rep_x = $cw / $bg->{w};
876 my $rep_y = $ch / $bg->{h}; 931 my $rep_y = $ch / $bg->{h};
877 932
878 glColor @{ $self->{bg} }; 933 glColor @{ $self->{bg} };
879 934
880 $bg->{s} = $rep_x; 935 $bg->{s} = $rep_x;
881 $bg->{t} = $rep_y; 936 $bg->{t} = $rep_y;
882 $bg->{wrap_mode} = 1; 937 $bg->{wrap_mode} = 1;
883 $bg->draw_quad ($border, $border, $cw, $ch); 938 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
939 }
884 940
885 glDisable GL_TEXTURE_2D; 941 glDisable GL_TEXTURE_2D;
886 glDisable GL_BLEND;
887 942
888 $self->{title}->draw if $self->{title}; 943 $self->{title}->draw if $self->{title};
944
889 $self->child->draw; 945 $self->child->draw;
890} 946}
891 947
892############################################################################# 948#############################################################################
893 949
… …
915 $self->{children}[$y][$x] = $child; 971 $self->{children}[$y][$x] = $child;
916 972
917 $child->check_size; 973 $child->check_size;
918} 974}
919 975
976sub children {
977 grep $_, map @$_, grep $_, @{ $_[0]{children} }
978}
979
920# TODO: move to container class maybe? send childs a signal on removal? 980# TODO: move to container class maybe? send childs a signal on removal?
921sub clear { 981sub clear {
922 my ($self) = @_; 982 my ($self) = @_;
923 983
924 my $children = delete $self->{children}; 984 my @children = $self->children;
985 delete $self->{children};
925 986
926 for (grep $_, map @$_, grep $_, @$children) { 987 for (@children) {
927 delete $_->{parent}; 988 delete $_->{parent};
928 $_->hide; 989 $_->hide;
929 } 990 }
930 991
931 $self->update; 992 $self->update;
… …
1112} 1173}
1113 1174
1114sub size_allocate { 1175sub size_allocate {
1115 my ($self, $w, $h) = @_; 1176 my ($self, $w, $h) = @_;
1116 1177
1178 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1179
1117 my $children = $self->{children}; 1180 my $children = $self->{children};
1118 1181
1119 my @h = map $_->{req_h}, @$children; 1182 my @h = map $_->{req_h}, @$children;
1120 1183
1121 my $req_h = List::Util::sum @h; 1184 my $req_h = List::Util::sum @h;
… …
1160 my ($class, %arg) = @_; 1223 my ($class, %arg) = @_;
1161 1224
1162 my $self = $class->SUPER::new ( 1225 my $self = $class->SUPER::new (
1163 fg => [1, 1, 1], 1226 fg => [1, 1, 1],
1164 #font => default_font 1227 #font => default_font
1228 #text => initial text
1229 #markup => initial narkup
1230 layout => (new CFClient::Layout),
1165 fontsize => 1, 1231 fontsize => 1,
1166 text => "",
1167 align => -1, 1232 align => -1,
1168 valign => -1, 1233 valign => -1,
1169 padding => 2, 1234 padding => 2,
1170 layout => new CFClient::Layout,
1171 can_events => 0, 1235 can_events => 0,
1172 %arg 1236 %arg
1173 ); 1237 );
1174 1238
1175 if (exists $self->{template}) { 1239 if (exists $self->{template}) {
1176 my $layout = new CFClient::Layout; 1240 my $layout = new CFClient::Layout;
1177 $layout->set_text (delete $self->{template}); 1241 $layout->set_text (delete $self->{template});
1178 $self->{template} = $layout; 1242 $self->{template} = $layout;
1179 } 1243 }
1180 1244
1181 $self->set_text (delete $self->{text}) if exists $self->{text}; 1245 if (exists $self->{markup}) {
1182 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1246 $self->set_markup (delete $self->{markup});
1247 } else {
1248 $self->set_text (delete $self->{text});
1249 }
1183 1250
1184 $self 1251 $self
1185} 1252}
1186 1253
1187sub escape { 1254sub escape {
… …
1192 s/</&lt;/g; 1259 s/</&lt;/g;
1193 1260
1194 $_[1] 1261 $_[1]
1195} 1262}
1196 1263
1264sub update {
1265 my ($self) = @_;
1266
1267 delete $self->{texture};
1268 $self->SUPER::update;
1269}
1270
1197sub set_text { 1271sub set_text {
1198 my ($self, $text) = @_; 1272 my ($self, $text) = @_;
1199 1273
1274 return if $self->{text} eq "T$text";
1275 $self->{text} = "T$text";
1276
1277 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1200 $self->{layout}->set_text ($text); 1278 $self->{layout}->set_text ($text);
1201 1279
1202 delete $self->{texture}; 1280 $self->update;
1203 $self->check_size; 1281 $self->check_size;
1204 $self->update;
1205} 1282}
1206 1283
1207sub set_markup { 1284sub set_markup {
1208 my ($self, $markup) = @_; 1285 my ($self, $markup) = @_;
1209 1286
1287 return if $self->{text} eq "M$markup";
1288 $self->{text} = "M$markup";
1289
1290 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1291
1292 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1210 $self->{layout}->set_markup ($markup); 1293 $self->{layout}->set_markup ($markup);
1211 1294
1212 delete $self->{texture}; 1295 $self->update;
1213 $self->check_size; 1296 $self->check_size;
1214 $self->update;
1215} 1297}
1216 1298
1217sub size_request { 1299sub size_request {
1218 my ($self) = @_; 1300 my ($self) = @_;
1219 1301
… …
1248sub set_fontsize { 1330sub set_fontsize {
1249 my ($self, $fontsize) = @_; 1331 my ($self, $fontsize) = @_;
1250 1332
1251 $self->{fontsize} = $fontsize; 1333 $self->{fontsize} = $fontsize;
1252 delete $self->{texture}; 1334 delete $self->{texture};
1335
1336 $self->update;
1253 $self->check_size; 1337 $self->check_size;
1254 $self->update;
1255} 1338}
1256 1339
1257sub _draw { 1340sub _draw {
1258 my ($self) = @_; 1341 my ($self) = @_;
1259 1342
1260 my $tex = $self->{texture} ||= do { 1343 my $tex = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}});
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1345 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $self->{layout}->set_width ($self->{w}); 1346 $self->{layout}->set_width ($self->{w});
1263 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1347 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1348
1264 new_from_layout CFClient::Texture $self->{layout} 1349 my $tex = new_from_layout CFClient::Texture $self->{layout};
1350
1351 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1352 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1353 : ($self->{w} - $tex->{w}) * 0.5;
1354
1355 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1356 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1357 : ($self->{h} - $tex->{h}) * 0.5;
1358
1359 $tex
1265 }; 1360 };
1266 1361
1267 glEnable GL_BLEND;
1268 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1269 glEnable GL_TEXTURE_2D; 1362 glEnable GL_TEXTURE_2D;
1270 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1271 1364
1365 if ($tex->{format} == GL_ALPHA) {
1272 glColor @{$self->{fg}}; 1366 glColor @{$self->{fg}};
1273
1274 $self->{ox} = int (
1275 $self->{align} < 0 ? $self->{padding}
1276 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1277 : ($self->{w} - $tex->{w}) * 0.5
1278 );
1279
1280 $self->{oy} = int (
1281 $self->{valign} < 0 ? $self->{padding}
1282 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1283 : ($self->{h} - $tex->{h}) * 0.5
1284 );
1285
1286 $tex->draw_quad ($self->{ox}, $self->{oy}); 1367 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1368 } else {
1369 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1370 }
1287 1371
1288 glDisable GL_TEXTURE_2D; 1372 glDisable GL_TEXTURE_2D;
1289 glDisable GL_BLEND;
1290} 1373}
1291 1374
1292############################################################################# 1375#############################################################################
1293 1376
1294package CFClient::UI::EntryBase; 1377package CFClient::UI::EntryBase;
… …
1329 $self->{layout}->set_text ("$text "); 1412 $self->{layout}->set_text ("$text ");
1330 1413
1331 $self->emit (changed => $self->{text}); 1414 $self->emit (changed => $self->{text});
1332} 1415}
1333 1416
1417sub set_text {
1418 my ($self, $text) = @_;
1419
1420 $self->{cursor} = length $text;
1421 $self->_set_text ($text);
1422 $self->check_size;
1423 $self->update;
1424}
1425
1334sub get_text { 1426sub get_text {
1335 $_[0]{text} 1427 $_[0]{text}
1336} 1428}
1337 1429
1338sub size_request { 1430sub size_request {
… …
1345 1437
1346sub size_allocate { 1438sub size_allocate {
1347 my ($self, $w, $h) = @_; 1439 my ($self, $w, $h) = @_;
1348 1440
1349 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1441 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1350}
1351
1352sub set_text {
1353 my ($self, $text) = @_;
1354
1355 $self->{cursor} = length $text;
1356 $self->_set_text ($text);
1357 $self->update;
1358} 1442}
1359 1443
1360sub key_down { 1444sub key_down {
1361 my ($self, $ev) = @_; 1445 my ($self, $ev) = @_;
1362 1446
… …
1550 1634
1551 if ($GRAB == $self) { 1635 if ($GRAB == $self) {
1552 $self->{fg} = $self->{active_fg}; 1636 $self->{fg} = $self->{active_fg};
1553 } 1637 }
1554 1638
1555 glEnable GL_BLEND;
1556 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1557 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1558 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559 glColor 0, 0, 0, 1; 1641 glColor 0, 0, 0, 1;
1560 1642
1561 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1643 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1562 1644
1563 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1564 glDisable GL_BLEND;
1565 1646
1566 $self->SUPER::_draw; 1647 $self->SUPER::_draw;
1567} 1648}
1568 1649
1569############################################################################# 1650#############################################################################
… …
1616 1697
1617 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1698 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1618 1699
1619 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1700 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1620 1701
1621 glEnable GL_BLEND; 1702 my $tex = $self->{state} ? $tex[1] : $tex[0];
1703
1622 glEnable GL_TEXTURE_2D; 1704 glEnable GL_TEXTURE_2D;
1623 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1624
1625 my $tex = $self->{state} ? $tex[1] : $tex[0];
1626
1627 $tex->draw_quad (0, 0, $s, $s); 1705 $tex->draw_quad_alpha (0, 0, $s, $s);
1628
1629 glDisable GL_TEXTURE_2D; 1706 glDisable GL_TEXTURE_2D;
1630 glDisable GL_BLEND;
1631} 1707}
1632 1708
1633############################################################################# 1709#############################################################################
1634 1710
1635package CFClient::UI::Image; 1711package CFClient::UI::Image;
… …
1678 glTranslate 0, -$self->{w}, 0; 1754 glTranslate 0, -$self->{w}, 0;
1679 1755
1680 ($w, $h) = ($h, $w); 1756 ($w, $h) = ($h, $w);
1681 } 1757 }
1682 1758
1683 glEnable GL_BLEND;
1684 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1685 glEnable GL_TEXTURE_2D; 1759 glEnable GL_TEXTURE_2D;
1686 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1687 1761
1688 $tex->draw_quad (0, 0, $w, $h); 1762 $tex->draw_quad_alpha (0, 0, $w, $h);
1689 1763
1690 glDisable GL_BLEND;
1691 glDisable GL_TEXTURE_2D; 1764 glDisable GL_TEXTURE_2D;
1692} 1765}
1693 1766
1694############################################################################# 1767#############################################################################
1695 1768
… …
1743} 1816}
1744 1817
1745sub set_max { 1818sub set_max {
1746 my ($self, $max) = @_; 1819 my ($self, $max) = @_;
1747 1820
1821 return if $self->{max_val} == $max;
1822
1748 $self->{max_val} = $max; 1823 $self->{max_val} = $max;
1824 $self->update;
1749} 1825}
1750 1826
1751sub set_value { 1827sub set_value {
1752 my ($self, $val, $max) = @_; 1828 my ($self, $val, $max) = @_;
1753 1829
1754 $self->set_max ($max) 1830 $self->set_max ($max)
1755 if defined $max; 1831 if defined $max;
1756 1832
1757 $max = $self->{max_val}; 1833 return if $self->{val} == $val;
1834
1758 $self->{val} = $val; 1835 $self->{val} = $val;
1759
1760 $self->update; 1836 $self->update;
1761} 1837}
1762 1838
1763sub _draw { 1839sub _draw {
1764 my ($self) = @_; 1840 my ($self) = @_;
… …
1847 1923
1848 $self->{value}->set_fontsize ($fsize); 1924 $self->{value}->set_fontsize ($fsize);
1849 $self->{max} ->set_fontsize ($fsize); 1925 $self->{max} ->set_fontsize ($fsize);
1850} 1926}
1851 1927
1928sub set_max {
1929 my ($self, $max) = @_;
1930
1931 $self->{gauge}->set_max ($max);
1932 $self->{max}->set_text ($max);
1933}
1934
1852sub set_value { 1935sub set_value {
1853 my ($self, $val, $max) = @_; 1936 my ($self, $val, $max) = @_;
1854 1937
1855 $self->set_max ($max) 1938 $self->set_max ($max)
1856 if defined $max; 1939 if defined $max;
1857 1940
1858 $self->{gauge}->set_value ($val, $max); 1941 $self->{gauge}->set_value ($val, $max);
1859 $self->{value}->set_text ($val); 1942 $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} 1943}
1868 1944
1869############################################################################# 1945#############################################################################
1870 1946
1871package CFClient::UI::Slider; 1947package CFClient::UI::Slider;
… …
1890 # TODO: calculations are off 1966 # TODO: calculations are off
1891 my $self = $class->SUPER::new ( 1967 my $self = $class->SUPER::new (
1892 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1893 active_fg => [0, 0, 0], 1969 active_fg => [0, 0, 0],
1894 range => [0, 0, 100, 10], 1970 range => [0, 0, 100, 10],
1895 req_w => 20, 1971 req_w => $::WIDTH / 80,
1896 req_h => 20, 1972 req_h => $::WIDTH / 80,
1897 vertical => 0, 1973 vertical => 0,
1898 can_hover => 1, 1974 can_hover => 1,
1899 inner_pad => 5, 1975 inner_pad => 5,
1900 @_ 1976 @_
1901 ); 1977 );
… …
1984 $page ||= 2; 2060 $page ||= 2;
1985 2061
1986 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2062 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1987 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2063 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1988 2064
1989 glEnable GL_BLEND;
1990 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1991 glEnable GL_TEXTURE_2D; 2065 glEnable GL_TEXTURE_2D;
1992 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1993 2067
1994 # draw background 2068 # draw background
1995 $tex[1]->draw_quad (0, 0, $w, $h); 2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1996 2070
1997 # draw handle 2071 # draw handle
1998 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2072 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1999 2073
2000 glDisable GL_BLEND;
2001 glDisable GL_TEXTURE_2D; 2074 glDisable GL_TEXTURE_2D;
2002} 2075}
2003 2076
2004############################################################################# 2077#############################################################################
2005 2078
… …
2016 fontsize => 1, 2089 fontsize => 1,
2017 can_events => 0, 2090 can_events => 0,
2018 #font => default_font 2091 #font => default_font
2019 @_, 2092 @_,
2020 2093
2021 layout => (new CFClient::Layout), 2094 layout => (new CFClient::Layout 1),
2022 par => [], 2095 par => [],
2023 height => 0, 2096 height => 0,
2024 children => [ 2097 children => [
2025 (new CFClient::UI::Empty expand => 1), 2098 (new CFClient::UI::Empty expand => 1),
2026 (new CFClient::UI::Slider vertical => 1), 2099 (new CFClient::UI::Slider vertical => 1),
2027 ], 2100 ],
2028 ); 2101 );
2029 2102
2030 $self->{children}[1]->connect (changed => sub { 2103 $self->{children}[1]->connect (changed => sub { $self->update });
2031 $self->update;
2032 });
2033 2104
2034 $self 2105 $self
2035} 2106}
2036 2107
2037sub set_fontsize { 2108sub set_fontsize {
… …
2045 my ($self, $text) = @_; 2116 my ($self, $text) = @_;
2046 2117
2047 my $layout = $self->{layout}; 2118 my $layout = $self->{layout};
2048 2119
2049 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2120 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2050 $layout->set_width ($self->{w}); 2121 $layout->set_width ($self->{children}[0]{w});
2051 $layout->set_text ($text); 2122 $layout->set_markup ($text);
2052 2123
2053 ($layout->size)[1] 2124 ($layout->size)[1]
2054} 2125}
2055 2126
2056sub reflow { 2127sub reflow {
… …
2108 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2179 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2109 2180
2110 delete $self->{texture}; 2181 delete $self->{texture};
2111 } 2182 }
2112 2183
2113 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2184 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2114 glClearColor 0, 0, 0, 1; 2185 glClearColor 0, 0, 0, 0;
2115 glClear GL_COLOR_BUFFER_BIT; 2186 glClear GL_COLOR_BUFFER_BIT;
2116 2187
2117 glEnable GL_BLEND;
2118 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2119 glEnable GL_TEXTURE_2D; 2188 glEnable GL_TEXTURE_2D;
2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2189 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121 2190
2122 my $top = int $self->{children}[1]{range}[0]; 2191 my $top = int $self->{children}[1]{range}[0];
2123 2192
… …
2132 2201
2133 for my $par (@{$self->{par}}) { 2202 for my $par (@{$self->{par}}) {
2134 my $h = $par->[0]; 2203 my $h = $par->[0];
2135 2204
2136 if ($y0 < $y + $h && $y < $y1) { 2205 if ($y0 < $y + $h && $y < $y1) {
2206 $layout->set_foreground (@{ $par->[1] });
2137 $layout->set_text ($par->[2]); 2207 $layout->set_markup ($par->[2]);
2138 2208
2139 glColor @{ $par->[1] };
2140 my ($W, $H) = $layout->size; 2209 my ($W, $H) = $layout->size;
2141 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2210 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2142 } 2211 }
2143 2212
2144 $y += $h; 2213 $y += $h;
2145 } 2214 }
2146 2215
2147 glDisable GL_TEXTURE_2D; 2216 glDisable GL_TEXTURE_2D;
2148 glDisable GL_BLEND;
2149 }; 2217 };
2150 }); 2218 });
2151} 2219}
2152 2220
2153sub _draw { 2221sub _draw {
2154 my ($self) = @_; 2222 my ($self) = @_;
2155 2223
2156 if ($self->{texture}) {
2157 glEnable GL_TEXTURE_2D; 2224 glEnable GL_TEXTURE_2D;
2158 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2225 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2159 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2226 glColor 1, 1, 1, 1;
2227 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2160 glDisable GL_TEXTURE_2D; 2228 glDisable GL_TEXTURE_2D;
2161 }
2162 2229
2163 $self->{children}[1]->draw; 2230 $self->{children}[1]->draw;
2164 2231
2165} 2232}
2166 2233
… …
2260 @_, 2327 @_,
2261 can_events => 0, 2328 can_events => 0,
2262 ) 2329 )
2263} 2330}
2264 2331
2265sub set_markup { 2332sub set_tooltip_from {
2266 my ($self, $text) = @_; 2333 my ($self, $widget) = @_;
2267 2334
2268 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2335 $self->add (new CFClient::UI::Label
2269 $self->{label}->set_markup ($text); 2336 markup => $widget->{tooltip},
2270 $self->add ($self->{label}); 2337 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338 fontsize => 0.8,
2339 fg => [0, 0, 0, 1],
2340 font => ($widget->{tooltip_font} || $::FONT_PROP),
2341 );
2271} 2342}
2272 2343
2273sub size_request { 2344sub size_request {
2274 my ($self) = @_; 2345 my ($self) = @_;
2275
2276 $self->child->set_max_size ($::WIDTH * 0.3);
2277 2346
2278 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2347 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2279 2348
2280 ($w + 4, $h + 4) 2349 ($w + 4, $h + 4)
2281} 2350}
… …
2287} 2356}
2288 2357
2289sub _draw { 2358sub _draw {
2290 my ($self) = @_; 2359 my ($self) = @_;
2291 2360
2292 glPushMatrix;
2293 glTranslate 0.375, 0.375; 2361 glTranslate 0.375, 0.375;
2294 2362
2295 my ($w, $h) = @$self{qw(w h)}; 2363 my ($w, $h) = @$self{qw(w h)};
2296 2364
2297 glColor 1, 0.8, 0.4; 2365 glColor 1, 0.8, 0.4;
… …
2308 glVertex 0 , $h; 2376 glVertex 0 , $h;
2309 glVertex $w, $h; 2377 glVertex $w, $h;
2310 glVertex $w, 0; 2378 glVertex $w, 0;
2311 glEnd; 2379 glEnd;
2312 2380
2313 glPopMatrix; 2381 glTranslate 2 - 0.375, 2 - 0.375;
2314
2315 glTranslate 2, 2;
2316 $self->SUPER::_draw; 2382 $self->SUPER::_draw;
2317} 2383}
2318 2384
2319############################################################################# 2385#############################################################################
2320 2386
… …
2335 2401
2336sub size_request { 2402sub size_request {
2337 (32, 8) 2403 (32, 8)
2338} 2404}
2339 2405
2340sub draw { 2406sub _draw {
2341 my ($self) = @_; 2407 my ($self) = @_;
2342 2408
2409 return unless $::CONN;#d# manage and cache textures differently
2343 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2344 2411
2412 # TODO animation
2345 if ($tex) { 2413 if ($tex) {
2346 glEnable GL_BLEND;
2347 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2348 glEnable GL_TEXTURE_2D; 2414 glEnable GL_TEXTURE_2D;
2349 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2350 glColor 1, 1, 1, 1; 2416 glColor 1, 1, 1, 1;
2351 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2352 glDisable GL_TEXTURE_2D; 2418 glDisable GL_TEXTURE_2D;
2353 glDisable GL_BLEND;
2354 } 2419 }
2420}
2421
2422#############################################################################
2423
2424package CFClient::UI::InventoryItem;
2425
2426our @ISA = CFClient::UI::HBox::;
2427
2428sub new {
2429 my $class = shift;
2430
2431 my %args = @_;
2432
2433 my $item = delete $args{item};
2434
2435 my $desc = $item->{nrof} < 2
2436 ? $item->{name}
2437 : "$item->{nrof} $item->{name_pl}";
2438
2439
2440 my $self = $class->SUPER::new (
2441 can_hover => 1,
2442 can_events => 1,
2443 tooltip => (CFClient::UI::Label->escape ($desc)
2444 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2445 connect_button_down => sub {
2446 my ($self, $ev, $x, $y) = @_;
2447
2448 # todo: maybe put examine on 1? but should just be a tooltip :(
2449 if ($ev->{button} == 1) {
2450 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2451 } elsif ($ev->{button} == 2) {
2452 $::CONN->send ("apply $item->{tag}");
2453 } elsif ($ev->{button} == 3) {
2454 CFClient::UI::Menu->new (
2455 items => [
2456 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2457 [
2458 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459 sub { $::CONN->send ("lock $item->{tag}") },
2460 ],
2461 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2462 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2463 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2464 ],
2465 )->popup ($ev);
2466 }
2467
2468 1
2469 },
2470 %args
2471 );
2472
2473 $self->add (new CFClient::UI::Face
2474 can_events => 0,
2475 face => $item->{face},
2476 anim => $item->{anim},
2477 animspeed => $item->{animspeed},
2478 );
2479
2480 $self->add (new CFClient::UI::Label
2481 can_events => 0,
2482 text => $desc,
2483 );
2484
2485 $self
2486}
2487
2488#############################################################################
2489
2490package CFClient::UI::Inventory;
2491
2492our @ISA = CFClient::UI::ScrolledWindow::;
2493
2494sub new {
2495 my $class = shift;
2496
2497 my $self = $class->SUPER::new (
2498 scrolled => (new CFClient::UI::VBox),
2499 @_,
2500 );
2501
2502 $self
2503}
2504
2505sub set_items {
2506 my ($self, $items) = @_;
2507
2508 $self->{scrolled}->clear;
2509 return unless $items;
2510
2511 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2512
2513 $self->{real_items} = \@items;
2514
2515 for my $item (@items) {
2516 my $desc = $item->{nrof} < 2
2517 ? $item->{name}
2518 : "$item->{nrof} $item->{name_pl}";
2519
2520 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2521 }
2522
2523# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2524}
2525
2526sub size_request {
2527 my ($self) = @_;
2528 ($self->{req_w}, $self->{req_h});
2529}
2530
2531#############################################################################
2532
2533package CFClient::UI::Menu;
2534
2535our @ISA = CFClient::UI::FancyFrame::;
2536
2537use CFClient::OpenGL;
2538
2539sub new {
2540 my $class = shift;
2541
2542 my $self = $class->SUPER::new (
2543 items => [],
2544 z => 100,
2545 @_,
2546 );
2547
2548 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2549
2550 for my $item (@{ $self->{items} }) {
2551 my ($widget, $cb) = @$item;
2552
2553 # handle various types of items, only text for now
2554 if (!ref $widget) {
2555 $widget = new CFClient::UI::Label
2556 can_hover => 1,
2557 can_events => 1,
2558 text => $widget;
2559 }
2560
2561 $self->{item}{$widget} = $item;
2562
2563 $self->{vbox}->add ($widget);
2564 }
2565
2566 $self
2567}
2568
2569# popup given the event (must be a mouse button down event currently)
2570sub popup {
2571 my ($self, $ev) = @_;
2572
2573 $self->emit ("popdown");
2574
2575 # maybe save $GRAB? must be careful about events...
2576 $GRAB = $self;
2577 $self->{button} = $ev->{button};
2578
2579 $self->show;
2580 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2581}
2582
2583sub mouse_motion {
2584 my ($self, $ev, $x, $y) = @_;
2585
2586 # TODO: should use vbox->find_widget or so
2587 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2588 $self->{hover} = $self->{item}{$HOVER};
2589}
2590
2591sub button_up {
2592 my ($self, $ev, $x, $y) = @_;
2593
2594 if ($ev->{button} == $self->{button}) {
2595 undef $GRAB;
2596 $self->hide;
2597
2598 $self->emit ("popdown");
2599 $self->{hover}[1]->() if $self->{hover};
2600 }
2601}
2602
2603#############################################################################
2604
2605package CFClient::UI::Statusbox;
2606
2607our @ISA = CFClient::UI::VBox::;
2608
2609sub reorder {
2610 my ($self) = @_;
2611 my $NOW = time;
2612
2613 while (my ($k, $v) = each %{ $self->{item} }) {
2614 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2615 }
2616
2617 my @widgets;
2618
2619 my @items = sort {
2620 $a->{pri} <=> $b->{pri}
2621 or $b->{id} <=> $a->{id}
2622 } values %{ $self->{item} };
2623
2624 my $count = 10 + 1;
2625 for my $item (@items) {
2626 last unless --$count;
2627
2628 push @widgets, $item->{label} ||= do {
2629 # TODO: doesn't handle markup well (read as: at all)
2630 my $short = $item->{count} > 1
2631 ? "<b>$item->{count} ×</b> $item->{text}"
2632 : $item->{text};
2633
2634 for ($short) {
2635 s/^\s+//;
2636 s/\012.*/…/s;
2637 my $len = int 30 / $item->{fontsize};
2638 substr $_, $len, length, "…" if $len < length;
2639 }
2640
2641 new CFClient::UI::Label
2642 markup => $short,
2643 tooltip => $item->{tooltip},
2644 tooltip_font => $::FONT_PROP,
2645 tooltip_width => 0.67,
2646 fontsize => $item->{fontsize},
2647 color => $item->{color},
2648 can_events => 1,
2649 can_hover => 1
2650 };
2651 }
2652
2653 $self->clear;
2654 $self->SUPER::add (reverse @widgets);
2655}
2656
2657sub add {
2658 my ($self, $text, %arg) = @_;
2659
2660 my $timeout = time + ((delete $arg{timeout}) || 60);
2661
2662 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663
2664 if (my $item = $self->{item}{$group}) {
2665 if ($item->{text} eq $text) {
2666 $item->{count}++;
2667 } else {
2668 $item->{count} = 1;
2669 $item->{text} = $item->{tooltip} = $text;
2670 }
2671 $item->{timeout} = $timeout;
2672 delete $item->{label};
2673 } else {
2674 $self->{item}{$group} = {
2675 id => ++$self->{id},
2676 text => $text,
2677 timeout => $timeout,
2678 tooltip => $text,
2679 fontsize => 0.8,
2680 color => [0.8, 0.8, 0.8, 0.8],
2681 pri => 0,
2682 count => 1,
2683 %arg,
2684 };
2685 }
2686
2687 $self->reorder;
2355} 2688}
2356 2689
2357############################################################################# 2690#############################################################################
2358 2691
2359package CFClient::UI::Root; 2692package CFClient::UI::Root;
2360 2693
2361our @ISA = CFClient::UI::Container::; 2694our @ISA = CFClient::UI::Container::;
2362 2695
2363use CFClient::OpenGL; 2696use CFClient::OpenGL;
2364 2697
2365sub check_size { 2698sub new {
2366 my ($self) = @_; 2699 my $class = shift;
2367 2700
2368 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2701 $class->SUPER::new (
2369} 2702 @_,
2370 2703 )
2371sub size_request {
2372 ($::WIDTH, $::HEIGHT)
2373} 2704}
2374 2705
2375sub configure { 2706sub configure {
2376 my ($self, $x, $y, $w, $h) = @_; 2707 my ($self, $x, $y, $w, $h) = @_;
2377 2708
2378 $self->SUPER::configure ($x, $y, $w, $h); 2709 $self->{w} = $w;
2710 $self->{h} = $h;
2711}
2379 2712
2713sub check_size {
2714 my ($self) = @_;
2715
2716 $self->size_allocate ($self->{w}, $self->{h})
2717 if $self->{w};
2718}
2719
2720sub size_request {
2721 my ($self) = @_;
2722
2723 ($self->{w}, $self->{h})
2724}
2725
2726sub size_allocate {
2727 my ($self, $w, $h) = @_;
2728
2729 my $old_w = $self->{old_w};
2730 my $old_h = $self->{old_h};
2731
2732 if ($old_w && $old_h) {
2733 for my $child ($self->children) {
2734 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2735 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2736 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2737 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2738 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2739 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2740 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2741 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2742 }
2743 }
2744
2380 for my $child (@{$self->{children}}) { 2745 for my $child ($self->children) {
2381 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2746 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2382 2747
2383 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2748 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2384 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2749 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2385 $child->configure ($X, $Y, $W,$H); 2750 $child->configure ($X, $Y, $W, $H);
2386 } 2751 }
2387}
2388 2752
2389sub _topleft { 2753 $self->{old_w} = $w;
2754 $self->{old_h} = $h;
2755}
2756
2757sub coord2local {
2390 my ($self, $x, $y) = @_; 2758 my ($self, $x, $y) = @_;
2391 2759
2392 ($x, $y) 2760 ($x, $y)
2393} 2761}
2394 2762
2763sub coord2global {
2764 my ($self, $x, $y) = @_;
2765
2766 ($x, $y)
2767}
2768
2395sub update { 2769sub update {
2396 my ($self) = @_; 2770 my ($self) = @_;
2397 2771
2398 $self->check_size; 2772 $self->check_size;
2399 ::refresh (); 2773 $::WANT_REFRESH++;
2400} 2774}
2401 2775
2402sub add { 2776sub add {
2403 my ($self, $child) = @_; 2777 my ($self, $child) = @_;
2404 2778
2405 # integerize window positions 2779 # integerise window positions
2406 $child->{x} = int $child->{x}; 2780 $child->{x} = int $child->{x};
2407 $child->{y} = int $child->{y}; 2781 $child->{y} = int $child->{y};
2408 2782
2409 $self->SUPER::add ($child); 2783 $self->SUPER::add ($child);
2410} 2784}
… …
2413 my ($self, $id, $cb) = @_; 2787 my ($self, $id, $cb) = @_;
2414 2788
2415 $self->{refresh_hook}{$id} = $cb; 2789 $self->{refresh_hook}{$id} = $cb;
2416} 2790}
2417 2791
2418sub draw { 2792sub draw {
2419 my ($self) = @_; 2793 my ($self) = @_;
2420 2794
2795 if ($self->{check_size}) {
2796 my @queue = ([], []);
2797
2798 for (;;) {
2799 if ($self->{check_size}) {
2800 # heuristic: check containers last
2801 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2802 for values %{delete $self->{check_size}}
2803 }
2804
2805 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2806
2807 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2808 ? @$widget{qw(user_w user_h)}
2809 : $widget->size_request;
2810
2811 if (delete $widget->{force_alloc}
2812 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2813 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2814
2815 $widget->{req_w} = $w;
2816 $widget->{req_h} = $h;
2817
2818 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2819
2820 $widget->{parent}->check_size
2821 if $widget->{parent};
2822 }
2823 }
2824 }
2825
2826 while ($self->{size_alloc}) {
2827 for (values %{delete $self->{size_alloc}}) {
2828 my ($widget, $w, $h) = @$_;
2829
2830 $w = 0 if $w < 0;
2831 $h = 0 if $h < 0;
2832
2833 $widget->{w} = $w;
2834 $widget->{h} = $h;
2835 $widget->size_allocate ($w, $h);
2836 $widget->emit (size_allocate => $w, $h);
2837 }
2838 }
2839
2421 while (my $rcb = delete $self->{refresh_hook}) { 2840 while ($self->{refresh_hook}) {
2422 $_->() for values %$rcb; 2841 $_->()
2842 for values %{delete $self->{refresh_hook}};
2423 } 2843 }
2424 2844
2425 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2845 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2426 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2427 glClear GL_COLOR_BUFFER_BIT; 2847 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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