ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.166 by root, Mon Apr 24 08:38:36 2006 UTC vs.
Revision 1.207 by elmex, Mon May 15 18:23:33 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
141# call when resolution changes etc.
142sub rescale_widgets {
143 my ($sx, $sy) = @_;
144
145 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155 }
156
157 $widget->reconfigure;
127 } 158 }
128} 159}
129 160
130############################################################################# 161#############################################################################
131 162
… …
150 if (/^connect_(.*)$/) { 181 if (/^connect_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 182 $self->connect ($1 => delete $self->{$_});
152 } 183 }
153 } 184 }
154 185
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
155 $self 188 $self
156} 189}
157 190
158sub destroy { 191sub destroy {
159 my ($self) = @_; 192 my ($self) = @_;
… …
224 $self->{y} = $y; 257 $self->{y} = $y;
225 $self->update; 258 $self->update;
226 } 259 }
227 260
228 if ($self->{w} != $w || $self->{h} != $h) { 261 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w; 262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230 $self->{h} = $h;
231
232 $self->size_allocate ($w, $h);
233 $self->update;
234 } 263 }
235} 264}
236 265
237sub size_allocate { 266sub size_allocate {
238 # nothing to be done 267 # nothing to be done
239} 268}
240 269
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children {
278}
279
241sub set_max_size { 280sub set_max_size {
242 my ($self, $w, $h) = @_; 281 my ($self, $w, $h) = @_;
243 282
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 283 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 284 delete $self->{max_h}; $self->{max_h} = $h if $h;
246}
247
248# return top left coordinates
249sub _topleft {
250 my ($self, $x, $y) = @_;
251
252 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
253} 285}
254 286
255# translate global coordinates to local coordinate system 287# translate global coordinates to local coordinate system
256sub coord2local { 288sub coord2local {
257 my ($self, $x, $y) = @_; 289 my ($self, $x, $y) = @_;
258 290
259 my ($X, $Y) = $self->_topleft; 291 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260 ($x - $X, $y - $Y)
261} 292}
262 293
263# translate local coordinates to global coordinate system 294# translate local coordinates to global coordinate system
264sub coord2global { 295sub coord2global {
265 my ($self, $x, $y) = @_; 296 my ($self, $x, $y) = @_;
266 297
267 my ($X, $Y) = $self->_topleft; 298 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268 ($x + $X, $y + $Y)
269} 299}
270 300
271sub focus_in { 301sub focus_in {
272 my ($self) = @_; 302 my ($self) = @_;
273 303
… …
345 glVertex $self->{w}, 0; 375 glVertex $self->{w}, 0;
346 glVertex $self->{w}, $self->{h}; 376 glVertex $self->{w}, $self->{h};
347 glVertex 0 , $self->{h}; 377 glVertex 0 , $self->{h};
348 glEnd; 378 glEnd;
349 glPopMatrix; 379 glPopMatrix;
350 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 380 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351 } 381 }
352} 382}
353 383
354sub _draw { 384sub _draw {
355 my ($self) = @_; 385 my ($self) = @_;
… …
371 401
372sub set_parent { 402sub set_parent {
373 my ($self, $parent) = @_; 403 my ($self, $parent) = @_;
374 404
375 Scalar::Util::weaken ($self->{parent} = $parent); 405 Scalar::Util::weaken ($self->{parent} = $parent);
406
407 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size
409 unless exists $self->{req_w};
376} 410}
377 411
378sub check_size { 412sub check_size {
379 my ($self) = @_; 413 my ($self, $forced) = @_;
380 414
381 $self->{parent} 415 $self->{force_alloc} = 1 if $forced;
382 or return 1; 416 $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} 417}
403 418
404sub update { 419sub update {
405 my ($self) = @_; 420 my ($self) = @_;
406 421
… …
421} 436}
422 437
423sub DESTROY { 438sub DESTROY {
424 my ($self) = @_; 439 my ($self) = @_;
425 440
441 delete $WIDGET{$self+0};
426 #$self->deactivate; 442 #$self->deactivate;
427} 443}
428 444
429############################################################################# 445#############################################################################
430 446
… …
503 519
504 $self 520 $self
505} 521}
506 522
507sub add { 523sub add {
508 my ($self, $child) = @_; 524 my ($self, @widgets) = @_;
509 525
510 $child->set_parent ($self); 526 $_->set_parent ($self)
527 for @widgets;
511 528
512 use sort 'stable'; 529 use sort 'stable';
513 530
514 $self->{children} = [ 531 $self->{children} = [
515 sort { $a->{z} <=> $b->{z} } 532 sort { $a->{z} <=> $b->{z} }
516 @{$self->{children}}, $child 533 @{$self->{children}}, @widgets
517 ]; 534 ];
518 535
519 $child->check_size; 536 $self->check_size (1);
537 $self->update;
538}
539
540sub children {
541 @{ $_[0]{children} }
520} 542}
521 543
522sub remove { 544sub remove {
523 my ($self, $child) = @_; 545 my ($self, $child) = @_;
524 546
… …
539 561
540 for (@$children) { 562 for (@$children) {
541 delete $_->{parent}; 563 delete $_->{parent};
542 $_->hide; 564 $_->hide;
543 } 565 }
566
567 $self->check_size;
568 $self->update;
544} 569}
545 570
546sub find_widget { 571sub find_widget {
547 my ($self, $x, $y) = @_; 572 my ($self, $x, $y) = @_;
548 573
… …
623} 648}
624 649
625sub update { 650sub update {
626 my ($self) = @_; 651 my ($self) = @_;
627 652
628 # we want to do this delayed... 653 $ROOT->on_post_alloc ($self => sub { $self->render_child });
629 $self->render_chld;
630 $self->SUPER::update; 654 $self->SUPER::update;
631}
632
633sub render_chld {
634 my ($self) = @_;
635
636 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
637 glClearColor 0, 0, 0, 1;
638 glClear GL_COLOR_BUFFER_BIT;
639 $self->child->draw;
640 };
641} 655}
642 656
643sub size_allocate { 657sub size_allocate {
644 my ($self, $w, $h) = @_; 658 my ($self, $w, $h) = @_;
645 659
646 $self->child->configure (0, 0, $w, $h); 660 $self->SUPER::size_allocate ($w, $h);
661 $self->update;
662}
647 663
664sub _render {
665 $_[0]{children}[0]->draw;
666}
667
668sub render_child {
669 my ($self) = @_;
670
671 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT;
674
648 $self->render_chld; 675 $self->_render;
676# glColorMask 1, 1, 1, 0;
677# glEnable GL_BLEND;
678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679# glRasterPos 0, 0;
680# glCopyPixels 0, 0, $self->{w}, $self->{h};
681# glDisable GL_BLEND;
682# glColorMask 1, 1, 1, 1;
683 };
649} 684}
650 685
651sub _draw { 686sub _draw {
652 my ($self) = @_; 687 my ($self) = @_;
653 688
654 my ($w, $h) = ($self->w, $self->h); 689 my ($w, $h) = ($self->w, $self->h);
655 690
656 my $tex = $self->{texture} 691 my $tex = $self->{texture}
657 or return; 692 or return;
658 693
659 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
662 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1;
663 697
664 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
665 699
666 glDisable GL_BLEND;
667 glDisable GL_TEXTURE_2D; 700 glDisable GL_TEXTURE_2D;
668} 701}
669 702
670############################################################################# 703#############################################################################
671 704
672package CFClient::UI::ViewPort; 705package CFClient::UI::ViewPort;
673 706
674our @ISA = CFClient::UI::Window::; 707our @ISA = CFClient::UI::Window::;
675 708
676sub new { die }
677
678sub size_request { 709sub size_request {
679 my ($self) = @_; 710 my ($self) = @_;
680 711
681 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 712 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
682 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
683 714
684 @$self{qw(child_w child_h)} 715 @$self{qw(child_w child_h)}
685} 716}
686 717
687sub _draw { 718sub size_allocate {
688 my ($self) = @_; 719 my ($self, $w, $h) = @_;
689 720
690 $self->{children}[1]->draw; 721 $self->update;
691} 722}
692 723
724sub set_offset {
725 my ($self, $x, $y) = @_;
693 726
694############################################################################# 727 $self->{view_x} = int $x;
728 $self->{view_y} = int $y;
695 729
730 $self->update;
731}
732
733# hmm, this does not work for topleft of $self... but we should not ask for that
734sub coord2local {
735 my ($self, $x, $y) = @_;
736
737 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
738}
739
740sub coord2global {
741 my ($self, $x, $y) = @_;
742
743 $x = List::Util::min $self->{w}, $x - $self->{view_x};
744 $y = List::Util::min $self->{h}, $y - $self->{view_y};
745
746 $self->SUPER::coord2global ($x, $y)
747}
748
749sub find_widget {
750 my ($self, $x, $y) = @_;
751
752 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
753 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
754 ) {
755 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
756 } else {
757 $self->CFClient::UI::Base::find_widget ($x, $y)
758 }
759}
760
761sub _render {
762 my ($self) = @_;
763
764 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
765
766 $self->SUPER::_render;
767}
768
769#############################################################################
770
696package CFClient::UI::Frame; 771package CFClient::UI::ScrolledWindow;
697 772
698our @ISA = CFClient::UI::Bin::; 773our @ISA = CFClient::UI::HBox::;
699
700use CFClient::OpenGL;
701 774
702sub new { 775sub new {
703 my $class = shift; 776 my $class = shift;
704 777
778 my $self;
779
780 my $slider = new CFClient::UI::Slider
781 vertical => 1,
782 range => [0, 0, 1, 0.01], # HACK fix
783 connect_changed => sub {
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
785 },
786 ;
787
705 my $self = $class->SUPER::new ( 788 $self = $class->SUPER::new (
706 bg => [1, 1, 1, 1], 789 vp => (new CFClient::UI::ViewPort),
707 border_bg => [1, 1, 1, 1], 790 slider => $slider,
708 border => 0.8,
709 @_ 791 @_,
710 ); 792 );
711 793
794 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp});
796 $self->add ($self->{slider});
797
712 $self 798 $self
713} 799}
714 800
801#TODO# update range on size_allocate depending on child
802# update viewport offset on scroll
803
804#############################################################################
805
806package CFClient::UI::Frame;
807
808our @ISA = CFClient::UI::Bin::;
809
810use CFClient::OpenGL;
811
812sub new {
813 my $class = shift;
814
815 $class->SUPER::new (
816 bg => undef,
817 @_,
818 )
819}
820
715sub _draw { 821sub _draw {
716 my ($self) = @_; 822 my ($self) = @_;
717 823
718 my ($w, $h) = ($self->{w}, $self->{h}); 824 if ($self->{bg}) {
825 my ($w, $h) = @$self{qw(w h)};
719 826
720 glEnable GL_BLEND; 827 glEnable GL_BLEND;
721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
722 glEnable GL_TEXTURE_2D; 829 glColor @{ $self->{bg} };
723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
724 830
725# glBegin GL_QUADS; 831 glBegin GL_QUADS;
726# glColor 0, 0, 0, 0;
727# glVertex 0 , 0; 832 glVertex 0 , 0;
728# glVertex 0 , $h; 833 glVertex 0 , $h;
729# glVertex $w, $h; 834 glVertex $w, $h;
730# glVertex $w, 0; 835 glVertex $w, 0;
731# glEnd; 836 glEnd;
732 837
733
734 $self->child->draw;
735 glDisable GL_BLEND; 838 glDisable GL_BLEND;
736 glDisable GL_TEXTURE_2D; 839 }
840
841 $self->SUPER::_draw;
737} 842}
738 843
739############################################################################# 844#############################################################################
740 845
741package CFClient::UI::FancyFrame; 846package CFClient::UI::FancyFrame;
… …
754 # TODO: user_x, user_y, overwrite moveto? 859 # TODO: user_x, user_y, overwrite moveto?
755 860
756 my $self = $class->SUPER::new ( 861 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1], 862 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1], 863 border_bg => [1, 1, 1, 1],
759 border => 0.8, 864 border => 0.6,
865 toplevel => 1,
760 can_events => 1, 866 can_events => 1,
761 @_ 867 @_
762 ); 868 );
763 869
764 $self->{title} &&= new CFClient::UI::Label 870 $self->{title} &&= new CFClient::UI::Label
765 align => 0, 871 align => 0,
766 valign => 1, 872 valign => 1,
767 text => $self->{title}, 873 text => $self->{title},
768 fontsize => 1; 874 fontsize => $self->{border};
769 875
770 $self 876 $self
771} 877}
772 878
773sub border { 879sub border {
… …
798} 904}
799 905
800sub button_down { 906sub button_down {
801 my ($self, $ev, $x, $y) = @_; 907 my ($self, $ev, $x, $y) = @_;
802 908
909 my ($w, $h) = @$self{qw(w h)};
803 my $border = $self->border; 910 my $border = $self->border;
804 911
805 if ($x < $self->{w} && $x >= $self->{w} - $border 912 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806 && $y < $self->{h} && $y >= $self->{h} - $border) { 913 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807 914
915 if ($lr & $td) {
916 my ($wx, $wy) = ($self->{x}, $self->{y});
808 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 917 my ($ox, $oy) = ($ev->{x}, $ev->{y});
809 my ($bw, $bh) = ($self->{w}, $self->{h}); 918 my ($bw, $bh) = ($self->{w}, $self->{h});
810 919
920 my $mx = $x < $border;
921 my $my = $y < $border;
922
811 $self->{motion} = sub { 923 $self->{motion} = sub {
812 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
813 925
814 ($x, $y) = ($ev->{x}, $ev->{y}); 926 my $dx = $ev->{x} - $ox;
927 my $dy = $ev->{y} - $oy;
815 928
816 $self->{user_w} = $bw + $x - $ox; 929 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
817 $self->{user_h} = $bh + $y - $oy; 930 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
931 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
818 $self->check_size; 932 $self->check_size;
819 }; 933 };
820 934
821 } elsif ($x >= 0 && $x < $self->{w} 935 } elsif ($lr ^ $td) {
822 && $y >= 0 && $y < $border) {
823
824 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 936 my ($ox, $oy) = ($ev->{x}, $ev->{y});
825 my ($bx, $by) = ($self->{x}, $self->{y}); 937 my ($bx, $by) = ($self->{x}, $self->{y});
826 938
827 $self->{motion} = sub { 939 $self->{motion} = sub {
828 my ($ev, $x, $y) = @_; 940 my ($ev, $x, $y) = @_;
… …
851 my ($self) = @_; 963 my ($self) = @_;
852 964
853 my ($w, $h ) = ($self->{w}, $self->{h}); 965 my ($w, $h ) = ($self->{w}, $self->{h});
854 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
855 967
856 glEnable GL_BLEND;
857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
858 glEnable GL_TEXTURE_2D; 968 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
860 970
861 my $border = $self->border; 971 my $border = $self->border;
862 972
863 glColor @{ $self->{border_bg} }; 973 glColor @{ $self->{border_bg} };
864 $tex[1]->draw_quad (0, 0, $w, $border); 974 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
865 $tex[3]->draw_quad (0, $border, $border, $ch); 975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
866 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
867 $tex[4]->draw_quad (0, $h - $border, $w, $border); 977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
868 978
979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
869 my $bg = $tex[0]; 980 my $bg = $tex[0];
870 981
871 # TODO: repeat texture not scale 982 # TODO: repeat texture not scale
872 my $rep_x = $cw / $bg->{w}; 983 my $rep_x = $cw / $bg->{w};
873 my $rep_y = $ch / $bg->{h}; 984 my $rep_y = $ch / $bg->{h};
874 985
875 glColor @{ $self->{bg} }; 986 glColor @{ $self->{bg} };
876 987
877 $bg->{s} = $rep_x; 988 $bg->{s} = $rep_x;
878 $bg->{t} = $rep_y; 989 $bg->{t} = $rep_y;
879 $bg->{wrap_mode} = 1; 990 $bg->{wrap_mode} = 1;
880 $bg->draw_quad ($border, $border, $cw, $ch); 991 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 }
881 993
882 glDisable GL_TEXTURE_2D; 994 glDisable GL_TEXTURE_2D;
883 glDisable GL_BLEND;
884 995
885 $self->{title}->draw if $self->{title}; 996 $self->{title}->draw if $self->{title};
997
886 $self->child->draw; 998 $self->child->draw;
887} 999}
888 1000
889############################################################################# 1001#############################################################################
890 1002
… …
912 $self->{children}[$y][$x] = $child; 1024 $self->{children}[$y][$x] = $child;
913 1025
914 $child->check_size; 1026 $child->check_size;
915} 1027}
916 1028
1029sub children {
1030 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031}
1032
917# TODO: move to container class maybe? send childs a signal on removal? 1033# TODO: move to container class maybe? send childs a signal on removal?
918sub clear { 1034sub clear {
919 my ($self) = @_; 1035 my ($self) = @_;
920 1036
921 my $children = delete $self->{children}; 1037 my @children = $self->children;
1038 delete $self->{children};
922 1039
923 for (grep $_, map @$_, grep $_, @$children) { 1040 for (@children) {
924 delete $_->{parent}; 1041 delete $_->{parent};
925 $_->hide; 1042 $_->hide;
926 } 1043 }
927 1044
928 $self->update; 1045 $self->update;
… …
1109} 1226}
1110 1227
1111sub size_allocate { 1228sub size_allocate {
1112 my ($self, $w, $h) = @_; 1229 my ($self, $w, $h) = @_;
1113 1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1114 my $children = $self->{children}; 1233 my $children = $self->{children};
1115 1234
1116 my @h = map $_->{req_h}, @$children; 1235 my @h = map $_->{req_h}, @$children;
1117 1236
1118 my $req_h = List::Util::sum @h; 1237 my $req_h = List::Util::sum @h;
… …
1157 my ($class, %arg) = @_; 1276 my ($class, %arg) = @_;
1158 1277
1159 my $self = $class->SUPER::new ( 1278 my $self = $class->SUPER::new (
1160 fg => [1, 1, 1], 1279 fg => [1, 1, 1],
1161 #font => default_font 1280 #font => default_font
1281 #text => initial text
1282 #markup => initial narkup
1283 layout => (new CFClient::Layout),
1162 fontsize => 1, 1284 fontsize => 1,
1163 text => "",
1164 align => -1, 1285 align => -1,
1165 valign => -1, 1286 valign => -1,
1166 padding => 2, 1287 padding => 2,
1167 layout => new CFClient::Layout,
1168 can_events => 0, 1288 can_events => 0,
1169 %arg 1289 %arg
1170 ); 1290 );
1171 1291
1172 if (exists $self->{template}) { 1292 if (exists $self->{template}) {
1173 my $layout = new CFClient::Layout; 1293 my $layout = new CFClient::Layout;
1174 $layout->set_text (delete $self->{template}); 1294 $layout->set_text (delete $self->{template});
1175 $self->{template} = $layout; 1295 $self->{template} = $layout;
1176 } 1296 }
1177 1297
1178 $self->set_text (delete $self->{text}) if exists $self->{text}; 1298 if (exists $self->{markup}) {
1179 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1299 $self->set_markup (delete $self->{markup});
1300 } else {
1301 $self->set_text (delete $self->{text});
1302 }
1180 1303
1181 $self 1304 $self
1182} 1305}
1183 1306
1184sub escape { 1307sub escape {
… …
1189 s/</&lt;/g; 1312 s/</&lt;/g;
1190 1313
1191 $_[1] 1314 $_[1]
1192} 1315}
1193 1316
1317sub update {
1318 my ($self) = @_;
1319
1320 delete $self->{texture};
1321 $self->SUPER::update;
1322}
1323
1194sub set_text { 1324sub set_text {
1195 my ($self, $text) = @_; 1325 my ($self, $text) = @_;
1196 1326
1327 return if $self->{text} eq "T$text";
1328 $self->{text} = "T$text";
1329
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1197 $self->{layout}->set_text ($text); 1331 $self->{layout}->set_text ($text);
1198 1332
1199 delete $self->{texture}; 1333 $self->update;
1200 $self->check_size; 1334 $self->check_size;
1201 $self->update;
1202} 1335}
1203 1336
1204sub set_markup { 1337sub set_markup {
1205 my ($self, $markup) = @_; 1338 my ($self, $markup) = @_;
1206 1339
1340 return if $self->{text} eq "M$markup";
1341 $self->{text} = "M$markup";
1342
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344
1345 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1207 $self->{layout}->set_markup ($markup); 1346 $self->{layout}->set_markup ($markup);
1208 1347
1209 delete $self->{texture}; 1348 $self->update;
1210 $self->check_size; 1349 $self->check_size;
1211 $self->update;
1212} 1350}
1213 1351
1214sub size_request { 1352sub size_request {
1215 my ($self) = @_; 1353 my ($self) = @_;
1216 1354
… …
1245sub set_fontsize { 1383sub set_fontsize {
1246 my ($self, $fontsize) = @_; 1384 my ($self, $fontsize) = @_;
1247 1385
1248 $self->{fontsize} = $fontsize; 1386 $self->{fontsize} = $fontsize;
1249 delete $self->{texture}; 1387 delete $self->{texture};
1388
1389 $self->update;
1250 $self->check_size; 1390 $self->check_size;
1251 $self->update;
1252} 1391}
1253 1392
1254sub _draw { 1393sub _draw {
1255 my ($self) = @_; 1394 my ($self) = @_;
1256 1395
1257 my $tex = $self->{texture} ||= do { 1396 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}});
1258 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1398 $self->{layout}->set_font ($self->{font}) if $self->{font};
1259 $self->{layout}->set_width ($self->{w}); 1399 $self->{layout}->set_width ($self->{w});
1260 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1401
1261 new_from_layout CFClient::Texture $self->{layout} 1402 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403
1404 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406 : ($self->{w} - $tex->{w}) * 0.5;
1407
1408 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410 : ($self->{h} - $tex->{h}) * 0.5;
1411
1412 $tex
1262 }; 1413 };
1263 1414
1264 glEnable GL_BLEND;
1265 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1266 glEnable GL_TEXTURE_2D; 1415 glEnable GL_TEXTURE_2D;
1267 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268 1417
1418 if ($tex->{format} == GL_ALPHA) {
1269 glColor @{$self->{fg}}; 1419 glColor @{$self->{fg}};
1270
1271 $self->{ox} = int (
1272 $self->{align} < 0 ? $self->{padding}
1273 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1274 : ($self->{w} - $tex->{w}) * 0.5
1275 );
1276
1277 $self->{oy} = int (
1278 $self->{valign} < 0 ? $self->{padding}
1279 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1280 : ($self->{h} - $tex->{h}) * 0.5
1281 );
1282
1283 $tex->draw_quad ($self->{ox}, $self->{oy}); 1420 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1421 } else {
1422 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1423 }
1284 1424
1285 glDisable GL_TEXTURE_2D; 1425 glDisable GL_TEXTURE_2D;
1286 glDisable GL_BLEND;
1287} 1426}
1288 1427
1289############################################################################# 1428#############################################################################
1290 1429
1291package CFClient::UI::EntryBase; 1430package CFClient::UI::EntryBase;
… …
1326 $self->{layout}->set_text ("$text "); 1465 $self->{layout}->set_text ("$text ");
1327 1466
1328 $self->emit (changed => $self->{text}); 1467 $self->emit (changed => $self->{text});
1329} 1468}
1330 1469
1470sub set_text {
1471 my ($self, $text) = @_;
1472
1473 $self->{cursor} = length $text;
1474 $self->_set_text ($text);
1475 $self->check_size;
1476 $self->update;
1477}
1478
1331sub get_text { 1479sub get_text {
1332 $_[0]{text} 1480 $_[0]{text}
1333} 1481}
1334 1482
1335sub size_request { 1483sub size_request {
… …
1342 1490
1343sub size_allocate { 1491sub size_allocate {
1344 my ($self, $w, $h) = @_; 1492 my ($self, $w, $h) = @_;
1345 1493
1346 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1347}
1348
1349sub set_text {
1350 my ($self, $text) = @_;
1351
1352 $self->{cursor} = length $text;
1353 $self->_set_text ($text);
1354 $self->update;
1355} 1495}
1356 1496
1357sub key_down { 1497sub key_down {
1358 my ($self, $ev) = @_; 1498 my ($self, $ev) = @_;
1359 1499
… …
1361 my $sym = $ev->{sym}; 1501 my $sym = $ev->{sym};
1362 my $uni = $ev->{unicode}; 1502 my $uni = $ev->{unicode};
1363 1503
1364 my $text = $self->get_text; 1504 my $text = $self->get_text;
1365 1505
1366 if ($sym == 8) { 1506 if ($uni == 8) {
1367 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1507 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1368 } elsif ($sym == 127) { 1508 } elsif ($uni == 127) {
1369 substr $text, $self->{cursor}, 1, ""; 1509 substr $text, $self->{cursor}, 1, "";
1370 } elsif ($sym == CFClient::SDLK_LEFT) { 1510 } elsif ($sym == CFClient::SDLK_LEFT) {
1371 --$self->{cursor} if $self->{cursor}; 1511 --$self->{cursor} if $self->{cursor};
1372 } elsif ($sym == CFClient::SDLK_RIGHT) { 1512 } elsif ($sym == CFClient::SDLK_RIGHT) {
1373 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1513 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1374 } elsif ($sym == CFClient::SDLK_HOME) { 1514 } elsif ($sym == CFClient::SDLK_HOME) {
1375 $self->{cursor} = 0; 1515 $self->{cursor} = 0;
1376 } elsif ($sym == CFClient::SDLK_END) { 1516 } elsif ($sym == CFClient::SDLK_END) {
1377 $self->{cursor} = length $text; 1517 $self->{cursor} = length $text;
1378 } elsif ($sym == 27) { 1518 } elsif ($uni == 27) {
1379 $self->emit ('escape'); 1519 $self->emit ('escape');
1380 } elsif ($uni) { 1520 } elsif ($uni) {
1381 substr $text, $self->{cursor}++, 0, chr $uni; 1521 substr $text, $self->{cursor}++, 0, chr $uni;
1382 } 1522 }
1383 1523
… …
1466 my ($self, $ev) = @_; 1606 my ($self, $ev) = @_;
1467 1607
1468 my $sym = $ev->{sym}; 1608 my $sym = $ev->{sym};
1469 1609
1470 if ($sym == 13) { 1610 if ($sym == 13) {
1611 unshift @{$self->{history}},
1612 my $txt = $self->get_text;
1613 $self->{history_pointer} = -1;
1614 $self->{history_saveback} = '';
1471 $self->emit (activate => $self->get_text); 1615 $self->emit (activate => $txt);
1472 $self->update; 1616 $self->update;
1617
1618 } elsif ($sym == CFClient::SDLK_UP) {
1619 if ($self->{history_pointer} < 0) {
1620 $self->{history_saveback} = $self->get_text;
1621 }
1622 if (@{$self->{history} || []} > 0) {
1623 $self->{history_pointer}++;
1624 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1625 $self->{history_pointer} = @{$self->{history} || []} - 1;
1626 }
1627 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1628 }
1629
1630 } elsif ($sym == CFClient::SDLK_DOWN) {
1631 $self->{history_pointer}--;
1632 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1633
1634 if ($self->{history_pointer} >= 0) {
1635 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1636 } else {
1637 $self->set_text ($self->{history_saveback});
1638 }
1473 1639
1474 } else { 1640 } else {
1475 $self->SUPER::key_down ($ev); 1641 $self->SUPER::key_down ($ev);
1476 } 1642 }
1477 1643
… …
1521 1687
1522 if ($GRAB == $self) { 1688 if ($GRAB == $self) {
1523 $self->{fg} = $self->{active_fg}; 1689 $self->{fg} = $self->{active_fg};
1524 } 1690 }
1525 1691
1526 glEnable GL_BLEND;
1527 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1528 glEnable GL_TEXTURE_2D; 1692 glEnable GL_TEXTURE_2D;
1529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1693 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1530 glColor 0, 0, 0, 1; 1694 glColor 0, 0, 0, 1;
1531 1695
1532 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1696 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1533 1697
1534 glDisable GL_TEXTURE_2D; 1698 glDisable GL_TEXTURE_2D;
1535 glDisable GL_BLEND;
1536 1699
1537 $self->SUPER::_draw; 1700 $self->SUPER::_draw;
1538} 1701}
1539 1702
1540############################################################################# 1703#############################################################################
… …
1587 1750
1588 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1751 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1589 1752
1590 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1753 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1591 1754
1592 glEnable GL_BLEND; 1755 my $tex = $self->{state} ? $tex[1] : $tex[0];
1756
1593 glEnable GL_TEXTURE_2D; 1757 glEnable GL_TEXTURE_2D;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1595
1596 my $tex = $self->{state} ? $tex[1] : $tex[0];
1597
1598 $tex->draw_quad (0, 0, $s, $s); 1758 $tex->draw_quad_alpha (0, 0, $s, $s);
1599
1600 glDisable GL_TEXTURE_2D; 1759 glDisable GL_TEXTURE_2D;
1601 glDisable GL_BLEND;
1602} 1760}
1603 1761
1604############################################################################# 1762#############################################################################
1605 1763
1606package CFClient::UI::Image; 1764package CFClient::UI::Image;
… …
1649 glTranslate 0, -$self->{w}, 0; 1807 glTranslate 0, -$self->{w}, 0;
1650 1808
1651 ($w, $h) = ($h, $w); 1809 ($w, $h) = ($h, $w);
1652 } 1810 }
1653 1811
1654 glEnable GL_BLEND;
1655 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1656 glEnable GL_TEXTURE_2D; 1812 glEnable GL_TEXTURE_2D;
1657 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1658 1814
1659 $tex->draw_quad (0, 0, $w, $h); 1815 $tex->draw_quad_alpha (0, 0, $w, $h);
1660 1816
1661 glDisable GL_BLEND;
1662 glDisable GL_TEXTURE_2D; 1817 glDisable GL_TEXTURE_2D;
1663} 1818}
1664 1819
1665############################################################################# 1820#############################################################################
1666 1821
… …
1714} 1869}
1715 1870
1716sub set_max { 1871sub set_max {
1717 my ($self, $max) = @_; 1872 my ($self, $max) = @_;
1718 1873
1874 return if $self->{max_val} == $max;
1875
1719 $self->{max_val} = $max; 1876 $self->{max_val} = $max;
1877 $self->update;
1720} 1878}
1721 1879
1722sub set_value { 1880sub set_value {
1723 my ($self, $val, $max) = @_; 1881 my ($self, $val, $max) = @_;
1724 1882
1725 $self->set_max ($max) 1883 $self->set_max ($max)
1726 if defined $max; 1884 if defined $max;
1727 1885
1728 $max = $self->{max_val}; 1886 return if $self->{val} == $val;
1887
1729 $self->{val} = $val; 1888 $self->{val} = $val;
1730
1731 $self->update; 1889 $self->update;
1732} 1890}
1733 1891
1734sub _draw { 1892sub _draw {
1735 my ($self) = @_; 1893 my ($self) = @_;
… …
1798 1956
1799sub new { 1957sub new {
1800 my ($class, %arg) = @_; 1958 my ($class, %arg) = @_;
1801 1959
1802 my $self = $class->SUPER::new ( 1960 my $self = $class->SUPER::new (
1803 tooltip => $arg{type}, 1961 tooltip => $arg{type},
1804 can_hover => 1, 1962 can_hover => 1,
1963 can_events => 1,
1805 %arg, 1964 %arg,
1806 ); 1965 );
1807 1966
1808 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1967 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1809 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1968 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1817 1976
1818 $self->{value}->set_fontsize ($fsize); 1977 $self->{value}->set_fontsize ($fsize);
1819 $self->{max} ->set_fontsize ($fsize); 1978 $self->{max} ->set_fontsize ($fsize);
1820} 1979}
1821 1980
1981sub set_max {
1982 my ($self, $max) = @_;
1983
1984 $self->{gauge}->set_max ($max);
1985 $self->{max}->set_text ($max);
1986}
1987
1822sub set_value { 1988sub set_value {
1823 my ($self, $val, $max) = @_; 1989 my ($self, $val, $max) = @_;
1824 1990
1825 $self->set_max ($max) 1991 $self->set_max ($max)
1826 if defined $max; 1992 if defined $max;
1827 1993
1828 $self->{gauge}->set_value ($val, $max); 1994 $self->{gauge}->set_value ($val, $max);
1829 $self->{value}->set_text ($val); 1995 $self->{value}->set_text ($val);
1830}
1831
1832sub set_max {
1833 my ($self, $max) = @_;
1834
1835 $self->{gauge}->set_max ($max);
1836 $self->{max}->set_text ($max);
1837} 1996}
1838 1997
1839############################################################################# 1998#############################################################################
1840 1999
1841package CFClient::UI::Slider; 2000package CFClient::UI::Slider;
… …
1851 qw(s1_slider.png s1_slider_bg.png); 2010 qw(s1_slider.png s1_slider_bg.png);
1852 2011
1853sub new { 2012sub new {
1854 my $class = shift; 2013 my $class = shift;
1855 2014
1856 # range [value, low, high, page] 2015 # range [value, low, high, page, unit]
1857 2016
1858 # TODO: 0-width page 2017 # TODO: 0-width page
1859 # TODO: req_w/h are wrong with vertical 2018 # TODO: req_w/h are wrong with vertical
1860 # TODO: calculations are off 2019 # TODO: calculations are off
1861 my $self = $class->SUPER::new ( 2020 my $self = $class->SUPER::new (
1862 fg => [1, 1, 1], 2021 fg => [1, 1, 1],
1863 active_fg => [0, 0, 0], 2022 active_fg => [0, 0, 0],
1864 range => [0, 0, 100, 10], 2023 range => [0, 0, 100, 10],
1865 req_w => 20, 2024 req_w => $::WIDTH / 80,
1866 req_h => 20, 2025 req_h => $::WIDTH / 80,
1867 vertical => 0, 2026 vertical => 0,
1868 can_hover => 1, 2027 can_hover => 1,
1869 inner_pad => 5, 2028 inner_pad => .05,
1870 @_ 2029 @_
1871 ); 2030 );
1872 2031
2032 $self->set_value ($self->{range}[0]);
2033 $self->update;
2034
1873 $self 2035 $self
2036}
2037
2038sub set_value {
2039 my ($self, $value) = @_;
2040
2041 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2042
2043 $hi = $lo + 1 if $hi <= $lo;
2044
2045 $value = $lo if $value < $lo;
2046 $value = $hi if $value > $hi;
2047
2048 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2049 if $unit;
2050
2051 $page = $hi - $lo if $page > $hi - $lo;
2052
2053 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2054
2055 if ($value != $old_value) {
2056 $self->emit (changed => $value);
2057 $self->update;
2058 }
1874} 2059}
1875 2060
1876sub size_request { 2061sub size_request {
1877 my ($self) = @_; 2062 my ($self) = @_;
1878 2063
… …
1891 2076
1892sub mouse_motion { 2077sub mouse_motion {
1893 my ($self, $ev, $x, $y) = @_; 2078 my ($self, $ev, $x, $y) = @_;
1894 2079
1895 if ($GRAB == $self) { 2080 if ($GRAB == $self) {
2081 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2082
2083 my (undef, $lo, $hi, $page) = @{$self->{range}};
2084
2085 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2086
2087 $self->set_value ($x * ($hi - $lo) + $lo);
2088 }
2089}
2090
2091sub update {
2092 my ($self) = @_;
2093
2094 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2095 $self->set_value ($self->{range}[0]);
2096
1896 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2097 my ($value, $lo, $hi, $page) = @{$self->{range}};
1897 2098
1898 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2099 my $inner_w = 1 - 2 * $self->{inner_pad};
1899 2100
1900 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2101 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1901 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1902 2102
1903 $x -= $inner_pad_px; # substract the padding 2103 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1904 $x = $x * ($hi - $lo) / $inner_w + $lo; 2104 $value = $self->{scale} * ($value - $lo);
1905 $x = $lo if $x < $lo;
1906 $x = $hi - $page if $x > $hi - $page;
1907 $self->{range}[0] = $x;
1908 2105
1909 $self->emit (changed => $x); 2106 $value = $self->{inner_pad} + ($value - $page * 0.5);
1910 $self->update; 2107
2108 $value = 0 if $value < 0;
2109 $page = 1 - $value if $value + $page > 1;
2110
2111 $self->{knob_x} = $value;
2112 $self->{knob_w} = $page;
1911 } 2113 });
1912}
1913 2114
1914# the inner_* stuff is for generating a padding for the slider handle, 2115 $self->SUPER::update;
1915# so that the handle doesn't leave the texture. This calculation isn't 100%
1916# correct propably, but it does the job for now
1917sub _calc_inner_pad_px {
1918 my ($self, $w) = @_;
1919 ($w / 100) * $self->{inner_pad} # % to pixels
1920} 2116}
1921 2117
1922sub _draw { 2118sub _draw {
1923 my ($self) = @_; 2119 my ($self) = @_;
1924 2120
1925 $self->SUPER::_draw (); 2121 $self->SUPER::_draw ();
1926 2122
1927 my ($w, $h) = @$self{qw(w h)}; 2123 glScale $self->{w}, $self->{h};
1928 2124
1929 if ($self->{vertical}) { 2125 if ($self->{vertical}) {
1930 # draw a vertical slider like a rotated horizontal slider 2126 # draw a vertical slider like a rotated horizontal slider
1931 2127
1932 glRotate 90, 0, 0, 1; 2128 glRotate 90, 0, 0, 1;
1933 glTranslate 0, -$self->{w}, 0; 2129 glTranslate 0, 1, 0;
1934
1935 ($w, $h) = ($h, $w);
1936 } 2130 }
1937 2131
1938 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2132 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1939 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2133 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1940 2134
1941 my ($value, $lo, $hi, $page) = @{$self->{range}};
1942
1943 $hi = $value + 1 if $lo == $hi;
1944
1945 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1946 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1947
1948 $page = int $page * $inner_w / ($hi - $lo);
1949 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1950
1951 $w -= $page;
1952 $page &= ~1;
1953 glTranslate $page * 0.5, 0, 0;
1954 $page ||= 2;
1955
1956 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1957 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1958
1959 glEnable GL_BLEND;
1960 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1961 glEnable GL_TEXTURE_2D; 2135 glEnable GL_TEXTURE_2D;
1962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1963 2137
1964 # draw background 2138 # draw background
1965 $tex[1]->draw_quad (0, 0, $w, $h); 2139 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1966 2140
1967 # draw handle 2141 # draw handle
1968 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2142 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1969 2143
1970 glDisable GL_BLEND;
1971 glDisable GL_TEXTURE_2D; 2144 glDisable GL_TEXTURE_2D;
1972} 2145}
1973 2146
1974############################################################################# 2147#############################################################################
1975 2148
… …
1986 fontsize => 1, 2159 fontsize => 1,
1987 can_events => 0, 2160 can_events => 0,
1988 #font => default_font 2161 #font => default_font
1989 @_, 2162 @_,
1990 2163
1991 layout => (new CFClient::Layout), 2164 layout => (new CFClient::Layout 1),
1992 par => [], 2165 par => [],
1993 height => 0, 2166 height => 0,
1994 children => [ 2167 children => [
1995 (new CFClient::UI::Empty expand => 1), 2168 (new CFClient::UI::Empty expand => 1),
1996 (new CFClient::UI::Slider vertical => 1), 2169 (new CFClient::UI::Slider vertical => 1),
1997 ], 2170 ],
1998 ); 2171 );
1999 2172
2000 $self->{children}[1]->connect (changed => sub { 2173 $self->{children}[1]->connect (changed => sub { $self->update });
2001 $self->update;
2002 });
2003 2174
2004 $self 2175 $self
2005} 2176}
2006 2177
2007sub set_fontsize { 2178sub set_fontsize {
… …
2015 my ($self, $text) = @_; 2186 my ($self, $text) = @_;
2016 2187
2017 my $layout = $self->{layout}; 2188 my $layout = $self->{layout};
2018 2189
2019 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2190 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2020 $layout->set_width ($self->{w}); 2191 $layout->set_width ($self->{children}[0]{w});
2021 $layout->set_text ($text); 2192 $layout->set_markup ($text);
2022 2193
2023 ($layout->size)[1] 2194 ($layout->size)[1]
2024} 2195}
2025 2196
2026sub reflow { 2197sub reflow {
… …
2064 2235
2065 return unless $self->{h} > 0; 2236 return unless $self->{h} > 0;
2066 2237
2067 delete $self->{texture}; 2238 delete $self->{texture};
2068 2239
2069 $ROOT->on_refresh ($self, sub { 2240 $ROOT->on_post_alloc ($self, sub {
2070 if (delete $self->{need_reflow}) { 2241 if (delete $self->{need_reflow}) {
2071 my $height = 0; 2242 my $height = 0;
2072 2243
2073 $height += $_->[0] = $self->text_height ($_->[2]) 2244 $height += $_->[0] = $self->text_height ($_->[2])
2074 for @{$self->{par}}; 2245 for @{$self->{par}};
… …
2078 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2249 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2079 2250
2080 delete $self->{texture}; 2251 delete $self->{texture};
2081 } 2252 }
2082 2253
2083 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2254 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2084 glClearColor 0, 0, 0, 1; 2255 glClearColor 0, 0, 0, 0;
2085 glClear GL_COLOR_BUFFER_BIT; 2256 glClear GL_COLOR_BUFFER_BIT;
2086 2257
2087 glEnable GL_BLEND;
2088 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2089 glEnable GL_TEXTURE_2D; 2258 glEnable GL_TEXTURE_2D;
2090 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2259 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2091 2260
2092 my $top = int $self->{children}[1]{range}[0]; 2261 my $top = int $self->{children}[1]{range}[0];
2093 2262
… …
2102 2271
2103 for my $par (@{$self->{par}}) { 2272 for my $par (@{$self->{par}}) {
2104 my $h = $par->[0]; 2273 my $h = $par->[0];
2105 2274
2106 if ($y0 < $y + $h && $y < $y1) { 2275 if ($y0 < $y + $h && $y < $y1) {
2276 $layout->set_foreground (@{ $par->[1] });
2107 $layout->set_text ($par->[2]); 2277 $layout->set_markup ($par->[2]);
2108 2278
2109 glColor @{ $par->[1] };
2110 my ($W, $H) = $layout->size; 2279 my ($W, $H) = $layout->size;
2111 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2280 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2112 } 2281 }
2113 2282
2114 $y += $h; 2283 $y += $h;
2115 } 2284 }
2116 2285
2117 glDisable GL_TEXTURE_2D; 2286 glDisable GL_TEXTURE_2D;
2118 glDisable GL_BLEND;
2119 }; 2287 };
2120 }); 2288 });
2121} 2289}
2122 2290
2123sub _draw { 2291sub _draw {
2124 my ($self) = @_; 2292 my ($self) = @_;
2125 2293
2126 if ($self->{texture}) {
2127 glEnable GL_TEXTURE_2D; 2294 glEnable GL_TEXTURE_2D;
2128 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2129 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2296 glColor 1, 1, 1, 1;
2297 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2130 glDisable GL_TEXTURE_2D; 2298 glDisable GL_TEXTURE_2D;
2131 }
2132 2299
2133 $self->{children}[1]->draw; 2300 $self->{children}[1]->draw;
2134 2301
2135} 2302}
2136 2303
… …
2230 @_, 2397 @_,
2231 can_events => 0, 2398 can_events => 0,
2232 ) 2399 )
2233} 2400}
2234 2401
2235sub set_markup { 2402sub set_tooltip_from {
2236 my ($self, $text) = @_; 2403 my ($self, $widget) = @_;
2237 2404
2238 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2405 $self->add (new CFClient::UI::Label
2239 $self->{label}->set_markup ($text); 2406 markup => $widget->{tooltip},
2240 $self->add ($self->{label}); 2407 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2408 fontsize => 0.8,
2409 fg => [0, 0, 0, 1],
2410 font => ($widget->{tooltip_font} || $::FONT_PROP),
2411 );
2241} 2412}
2242 2413
2243sub size_request { 2414sub size_request {
2244 my ($self) = @_; 2415 my ($self) = @_;
2245
2246 $self->child->set_max_size ($::WIDTH * 0.3);
2247 2416
2248 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2417 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2249 2418
2250 ($w + 4, $h + 4) 2419 ($w + 4, $h + 4)
2251} 2420}
… …
2257} 2426}
2258 2427
2259sub _draw { 2428sub _draw {
2260 my ($self) = @_; 2429 my ($self) = @_;
2261 2430
2262 glPushMatrix;
2263 glTranslate 0.375, 0.375; 2431 glTranslate 0.375, 0.375;
2264 2432
2265 my ($w, $h) = @$self{qw(w h)}; 2433 my ($w, $h) = @$self{qw(w h)};
2266 2434
2267 glColor 1, 0.8, 0.4; 2435 glColor 1, 0.8, 0.4;
… …
2278 glVertex 0 , $h; 2446 glVertex 0 , $h;
2279 glVertex $w, $h; 2447 glVertex $w, $h;
2280 glVertex $w, 0; 2448 glVertex $w, 0;
2281 glEnd; 2449 glEnd;
2282 2450
2283 glPopMatrix; 2451 glTranslate 2 - 0.375, 2 - 0.375;
2284
2285 glTranslate 2, 2;
2286 $self->SUPER::_draw; 2452 $self->SUPER::_draw;
2287} 2453}
2288 2454
2289############################################################################# 2455#############################################################################
2290 2456
… …
2305 2471
2306sub size_request { 2472sub size_request {
2307 (32, 8) 2473 (32, 8)
2308} 2474}
2309 2475
2310sub draw { 2476sub _draw {
2311 my ($self) = @_; 2477 my ($self) = @_;
2312 2478
2479 return unless $::CONN;#d# manage and cache textures differently
2313 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2480 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2314 2481
2482 # TODO animation
2315 if ($tex) { 2483 if ($tex) {
2316 glEnable GL_BLEND;
2317 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2318 glEnable GL_TEXTURE_2D; 2484 glEnable GL_TEXTURE_2D;
2319 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2485 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2320 glColor 1, 1, 1, 1; 2486 glColor 1, 1, 1, 1;
2321 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2487 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2322 glDisable GL_TEXTURE_2D; 2488 glDisable GL_TEXTURE_2D;
2323 glDisable GL_BLEND;
2324 } 2489 }
2490}
2491
2492#############################################################################
2493
2494package CFClient::UI::InventoryItem;
2495
2496our @ISA = CFClient::UI::HBox::;
2497
2498sub new {
2499 my $class = shift;
2500
2501 my %args = @_;
2502
2503 my $item = delete $args{item};
2504
2505 my $desc = $item->{nrof} < 2
2506 ? $item->{name}
2507 : "$item->{nrof} $item->{name_pl}";
2508
2509 $item->{flags} & Crossfire::Protocol::F_OPEN
2510 and $desc .= " (open)";
2511 $item->{flags} & Crossfire::Protocol::F_APPLIED
2512 and $desc .= " (applied)";
2513 $item->{flags} & Crossfire::Protocol::F_UNPAID
2514 and $desc .= " (unpaid)";
2515 $item->{flags} & Crossfire::Protocol::F_MAGIC
2516 and $desc .= " (magic)";
2517 $item->{flags} & Crossfire::Protocol::F_CURSED
2518 and $desc .= " (cursed)";
2519 $item->{flags} & Crossfire::Protocol::F_DAMNED
2520 and $desc .= " (damned)";
2521 $item->{flags} & Crossfire::Protocol::F_LOCKED
2522 and $desc .= " *";
2523
2524 my $self = $class->SUPER::new (
2525 can_hover => 1,
2526 can_events => 1,
2527 tooltip => (CFClient::UI::Label->escape ($desc)
2528 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2529 connect_button_down => sub {
2530 my ($self, $ev, $x, $y) = @_;
2531
2532 # todo: maybe put examine on 1? but should just be a tooltip :(
2533 if ($ev->{button} == 1) {
2534 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2535 } elsif ($ev->{button} == 2) {
2536 $::CONN->send ("apply $item->{tag}");
2537 } elsif ($ev->{button} == 3) {
2538 my @menu_items = (
2539 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2543 [
2544 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2545 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2546 ],
2547 );
2548
2549 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2550 }
2551
2552 1
2553 },
2554 %args
2555 );
2556
2557 $self->add (new CFClient::UI::Face
2558 can_events => 0,
2559 face => $item->{face},
2560 anim => $item->{anim},
2561 animspeed => $item->{animspeed},
2562 );
2563
2564 $self->add (new CFClient::UI::Label
2565 can_events => 0,
2566 text => $desc,
2567 );
2568
2569 $self
2570}
2571
2572#############################################################################
2573
2574package CFClient::UI::Inventory;
2575
2576our @ISA = CFClient::UI::ScrolledWindow::;
2577
2578sub new {
2579 my $class = shift;
2580
2581 my $self = $class->SUPER::new (
2582 scrolled => (new CFClient::UI::VBox),
2583 @_,
2584 );
2585
2586 $self
2587}
2588
2589sub set_items {
2590 my ($self, $items) = @_;
2591
2592 $self->{scrolled}->clear;
2593 return unless $items;
2594
2595 my @items = sort {
2596 ($a->{type} <=> $b->{type})
2597 or ($a->{name} cmp $b->{name})
2598 } @$items;
2599
2600 $self->{real_items} = \@items;
2601
2602 for my $item (@items) {
2603 my $desc = $item->{nrof} < 2
2604 ? $item->{name}
2605 : "$item->{nrof} $item->{name_pl}";
2606
2607 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2608 }
2609
2610 $self->{scrolled}->add (@items);
2611
2612# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2613}
2614
2615sub size_request {
2616 my ($self) = @_;
2617 ($self->{req_w}, $self->{req_h});
2618}
2619
2620#############################################################################
2621
2622package CFClient::UI::Menu;
2623
2624our @ISA = CFClient::UI::FancyFrame::;
2625
2626use CFClient::OpenGL;
2627
2628sub new {
2629 my $class = shift;
2630
2631 my $self = $class->SUPER::new (
2632 items => [],
2633 z => 100,
2634 @_,
2635 );
2636
2637 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2638
2639 for my $item (@{ $self->{items} }) {
2640 my ($widget, $cb) = @$item;
2641
2642 # handle various types of items, only text for now
2643 if (!ref $widget) {
2644 $widget = new CFClient::UI::Label
2645 can_hover => 1,
2646 can_events => 1,
2647 text => $widget;
2648 }
2649
2650 $self->{item}{$widget} = $item;
2651
2652 $self->{vbox}->add ($widget);
2653 }
2654
2655 $self
2656}
2657
2658# popup given the event (must be a mouse button down event currently)
2659sub popup {
2660 my ($self, $ev) = @_;
2661
2662 $self->emit ("popdown");
2663
2664 # maybe save $GRAB? must be careful about events...
2665 $GRAB = $self;
2666 $self->{button} = $ev->{button};
2667
2668 $self->show;
2669 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2670}
2671
2672sub mouse_motion {
2673 my ($self, $ev, $x, $y) = @_;
2674
2675 # TODO: should use vbox->find_widget or so
2676 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2677 $self->{hover} = $self->{item}{$HOVER};
2678}
2679
2680sub button_up {
2681 my ($self, $ev, $x, $y) = @_;
2682
2683 if ($ev->{button} == $self->{button}) {
2684 undef $GRAB;
2685 $self->hide;
2686
2687 $self->emit ("popdown");
2688 $self->{hover}[1]->() if $self->{hover};
2689 }
2690}
2691
2692#############################################################################
2693
2694package CFClient::UI::Statusbox;
2695
2696our @ISA = CFClient::UI::VBox::;
2697
2698sub reorder {
2699 my ($self) = @_;
2700 my $NOW = time;
2701
2702 while (my ($k, $v) = each %{ $self->{item} }) {
2703 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2704 }
2705
2706 my @widgets;
2707
2708 my @items = sort {
2709 $a->{pri} <=> $b->{pri}
2710 or $b->{id} <=> $a->{id}
2711 } values %{ $self->{item} };
2712
2713 my $count = 10 + 1;
2714 for my $item (@items) {
2715 last unless --$count;
2716
2717 push @widgets, $item->{label} ||= do {
2718 # TODO: doesn't handle markup well (read as: at all)
2719 my $short = $item->{count} > 1
2720 ? "<b>$item->{count} ×</b> $item->{text}"
2721 : $item->{text};
2722
2723 for ($short) {
2724 s/^\s+//;
2725 s/\s+/ /g;
2726 my $len = int 40 / $item->{fontsize};
2727 substr $_, $len, length, "…" if $len < length;
2728 }
2729
2730 new CFClient::UI::Label
2731 markup => $short,
2732 tooltip => $item->{tooltip},
2733 tooltip_font => $::FONT_PROP,
2734 tooltip_width => 0.67,
2735 fontsize => $item->{fontsize},
2736 fg => $item->{fg},
2737 can_events => 1,
2738 can_hover => 1
2739 };
2740 }
2741
2742 $self->clear;
2743 $self->SUPER::add (reverse @widgets);
2744}
2745
2746sub add {
2747 my ($self, $text, %arg) = @_;
2748
2749 $text =~ s/^\s+//;
2750 $text =~ s/\s+$//;
2751
2752 my $timeout = time + ((delete $arg{timeout}) || 60);
2753
2754 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2755
2756 if (my $item = $self->{item}{$group}) {
2757 if ($item->{text} eq $text) {
2758 $item->{count}++;
2759 } else {
2760 $item->{count} = 1;
2761 $item->{text} = $item->{tooltip} = $text;
2762 }
2763 $item->{id} = ++$self->{id};
2764 $item->{timeout} = $timeout;
2765 delete $item->{label};
2766 } else {
2767 $self->{item}{$group} = {
2768 id => ++$self->{id},
2769 text => $text,
2770 timeout => $timeout,
2771 tooltip => $text,
2772 fontsize => 0.8,
2773 fg => [0.8, 0.8, 0.8, 0.8],
2774 pri => 0,
2775 count => 1,
2776 %arg,
2777 };
2778 }
2779
2780 $self->reorder;
2325} 2781}
2326 2782
2327############################################################################# 2783#############################################################################
2328 2784
2329package CFClient::UI::Root; 2785package CFClient::UI::Root;
2330 2786
2331our @ISA = CFClient::UI::Container::; 2787our @ISA = CFClient::UI::Container::;
2332 2788
2333use CFClient::OpenGL; 2789use CFClient::OpenGL;
2334 2790
2335sub check_size { 2791sub new {
2336 my ($self) = @_; 2792 my $class = shift;
2337 2793
2338 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2794 $class->SUPER::new (
2339} 2795 @_,
2340 2796 )
2341sub size_request {
2342 ($::WIDTH, $::HEIGHT)
2343} 2797}
2344 2798
2345sub configure { 2799sub configure {
2346 my ($self, $x, $y, $w, $h) = @_; 2800 my ($self, $x, $y, $w, $h) = @_;
2347 2801
2348 $self->SUPER::configure ($x, $y, $w, $h); 2802 $self->{w} = $w;
2803 $self->{h} = $h;
2804}
2349 2805
2806sub check_size {
2807 my ($self) = @_;
2808
2809 $self->size_allocate ($self->{w}, $self->{h})
2810 if $self->{w};
2811}
2812
2813sub size_request {
2814 my ($self) = @_;
2815
2816 ($self->{w}, $self->{h})
2817}
2818
2819sub size_allocate {
2820 my ($self, $w, $h) = @_;
2821
2822 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2823 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2824
2825 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2826 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2827
2350 for my $child (@{$self->{children}}) { 2828 for my $child ($self->children) {
2351 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2829 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2352 2830
2831 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2832 if exists $child->{req_x};
2833
2834 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2835 if exists $child->{req_y};
2836
2353 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2837 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2354 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2838 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2839
2355 $child->configure ($X, $Y, $W,$H); 2840 $child->configure ($X, $Y, $W, $H);
2356 } 2841 }
2357} 2842}
2358 2843
2359sub _topleft { 2844sub coord2local {
2360 my ($self, $x, $y) = @_; 2845 my ($self, $x, $y) = @_;
2361 2846
2362 ($x, $y) 2847 ($x, $y)
2363} 2848}
2364 2849
2850sub coord2global {
2851 my ($self, $x, $y) = @_;
2852
2853 ($x, $y)
2854}
2855
2365sub update { 2856sub update {
2366 my ($self) = @_; 2857 my ($self) = @_;
2367 2858
2368 $self->check_size; 2859 $self->check_size;
2369 ::refresh (); 2860 $::WANT_REFRESH++;
2370} 2861}
2371 2862
2372sub add { 2863sub add {
2373 my ($self, $child) = @_; 2864 my ($self, @children) = @_;
2374 2865
2866 for my $child (@children) {
2867 $child->{toplevel} = 1;
2868
2375 # integerize window positions 2869 # integerise window positions
2376 $child->{x} = int $child->{x}; 2870 $child->{x} = int $child->{x};
2377 $child->{y} = int $child->{y}; 2871 $child->{y} = int $child->{y};
2872 }
2378 2873
2379 $self->SUPER::add ($child); 2874 $self->SUPER::add (@children);
2380} 2875}
2381 2876
2382sub on_refresh { 2877sub on_refresh {
2383 my ($self, $id, $cb) = @_; 2878 my ($self, $id, $cb) = @_;
2384 2879
2385 $self->{refresh_hook}{$id} = $cb; 2880 $self->{refresh_hook}{$id} = $cb;
2386} 2881}
2387 2882
2883sub on_post_alloc {
2884 my ($self, $id, $cb) = @_;
2885
2886 $self->{post_alloc_hook}{$id} = $cb;
2887}
2888
2388sub draw { 2889sub draw {
2389 my ($self) = @_; 2890 my ($self) = @_;
2390 2891
2391 while (my $rcb = delete $self->{refresh_hook}) { 2892 while ($self->{refresh_hook}) {
2392 $_->() for values %$rcb; 2893 $_->()
2894 for values %{delete $self->{refresh_hook}};
2895 }
2896
2897 if ($self->{check_size}) {
2898 my @queue = ([], []);
2899
2900 for (;;) {
2901 if ($self->{check_size}) {
2902 # heuristic: check containers last
2903 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2904 for values %{delete $self->{check_size}}
2905 }
2906
2907 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2908
2909 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2910 ? @$widget{qw(user_w user_h)}
2911 : $widget->size_request;
2912
2913 if (delete $widget->{force_alloc}
2914 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2915 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2916
2917 $widget->{req_w} = $w;
2918 $widget->{req_h} = $h;
2919
2920 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2921
2922 $widget->{parent}->check_size
2923 if $widget->{parent};
2924 }
2925 }
2926 }
2927
2928 while ($self->{size_alloc}) {
2929 for (values %{delete $self->{size_alloc}}) {
2930 my ($widget, $w, $h) = @$_;
2931
2932 $w = 0 if $w < 0;
2933 $h = 0 if $h < 0;
2934
2935 $widget->{w} = $w;
2936 $widget->{h} = $h;
2937 $widget->size_allocate ($w, $h);
2938 $widget->emit (size_allocate => $w, $h);
2939 }
2940 }
2941
2942 while ($self->{post_alloc_hook}) {
2943 $_->()
2944 for values %{delete $self->{post_alloc_hook}};
2393 } 2945 }
2394 2946
2395 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2947 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2396 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2948 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2397 glClear GL_COLOR_BUFFER_BIT; 2949 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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