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.164 by root, Mon Apr 24 06:57:39 2006 UTC vs.
Revision 1.229 by root, Wed May 24 21:49:58 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]);
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
838sub size_allocate {
839 my ($self, $w, $h) = @_;
840
841 $self->SUPER::size_allocate ($w, $h);
842
843 my $child = $self->{vp}->child;
844 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
845}
846
847#TODO# update range on size_allocate depending on child
848# update viewport offset on scroll
849
850#############################################################################
851
852package CFClient::UI::Frame;
853
854our @ISA = CFClient::UI::Bin::;
855
856use CFClient::OpenGL;
857
858sub new {
859 my $class = shift;
860
861 $class->SUPER::new (
862 bg => undef,
863 @_,
864 )
865}
866
711sub _draw { 867sub _draw {
712 my ($self) = @_; 868 my ($self) = @_;
713 869
714 my ($w, $h) = ($self->{w}, $self->{h}); 870 if ($self->{bg}) {
871 my ($w, $h) = @$self{qw(w h)};
715 872
716 glEnable GL_BLEND; 873 glEnable GL_BLEND;
717 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 874 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
718 glEnable GL_TEXTURE_2D; 875 glColor @{ $self->{bg} };
719 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
720 876
721# glBegin GL_QUADS; 877 glBegin GL_QUADS;
722# glColor 0, 0, 0, 0;
723# glVertex 0 , 0; 878 glVertex 0 , 0;
724# glVertex 0 , $h; 879 glVertex 0 , $h;
725# glVertex $w, $h; 880 glVertex $w, $h;
726# glVertex $w, 0; 881 glVertex $w, 0;
727# glEnd; 882 glEnd;
728 883
729
730 $self->child->draw;
731 glDisable GL_BLEND; 884 glDisable GL_BLEND;
732 glDisable GL_TEXTURE_2D; 885 }
886
887 $self->SUPER::_draw;
733} 888}
734 889
735############################################################################# 890#############################################################################
736 891
737package CFClient::UI::FancyFrame; 892package CFClient::UI::FancyFrame;
… …
750 # TODO: user_x, user_y, overwrite moveto? 905 # TODO: user_x, user_y, overwrite moveto?
751 906
752 my $self = $class->SUPER::new ( 907 my $self = $class->SUPER::new (
753 bg => [1, 1, 1, 1], 908 bg => [1, 1, 1, 1],
754 border_bg => [1, 1, 1, 1], 909 border_bg => [1, 1, 1, 1],
755 border => 0.8, 910 border => 0.6,
911 toplevel => 1,
756 can_events => 0, 912 can_events => 1,
757 @_ 913 @_
758 ); 914 );
759 915
760 $self->{title} &&= new CFClient::UI::Label 916 $self->{title} &&= new CFClient::UI::Label
761 align => 0, 917 align => 0,
762 valign => 1, 918 valign => 1,
763 text => $self->{title}, 919 text => $self->{title},
764 fontsize => 1; 920 fontsize => $self->{border};
765 921
766 $self 922 $self
767} 923}
768 924
769sub border { 925sub border {
… …
785 my ($self, $w, $h) = @_; 941 my ($self, $w, $h) = @_;
786 942
787 $h -= List::Util::max 0, $self->border * 2; 943 $h -= List::Util::max 0, $self->border * 2;
788 $w -= List::Util::max 0, $self->border * 2; 944 $w -= List::Util::max 0, $self->border * 2;
789 945
790 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 946 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
791 if $self->{title}; 947 if $self->{title};
792 948
793 $self->child->configure ($self->border, $self->border, $w, $h); 949 $self->child->configure ($self->border, $self->border, $w, $h);
794} 950}
795 951
796sub button_down { 952sub button_down {
797 my ($self, $ev, $x, $y) = @_; 953 my ($self, $ev, $x, $y) = @_;
798 954
955 my ($w, $h) = @$self{qw(w h)};
799 my $border = $self->border; 956 my $border = $self->border;
800 957
801 if ($x < $self->{w} && $x >= $self->{w} - $border 958 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
802 && $y < $self->{h} && $y >= $self->{h} - $border) { 959 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
803 960
961 if ($lr & $td) {
962 my ($wx, $wy) = ($self->{x}, $self->{y});
804 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 963 my ($ox, $oy) = ($ev->{x}, $ev->{y});
805 my ($bw, $bh) = ($self->{w}, $self->{h}); 964 my ($bw, $bh) = ($self->{w}, $self->{h});
806 965
966 my $mx = $x < $border;
967 my $my = $y < $border;
968
807 $self->{motion} = sub { 969 $self->{motion} = sub {
808 my ($ev, $x, $y) = @_; 970 my ($ev, $x, $y) = @_;
809 971
810 ($x, $y) = ($ev->{x}, $ev->{y}); 972 my $dx = $ev->{x} - $ox;
973 my $dy = $ev->{y} - $oy;
811 974
812 $self->{user_w} = $bw + $x - $ox; 975 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
813 $self->{user_h} = $bh + $y - $oy; 976 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
977 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
814 $self->check_size; 978 $self->check_size;
815 }; 979 };
816 980
817 } elsif ($x >= 0 && $x < $self->{w} 981 } elsif ($lr ^ $td) {
818 && $y >= 0 && $y < $border) {
819
820 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 982 my ($ox, $oy) = ($ev->{x}, $ev->{y});
821 my ($bx, $by) = ($self->{x}, $self->{y}); 983 my ($bx, $by) = ($self->{x}, $self->{y});
822 984
823 $self->{motion} = sub { 985 $self->{motion} = sub {
824 my ($ev, $x, $y) = @_; 986 my ($ev, $x, $y) = @_;
… …
847 my ($self) = @_; 1009 my ($self) = @_;
848 1010
849 my ($w, $h ) = ($self->{w}, $self->{h}); 1011 my ($w, $h ) = ($self->{w}, $self->{h});
850 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1012 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
851 1013
852 glEnable GL_BLEND;
853 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
854 glEnable GL_TEXTURE_2D; 1014 glEnable GL_TEXTURE_2D;
855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1015 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
856 1016
857 my $border = $self->border; 1017 my $border = $self->border;
858 1018
859 glColor @{ $self->{border_bg} }; 1019 glColor @{ $self->{border_bg} };
860 $tex[1]->draw_quad (0, 0, $w, $border); 1020 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
861 $tex[3]->draw_quad (0, $border, $border, $ch); 1021 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
862 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1022 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
863 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1023 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
864 1024
1025 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
865 my $bg = $tex[0]; 1026 my $bg = $tex[0];
866 1027
867 # TODO: repeat texture not scale 1028 # TODO: repeat texture not scale
868 my $rep_x = $cw / $bg->{w}; 1029 my $rep_x = $cw / $bg->{w};
869 my $rep_y = $ch / $bg->{h}; 1030 my $rep_y = $ch / $bg->{h};
870 1031
871 glColor @{ $self->{bg} }; 1032 glColor @{ $self->{bg} };
872 1033
873 $bg->{s} = $rep_x; 1034 $bg->{s} = $rep_x;
874 $bg->{t} = $rep_y; 1035 $bg->{t} = $rep_y;
875 $bg->{wrap_mode} = 1; 1036 $bg->{wrap_mode} = 1;
876 $bg->draw_quad ($border, $border, $cw, $ch); 1037 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1038 }
877 1039
878 glDisable GL_TEXTURE_2D; 1040 glDisable GL_TEXTURE_2D;
879 glDisable GL_BLEND;
880 1041
881 $self->{title}->draw if $self->{title}; 1042 $self->{title}->draw if $self->{title};
1043
882 $self->child->draw; 1044 $self->child->draw;
883} 1045}
884 1046
885############################################################################# 1047#############################################################################
886 1048
… …
908 $self->{children}[$y][$x] = $child; 1070 $self->{children}[$y][$x] = $child;
909 1071
910 $child->check_size; 1072 $child->check_size;
911} 1073}
912 1074
1075sub children {
1076 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1077}
1078
913# TODO: move to container class maybe? send childs a signal on removal? 1079# TODO: move to container class maybe? send childs a signal on removal?
914sub clear { 1080sub clear {
915 my ($self) = @_; 1081 my ($self) = @_;
916 1082
917 my $children = delete $self->{children}; 1083 my @children = $self->children;
1084 delete $self->{children};
918 1085
919 for (grep $_, map @$_, grep $_, @$children) { 1086 for (@children) {
920 delete $_->{parent}; 1087 delete $_->{parent};
921 $_->hide; 1088 $_->hide;
922 } 1089 }
923 1090
924 $self->update; 1091 $self->update;
… …
1105} 1272}
1106 1273
1107sub size_allocate { 1274sub size_allocate {
1108 my ($self, $w, $h) = @_; 1275 my ($self, $w, $h) = @_;
1109 1276
1277 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1278
1110 my $children = $self->{children}; 1279 my $children = $self->{children};
1111 1280
1112 my @h = map $_->{req_h}, @$children; 1281 my @h = map $_->{req_h}, @$children;
1113 1282
1114 my $req_h = List::Util::sum @h; 1283 my $req_h = List::Util::sum @h;
… …
1143 1312
1144############################################################################# 1313#############################################################################
1145 1314
1146package CFClient::UI::Label; 1315package CFClient::UI::Label;
1147 1316
1148our @ISA = CFClient::UI::Base::; 1317our @ISA = CFClient::UI::DrawBG::;
1149 1318
1150use CFClient::OpenGL; 1319use CFClient::OpenGL;
1151 1320
1152sub new { 1321sub new {
1153 my ($class, %arg) = @_; 1322 my ($class, %arg) = @_;
1154 1323
1155 my $self = $class->SUPER::new ( 1324 my $self = $class->SUPER::new (
1156 fg => [1, 1, 1], 1325 fg => [1, 1, 1],
1326 #bg => none
1327 #active_bg => none
1157 #font => default_font 1328 #font => default_font
1329 #text => initial text
1330 #markup => initial narkup
1331 #max_w => maximum pixel width
1332 ellipsise => 3, # end
1333 layout => (new CFClient::Layout),
1158 fontsize => 1, 1334 fontsize => 1,
1159 text => "",
1160 align => -1, 1335 align => -1,
1161 valign => -1, 1336 valign => -1,
1162 padding => 2, 1337 padding => 2,
1163 layout => new CFClient::Layout,
1164 can_events => 0, 1338 can_events => 0,
1165 %arg 1339 %arg
1166 ); 1340 );
1167 1341
1168 if (exists $self->{template}) { 1342 if (exists $self->{template}) {
1169 my $layout = new CFClient::Layout; 1343 my $layout = new CFClient::Layout;
1170 $layout->set_text (delete $self->{template}); 1344 $layout->set_text (delete $self->{template});
1171 $self->{template} = $layout; 1345 $self->{template} = $layout;
1172 } 1346 }
1173 1347
1174 $self->set_text (delete $self->{text}) if exists $self->{text}; 1348 if (exists $self->{markup}) {
1175 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1349 $self->set_markup (delete $self->{markup});
1350 } else {
1351 $self->set_text (delete $self->{text});
1352 }
1176 1353
1177 $self 1354 $self
1178} 1355}
1179 1356
1180sub escape { 1357sub escape($) {
1181 local $_ = $_[1]; 1358 local $_ = $_[0];
1182 1359
1183 s/&/&amp;/g; 1360 s/&/&amp;/g;
1184 s/>/&gt;/g; 1361 s/>/&gt;/g;
1185 s/</&lt;/g; 1362 s/</&lt;/g;
1186 1363
1187 $_[1] 1364 $_
1365}
1366
1367sub update {
1368 my ($self) = @_;
1369
1370 delete $self->{texture};
1371 $self->SUPER::update;
1188} 1372}
1189 1373
1190sub set_text { 1374sub set_text {
1191 my ($self, $text) = @_; 1375 my ($self, $text) = @_;
1192 1376
1377 return if $self->{text} eq "T$text";
1378 $self->{text} = "T$text";
1379
1380 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1193 $self->{layout}->set_text ($text); 1381 $self->{layout}->set_text ($text);
1194 1382
1195 delete $self->{texture}; 1383 $self->update;
1196 $self->check_size; 1384 $self->check_size;
1197 $self->update;
1198} 1385}
1199 1386
1200sub set_markup { 1387sub set_markup {
1201 my ($self, $markup) = @_; 1388 my ($self, $markup) = @_;
1202 1389
1390 return if $self->{text} eq "M$markup";
1391 $self->{text} = "M$markup";
1392
1393 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1394
1395 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1203 $self->{layout}->set_markup ($markup); 1396 $self->{layout}->set_markup ($markup);
1204 1397
1205 delete $self->{texture}; 1398 $self->update;
1206 $self->check_size; 1399 $self->check_size;
1207 $self->update;
1208} 1400}
1209 1401
1210sub size_request { 1402sub size_request {
1211 my ($self) = @_; 1403 my ($self) = @_;
1212 1404
1213 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1405 $self->{layout}->set_font ($self->{font}) if $self->{font};
1214 $self->{layout}->set_width ($self->{max_w} || -1); 1406 $self->{layout}->set_width ($self->{max_w} || -1);
1407 $self->{layout}->set_ellipsise ($self->{ellipsise});
1408 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1215 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1409 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1216 1410
1217 my ($w, $h) = $self->{layout}->size; 1411 my ($w, $h) = $self->{layout}->size;
1218 1412
1219 if (exists $self->{template}) { 1413 if (exists $self->{template}) {
… …
1241sub set_fontsize { 1435sub set_fontsize {
1242 my ($self, $fontsize) = @_; 1436 my ($self, $fontsize) = @_;
1243 1437
1244 $self->{fontsize} = $fontsize; 1438 $self->{fontsize} = $fontsize;
1245 delete $self->{texture}; 1439 delete $self->{texture};
1440
1441 $self->update;
1246 $self->check_size; 1442 $self->check_size;
1247 $self->update;
1248} 1443}
1249 1444
1250sub _draw { 1445sub _draw {
1251 my ($self) = @_; 1446 my ($self) = @_;
1252 1447
1448 $self->SUPER::_draw; # draw background, if applicable
1449
1253 my $tex = $self->{texture} ||= do { 1450 my $tex = $self->{texture} ||= do {
1451 $self->{layout}->set_foreground (@{$self->{fg}});
1254 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1452 $self->{layout}->set_font ($self->{font}) if $self->{font};
1255 $self->{layout}->set_width ($self->{w}); 1453 $self->{layout}->set_width ($self->{w});
1454 $self->{layout}->set_ellipsise ($self->{ellipsise});
1455 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1256 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1456 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1457
1257 new_from_layout CFClient::Texture $self->{layout} 1458 my $tex = new_from_layout CFClient::Texture $self->{layout};
1459
1460 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1461 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1462 : ($self->{w} - $tex->{w}) * 0.5);
1463
1464 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1465 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1466 : ($self->{h} - $tex->{h}) * 0.5);
1467
1468 $tex
1258 }; 1469 };
1259 1470
1260 glEnable GL_BLEND;
1261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1262 glEnable GL_TEXTURE_2D; 1471 glEnable GL_TEXTURE_2D;
1263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1264 1473
1474 if ($tex->{format} == GL_ALPHA) {
1265 glColor @{$self->{fg}}; 1475 glColor @{$self->{fg}};
1266
1267 $self->{ox} = int (
1268 $self->{align} < 0 ? $self->{padding}
1269 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1270 : ($self->{w} - $tex->{w}) * 0.5
1271 );
1272
1273 $self->{oy} = int (
1274 $self->{valign} < 0 ? $self->{padding}
1275 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1276 : ($self->{h} - $tex->{h}) * 0.5
1277 );
1278
1279 $tex->draw_quad ($self->{ox}, $self->{oy}); 1476 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1477 } else {
1478 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1479 }
1280 1480
1281 glDisable GL_TEXTURE_2D; 1481 glDisable GL_TEXTURE_2D;
1282 glDisable GL_BLEND;
1283} 1482}
1284 1483
1285############################################################################# 1484#############################################################################
1286 1485
1287package CFClient::UI::EntryBase; 1486package CFClient::UI::EntryBase;
… …
1300 active_fg => [0, 0, 0], 1499 active_fg => [0, 0, 0],
1301 can_hover => 1, 1500 can_hover => 1,
1302 can_focus => 1, 1501 can_focus => 1,
1303 valign => 0, 1502 valign => 0,
1304 can_events => 1, 1503 can_events => 1,
1504 #text => ...
1305 @_ 1505 @_
1306 ) 1506 )
1307} 1507}
1308 1508
1309sub _set_text { 1509sub _set_text {
… …
1320 1520
1321 $text =~ s/./*/g if $self->{hidden}; 1521 $text =~ s/./*/g if $self->{hidden};
1322 $self->{layout}->set_text ("$text "); 1522 $self->{layout}->set_text ("$text ");
1323 1523
1324 $self->emit (changed => $self->{text}); 1524 $self->emit (changed => $self->{text});
1325}
1326
1327sub get_text {
1328 $_[0]{text}
1329}
1330
1331sub size_request {
1332 my ($self) = @_;
1333
1334 my ($w, $h) = $self->SUPER::size_request;
1335
1336 ($w + 1, $h) # add 1 for cursor
1337}
1338
1339sub size_allocate {
1340 my ($self, $w, $h) = @_;
1341
1342 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1343} 1525}
1344 1526
1345sub set_text { 1527sub set_text {
1346 my ($self, $text) = @_; 1528 my ($self, $text) = @_;
1347 1529
1348 $self->{cursor} = length $text; 1530 $self->{cursor} = length $text;
1349 $self->_set_text ($text); 1531 $self->_set_text ($text);
1350 $self->update; 1532 $self->update;
1533 $self->check_size;
1534}
1535
1536sub get_text {
1537 $_[0]{text}
1538}
1539
1540sub size_request {
1541 my ($self) = @_;
1542
1543 my ($w, $h) = $self->SUPER::size_request;
1544
1545 ($w + 1, $h) # add 1 for cursor
1546}
1547
1548sub size_allocate {
1549 my ($self, $w, $h) = @_;
1550
1551 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1351} 1552}
1352 1553
1353sub key_down { 1554sub key_down {
1354 my ($self, $ev) = @_; 1555 my ($self, $ev) = @_;
1355 1556
… …
1357 my $sym = $ev->{sym}; 1558 my $sym = $ev->{sym};
1358 my $uni = $ev->{unicode}; 1559 my $uni = $ev->{unicode};
1359 1560
1360 my $text = $self->get_text; 1561 my $text = $self->get_text;
1361 1562
1362 if ($sym == 8) { 1563 if ($uni == 8) {
1363 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1564 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1364 } elsif ($sym == 127) { 1565 } elsif ($uni == 127) {
1365 substr $text, $self->{cursor}, 1, ""; 1566 substr $text, $self->{cursor}, 1, "";
1366 } elsif ($sym == CFClient::SDLK_LEFT) { 1567 } elsif ($sym == CFClient::SDLK_LEFT) {
1367 --$self->{cursor} if $self->{cursor}; 1568 --$self->{cursor} if $self->{cursor};
1368 } elsif ($sym == CFClient::SDLK_RIGHT) { 1569 } elsif ($sym == CFClient::SDLK_RIGHT) {
1369 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1570 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1370 } elsif ($sym == CFClient::SDLK_HOME) { 1571 } elsif ($sym == CFClient::SDLK_HOME) {
1371 $self->{cursor} = 0; 1572 $self->{cursor} = 0;
1372 } elsif ($sym == CFClient::SDLK_END) { 1573 } elsif ($sym == CFClient::SDLK_END) {
1373 $self->{cursor} = length $text; 1574 $self->{cursor} = length $text;
1374 } elsif ($sym == 27) { 1575 } elsif ($uni == 27) {
1375 $self->emit ('escape'); 1576 $self->emit ('escape');
1376 } elsif ($uni) { 1577 } elsif ($uni) {
1377 substr $text, $self->{cursor}++, 0, chr $uni; 1578 substr $text, $self->{cursor}++, 0, chr $uni;
1378 } 1579 }
1379 1580
1380 $self->_set_text ($text); 1581 $self->_set_text ($text);
1381 $self->update; 1582 $self->update;
1583 $self->check_size;
1382} 1584}
1383 1585
1384sub focus_in { 1586sub focus_in {
1385 my ($self) = @_; 1587 my ($self) = @_;
1386 1588
… …
1462 my ($self, $ev) = @_; 1664 my ($self, $ev) = @_;
1463 1665
1464 my $sym = $ev->{sym}; 1666 my $sym = $ev->{sym};
1465 1667
1466 if ($sym == 13) { 1668 if ($sym == 13) {
1669 unshift @{$self->{history}},
1670 my $txt = $self->get_text;
1671 $self->{history_pointer} = -1;
1672 $self->{history_saveback} = '';
1467 $self->emit (activate => $self->get_text); 1673 $self->emit (activate => $txt);
1468 $self->update; 1674 $self->update;
1675
1676 } elsif ($sym == CFClient::SDLK_UP) {
1677 if ($self->{history_pointer} < 0) {
1678 $self->{history_saveback} = $self->get_text;
1679 }
1680 if (@{$self->{history} || []} > 0) {
1681 $self->{history_pointer}++;
1682 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1683 $self->{history_pointer} = @{$self->{history} || []} - 1;
1684 }
1685 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1686 }
1687
1688 } elsif ($sym == CFClient::SDLK_DOWN) {
1689 $self->{history_pointer}--;
1690 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1691
1692 if ($self->{history_pointer} >= 0) {
1693 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1694 } else {
1695 $self->set_text ($self->{history_saveback});
1696 }
1469 1697
1470 } else { 1698 } else {
1471 $self->SUPER::key_down ($ev); 1699 $self->SUPER::key_down ($ev);
1472 } 1700 }
1473 1701
… …
1489 my $class = shift; 1717 my $class = shift;
1490 1718
1491 $class->SUPER::new ( 1719 $class->SUPER::new (
1492 padding => 4, 1720 padding => 4,
1493 fg => [1, 1, 1], 1721 fg => [1, 1, 1],
1494 bg => [1, 1, 1, 0.2],
1495 active_fg => [0, 0, 1], 1722 active_fg => [0, 0, 1],
1496 can_hover => 1, 1723 can_hover => 1,
1497 align => 0, 1724 align => 0,
1498 valign => 0, 1725 valign => 0,
1499 can_events => 1, 1726 can_events => 1,
… …
1517 1744
1518 if ($GRAB == $self) { 1745 if ($GRAB == $self) {
1519 $self->{fg} = $self->{active_fg}; 1746 $self->{fg} = $self->{active_fg};
1520 } 1747 }
1521 1748
1522 glEnable GL_BLEND;
1523 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1524 glEnable GL_TEXTURE_2D; 1749 glEnable GL_TEXTURE_2D;
1525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1526 glColor 0, 0, 0, 1; 1751 glColor 0, 0, 0, 1;
1527 1752
1528 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1753 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1529 1754
1530 glDisable GL_TEXTURE_2D; 1755 glDisable GL_TEXTURE_2D;
1531 glDisable GL_BLEND;
1532 1756
1533 $self->SUPER::_draw; 1757 $self->SUPER::_draw;
1534} 1758}
1535 1759
1536############################################################################# 1760#############################################################################
… …
1550 1774
1551 $class->SUPER::new ( 1775 $class->SUPER::new (
1552 padding => 2, 1776 padding => 2,
1553 fg => [1, 1, 1], 1777 fg => [1, 1, 1],
1554 active_fg => [1, 1, 0], 1778 active_fg => [1, 1, 0],
1779 bg => [0, 0, 0, 0.2],
1780 active_bg => [1, 1, 1, 0.5],
1555 state => 0, 1781 state => 0,
1556 can_hover => 1, 1782 can_hover => 1,
1557 @_ 1783 @_
1558 ) 1784 )
1559} 1785}
… …
1583 1809
1584 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1810 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1585 1811
1586 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1812 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1587 1813
1588 glEnable GL_BLEND; 1814 my $tex = $self->{state} ? $tex[1] : $tex[0];
1815
1589 glEnable GL_TEXTURE_2D; 1816 glEnable GL_TEXTURE_2D;
1590 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1591
1592 my $tex = $self->{state} ? $tex[1] : $tex[0];
1593
1594 $tex->draw_quad (0, 0, $s, $s); 1817 $tex->draw_quad_alpha (0, 0, $s, $s);
1595
1596 glDisable GL_TEXTURE_2D; 1818 glDisable GL_TEXTURE_2D;
1597 glDisable GL_BLEND;
1598} 1819}
1599 1820
1600############################################################################# 1821#############################################################################
1601 1822
1602package CFClient::UI::Image; 1823package CFClient::UI::Image;
… …
1645 glTranslate 0, -$self->{w}, 0; 1866 glTranslate 0, -$self->{w}, 0;
1646 1867
1647 ($w, $h) = ($h, $w); 1868 ($w, $h) = ($h, $w);
1648 } 1869 }
1649 1870
1650 glEnable GL_BLEND;
1651 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1652 glEnable GL_TEXTURE_2D; 1871 glEnable GL_TEXTURE_2D;
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1872 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1654 1873
1655 $tex->draw_quad (0, 0, $w, $h); 1874 $tex->draw_quad_alpha (0, 0, $w, $h);
1656 1875
1657 glDisable GL_BLEND;
1658 glDisable GL_TEXTURE_2D; 1876 glDisable GL_TEXTURE_2D;
1659} 1877}
1660 1878
1661############################################################################# 1879#############################################################################
1662 1880
… …
1710} 1928}
1711 1929
1712sub set_max { 1930sub set_max {
1713 my ($self, $max) = @_; 1931 my ($self, $max) = @_;
1714 1932
1933 return if $self->{max_val} == $max;
1934
1715 $self->{max_val} = $max; 1935 $self->{max_val} = $max;
1936 $self->update;
1716} 1937}
1717 1938
1718sub set_value { 1939sub set_value {
1719 my ($self, $val, $max) = @_; 1940 my ($self, $val, $max) = @_;
1720 1941
1721 $self->set_max ($max) 1942 $self->set_max ($max)
1722 if defined $max; 1943 if defined $max;
1723 1944
1724 $max = $self->{max_val}; 1945 return if $self->{val} == $val;
1946
1725 $self->{val} = $val; 1947 $self->{val} = $val;
1726
1727 $self->update; 1948 $self->update;
1728} 1949}
1729 1950
1730sub _draw { 1951sub _draw {
1731 my ($self) = @_; 1952 my ($self) = @_;
… …
1794 2015
1795sub new { 2016sub new {
1796 my ($class, %arg) = @_; 2017 my ($class, %arg) = @_;
1797 2018
1798 my $self = $class->SUPER::new ( 2019 my $self = $class->SUPER::new (
1799 tooltip => $arg{type}, 2020 tooltip => $arg{type},
1800 can_hover => 1, 2021 can_hover => 1,
2022 can_events => 1,
1801 %arg, 2023 %arg,
1802 ); 2024 );
1803 2025
1804 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2026 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1805 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2027 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1813 2035
1814 $self->{value}->set_fontsize ($fsize); 2036 $self->{value}->set_fontsize ($fsize);
1815 $self->{max} ->set_fontsize ($fsize); 2037 $self->{max} ->set_fontsize ($fsize);
1816} 2038}
1817 2039
2040sub set_max {
2041 my ($self, $max) = @_;
2042
2043 $self->{gauge}->set_max ($max);
2044 $self->{max}->set_text ($max);
2045}
2046
1818sub set_value { 2047sub set_value {
1819 my ($self, $val, $max) = @_; 2048 my ($self, $val, $max) = @_;
1820 2049
1821 $self->set_max ($max) 2050 $self->set_max ($max)
1822 if defined $max; 2051 if defined $max;
1823 2052
1824 $self->{gauge}->set_value ($val, $max); 2053 $self->{gauge}->set_value ($val, $max);
1825 $self->{value}->set_text ($val); 2054 $self->{value}->set_text ($val);
1826}
1827
1828sub set_max {
1829 my ($self, $max) = @_;
1830
1831 $self->{gauge}->set_max ($max);
1832 $self->{max}->set_text ($max);
1833} 2055}
1834 2056
1835############################################################################# 2057#############################################################################
1836 2058
1837package CFClient::UI::Slider; 2059package CFClient::UI::Slider;
… …
1847 qw(s1_slider.png s1_slider_bg.png); 2069 qw(s1_slider.png s1_slider_bg.png);
1848 2070
1849sub new { 2071sub new {
1850 my $class = shift; 2072 my $class = shift;
1851 2073
1852 # range [value, low, high, page] 2074 # range [value, low, high, page, unit]
1853 2075
1854 # TODO: 0-width page 2076 # TODO: 0-width page
1855 # TODO: req_w/h are wrong with vertical 2077 # TODO: req_w/h are wrong with vertical
1856 # TODO: calculations are off 2078 # TODO: calculations are off
1857 my $self = $class->SUPER::new ( 2079 my $self = $class->SUPER::new (
1858 fg => [1, 1, 1], 2080 fg => [1, 1, 1],
1859 active_fg => [0, 0, 0], 2081 active_fg => [0, 0, 0],
2082 bg => [0, 0, 0, 0.2],
2083 active_bg => [1, 1, 1, 0.5],
1860 range => [0, 0, 100, 10], 2084 range => [0, 0, 100, 10, 0],
1861 req_w => 20, 2085 req_w => $::WIDTH / 80,
1862 req_h => 20, 2086 req_h => $::WIDTH / 80,
1863 vertical => 0, 2087 vertical => 0,
1864 can_hover => 1, 2088 can_hover => 1,
1865 inner_pad => 5, 2089 inner_pad => 0.02,
1866 @_ 2090 @_
1867 ); 2091 );
1868 2092
2093 $self->set_value ($self->{range}[0]);
2094 $self->update;
2095
1869 $self 2096 $self
2097}
2098
2099sub set_range {
2100 my ($self, $range) = @_;
2101
2102 $self->{range} = $range;
2103
2104 $self->update;
2105}
2106
2107sub set_value {
2108 my ($self, $value) = @_;
2109
2110 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2111
2112 $hi = $lo + 1 if $hi <= $lo;
2113
2114 $page = $hi - $lo if $page > $hi - $lo;
2115
2116 $value = $lo if $value < $lo;
2117 $value = $hi - $page if $value > $hi - $page;
2118
2119 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2120 if $unit;
2121
2122 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2123
2124 if ($value != $old_value) {
2125 $self->emit (changed => $value);
2126 $self->update;
2127 }
1870} 2128}
1871 2129
1872sub size_request { 2130sub size_request {
1873 my ($self) = @_; 2131 my ($self) = @_;
1874 2132
… …
1880 2138
1881sub button_down { 2139sub button_down {
1882 my ($self, $ev, $x, $y) = @_; 2140 my ($self, $ev, $x, $y) = @_;
1883 2141
1884 $self->SUPER::button_down ($ev, $x, $y); 2142 $self->SUPER::button_down ($ev, $x, $y);
2143
2144 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2145
1885 $self->mouse_motion ($ev, $x, $y); 2146 $self->mouse_motion ($ev, $x, $y);
1886} 2147}
1887 2148
1888sub mouse_motion { 2149sub mouse_motion {
1889 my ($self, $ev, $x, $y) = @_; 2150 my ($self, $ev, $x, $y) = @_;
1890 2151
1891 if ($GRAB == $self) { 2152 if ($GRAB == $self) {
2153 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2154
2155 my (undef, $lo, $hi, $page) = @{$self->{range}};
2156
2157 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2158
2159 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2160 }
2161}
2162
2163sub update {
2164 my ($self) = @_;
2165
2166 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2167 $self->set_value ($self->{range}[0]);
2168
1892 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2169 my ($value, $lo, $hi, $page) = @{$self->{range}};
2170 my $range = ($hi - $page - $lo) || 1e-100;
1893 2171
1894 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2172 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1895 2173
1896 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2174 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1897 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2175 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1898 2176
1899 $x -= $inner_pad_px; # substract the padding 2177 $value = ($value - $lo) / $range;
1900 $x = $x * ($hi - $lo) / $inner_w + $lo; 2178 $value = $value * $self->{scale} + $self->{offset};
1901 $x = $lo if $x < $lo;
1902 $x = $hi - $page if $x > $hi - $page;
1903 $self->{range}[0] = $x;
1904 2179
1905 $self->emit (changed => $x); 2180 $self->{knob_x} = $value - $knob_w * 0.5;
1906 $self->update; 2181 $self->{knob_w} = $knob_w;
1907 } 2182 });
1908}
1909 2183
1910# the inner_* stuff is for generating a padding for the slider handle, 2184 $self->SUPER::update;
1911# so that the handle doesn't leave the texture. This calculation isn't 100%
1912# correct propably, but it does the job for now
1913sub _calc_inner_pad_px {
1914 my ($self, $w) = @_;
1915 ($w / 100) * $self->{inner_pad} # % to pixels
1916} 2185}
1917 2186
1918sub _draw { 2187sub _draw {
1919 my ($self) = @_; 2188 my ($self) = @_;
1920 2189
1921 $self->SUPER::_draw (); 2190 $self->SUPER::_draw ();
1922 2191
1923 my ($w, $h) = @$self{qw(w h)}; 2192 glScale $self->{w}, $self->{h};
1924 2193
1925 if ($self->{vertical}) { 2194 if ($self->{vertical}) {
1926 # draw a vertical slider like a rotated horizontal slider 2195 # draw a vertical slider like a rotated horizontal slider
1927 2196
2197 glTranslate 1, 0, 0;
1928 glRotate 90, 0, 0, 1; 2198 glRotate 90, 0, 0, 1;
1929 glTranslate 0, -$self->{w}, 0;
1930
1931 ($w, $h) = ($h, $w);
1932 } 2199 }
1933 2200
1934 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2201 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1935 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2202 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1936 2203
1937 my ($value, $lo, $hi, $page) = @{$self->{range}};
1938
1939 $hi = $value + 1 if $lo == $hi;
1940
1941 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1942 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1943
1944 $page = int $page * $inner_w / ($hi - $lo);
1945 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1946
1947 $w -= $page;
1948 $page &= ~1;
1949 glTranslate $page * 0.5, 0, 0;
1950 $page ||= 2;
1951
1952 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1953 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1954
1955 glEnable GL_BLEND;
1956 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1957 glEnable GL_TEXTURE_2D; 2204 glEnable GL_TEXTURE_2D;
1958 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2205 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1959 2206
1960 # draw background 2207 # draw background
1961 $tex[1]->draw_quad (0, 0, $w, $h); 2208 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1962 2209
1963 # draw handle 2210 # draw handle
1964 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2211 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1965 2212
1966 glDisable GL_BLEND;
1967 glDisable GL_TEXTURE_2D; 2213 glDisable GL_TEXTURE_2D;
1968} 2214}
2215
2216#############################################################################
2217
2218package CFClient::UI::ValSlider;
2219
2220our @ISA = CFClient::UI::HBox::;
2221
2222sub new {
2223 my ($class, %arg) = @_;
2224
2225 my $range = delete $arg{range};
2226
2227 my $self = $class->SUPER::new (
2228 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2229 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2230 to_value => sub { shift },
2231 from_value => sub { shift },
2232 %arg,
2233 );
2234
2235 $self->{slider}->connect (changed => sub {
2236 my ($self, $value) = @_;
2237 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2238 $self->{parent}->emit (changed => $value);
2239 });
2240
2241# $self->{entry}->connect (changed => sub {
2242# my ($self, $value) = @_;
2243# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2244# $self->{parent}->emit (changed => $value);
2245# });
2246
2247 $self->add ($self->{slider}, $self->{entry});
2248
2249 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2250
2251 $self
2252}
2253
2254sub set_range { shift->{slider}->set_range (@_) }
2255sub set_value { shift->{slider}->set_value (@_) }
1969 2256
1970############################################################################# 2257#############################################################################
1971 2258
1972package CFClient::UI::TextView; 2259package CFClient::UI::TextView;
1973 2260
… …
1982 fontsize => 1, 2269 fontsize => 1,
1983 can_events => 0, 2270 can_events => 0,
1984 #font => default_font 2271 #font => default_font
1985 @_, 2272 @_,
1986 2273
1987 layout => (new CFClient::Layout), 2274 layout => (new CFClient::Layout 1),
1988 par => [], 2275 par => [],
1989 height => 0, 2276 height => 0,
1990 children => [ 2277 children => [
1991 (new CFClient::UI::Empty expand => 1), 2278 (new CFClient::UI::Empty expand => 1),
1992 (new CFClient::UI::Slider vertical => 1), 2279 (new CFClient::UI::Slider vertical => 1),
1993 ], 2280 ],
1994 ); 2281 );
1995 2282
1996 $self->{children}[1]->connect (changed => sub { 2283 $self->{children}[1]->connect (changed => sub { $self->update });
1997 $self->update;
1998 });
1999 2284
2000 $self 2285 $self
2001} 2286}
2002 2287
2003sub set_fontsize { 2288sub set_fontsize {
2004 my ($self, $fontsize) = @_; 2289 my ($self, $fontsize) = @_;
2005 2290
2006 $self->{fontsize} = $fontsize; 2291 $self->{fontsize} = $fontsize;
2007 $self->reflow; 2292 $self->reflow;
2008}
2009
2010sub text_height {
2011 my ($self, $text) = @_;
2012
2013 my $layout = $self->{layout};
2014
2015 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2016 $layout->set_width ($self->{w});
2017 $layout->set_text ($text);
2018
2019 ($layout->size)[1]
2020}
2021
2022sub reflow {
2023 my ($self) = @_;
2024
2025 $self->{need_reflow}++;
2026 $self->update;
2027} 2293}
2028 2294
2029sub size_allocate { 2295sub size_allocate {
2030 my ($self, $w, $h) = @_; 2296 my ($self, $w, $h) = @_;
2031 2297
… …
2036 $self->{layout}->set_width ($self->{children}[0]{w}); 2302 $self->{layout}->set_width ($self->{children}[0]{w});
2037 2303
2038 $self->reflow; 2304 $self->reflow;
2039} 2305}
2040 2306
2307sub text_size {
2308 my ($self, $text, $indent) = @_;
2309
2310 my $layout = $self->{layout};
2311
2312 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2313 $layout->set_width ($self->{children}[0]{w} - $indent);
2314 $layout->set_markup ($text);
2315
2316 $layout->size
2317}
2318
2319sub reflow {
2320 my ($self) = @_;
2321
2322 $self->{need_reflow}++;
2323 $self->update;
2324}
2325
2326sub set_offset {
2327 my ($self, $offset) = @_;
2328
2329 # todo: base offset on lines or so, not on pixels
2330 $self->{children}[1]->set_value ($offset);
2331}
2332
2333sub clear {
2334 my ($self) = @_;
2335
2336 $self->{par} = [];
2337 $self->{height} = 0;
2338 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2339}
2340
2041sub add_paragraph { 2341sub add_paragraph {
2042 my ($self, $color, $text) = @_; 2342 my ($self, $color, $text, $indent) = @_;
2043 2343
2044 #TODO: intelligently "reformat" paragraph 2344 for my $line (split /\n/, $text) {
2045 2345 my ($w, $h) = $self->text_size ($line);
2046 my $height = $self->text_height ($text);
2047
2048 $self->{height} += $height; 2346 $self->{height} += $h;
2347 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2348 }
2049 2349
2050 push @{$self->{par}}, [$height, $color, $text];
2051
2052 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2350 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2053 $self->{children}[1]->update;
2054} 2351}
2055 2352
2056sub update { 2353sub update {
2057 my ($self) = @_; 2354 my ($self) = @_;
2058 2355
… …
2060 2357
2061 return unless $self->{h} > 0; 2358 return unless $self->{h} > 0;
2062 2359
2063 delete $self->{texture}; 2360 delete $self->{texture};
2064 2361
2065 $ROOT->on_refresh ($self, sub { 2362 $ROOT->on_post_alloc ($self, sub {
2363 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2364
2066 if (delete $self->{need_reflow}) { 2365 if (delete $self->{need_reflow}) {
2067 my $height = 0; 2366 my $height = 0;
2068 2367
2069 $height += $_->[0] = $self->text_height ($_->[2]) 2368 my $layout = $self->{layout};
2369
2370 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2371
2070 for @{$self->{par}}; 2372 for (@{$self->{par}}) {
2373 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2374 $layout->set_width ($W - $_->[3]);
2375 $layout->set_markup ($_->[4]);
2376 my ($w, $h) = $layout->size;
2377 $_->[0] = $w + $_->[3];
2378 $_->[1] = $h;
2379 }
2380
2381 $height += $_->[1];
2382 }
2071 2383
2072 $self->{height} = $height; 2384 $self->{height} = $height;
2073 2385
2074 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2386 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2075 2387
2076 delete $self->{texture}; 2388 delete $self->{texture};
2077 } 2389 }
2078 2390
2079 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2391 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2080 glClearColor 0, 0, 0, 1; 2392 glClearColor 0.5, 0.5, 0.5, 0;
2081 glClear GL_COLOR_BUFFER_BIT; 2393 glClear GL_COLOR_BUFFER_BIT;
2082 2394
2395 my $top = int $self->{children}[1]{range}[0];
2396
2397 my $y0 = $top;
2398 my $y1 = $top + $H;
2399
2400 my $y = 0;
2401
2402 my $layout = $self->{layout};
2403
2404 $layout->set_font ($self->{font}) if $self->{font};
2405
2083 glEnable GL_BLEND; 2406 glEnable GL_BLEND;
2407 #TODO# not correct in windows where rgba is forced off
2084 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2408 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2085 glEnable GL_TEXTURE_2D;
2086 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2087
2088 my $top = int $self->{children}[1]{range}[0];
2089
2090 my $y0 = $top;
2091 my $y1 = $top + $self->{h};
2092
2093 my $y = 0;
2094
2095 my $layout = $self->{layout};
2096
2097 $layout->set_font ($self->{font}) if $self->{font};
2098 2409
2099 for my $par (@{$self->{par}}) { 2410 for my $par (@{$self->{par}}) {
2100 my $h = $par->[0]; 2411 my $h = $par->[1];
2101 2412
2102 if ($y0 < $y + $h && $y < $y1) { 2413 if ($y0 < $y + $h && $y < $y1) {
2414 $layout->set_foreground (@{ $par->[2] });
2415 $layout->set_width ($W - $par->[3]);
2103 $layout->set_text ($par->[2]); 2416 $layout->set_markup ($par->[4]);
2104 2417
2105 glColor @{ $par->[1] }; 2418 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2106 my ($W, $H) = $layout->size; 2419
2107 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2420 glRasterPos $par->[3], $y - $y0;
2421 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2108 } 2422 }
2109 2423
2110 $y += $h; 2424 $y += $h;
2111 } 2425 }
2112 2426
2113 glDisable GL_TEXTURE_2D;
2114 glDisable GL_BLEND; 2427 glDisable GL_BLEND;
2115 }; 2428 };
2116 }); 2429 });
2117} 2430}
2118 2431
2119sub _draw { 2432sub _draw {
2120 my ($self) = @_; 2433 my ($self) = @_;
2121 2434
2122 if ($self->{texture}) {
2123 glEnable GL_TEXTURE_2D; 2435 glEnable GL_TEXTURE_2D;
2124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2437 glColor 1, 1, 1, 1;
2125 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2438 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2126 glDisable GL_TEXTURE_2D; 2439 glDisable GL_TEXTURE_2D;
2127 }
2128 2440
2129 $self->{children}[1]->draw; 2441 $self->{children}[1]->draw;
2130 2442
2131} 2443}
2132 2444
… …
2226 @_, 2538 @_,
2227 can_events => 0, 2539 can_events => 0,
2228 ) 2540 )
2229} 2541}
2230 2542
2231sub set_markup { 2543sub set_tooltip_from {
2232 my ($self, $text) = @_; 2544 my ($self, $widget) = @_;
2233 2545
2234 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2546 $self->add (new CFClient::UI::Label
2235 $self->{label}->set_markup ($text); 2547 markup => $widget->{tooltip},
2236 $self->add ($self->{label}); 2548 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2549 fontsize => 0.8,
2550 fg => [0, 0, 0, 1],
2551 ellipsise => 0,
2552 font => ($widget->{tooltip_font} || $::FONT_PROP),
2553 );
2237} 2554}
2238 2555
2239sub size_request { 2556sub size_request {
2240 my ($self) = @_; 2557 my ($self) = @_;
2241
2242 $self->child->set_max_size ($::WIDTH * 0.3);
2243 2558
2244 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2559 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2245 2560
2246 ($w + 4, $h + 4) 2561 ($w + 4, $h + 4)
2247} 2562}
… …
2253} 2568}
2254 2569
2255sub _draw { 2570sub _draw {
2256 my ($self) = @_; 2571 my ($self) = @_;
2257 2572
2258 glPushMatrix;
2259 glTranslate 0.375, 0.375; 2573 glTranslate 0.375, 0.375;
2260 2574
2261 my ($w, $h) = @$self{qw(w h)}; 2575 my ($w, $h) = @$self{qw(w h)};
2262 2576
2263 glColor 1, 0.8, 0.4; 2577 glColor 1, 0.8, 0.4;
… …
2274 glVertex 0 , $h; 2588 glVertex 0 , $h;
2275 glVertex $w, $h; 2589 glVertex $w, $h;
2276 glVertex $w, 0; 2590 glVertex $w, 0;
2277 glEnd; 2591 glEnd;
2278 2592
2279 glPopMatrix; 2593 glTranslate 2 - 0.375, 2 - 0.375;
2280
2281 glTranslate 2, 2;
2282 $self->SUPER::_draw; 2594 $self->SUPER::_draw;
2283} 2595}
2284 2596
2285############################################################################# 2597#############################################################################
2286 2598
… …
2291use CFClient::OpenGL; 2603use CFClient::OpenGL;
2292 2604
2293sub new { 2605sub new {
2294 my $class = shift; 2606 my $class = shift;
2295 2607
2296 $class->SUPER::new ( 2608 my $self = $class->SUPER::new (
2297 aspect => 1, 2609 aspect => 1,
2298 @_, 2610 @_,
2299 ) 2611 );
2612
2613 if ($self->{anim} && $self->{animspeed}) {
2614 Scalar::Util::weaken (my $widget = $self);
2615
2616 $self->{timer} = Event->timer (
2617 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2618 hard => 1,
2619 interval => $self->{animspeed},
2620 cb => sub {
2621 ++$widget->{frame};
2622 $widget->update;
2623 },
2624 );
2625 }
2626
2627 $self
2300} 2628}
2301 2629
2302sub size_request { 2630sub size_request {
2303 (32, 8) 2631 (32, 8)
2304} 2632}
2305 2633
2634sub update {
2635 my ($self) = @_;
2636
2637 return unless $self->{visible};
2638
2639 $self->SUPER::update;
2640}
2641
2306sub draw { 2642sub _draw {
2307 my ($self) = @_; 2643 my ($self) = @_;
2308 2644
2645 return unless $::CONN;
2646
2647 my $face;
2648
2649 if ($self->{frame}) {
2650 my $anim = $::CONN->{anim}[$self->{anim}];
2651
2652 $face = $anim->[ $self->{frame} % @$anim ]
2653 if $anim && @$anim;
2654 }
2655
2309 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2656 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2310 2657
2311 if ($tex) { 2658 if ($tex) {
2312 glEnable GL_BLEND;
2313 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2314 glEnable GL_TEXTURE_2D; 2659 glEnable GL_TEXTURE_2D;
2315 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2316 glColor 1, 1, 1, 1; 2661 glColor 1, 1, 1, 1;
2317 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2662 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2318 glDisable GL_TEXTURE_2D; 2663 glDisable GL_TEXTURE_2D;
2319 glDisable GL_BLEND;
2320 } 2664 }
2665}
2666
2667sub DESTROY {
2668 my ($self) = @_;
2669
2670 $self->{timer}->cancel
2671 if $self->{timer};
2672
2673 $self->SUPER::DESTROY;
2321} 2674}
2322 2675
2323############################################################################# 2676#############################################################################
2324 2677
2678package CFClient::UI::InventoryItem;
2679
2680our @ISA = CFClient::UI::HBox::;
2681
2682sub _item_to_desc {
2683 my ($item) = @_;
2684
2685 my $desc =
2686 $item->{nrof} < 2
2687 ? $item->{name}
2688 : "$item->{nrof} × $item->{name_pl}";
2689
2690 $item->{flags} & Crossfire::Protocol::F_OPEN
2691 and $desc .= " (open)";
2692 $item->{flags} & Crossfire::Protocol::F_APPLIED
2693 and $desc .= " (applied)";
2694 $item->{flags} & Crossfire::Protocol::F_UNPAID
2695 and $desc .= " (unpaid)";
2696 $item->{flags} & Crossfire::Protocol::F_MAGIC
2697 and $desc .= " (magic)";
2698 $item->{flags} & Crossfire::Protocol::F_CURSED
2699 and $desc .= " (cursed)";
2700 $item->{flags} & Crossfire::Protocol::F_DAMNED
2701 and $desc .= " (damned)";
2702 $item->{flags} & Crossfire::Protocol::F_LOCKED
2703 and $desc .= " *";
2704
2705 $desc
2706}
2707
2708sub new {
2709 my $class = shift;
2710
2711 my %args = @_;
2712
2713 my $item = delete $args{item};
2714
2715 my $desc = _item_to_desc ($item);
2716
2717 my $self = $class->SUPER::new (
2718 can_hover => 1,
2719 can_events => 1,
2720 tooltip => ((CFClient::UI::Label::escape $desc)
2721 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2722 connect_button_down => sub {
2723 my ($self, $ev, $x, $y) = @_;
2724
2725 # todo: maybe put examine on 1? but should just be a tooltip :(
2726 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2727 my $targ = $::CONN->{player}{tag};
2728
2729 if ($item->{container} == $::CONN->{player}{tag}) {
2730 $targ = $main::OPENCONT;
2731 }
2732
2733 $::CONN->send ("move $targ $item->{tag} 0");
2734 } elsif ($ev->{button} == 1) {
2735 $::CONN->send ("examine $item->{tag}");
2736 } elsif ($ev->{button} == 2) {
2737 $::CONN->send ("apply $item->{tag}");
2738 } elsif ($ev->{button} == 3) {
2739 my @menu_items = (
2740 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2741 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2742 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2743 (
2744 $item->{flags} & Crossfire::Protocol::F_LOCKED
2745 ? (
2746 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2747 )
2748 : (
2749 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2750 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2751 )
2752 ),
2753 );
2754
2755 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2756 }
2757
2758 1
2759 },
2760 %args
2761 );
2762
2763
2764 $self->add (new CFClient::UI::Face
2765 can_events => 0,
2766 face => $item->{face},
2767 anim => $item->{anim},
2768 animspeed => $item->{animspeed},
2769 );
2770
2771 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2772
2773 $self->{item} = $item;
2774
2775 $self->update_item;
2776
2777 $self
2778}
2779
2780sub update_item {
2781 my ($self) = @_;
2782
2783 my $desc = _item_to_desc ($self->{item});
2784
2785 $self->{name_lbl}->set_text ($desc);
2786}
2787
2788#############################################################################
2789
2790package CFClient::UI::Inventory;
2791
2792our @ISA = CFClient::UI::ScrolledWindow::;
2793
2794sub new {
2795 my $class = shift;
2796
2797 my $self = $class->SUPER::new (
2798 scrolled => (new CFClient::UI::Table),
2799 @_,
2800 );
2801
2802 $self
2803}
2804
2805sub set_items {
2806 my ($self, $items) = @_;
2807
2808 $self->{scrolled}->clear;
2809 return unless $items;
2810
2811 my @items = sort {
2812 ($a->{type} <=> $b->{type})
2813 or ($a->{name} cmp $b->{name})
2814 } @$items;
2815
2816 $self->{real_items} = \@items;
2817
2818 for my $item (@items) {
2819 $item->{item} = $item;
2820 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2821 $item->update_item ();
2822 }
2823
2824 my $i = 0;
2825 for (@items) {
2826 $self->{scrolled}->add (0, $i, $_);
2827 my $nrof = $_->{item}->{nrof} || 1;
2828 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2829 }
2830
2831# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2832}
2833
2834sub size_request {
2835 my ($self) = @_;
2836 ($self->{req_w}, $self->{req_h});
2837}
2838
2839#############################################################################
2840
2841package CFClient::UI::Menu;
2842
2843our @ISA = CFClient::UI::FancyFrame::;
2844
2845use CFClient::OpenGL;
2846
2847sub new {
2848 my $class = shift;
2849
2850 my $self = $class->SUPER::new (
2851 items => [],
2852 z => 100,
2853 @_,
2854 );
2855
2856 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2857
2858 for my $item (@{ $self->{items} }) {
2859 my ($widget, $cb) = @$item;
2860
2861 # handle various types of items, only text for now
2862 if (!ref $widget) {
2863 $widget = new CFClient::UI::Label
2864 can_hover => 1,
2865 can_events => 1,
2866 text => $widget;
2867 }
2868
2869 $self->{item}{$widget} = $item;
2870
2871 $self->{vbox}->add ($widget);
2872 }
2873
2874 $self
2875}
2876
2877# popup given the event (must be a mouse button down event currently)
2878sub popup {
2879 my ($self, $ev) = @_;
2880
2881 $self->emit ("popdown");
2882
2883 # maybe save $GRAB? must be careful about events...
2884 $GRAB = $self;
2885 $self->{button} = $ev->{button};
2886
2887 $self->show;
2888 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2889}
2890
2891sub mouse_motion {
2892 my ($self, $ev, $x, $y) = @_;
2893
2894 # TODO: should use vbox->find_widget or so
2895 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2896 $self->{hover} = $self->{item}{$HOVER};
2897}
2898
2899sub button_up {
2900 my ($self, $ev, $x, $y) = @_;
2901
2902 if ($ev->{button} == $self->{button}) {
2903 undef $GRAB;
2904 $self->hide;
2905
2906 $self->emit ("popdown");
2907 $self->{hover}[1]->() if $self->{hover};
2908 }
2909}
2910
2911#############################################################################
2912
2913package CFClient::UI::Statusbox;
2914
2915our @ISA = CFClient::UI::VBox::;
2916
2917sub new {
2918 my $class = shift;
2919
2920 $class->SUPER::new (
2921 fontsize => 0.8,
2922 @_,
2923 )
2924}
2925
2926sub reorder {
2927 my ($self) = @_;
2928 my $NOW = time;
2929
2930 while (my ($k, $v) = each %{ $self->{item} }) {
2931 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2932 }
2933
2934 my @widgets;
2935
2936 my @items = sort {
2937 $a->{pri} <=> $b->{pri}
2938 or $b->{id} <=> $a->{id}
2939 } values %{ $self->{item} };
2940
2941 my $count = 10 + 1;
2942 for my $item (@items) {
2943 last unless --$count;
2944
2945 push @widgets, $item->{label} ||= do {
2946 # TODO: doesn't handle markup well (read as: at all)
2947 my $short = $item->{count} > 1
2948 ? "<b>$item->{count} ×</b> $item->{text}"
2949 : $item->{text};
2950
2951 for ($short) {
2952 s/^\s+//;
2953 s/\s+/ /g;
2954 }
2955
2956 new CFClient::UI::Label
2957 markup => $short,
2958 tooltip => $item->{tooltip},
2959 tooltip_font => $::FONT_PROP,
2960 tooltip_width => 0.67,
2961 fontsize => $item->{fontsize} || $self->{fontsize},
2962 max_w => $::WIDTH * 0.44,
2963 fg => $item->{fg},
2964 can_events => 1,
2965 can_hover => 1
2966 };
2967 }
2968
2969 $self->clear;
2970 $self->SUPER::add (reverse @widgets);
2971}
2972
2973sub add {
2974 my ($self, $text, %arg) = @_;
2975
2976 $text =~ s/^\s+//;
2977 $text =~ s/\s+$//;
2978
2979 my $timeout = time + ((delete $arg{timeout}) || 60);
2980
2981 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2982
2983 if (my $item = $self->{item}{$group}) {
2984 if ($item->{text} eq $text) {
2985 $item->{count}++;
2986 } else {
2987 $item->{count} = 1;
2988 $item->{text} = $item->{tooltip} = $text;
2989 }
2990 $item->{id} = ++$self->{id};
2991 $item->{timeout} = $timeout;
2992 delete $item->{label};
2993 } else {
2994 $self->{item}{$group} = {
2995 id => ++$self->{id},
2996 text => $text,
2997 timeout => $timeout,
2998 tooltip => $text,
2999 fg => [0.8, 0.8, 0.8, 0.8],
3000 pri => 0,
3001 count => 1,
3002 %arg,
3003 };
3004 }
3005
3006 $self->reorder;
3007}
3008
3009sub reconfigure {
3010 my ($self) = @_;
3011
3012 delete $_->{label}
3013 for values %{ $self->{item} || {} };
3014
3015 $self->reorder;
3016 $self->SUPER::reconfigure;
3017}
3018
3019#############################################################################
3020
2325package CFClient::UI::Root; 3021package CFClient::UI::Root;
2326 3022
2327our @ISA = CFClient::UI::Container::; 3023our @ISA = CFClient::UI::Container::;
2328 3024
2329use CFClient::OpenGL; 3025use CFClient::OpenGL;
2330 3026
2331sub check_size { 3027sub new {
2332 my ($self) = @_; 3028 my $class = shift;
2333 3029
2334 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3030 $class->SUPER::new (
2335} 3031 @_,
2336 3032 )
2337sub size_request {
2338 ($::WIDTH, $::HEIGHT)
2339} 3033}
2340 3034
2341sub configure { 3035sub configure {
2342 my ($self, $x, $y, $w, $h) = @_; 3036 my ($self, $x, $y, $w, $h) = @_;
2343 3037
2344 $self->SUPER::configure ($x, $y, $w, $h); 3038 $self->{w} = $w;
3039 $self->{h} = $h;
3040}
2345 3041
3042sub check_size {
3043 my ($self) = @_;
3044
3045 $self->size_allocate ($self->{w}, $self->{h})
3046 if $self->{w};
3047}
3048
3049sub size_request {
3050 my ($self) = @_;
3051
3052 ($self->{w}, $self->{h})
3053}
3054
3055sub size_allocate {
3056 my ($self, $w, $h) = @_;
3057
3058 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3059 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3060
3061 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3062 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3063
2346 for my $child (@{$self->{children}}) { 3064 for my $child ($self->children) {
2347 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3065 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2348 3066
3067 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3068 if exists $child->{req_x};
3069
3070 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3071 if exists $child->{req_y};
3072
2349 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3073 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2350 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3074 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3075
2351 $child->configure ($X, $Y, $W,$H); 3076 $child->configure ($X, $Y, $W, $H);
2352 } 3077 }
2353} 3078}
2354 3079
2355sub _topleft { 3080sub coord2local {
2356 my ($self, $x, $y) = @_; 3081 my ($self, $x, $y) = @_;
2357 3082
2358 ($x, $y) 3083 ($x, $y)
2359} 3084}
2360 3085
3086sub coord2global {
3087 my ($self, $x, $y) = @_;
3088
3089 ($x, $y)
3090}
3091
2361sub update { 3092sub update {
2362 my ($self) = @_; 3093 my ($self) = @_;
2363 3094
2364 $self->check_size; 3095 $self->check_size;
2365 ::refresh (); 3096 $::WANT_REFRESH++;
2366} 3097}
2367 3098
2368sub add { 3099sub add {
2369 my ($self, $child) = @_; 3100 my ($self, @children) = @_;
2370 3101
3102 for (my @widgets = @children; my $w = pop @widgets; ) {
3103 push @widgets, $w->children;
3104 $w->{root} = $self;
3105 $w->{visible} = 1;
3106 }
3107
3108 for my $child (@children) {
3109 $child->{toplevel} = 1;
3110
2371 # integerize window positions 3111 # integerise window positions
2372 $child->{x} = int $child->{x}; 3112 $child->{x} = int $child->{x};
2373 $child->{y} = int $child->{y}; 3113 $child->{y} = int $child->{y};
3114 }
2374 3115
2375 $self->SUPER::add ($child); 3116 $self->SUPER::add (@children);
3117}
3118
3119sub remove {
3120 my ($self, @children) = @_;
3121
3122 $self->SUPER::remove (@children);
3123
3124 while (@children) {
3125 my $w = pop @children;
3126 push @children, $w->children;
3127 delete $w->{visible};
3128 }
2376} 3129}
2377 3130
2378sub on_refresh { 3131sub on_refresh {
2379 my ($self, $id, $cb) = @_; 3132 my ($self, $id, $cb) = @_;
2380 3133
2381 $self->{refresh_hook}{$id} = $cb; 3134 $self->{refresh_hook}{$id} = $cb;
2382} 3135}
2383 3136
3137sub on_post_alloc {
3138 my ($self, $id, $cb) = @_;
3139
3140 $self->{post_alloc_hook}{$id} = $cb;
3141}
3142
2384sub draw { 3143sub draw {
2385 my ($self) = @_; 3144 my ($self) = @_;
2386 3145
2387 while (my $rcb = delete $self->{refresh_hook}) { 3146 while ($self->{refresh_hook}) {
2388 $_->() for values %$rcb; 3147 $_->()
3148 for values %{delete $self->{refresh_hook}};
3149 }
3150
3151 if ($self->{check_size}) {
3152 my @queue = ([], []);
3153
3154 for (;;) {
3155 if ($self->{check_size}) {
3156 # heuristic: check containers last
3157 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3158 for values %{delete $self->{check_size}}
3159 }
3160
3161 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3162
3163 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3164 ? @$widget{qw(user_w user_h)}
3165 : $widget->size_request;
3166
3167 if (delete $widget->{force_alloc}
3168 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3169 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3170
3171 $widget->{req_w} = $w;
3172 $widget->{req_h} = $h;
3173
3174 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3175
3176 $widget->{parent}->check_size
3177 if $widget->{parent};
3178 }
3179 }
3180 }
3181
3182 while ($self->{size_alloc}) {
3183 for (values %{delete $self->{size_alloc}}) {
3184 my ($widget, $w, $h) = @$_;
3185
3186 $w = 0 if $w < 0;
3187 $h = 0 if $h < 0;
3188
3189 $widget->{w} = $w;
3190 $widget->{h} = $h;
3191 $widget->size_allocate ($w, $h);
3192 $widget->emit (size_allocate => $w, $h);
3193 }
3194 }
3195
3196 while ($self->{post_alloc_hook}) {
3197 $_->()
3198 for values %{delete $self->{post_alloc_hook}};
2389 } 3199 }
2390 3200
2391 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3201 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2392 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3202 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2393 glClear GL_COLOR_BUFFER_BIT; 3203 glClear GL_COLOR_BUFFER_BIT;
2394 3204
2395 glMatrixMode GL_PROJECTION; 3205 glMatrixMode GL_PROJECTION;
2396 glLoadIdentity; 3206 glLoadIdentity;
2397 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3207 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2398 glMatrixMode GL_MODELVIEW; 3208 glMatrixMode GL_MODELVIEW;
2399 glLoadIdentity; 3209 glLoadIdentity;
2400 3210
2401 $self->_draw; 3211 $self->_draw;
2402} 3212}
… …
2404############################################################################# 3214#############################################################################
2405 3215
2406package CFClient::UI; 3216package CFClient::UI;
2407 3217
2408$ROOT = new CFClient::UI::Root; 3218$ROOT = new CFClient::UI::Root;
2409$TOOLTIP = new CFClient::UI::Tooltip; 3219$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2410 3220
24111 32211
2412 3222

Diff Legend

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