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.175 by root, Tue Apr 25 11:48:31 2006 UTC vs.
Revision 1.208 by root, Mon May 15 22:52:17 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
15 18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_markup ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 32 $TOOLTIP->show;
31 33
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 35
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
37 38
38 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
39 } 42 }
40 43
41 return; 44 return;
42 } 45 }
43 } 46 }
… …
130 133
131 for (@$vals) { 134 for (@$vals) {
132 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
133 $rem += $_ - $i; 136 $rem += $_ - $i;
134 $_ = $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;
135 } 158 }
136} 159}
137 160
138############################################################################# 161#############################################################################
139 162
… …
158 if (/^connect_(.*)$/) { 181 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 182 $self->connect ($1 => delete $self->{$_});
160 } 183 }
161 } 184 }
162 185
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
163 $self 188 $self
164} 189}
165 190
166sub destroy { 191sub destroy {
167 my ($self) = @_; 192 my ($self) = @_;
… …
232 $self->{y} = $y; 257 $self->{y} = $y;
233 $self->update; 258 $self->update;
234 } 259 }
235 260
236 if ($self->{w} != $w || $self->{h} != $h) { 261 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 } 263 }
243} 264}
244 265
245sub size_allocate { 266sub size_allocate {
246 # nothing to be done 267 # nothing to be done
247} 268}
248 269
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
249sub children { 277sub children {
250}
251
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260} 278}
261 279
262sub set_max_size { 280sub set_max_size {
263 my ($self, $w, $h) = @_; 281 my ($self, $w, $h) = @_;
264 282
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 283 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 284 delete $self->{max_h}; $self->{max_h} = $h if $h;
267}
268
269# return top left coordinates
270sub _topleft {
271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
275
276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
277} 285}
278 286
279# translate global coordinates to local coordinate system 287# translate global coordinates to local coordinate system
280sub coord2local { 288sub coord2local {
281 my ($self, $x, $y) = @_; 289 my ($self, $x, $y) = @_;
282 290
283 my ($X, $Y) = $self->_topleft; 291 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 292}
286 293
287# translate local coordinates to global coordinate system 294# translate local coordinates to global coordinate system
288sub coord2global { 295sub coord2global {
289 my ($self, $x, $y) = @_; 296 my ($self, $x, $y) = @_;
290 297
291 my ($X, $Y) = $self->_topleft; 298 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 299}
294 300
295sub focus_in { 301sub focus_in {
296 my ($self) = @_; 302 my ($self) = @_;
297 303
… …
369 glVertex $self->{w}, 0; 375 glVertex $self->{w}, 0;
370 glVertex $self->{w}, $self->{h}; 376 glVertex $self->{w}, $self->{h};
371 glVertex 0 , $self->{h}; 377 glVertex 0 , $self->{h};
372 glEnd; 378 glEnd;
373 glPopMatrix; 379 glPopMatrix;
374 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;
375 } 381 }
376} 382}
377 383
378sub _draw { 384sub _draw {
379 my ($self) = @_; 385 my ($self) = @_;
… …
395 401
396sub set_parent { 402sub set_parent {
397 my ($self, $parent) = @_; 403 my ($self, $parent) = @_;
398 404
399 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};
400} 410}
401 411
402sub check_size { 412sub check_size {
403 my ($self) = @_; 413 my ($self, $forced) = @_;
404 414
405 $self->{parent} 415 $self->{force_alloc} = 1 if $forced;
406 or return 1; 416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426} 417}
427 418
428sub update { 419sub update {
429 my ($self) = @_; 420 my ($self) = @_;
430 421
… …
445} 436}
446 437
447sub DESTROY { 438sub DESTROY {
448 my ($self) = @_; 439 my ($self) = @_;
449 440
441 delete $WIDGET{$self+0};
450 #$self->deactivate; 442 #$self->deactivate;
451} 443}
452 444
453############################################################################# 445#############################################################################
454 446
… …
527 519
528 $self 520 $self
529} 521}
530 522
531sub add { 523sub add {
532 my ($self, $child) = @_; 524 my ($self, @widgets) = @_;
533 525
534 $child->set_parent ($self); 526 $_->set_parent ($self)
527 for @widgets;
535 528
536 use sort 'stable'; 529 use sort 'stable';
537 530
538 $self->{children} = [ 531 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 532 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 533 @{$self->{children}}, @widgets
541 ]; 534 ];
542 535
543 $child->check_size; 536 $self->check_size (1);
537 $self->update;
544} 538}
545 539
546sub children { 540sub children {
547 @{ $_[0]{children} } 541 @{ $_[0]{children} }
548} 542}
… …
567 561
568 for (@$children) { 562 for (@$children) {
569 delete $_->{parent}; 563 delete $_->{parent};
570 $_->hide; 564 $_->hide;
571 } 565 }
566
567 $self->check_size;
568 $self->update;
572} 569}
573 570
574sub find_widget { 571sub find_widget {
575 my ($self, $x, $y) = @_; 572 my ($self, $x, $y) = @_;
576 573
… …
651} 648}
652 649
653sub update { 650sub update {
654 my ($self) = @_; 651 my ($self) = @_;
655 652
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 653 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 654 $self->SUPER::update;
658} 655}
659 656
660sub size_allocate { 657sub size_allocate {
661 my ($self, $w, $h) = @_; 658 my ($self, $w, $h) = @_;
662 659
663 $self->SUPER::size_allocate ($w, $h); 660 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 661 $self->update;
662}
663
664sub _render {
665 $_[0]{children}[0]->draw;
665} 666}
666 667
667sub render_child { 668sub render_child {
668 my ($self) = @_; 669 my ($self) = @_;
669 670
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 671 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 672 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 673 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 674
675 $self->_render;
674# glColorMask 1, 1, 1, 0; 676# glColorMask 1, 1, 1, 0;
675# glEnable GL_BLEND; 677# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO; 678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0; 679# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h}; 680# glCopyPixels 0, 0, $self->{w}, $self->{h};
… …
687 my ($w, $h) = ($self->w, $self->h); 689 my ($w, $h) = ($self->w, $self->h);
688 690
689 my $tex = $self->{texture} 691 my $tex = $self->{texture}
690 or return; 692 or return;
691 693
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
695 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; 696 glColor 0, 0, 0, 1;
697 697
698 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 699
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 700 glDisable GL_TEXTURE_2D;
702} 701}
703 702
704############################################################################# 703#############################################################################
705 704
706package CFClient::UI::ViewPort; 705package CFClient::UI::ViewPort;
707 706
708our @ISA = CFClient::UI::Window::; 707our @ISA = CFClient::UI::Window::;
709 708
710sub new { die }
711
712sub size_request { 709sub size_request {
713 my ($self) = @_; 710 my ($self) = @_;
714 711
715 @$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)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
717 714
718 @$self{qw(child_w child_h)} 715 @$self{qw(child_w child_h)}
719} 716}
720 717
721sub _draw { 718sub size_allocate {
722 my ($self) = @_; 719 my ($self, $w, $h) = @_;
723 720
724 $self->{children}[1]->draw; 721 $self->update;
725} 722}
726 723
724sub set_offset {
725 my ($self, $x, $y) = @_;
727 726
728############################################################################# 727 $self->{view_x} = int $x;
728 $self->{view_y} = int $y;
729 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
730package CFClient::UI::Frame; 771package CFClient::UI::ScrolledWindow;
731 772
732our @ISA = CFClient::UI::Bin::; 773our @ISA = CFClient::UI::HBox::;
733
734use CFClient::OpenGL;
735 774
736sub new { 775sub new {
737 my $class = shift; 776 my $class = shift;
738 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
739 my $self = $class->SUPER::new ( 788 $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1], 789 vp => (new CFClient::UI::ViewPort),
741 border_bg => [1, 1, 1, 1], 790 slider => $slider,
742 border => 0.8,
743 @_ 791 @_,
744 ); 792 );
745 793
794 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp});
796 $self->add ($self->{slider});
797
746 $self 798 $self
747} 799}
748 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
749sub _draw { 821sub _draw {
750 my ($self) = @_; 822 my ($self) = @_;
751 823
752 my ($w, $h) = ($self->{w}, $self->{h}); 824 if ($self->{bg}) {
825 my ($w, $h) = @$self{qw(w h)};
753 826
754 glEnable GL_BLEND; 827 glEnable GL_BLEND;
755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
756 glEnable GL_TEXTURE_2D; 829 glColor @{ $self->{bg} };
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758 830
759# glBegin GL_QUADS; 831 glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0; 832 glVertex 0 , 0;
762# glVertex 0 , $h; 833 glVertex 0 , $h;
763# glVertex $w, $h; 834 glVertex $w, $h;
764# glVertex $w, 0; 835 glVertex $w, 0;
765# glEnd; 836 glEnd;
766 837
767
768 $self->child->draw;
769 glDisable GL_BLEND; 838 glDisable GL_BLEND;
770 glDisable GL_TEXTURE_2D; 839 }
840
841 $self->SUPER::_draw;
771} 842}
772 843
773############################################################################# 844#############################################################################
774 845
775package CFClient::UI::FancyFrame; 846package CFClient::UI::FancyFrame;
… …
788 # TODO: user_x, user_y, overwrite moveto? 859 # TODO: user_x, user_y, overwrite moveto?
789 860
790 my $self = $class->SUPER::new ( 861 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 862 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 863 border_bg => [1, 1, 1, 1],
793 border => 0.8, 864 border => 0.6,
865 toplevel => 1,
794 can_events => 1, 866 can_events => 1,
795 @_ 867 @_
796 ); 868 );
797 869
798 $self->{title} &&= new CFClient::UI::Label 870 $self->{title} &&= new CFClient::UI::Label
799 align => 0, 871 align => 0,
800 valign => 1, 872 valign => 1,
801 text => $self->{title}, 873 text => $self->{title},
802 fontsize => 1; 874 fontsize => $self->{border};
803 875
804 $self 876 $self
805} 877}
806 878
807sub border { 879sub border {
… …
823 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
824 896
825 $h -= List::Util::max 0, $self->border * 2; 897 $h -= List::Util::max 0, $self->border * 2;
826 $w -= List::Util::max 0, $self->border * 2; 898 $w -= List::Util::max 0, $self->border * 2;
827 899
828 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 900 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
829 if $self->{title}; 901 if $self->{title};
830 902
831 $self->child->configure ($self->border, $self->border, $w, $h); 903 $self->child->configure ($self->border, $self->border, $w, $h);
832} 904}
833 905
834sub button_down { 906sub button_down {
835 my ($self, $ev, $x, $y) = @_; 907 my ($self, $ev, $x, $y) = @_;
836 908
909 my ($w, $h) = @$self{qw(w h)};
837 my $border = $self->border; 910 my $border = $self->border;
838 911
839 if ($x < $self->{w} && $x >= $self->{w} - $border 912 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
840 && $y < $self->{h} && $y >= $self->{h} - $border) { 913 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
841 914
915 if ($lr & $td) {
916 my ($wx, $wy) = ($self->{x}, $self->{y});
842 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 917 my ($ox, $oy) = ($ev->{x}, $ev->{y});
843 my ($bw, $bh) = ($self->{w}, $self->{h}); 918 my ($bw, $bh) = ($self->{w}, $self->{h});
844 919
920 my $mx = $x < $border;
921 my $my = $y < $border;
922
845 $self->{motion} = sub { 923 $self->{motion} = sub {
846 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
847 925
848 ($x, $y) = ($ev->{x}, $ev->{y}); 926 my $dx = $ev->{x} - $ox;
927 my $dy = $ev->{y} - $oy;
849 928
850 $self->{user_w} = $bw + $x - $ox; 929 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
851 $self->{user_h} = $bh + $y - $oy; 930 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
931 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
852 $self->check_size; 932 $self->check_size;
853 }; 933 };
854 934
855 } elsif ($x >= 0 && $x < $self->{w} 935 } elsif ($lr ^ $td) {
856 && $y >= 0 && $y < $border) {
857
858 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 936 my ($ox, $oy) = ($ev->{x}, $ev->{y});
859 my ($bx, $by) = ($self->{x}, $self->{y}); 937 my ($bx, $by) = ($self->{x}, $self->{y});
860 938
861 $self->{motion} = sub { 939 $self->{motion} = sub {
862 my ($ev, $x, $y) = @_; 940 my ($ev, $x, $y) = @_;
… …
885 my ($self) = @_; 963 my ($self) = @_;
886 964
887 my ($w, $h ) = ($self->{w}, $self->{h}); 965 my ($w, $h ) = ($self->{w}, $self->{h});
888 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
889 967
890 glEnable GL_BLEND;
891 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
892 glEnable GL_TEXTURE_2D; 968 glEnable GL_TEXTURE_2D;
893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
894 970
895 my $border = $self->border; 971 my $border = $self->border;
896 972
897 glColor @{ $self->{border_bg} }; 973 glColor @{ $self->{border_bg} };
898 $tex[1]->draw_quad (0, 0, $w, $border); 974 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
899 $tex[3]->draw_quad (0, $border, $border, $ch); 975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
900 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
901 $tex[4]->draw_quad (0, $h - $border, $w, $border); 977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
902 978
979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
903 my $bg = $tex[0]; 980 my $bg = $tex[0];
904 981
905 # TODO: repeat texture not scale 982 # TODO: repeat texture not scale
906 my $rep_x = $cw / $bg->{w}; 983 my $rep_x = $cw / $bg->{w};
907 my $rep_y = $ch / $bg->{h}; 984 my $rep_y = $ch / $bg->{h};
908 985
909 glColor @{ $self->{bg} }; 986 glColor @{ $self->{bg} };
910 987
911 $bg->{s} = $rep_x; 988 $bg->{s} = $rep_x;
912 $bg->{t} = $rep_y; 989 $bg->{t} = $rep_y;
913 $bg->{wrap_mode} = 1; 990 $bg->{wrap_mode} = 1;
914 $bg->draw_quad ($border, $border, $cw, $ch); 991 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 }
915 993
916 glDisable GL_TEXTURE_2D; 994 glDisable GL_TEXTURE_2D;
917 glDisable GL_BLEND;
918 995
919 $self->{title}->draw if $self->{title}; 996 $self->{title}->draw if $self->{title};
997
920 $self->child->draw; 998 $self->child->draw;
921} 999}
922 1000
923############################################################################# 1001#############################################################################
924 1002
… …
1148} 1226}
1149 1227
1150sub size_allocate { 1228sub size_allocate {
1151 my ($self, $w, $h) = @_; 1229 my ($self, $w, $h) = @_;
1152 1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1153 my $children = $self->{children}; 1233 my $children = $self->{children};
1154 1234
1155 my @h = map $_->{req_h}, @$children; 1235 my @h = map $_->{req_h}, @$children;
1156 1236
1157 my $req_h = List::Util::sum @h; 1237 my $req_h = List::Util::sum @h;
… …
1196 my ($class, %arg) = @_; 1276 my ($class, %arg) = @_;
1197 1277
1198 my $self = $class->SUPER::new ( 1278 my $self = $class->SUPER::new (
1199 fg => [1, 1, 1], 1279 fg => [1, 1, 1],
1200 #font => default_font 1280 #font => default_font
1281 #text => initial text
1282 #markup => initial narkup
1283 layout => (new CFClient::Layout),
1201 fontsize => 1, 1284 fontsize => 1,
1202 text => "",
1203 align => -1, 1285 align => -1,
1204 valign => -1, 1286 valign => -1,
1205 padding => 2, 1287 padding => 2,
1206 layout => new CFClient::Layout,
1207 can_events => 0, 1288 can_events => 0,
1208 %arg 1289 %arg
1209 ); 1290 );
1210 1291
1211 if (exists $self->{template}) { 1292 if (exists $self->{template}) {
1212 my $layout = new CFClient::Layout; 1293 my $layout = new CFClient::Layout;
1213 $layout->set_text (delete $self->{template}); 1294 $layout->set_text (delete $self->{template});
1214 $self->{template} = $layout; 1295 $self->{template} = $layout;
1215 } 1296 }
1216 1297
1217 $self->set_text (delete $self->{text}) if exists $self->{text}; 1298 if (exists $self->{markup}) {
1218 $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 }
1219 1303
1220 $self 1304 $self
1221} 1305}
1222 1306
1223sub escape { 1307sub escape {
… …
1235 1319
1236 delete $self->{texture}; 1320 delete $self->{texture};
1237 $self->SUPER::update; 1321 $self->SUPER::update;
1238} 1322}
1239 1323
1240sub reconfigure {
1241 my ($self) = @_;
1242
1243 delete $self->{texture};
1244}
1245
1246sub set_text { 1324sub set_text {
1247 my ($self, $text) = @_; 1325 my ($self, $text) = @_;
1248 1326
1249 return if $self->{text} eq "T$text"; 1327 return if $self->{text} eq "T$text";
1250 $self->{text} = "T$text"; 1328 $self->{text} = "T$text";
1251 1329
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1252 $self->{layout}->set_text ($text); 1331 $self->{layout}->set_text ($text);
1253 1332
1254 delete $self->{texture};
1255 $self->update; 1333 $self->update;
1256 $self->check_size; 1334 $self->check_size;
1257} 1335}
1258 1336
1259sub set_markup { 1337sub set_markup {
1260 my ($self, $markup) = @_; 1338 my ($self, $markup) = @_;
1261 1339
1262 return if $self->{text} eq "M$markup"; 1340 return if $self->{text} eq "M$markup";
1263 $self->{text} = "M$markup"; 1341 $self->{text} = "M$markup";
1264 1342
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344
1345 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1265 $self->{layout}->set_markup ($markup); 1346 $self->{layout}->set_markup ($markup);
1266 1347
1267 delete $self->{texture};
1268 $self->update; 1348 $self->update;
1269 $self->check_size; 1349 $self->check_size;
1270} 1350}
1271 1351
1272sub size_request { 1352sub size_request {
… …
1303sub set_fontsize { 1383sub set_fontsize {
1304 my ($self, $fontsize) = @_; 1384 my ($self, $fontsize) = @_;
1305 1385
1306 $self->{fontsize} = $fontsize; 1386 $self->{fontsize} = $fontsize;
1307 delete $self->{texture}; 1387 delete $self->{texture};
1388
1389 $self->update;
1308 $self->check_size; 1390 $self->check_size;
1309 $self->update;
1310} 1391}
1311 1392
1312sub _draw { 1393sub _draw {
1313 my ($self) = @_; 1394 my ($self) = @_;
1314 1395
1315 my $tex = $self->{texture} ||= do { 1396 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}});
1316 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1398 $self->{layout}->set_font ($self->{font}) if $self->{font};
1317 $self->{layout}->set_width ($self->{w}); 1399 $self->{layout}->set_width ($self->{w});
1318 $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
1319 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
1320 }; 1413 };
1321 1414
1322 glEnable GL_BLEND;
1323 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1324 glEnable GL_TEXTURE_2D; 1415 glEnable GL_TEXTURE_2D;
1325 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1326 1417
1418 if ($tex->{format} == GL_ALPHA) {
1327 glColor @{$self->{fg}}; 1419 glColor @{$self->{fg}};
1328
1329 $self->{ox} = int (
1330 $self->{align} < 0 ? $self->{padding}
1331 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1332 : ($self->{w} - $tex->{w}) * 0.5
1333 );
1334
1335 $self->{oy} = int (
1336 $self->{valign} < 0 ? $self->{padding}
1337 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1338 : ($self->{h} - $tex->{h}) * 0.5
1339 );
1340
1341 $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 }
1342 1424
1343 glDisable GL_TEXTURE_2D; 1425 glDisable GL_TEXTURE_2D;
1344 glDisable GL_BLEND;
1345} 1426}
1346 1427
1347############################################################################# 1428#############################################################################
1348 1429
1349package CFClient::UI::EntryBase; 1430package CFClient::UI::EntryBase;
… …
1384 $self->{layout}->set_text ("$text "); 1465 $self->{layout}->set_text ("$text ");
1385 1466
1386 $self->emit (changed => $self->{text}); 1467 $self->emit (changed => $self->{text});
1387} 1468}
1388 1469
1389sub get_text {
1390 $_[0]{text}
1391}
1392
1393sub size_request {
1394 my ($self) = @_;
1395
1396 my ($w, $h) = $self->SUPER::size_request;
1397
1398 ($w + 1, $h) # add 1 for cursor
1399}
1400
1401sub size_allocate {
1402 my ($self, $w, $h) = @_;
1403
1404 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1405}
1406
1407sub set_text { 1470sub set_text {
1408 my ($self, $text) = @_; 1471 my ($self, $text) = @_;
1409 1472
1410 $self->{cursor} = length $text; 1473 $self->{cursor} = length $text;
1411 $self->_set_text ($text); 1474 $self->_set_text ($text);
1412 $self->update; 1475 $self->update;
1476 $self->check_size;
1477}
1478
1479sub get_text {
1480 $_[0]{text}
1481}
1482
1483sub size_request {
1484 my ($self) = @_;
1485
1486 my ($w, $h) = $self->SUPER::size_request;
1487
1488 ($w + 1, $h) # add 1 for cursor
1489}
1490
1491sub size_allocate {
1492 my ($self, $w, $h) = @_;
1493
1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1413} 1495}
1414 1496
1415sub key_down { 1497sub key_down {
1416 my ($self, $ev) = @_; 1498 my ($self, $ev) = @_;
1417 1499
… …
1419 my $sym = $ev->{sym}; 1501 my $sym = $ev->{sym};
1420 my $uni = $ev->{unicode}; 1502 my $uni = $ev->{unicode};
1421 1503
1422 my $text = $self->get_text; 1504 my $text = $self->get_text;
1423 1505
1424 if ($sym == 8) { 1506 if ($uni == 8) {
1425 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1507 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1426 } elsif ($sym == 127) { 1508 } elsif ($uni == 127) {
1427 substr $text, $self->{cursor}, 1, ""; 1509 substr $text, $self->{cursor}, 1, "";
1428 } elsif ($sym == CFClient::SDLK_LEFT) { 1510 } elsif ($sym == CFClient::SDLK_LEFT) {
1429 --$self->{cursor} if $self->{cursor}; 1511 --$self->{cursor} if $self->{cursor};
1430 } elsif ($sym == CFClient::SDLK_RIGHT) { 1512 } elsif ($sym == CFClient::SDLK_RIGHT) {
1431 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1513 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1432 } elsif ($sym == CFClient::SDLK_HOME) { 1514 } elsif ($sym == CFClient::SDLK_HOME) {
1433 $self->{cursor} = 0; 1515 $self->{cursor} = 0;
1434 } elsif ($sym == CFClient::SDLK_END) { 1516 } elsif ($sym == CFClient::SDLK_END) {
1435 $self->{cursor} = length $text; 1517 $self->{cursor} = length $text;
1436 } elsif ($sym == 27) { 1518 } elsif ($uni == 27) {
1437 $self->emit ('escape'); 1519 $self->emit ('escape');
1438 } elsif ($uni) { 1520 } elsif ($uni) {
1439 substr $text, $self->{cursor}++, 0, chr $uni; 1521 substr $text, $self->{cursor}++, 0, chr $uni;
1440 } 1522 }
1441 1523
1442 $self->_set_text ($text); 1524 $self->_set_text ($text);
1443 $self->update; 1525 $self->update;
1526 $self->check_size;
1444} 1527}
1445 1528
1446sub focus_in { 1529sub focus_in {
1447 my ($self) = @_; 1530 my ($self) = @_;
1448 1531
… …
1605 1688
1606 if ($GRAB == $self) { 1689 if ($GRAB == $self) {
1607 $self->{fg} = $self->{active_fg}; 1690 $self->{fg} = $self->{active_fg};
1608 } 1691 }
1609 1692
1610 glEnable GL_BLEND;
1611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1612 glEnable GL_TEXTURE_2D; 1693 glEnable GL_TEXTURE_2D;
1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1614 glColor 0, 0, 0, 1; 1695 glColor 0, 0, 0, 1;
1615 1696
1616 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1697 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1617 1698
1618 glDisable GL_TEXTURE_2D; 1699 glDisable GL_TEXTURE_2D;
1619 glDisable GL_BLEND;
1620 1700
1621 $self->SUPER::_draw; 1701 $self->SUPER::_draw;
1622} 1702}
1623 1703
1624############################################################################# 1704#############################################################################
… …
1671 1751
1672 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1752 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1673 1753
1674 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1675 1755
1676 glEnable GL_BLEND; 1756 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757
1677 glEnable GL_TEXTURE_2D; 1758 glEnable GL_TEXTURE_2D;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679
1680 my $tex = $self->{state} ? $tex[1] : $tex[0];
1681
1682 $tex->draw_quad (0, 0, $s, $s); 1759 $tex->draw_quad_alpha (0, 0, $s, $s);
1683
1684 glDisable GL_TEXTURE_2D; 1760 glDisable GL_TEXTURE_2D;
1685 glDisable GL_BLEND;
1686} 1761}
1687 1762
1688############################################################################# 1763#############################################################################
1689 1764
1690package CFClient::UI::Image; 1765package CFClient::UI::Image;
… …
1733 glTranslate 0, -$self->{w}, 0; 1808 glTranslate 0, -$self->{w}, 0;
1734 1809
1735 ($w, $h) = ($h, $w); 1810 ($w, $h) = ($h, $w);
1736 } 1811 }
1737 1812
1738 glEnable GL_BLEND;
1739 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1740 glEnable GL_TEXTURE_2D; 1813 glEnable GL_TEXTURE_2D;
1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1742 1815
1743 $tex->draw_quad (0, 0, $w, $h); 1816 $tex->draw_quad_alpha (0, 0, $w, $h);
1744 1817
1745 glDisable GL_BLEND;
1746 glDisable GL_TEXTURE_2D; 1818 glDisable GL_TEXTURE_2D;
1747} 1819}
1748 1820
1749############################################################################# 1821#############################################################################
1750 1822
… …
1939 qw(s1_slider.png s1_slider_bg.png); 2011 qw(s1_slider.png s1_slider_bg.png);
1940 2012
1941sub new { 2013sub new {
1942 my $class = shift; 2014 my $class = shift;
1943 2015
1944 # range [value, low, high, page] 2016 # range [value, low, high, page, unit]
1945 2017
1946 # TODO: 0-width page 2018 # TODO: 0-width page
1947 # TODO: req_w/h are wrong with vertical 2019 # TODO: req_w/h are wrong with vertical
1948 # TODO: calculations are off 2020 # TODO: calculations are off
1949 my $self = $class->SUPER::new ( 2021 my $self = $class->SUPER::new (
1950 fg => [1, 1, 1], 2022 fg => [1, 1, 1],
1951 active_fg => [0, 0, 0], 2023 active_fg => [0, 0, 0],
1952 range => [0, 0, 100, 10], 2024 range => [0, 0, 100, 10],
1953 req_w => 20, 2025 req_w => $::WIDTH / 80,
1954 req_h => 20, 2026 req_h => $::WIDTH / 80,
1955 vertical => 0, 2027 vertical => 0,
1956 can_hover => 1, 2028 can_hover => 1,
1957 inner_pad => 5, 2029 inner_pad => .05,
1958 @_ 2030 @_
1959 ); 2031 );
1960 2032
2033 $self->set_value ($self->{range}[0]);
2034 $self->update;
2035
1961 $self 2036 $self
2037}
2038
2039sub set_value {
2040 my ($self, $value) = @_;
2041
2042 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2043
2044 $hi = $lo + 1 if $hi <= $lo;
2045
2046 $value = $lo if $value < $lo;
2047 $value = $hi if $value > $hi;
2048
2049 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2050 if $unit;
2051
2052 $page = $hi - $lo if $page > $hi - $lo;
2053
2054 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2055
2056 if ($value != $old_value) {
2057 $self->emit (changed => $value);
2058 $self->update;
2059 }
1962} 2060}
1963 2061
1964sub size_request { 2062sub size_request {
1965 my ($self) = @_; 2063 my ($self) = @_;
1966 2064
… …
1979 2077
1980sub mouse_motion { 2078sub mouse_motion {
1981 my ($self, $ev, $x, $y) = @_; 2079 my ($self, $ev, $x, $y) = @_;
1982 2080
1983 if ($GRAB == $self) { 2081 if ($GRAB == $self) {
2082 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2083
2084 my (undef, $lo, $hi, $page) = @{$self->{range}};
2085
2086 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2087
2088 $self->set_value ($x * ($hi - $lo) + $lo);
2089 }
2090}
2091
2092sub update {
2093 my ($self) = @_;
2094
2095 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2096 $self->set_value ($self->{range}[0]);
2097
1984 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2098 my ($value, $lo, $hi, $page) = @{$self->{range}};
1985 2099
1986 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2100 my $inner_w = 1 - 2 * $self->{inner_pad};
1987 2101
1988 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2102 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1989 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1990 2103
1991 $x -= $inner_pad_px; # substract the padding 2104 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1992 $x = $x * ($hi - $lo) / $inner_w + $lo; 2105 $value = $self->{scale} * ($value - $lo);
1993 $x = $lo if $x < $lo;
1994 $x = $hi - $page if $x > $hi - $page;
1995 $self->{range}[0] = $x;
1996 2106
1997 $self->emit (changed => $x); 2107 $value = $self->{inner_pad} + ($value - $page * 0.5);
1998 $self->update; 2108
2109 $value = 0 if $value < 0;
2110 $page = 1 - $value if $value + $page > 1;
2111
2112 $self->{knob_x} = $value;
2113 $self->{knob_w} = $page;
1999 } 2114 });
2000}
2001 2115
2002# the inner_* stuff is for generating a padding for the slider handle, 2116 $self->SUPER::update;
2003# so that the handle doesn't leave the texture. This calculation isn't 100%
2004# correct propably, but it does the job for now
2005sub _calc_inner_pad_px {
2006 my ($self, $w) = @_;
2007 ($w / 100) * $self->{inner_pad} # % to pixels
2008} 2117}
2009 2118
2010sub _draw { 2119sub _draw {
2011 my ($self) = @_; 2120 my ($self) = @_;
2012 2121
2013 $self->SUPER::_draw (); 2122 $self->SUPER::_draw ();
2014 2123
2015 my ($w, $h) = @$self{qw(w h)}; 2124 glScale $self->{w}, $self->{h};
2016 2125
2017 if ($self->{vertical}) { 2126 if ($self->{vertical}) {
2018 # draw a vertical slider like a rotated horizontal slider 2127 # draw a vertical slider like a rotated horizontal slider
2019 2128
2020 glRotate 90, 0, 0, 1; 2129 glRotate 90, 0, 0, 1;
2021 glTranslate 0, -$self->{w}, 0; 2130 glTranslate 0, 1, 0;
2022
2023 ($w, $h) = ($h, $w);
2024 } 2131 }
2025 2132
2026 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2133 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2027 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2134 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2028 2135
2029 my ($value, $lo, $hi, $page) = @{$self->{range}};
2030
2031 $hi = $value + 1 if $lo == $hi;
2032
2033 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2034 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2035
2036 $page = int $page * $inner_w / ($hi - $lo);
2037 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2038
2039 $w -= $page;
2040 $page &= ~1;
2041 glTranslate $page * 0.5, 0, 0;
2042 $page ||= 2;
2043
2044 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2045 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2046
2047 glEnable GL_BLEND;
2048 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2049 glEnable GL_TEXTURE_2D; 2136 glEnable GL_TEXTURE_2D;
2050 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2051 2138
2052 # draw background 2139 # draw background
2053 $tex[1]->draw_quad (0, 0, $w, $h); 2140 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2054 2141
2055 # draw handle 2142 # draw handle
2056 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2143 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2057 2144
2058 glDisable GL_BLEND;
2059 glDisable GL_TEXTURE_2D; 2145 glDisable GL_TEXTURE_2D;
2060} 2146}
2061 2147
2062############################################################################# 2148#############################################################################
2063 2149
… …
2074 fontsize => 1, 2160 fontsize => 1,
2075 can_events => 0, 2161 can_events => 0,
2076 #font => default_font 2162 #font => default_font
2077 @_, 2163 @_,
2078 2164
2079 layout => (new CFClient::Layout), 2165 layout => (new CFClient::Layout 1),
2080 par => [], 2166 par => [],
2081 height => 0, 2167 height => 0,
2082 children => [ 2168 children => [
2083 (new CFClient::UI::Empty expand => 1), 2169 (new CFClient::UI::Empty expand => 1),
2084 (new CFClient::UI::Slider vertical => 1), 2170 (new CFClient::UI::Slider vertical => 1),
2085 ], 2171 ],
2086 ); 2172 );
2087 2173
2088 $self->{children}[1]->connect (changed => sub { 2174 $self->{children}[1]->connect (changed => sub { $self->update });
2089 $self->update;
2090 });
2091 2175
2092 $self 2176 $self
2093} 2177}
2094 2178
2095sub set_fontsize { 2179sub set_fontsize {
… …
2103 my ($self, $text) = @_; 2187 my ($self, $text) = @_;
2104 2188
2105 my $layout = $self->{layout}; 2189 my $layout = $self->{layout};
2106 2190
2107 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2191 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2108 $layout->set_width ($self->{w}); 2192 $layout->set_width ($self->{children}[0]{w});
2109 $layout->set_text ($text); 2193 $layout->set_markup ($text);
2110 2194
2111 ($layout->size)[1] 2195 ($layout->size)[1]
2112} 2196}
2113 2197
2114sub reflow { 2198sub reflow {
… …
2152 2236
2153 return unless $self->{h} > 0; 2237 return unless $self->{h} > 0;
2154 2238
2155 delete $self->{texture}; 2239 delete $self->{texture};
2156 2240
2157 $ROOT->on_refresh ($self, sub { 2241 $ROOT->on_post_alloc ($self, sub {
2158 if (delete $self->{need_reflow}) { 2242 if (delete $self->{need_reflow}) {
2159 my $height = 0; 2243 my $height = 0;
2160 2244
2161 $height += $_->[0] = $self->text_height ($_->[2]) 2245 $height += $_->[0] = $self->text_height ($_->[2])
2162 for @{$self->{par}}; 2246 for @{$self->{par}};
… …
2166 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2250 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2167 2251
2168 delete $self->{texture}; 2252 delete $self->{texture};
2169 } 2253 }
2170 2254
2171 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2255 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2172 glClearColor 0, 0, 0, 0; 2256 glClearColor 0, 0, 0, 0;
2173 glClear GL_COLOR_BUFFER_BIT; 2257 glClear GL_COLOR_BUFFER_BIT;
2174 2258
2175 glEnable GL_BLEND;
2176 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2177 glEnable GL_TEXTURE_2D; 2259 glEnable GL_TEXTURE_2D;
2178 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2179 2261
2180 my $top = int $self->{children}[1]{range}[0]; 2262 my $top = int $self->{children}[1]{range}[0];
2181 2263
… …
2190 2272
2191 for my $par (@{$self->{par}}) { 2273 for my $par (@{$self->{par}}) {
2192 my $h = $par->[0]; 2274 my $h = $par->[0];
2193 2275
2194 if ($y0 < $y + $h && $y < $y1) { 2276 if ($y0 < $y + $h && $y < $y1) {
2277 $layout->set_foreground (@{ $par->[1] });
2195 $layout->set_text ($par->[2]); 2278 $layout->set_markup ($par->[2]);
2196 2279
2197 glColor @{ $par->[1] };
2198 my ($W, $H) = $layout->size; 2280 my ($W, $H) = $layout->size;
2199 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2281 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2200 } 2282 }
2201 2283
2202 $y += $h; 2284 $y += $h;
2203 } 2285 }
2204 2286
2205 glDisable GL_TEXTURE_2D; 2287 glDisable GL_TEXTURE_2D;
2206 glDisable GL_BLEND;
2207 }; 2288 };
2208 }); 2289 });
2209} 2290}
2210 2291
2211sub _draw { 2292sub _draw {
2212 my ($self) = @_; 2293 my ($self) = @_;
2213 2294
2214 if ($self->{texture}) {
2215 glEnable GL_BLEND;
2216 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2217 glEnable GL_TEXTURE_2D; 2295 glEnable GL_TEXTURE_2D;
2218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2219 glColor 1, 1, 1, 1; 2297 glColor 1, 1, 1, 1;
2220 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2298 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2221 glDisable GL_TEXTURE_2D; 2299 glDisable GL_TEXTURE_2D;
2222 glDisable GL_BLEND;
2223 }
2224 2300
2225 $self->{children}[1]->draw; 2301 $self->{children}[1]->draw;
2226 2302
2227} 2303}
2228 2304
… …
2322 @_, 2398 @_,
2323 can_events => 0, 2399 can_events => 0,
2324 ) 2400 )
2325} 2401}
2326 2402
2327sub set_markup { 2403sub set_tooltip_from {
2328 my ($self, $text) = @_; 2404 my ($self, $widget) = @_;
2329 2405
2330 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2406 $self->add (new CFClient::UI::Label
2331 $self->{label}->set_markup ($text); 2407 markup => $widget->{tooltip},
2332 $self->add ($self->{label}); 2408 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2409 fontsize => 0.8,
2410 fg => [0, 0, 0, 1],
2411 font => ($widget->{tooltip_font} || $::FONT_PROP),
2412 );
2333} 2413}
2334 2414
2335sub size_request { 2415sub size_request {
2336 my ($self) = @_; 2416 my ($self) = @_;
2337
2338 $self->child->set_max_size ($::WIDTH * 0.3);
2339 2417
2340 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2418 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2341 2419
2342 ($w + 4, $h + 4) 2420 ($w + 4, $h + 4)
2343} 2421}
… …
2349} 2427}
2350 2428
2351sub _draw { 2429sub _draw {
2352 my ($self) = @_; 2430 my ($self) = @_;
2353 2431
2354 glPushMatrix;
2355 glTranslate 0.375, 0.375; 2432 glTranslate 0.375, 0.375;
2356 2433
2357 my ($w, $h) = @$self{qw(w h)}; 2434 my ($w, $h) = @$self{qw(w h)};
2358 2435
2359 glColor 1, 0.8, 0.4; 2436 glColor 1, 0.8, 0.4;
… …
2370 glVertex 0 , $h; 2447 glVertex 0 , $h;
2371 glVertex $w, $h; 2448 glVertex $w, $h;
2372 glVertex $w, 0; 2449 glVertex $w, 0;
2373 glEnd; 2450 glEnd;
2374 2451
2375 glPopMatrix; 2452 glTranslate 2 - 0.375, 2 - 0.375;
2376
2377 glTranslate 2, 2;
2378 $self->SUPER::_draw; 2453 $self->SUPER::_draw;
2379} 2454}
2380 2455
2381############################################################################# 2456#############################################################################
2382 2457
… …
2397 2472
2398sub size_request { 2473sub size_request {
2399 (32, 8) 2474 (32, 8)
2400} 2475}
2401 2476
2402sub draw { 2477sub _draw {
2403 my ($self) = @_; 2478 my ($self) = @_;
2404 2479
2480 return unless $::CONN;#d# manage and cache textures differently
2405 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2481 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2406 2482
2483 # TODO animation
2407 if ($tex) { 2484 if ($tex) {
2408 glEnable GL_BLEND;
2409 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2410 glEnable GL_TEXTURE_2D; 2485 glEnable GL_TEXTURE_2D;
2411 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2412 glColor 1, 1, 1, 1; 2487 glColor 1, 1, 1, 1;
2413 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2488 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2414 glDisable GL_TEXTURE_2D; 2489 glDisable GL_TEXTURE_2D;
2415 glDisable GL_BLEND;
2416 } 2490 }
2491}
2492
2493#############################################################################
2494
2495package CFClient::UI::InventoryItem;
2496
2497our @ISA = CFClient::UI::HBox::;
2498
2499sub new {
2500 my $class = shift;
2501
2502 my %args = @_;
2503
2504 my $item = delete $args{item};
2505
2506 my $desc = $item->{nrof} < 2
2507 ? $item->{name}
2508 : "$item->{nrof} $item->{name_pl}";
2509
2510 $item->{flags} & Crossfire::Protocol::F_OPEN
2511 and $desc .= " (open)";
2512 $item->{flags} & Crossfire::Protocol::F_APPLIED
2513 and $desc .= " (applied)";
2514 $item->{flags} & Crossfire::Protocol::F_UNPAID
2515 and $desc .= " (unpaid)";
2516 $item->{flags} & Crossfire::Protocol::F_MAGIC
2517 and $desc .= " (magic)";
2518 $item->{flags} & Crossfire::Protocol::F_CURSED
2519 and $desc .= " (cursed)";
2520 $item->{flags} & Crossfire::Protocol::F_DAMNED
2521 and $desc .= " (damned)";
2522 $item->{flags} & Crossfire::Protocol::F_LOCKED
2523 and $desc .= " *";
2524
2525 my $self = $class->SUPER::new (
2526 can_hover => 1,
2527 can_events => 1,
2528 tooltip => (CFClient::UI::Label->escape ($desc)
2529 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2530 connect_button_down => sub {
2531 my ($self, $ev, $x, $y) = @_;
2532
2533 # todo: maybe put examine on 1? but should just be a tooltip :(
2534 if ($ev->{button} == 1) {
2535 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2536 } elsif ($ev->{button} == 2) {
2537 $::CONN->send ("apply $item->{tag}");
2538 } elsif ($ev->{button} == 3) {
2539 my @menu_items = (
2540 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2541 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2542 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2543 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2544 [
2545 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2546 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2547 ],
2548 );
2549
2550 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2551 }
2552
2553 1
2554 },
2555 %args
2556 );
2557
2558 $self->add (new CFClient::UI::Face
2559 can_events => 0,
2560 face => $item->{face},
2561 anim => $item->{anim},
2562 animspeed => $item->{animspeed},
2563 );
2564
2565 $self->add (new CFClient::UI::Label
2566 can_events => 0,
2567 text => $desc,
2568 );
2569
2570 $self
2571}
2572
2573#############################################################################
2574
2575package CFClient::UI::Inventory;
2576
2577our @ISA = CFClient::UI::ScrolledWindow::;
2578
2579sub new {
2580 my $class = shift;
2581
2582 my $self = $class->SUPER::new (
2583 scrolled => (new CFClient::UI::VBox),
2584 @_,
2585 );
2586
2587 $self
2588}
2589
2590sub set_items {
2591 my ($self, $items) = @_;
2592
2593 $self->{scrolled}->clear;
2594 return unless $items;
2595
2596 my @items = sort {
2597 ($a->{type} <=> $b->{type})
2598 or ($a->{name} cmp $b->{name})
2599 } @$items;
2600
2601 $self->{real_items} = \@items;
2602
2603 for my $item (@items) {
2604 my $desc = $item->{nrof} < 2
2605 ? $item->{name}
2606 : "$item->{nrof} $item->{name_pl}";
2607
2608 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2609 }
2610
2611 $self->{scrolled}->add (@items);
2612
2613# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2614}
2615
2616sub size_request {
2617 my ($self) = @_;
2618 ($self->{req_w}, $self->{req_h});
2619}
2620
2621#############################################################################
2622
2623package CFClient::UI::Menu;
2624
2625our @ISA = CFClient::UI::FancyFrame::;
2626
2627use CFClient::OpenGL;
2628
2629sub new {
2630 my $class = shift;
2631
2632 my $self = $class->SUPER::new (
2633 items => [],
2634 z => 100,
2635 @_,
2636 );
2637
2638 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2639
2640 for my $item (@{ $self->{items} }) {
2641 my ($widget, $cb) = @$item;
2642
2643 # handle various types of items, only text for now
2644 if (!ref $widget) {
2645 $widget = new CFClient::UI::Label
2646 can_hover => 1,
2647 can_events => 1,
2648 text => $widget;
2649 }
2650
2651 $self->{item}{$widget} = $item;
2652
2653 $self->{vbox}->add ($widget);
2654 }
2655
2656 $self
2657}
2658
2659# popup given the event (must be a mouse button down event currently)
2660sub popup {
2661 my ($self, $ev) = @_;
2662
2663 $self->emit ("popdown");
2664
2665 # maybe save $GRAB? must be careful about events...
2666 $GRAB = $self;
2667 $self->{button} = $ev->{button};
2668
2669 $self->show;
2670 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2671}
2672
2673sub mouse_motion {
2674 my ($self, $ev, $x, $y) = @_;
2675
2676 # TODO: should use vbox->find_widget or so
2677 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2678 $self->{hover} = $self->{item}{$HOVER};
2679}
2680
2681sub button_up {
2682 my ($self, $ev, $x, $y) = @_;
2683
2684 if ($ev->{button} == $self->{button}) {
2685 undef $GRAB;
2686 $self->hide;
2687
2688 $self->emit ("popdown");
2689 $self->{hover}[1]->() if $self->{hover};
2690 }
2691}
2692
2693#############################################################################
2694
2695package CFClient::UI::Statusbox;
2696
2697our @ISA = CFClient::UI::VBox::;
2698
2699sub reorder {
2700 my ($self) = @_;
2701 my $NOW = time;
2702
2703 while (my ($k, $v) = each %{ $self->{item} }) {
2704 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2705 }
2706
2707 my @widgets;
2708
2709 my @items = sort {
2710 $a->{pri} <=> $b->{pri}
2711 or $b->{id} <=> $a->{id}
2712 } values %{ $self->{item} };
2713
2714 my $count = 10 + 1;
2715 for my $item (@items) {
2716 last unless --$count;
2717
2718 push @widgets, $item->{label} ||= do {
2719 # TODO: doesn't handle markup well (read as: at all)
2720 my $short = $item->{count} > 1
2721 ? "<b>$item->{count} ×</b> $item->{text}"
2722 : $item->{text};
2723
2724 for ($short) {
2725 s/^\s+//;
2726 s/\s+/ /g;
2727 my $len = int 40 / $item->{fontsize};
2728 substr $_, $len, length, "…" if $len < length;
2729 }
2730
2731 new CFClient::UI::Label
2732 markup => $short,
2733 tooltip => $item->{tooltip},
2734 tooltip_font => $::FONT_PROP,
2735 tooltip_width => 0.67,
2736 fontsize => $item->{fontsize},
2737 fg => $item->{fg},
2738 can_events => 1,
2739 can_hover => 1
2740 };
2741 }
2742
2743 $self->clear;
2744 $self->SUPER::add (reverse @widgets);
2745}
2746
2747sub add {
2748 my ($self, $text, %arg) = @_;
2749
2750 $text =~ s/^\s+//;
2751 $text =~ s/\s+$//;
2752
2753 my $timeout = time + ((delete $arg{timeout}) || 60);
2754
2755 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2756
2757 if (my $item = $self->{item}{$group}) {
2758 if ($item->{text} eq $text) {
2759 $item->{count}++;
2760 } else {
2761 $item->{count} = 1;
2762 $item->{text} = $item->{tooltip} = $text;
2763 }
2764 $item->{id} = ++$self->{id};
2765 $item->{timeout} = $timeout;
2766 delete $item->{label};
2767 } else {
2768 $self->{item}{$group} = {
2769 id => ++$self->{id},
2770 text => $text,
2771 timeout => $timeout,
2772 tooltip => $text,
2773 fontsize => 0.8,
2774 fg => [0.8, 0.8, 0.8, 0.8],
2775 pri => 0,
2776 count => 1,
2777 %arg,
2778 };
2779 }
2780
2781 $self->reorder;
2417} 2782}
2418 2783
2419############################################################################# 2784#############################################################################
2420 2785
2421package CFClient::UI::Root; 2786package CFClient::UI::Root;
2422 2787
2423our @ISA = CFClient::UI::Container::; 2788our @ISA = CFClient::UI::Container::;
2424 2789
2425use CFClient::OpenGL; 2790use CFClient::OpenGL;
2426 2791
2427sub check_size { 2792sub new {
2428 my ($self) = @_; 2793 my $class = shift;
2429 2794
2430 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2795 $class->SUPER::new (
2431} 2796 @_,
2432 2797 )
2433sub size_request {
2434 ($::WIDTH, $::HEIGHT)
2435} 2798}
2436 2799
2437sub configure { 2800sub configure {
2438 my ($self, $x, $y, $w, $h) = @_; 2801 my ($self, $x, $y, $w, $h) = @_;
2439 2802
2440 $self->SUPER::configure ($x, $y, $w, $h); 2803 $self->{w} = $w;
2804 $self->{h} = $h;
2805}
2441 2806
2807sub check_size {
2808 my ($self) = @_;
2809
2810 $self->size_allocate ($self->{w}, $self->{h})
2811 if $self->{w};
2812}
2813
2814sub size_request {
2815 my ($self) = @_;
2816
2817 ($self->{w}, $self->{h})
2818}
2819
2820sub size_allocate {
2821 my ($self, $w, $h) = @_;
2822
2823 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2824 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2825
2826 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2827 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2828
2442 for my $child (@{$self->{children}}) { 2829 for my $child ($self->children) {
2443 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2830 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2444 2831
2832 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2833 if exists $child->{req_x};
2834
2835 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2836 if exists $child->{req_y};
2837
2445 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2838 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2446 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2839 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2840
2447 $child->configure ($X, $Y, $W,$H); 2841 $child->configure ($X, $Y, $W, $H);
2448 } 2842 }
2449} 2843}
2450 2844
2451sub _topleft { 2845sub coord2local {
2452 my ($self, $x, $y) = @_; 2846 my ($self, $x, $y) = @_;
2453 2847
2454 ($x, $y) 2848 ($x, $y)
2455} 2849}
2456 2850
2851sub coord2global {
2852 my ($self, $x, $y) = @_;
2853
2854 ($x, $y)
2855}
2856
2457sub update { 2857sub update {
2458 my ($self) = @_; 2858 my ($self) = @_;
2459 2859
2460 $self->check_size; 2860 $self->check_size;
2461 ::refresh (); 2861 $::WANT_REFRESH++;
2462} 2862}
2463 2863
2464sub add { 2864sub add {
2465 my ($self, $child) = @_; 2865 my ($self, @children) = @_;
2466 2866
2867 for my $child (@children) {
2868 $child->{toplevel} = 1;
2869
2467 # integerize window positions 2870 # integerise window positions
2468 $child->{x} = int $child->{x}; 2871 $child->{x} = int $child->{x};
2469 $child->{y} = int $child->{y}; 2872 $child->{y} = int $child->{y};
2873 }
2470 2874
2471 $self->SUPER::add ($child); 2875 $self->SUPER::add (@children);
2472} 2876}
2473 2877
2474sub on_refresh { 2878sub on_refresh {
2475 my ($self, $id, $cb) = @_; 2879 my ($self, $id, $cb) = @_;
2476 2880
2477 $self->{refresh_hook}{$id} = $cb; 2881 $self->{refresh_hook}{$id} = $cb;
2478} 2882}
2479 2883
2884sub on_post_alloc {
2885 my ($self, $id, $cb) = @_;
2886
2887 $self->{post_alloc_hook}{$id} = $cb;
2888}
2889
2480sub draw { 2890sub draw {
2481 my ($self) = @_; 2891 my ($self) = @_;
2482 2892
2483 while (my $rcb = delete $self->{refresh_hook}) { 2893 while ($self->{refresh_hook}) {
2484 $_->() for values %$rcb; 2894 $_->()
2895 for values %{delete $self->{refresh_hook}};
2896 }
2897
2898 if ($self->{check_size}) {
2899 my @queue = ([], []);
2900
2901 for (;;) {
2902 if ($self->{check_size}) {
2903 # heuristic: check containers last
2904 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2905 for values %{delete $self->{check_size}}
2906 }
2907
2908 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2909
2910 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2911 ? @$widget{qw(user_w user_h)}
2912 : $widget->size_request;
2913
2914 if (delete $widget->{force_alloc}
2915 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2916 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2917
2918 $widget->{req_w} = $w;
2919 $widget->{req_h} = $h;
2920
2921 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2922
2923 $widget->{parent}->check_size
2924 if $widget->{parent};
2925 }
2926 }
2927 }
2928
2929 while ($self->{size_alloc}) {
2930 for (values %{delete $self->{size_alloc}}) {
2931 my ($widget, $w, $h) = @$_;
2932
2933 $w = 0 if $w < 0;
2934 $h = 0 if $h < 0;
2935
2936 $widget->{w} = $w;
2937 $widget->{h} = $h;
2938 $widget->size_allocate ($w, $h);
2939 $widget->emit (size_allocate => $w, $h);
2940 }
2941 }
2942
2943 while ($self->{post_alloc_hook}) {
2944 $_->()
2945 for values %{delete $self->{post_alloc_hook}};
2485 } 2946 }
2486 2947
2487 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2948 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2488 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2949 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2489 glClear GL_COLOR_BUFFER_BIT; 2950 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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