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.173 by root, Tue Apr 25 10:30:48 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
241sub children { 277sub children {
242}
243
244# call when resoltuion changes etc.
245sub reconfigure {
246 my ($self) = @_;
247
248 $_->reconfigure
249 for $self->children;
250
251 $_->check_size;
252} 278}
253 279
254sub set_max_size { 280sub set_max_size {
255 my ($self, $w, $h) = @_; 281 my ($self, $w, $h) = @_;
256 282
257 delete $self->{max_w}; $self->{max_w} = $w if $w; 283 delete $self->{max_w}; $self->{max_w} = $w if $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h; 284 delete $self->{max_h}; $self->{max_h} = $h if $h;
259}
260
261# return top left coordinates
262sub _topleft {
263 my ($self, $x, $y) = @_;
264
265 $self->{parent}
266 or Carp::confess "no parent widget in _topleft\n";#d#
267
268 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
269} 285}
270 286
271# translate global coordinates to local coordinate system 287# translate global coordinates to local coordinate system
272sub coord2local { 288sub coord2local {
273 my ($self, $x, $y) = @_; 289 my ($self, $x, $y) = @_;
274 290
275 my ($X, $Y) = $self->_topleft; 291 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
276 ($x - $X, $y - $Y)
277} 292}
278 293
279# translate local coordinates to global coordinate system 294# translate local coordinates to global coordinate system
280sub coord2global { 295sub coord2global {
281 my ($self, $x, $y) = @_; 296 my ($self, $x, $y) = @_;
282 297
283 my ($X, $Y) = $self->_topleft; 298 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
284 ($x + $X, $y + $Y)
285} 299}
286 300
287sub focus_in { 301sub focus_in {
288 my ($self) = @_; 302 my ($self) = @_;
289 303
… …
361 glVertex $self->{w}, 0; 375 glVertex $self->{w}, 0;
362 glVertex $self->{w}, $self->{h}; 376 glVertex $self->{w}, $self->{h};
363 glVertex 0 , $self->{h}; 377 glVertex 0 , $self->{h};
364 glEnd; 378 glEnd;
365 glPopMatrix; 379 glPopMatrix;
366 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;
367 } 381 }
368} 382}
369 383
370sub _draw { 384sub _draw {
371 my ($self) = @_; 385 my ($self) = @_;
… …
387 401
388sub set_parent { 402sub set_parent {
389 my ($self, $parent) = @_; 403 my ($self, $parent) = @_;
390 404
391 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};
392} 410}
393 411
394sub check_size { 412sub check_size {
395 my ($self) = @_; 413 my ($self, $forced) = @_;
396 414
397 $self->{parent} 415 $self->{force_alloc} = 1 if $forced;
398 or return 1; 416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
399
400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
403
404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
405 $self->{req_w} = $w;
406 $self->{req_h} = $h;
407
408 $self->{parent}->check_size
409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
417 }
418} 417}
419 418
420sub update { 419sub update {
421 my ($self) = @_; 420 my ($self) = @_;
422 421
… …
437} 436}
438 437
439sub DESTROY { 438sub DESTROY {
440 my ($self) = @_; 439 my ($self) = @_;
441 440
441 delete $WIDGET{$self+0};
442 #$self->deactivate; 442 #$self->deactivate;
443} 443}
444 444
445############################################################################# 445#############################################################################
446 446
… …
519 519
520 $self 520 $self
521} 521}
522 522
523sub add { 523sub add {
524 my ($self, $child) = @_; 524 my ($self, @widgets) = @_;
525 525
526 $child->set_parent ($self); 526 $_->set_parent ($self)
527 for @widgets;
527 528
528 use sort 'stable'; 529 use sort 'stable';
529 530
530 $self->{children} = [ 531 $self->{children} = [
531 sort { $a->{z} <=> $b->{z} } 532 sort { $a->{z} <=> $b->{z} }
532 @{$self->{children}}, $child 533 @{$self->{children}}, @widgets
533 ]; 534 ];
534 535
535 $child->check_size; 536 $self->check_size (1);
537 $self->update;
536} 538}
537 539
538sub children { 540sub children {
539 @{ $_[0]{children} } 541 @{ $_[0]{children} }
540} 542}
… …
559 561
560 for (@$children) { 562 for (@$children) {
561 delete $_->{parent}; 563 delete $_->{parent};
562 $_->hide; 564 $_->hide;
563 } 565 }
566
567 $self->check_size;
568 $self->update;
564} 569}
565 570
566sub find_widget { 571sub find_widget {
567 my ($self, $x, $y) = @_; 572 my ($self, $x, $y) = @_;
568 573
… …
643} 648}
644 649
645sub update { 650sub update {
646 my ($self) = @_; 651 my ($self) = @_;
647 652
648 # we want to do this delayed... 653 $ROOT->on_post_alloc ($self => sub { $self->render_child });
649 $self->render_chld;
650 $self->SUPER::update; 654 $self->SUPER::update;
651}
652
653sub render_chld {
654 my ($self) = @_;
655
656 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
657 glClearColor 0, 0, 0, 1;
658 glClear GL_COLOR_BUFFER_BIT;
659 $self->child->draw;
660 };
661} 655}
662 656
663sub size_allocate { 657sub size_allocate {
664 my ($self, $w, $h) = @_; 658 my ($self, $w, $h) = @_;
665 659
666 $self->child->configure (0, 0, $w, $h); 660 $self->SUPER::size_allocate ($w, $h);
661 $self->update;
662}
667 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
668 $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 };
669} 684}
670 685
671sub _draw { 686sub _draw {
672 my ($self) = @_; 687 my ($self) = @_;
673 688
674 my ($w, $h) = ($self->w, $self->h); 689 my ($w, $h) = ($self->w, $self->h);
675 690
676 my $tex = $self->{texture} 691 my $tex = $self->{texture}
677 or return; 692 or return;
678 693
679 glEnable GL_BLEND;
680 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
681 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
682 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;
683 697
684 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
685 699
686 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 700 glDisable GL_TEXTURE_2D;
688} 701}
689 702
690############################################################################# 703#############################################################################
691 704
692package CFClient::UI::ViewPort; 705package CFClient::UI::ViewPort;
693 706
694our @ISA = CFClient::UI::Window::; 707our @ISA = CFClient::UI::Window::;
695 708
696sub new { die }
697
698sub size_request { 709sub size_request {
699 my ($self) = @_; 710 my ($self) = @_;
700 711
701 @$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)};
702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
703 714
704 @$self{qw(child_w child_h)} 715 @$self{qw(child_w child_h)}
705} 716}
706 717
707sub _draw { 718sub size_allocate {
708 my ($self) = @_; 719 my ($self, $w, $h) = @_;
709 720
710 $self->{children}[1]->draw; 721 $self->update;
711} 722}
712 723
724sub set_offset {
725 my ($self, $x, $y) = @_;
713 726
714############################################################################# 727 $self->{view_x} = int $x;
728 $self->{view_y} = int $y;
715 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
716package CFClient::UI::Frame; 771package CFClient::UI::ScrolledWindow;
717 772
718our @ISA = CFClient::UI::Bin::; 773our @ISA = CFClient::UI::HBox::;
719
720use CFClient::OpenGL;
721 774
722sub new { 775sub new {
723 my $class = shift; 776 my $class = shift;
724 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
725 my $self = $class->SUPER::new ( 788 $self = $class->SUPER::new (
726 bg => [1, 1, 1, 1], 789 vp => (new CFClient::UI::ViewPort),
727 border_bg => [1, 1, 1, 1], 790 slider => $slider,
728 border => 0.8,
729 @_ 791 @_,
730 ); 792 );
731 793
794 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp});
796 $self->add ($self->{slider});
797
732 $self 798 $self
733} 799}
734 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
735sub _draw { 821sub _draw {
736 my ($self) = @_; 822 my ($self) = @_;
737 823
738 my ($w, $h) = ($self->{w}, $self->{h}); 824 if ($self->{bg}) {
825 my ($w, $h) = @$self{qw(w h)};
739 826
740 glEnable GL_BLEND; 827 glEnable GL_BLEND;
741 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
742 glEnable GL_TEXTURE_2D; 829 glColor @{ $self->{bg} };
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744 830
745# glBegin GL_QUADS; 831 glBegin GL_QUADS;
746# glColor 0, 0, 0, 0;
747# glVertex 0 , 0; 832 glVertex 0 , 0;
748# glVertex 0 , $h; 833 glVertex 0 , $h;
749# glVertex $w, $h; 834 glVertex $w, $h;
750# glVertex $w, 0; 835 glVertex $w, 0;
751# glEnd; 836 glEnd;
752 837
753
754 $self->child->draw;
755 glDisable GL_BLEND; 838 glDisable GL_BLEND;
756 glDisable GL_TEXTURE_2D; 839 }
840
841 $self->SUPER::_draw;
757} 842}
758 843
759############################################################################# 844#############################################################################
760 845
761package CFClient::UI::FancyFrame; 846package CFClient::UI::FancyFrame;
… …
774 # TODO: user_x, user_y, overwrite moveto? 859 # TODO: user_x, user_y, overwrite moveto?
775 860
776 my $self = $class->SUPER::new ( 861 my $self = $class->SUPER::new (
777 bg => [1, 1, 1, 1], 862 bg => [1, 1, 1, 1],
778 border_bg => [1, 1, 1, 1], 863 border_bg => [1, 1, 1, 1],
779 border => 0.8, 864 border => 0.6,
865 toplevel => 1,
780 can_events => 1, 866 can_events => 1,
781 @_ 867 @_
782 ); 868 );
783 869
784 $self->{title} &&= new CFClient::UI::Label 870 $self->{title} &&= new CFClient::UI::Label
785 align => 0, 871 align => 0,
786 valign => 1, 872 valign => 1,
787 text => $self->{title}, 873 text => $self->{title},
788 fontsize => 1; 874 fontsize => $self->{border};
789 875
790 $self 876 $self
791} 877}
792 878
793sub border { 879sub border {
… …
818} 904}
819 905
820sub button_down { 906sub button_down {
821 my ($self, $ev, $x, $y) = @_; 907 my ($self, $ev, $x, $y) = @_;
822 908
909 my ($w, $h) = @$self{qw(w h)};
823 my $border = $self->border; 910 my $border = $self->border;
824 911
825 if ($x < $self->{w} && $x >= $self->{w} - $border 912 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
826 && $y < $self->{h} && $y >= $self->{h} - $border) { 913 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
827 914
915 if ($lr & $td) {
916 my ($wx, $wy) = ($self->{x}, $self->{y});
828 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 917 my ($ox, $oy) = ($ev->{x}, $ev->{y});
829 my ($bw, $bh) = ($self->{w}, $self->{h}); 918 my ($bw, $bh) = ($self->{w}, $self->{h});
830 919
920 my $mx = $x < $border;
921 my $my = $y < $border;
922
831 $self->{motion} = sub { 923 $self->{motion} = sub {
832 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
833 925
834 ($x, $y) = ($ev->{x}, $ev->{y}); 926 my $dx = $ev->{x} - $ox;
927 my $dy = $ev->{y} - $oy;
835 928
836 $self->{user_w} = $bw + $x - $ox; 929 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
837 $self->{user_h} = $bh + $y - $oy; 930 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
931 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
838 $self->check_size; 932 $self->check_size;
839 }; 933 };
840 934
841 } elsif ($x >= 0 && $x < $self->{w} 935 } elsif ($lr ^ $td) {
842 && $y >= 0 && $y < $border) {
843
844 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 936 my ($ox, $oy) = ($ev->{x}, $ev->{y});
845 my ($bx, $by) = ($self->{x}, $self->{y}); 937 my ($bx, $by) = ($self->{x}, $self->{y});
846 938
847 $self->{motion} = sub { 939 $self->{motion} = sub {
848 my ($ev, $x, $y) = @_; 940 my ($ev, $x, $y) = @_;
… …
871 my ($self) = @_; 963 my ($self) = @_;
872 964
873 my ($w, $h ) = ($self->{w}, $self->{h}); 965 my ($w, $h ) = ($self->{w}, $self->{h});
874 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
875 967
876 glEnable GL_BLEND;
877 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
878 glEnable GL_TEXTURE_2D; 968 glEnable GL_TEXTURE_2D;
879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
880 970
881 my $border = $self->border; 971 my $border = $self->border;
882 972
883 glColor @{ $self->{border_bg} }; 973 glColor @{ $self->{border_bg} };
884 $tex[1]->draw_quad (0, 0, $w, $border); 974 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
885 $tex[3]->draw_quad (0, $border, $border, $ch); 975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
886 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
887 $tex[4]->draw_quad (0, $h - $border, $w, $border); 977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
888 978
979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
889 my $bg = $tex[0]; 980 my $bg = $tex[0];
890 981
891 # TODO: repeat texture not scale 982 # TODO: repeat texture not scale
892 my $rep_x = $cw / $bg->{w}; 983 my $rep_x = $cw / $bg->{w};
893 my $rep_y = $ch / $bg->{h}; 984 my $rep_y = $ch / $bg->{h};
894 985
895 glColor @{ $self->{bg} }; 986 glColor @{ $self->{bg} };
896 987
897 $bg->{s} = $rep_x; 988 $bg->{s} = $rep_x;
898 $bg->{t} = $rep_y; 989 $bg->{t} = $rep_y;
899 $bg->{wrap_mode} = 1; 990 $bg->{wrap_mode} = 1;
900 $bg->draw_quad ($border, $border, $cw, $ch); 991 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 }
901 993
902 glDisable GL_TEXTURE_2D; 994 glDisable GL_TEXTURE_2D;
903 glDisable GL_BLEND;
904 995
905 $self->{title}->draw if $self->{title}; 996 $self->{title}->draw if $self->{title};
997
906 $self->child->draw; 998 $self->child->draw;
907} 999}
908 1000
909############################################################################# 1001#############################################################################
910 1002
… …
1134} 1226}
1135 1227
1136sub size_allocate { 1228sub size_allocate {
1137 my ($self, $w, $h) = @_; 1229 my ($self, $w, $h) = @_;
1138 1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1139 my $children = $self->{children}; 1233 my $children = $self->{children};
1140 1234
1141 my @h = map $_->{req_h}, @$children; 1235 my @h = map $_->{req_h}, @$children;
1142 1236
1143 my $req_h = List::Util::sum @h; 1237 my $req_h = List::Util::sum @h;
… …
1182 my ($class, %arg) = @_; 1276 my ($class, %arg) = @_;
1183 1277
1184 my $self = $class->SUPER::new ( 1278 my $self = $class->SUPER::new (
1185 fg => [1, 1, 1], 1279 fg => [1, 1, 1],
1186 #font => default_font 1280 #font => default_font
1281 #text => initial text
1282 #markup => initial narkup
1283 layout => (new CFClient::Layout),
1187 fontsize => 1, 1284 fontsize => 1,
1188 text => "",
1189 align => -1, 1285 align => -1,
1190 valign => -1, 1286 valign => -1,
1191 padding => 2, 1287 padding => 2,
1192 layout => new CFClient::Layout,
1193 can_events => 0, 1288 can_events => 0,
1194 %arg 1289 %arg
1195 ); 1290 );
1196 1291
1197 if (exists $self->{template}) { 1292 if (exists $self->{template}) {
1198 my $layout = new CFClient::Layout; 1293 my $layout = new CFClient::Layout;
1199 $layout->set_text (delete $self->{template}); 1294 $layout->set_text (delete $self->{template});
1200 $self->{template} = $layout; 1295 $self->{template} = $layout;
1201 } 1296 }
1202 1297
1203 $self->set_text (delete $self->{text}) if exists $self->{text}; 1298 if (exists $self->{markup}) {
1204 $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 }
1205 1303
1206 $self 1304 $self
1207} 1305}
1208 1306
1209sub escape { 1307sub escape {
… …
1221 1319
1222 delete $self->{texture}; 1320 delete $self->{texture};
1223 $self->SUPER::update; 1321 $self->SUPER::update;
1224} 1322}
1225 1323
1226sub reconfigure {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230}
1231
1232sub set_text { 1324sub set_text {
1233 my ($self, $text) = @_; 1325 my ($self, $text) = @_;
1234 1326
1235 return if $self->{text} eq "T$text"; 1327 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text"; 1328 $self->{text} = "T$text";
1237 1329
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1238 $self->{layout}->set_text ($text); 1331 $self->{layout}->set_text ($text);
1239 1332
1240 delete $self->{texture};
1241 $self->update; 1333 $self->update;
1242 $self->check_size; 1334 $self->check_size;
1243} 1335}
1244 1336
1245sub set_markup { 1337sub set_markup {
1246 my ($self, $markup) = @_; 1338 my ($self, $markup) = @_;
1247 1339
1248 return if $self->{text} eq "M$markup"; 1340 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup"; 1341 $self->{text} = "M$markup";
1250 1342
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344
1345 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1251 $self->{layout}->set_markup ($markup); 1346 $self->{layout}->set_markup ($markup);
1252 1347
1253 delete $self->{texture};
1254 $self->update; 1348 $self->update;
1255 $self->check_size; 1349 $self->check_size;
1256} 1350}
1257 1351
1258sub size_request { 1352sub size_request {
… …
1289sub set_fontsize { 1383sub set_fontsize {
1290 my ($self, $fontsize) = @_; 1384 my ($self, $fontsize) = @_;
1291 1385
1292 $self->{fontsize} = $fontsize; 1386 $self->{fontsize} = $fontsize;
1293 delete $self->{texture}; 1387 delete $self->{texture};
1388
1389 $self->update;
1294 $self->check_size; 1390 $self->check_size;
1295 $self->update;
1296} 1391}
1297 1392
1298sub _draw { 1393sub _draw {
1299 my ($self) = @_; 1394 my ($self) = @_;
1300 1395
1301 my $tex = $self->{texture} ||= do { 1396 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}});
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1398 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $self->{layout}->set_width ($self->{w}); 1399 $self->{layout}->set_width ($self->{w});
1304 $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
1305 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
1306 }; 1413 };
1307 1414
1308 glEnable GL_BLEND;
1309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1310 glEnable GL_TEXTURE_2D; 1415 glEnable GL_TEXTURE_2D;
1311 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1312 1417
1418 if ($tex->{format} == GL_ALPHA) {
1313 glColor @{$self->{fg}}; 1419 glColor @{$self->{fg}};
1314
1315 $self->{ox} = int (
1316 $self->{align} < 0 ? $self->{padding}
1317 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1318 : ($self->{w} - $tex->{w}) * 0.5
1319 );
1320
1321 $self->{oy} = int (
1322 $self->{valign} < 0 ? $self->{padding}
1323 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1324 : ($self->{h} - $tex->{h}) * 0.5
1325 );
1326
1327 $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 }
1328 1424
1329 glDisable GL_TEXTURE_2D; 1425 glDisable GL_TEXTURE_2D;
1330 glDisable GL_BLEND;
1331} 1426}
1332 1427
1333############################################################################# 1428#############################################################################
1334 1429
1335package CFClient::UI::EntryBase; 1430package CFClient::UI::EntryBase;
… …
1370 $self->{layout}->set_text ("$text "); 1465 $self->{layout}->set_text ("$text ");
1371 1466
1372 $self->emit (changed => $self->{text}); 1467 $self->emit (changed => $self->{text});
1373} 1468}
1374 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
1375sub get_text { 1479sub get_text {
1376 $_[0]{text} 1480 $_[0]{text}
1377} 1481}
1378 1482
1379sub size_request { 1483sub size_request {
… …
1386 1490
1387sub size_allocate { 1491sub size_allocate {
1388 my ($self, $w, $h) = @_; 1492 my ($self, $w, $h) = @_;
1389 1493
1390 $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
1391}
1392
1393sub set_text {
1394 my ($self, $text) = @_;
1395
1396 $self->{cursor} = length $text;
1397 $self->_set_text ($text);
1398 $self->update;
1399} 1495}
1400 1496
1401sub key_down { 1497sub key_down {
1402 my ($self, $ev) = @_; 1498 my ($self, $ev) = @_;
1403 1499
… …
1405 my $sym = $ev->{sym}; 1501 my $sym = $ev->{sym};
1406 my $uni = $ev->{unicode}; 1502 my $uni = $ev->{unicode};
1407 1503
1408 my $text = $self->get_text; 1504 my $text = $self->get_text;
1409 1505
1410 if ($sym == 8) { 1506 if ($uni == 8) {
1411 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1507 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1412 } elsif ($sym == 127) { 1508 } elsif ($uni == 127) {
1413 substr $text, $self->{cursor}, 1, ""; 1509 substr $text, $self->{cursor}, 1, "";
1414 } elsif ($sym == CFClient::SDLK_LEFT) { 1510 } elsif ($sym == CFClient::SDLK_LEFT) {
1415 --$self->{cursor} if $self->{cursor}; 1511 --$self->{cursor} if $self->{cursor};
1416 } elsif ($sym == CFClient::SDLK_RIGHT) { 1512 } elsif ($sym == CFClient::SDLK_RIGHT) {
1417 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1513 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1418 } elsif ($sym == CFClient::SDLK_HOME) { 1514 } elsif ($sym == CFClient::SDLK_HOME) {
1419 $self->{cursor} = 0; 1515 $self->{cursor} = 0;
1420 } elsif ($sym == CFClient::SDLK_END) { 1516 } elsif ($sym == CFClient::SDLK_END) {
1421 $self->{cursor} = length $text; 1517 $self->{cursor} = length $text;
1422 } elsif ($sym == 27) { 1518 } elsif ($uni == 27) {
1423 $self->emit ('escape'); 1519 $self->emit ('escape');
1424 } elsif ($uni) { 1520 } elsif ($uni) {
1425 substr $text, $self->{cursor}++, 0, chr $uni; 1521 substr $text, $self->{cursor}++, 0, chr $uni;
1426 } 1522 }
1427 1523
… …
1591 1687
1592 if ($GRAB == $self) { 1688 if ($GRAB == $self) {
1593 $self->{fg} = $self->{active_fg}; 1689 $self->{fg} = $self->{active_fg};
1594 } 1690 }
1595 1691
1596 glEnable GL_BLEND;
1597 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1598 glEnable GL_TEXTURE_2D; 1692 glEnable GL_TEXTURE_2D;
1599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1693 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1600 glColor 0, 0, 0, 1; 1694 glColor 0, 0, 0, 1;
1601 1695
1602 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1696 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1603 1697
1604 glDisable GL_TEXTURE_2D; 1698 glDisable GL_TEXTURE_2D;
1605 glDisable GL_BLEND;
1606 1699
1607 $self->SUPER::_draw; 1700 $self->SUPER::_draw;
1608} 1701}
1609 1702
1610############################################################################# 1703#############################################################################
… …
1657 1750
1658 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;
1659 1752
1660 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1753 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1661 1754
1662 glEnable GL_BLEND; 1755 my $tex = $self->{state} ? $tex[1] : $tex[0];
1756
1663 glEnable GL_TEXTURE_2D; 1757 glEnable GL_TEXTURE_2D;
1664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1665
1666 my $tex = $self->{state} ? $tex[1] : $tex[0];
1667
1668 $tex->draw_quad (0, 0, $s, $s); 1758 $tex->draw_quad_alpha (0, 0, $s, $s);
1669
1670 glDisable GL_TEXTURE_2D; 1759 glDisable GL_TEXTURE_2D;
1671 glDisable GL_BLEND;
1672} 1760}
1673 1761
1674############################################################################# 1762#############################################################################
1675 1763
1676package CFClient::UI::Image; 1764package CFClient::UI::Image;
… …
1719 glTranslate 0, -$self->{w}, 0; 1807 glTranslate 0, -$self->{w}, 0;
1720 1808
1721 ($w, $h) = ($h, $w); 1809 ($w, $h) = ($h, $w);
1722 } 1810 }
1723 1811
1724 glEnable GL_BLEND;
1725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1726 glEnable GL_TEXTURE_2D; 1812 glEnable GL_TEXTURE_2D;
1727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1728 1814
1729 $tex->draw_quad (0, 0, $w, $h); 1815 $tex->draw_quad_alpha (0, 0, $w, $h);
1730 1816
1731 glDisable GL_BLEND;
1732 glDisable GL_TEXTURE_2D; 1817 glDisable GL_TEXTURE_2D;
1733} 1818}
1734 1819
1735############################################################################# 1820#############################################################################
1736 1821
… …
1925 qw(s1_slider.png s1_slider_bg.png); 2010 qw(s1_slider.png s1_slider_bg.png);
1926 2011
1927sub new { 2012sub new {
1928 my $class = shift; 2013 my $class = shift;
1929 2014
1930 # range [value, low, high, page] 2015 # range [value, low, high, page, unit]
1931 2016
1932 # TODO: 0-width page 2017 # TODO: 0-width page
1933 # TODO: req_w/h are wrong with vertical 2018 # TODO: req_w/h are wrong with vertical
1934 # TODO: calculations are off 2019 # TODO: calculations are off
1935 my $self = $class->SUPER::new ( 2020 my $self = $class->SUPER::new (
1936 fg => [1, 1, 1], 2021 fg => [1, 1, 1],
1937 active_fg => [0, 0, 0], 2022 active_fg => [0, 0, 0],
1938 range => [0, 0, 100, 10], 2023 range => [0, 0, 100, 10],
1939 req_w => 20, 2024 req_w => $::WIDTH / 80,
1940 req_h => 20, 2025 req_h => $::WIDTH / 80,
1941 vertical => 0, 2026 vertical => 0,
1942 can_hover => 1, 2027 can_hover => 1,
1943 inner_pad => 5, 2028 inner_pad => .05,
1944 @_ 2029 @_
1945 ); 2030 );
1946 2031
2032 $self->set_value ($self->{range}[0]);
2033 $self->update;
2034
1947 $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 }
1948} 2059}
1949 2060
1950sub size_request { 2061sub size_request {
1951 my ($self) = @_; 2062 my ($self) = @_;
1952 2063
… …
1965 2076
1966sub mouse_motion { 2077sub mouse_motion {
1967 my ($self, $ev, $x, $y) = @_; 2078 my ($self, $ev, $x, $y) = @_;
1968 2079
1969 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
1970 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2097 my ($value, $lo, $hi, $page) = @{$self->{range}};
1971 2098
1972 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2099 my $inner_w = 1 - 2 * $self->{inner_pad};
1973 2100
1974 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2101 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1975 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1976 2102
1977 $x -= $inner_pad_px; # substract the padding 2103 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1978 $x = $x * ($hi - $lo) / $inner_w + $lo; 2104 $value = $self->{scale} * ($value - $lo);
1979 $x = $lo if $x < $lo;
1980 $x = $hi - $page if $x > $hi - $page;
1981 $self->{range}[0] = $x;
1982 2105
1983 $self->emit (changed => $x); 2106 $value = $self->{inner_pad} + ($value - $page * 0.5);
1984 $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;
1985 } 2113 });
1986}
1987 2114
1988# the inner_* stuff is for generating a padding for the slider handle, 2115 $self->SUPER::update;
1989# so that the handle doesn't leave the texture. This calculation isn't 100%
1990# correct propably, but it does the job for now
1991sub _calc_inner_pad_px {
1992 my ($self, $w) = @_;
1993 ($w / 100) * $self->{inner_pad} # % to pixels
1994} 2116}
1995 2117
1996sub _draw { 2118sub _draw {
1997 my ($self) = @_; 2119 my ($self) = @_;
1998 2120
1999 $self->SUPER::_draw (); 2121 $self->SUPER::_draw ();
2000 2122
2001 my ($w, $h) = @$self{qw(w h)}; 2123 glScale $self->{w}, $self->{h};
2002 2124
2003 if ($self->{vertical}) { 2125 if ($self->{vertical}) {
2004 # draw a vertical slider like a rotated horizontal slider 2126 # draw a vertical slider like a rotated horizontal slider
2005 2127
2006 glRotate 90, 0, 0, 1; 2128 glRotate 90, 0, 0, 1;
2007 glTranslate 0, -$self->{w}, 0; 2129 glTranslate 0, 1, 0;
2008
2009 ($w, $h) = ($h, $w);
2010 } 2130 }
2011 2131
2012 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2132 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2013 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2133 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2014 2134
2015 my ($value, $lo, $hi, $page) = @{$self->{range}};
2016
2017 $hi = $value + 1 if $lo == $hi;
2018
2019 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2020 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2021
2022 $page = int $page * $inner_w / ($hi - $lo);
2023 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2024
2025 $w -= $page;
2026 $page &= ~1;
2027 glTranslate $page * 0.5, 0, 0;
2028 $page ||= 2;
2029
2030 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2031 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2032
2033 glEnable GL_BLEND;
2034 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2035 glEnable GL_TEXTURE_2D; 2135 glEnable GL_TEXTURE_2D;
2036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2037 2137
2038 # draw background 2138 # draw background
2039 $tex[1]->draw_quad (0, 0, $w, $h); 2139 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2040 2140
2041 # draw handle 2141 # draw handle
2042 $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);
2043 2143
2044 glDisable GL_BLEND;
2045 glDisable GL_TEXTURE_2D; 2144 glDisable GL_TEXTURE_2D;
2046} 2145}
2047 2146
2048############################################################################# 2147#############################################################################
2049 2148
… …
2060 fontsize => 1, 2159 fontsize => 1,
2061 can_events => 0, 2160 can_events => 0,
2062 #font => default_font 2161 #font => default_font
2063 @_, 2162 @_,
2064 2163
2065 layout => (new CFClient::Layout), 2164 layout => (new CFClient::Layout 1),
2066 par => [], 2165 par => [],
2067 height => 0, 2166 height => 0,
2068 children => [ 2167 children => [
2069 (new CFClient::UI::Empty expand => 1), 2168 (new CFClient::UI::Empty expand => 1),
2070 (new CFClient::UI::Slider vertical => 1), 2169 (new CFClient::UI::Slider vertical => 1),
2071 ], 2170 ],
2072 ); 2171 );
2073 2172
2074 $self->{children}[1]->connect (changed => sub { 2173 $self->{children}[1]->connect (changed => sub { $self->update });
2075 $self->update;
2076 });
2077 2174
2078 $self 2175 $self
2079} 2176}
2080 2177
2081sub set_fontsize { 2178sub set_fontsize {
… …
2089 my ($self, $text) = @_; 2186 my ($self, $text) = @_;
2090 2187
2091 my $layout = $self->{layout}; 2188 my $layout = $self->{layout};
2092 2189
2093 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2190 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094 $layout->set_width ($self->{w}); 2191 $layout->set_width ($self->{children}[0]{w});
2095 $layout->set_text ($text); 2192 $layout->set_markup ($text);
2096 2193
2097 ($layout->size)[1] 2194 ($layout->size)[1]
2098} 2195}
2099 2196
2100sub reflow { 2197sub reflow {
… …
2138 2235
2139 return unless $self->{h} > 0; 2236 return unless $self->{h} > 0;
2140 2237
2141 delete $self->{texture}; 2238 delete $self->{texture};
2142 2239
2143 $ROOT->on_refresh ($self, sub { 2240 $ROOT->on_post_alloc ($self, sub {
2144 if (delete $self->{need_reflow}) { 2241 if (delete $self->{need_reflow}) {
2145 my $height = 0; 2242 my $height = 0;
2146 2243
2147 $height += $_->[0] = $self->text_height ($_->[2]) 2244 $height += $_->[0] = $self->text_height ($_->[2])
2148 for @{$self->{par}}; 2245 for @{$self->{par}};
… …
2152 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2249 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2153 2250
2154 delete $self->{texture}; 2251 delete $self->{texture};
2155 } 2252 }
2156 2253
2157 $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 {
2158 glClearColor 0, 0, 0, 1; 2255 glClearColor 0, 0, 0, 0;
2159 glClear GL_COLOR_BUFFER_BIT; 2256 glClear GL_COLOR_BUFFER_BIT;
2160 2257
2161 glEnable GL_BLEND;
2162 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2163 glEnable GL_TEXTURE_2D; 2258 glEnable GL_TEXTURE_2D;
2164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2259 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2165 2260
2166 my $top = int $self->{children}[1]{range}[0]; 2261 my $top = int $self->{children}[1]{range}[0];
2167 2262
… …
2176 2271
2177 for my $par (@{$self->{par}}) { 2272 for my $par (@{$self->{par}}) {
2178 my $h = $par->[0]; 2273 my $h = $par->[0];
2179 2274
2180 if ($y0 < $y + $h && $y < $y1) { 2275 if ($y0 < $y + $h && $y < $y1) {
2276 $layout->set_foreground (@{ $par->[1] });
2181 $layout->set_text ($par->[2]); 2277 $layout->set_markup ($par->[2]);
2182 2278
2183 glColor @{ $par->[1] };
2184 my ($W, $H) = $layout->size; 2279 my ($W, $H) = $layout->size;
2185 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);
2186 } 2281 }
2187 2282
2188 $y += $h; 2283 $y += $h;
2189 } 2284 }
2190 2285
2191 glDisable GL_TEXTURE_2D; 2286 glDisable GL_TEXTURE_2D;
2192 glDisable GL_BLEND;
2193 }; 2287 };
2194 }); 2288 });
2195} 2289}
2196 2290
2197sub _draw { 2291sub _draw {
2198 my ($self) = @_; 2292 my ($self) = @_;
2199 2293
2200 if ($self->{texture}) {
2201 glEnable GL_TEXTURE_2D; 2294 glEnable GL_TEXTURE_2D;
2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1; 2296 glColor 1, 1, 1, 1;
2204 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2297 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2205 glDisable GL_TEXTURE_2D; 2298 glDisable GL_TEXTURE_2D;
2206 }
2207 2299
2208 $self->{children}[1]->draw; 2300 $self->{children}[1]->draw;
2209 2301
2210} 2302}
2211 2303
… …
2305 @_, 2397 @_,
2306 can_events => 0, 2398 can_events => 0,
2307 ) 2399 )
2308} 2400}
2309 2401
2310sub set_markup { 2402sub set_tooltip_from {
2311 my ($self, $text) = @_; 2403 my ($self, $widget) = @_;
2312 2404
2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2405 $self->add (new CFClient::UI::Label
2314 $self->{label}->set_markup ($text); 2406 markup => $widget->{tooltip},
2315 $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 );
2316} 2412}
2317 2413
2318sub size_request { 2414sub size_request {
2319 my ($self) = @_; 2415 my ($self) = @_;
2320
2321 $self->child->set_max_size ($::WIDTH * 0.3);
2322 2416
2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2417 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324 2418
2325 ($w + 4, $h + 4) 2419 ($w + 4, $h + 4)
2326} 2420}
… …
2332} 2426}
2333 2427
2334sub _draw { 2428sub _draw {
2335 my ($self) = @_; 2429 my ($self) = @_;
2336 2430
2337 glPushMatrix;
2338 glTranslate 0.375, 0.375; 2431 glTranslate 0.375, 0.375;
2339 2432
2340 my ($w, $h) = @$self{qw(w h)}; 2433 my ($w, $h) = @$self{qw(w h)};
2341 2434
2342 glColor 1, 0.8, 0.4; 2435 glColor 1, 0.8, 0.4;
… …
2353 glVertex 0 , $h; 2446 glVertex 0 , $h;
2354 glVertex $w, $h; 2447 glVertex $w, $h;
2355 glVertex $w, 0; 2448 glVertex $w, 0;
2356 glEnd; 2449 glEnd;
2357 2450
2358 glPopMatrix; 2451 glTranslate 2 - 0.375, 2 - 0.375;
2359
2360 glTranslate 2, 2;
2361 $self->SUPER::_draw; 2452 $self->SUPER::_draw;
2362} 2453}
2363 2454
2364############################################################################# 2455#############################################################################
2365 2456
… …
2380 2471
2381sub size_request { 2472sub size_request {
2382 (32, 8) 2473 (32, 8)
2383} 2474}
2384 2475
2385sub draw { 2476sub _draw {
2386 my ($self) = @_; 2477 my ($self) = @_;
2387 2478
2479 return unless $::CONN;#d# manage and cache textures differently
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2480 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2389 2481
2482 # TODO animation
2390 if ($tex) { 2483 if ($tex) {
2391 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D; 2484 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2485 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395 glColor 1, 1, 1, 1; 2486 glColor 1, 1, 1, 1;
2396 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2487 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2397 glDisable GL_TEXTURE_2D; 2488 glDisable GL_TEXTURE_2D;
2398 glDisable GL_BLEND;
2399 } 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;
2400} 2781}
2401 2782
2402############################################################################# 2783#############################################################################
2403 2784
2404package CFClient::UI::Root; 2785package CFClient::UI::Root;
2405 2786
2406our @ISA = CFClient::UI::Container::; 2787our @ISA = CFClient::UI::Container::;
2407 2788
2408use CFClient::OpenGL; 2789use CFClient::OpenGL;
2409 2790
2410sub check_size { 2791sub new {
2411 my ($self) = @_; 2792 my $class = shift;
2412 2793
2413 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2794 $class->SUPER::new (
2414} 2795 @_,
2415 2796 )
2416sub size_request {
2417 ($::WIDTH, $::HEIGHT)
2418} 2797}
2419 2798
2420sub configure { 2799sub configure {
2421 my ($self, $x, $y, $w, $h) = @_; 2800 my ($self, $x, $y, $w, $h) = @_;
2422 2801
2423 $self->SUPER::configure ($x, $y, $w, $h); 2802 $self->{w} = $w;
2803 $self->{h} = $h;
2804}
2424 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
2425 for my $child (@{$self->{children}}) { 2828 for my $child ($self->children) {
2426 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)};
2427 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
2428 $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;
2429 $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
2430 $child->configure ($X, $Y, $W,$H); 2840 $child->configure ($X, $Y, $W, $H);
2431 } 2841 }
2432} 2842}
2433 2843
2434sub _topleft { 2844sub coord2local {
2435 my ($self, $x, $y) = @_; 2845 my ($self, $x, $y) = @_;
2436 2846
2437 ($x, $y) 2847 ($x, $y)
2438} 2848}
2439 2849
2850sub coord2global {
2851 my ($self, $x, $y) = @_;
2852
2853 ($x, $y)
2854}
2855
2440sub update { 2856sub update {
2441 my ($self) = @_; 2857 my ($self) = @_;
2442 2858
2443 $self->check_size; 2859 $self->check_size;
2444 ::refresh (); 2860 $::WANT_REFRESH++;
2445} 2861}
2446 2862
2447sub add { 2863sub add {
2448 my ($self, $child) = @_; 2864 my ($self, @children) = @_;
2449 2865
2866 for my $child (@children) {
2867 $child->{toplevel} = 1;
2868
2450 # integerize window positions 2869 # integerise window positions
2451 $child->{x} = int $child->{x}; 2870 $child->{x} = int $child->{x};
2452 $child->{y} = int $child->{y}; 2871 $child->{y} = int $child->{y};
2872 }
2453 2873
2454 $self->SUPER::add ($child); 2874 $self->SUPER::add (@children);
2455} 2875}
2456 2876
2457sub on_refresh { 2877sub on_refresh {
2458 my ($self, $id, $cb) = @_; 2878 my ($self, $id, $cb) = @_;
2459 2879
2460 $self->{refresh_hook}{$id} = $cb; 2880 $self->{refresh_hook}{$id} = $cb;
2461} 2881}
2462 2882
2883sub on_post_alloc {
2884 my ($self, $id, $cb) = @_;
2885
2886 $self->{post_alloc_hook}{$id} = $cb;
2887}
2888
2463sub draw { 2889sub draw {
2464 my ($self) = @_; 2890 my ($self) = @_;
2465 2891
2466 while (my $rcb = delete $self->{refresh_hook}) { 2892 while ($self->{refresh_hook}) {
2467 $_->() 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}};
2468 } 2945 }
2469 2946
2470 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2947 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2471 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2948 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2472 glClear GL_COLOR_BUFFER_BIT; 2949 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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