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

Diff Legend

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