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.166 by root, Mon Apr 24 08:38:36 2006 UTC vs.
Revision 1.230 by root, Wed May 24 21:59:54 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 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 32 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
31 } 42 }
32 43
33 return; 44 return;
34 } 45 }
35 } 46 }
… …
123 for (@$vals) { 134 for (@$vals) {
124 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
125 $rem += $_ - $i; 136 $rem += $_ - $i;
126 $_ = $i; 137 $_ = $i;
127 } 138 }
139}
140
141sub full_refresh {
142 # make a copy, otherwise for complains about freed values.
143 my @widgets = values %WIDGET;
144
145 $_->update
146 for @widgets;
147}
148
149sub reconfigure_widgets {
150 # make a copy, otherwise C<for> complains about freed values.
151 my @widgets = values %WIDGET;
152
153 $_->reconfigure
154 for @widgets;
155}
156
157# call when resolution changes etc.
158sub rescale_widgets {
159 my ($sx, $sy) = @_;
160
161 for my $widget (values %WIDGET) {
162 if ($widget->{is_toplevel}) {
163 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
164 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
165 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
166 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
167 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
168 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
169 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
170 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
171 }
172 }
173
174 reconfigure_widgets;
128} 175}
129 176
130############################################################################# 177#############################################################################
131 178
132package CFClient::UI::Base; 179package CFClient::UI::Base;
… …
150 if (/^connect_(.*)$/) { 197 if (/^connect_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 198 $self->connect ($1 => delete $self->{$_});
152 } 199 }
153 } 200 }
154 201
202 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
203
155 $self 204 $self
156} 205}
157 206
158sub destroy { 207sub destroy {
159 my ($self) = @_; 208 my ($self) = @_;
… …
162 %$self = (); 211 %$self = ();
163} 212}
164 213
165sub show { 214sub show {
166 my ($self) = @_; 215 my ($self) = @_;
167
168 return if $self->{parent}; 216 return if $self->{parent};
169 217
170 $CFClient::UI::ROOT->add ($self); 218 $CFClient::UI::ROOT->add ($self);
219}
220
221sub show_centered {
222 my ($self) = @_;
223 return if $self->{parent};
224
225 $self->show;
226
227 $CFClient::UI::ROOT->on_post_alloc (
228 "centered $self" => sub {
229 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
230 },
231 );
171} 232}
172 233
173sub hide { 234sub hide {
174 my ($self) = @_; 235 my ($self) = @_;
175 236
… …
224 $self->{y} = $y; 285 $self->{y} = $y;
225 $self->update; 286 $self->update;
226 } 287 }
227 288
228 if ($self->{w} != $w || $self->{h} != $h) { 289 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w; 290 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230 $self->{h} = $h;
231
232 $self->size_allocate ($w, $h);
233 $self->update;
234 } 291 }
235} 292}
236 293
237sub size_allocate { 294sub size_allocate {
238 # nothing to be done 295 # nothing to be done
239} 296}
240 297
298sub reconfigure {
299 my ($self) = @_;
300
301 $self->check_size (1);
302 $self->update;
303}
304
305sub children {
306}
307
241sub set_max_size { 308sub set_max_size {
242 my ($self, $w, $h) = @_; 309 my ($self, $w, $h) = @_;
243 310
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 311 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 312 delete $self->{max_h}; $self->{max_h} = $h if $h;
246} 313}
247 314
248# return top left coordinates 315sub set_tooltip {
249sub _topleft {
250 my ($self, $x, $y) = @_; 316 my ($self, $tooltip) = @_;
251 317
252 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 318 $self->{tooltip} = $tooltip;
319
320 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
321 delete $CFClient::UI::TOOLTIP->{owner};
322 CFClient::UI::check_tooltip;
323 }
253} 324}
254 325
255# translate global coordinates to local coordinate system 326# translate global coordinates to local coordinate system
256sub coord2local { 327sub coord2local {
257 my ($self, $x, $y) = @_; 328 my ($self, $x, $y) = @_;
258 329
259 my ($X, $Y) = $self->_topleft; 330 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260 ($x - $X, $y - $Y)
261} 331}
262 332
263# translate local coordinates to global coordinate system 333# translate local coordinates to global coordinate system
264sub coord2global { 334sub coord2global {
265 my ($self, $x, $y) = @_; 335 my ($self, $x, $y) = @_;
266 336
267 my ($X, $Y) = $self->_topleft; 337 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268 ($x + $X, $y + $Y)
269} 338}
270 339
271sub focus_in { 340sub focus_in {
272 my ($self) = @_; 341 my ($self) = @_;
273 342
… …
345 glVertex $self->{w}, 0; 414 glVertex $self->{w}, 0;
346 glVertex $self->{w}, $self->{h}; 415 glVertex $self->{w}, $self->{h};
347 glVertex 0 , $self->{h}; 416 glVertex 0 , $self->{h};
348 glEnd; 417 glEnd;
349 glPopMatrix; 418 glPopMatrix;
350 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 419 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351 } 420 }
352} 421}
353 422
354sub _draw { 423sub _draw {
355 my ($self) = @_; 424 my ($self) = @_;
… …
371 440
372sub set_parent { 441sub set_parent {
373 my ($self, $parent) = @_; 442 my ($self, $parent) = @_;
374 443
375 Scalar::Util::weaken ($self->{parent} = $parent); 444 Scalar::Util::weaken ($self->{parent} = $parent);
445
446 # TODO: req_w _does_change after ->reconfigure
447 $self->check_size
448 unless exists $self->{req_w};
449
450 $self->show;
376} 451}
377 452
378sub check_size { 453sub check_size {
379 my ($self) = @_; 454 my ($self, $forced) = @_;
380 455
381 $self->{parent} 456 $self->{force_alloc} = 1 if $forced;
382 or return 1; 457 $CFClient::UI::ROOT->{check_size}{$self} = $self;
383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w;
390 $self->{req_h} = $h;
391
392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
401 }
402} 458}
403 459
404sub update { 460sub update {
405 my ($self) = @_; 461 my ($self) = @_;
406 462
… …
421} 477}
422 478
423sub DESTROY { 479sub DESTROY {
424 my ($self) = @_; 480 my ($self) = @_;
425 481
482 delete $WIDGET{$self+0};
426 #$self->deactivate; 483 #$self->deactivate;
427} 484}
428 485
429############################################################################# 486#############################################################################
430 487
… …
439 my $class = shift; 496 my $class = shift;
440 497
441 # range [value, low, high, page] 498 # range [value, low, high, page]
442 499
443 $class->SUPER::new ( 500 $class->SUPER::new (
444 bg => [0, 0, 0, 0.2], 501 #bg => [0, 0, 0, 0.2],
445 active_bg => [1, 1, 1, 0.5], 502 #active_bg => [1, 1, 1, 0.5],
446 @_ 503 @_
447 ) 504 )
448} 505}
449 506
450sub _draw { 507sub _draw {
451 my ($self) = @_; 508 my ($self) = @_;
452 509
510 my $color = $FOCUS == $self && $self->{active_bg}
511 ? $self->{active_bg}
512 : $self->{bg};
513
514 if ($color && (@$color < 4 || $color->[3])) {
453 my ($w, $h) = @$self{qw(w h)}; 515 my ($w, $h) = @$self{qw(w h)};
454 516
455 glEnable GL_BLEND; 517 glEnable GL_BLEND;
456 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 518 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
457 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 519 glColor @$color;
458 520
459 glBegin GL_QUADS; 521 glBegin GL_QUADS;
460 glVertex 0 , 0; 522 glVertex 0 , 0;
461 glVertex 0 , $h; 523 glVertex 0 , $h;
462 glVertex $w, $h; 524 glVertex $w, $h;
463 glVertex $w, 0; 525 glVertex $w, 0;
464 glEnd; 526 glEnd;
465 527
466 glDisable GL_BLEND; 528 glDisable GL_BLEND;
529 }
467} 530}
468 531
469############################################################################# 532#############################################################################
470 533
471package CFClient::UI::Empty; 534package CFClient::UI::Empty;
… …
503 566
504 $self 567 $self
505} 568}
506 569
507sub add { 570sub add {
508 my ($self, $child) = @_; 571 my ($self, @widgets) = @_;
509 572
510 $child->set_parent ($self); 573 $_->set_parent ($self)
574 for @widgets;
511 575
512 use sort 'stable'; 576 use sort 'stable';
513 577
514 $self->{children} = [ 578 $self->{children} = [
515 sort { $a->{z} <=> $b->{z} } 579 sort { $a->{z} <=> $b->{z} }
516 @{$self->{children}}, $child 580 @{$self->{children}}, @widgets
517 ]; 581 ];
518 582
519 $child->check_size; 583 $self->check_size (1);
584 $self->update;
585}
586
587sub children {
588 @{ $_[0]{children} }
520} 589}
521 590
522sub remove { 591sub remove {
523 my ($self, $child) = @_; 592 my ($self, $child) = @_;
524 593
… …
539 608
540 for (@$children) { 609 for (@$children) {
541 delete $_->{parent}; 610 delete $_->{parent};
542 $_->hide; 611 $_->hide;
543 } 612 }
613
614 $self->check_size;
615 $self->update;
544} 616}
545 617
546sub find_widget { 618sub find_widget {
547 my ($self, $x, $y) = @_; 619 my ($self, $x, $y) = @_;
548 620
… …
623} 695}
624 696
625sub update { 697sub update {
626 my ($self) = @_; 698 my ($self) = @_;
627 699
628 # we want to do this delayed... 700 $ROOT->on_post_alloc ($self => sub { $self->render_child });
629 $self->render_chld;
630 $self->SUPER::update; 701 $self->SUPER::update;
631}
632
633sub render_chld {
634 my ($self) = @_;
635
636 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
637 glClearColor 0, 0, 0, 1;
638 glClear GL_COLOR_BUFFER_BIT;
639 $self->child->draw;
640 };
641} 702}
642 703
643sub size_allocate { 704sub size_allocate {
644 my ($self, $w, $h) = @_; 705 my ($self, $w, $h) = @_;
645 706
646 $self->child->configure (0, 0, $w, $h); 707 $self->SUPER::size_allocate ($w, $h);
708 $self->update;
709}
647 710
711sub _render {
712 $_[0]{children}[0]->draw;
713}
714
715sub render_child {
716 my ($self) = @_;
717
718 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
719 glClearColor 0, 0, 0, 0;
720 glClear GL_COLOR_BUFFER_BIT;
721
648 $self->render_chld; 722 $self->_render;
723 };
649} 724}
650 725
651sub _draw { 726sub _draw {
652 my ($self) = @_; 727 my ($self) = @_;
653 728
654 my ($w, $h) = ($self->w, $self->h); 729 my ($w, $h) = ($self->w, $self->h);
655 730
656 my $tex = $self->{texture} 731 my $tex = $self->{texture}
657 or return; 732 or return;
658 733
659 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 734 glEnable GL_TEXTURE_2D;
662 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 735 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
736 glColor 1, 1, 1, 1;
663 737
664 $tex->draw_quad (0, 0, $w, $h); 738 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
665 739
666 glDisable GL_BLEND;
667 glDisable GL_TEXTURE_2D; 740 glDisable GL_TEXTURE_2D;
668} 741}
669 742
670############################################################################# 743#############################################################################
671 744
672package CFClient::UI::ViewPort; 745package CFClient::UI::ViewPort;
673 746
674our @ISA = CFClient::UI::Window::; 747our @ISA = CFClient::UI::Window::;
675 748
676sub new { die }
677
678sub size_request { 749sub size_request {
679 my ($self) = @_; 750 my ($self) = @_;
680 751
681 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 752 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
682 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
683 753
684 @$self{qw(child_w child_h)} 754 @$self{qw(child_w child_h)}
685} 755}
686 756
687sub _draw { 757sub size_allocate {
688 my ($self) = @_; 758 my ($self, $w, $h) = @_;
689 759
690 $self->{children}[1]->draw; 760 my ($cw, $ch) = @$self{qw(child_w child_h)};
761# $w = $self->{w};
762 $self->child->configure (0, 0, $cw, $ch);
763 $self->update;
691} 764}
692 765
766sub set_offset {
767 my ($self, $x, $y) = @_;
768
769 $self->{view_x} = int $x;
770 $self->{view_y} = int $y;
771
772 $self->update;
773}
774
775# hmm, this does not work for topleft of $self... but we should not ask for that
776sub coord2local {
777 my ($self, $x, $y) = @_;
778
779 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
780}
781
782sub coord2global {
783 my ($self, $x, $y) = @_;
784
785 $x = List::Util::min $self->{w}, $x - $self->{view_x};
786 $y = List::Util::min $self->{h}, $y - $self->{view_y};
787
788 $self->SUPER::coord2global ($x, $y)
789}
790
791sub find_widget {
792 my ($self, $x, $y) = @_;
793
794 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
795 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
796 ) {
797 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
798 } else {
799 $self->CFClient::UI::Base::find_widget ($x, $y)
800 }
801}
802
803sub _render {
804 my ($self) = @_;
805
806 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
807
808 $self->SUPER::_render;
809}
693 810
694############################################################################# 811#############################################################################
695 812
696package CFClient::UI::Frame; 813package CFClient::UI::ScrolledWindow;
697 814
698our @ISA = CFClient::UI::Bin::; 815our @ISA = CFClient::UI::HBox::;
699
700use CFClient::OpenGL;
701 816
702sub new { 817sub new {
703 my $class = shift; 818 my $class = shift;
704 819
820 my $self;
821
822 my $slider = new CFClient::UI::Slider
823 vertical => 1,
824 range => [0, 0, 1, 0.01], # HACK fix
825 connect_changed => sub {
826 $self->{vp}->set_offset (0, $_[1]);
827 },
828 ;
829
705 my $self = $class->SUPER::new ( 830 $self = $class->SUPER::new (
706 bg => [1, 1, 1, 1], 831 vp => (new CFClient::UI::ViewPort expand => 1),
707 border_bg => [1, 1, 1, 1], 832 slider => $slider,
708 border => 0.8,
709 @_ 833 @_,
710 ); 834 );
711 835
836 $self->{vp}->add ($self->{scrolled});
837 $self->add ($self->{vp});
838 $self->add ($self->{slider});
839
712 $self 840 $self
713} 841}
714 842
843sub size_allocate {
844 my ($self, $w, $h) = @_;
845
846 $self->SUPER::size_allocate ($w, $h);
847
848 my $child = $self->{vp}->child;
849 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
850}
851
852#TODO# update range on size_allocate depending on child
853# update viewport offset on scroll
854
855#############################################################################
856
857package CFClient::UI::Frame;
858
859our @ISA = CFClient::UI::Bin::;
860
861use CFClient::OpenGL;
862
863sub new {
864 my $class = shift;
865
866 $class->SUPER::new (
867 bg => undef,
868 @_,
869 )
870}
871
715sub _draw { 872sub _draw {
716 my ($self) = @_; 873 my ($self) = @_;
717 874
718 my ($w, $h) = ($self->{w}, $self->{h}); 875 if ($self->{bg}) {
876 my ($w, $h) = @$self{qw(w h)};
719 877
720 glEnable GL_BLEND; 878 glEnable GL_BLEND;
721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 879 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
722 glEnable GL_TEXTURE_2D; 880 glColor @{ $self->{bg} };
723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
724 881
725# glBegin GL_QUADS; 882 glBegin GL_QUADS;
726# glColor 0, 0, 0, 0;
727# glVertex 0 , 0; 883 glVertex 0 , 0;
728# glVertex 0 , $h; 884 glVertex 0 , $h;
729# glVertex $w, $h; 885 glVertex $w, $h;
730# glVertex $w, 0; 886 glVertex $w, 0;
731# glEnd; 887 glEnd;
732 888
733
734 $self->child->draw;
735 glDisable GL_BLEND; 889 glDisable GL_BLEND;
736 glDisable GL_TEXTURE_2D; 890 }
891
892 $self->SUPER::_draw;
737} 893}
738 894
739############################################################################# 895#############################################################################
740 896
741package CFClient::UI::FancyFrame; 897package CFClient::UI::FancyFrame;
… …
752 my $class = shift; 908 my $class = shift;
753 909
754 # TODO: user_x, user_y, overwrite moveto? 910 # TODO: user_x, user_y, overwrite moveto?
755 911
756 my $self = $class->SUPER::new ( 912 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1], 913 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1], 914 border_bg => [1, 1, 1, 1],
759 border => 0.8, 915 border => 0.6,
916 is_toplevel => 1,
760 can_events => 1, 917 can_events => 1,
761 @_ 918 @_
762 ); 919 );
763 920
764 $self->{title} &&= new CFClient::UI::Label 921 $self->{title} &&= new CFClient::UI::Label
765 align => 0, 922 align => 0,
766 valign => 1, 923 valign => 1,
767 text => $self->{title}, 924 text => $self->{title},
768 fontsize => 1; 925 fontsize => $self->{border};
769 926
770 $self 927 $self
771} 928}
772 929
773sub border { 930sub border {
… …
789 my ($self, $w, $h) = @_; 946 my ($self, $w, $h) = @_;
790 947
791 $h -= List::Util::max 0, $self->border * 2; 948 $h -= List::Util::max 0, $self->border * 2;
792 $w -= List::Util::max 0, $self->border * 2; 949 $w -= List::Util::max 0, $self->border * 2;
793 950
794 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 951 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
795 if $self->{title}; 952 if $self->{title};
796 953
797 $self->child->configure ($self->border, $self->border, $w, $h); 954 $self->child->configure ($self->border, $self->border, $w, $h);
798} 955}
799 956
800sub button_down { 957sub button_down {
801 my ($self, $ev, $x, $y) = @_; 958 my ($self, $ev, $x, $y) = @_;
802 959
960 my ($w, $h) = @$self{qw(w h)};
803 my $border = $self->border; 961 my $border = $self->border;
804 962
805 if ($x < $self->{w} && $x >= $self->{w} - $border 963 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806 && $y < $self->{h} && $y >= $self->{h} - $border) { 964 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807 965
966 if ($lr & $td) {
967 my ($wx, $wy) = ($self->{x}, $self->{y});
808 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 968 my ($ox, $oy) = ($ev->{x}, $ev->{y});
809 my ($bw, $bh) = ($self->{w}, $self->{h}); 969 my ($bw, $bh) = ($self->{w}, $self->{h});
810 970
971 my $mx = $x < $border;
972 my $my = $y < $border;
973
811 $self->{motion} = sub { 974 $self->{motion} = sub {
812 my ($ev, $x, $y) = @_; 975 my ($ev, $x, $y) = @_;
813 976
814 ($x, $y) = ($ev->{x}, $ev->{y}); 977 my $dx = $ev->{x} - $ox;
978 my $dy = $ev->{y} - $oy;
815 979
816 $self->{user_w} = $bw + $x - $ox; 980 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
817 $self->{user_h} = $bh + $y - $oy; 981 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
982 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
818 $self->check_size; 983 $self->check_size;
819 }; 984 };
820 985
821 } elsif ($x >= 0 && $x < $self->{w} 986 } elsif ($lr ^ $td) {
822 && $y >= 0 && $y < $border) {
823
824 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 987 my ($ox, $oy) = ($ev->{x}, $ev->{y});
825 my ($bx, $by) = ($self->{x}, $self->{y}); 988 my ($bx, $by) = ($self->{x}, $self->{y});
826 989
827 $self->{motion} = sub { 990 $self->{motion} = sub {
828 my ($ev, $x, $y) = @_; 991 my ($ev, $x, $y) = @_;
… …
851 my ($self) = @_; 1014 my ($self) = @_;
852 1015
853 my ($w, $h ) = ($self->{w}, $self->{h}); 1016 my ($w, $h ) = ($self->{w}, $self->{h});
854 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1017 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
855 1018
856 glEnable GL_BLEND;
857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
858 glEnable GL_TEXTURE_2D; 1019 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1020 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
860 1021
861 my $border = $self->border; 1022 my $border = $self->border;
862 1023
863 glColor @{ $self->{border_bg} }; 1024 glColor @{ $self->{border_bg} };
864 $tex[1]->draw_quad (0, 0, $w, $border); 1025 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
865 $tex[3]->draw_quad (0, $border, $border, $ch); 1026 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
866 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1027 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
867 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1028 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
868 1029
1030 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
869 my $bg = $tex[0]; 1031 my $bg = $tex[0];
870 1032
871 # TODO: repeat texture not scale 1033 # TODO: repeat texture not scale
872 my $rep_x = $cw / $bg->{w}; 1034 my $rep_x = $cw / $bg->{w};
873 my $rep_y = $ch / $bg->{h}; 1035 my $rep_y = $ch / $bg->{h};
874 1036
875 glColor @{ $self->{bg} }; 1037 glColor @{ $self->{bg} };
876 1038
877 $bg->{s} = $rep_x; 1039 $bg->{s} = $rep_x;
878 $bg->{t} = $rep_y; 1040 $bg->{t} = $rep_y;
879 $bg->{wrap_mode} = 1; 1041 $bg->{wrap_mode} = 1;
880 $bg->draw_quad ($border, $border, $cw, $ch); 1042 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1043 }
881 1044
882 glDisable GL_TEXTURE_2D; 1045 glDisable GL_TEXTURE_2D;
883 glDisable GL_BLEND;
884 1046
885 $self->{title}->draw if $self->{title}; 1047 $self->{title}->draw if $self->{title};
1048
886 $self->child->draw; 1049 $self->child->draw;
887} 1050}
888 1051
889############################################################################# 1052#############################################################################
890 1053
… …
912 $self->{children}[$y][$x] = $child; 1075 $self->{children}[$y][$x] = $child;
913 1076
914 $child->check_size; 1077 $child->check_size;
915} 1078}
916 1079
1080sub children {
1081 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1082}
1083
917# TODO: move to container class maybe? send childs a signal on removal? 1084# TODO: move to container class maybe? send childs a signal on removal?
918sub clear { 1085sub clear {
919 my ($self) = @_; 1086 my ($self) = @_;
920 1087
921 my $children = delete $self->{children}; 1088 my @children = $self->children;
1089 delete $self->{children};
922 1090
923 for (grep $_, map @$_, grep $_, @$children) { 1091 for (@children) {
924 delete $_->{parent}; 1092 delete $_->{parent};
925 $_->hide; 1093 $_->hide;
926 } 1094 }
927 1095
928 $self->update; 1096 $self->update;
… …
1109} 1277}
1110 1278
1111sub size_allocate { 1279sub size_allocate {
1112 my ($self, $w, $h) = @_; 1280 my ($self, $w, $h) = @_;
1113 1281
1282 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1283
1114 my $children = $self->{children}; 1284 my $children = $self->{children};
1115 1285
1116 my @h = map $_->{req_h}, @$children; 1286 my @h = map $_->{req_h}, @$children;
1117 1287
1118 my $req_h = List::Util::sum @h; 1288 my $req_h = List::Util::sum @h;
… …
1147 1317
1148############################################################################# 1318#############################################################################
1149 1319
1150package CFClient::UI::Label; 1320package CFClient::UI::Label;
1151 1321
1152our @ISA = CFClient::UI::Base::; 1322our @ISA = CFClient::UI::DrawBG::;
1153 1323
1154use CFClient::OpenGL; 1324use CFClient::OpenGL;
1155 1325
1156sub new { 1326sub new {
1157 my ($class, %arg) = @_; 1327 my ($class, %arg) = @_;
1158 1328
1159 my $self = $class->SUPER::new ( 1329 my $self = $class->SUPER::new (
1160 fg => [1, 1, 1], 1330 fg => [1, 1, 1],
1331 #bg => none
1332 #active_bg => none
1161 #font => default_font 1333 #font => default_font
1334 #text => initial text
1335 #markup => initial narkup
1336 #max_w => maximum pixel width
1337 ellipsise => 3, # end
1338 layout => (new CFClient::Layout),
1162 fontsize => 1, 1339 fontsize => 1,
1163 text => "",
1164 align => -1, 1340 align => -1,
1165 valign => -1, 1341 valign => -1,
1166 padding => 2, 1342 padding => 2,
1167 layout => new CFClient::Layout,
1168 can_events => 0, 1343 can_events => 0,
1169 %arg 1344 %arg
1170 ); 1345 );
1171 1346
1172 if (exists $self->{template}) { 1347 if (exists $self->{template}) {
1173 my $layout = new CFClient::Layout; 1348 my $layout = new CFClient::Layout;
1174 $layout->set_text (delete $self->{template}); 1349 $layout->set_text (delete $self->{template});
1175 $self->{template} = $layout; 1350 $self->{template} = $layout;
1176 } 1351 }
1177 1352
1178 $self->set_text (delete $self->{text}) if exists $self->{text}; 1353 if (exists $self->{markup}) {
1179 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1354 $self->set_markup (delete $self->{markup});
1355 } else {
1356 $self->set_text (delete $self->{text});
1357 }
1180 1358
1181 $self 1359 $self
1182} 1360}
1183 1361
1184sub escape { 1362sub escape($) {
1185 local $_ = $_[1]; 1363 local $_ = $_[0];
1186 1364
1187 s/&/&amp;/g; 1365 s/&/&amp;/g;
1188 s/>/&gt;/g; 1366 s/>/&gt;/g;
1189 s/</&lt;/g; 1367 s/</&lt;/g;
1190 1368
1191 $_[1] 1369 $_
1370}
1371
1372sub update {
1373 my ($self) = @_;
1374
1375 delete $self->{texture};
1376 $self->SUPER::update;
1192} 1377}
1193 1378
1194sub set_text { 1379sub set_text {
1195 my ($self, $text) = @_; 1380 my ($self, $text) = @_;
1196 1381
1382 return if $self->{text} eq "T$text";
1383 $self->{text} = "T$text";
1384
1385 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1197 $self->{layout}->set_text ($text); 1386 $self->{layout}->set_text ($text);
1198 1387
1199 delete $self->{texture}; 1388 $self->update;
1200 $self->check_size; 1389 $self->check_size;
1201 $self->update;
1202} 1390}
1203 1391
1204sub set_markup { 1392sub set_markup {
1205 my ($self, $markup) = @_; 1393 my ($self, $markup) = @_;
1206 1394
1395 return if $self->{text} eq "M$markup";
1396 $self->{text} = "M$markup";
1397
1398 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1399
1400 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1207 $self->{layout}->set_markup ($markup); 1401 $self->{layout}->set_markup ($markup);
1208 1402
1209 delete $self->{texture}; 1403 $self->update;
1210 $self->check_size; 1404 $self->check_size;
1211 $self->update;
1212} 1405}
1213 1406
1214sub size_request { 1407sub size_request {
1215 my ($self) = @_; 1408 my ($self) = @_;
1216 1409
1217 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1410 $self->{layout}->set_font ($self->{font}) if $self->{font};
1218 $self->{layout}->set_width ($self->{max_w} || -1); 1411 $self->{layout}->set_width ($self->{max_w} || -1);
1412 $self->{layout}->set_ellipsise ($self->{ellipsise});
1413 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1219 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1414 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1220 1415
1221 my ($w, $h) = $self->{layout}->size; 1416 my ($w, $h) = $self->{layout}->size;
1222 1417
1223 if (exists $self->{template}) { 1418 if (exists $self->{template}) {
… …
1245sub set_fontsize { 1440sub set_fontsize {
1246 my ($self, $fontsize) = @_; 1441 my ($self, $fontsize) = @_;
1247 1442
1248 $self->{fontsize} = $fontsize; 1443 $self->{fontsize} = $fontsize;
1249 delete $self->{texture}; 1444 delete $self->{texture};
1445
1446 $self->update;
1250 $self->check_size; 1447 $self->check_size;
1251 $self->update;
1252} 1448}
1253 1449
1254sub _draw { 1450sub _draw {
1255 my ($self) = @_; 1451 my ($self) = @_;
1256 1452
1453 $self->SUPER::_draw; # draw background, if applicable
1454
1257 my $tex = $self->{texture} ||= do { 1455 my $tex = $self->{texture} ||= do {
1456 $self->{layout}->set_foreground (@{$self->{fg}});
1258 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1457 $self->{layout}->set_font ($self->{font}) if $self->{font};
1259 $self->{layout}->set_width ($self->{w}); 1458 $self->{layout}->set_width ($self->{w});
1459 $self->{layout}->set_ellipsise ($self->{ellipsise});
1460 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1260 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1461 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1462
1261 new_from_layout CFClient::Texture $self->{layout} 1463 my $tex = new_from_layout CFClient::Texture $self->{layout};
1464
1465 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1466 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1467 : ($self->{w} - $tex->{w}) * 0.5);
1468
1469 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1470 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1471 : ($self->{h} - $tex->{h}) * 0.5);
1472
1473 $tex
1262 }; 1474 };
1263 1475
1264 glEnable GL_BLEND;
1265 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1266 glEnable GL_TEXTURE_2D; 1476 glEnable GL_TEXTURE_2D;
1267 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1477 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268 1478
1479 if ($tex->{format} == GL_ALPHA) {
1269 glColor @{$self->{fg}}; 1480 glColor @{$self->{fg}};
1270
1271 $self->{ox} = int (
1272 $self->{align} < 0 ? $self->{padding}
1273 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1274 : ($self->{w} - $tex->{w}) * 0.5
1275 );
1276
1277 $self->{oy} = int (
1278 $self->{valign} < 0 ? $self->{padding}
1279 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1280 : ($self->{h} - $tex->{h}) * 0.5
1281 );
1282
1283 $tex->draw_quad ($self->{ox}, $self->{oy}); 1481 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1482 } else {
1483 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1484 }
1284 1485
1285 glDisable GL_TEXTURE_2D; 1486 glDisable GL_TEXTURE_2D;
1286 glDisable GL_BLEND;
1287} 1487}
1288 1488
1289############################################################################# 1489#############################################################################
1290 1490
1291package CFClient::UI::EntryBase; 1491package CFClient::UI::EntryBase;
… …
1304 active_fg => [0, 0, 0], 1504 active_fg => [0, 0, 0],
1305 can_hover => 1, 1505 can_hover => 1,
1306 can_focus => 1, 1506 can_focus => 1,
1307 valign => 0, 1507 valign => 0,
1308 can_events => 1, 1508 can_events => 1,
1509 #text => ...
1309 @_ 1510 @_
1310 ) 1511 )
1311} 1512}
1312 1513
1313sub _set_text { 1514sub _set_text {
… …
1324 1525
1325 $text =~ s/./*/g if $self->{hidden}; 1526 $text =~ s/./*/g if $self->{hidden};
1326 $self->{layout}->set_text ("$text "); 1527 $self->{layout}->set_text ("$text ");
1327 1528
1328 $self->emit (changed => $self->{text}); 1529 $self->emit (changed => $self->{text});
1329}
1330
1331sub get_text {
1332 $_[0]{text}
1333}
1334
1335sub size_request {
1336 my ($self) = @_;
1337
1338 my ($w, $h) = $self->SUPER::size_request;
1339
1340 ($w + 1, $h) # add 1 for cursor
1341}
1342
1343sub size_allocate {
1344 my ($self, $w, $h) = @_;
1345
1346 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1347} 1530}
1348 1531
1349sub set_text { 1532sub set_text {
1350 my ($self, $text) = @_; 1533 my ($self, $text) = @_;
1351 1534
1352 $self->{cursor} = length $text; 1535 $self->{cursor} = length $text;
1353 $self->_set_text ($text); 1536 $self->_set_text ($text);
1354 $self->update; 1537 $self->update;
1538 $self->check_size;
1539}
1540
1541sub get_text {
1542 $_[0]{text}
1543}
1544
1545sub size_request {
1546 my ($self) = @_;
1547
1548 my ($w, $h) = $self->SUPER::size_request;
1549
1550 ($w + 1, $h) # add 1 for cursor
1551}
1552
1553sub size_allocate {
1554 my ($self, $w, $h) = @_;
1555
1556 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1355} 1557}
1356 1558
1357sub key_down { 1559sub key_down {
1358 my ($self, $ev) = @_; 1560 my ($self, $ev) = @_;
1359 1561
… …
1361 my $sym = $ev->{sym}; 1563 my $sym = $ev->{sym};
1362 my $uni = $ev->{unicode}; 1564 my $uni = $ev->{unicode};
1363 1565
1364 my $text = $self->get_text; 1566 my $text = $self->get_text;
1365 1567
1366 if ($sym == 8) { 1568 if ($uni == 8) {
1367 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1569 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1368 } elsif ($sym == 127) { 1570 } elsif ($uni == 127) {
1369 substr $text, $self->{cursor}, 1, ""; 1571 substr $text, $self->{cursor}, 1, "";
1370 } elsif ($sym == CFClient::SDLK_LEFT) { 1572 } elsif ($sym == CFClient::SDLK_LEFT) {
1371 --$self->{cursor} if $self->{cursor}; 1573 --$self->{cursor} if $self->{cursor};
1372 } elsif ($sym == CFClient::SDLK_RIGHT) { 1574 } elsif ($sym == CFClient::SDLK_RIGHT) {
1373 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1575 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1374 } elsif ($sym == CFClient::SDLK_HOME) { 1576 } elsif ($sym == CFClient::SDLK_HOME) {
1375 $self->{cursor} = 0; 1577 $self->{cursor} = 0;
1376 } elsif ($sym == CFClient::SDLK_END) { 1578 } elsif ($sym == CFClient::SDLK_END) {
1377 $self->{cursor} = length $text; 1579 $self->{cursor} = length $text;
1378 } elsif ($sym == 27) { 1580 } elsif ($uni == 27) {
1379 $self->emit ('escape'); 1581 $self->emit ('escape');
1380 } elsif ($uni) { 1582 } elsif ($uni) {
1381 substr $text, $self->{cursor}++, 0, chr $uni; 1583 substr $text, $self->{cursor}++, 0, chr $uni;
1382 } 1584 }
1383 1585
1384 $self->_set_text ($text); 1586 $self->_set_text ($text);
1385 $self->update; 1587 $self->update;
1588 $self->check_size;
1386} 1589}
1387 1590
1388sub focus_in { 1591sub focus_in {
1389 my ($self) = @_; 1592 my ($self) = @_;
1390 1593
… …
1466 my ($self, $ev) = @_; 1669 my ($self, $ev) = @_;
1467 1670
1468 my $sym = $ev->{sym}; 1671 my $sym = $ev->{sym};
1469 1672
1470 if ($sym == 13) { 1673 if ($sym == 13) {
1674 unshift @{$self->{history}},
1675 my $txt = $self->get_text;
1676 $self->{history_pointer} = -1;
1677 $self->{history_saveback} = '';
1471 $self->emit (activate => $self->get_text); 1678 $self->emit (activate => $txt);
1472 $self->update; 1679 $self->update;
1680
1681 } elsif ($sym == CFClient::SDLK_UP) {
1682 if ($self->{history_pointer} < 0) {
1683 $self->{history_saveback} = $self->get_text;
1684 }
1685 if (@{$self->{history} || []} > 0) {
1686 $self->{history_pointer}++;
1687 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1688 $self->{history_pointer} = @{$self->{history} || []} - 1;
1689 }
1690 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1691 }
1692
1693 } elsif ($sym == CFClient::SDLK_DOWN) {
1694 $self->{history_pointer}--;
1695 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1696
1697 if ($self->{history_pointer} >= 0) {
1698 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1699 } else {
1700 $self->set_text ($self->{history_saveback});
1701 }
1473 1702
1474 } else { 1703 } else {
1475 $self->SUPER::key_down ($ev); 1704 $self->SUPER::key_down ($ev);
1476 } 1705 }
1477 1706
… …
1493 my $class = shift; 1722 my $class = shift;
1494 1723
1495 $class->SUPER::new ( 1724 $class->SUPER::new (
1496 padding => 4, 1725 padding => 4,
1497 fg => [1, 1, 1], 1726 fg => [1, 1, 1],
1498 bg => [1, 1, 1, 0.2],
1499 active_fg => [0, 0, 1], 1727 active_fg => [0, 0, 1],
1500 can_hover => 1, 1728 can_hover => 1,
1501 align => 0, 1729 align => 0,
1502 valign => 0, 1730 valign => 0,
1503 can_events => 1, 1731 can_events => 1,
… …
1521 1749
1522 if ($GRAB == $self) { 1750 if ($GRAB == $self) {
1523 $self->{fg} = $self->{active_fg}; 1751 $self->{fg} = $self->{active_fg};
1524 } 1752 }
1525 1753
1526 glEnable GL_BLEND;
1527 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1528 glEnable GL_TEXTURE_2D; 1754 glEnable GL_TEXTURE_2D;
1529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1755 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1530 glColor 0, 0, 0, 1; 1756 glColor 0, 0, 0, 1;
1531 1757
1532 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1758 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1533 1759
1534 glDisable GL_TEXTURE_2D; 1760 glDisable GL_TEXTURE_2D;
1535 glDisable GL_BLEND;
1536 1761
1537 $self->SUPER::_draw; 1762 $self->SUPER::_draw;
1538} 1763}
1539 1764
1540############################################################################# 1765#############################################################################
… …
1554 1779
1555 $class->SUPER::new ( 1780 $class->SUPER::new (
1556 padding => 2, 1781 padding => 2,
1557 fg => [1, 1, 1], 1782 fg => [1, 1, 1],
1558 active_fg => [1, 1, 0], 1783 active_fg => [1, 1, 0],
1784 bg => [0, 0, 0, 0.2],
1785 active_bg => [1, 1, 1, 0.5],
1559 state => 0, 1786 state => 0,
1560 can_hover => 1, 1787 can_hover => 1,
1561 @_ 1788 @_
1562 ) 1789 )
1563} 1790}
… …
1587 1814
1588 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1815 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1589 1816
1590 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1817 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1591 1818
1592 glEnable GL_BLEND; 1819 my $tex = $self->{state} ? $tex[1] : $tex[0];
1820
1593 glEnable GL_TEXTURE_2D; 1821 glEnable GL_TEXTURE_2D;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1595
1596 my $tex = $self->{state} ? $tex[1] : $tex[0];
1597
1598 $tex->draw_quad (0, 0, $s, $s); 1822 $tex->draw_quad_alpha (0, 0, $s, $s);
1599
1600 glDisable GL_TEXTURE_2D; 1823 glDisable GL_TEXTURE_2D;
1601 glDisable GL_BLEND;
1602} 1824}
1603 1825
1604############################################################################# 1826#############################################################################
1605 1827
1606package CFClient::UI::Image; 1828package CFClient::UI::Image;
… …
1649 glTranslate 0, -$self->{w}, 0; 1871 glTranslate 0, -$self->{w}, 0;
1650 1872
1651 ($w, $h) = ($h, $w); 1873 ($w, $h) = ($h, $w);
1652 } 1874 }
1653 1875
1654 glEnable GL_BLEND;
1655 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1656 glEnable GL_TEXTURE_2D; 1876 glEnable GL_TEXTURE_2D;
1657 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1658 1878
1659 $tex->draw_quad (0, 0, $w, $h); 1879 $tex->draw_quad_alpha (0, 0, $w, $h);
1660 1880
1661 glDisable GL_BLEND;
1662 glDisable GL_TEXTURE_2D; 1881 glDisable GL_TEXTURE_2D;
1663} 1882}
1664 1883
1665############################################################################# 1884#############################################################################
1666 1885
… …
1714} 1933}
1715 1934
1716sub set_max { 1935sub set_max {
1717 my ($self, $max) = @_; 1936 my ($self, $max) = @_;
1718 1937
1938 return if $self->{max_val} == $max;
1939
1719 $self->{max_val} = $max; 1940 $self->{max_val} = $max;
1941 $self->update;
1720} 1942}
1721 1943
1722sub set_value { 1944sub set_value {
1723 my ($self, $val, $max) = @_; 1945 my ($self, $val, $max) = @_;
1724 1946
1725 $self->set_max ($max) 1947 $self->set_max ($max)
1726 if defined $max; 1948 if defined $max;
1727 1949
1728 $max = $self->{max_val}; 1950 return if $self->{val} == $val;
1951
1729 $self->{val} = $val; 1952 $self->{val} = $val;
1730
1731 $self->update; 1953 $self->update;
1732} 1954}
1733 1955
1734sub _draw { 1956sub _draw {
1735 my ($self) = @_; 1957 my ($self) = @_;
… …
1798 2020
1799sub new { 2021sub new {
1800 my ($class, %arg) = @_; 2022 my ($class, %arg) = @_;
1801 2023
1802 my $self = $class->SUPER::new ( 2024 my $self = $class->SUPER::new (
1803 tooltip => $arg{type}, 2025 tooltip => $arg{type},
1804 can_hover => 1, 2026 can_hover => 1,
2027 can_events => 1,
1805 %arg, 2028 %arg,
1806 ); 2029 );
1807 2030
1808 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2031 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1809 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2032 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1817 2040
1818 $self->{value}->set_fontsize ($fsize); 2041 $self->{value}->set_fontsize ($fsize);
1819 $self->{max} ->set_fontsize ($fsize); 2042 $self->{max} ->set_fontsize ($fsize);
1820} 2043}
1821 2044
2045sub set_max {
2046 my ($self, $max) = @_;
2047
2048 $self->{gauge}->set_max ($max);
2049 $self->{max}->set_text ($max);
2050}
2051
1822sub set_value { 2052sub set_value {
1823 my ($self, $val, $max) = @_; 2053 my ($self, $val, $max) = @_;
1824 2054
1825 $self->set_max ($max) 2055 $self->set_max ($max)
1826 if defined $max; 2056 if defined $max;
1827 2057
1828 $self->{gauge}->set_value ($val, $max); 2058 $self->{gauge}->set_value ($val, $max);
1829 $self->{value}->set_text ($val); 2059 $self->{value}->set_text ($val);
1830}
1831
1832sub set_max {
1833 my ($self, $max) = @_;
1834
1835 $self->{gauge}->set_max ($max);
1836 $self->{max}->set_text ($max);
1837} 2060}
1838 2061
1839############################################################################# 2062#############################################################################
1840 2063
1841package CFClient::UI::Slider; 2064package CFClient::UI::Slider;
… …
1851 qw(s1_slider.png s1_slider_bg.png); 2074 qw(s1_slider.png s1_slider_bg.png);
1852 2075
1853sub new { 2076sub new {
1854 my $class = shift; 2077 my $class = shift;
1855 2078
1856 # range [value, low, high, page] 2079 # range [value, low, high, page, unit]
1857 2080
1858 # TODO: 0-width page 2081 # TODO: 0-width page
1859 # TODO: req_w/h are wrong with vertical 2082 # TODO: req_w/h are wrong with vertical
1860 # TODO: calculations are off 2083 # TODO: calculations are off
1861 my $self = $class->SUPER::new ( 2084 my $self = $class->SUPER::new (
1862 fg => [1, 1, 1], 2085 fg => [1, 1, 1],
1863 active_fg => [0, 0, 0], 2086 active_fg => [0, 0, 0],
2087 bg => [0, 0, 0, 0.2],
2088 active_bg => [1, 1, 1, 0.5],
1864 range => [0, 0, 100, 10], 2089 range => [0, 0, 100, 10, 0],
1865 req_w => 20, 2090 req_w => $::WIDTH / 80,
1866 req_h => 20, 2091 req_h => $::WIDTH / 80,
1867 vertical => 0, 2092 vertical => 0,
1868 can_hover => 1, 2093 can_hover => 1,
1869 inner_pad => 5, 2094 inner_pad => 0.02,
1870 @_ 2095 @_
1871 ); 2096 );
1872 2097
2098 $self->set_value ($self->{range}[0]);
2099 $self->update;
2100
1873 $self 2101 $self
2102}
2103
2104sub set_range {
2105 my ($self, $range) = @_;
2106
2107 $self->{range} = $range;
2108
2109 $self->update;
2110}
2111
2112sub set_value {
2113 my ($self, $value) = @_;
2114
2115 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2116
2117 $hi = $lo + 1 if $hi <= $lo;
2118
2119 $page = $hi - $lo if $page > $hi - $lo;
2120
2121 $value = $lo if $value < $lo;
2122 $value = $hi - $page if $value > $hi - $page;
2123
2124 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2125 if $unit;
2126
2127 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2128
2129 if ($value != $old_value) {
2130 $self->emit (changed => $value);
2131 $self->update;
2132 }
1874} 2133}
1875 2134
1876sub size_request { 2135sub size_request {
1877 my ($self) = @_; 2136 my ($self) = @_;
1878 2137
… …
1884 2143
1885sub button_down { 2144sub button_down {
1886 my ($self, $ev, $x, $y) = @_; 2145 my ($self, $ev, $x, $y) = @_;
1887 2146
1888 $self->SUPER::button_down ($ev, $x, $y); 2147 $self->SUPER::button_down ($ev, $x, $y);
2148
2149 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2150
1889 $self->mouse_motion ($ev, $x, $y); 2151 $self->mouse_motion ($ev, $x, $y);
1890} 2152}
1891 2153
1892sub mouse_motion { 2154sub mouse_motion {
1893 my ($self, $ev, $x, $y) = @_; 2155 my ($self, $ev, $x, $y) = @_;
1894 2156
1895 if ($GRAB == $self) { 2157 if ($GRAB == $self) {
2158 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2159
2160 my (undef, $lo, $hi, $page) = @{$self->{range}};
2161
2162 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2163
2164 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2165 }
2166}
2167
2168sub update {
2169 my ($self) = @_;
2170
2171 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2172 $self->set_value ($self->{range}[0]);
2173
1896 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2174 my ($value, $lo, $hi, $page) = @{$self->{range}};
2175 my $range = ($hi - $page - $lo) || 1e-100;
1897 2176
1898 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2177 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1899 2178
1900 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2179 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1901 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2180 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1902 2181
1903 $x -= $inner_pad_px; # substract the padding 2182 $value = ($value - $lo) / $range;
1904 $x = $x * ($hi - $lo) / $inner_w + $lo; 2183 $value = $value * $self->{scale} + $self->{offset};
1905 $x = $lo if $x < $lo;
1906 $x = $hi - $page if $x > $hi - $page;
1907 $self->{range}[0] = $x;
1908 2184
1909 $self->emit (changed => $x); 2185 $self->{knob_x} = $value - $knob_w * 0.5;
1910 $self->update; 2186 $self->{knob_w} = $knob_w;
1911 } 2187 });
1912}
1913 2188
1914# the inner_* stuff is for generating a padding for the slider handle, 2189 $self->SUPER::update;
1915# so that the handle doesn't leave the texture. This calculation isn't 100%
1916# correct propably, but it does the job for now
1917sub _calc_inner_pad_px {
1918 my ($self, $w) = @_;
1919 ($w / 100) * $self->{inner_pad} # % to pixels
1920} 2190}
1921 2191
1922sub _draw { 2192sub _draw {
1923 my ($self) = @_; 2193 my ($self) = @_;
1924 2194
1925 $self->SUPER::_draw (); 2195 $self->SUPER::_draw ();
1926 2196
1927 my ($w, $h) = @$self{qw(w h)}; 2197 glScale $self->{w}, $self->{h};
1928 2198
1929 if ($self->{vertical}) { 2199 if ($self->{vertical}) {
1930 # draw a vertical slider like a rotated horizontal slider 2200 # draw a vertical slider like a rotated horizontal slider
1931 2201
2202 glTranslate 1, 0, 0;
1932 glRotate 90, 0, 0, 1; 2203 glRotate 90, 0, 0, 1;
1933 glTranslate 0, -$self->{w}, 0;
1934
1935 ($w, $h) = ($h, $w);
1936 } 2204 }
1937 2205
1938 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2206 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1939 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2207 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1940 2208
1941 my ($value, $lo, $hi, $page) = @{$self->{range}};
1942
1943 $hi = $value + 1 if $lo == $hi;
1944
1945 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1946 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1947
1948 $page = int $page * $inner_w / ($hi - $lo);
1949 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1950
1951 $w -= $page;
1952 $page &= ~1;
1953 glTranslate $page * 0.5, 0, 0;
1954 $page ||= 2;
1955
1956 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1957 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1958
1959 glEnable GL_BLEND;
1960 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1961 glEnable GL_TEXTURE_2D; 2209 glEnable GL_TEXTURE_2D;
1962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2210 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1963 2211
1964 # draw background 2212 # draw background
1965 $tex[1]->draw_quad (0, 0, $w, $h); 2213 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1966 2214
1967 # draw handle 2215 # draw handle
1968 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2216 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1969 2217
1970 glDisable GL_BLEND;
1971 glDisable GL_TEXTURE_2D; 2218 glDisable GL_TEXTURE_2D;
1972} 2219}
2220
2221#############################################################################
2222
2223package CFClient::UI::ValSlider;
2224
2225our @ISA = CFClient::UI::HBox::;
2226
2227sub new {
2228 my ($class, %arg) = @_;
2229
2230 my $range = delete $arg{range};
2231
2232 my $self = $class->SUPER::new (
2233 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2234 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2235 to_value => sub { shift },
2236 from_value => sub { shift },
2237 %arg,
2238 );
2239
2240 $self->{slider}->connect (changed => sub {
2241 my ($self, $value) = @_;
2242 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2243 $self->{parent}->emit (changed => $value);
2244 });
2245
2246# $self->{entry}->connect (changed => sub {
2247# my ($self, $value) = @_;
2248# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2249# $self->{parent}->emit (changed => $value);
2250# });
2251
2252 $self->add ($self->{slider}, $self->{entry});
2253
2254 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2255
2256 $self
2257}
2258
2259sub set_range { shift->{slider}->set_range (@_) }
2260sub set_value { shift->{slider}->set_value (@_) }
1973 2261
1974############################################################################# 2262#############################################################################
1975 2263
1976package CFClient::UI::TextView; 2264package CFClient::UI::TextView;
1977 2265
… …
1986 fontsize => 1, 2274 fontsize => 1,
1987 can_events => 0, 2275 can_events => 0,
1988 #font => default_font 2276 #font => default_font
1989 @_, 2277 @_,
1990 2278
1991 layout => (new CFClient::Layout), 2279 layout => (new CFClient::Layout 1),
1992 par => [], 2280 par => [],
1993 height => 0, 2281 height => 0,
1994 children => [ 2282 children => [
1995 (new CFClient::UI::Empty expand => 1), 2283 (new CFClient::UI::Empty expand => 1),
1996 (new CFClient::UI::Slider vertical => 1), 2284 (new CFClient::UI::Slider vertical => 1),
1997 ], 2285 ],
1998 ); 2286 );
1999 2287
2000 $self->{children}[1]->connect (changed => sub { 2288 $self->{children}[1]->connect (changed => sub { $self->update });
2001 $self->update;
2002 });
2003 2289
2004 $self 2290 $self
2005} 2291}
2006 2292
2007sub set_fontsize { 2293sub set_fontsize {
2008 my ($self, $fontsize) = @_; 2294 my ($self, $fontsize) = @_;
2009 2295
2010 $self->{fontsize} = $fontsize; 2296 $self->{fontsize} = $fontsize;
2011 $self->reflow; 2297 $self->reflow;
2012}
2013
2014sub text_height {
2015 my ($self, $text) = @_;
2016
2017 my $layout = $self->{layout};
2018
2019 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2020 $layout->set_width ($self->{w});
2021 $layout->set_text ($text);
2022
2023 ($layout->size)[1]
2024}
2025
2026sub reflow {
2027 my ($self) = @_;
2028
2029 $self->{need_reflow}++;
2030 $self->update;
2031} 2298}
2032 2299
2033sub size_allocate { 2300sub size_allocate {
2034 my ($self, $w, $h) = @_; 2301 my ($self, $w, $h) = @_;
2035 2302
… …
2040 $self->{layout}->set_width ($self->{children}[0]{w}); 2307 $self->{layout}->set_width ($self->{children}[0]{w});
2041 2308
2042 $self->reflow; 2309 $self->reflow;
2043} 2310}
2044 2311
2312sub text_size {
2313 my ($self, $text, $indent) = @_;
2314
2315 my $layout = $self->{layout};
2316
2317 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2318 $layout->set_width ($self->{children}[0]{w} - $indent);
2319 $layout->set_markup ($text);
2320
2321 $layout->size
2322}
2323
2324sub reflow {
2325 my ($self) = @_;
2326
2327 $self->{need_reflow}++;
2328 $self->update;
2329}
2330
2331sub set_offset {
2332 my ($self, $offset) = @_;
2333
2334 # todo: base offset on lines or so, not on pixels
2335 $self->{children}[1]->set_value ($offset);
2336}
2337
2338sub clear {
2339 my ($self) = @_;
2340
2341 $self->{par} = [];
2342 $self->{height} = 0;
2343 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2344}
2345
2045sub add_paragraph { 2346sub add_paragraph {
2046 my ($self, $color, $text) = @_; 2347 my ($self, $color, $text, $indent) = @_;
2047 2348
2048 #TODO: intelligently "reformat" paragraph 2349 for my $line (split /\n/, $text) {
2049 2350 my ($w, $h) = $self->text_size ($line);
2050 my $height = $self->text_height ($text);
2051
2052 $self->{height} += $height; 2351 $self->{height} += $h;
2352 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2353 }
2053 2354
2054 push @{$self->{par}}, [$height, $color, $text];
2055
2056 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2355 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2057 $self->{children}[1]->update;
2058} 2356}
2059 2357
2060sub update { 2358sub update {
2061 my ($self) = @_; 2359 my ($self) = @_;
2062 2360
… …
2064 2362
2065 return unless $self->{h} > 0; 2363 return unless $self->{h} > 0;
2066 2364
2067 delete $self->{texture}; 2365 delete $self->{texture};
2068 2366
2069 $ROOT->on_refresh ($self, sub { 2367 $ROOT->on_post_alloc ($self, sub {
2368 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2369
2070 if (delete $self->{need_reflow}) { 2370 if (delete $self->{need_reflow}) {
2071 my $height = 0; 2371 my $height = 0;
2072 2372
2073 $height += $_->[0] = $self->text_height ($_->[2]) 2373 my $layout = $self->{layout};
2374
2375 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2376
2074 for @{$self->{par}}; 2377 for (@{$self->{par}}) {
2378 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2379 $layout->set_width ($W - $_->[3]);
2380 $layout->set_markup ($_->[4]);
2381 my ($w, $h) = $layout->size;
2382 $_->[0] = $w + $_->[3];
2383 $_->[1] = $h;
2384 }
2385
2386 $height += $_->[1];
2387 }
2075 2388
2076 $self->{height} = $height; 2389 $self->{height} = $height;
2077 2390
2078 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2391 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2079 2392
2080 delete $self->{texture}; 2393 delete $self->{texture};
2081 } 2394 }
2082 2395
2083 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2396 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2084 glClearColor 0, 0, 0, 1; 2397 glClearColor 0.5, 0.5, 0.5, 0;
2085 glClear GL_COLOR_BUFFER_BIT; 2398 glClear GL_COLOR_BUFFER_BIT;
2086 2399
2400 my $top = int $self->{children}[1]{range}[0];
2401
2402 my $y0 = $top;
2403 my $y1 = $top + $H;
2404
2405 my $y = 0;
2406
2407 my $layout = $self->{layout};
2408
2409 $layout->set_font ($self->{font}) if $self->{font};
2410
2087 glEnable GL_BLEND; 2411 glEnable GL_BLEND;
2412 #TODO# not correct in windows where rgba is forced off
2088 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2413 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2089 glEnable GL_TEXTURE_2D;
2090 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2091
2092 my $top = int $self->{children}[1]{range}[0];
2093
2094 my $y0 = $top;
2095 my $y1 = $top + $self->{h};
2096
2097 my $y = 0;
2098
2099 my $layout = $self->{layout};
2100
2101 $layout->set_font ($self->{font}) if $self->{font};
2102 2414
2103 for my $par (@{$self->{par}}) { 2415 for my $par (@{$self->{par}}) {
2104 my $h = $par->[0]; 2416 my $h = $par->[1];
2105 2417
2106 if ($y0 < $y + $h && $y < $y1) { 2418 if ($y0 < $y + $h && $y < $y1) {
2419 $layout->set_foreground (@{ $par->[2] });
2420 $layout->set_width ($W - $par->[3]);
2107 $layout->set_text ($par->[2]); 2421 $layout->set_markup ($par->[4]);
2108 2422
2109 glColor @{ $par->[1] }; 2423 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2110 my ($W, $H) = $layout->size; 2424
2111 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2425 glRasterPos $par->[3], $y - $y0;
2426 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2112 } 2427 }
2113 2428
2114 $y += $h; 2429 $y += $h;
2115 } 2430 }
2116 2431
2117 glDisable GL_TEXTURE_2D;
2118 glDisable GL_BLEND; 2432 glDisable GL_BLEND;
2119 }; 2433 };
2120 }); 2434 });
2121} 2435}
2122 2436
2123sub _draw { 2437sub _draw {
2124 my ($self) = @_; 2438 my ($self) = @_;
2125 2439
2126 if ($self->{texture}) {
2127 glEnable GL_TEXTURE_2D; 2440 glEnable GL_TEXTURE_2D;
2128 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2441 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2442 glColor 1, 1, 1, 1;
2129 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2443 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2130 glDisable GL_TEXTURE_2D; 2444 glDisable GL_TEXTURE_2D;
2131 }
2132 2445
2133 $self->{children}[1]->draw; 2446 $self->{children}[1]->draw;
2134 2447
2135} 2448}
2136 2449
… …
2230 @_, 2543 @_,
2231 can_events => 0, 2544 can_events => 0,
2232 ) 2545 )
2233} 2546}
2234 2547
2235sub set_markup { 2548sub set_tooltip_from {
2236 my ($self, $text) = @_; 2549 my ($self, $widget) = @_;
2237 2550
2238 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2551 $self->add (new CFClient::UI::Label
2239 $self->{label}->set_markup ($text); 2552 markup => $widget->{tooltip},
2240 $self->add ($self->{label}); 2553 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2554 fontsize => 0.8,
2555 fg => [0, 0, 0, 1],
2556 ellipsise => 0,
2557 font => ($widget->{tooltip_font} || $::FONT_PROP),
2558 );
2241} 2559}
2242 2560
2243sub size_request { 2561sub size_request {
2244 my ($self) = @_; 2562 my ($self) = @_;
2245
2246 $self->child->set_max_size ($::WIDTH * 0.3);
2247 2563
2248 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2564 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2249 2565
2250 ($w + 4, $h + 4) 2566 ($w + 4, $h + 4)
2251} 2567}
… …
2257} 2573}
2258 2574
2259sub _draw { 2575sub _draw {
2260 my ($self) = @_; 2576 my ($self) = @_;
2261 2577
2262 glPushMatrix;
2263 glTranslate 0.375, 0.375; 2578 glTranslate 0.375, 0.375;
2264 2579
2265 my ($w, $h) = @$self{qw(w h)}; 2580 my ($w, $h) = @$self{qw(w h)};
2266 2581
2267 glColor 1, 0.8, 0.4; 2582 glColor 1, 0.8, 0.4;
… …
2278 glVertex 0 , $h; 2593 glVertex 0 , $h;
2279 glVertex $w, $h; 2594 glVertex $w, $h;
2280 glVertex $w, 0; 2595 glVertex $w, 0;
2281 glEnd; 2596 glEnd;
2282 2597
2283 glPopMatrix; 2598 glTranslate 2 - 0.375, 2 - 0.375;
2284
2285 glTranslate 2, 2;
2286 $self->SUPER::_draw; 2599 $self->SUPER::_draw;
2287} 2600}
2288 2601
2289############################################################################# 2602#############################################################################
2290 2603
… …
2295use CFClient::OpenGL; 2608use CFClient::OpenGL;
2296 2609
2297sub new { 2610sub new {
2298 my $class = shift; 2611 my $class = shift;
2299 2612
2300 $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2301 aspect => 1, 2614 aspect => 1,
2302 @_, 2615 @_,
2303 ) 2616 );
2617
2618 if ($self->{anim} && $self->{animspeed}) {
2619 Scalar::Util::weaken (my $widget = $self);
2620
2621 $self->{timer} = Event->timer (
2622 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2623 hard => 1,
2624 interval => $self->{animspeed},
2625 cb => sub {
2626 ++$widget->{frame};
2627 $widget->update;
2628 },
2629 );
2630 }
2631
2632 $self
2304} 2633}
2305 2634
2306sub size_request { 2635sub size_request {
2307 (32, 8) 2636 (32, 8)
2308} 2637}
2309 2638
2639sub update {
2640 my ($self) = @_;
2641
2642 return unless $self->{visible};
2643
2644 $self->SUPER::update;
2645}
2646
2310sub draw { 2647sub _draw {
2311 my ($self) = @_; 2648 my ($self) = @_;
2312 2649
2650 return unless $::CONN;
2651
2652 my $face;
2653
2654 if ($self->{frame}) {
2655 my $anim = $::CONN->{anim}[$self->{anim}];
2656
2657 $face = $anim->[ $self->{frame} % @$anim ]
2658 if $anim && @$anim;
2659 }
2660
2313 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2661 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2314 2662
2315 if ($tex) { 2663 if ($tex) {
2316 glEnable GL_BLEND;
2317 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2318 glEnable GL_TEXTURE_2D; 2664 glEnable GL_TEXTURE_2D;
2319 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2320 glColor 1, 1, 1, 1; 2666 glColor 1, 1, 1, 1;
2321 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2667 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2322 glDisable GL_TEXTURE_2D; 2668 glDisable GL_TEXTURE_2D;
2323 glDisable GL_BLEND;
2324 } 2669 }
2670}
2671
2672sub DESTROY {
2673 my ($self) = @_;
2674
2675 $self->{timer}->cancel
2676 if $self->{timer};
2677
2678 $self->SUPER::DESTROY;
2325} 2679}
2326 2680
2327############################################################################# 2681#############################################################################
2328 2682
2683package CFClient::UI::InventoryItem;
2684
2685our @ISA = CFClient::UI::HBox::;
2686
2687sub _item_to_desc {
2688 my ($item) = @_;
2689
2690 my $desc =
2691 $item->{nrof} < 2
2692 ? $item->{name}
2693 : "$item->{nrof} × $item->{name_pl}";
2694
2695 $item->{flags} & Crossfire::Protocol::F_OPEN
2696 and $desc .= " (open)";
2697 $item->{flags} & Crossfire::Protocol::F_APPLIED
2698 and $desc .= " (applied)";
2699 $item->{flags} & Crossfire::Protocol::F_UNPAID
2700 and $desc .= " (unpaid)";
2701 $item->{flags} & Crossfire::Protocol::F_MAGIC
2702 and $desc .= " (magic)";
2703 $item->{flags} & Crossfire::Protocol::F_CURSED
2704 and $desc .= " (cursed)";
2705 $item->{flags} & Crossfire::Protocol::F_DAMNED
2706 and $desc .= " (damned)";
2707 $item->{flags} & Crossfire::Protocol::F_LOCKED
2708 and $desc .= " *";
2709
2710 $desc
2711}
2712
2713sub new {
2714 my $class = shift;
2715
2716 my %args = @_;
2717
2718 my $item = delete $args{item};
2719
2720 my $desc = _item_to_desc ($item);
2721
2722 my $self = $class->SUPER::new (
2723 can_hover => 1,
2724 can_events => 1,
2725 tooltip => ((CFClient::UI::Label::escape $desc)
2726 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2727 connect_button_down => sub {
2728 my ($self, $ev, $x, $y) = @_;
2729
2730 # todo: maybe put examine on 1? but should just be a tooltip :(
2731 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2732 my $targ = $::CONN->{player}{tag};
2733
2734 if ($item->{container} == $::CONN->{player}{tag}) {
2735 $targ = $main::OPENCONT;
2736 }
2737
2738 $::CONN->send ("move $targ $item->{tag} 0");
2739 } elsif ($ev->{button} == 1) {
2740 $::CONN->send ("examine $item->{tag}");
2741 } elsif ($ev->{button} == 2) {
2742 $::CONN->send ("apply $item->{tag}");
2743 } elsif ($ev->{button} == 3) {
2744 my @menu_items = (
2745 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2746 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2747 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2748 (
2749 $item->{flags} & Crossfire::Protocol::F_LOCKED
2750 ? (
2751 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2752 )
2753 : (
2754 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2755 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2756 )
2757 ),
2758 );
2759
2760 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2761 }
2762
2763 1
2764 },
2765 %args
2766 );
2767
2768
2769 $self->add (new CFClient::UI::Face
2770 can_events => 0,
2771 face => $item->{face},
2772 anim => $item->{anim},
2773 animspeed => $item->{animspeed},
2774 );
2775
2776 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2777
2778 $self->{item} = $item;
2779
2780 $self->update_item;
2781
2782 $self
2783}
2784
2785sub update_item {
2786 my ($self) = @_;
2787
2788 my $desc = _item_to_desc ($self->{item});
2789
2790 $self->{name_lbl}->set_text ($desc);
2791}
2792
2793#############################################################################
2794
2795package CFClient::UI::Inventory;
2796
2797our @ISA = CFClient::UI::ScrolledWindow::;
2798
2799sub new {
2800 my $class = shift;
2801
2802 my $self = $class->SUPER::new (
2803 scrolled => (new CFClient::UI::Table),
2804 @_,
2805 );
2806
2807 $self
2808}
2809
2810sub set_items {
2811 my ($self, $items) = @_;
2812
2813 $self->{scrolled}->clear;
2814 return unless $items;
2815
2816 my @items = sort {
2817 ($a->{type} <=> $b->{type})
2818 or ($a->{name} cmp $b->{name})
2819 } @$items;
2820
2821 $self->{real_items} = \@items;
2822
2823 for my $item (@items) {
2824 $item->{item} = $item;
2825 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2826 $item->update_item ();
2827 }
2828
2829 my $i = 0;
2830 for (@items) {
2831 $self->{scrolled}->add (0, $i, $_);
2832 my $nrof = $_->{item}->{nrof} || 1;
2833 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2834 }
2835
2836# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2837}
2838
2839sub size_request {
2840 my ($self) = @_;
2841 ($self->{req_w}, $self->{req_h});
2842}
2843
2844#############################################################################
2845
2846package CFClient::UI::Menu;
2847
2848our @ISA = CFClient::UI::FancyFrame::;
2849
2850use CFClient::OpenGL;
2851
2852sub new {
2853 my $class = shift;
2854
2855 my $self = $class->SUPER::new (
2856 items => [],
2857 z => 100,
2858 @_,
2859 );
2860
2861 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2862
2863 for my $item (@{ $self->{items} }) {
2864 my ($widget, $cb) = @$item;
2865
2866 # handle various types of items, only text for now
2867 if (!ref $widget) {
2868 $widget = new CFClient::UI::Label
2869 can_hover => 1,
2870 can_events => 1,
2871 text => $widget;
2872 }
2873
2874 $self->{item}{$widget} = $item;
2875
2876 $self->{vbox}->add ($widget);
2877 }
2878
2879 $self
2880}
2881
2882# popup given the event (must be a mouse button down event currently)
2883sub popup {
2884 my ($self, $ev) = @_;
2885
2886 $self->emit ("popdown");
2887
2888 # maybe save $GRAB? must be careful about events...
2889 $GRAB = $self;
2890 $self->{button} = $ev->{button};
2891
2892 $self->show;
2893 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2894}
2895
2896sub mouse_motion {
2897 my ($self, $ev, $x, $y) = @_;
2898
2899 # TODO: should use vbox->find_widget or so
2900 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2901 $self->{hover} = $self->{item}{$HOVER};
2902}
2903
2904sub button_up {
2905 my ($self, $ev, $x, $y) = @_;
2906
2907 if ($ev->{button} == $self->{button}) {
2908 undef $GRAB;
2909 $self->hide;
2910
2911 $self->emit ("popdown");
2912 $self->{hover}[1]->() if $self->{hover};
2913 }
2914}
2915
2916#############################################################################
2917
2918package CFClient::UI::Statusbox;
2919
2920our @ISA = CFClient::UI::VBox::;
2921
2922sub new {
2923 my $class = shift;
2924
2925 $class->SUPER::new (
2926 fontsize => 0.8,
2927 @_,
2928 )
2929}
2930
2931sub reorder {
2932 my ($self) = @_;
2933 my $NOW = time;
2934
2935 while (my ($k, $v) = each %{ $self->{item} }) {
2936 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2937 }
2938
2939 my @widgets;
2940
2941 my @items = sort {
2942 $a->{pri} <=> $b->{pri}
2943 or $b->{id} <=> $a->{id}
2944 } values %{ $self->{item} };
2945
2946 my $count = 10 + 1;
2947 for my $item (@items) {
2948 last unless --$count;
2949
2950 push @widgets, $item->{label} ||= do {
2951 # TODO: doesn't handle markup well (read as: at all)
2952 my $short = $item->{count} > 1
2953 ? "<b>$item->{count} ×</b> $item->{text}"
2954 : $item->{text};
2955
2956 for ($short) {
2957 s/^\s+//;
2958 s/\s+/ /g;
2959 }
2960
2961 new CFClient::UI::Label
2962 markup => $short,
2963 tooltip => $item->{tooltip},
2964 tooltip_font => $::FONT_PROP,
2965 tooltip_width => 0.67,
2966 fontsize => $item->{fontsize} || $self->{fontsize},
2967 max_w => $::WIDTH * 0.44,
2968 fg => $item->{fg},
2969 can_events => 1,
2970 can_hover => 1
2971 };
2972 }
2973
2974 $self->clear;
2975 $self->SUPER::add (reverse @widgets);
2976}
2977
2978sub add {
2979 my ($self, $text, %arg) = @_;
2980
2981 $text =~ s/^\s+//;
2982 $text =~ s/\s+$//;
2983
2984 my $timeout = time + ((delete $arg{timeout}) || 60);
2985
2986 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2987
2988 if (my $item = $self->{item}{$group}) {
2989 if ($item->{text} eq $text) {
2990 $item->{count}++;
2991 } else {
2992 $item->{count} = 1;
2993 $item->{text} = $item->{tooltip} = $text;
2994 }
2995 $item->{id} = ++$self->{id};
2996 $item->{timeout} = $timeout;
2997 delete $item->{label};
2998 } else {
2999 $self->{item}{$group} = {
3000 id => ++$self->{id},
3001 text => $text,
3002 timeout => $timeout,
3003 tooltip => $text,
3004 fg => [0.8, 0.8, 0.8, 0.8],
3005 pri => 0,
3006 count => 1,
3007 %arg,
3008 };
3009 }
3010
3011 $self->reorder;
3012}
3013
3014sub reconfigure {
3015 my ($self) = @_;
3016
3017 delete $_->{label}
3018 for values %{ $self->{item} || {} };
3019
3020 $self->reorder;
3021 $self->SUPER::reconfigure;
3022}
3023
3024#############################################################################
3025
2329package CFClient::UI::Root; 3026package CFClient::UI::Root;
2330 3027
2331our @ISA = CFClient::UI::Container::; 3028our @ISA = CFClient::UI::Container::;
2332 3029
2333use CFClient::OpenGL; 3030use CFClient::OpenGL;
2334 3031
2335sub check_size { 3032sub new {
2336 my ($self) = @_; 3033 my $class = shift;
2337 3034
2338 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3035 $class->SUPER::new (
2339} 3036 @_,
2340 3037 )
2341sub size_request {
2342 ($::WIDTH, $::HEIGHT)
2343} 3038}
2344 3039
2345sub configure { 3040sub configure {
2346 my ($self, $x, $y, $w, $h) = @_; 3041 my ($self, $x, $y, $w, $h) = @_;
2347 3042
2348 $self->SUPER::configure ($x, $y, $w, $h); 3043 $self->{w} = $w;
3044 $self->{h} = $h;
3045}
2349 3046
3047sub check_size {
3048 my ($self) = @_;
3049
3050 $self->size_allocate ($self->{w}, $self->{h})
3051 if $self->{w};
3052}
3053
3054sub size_request {
3055 my ($self) = @_;
3056
3057 ($self->{w}, $self->{h})
3058}
3059
3060sub size_allocate {
3061 my ($self, $w, $h) = @_;
3062
2350 for my $child (@{$self->{children}}) { 3063 for my $child ($self->children) {
2351 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3064 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2352 3065
3066 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3067 if exists $child->{req_x};
3068
3069 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3070 if exists $child->{req_y};
3071
2353 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3072 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2354 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3073 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3074
2355 $child->configure ($X, $Y, $W,$H); 3075 $child->configure ($X, $Y, $W, $H);
2356 } 3076 }
2357} 3077}
2358 3078
2359sub _topleft { 3079sub coord2local {
2360 my ($self, $x, $y) = @_; 3080 my ($self, $x, $y) = @_;
2361 3081
2362 ($x, $y) 3082 ($x, $y)
2363} 3083}
2364 3084
3085sub coord2global {
3086 my ($self, $x, $y) = @_;
3087
3088 ($x, $y)
3089}
3090
2365sub update { 3091sub update {
2366 my ($self) = @_; 3092 my ($self) = @_;
2367 3093
2368 $self->check_size; 3094 $self->check_size;
2369 ::refresh (); 3095 $::WANT_REFRESH++;
2370} 3096}
2371 3097
2372sub add { 3098sub add {
2373 my ($self, $child) = @_; 3099 my ($self, @children) = @_;
2374 3100
3101 for (my @widgets = @children; my $w = pop @widgets; ) {
3102 push @widgets, $w->children;
3103 $w->{root} = $self;
3104 $w->{visible} = 1;
3105 }
3106
3107 for my $child (@children) {
3108 $child->{is_toplevel} = 1;
3109
2375 # integerize window positions 3110 # integerise window positions
2376 $child->{x} = int $child->{x}; 3111 $child->{x} = int $child->{x};
2377 $child->{y} = int $child->{y}; 3112 $child->{y} = int $child->{y};
3113 }
2378 3114
2379 $self->SUPER::add ($child); 3115 $self->SUPER::add (@children);
3116}
3117
3118sub remove {
3119 my ($self, @children) = @_;
3120
3121 $self->SUPER::remove (@children);
3122
3123 while (@children) {
3124 my $w = pop @children;
3125 push @children, $w->children;
3126 delete $w->{visible};
3127 }
2380} 3128}
2381 3129
2382sub on_refresh { 3130sub on_refresh {
2383 my ($self, $id, $cb) = @_; 3131 my ($self, $id, $cb) = @_;
2384 3132
2385 $self->{refresh_hook}{$id} = $cb; 3133 $self->{refresh_hook}{$id} = $cb;
2386} 3134}
2387 3135
3136sub on_post_alloc {
3137 my ($self, $id, $cb) = @_;
3138
3139 $self->{post_alloc_hook}{$id} = $cb;
3140}
3141
2388sub draw { 3142sub draw {
2389 my ($self) = @_; 3143 my ($self) = @_;
2390 3144
2391 while (my $rcb = delete $self->{refresh_hook}) { 3145 while ($self->{refresh_hook}) {
2392 $_->() for values %$rcb; 3146 $_->()
3147 for values %{delete $self->{refresh_hook}};
3148 }
3149
3150 if ($self->{check_size}) {
3151 my @queue = ([], []);
3152
3153 for (;;) {
3154 if ($self->{check_size}) {
3155 # heuristic: check containers last
3156 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3157 for values %{delete $self->{check_size}}
3158 }
3159
3160 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3161
3162 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3163 ? @$widget{qw(user_w user_h)}
3164 : $widget->size_request;
3165
3166 if (delete $widget->{force_alloc}
3167 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3168 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3169
3170 $widget->{req_w} = $w;
3171 $widget->{req_h} = $h;
3172
3173 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3174
3175 $widget->{parent}->check_size
3176 if $widget->{parent};
3177 }
3178 }
3179 }
3180
3181 while ($self->{size_alloc}) {
3182 for (values %{delete $self->{size_alloc}}) {
3183 my ($widget, $w, $h) = @$_;
3184
3185 $w = 0 if $w < 0;
3186 $h = 0 if $h < 0;
3187
3188 $widget->{w} = $w;
3189 $widget->{h} = $h;
3190 $widget->size_allocate ($w, $h);
3191 $widget->emit (size_allocate => $w, $h);
3192 }
3193 }
3194
3195 while ($self->{post_alloc_hook}) {
3196 $_->()
3197 for values %{delete $self->{post_alloc_hook}};
2393 } 3198 }
2394 3199
2395 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2396 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2397 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
2398 3203
2399 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
2400 glLoadIdentity; 3205 glLoadIdentity;
2401 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2402 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
2403 glLoadIdentity; 3208 glLoadIdentity;
2404 3209
2405 $self->_draw; 3210 $self->_draw;
2406} 3211}
… …
2408############################################################################# 3213#############################################################################
2409 3214
2410package CFClient::UI; 3215package CFClient::UI;
2411 3216
2412$ROOT = new CFClient::UI::Root; 3217$ROOT = new CFClient::UI::Root;
2413$TOOLTIP = new CFClient::UI::Tooltip; 3218$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2414 3219
24151 32201
2416 3221

Diff Legend

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