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.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.202 by root, Sun May 14 20:51:19 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
… …
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
15 18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_markup ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 32 $TOOLTIP->show;
31 33
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 35
34 if ($x + $TOOLTIP->{w} > $::WIDTH) { 36 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 } 38 }
37 39
38 $TOOLTIP->move ($x, $y); 40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
39 } 43 }
40 44
41 return; 45 return;
42 } 46 }
43 } 47 }
… …
130 134
131 for (@$vals) { 135 for (@$vals) {
132 my $i = int $_ + $rem; 136 my $i = int $_ + $rem;
133 $rem += $_ - $i; 137 $rem += $_ - $i;
134 $_ = $i; 138 $_ = $i;
139 }
140}
141
142# call when resolution changes etc.
143sub rescale_widgets {
144 my ($sx, $sy) = @_;
145
146 for my $widget (values %WIDGET) {
147 if ($widget->{toplevel}) {
148 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
149 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
150 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
151 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
153 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
154 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
155 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
156 }
157
158 $widget->reconfigure;
135 } 159 }
136} 160}
137 161
138############################################################################# 162#############################################################################
139 163
… …
158 if (/^connect_(.*)$/) { 182 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 183 $self->connect ($1 => delete $self->{$_});
160 } 184 }
161 } 185 }
162 186
187 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
188
163 $self 189 $self
164} 190}
165 191
166sub destroy { 192sub destroy {
167 my ($self) = @_; 193 my ($self) = @_;
… …
173sub show { 199sub show {
174 my ($self) = @_; 200 my ($self) = @_;
175 201
176 return if $self->{parent}; 202 return if $self->{parent};
177 203
204 $self->{toplevel} = 1;
178 $CFClient::UI::ROOT->add ($self); 205 $CFClient::UI::ROOT->add ($self);
179} 206}
180 207
181sub hide { 208sub hide {
182 my ($self) = @_; 209 my ($self) = @_;
… …
232 $self->{y} = $y; 259 $self->{y} = $y;
233 $self->update; 260 $self->update;
234 } 261 }
235 262
236 if ($self->{w} != $w || $self->{h} != $h) { 263 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 264 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 } 265 }
243} 266}
244 267
245sub size_allocate { 268sub size_allocate {
246 # nothing to be done 269 # nothing to be done
247} 270}
248 271
272sub reconfigure {
273 my ($self) = @_;
274
275 $self->check_size (1);
276 $self->update;
277}
278
249sub children { 279sub children {
250}
251
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260} 280}
261 281
262sub set_max_size { 282sub set_max_size {
263 my ($self, $w, $h) = @_; 283 my ($self, $w, $h) = @_;
264 284
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 285 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 286 delete $self->{max_h}; $self->{max_h} = $h if $h;
267}
268
269# return top left coordinates
270sub _topleft {
271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
275
276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
277} 287}
278 288
279# translate global coordinates to local coordinate system 289# translate global coordinates to local coordinate system
280sub coord2local { 290sub coord2local {
281 my ($self, $x, $y) = @_; 291 my ($self, $x, $y) = @_;
282 292
283 my ($X, $Y) = $self->_topleft; 293 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 294}
286 295
287# translate local coordinates to global coordinate system 296# translate local coordinates to global coordinate system
288sub coord2global { 297sub coord2global {
289 my ($self, $x, $y) = @_; 298 my ($self, $x, $y) = @_;
290 299
291 my ($X, $Y) = $self->_topleft; 300 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 301}
294 302
295sub focus_in { 303sub focus_in {
296 my ($self) = @_; 304 my ($self) = @_;
297 305
… …
395 403
396sub set_parent { 404sub set_parent {
397 my ($self, $parent) = @_; 405 my ($self, $parent) = @_;
398 406
399 Scalar::Util::weaken ($self->{parent} = $parent); 407 Scalar::Util::weaken ($self->{parent} = $parent);
408
409 # TODO: req_w _does_change after ->reconfigure
410 $self->check_size
411 unless exists $self->{req_w};
400} 412}
401 413
402sub check_size { 414sub check_size {
403 my ($self) = @_; 415 my ($self, $forced) = @_;
404 416
405 $self->{parent} 417 $self->{force_alloc} = 1 if $forced;
406 or return 1; 418 $CFClient::UI::ROOT->{check_size}{$self} = $self;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426} 419}
427 420
428sub update { 421sub update {
429 my ($self) = @_; 422 my ($self) = @_;
430 423
… …
445} 438}
446 439
447sub DESTROY { 440sub DESTROY {
448 my ($self) = @_; 441 my ($self) = @_;
449 442
443 delete $WIDGET{$self+0};
450 #$self->deactivate; 444 #$self->deactivate;
451} 445}
452 446
453############################################################################# 447#############################################################################
454 448
… …
527 521
528 $self 522 $self
529} 523}
530 524
531sub add { 525sub add {
532 my ($self, $child) = @_; 526 my ($self, @widgets) = @_;
533 527
534 $child->set_parent ($self); 528 $_->set_parent ($self)
529 for @widgets;
535 530
536 use sort 'stable'; 531 use sort 'stable';
537 532
538 $self->{children} = [ 533 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 534 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 535 @{$self->{children}}, @widgets
541 ]; 536 ];
542 537
543 $child->check_size; 538 $self->check_size (1);
539 $self->update;
544} 540}
545 541
546sub children { 542sub children {
547 @{ $_[0]{children} } 543 @{ $_[0]{children} }
548} 544}
… …
567 563
568 for (@$children) { 564 for (@$children) {
569 delete $_->{parent}; 565 delete $_->{parent};
570 $_->hide; 566 $_->hide;
571 } 567 }
568
569 $self->check_size;
570 $self->update;
572} 571}
573 572
574sub find_widget { 573sub find_widget {
575 my ($self, $x, $y) = @_; 574 my ($self, $x, $y) = @_;
576 575
… …
651} 650}
652 651
653sub update { 652sub update {
654 my ($self) = @_; 653 my ($self) = @_;
655 654
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 655 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 656 $self->SUPER::update;
658} 657}
659 658
660sub size_allocate { 659sub size_allocate {
661 my ($self, $w, $h) = @_; 660 my ($self, $w, $h) = @_;
662 661
663 $self->SUPER::size_allocate ($w, $h); 662 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 663 $self->update;
664}
665
666sub _render {
667 $_[0]{children}[0]->draw;
665} 668}
666 669
667sub render_child { 670sub render_child {
668 my ($self) = @_; 671 my ($self) = @_;
669 672
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 673 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 674 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 675 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 676
677 $self->_render;
674# glColorMask 1, 1, 1, 0; 678# glColorMask 1, 1, 1, 0;
675# glEnable GL_BLEND; 679# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO; 680# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0; 681# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h}; 682# glCopyPixels 0, 0, $self->{w}, $self->{h};
… …
687 my ($w, $h) = ($self->w, $self->h); 691 my ($w, $h) = ($self->w, $self->h);
688 692
689 my $tex = $self->{texture} 693 my $tex = $self->{texture}
690 or return; 694 or return;
691 695
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 696 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 698 glColor 0, 0, 0, 1;
697 699
698 $tex->draw_quad (0, 0, $w, $h); 700 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 701
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 702 glDisable GL_TEXTURE_2D;
702} 703}
703 704
704############################################################################# 705#############################################################################
705 706
706package CFClient::UI::ViewPort; 707package CFClient::UI::ViewPort;
707 708
708our @ISA = CFClient::UI::Window::; 709our @ISA = CFClient::UI::Window::;
709 710
710sub new { die }
711
712sub size_request { 711sub size_request {
713 my ($self) = @_; 712 my ($self) = @_;
714 713
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 714 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 715 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
717 716
718 @$self{qw(child_w child_h)} 717 @$self{qw(child_w child_h)}
719} 718}
720 719
721sub _draw { 720sub size_allocate {
722 my ($self) = @_; 721 my ($self, $w, $h) = @_;
723 722
724 $self->{children}[1]->draw; 723 $self->update;
725} 724}
726 725
726sub set_offset {
727 my ($self, $x, $y) = @_;
727 728
728############################################################################# 729 $self->{view_x} = int $x;
730 $self->{view_y} = int $y;
729 731
732 $self->update;
733}
734
735# hmm, this does not work for topleft of $self... but we should not ask for that
736sub coord2local {
737 my ($self, $x, $y) = @_;
738
739 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
740}
741
742sub coord2global {
743 my ($self, $x, $y) = @_;
744
745 $x = List::Util::min $self->{w}, $x - $self->{view_x};
746 $y = List::Util::min $self->{h}, $y - $self->{view_y};
747
748 $self->SUPER::coord2global ($x, $y)
749}
750
751sub find_widget {
752 my ($self, $x, $y) = @_;
753
754 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
755 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
756 ) {
757 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
758 } else {
759 $self->CFClient::UI::Base::find_widget ($x, $y)
760 }
761}
762
763sub _render {
764 my ($self) = @_;
765
766 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
767
768 $self->SUPER::_render;
769}
770
771#############################################################################
772
730package CFClient::UI::Frame; 773package CFClient::UI::ScrolledWindow;
731 774
732our @ISA = CFClient::UI::Bin::; 775our @ISA = CFClient::UI::HBox::;
733
734use CFClient::OpenGL;
735 776
736sub new { 777sub new {
737 my $class = shift; 778 my $class = shift;
738 779
780 my $self;
781
782 my $slider = new CFClient::UI::Slider
783 vertical => 1,
784 range => [0, 0, 1, 0.01], # HACK fix
785 connect_changed => sub {
786 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
787 },
788 ;
789
739 my $self = $class->SUPER::new ( 790 $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1], 791 vp => (new CFClient::UI::ViewPort),
741 border_bg => [1, 1, 1, 1], 792 slider => $slider,
742 border => 0.8,
743 @_ 793 @_,
744 ); 794 );
745 795
796 $self->{vp}->add ($self->{scrolled});
797 $self->add ($self->{vp});
798 $self->add ($self->{slider});
799
746 $self 800 $self
747} 801}
748 802
803#TODO# update range on size_allocate depending on child
804# update viewport offset on scroll
805
806#############################################################################
807
808package CFClient::UI::Frame;
809
810our @ISA = CFClient::UI::Bin::;
811
812use CFClient::OpenGL;
813
814sub new {
815 my $class = shift;
816
817 $class->SUPER::new (
818 bg => undef,
819 @_,
820 )
821}
822
749sub _draw { 823sub _draw {
750 my ($self) = @_; 824 my ($self) = @_;
751 825
752 my ($w, $h) = ($self->{w}, $self->{h}); 826 if ($self->{bg}) {
827 my ($w, $h) = @$self{qw(w h)};
753 828
754 glEnable GL_BLEND; 829 glEnable GL_BLEND;
755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 830 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
756 glEnable GL_TEXTURE_2D; 831 glColor @{ $self->{bg} };
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758 832
759# glBegin GL_QUADS; 833 glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0; 834 glVertex 0 , 0;
762# glVertex 0 , $h; 835 glVertex 0 , $h;
763# glVertex $w, $h; 836 glVertex $w, $h;
764# glVertex $w, 0; 837 glVertex $w, 0;
765# glEnd; 838 glEnd;
766 839
767
768 $self->child->draw;
769 glDisable GL_BLEND; 840 glDisable GL_BLEND;
770 glDisable GL_TEXTURE_2D; 841 }
842
843 $self->SUPER::_draw;
771} 844}
772 845
773############################################################################# 846#############################################################################
774 847
775package CFClient::UI::FancyFrame; 848package CFClient::UI::FancyFrame;
… …
789 862
790 my $self = $class->SUPER::new ( 863 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 864 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 865 border_bg => [1, 1, 1, 1],
793 border => 0.6, 866 border => 0.6,
867 toplevel => 1,
794 can_events => 1, 868 can_events => 1,
795 @_ 869 @_
796 ); 870 );
797 871
798 $self->{title} &&= new CFClient::UI::Label 872 $self->{title} &&= new CFClient::UI::Label
… …
891 my ($self) = @_; 965 my ($self) = @_;
892 966
893 my ($w, $h ) = ($self->{w}, $self->{h}); 967 my ($w, $h ) = ($self->{w}, $self->{h});
894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 968 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
895 969
896 glEnable GL_BLEND;
897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898 glEnable GL_TEXTURE_2D; 970 glEnable GL_TEXTURE_2D;
899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 971 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900 972
901 my $border = $self->border; 973 my $border = $self->border;
902 974
903 glColor @{ $self->{border_bg} }; 975 glColor @{ $self->{border_bg} };
904 $tex[1]->draw_quad (0, 0, $w, $border); 976 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 977 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 978 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 979 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
908 980
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 981 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
910 my $bg = $tex[0]; 982 my $bg = $tex[0];
911 983
912 # TODO: repeat texture not scale 984 # TODO: repeat texture not scale
… …
916 glColor @{ $self->{bg} }; 988 glColor @{ $self->{bg} };
917 989
918 $bg->{s} = $rep_x; 990 $bg->{s} = $rep_x;
919 $bg->{t} = $rep_y; 991 $bg->{t} = $rep_y;
920 $bg->{wrap_mode} = 1; 992 $bg->{wrap_mode} = 1;
921 $bg->draw_quad ($border, $border, $cw, $ch); 993 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
994 }
922 995
923 glDisable GL_TEXTURE_2D; 996 glDisable GL_TEXTURE_2D;
924 glDisable GL_BLEND;
925 }
926 997
927 $self->{title}->draw if $self->{title}; 998 $self->{title}->draw if $self->{title};
928 999
929 $self->child->draw; 1000 $self->child->draw;
930} 1001}
… …
1157} 1228}
1158 1229
1159sub size_allocate { 1230sub size_allocate {
1160 my ($self, $w, $h) = @_; 1231 my ($self, $w, $h) = @_;
1161 1232
1233 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1234
1162 my $children = $self->{children}; 1235 my $children = $self->{children};
1163 1236
1164 my @h = map $_->{req_h}, @$children; 1237 my @h = map $_->{req_h}, @$children;
1165 1238
1166 my $req_h = List::Util::sum @h; 1239 my $req_h = List::Util::sum @h;
… …
1205 my ($class, %arg) = @_; 1278 my ($class, %arg) = @_;
1206 1279
1207 my $self = $class->SUPER::new ( 1280 my $self = $class->SUPER::new (
1208 fg => [1, 1, 1], 1281 fg => [1, 1, 1],
1209 #font => default_font 1282 #font => default_font
1283 #text => initial text
1284 #markup => initial narkup
1285 layout => (new CFClient::Layout),
1210 fontsize => 1, 1286 fontsize => 1,
1211 text => "",
1212 align => -1, 1287 align => -1,
1213 valign => -1, 1288 valign => -1,
1214 padding => 2, 1289 padding => 2,
1215 layout => new CFClient::Layout,
1216 can_events => 0, 1290 can_events => 0,
1217 %arg 1291 %arg
1218 ); 1292 );
1219 1293
1220 if (exists $self->{template}) { 1294 if (exists $self->{template}) {
1221 my $layout = new CFClient::Layout; 1295 my $layout = new CFClient::Layout;
1222 $layout->set_text (delete $self->{template}); 1296 $layout->set_text (delete $self->{template});
1223 $self->{template} = $layout; 1297 $self->{template} = $layout;
1224 } 1298 }
1225 1299
1226 $self->set_text (delete $self->{text}) if exists $self->{text}; 1300 if (exists $self->{markup}) {
1227 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1301 $self->set_markup (delete $self->{markup});
1302 } else {
1303 $self->set_text (delete $self->{text});
1304 }
1228 1305
1229 $self 1306 $self
1230} 1307}
1231 1308
1232sub escape { 1309sub escape {
… …
1244 1321
1245 delete $self->{texture}; 1322 delete $self->{texture};
1246 $self->SUPER::update; 1323 $self->SUPER::update;
1247} 1324}
1248 1325
1249sub reconfigure {
1250 my ($self) = @_;
1251
1252 delete $self->{texture};
1253}
1254
1255sub set_text { 1326sub set_text {
1256 my ($self, $text) = @_; 1327 my ($self, $text) = @_;
1257 1328
1258 return if $self->{text} eq "T$text"; 1329 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text"; 1330 $self->{text} = "T$text";
1260 1331
1332 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1261 $self->{layout}->set_text ($text); 1333 $self->{layout}->set_text ($text);
1262 1334
1263 delete $self->{texture};
1264 $self->update; 1335 $self->update;
1265 $self->check_size; 1336 $self->check_size;
1266} 1337}
1267 1338
1268sub set_markup { 1339sub set_markup {
1269 my ($self, $markup) = @_; 1340 my ($self, $markup) = @_;
1270 1341
1271 return if $self->{text} eq "M$markup"; 1342 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup"; 1343 $self->{text} = "M$markup";
1273 1344
1345 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1346
1347 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1274 $self->{layout}->set_markup ($markup); 1348 $self->{layout}->set_markup ($markup);
1275 1349
1276 delete $self->{texture};
1277 $self->update; 1350 $self->update;
1278 $self->check_size; 1351 $self->check_size;
1279} 1352}
1280 1353
1281sub size_request { 1354sub size_request {
… …
1312sub set_fontsize { 1385sub set_fontsize {
1313 my ($self, $fontsize) = @_; 1386 my ($self, $fontsize) = @_;
1314 1387
1315 $self->{fontsize} = $fontsize; 1388 $self->{fontsize} = $fontsize;
1316 delete $self->{texture}; 1389 delete $self->{texture};
1390
1391 $self->update;
1317 $self->check_size; 1392 $self->check_size;
1318 $self->update;
1319} 1393}
1320 1394
1321sub _draw { 1395sub _draw {
1322 my ($self) = @_; 1396 my ($self) = @_;
1323 1397
1324 my $tex = $self->{texture} ||= do { 1398 my $tex = $self->{texture} ||= do {
1399 $self->{layout}->set_foreground (@{$self->{fg}});
1325 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1400 $self->{layout}->set_font ($self->{font}) if $self->{font};
1326 $self->{layout}->set_width ($self->{w}); 1401 $self->{layout}->set_width ($self->{w});
1327 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1403
1328 new_from_layout CFClient::Texture $self->{layout} 1404 my $tex = new_from_layout CFClient::Texture $self->{layout};
1405
1406 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1407 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1408 : ($self->{w} - $tex->{w}) * 0.5;
1409
1410 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1411 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1412 : ($self->{h} - $tex->{h}) * 0.5;
1413
1414 $tex
1329 }; 1415 };
1330 1416
1331 glEnable GL_BLEND;
1332 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1333 glEnable GL_TEXTURE_2D; 1417 glEnable GL_TEXTURE_2D;
1334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1418 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1335 1419
1420 if ($tex->{format} == GL_ALPHA) {
1336 glColor @{$self->{fg}}; 1421 glColor @{$self->{fg}};
1337
1338 $self->{ox} = int (
1339 $self->{align} < 0 ? $self->{padding}
1340 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1341 : ($self->{w} - $tex->{w}) * 0.5
1342 );
1343
1344 $self->{oy} = int (
1345 $self->{valign} < 0 ? $self->{padding}
1346 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1347 : ($self->{h} - $tex->{h}) * 0.5
1348 );
1349
1350 $tex->draw_quad ($self->{ox}, $self->{oy}); 1422 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1423 } else {
1424 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1425 }
1351 1426
1352 glDisable GL_TEXTURE_2D; 1427 glDisable GL_TEXTURE_2D;
1353 glDisable GL_BLEND;
1354} 1428}
1355 1429
1356############################################################################# 1430#############################################################################
1357 1431
1358package CFClient::UI::EntryBase; 1432package CFClient::UI::EntryBase;
… …
1393 $self->{layout}->set_text ("$text "); 1467 $self->{layout}->set_text ("$text ");
1394 1468
1395 $self->emit (changed => $self->{text}); 1469 $self->emit (changed => $self->{text});
1396} 1470}
1397 1471
1472sub set_text {
1473 my ($self, $text) = @_;
1474
1475 $self->{cursor} = length $text;
1476 $self->_set_text ($text);
1477 $self->check_size;
1478 $self->update;
1479}
1480
1398sub get_text { 1481sub get_text {
1399 $_[0]{text} 1482 $_[0]{text}
1400} 1483}
1401 1484
1402sub size_request { 1485sub size_request {
… …
1409 1492
1410sub size_allocate { 1493sub size_allocate {
1411 my ($self, $w, $h) = @_; 1494 my ($self, $w, $h) = @_;
1412 1495
1413 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1496 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1414}
1415
1416sub set_text {
1417 my ($self, $text) = @_;
1418
1419 $self->{cursor} = length $text;
1420 $self->_set_text ($text);
1421 $self->update;
1422} 1497}
1423 1498
1424sub key_down { 1499sub key_down {
1425 my ($self, $ev) = @_; 1500 my ($self, $ev) = @_;
1426 1501
… …
1428 my $sym = $ev->{sym}; 1503 my $sym = $ev->{sym};
1429 my $uni = $ev->{unicode}; 1504 my $uni = $ev->{unicode};
1430 1505
1431 my $text = $self->get_text; 1506 my $text = $self->get_text;
1432 1507
1433 if ($sym == 8) { 1508 if ($uni == 8) {
1434 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1509 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1435 } elsif ($sym == 127) { 1510 } elsif ($uni == 127) {
1436 substr $text, $self->{cursor}, 1, ""; 1511 substr $text, $self->{cursor}, 1, "";
1437 } elsif ($sym == CFClient::SDLK_LEFT) { 1512 } elsif ($sym == CFClient::SDLK_LEFT) {
1438 --$self->{cursor} if $self->{cursor}; 1513 --$self->{cursor} if $self->{cursor};
1439 } elsif ($sym == CFClient::SDLK_RIGHT) { 1514 } elsif ($sym == CFClient::SDLK_RIGHT) {
1440 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1515 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1441 } elsif ($sym == CFClient::SDLK_HOME) { 1516 } elsif ($sym == CFClient::SDLK_HOME) {
1442 $self->{cursor} = 0; 1517 $self->{cursor} = 0;
1443 } elsif ($sym == CFClient::SDLK_END) { 1518 } elsif ($sym == CFClient::SDLK_END) {
1444 $self->{cursor} = length $text; 1519 $self->{cursor} = length $text;
1445 } elsif ($sym == 27) { 1520 } elsif ($uni == 27) {
1446 $self->emit ('escape'); 1521 $self->emit ('escape');
1447 } elsif ($uni) { 1522 } elsif ($uni) {
1448 substr $text, $self->{cursor}++, 0, chr $uni; 1523 substr $text, $self->{cursor}++, 0, chr $uni;
1449 } 1524 }
1450 1525
… …
1614 1689
1615 if ($GRAB == $self) { 1690 if ($GRAB == $self) {
1616 $self->{fg} = $self->{active_fg}; 1691 $self->{fg} = $self->{active_fg};
1617 } 1692 }
1618 1693
1619 glEnable GL_BLEND;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621 glEnable GL_TEXTURE_2D; 1694 glEnable GL_TEXTURE_2D;
1622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623 glColor 0, 0, 0, 1; 1696 glColor 0, 0, 0, 1;
1624 1697
1625 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1698 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1626 1699
1627 glDisable GL_TEXTURE_2D; 1700 glDisable GL_TEXTURE_2D;
1628 glDisable GL_BLEND;
1629 1701
1630 $self->SUPER::_draw; 1702 $self->SUPER::_draw;
1631} 1703}
1632 1704
1633############################################################################# 1705#############################################################################
… …
1680 1752
1681 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1753 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1682 1754
1683 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1755 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1684 1756
1685 glEnable GL_BLEND; 1757 my $tex = $self->{state} ? $tex[1] : $tex[0];
1758
1686 glEnable GL_TEXTURE_2D; 1759 glEnable GL_TEXTURE_2D;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688
1689 my $tex = $self->{state} ? $tex[1] : $tex[0];
1690
1691 $tex->draw_quad (0, 0, $s, $s); 1760 $tex->draw_quad_alpha (0, 0, $s, $s);
1692
1693 glDisable GL_TEXTURE_2D; 1761 glDisable GL_TEXTURE_2D;
1694 glDisable GL_BLEND;
1695} 1762}
1696 1763
1697############################################################################# 1764#############################################################################
1698 1765
1699package CFClient::UI::Image; 1766package CFClient::UI::Image;
… …
1742 glTranslate 0, -$self->{w}, 0; 1809 glTranslate 0, -$self->{w}, 0;
1743 1810
1744 ($w, $h) = ($h, $w); 1811 ($w, $h) = ($h, $w);
1745 } 1812 }
1746 1813
1747 glEnable GL_BLEND;
1748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1749 glEnable GL_TEXTURE_2D; 1814 glEnable GL_TEXTURE_2D;
1750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1815 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1751 1816
1752 $tex->draw_quad (0, 0, $w, $h); 1817 $tex->draw_quad_alpha (0, 0, $w, $h);
1753 1818
1754 glDisable GL_BLEND;
1755 glDisable GL_TEXTURE_2D; 1819 glDisable GL_TEXTURE_2D;
1756} 1820}
1757 1821
1758############################################################################# 1822#############################################################################
1759 1823
… …
1957 # TODO: calculations are off 2021 # TODO: calculations are off
1958 my $self = $class->SUPER::new ( 2022 my $self = $class->SUPER::new (
1959 fg => [1, 1, 1], 2023 fg => [1, 1, 1],
1960 active_fg => [0, 0, 0], 2024 active_fg => [0, 0, 0],
1961 range => [0, 0, 100, 10], 2025 range => [0, 0, 100, 10],
1962 req_w => 20, 2026 req_w => $::WIDTH / 80,
1963 req_h => 20, 2027 req_h => $::WIDTH / 80,
1964 vertical => 0, 2028 vertical => 0,
1965 can_hover => 1, 2029 can_hover => 1,
1966 inner_pad => 5, 2030 inner_pad => 5,
1967 @_ 2031 @_
1968 ); 2032 );
… …
2051 $page ||= 2; 2115 $page ||= 2;
2052 2116
2053 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2117 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2054 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2118 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2055 2119
2056 glEnable GL_BLEND;
2057 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2058 glEnable GL_TEXTURE_2D; 2120 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2121 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2122
2061 # draw background 2123 # draw background
2062 $tex[1]->draw_quad (0, 0, $w, $h); 2124 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
2063 2125
2064 # draw handle 2126 # draw handle
2065 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2127 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
2066 2128
2067 glDisable GL_BLEND;
2068 glDisable GL_TEXTURE_2D; 2129 glDisable GL_TEXTURE_2D;
2069} 2130}
2070 2131
2071############################################################################# 2132#############################################################################
2072 2133
… …
2083 fontsize => 1, 2144 fontsize => 1,
2084 can_events => 0, 2145 can_events => 0,
2085 #font => default_font 2146 #font => default_font
2086 @_, 2147 @_,
2087 2148
2088 layout => (new CFClient::Layout), 2149 layout => (new CFClient::Layout 1),
2089 par => [], 2150 par => [],
2090 height => 0, 2151 height => 0,
2091 children => [ 2152 children => [
2092 (new CFClient::UI::Empty expand => 1), 2153 (new CFClient::UI::Empty expand => 1),
2093 (new CFClient::UI::Slider vertical => 1), 2154 (new CFClient::UI::Slider vertical => 1),
… …
2111 2172
2112 my $layout = $self->{layout}; 2173 my $layout = $self->{layout};
2113 2174
2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2175 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115 $layout->set_width ($self->{children}[0]{w}); 2176 $layout->set_width ($self->{children}[0]{w});
2116 $layout->set_text ($text); 2177 $layout->set_markup ($text);
2117 2178
2118 ($layout->size)[1] 2179 ($layout->size)[1]
2119} 2180}
2120 2181
2121sub reflow { 2182sub reflow {
… …
2159 2220
2160 return unless $self->{h} > 0; 2221 return unless $self->{h} > 0;
2161 2222
2162 delete $self->{texture}; 2223 delete $self->{texture};
2163 2224
2164 $ROOT->on_refresh ($self, sub { 2225 $ROOT->on_post_alloc ($self, sub {
2165 if (delete $self->{need_reflow}) { 2226 if (delete $self->{need_reflow}) {
2166 my $height = 0; 2227 my $height = 0;
2167 2228
2168 $height += $_->[0] = $self->text_height ($_->[2]) 2229 $height += $_->[0] = $self->text_height ($_->[2])
2169 for @{$self->{par}}; 2230 for @{$self->{par}};
… …
2177 2238
2178 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2239 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2179 glClearColor 0, 0, 0, 0; 2240 glClearColor 0, 0, 0, 0;
2180 glClear GL_COLOR_BUFFER_BIT; 2241 glClear GL_COLOR_BUFFER_BIT;
2181 2242
2182 glEnable GL_BLEND;
2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2184 glEnable GL_TEXTURE_2D; 2243 glEnable GL_TEXTURE_2D;
2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2186 2245
2187 my $top = int $self->{children}[1]{range}[0]; 2246 my $top = int $self->{children}[1]{range}[0];
2188 2247
… …
2197 2256
2198 for my $par (@{$self->{par}}) { 2257 for my $par (@{$self->{par}}) {
2199 my $h = $par->[0]; 2258 my $h = $par->[0];
2200 2259
2201 if ($y0 < $y + $h && $y < $y1) { 2260 if ($y0 < $y + $h && $y < $y1) {
2261 $layout->set_foreground (@{ $par->[1] });
2202 $layout->set_text ($par->[2]); 2262 $layout->set_markup ($par->[2]);
2203 2263
2204 glColor @{ $par->[1] };
2205 my ($W, $H) = $layout->size; 2264 my ($W, $H) = $layout->size;
2206 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2265 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2207 } 2266 }
2208 2267
2209 $y += $h; 2268 $y += $h;
2210 } 2269 }
2211 2270
2212 glDisable GL_TEXTURE_2D; 2271 glDisable GL_TEXTURE_2D;
2213 glDisable GL_BLEND;
2214 }; 2272 };
2215 }); 2273 });
2216} 2274}
2217 2275
2218sub _draw { 2276sub _draw {
2219 my ($self) = @_; 2277 my ($self) = @_;
2220 2278
2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223 glEnable GL_TEXTURE_2D; 2279 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2280 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 1, 1, 1, 1; 2281 glColor 1, 1, 1, 1;
2226 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2282 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2227 glDisable GL_TEXTURE_2D; 2283 glDisable GL_TEXTURE_2D;
2228 glDisable GL_BLEND;
2229 2284
2230 $self->{children}[1]->draw; 2285 $self->{children}[1]->draw;
2231 2286
2232} 2287}
2233 2288
… …
2327 @_, 2382 @_,
2328 can_events => 0, 2383 can_events => 0,
2329 ) 2384 )
2330} 2385}
2331 2386
2332sub set_markup { 2387sub set_tooltip_from {
2333 my ($self, $text) = @_; 2388 my ($self, $widget) = @_;
2334 2389
2335 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2390 $self->add (new CFClient::UI::Label
2336 $self->{label}->set_markup ($text); 2391 markup => $widget->{tooltip},
2337 $self->add ($self->{label}); 2392 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2393 fontsize => 0.8,
2394 fg => [0, 0, 0, 1],
2395 font => ($widget->{tooltip_font} || $::FONT_PROP),
2396 );
2338} 2397}
2339 2398
2340sub size_request { 2399sub size_request {
2341 my ($self) = @_; 2400 my ($self) = @_;
2342
2343 $self->child->set_max_size ($::WIDTH * 0.3);
2344 2401
2345 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2402 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346 2403
2347 ($w + 4, $h + 4) 2404 ($w + 4, $h + 4)
2348} 2405}
… …
2354} 2411}
2355 2412
2356sub _draw { 2413sub _draw {
2357 my ($self) = @_; 2414 my ($self) = @_;
2358 2415
2359 glPushMatrix;
2360 glTranslate 0.375, 0.375; 2416 glTranslate 0.375, 0.375;
2361 2417
2362 my ($w, $h) = @$self{qw(w h)}; 2418 my ($w, $h) = @$self{qw(w h)};
2363 2419
2364 glColor 1, 0.8, 0.4; 2420 glColor 1, 0.8, 0.4;
… …
2375 glVertex 0 , $h; 2431 glVertex 0 , $h;
2376 glVertex $w, $h; 2432 glVertex $w, $h;
2377 glVertex $w, 0; 2433 glVertex $w, 0;
2378 glEnd; 2434 glEnd;
2379 2435
2380 glPopMatrix; 2436 glTranslate 2 - 0.375, 2 - 0.375;
2381
2382 glTranslate 2, 2;
2383 $self->SUPER::_draw; 2437 $self->SUPER::_draw;
2384} 2438}
2385 2439
2386############################################################################# 2440#############################################################################
2387 2441
… …
2405} 2459}
2406 2460
2407sub _draw { 2461sub _draw {
2408 my ($self) = @_; 2462 my ($self) = @_;
2409 2463
2464 return unless $::CONN;#d# manage and cache textures differently
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2465 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2411 2466
2412 # TODO animation 2467 # TODO animation
2413 if ($tex) { 2468 if ($tex) {
2414 glEnable GL_BLEND;
2415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2416 glEnable GL_TEXTURE_2D; 2469 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418 glColor 1, 1, 1, 1; 2471 glColor 1, 1, 1, 1;
2419 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2472 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2420 glDisable GL_TEXTURE_2D; 2473 glDisable GL_TEXTURE_2D;
2421 glDisable GL_BLEND;
2422 } 2474 }
2475}
2476
2477#############################################################################
2478
2479package CFClient::UI::InventoryItem;
2480
2481our @ISA = CFClient::UI::HBox::;
2482
2483sub new {
2484 my $class = shift;
2485
2486 my %args = @_;
2487
2488 my $item = delete $args{item};
2489
2490 my $desc = $item->{nrof} < 2
2491 ? $item->{name}
2492 : "$item->{nrof} $item->{name_pl}";
2493
2494
2495 my $self = $class->SUPER::new (
2496 can_hover => 1,
2497 can_events => 1,
2498 tooltip => (CFClient::UI::Label->escape ($desc)
2499 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2500 connect_button_down => sub {
2501 my ($self, $ev, $x, $y) = @_;
2502
2503 # todo: maybe put examine on 1? but should just be a tooltip :(
2504 if ($ev->{button} == 1) {
2505 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2506 } elsif ($ev->{button} == 2) {
2507 $::CONN->send ("apply $item->{tag}");
2508 } elsif ($ev->{button} == 3) {
2509 CFClient::UI::Menu->new (
2510 items => [
2511 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2512 [
2513 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2514 sub { $::CONN->send ("lock $item->{tag}") },
2515 ],
2516 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2517 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2518 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2519 ],
2520 )->popup ($ev);
2521 }
2522
2523 1
2524 },
2525 %args
2526 );
2527
2528 $self->add (new CFClient::UI::Face
2529 can_events => 0,
2530 face => $item->{face},
2531 anim => $item->{anim},
2532 animspeed => $item->{animspeed},
2533 );
2534
2535 $self->add (new CFClient::UI::Label
2536 can_events => 0,
2537 text => $desc,
2538 );
2539
2540 $self
2541}
2542
2543#############################################################################
2544
2545package CFClient::UI::Inventory;
2546
2547our @ISA = CFClient::UI::ScrolledWindow::;
2548
2549sub new {
2550 my $class = shift;
2551
2552 my $self = $class->SUPER::new (
2553 scrolled => (new CFClient::UI::VBox),
2554 @_,
2555 );
2556
2557 $self
2558}
2559
2560sub set_items {
2561 my ($self, $items) = @_;
2562
2563 $self->{scrolled}->clear;
2564 return unless $items;
2565
2566 my @items = sort {
2567 ($a->{type} <=> $b->{type})
2568 or ($a->{name} cmp $b->{name})
2569 } @$items;
2570
2571 $self->{real_items} = \@items;
2572
2573 for my $item (@items) {
2574 my $desc = $item->{nrof} < 2
2575 ? $item->{name}
2576 : "$item->{nrof} $item->{name_pl}";
2577
2578 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2579 }
2580
2581 $self->{scrolled}->add (@items);
2582
2583# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2584}
2585
2586sub size_request {
2587 my ($self) = @_;
2588 ($self->{req_w}, $self->{req_h});
2423} 2589}
2424 2590
2425############################################################################# 2591#############################################################################
2426 2592
2427package CFClient::UI::Menu; 2593package CFClient::UI::Menu;
… …
2475} 2641}
2476 2642
2477sub mouse_motion { 2643sub mouse_motion {
2478 my ($self, $ev, $x, $y) = @_; 2644 my ($self, $ev, $x, $y) = @_;
2479 2645
2480 # TODO: should use vbox->fdind_widget or so 2646 # TODO: should use vbox->find_widget or so
2481 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2647 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482 $self->{hover} = $self->{item}{$HOVER}; 2648 $self->{hover} = $self->{item}{$HOVER};
2483} 2649}
2484 2650
2485sub button_up { 2651sub button_up {
… …
2494 } 2660 }
2495} 2661}
2496 2662
2497############################################################################# 2663#############################################################################
2498 2664
2665package CFClient::UI::Statusbox;
2666
2667our @ISA = CFClient::UI::VBox::;
2668
2669sub reorder {
2670 my ($self) = @_;
2671 my $NOW = time;
2672
2673 while (my ($k, $v) = each %{ $self->{item} }) {
2674 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2675 }
2676
2677 my @widgets;
2678
2679 my @items = sort {
2680 $a->{pri} <=> $b->{pri}
2681 or $b->{id} <=> $a->{id}
2682 } values %{ $self->{item} };
2683
2684 my $count = 10 + 1;
2685 for my $item (@items) {
2686 last unless --$count;
2687
2688 push @widgets, $item->{label} ||= do {
2689 # TODO: doesn't handle markup well (read as: at all)
2690 my $short = $item->{count} > 1
2691 ? "<b>$item->{count} ×</b> $item->{text}"
2692 : $item->{text};
2693
2694 for ($short) {
2695 s/^\s+//;
2696 s/\012.*/…/s;
2697 my $len = int 40 / $item->{fontsize};
2698 substr $_, $len, length, "…" if $len < length;
2699 }
2700
2701 new CFClient::UI::Label
2702 markup => $short,
2703 tooltip => $item->{tooltip},
2704 tooltip_font => $::FONT_PROP,
2705 tooltip_width => 0.67,
2706 fontsize => $item->{fontsize},
2707 color => $item->{color},
2708 can_events => 1,
2709 can_hover => 1
2710 };
2711 }
2712
2713 $self->clear;
2714 $self->SUPER::add (reverse @widgets);
2715}
2716
2717sub add {
2718 my ($self, $text, %arg) = @_;
2719
2720 $text =~ s/^\s+//;
2721 $text =~ s/\s+$//;
2722
2723 my $timeout = time + ((delete $arg{timeout}) || 60);
2724
2725 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2726
2727 if (my $item = $self->{item}{$group}) {
2728 if ($item->{text} eq $text) {
2729 $item->{count}++;
2730 } else {
2731 $item->{count} = 1;
2732 $item->{text} = $item->{tooltip} = $text;
2733 }
2734 $item->{id} = ++$self->{id};
2735 $item->{timeout} = $timeout;
2736 delete $item->{label};
2737 } else {
2738 $self->{item}{$group} = {
2739 id => ++$self->{id},
2740 text => $text,
2741 timeout => $timeout,
2742 tooltip => $text,
2743 fontsize => 0.8,
2744 color => [0.8, 0.8, 0.8, 0.8],
2745 pri => 0,
2746 count => 1,
2747 %arg,
2748 };
2749 }
2750
2751 $self->reorder;
2752}
2753
2754#############################################################################
2755
2499package CFClient::UI::Root; 2756package CFClient::UI::Root;
2500 2757
2501our @ISA = CFClient::UI::Container::; 2758our @ISA = CFClient::UI::Container::;
2502 2759
2503use CFClient::OpenGL; 2760use CFClient::OpenGL;
2504 2761
2505sub check_size { 2762sub new {
2506 my ($self) = @_; 2763 my $class = shift;
2507 2764
2508 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2765 $class->SUPER::new (
2509} 2766 @_,
2510 2767 )
2511sub size_request {
2512 ($::WIDTH, $::HEIGHT)
2513} 2768}
2514 2769
2515sub configure { 2770sub configure {
2516 my ($self, $x, $y, $w, $h) = @_; 2771 my ($self, $x, $y, $w, $h) = @_;
2517 2772
2518 $self->SUPER::configure ($x, $y, $w, $h); 2773 $self->{w} = $w;
2774 $self->{h} = $h;
2775}
2519 2776
2777sub check_size {
2778 my ($self) = @_;
2779
2780 $self->size_allocate ($self->{w}, $self->{h})
2781 if $self->{w};
2782}
2783
2784sub size_request {
2785 my ($self) = @_;
2786
2787 ($self->{w}, $self->{h})
2788}
2789
2790sub size_allocate {
2791 my ($self, $w, $h) = @_;
2792
2793 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2794 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2795
2796 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2797 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2798
2520 for my $child (@{$self->{children}}) { 2799 for my $child ($self->children) {
2521 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2800 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2522 2801
2523 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2802 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2524 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2803 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2525 $child->configure ($X, $Y, $W,$H); 2804 $child->configure ($X, $Y, $W, $H);
2526 } 2805 }
2527} 2806}
2528 2807
2529sub _topleft { 2808sub coord2local {
2530 my ($self, $x, $y) = @_; 2809 my ($self, $x, $y) = @_;
2531 2810
2532 ($x, $y) 2811 ($x, $y)
2533} 2812}
2534 2813
2814sub coord2global {
2815 my ($self, $x, $y) = @_;
2816
2817 ($x, $y)
2818}
2819
2535sub update { 2820sub update {
2536 my ($self) = @_; 2821 my ($self) = @_;
2537 2822
2538 $self->check_size; 2823 $self->check_size;
2539 ::refresh (); 2824 $::WANT_REFRESH++;
2540} 2825}
2541 2826
2542sub add { 2827sub add {
2543 my ($self, $child) = @_; 2828 my ($self, $child) = @_;
2544 2829
2545 # integerize window positions 2830 # integerise window positions
2546 $child->{x} = int $child->{x}; 2831 $child->{x} = int $child->{x};
2547 $child->{y} = int $child->{y}; 2832 $child->{y} = int $child->{y};
2548 2833
2549 $self->SUPER::add ($child); 2834 $self->SUPER::add ($child);
2550} 2835}
… …
2553 my ($self, $id, $cb) = @_; 2838 my ($self, $id, $cb) = @_;
2554 2839
2555 $self->{refresh_hook}{$id} = $cb; 2840 $self->{refresh_hook}{$id} = $cb;
2556} 2841}
2557 2842
2843sub on_post_alloc {
2844 my ($self, $id, $cb) = @_;
2845
2846 $self->{post_alloc_hook}{$id} = $cb;
2847}
2848
2558sub draw { 2849sub draw {
2559 my ($self) = @_; 2850 my ($self) = @_;
2560 2851
2561 while (my $rcb = delete $self->{refresh_hook}) { 2852 while ($self->{refresh_hook}) {
2562 $_->() for values %$rcb; 2853 $_->()
2854 for values %{delete $self->{refresh_hook}};
2855 }
2856
2857 if ($self->{check_size}) {
2858 my @queue = ([], []);
2859
2860 for (;;) {
2861 if ($self->{check_size}) {
2862 # heuristic: check containers last
2863 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2864 for values %{delete $self->{check_size}}
2865 }
2866
2867 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2868
2869 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2870 ? @$widget{qw(user_w user_h)}
2871 : $widget->size_request;
2872
2873 if (delete $widget->{force_alloc}
2874 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2875 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2876
2877 $widget->{req_w} = $w;
2878 $widget->{req_h} = $h;
2879
2880 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2881
2882 $widget->{parent}->check_size
2883 if $widget->{parent};
2884 }
2885 }
2886 }
2887
2888 while ($self->{size_alloc}) {
2889 for (values %{delete $self->{size_alloc}}) {
2890 my ($widget, $w, $h) = @$_;
2891
2892 $w = 0 if $w < 0;
2893 $h = 0 if $h < 0;
2894
2895 $widget->{w} = $w;
2896 $widget->{h} = $h;
2897 $widget->size_allocate ($w, $h);
2898 $widget->emit (size_allocate => $w, $h);
2899 }
2900 }
2901
2902 while ($self->{post_alloc_hook}) {
2903 $_->()
2904 for values %{delete $self->{post_alloc_hook}};
2563 } 2905 }
2564 2906
2565 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2907 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2566 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2908 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2567 glClear GL_COLOR_BUFFER_BIT; 2909 glClear GL_COLOR_BUFFER_BIT;
… …
2575 $self->_draw; 2917 $self->_draw;
2576} 2918}
2577 2919
2578############################################################################# 2920#############################################################################
2579 2921
2580package CFClient::UI::Inventory;
2581
2582our @ISA = CFClient::UI::Container::;
2583
2584use CFClient::OpenGL;
2585
2586sub new {
2587 my $class = shift;
2588
2589 my $self = $class->SUPER::new (@_);
2590
2591 $self
2592}
2593
2594sub size_allocate {
2595 my ($self, $w, $h) = @_;
2596
2597 $self->{w} = $w;
2598 $self->{h} = $h;
2599
2600 $self->check_size;
2601}
2602
2603sub set_items {
2604 my ($self, $items) = @_;
2605 my @items = values %{$items};
2606 @items = sort { $a->{type} <=> $b->{type} } @items;
2607
2608 $self->{real_items} = \@items;
2609
2610 for my $item (@items) {
2611 my $desc = $item->{nrof} < 2
2612 ? $item->{name}
2613 : "$item->{nrof} $item->{name_pl}";
2614
2615 $self->add (my $hb = new CFClient::UI::HBox);
2616
2617 $hb->add (my $f = new CFClient::UI::Face
2618 can_events => 0,
2619 face => $item->{face},
2620 anim => $item->{anim},
2621 animspeed => $item->{animspeed},
2622 expand => 1
2623 );
2624 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2625 }
2626
2627 $self->{max_pos} = (scalar @items) - 1;
2628
2629 my $range = $self->{range};
2630 my $page = $self->{h} / 32; # waht information souce to use for face size?
2631 # it should be configurable i guess...
2632 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633 $range->update;
2634}
2635
2636sub size_request {
2637 my ($self) = @_;
2638 (100, 200)
2639}
2640
2641sub set_range {
2642 my ($self, $range) = @_;
2643
2644 $self->{range} = $range;
2645 $range->connect (changed => sub { $self->update });
2646
2647 my $page = $self->{h} / 32; # waht information souce to use for face size?
2648 # it should be configurable i guess...
2649
2650 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2651 $range->update;
2652
2653 $self->update;
2654}
2655
2656sub _draw {
2657 my ($self) = @_;
2658
2659 my ($w, $h) = ($self->{w}, $self->{h});
2660
2661 $self->{pos} = int $self->{range}{range}[0];
2662
2663 my $y = 0;
2664 my $cnt = 0;
2665 my $hrem = $self->{h}; # horiz. remaining space
2666
2667 for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2668 my $chld = $self->{children}->[$i];
2669
2670 if ($hrem >= $chld->{h}) {
2671 $chld->configure (0, $y, $chld->{w}, $chld->{h});
2672
2673 $chld->show;
2674 $chld->draw;
2675
2676 $hrem -= $chld->{h};
2677 $y += $chld->{h};
2678 } else {
2679 last
2680 }
2681 }
2682}
2683
2684
2685#############################################################################
2686
2687package CFClient::UI; 2922package CFClient::UI;
2688 2923
2689$ROOT = new CFClient::UI::Root; 2924$ROOT = new CFClient::UI::Root;
2690$TOOLTIP = new CFClient::UI::Tooltip; 2925$TOOLTIP = new CFClient::UI::Tooltip;
2691 2926

Diff Legend

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