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.189 by root, Mon May 8 22:17:24 2006 UTC vs.
Revision 1.212 by elmex, Wed May 17 14:55:14 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 $self->emit (size_allocate => $w, $h);
243 } 263 }
244} 264}
245 265
246sub size_allocate { 266sub size_allocate {
247 # nothing to be done 267 # nothing to be done
248} 268}
249 269
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
250sub children { 277sub children {
251}
252
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
263} 278}
264 279
265sub set_max_size { 280sub set_max_size {
266 my ($self, $w, $h) = @_; 281 my ($self, $w, $h) = @_;
267 282
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 283 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 284 delete $self->{max_h}; $self->{max_h} = $h if $h;
270} 285}
271 286
272# return top left coordinates 287sub set_tooltip {
273sub _topleft {
274 my ($self, $x, $y) = @_; 288 my ($self, $tooltip) = @_;
275 289
276 $self->{parent} 290 $self->{tooltip} = $tooltip;
277 or Carp::confess "no parent widget in _topleft\n";#d#
278 291
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 292 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner};
294 CFClient::UI::check_tooltip;
295 }
280} 296}
281 297
282# translate global coordinates to local coordinate system 298# translate global coordinates to local coordinate system
283sub coord2local { 299sub coord2local {
284 my ($self, $x, $y) = @_; 300 my ($self, $x, $y) = @_;
285 301
286 my ($X, $Y) = $self->_topleft; 302 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 303}
289 304
290# translate local coordinates to global coordinate system 305# translate local coordinates to global coordinate system
291sub coord2global { 306sub coord2global {
292 my ($self, $x, $y) = @_; 307 my ($self, $x, $y) = @_;
293 308
294 my ($X, $Y) = $self->_topleft; 309 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 310}
297 311
298sub focus_in { 312sub focus_in {
299 my ($self) = @_; 313 my ($self) = @_;
300 314
… …
372 glVertex $self->{w}, 0; 386 glVertex $self->{w}, 0;
373 glVertex $self->{w}, $self->{h}; 387 glVertex $self->{w}, $self->{h};
374 glVertex 0 , $self->{h}; 388 glVertex 0 , $self->{h};
375 glEnd; 389 glEnd;
376 glPopMatrix; 390 glPopMatrix;
377 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 391 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378 } 392 }
379} 393}
380 394
381sub _draw { 395sub _draw {
382 my ($self) = @_; 396 my ($self) = @_;
… …
398 412
399sub set_parent { 413sub set_parent {
400 my ($self, $parent) = @_; 414 my ($self, $parent) = @_;
401 415
402 Scalar::Util::weaken ($self->{parent} = $parent); 416 Scalar::Util::weaken ($self->{parent} = $parent);
417
418 # TODO: req_w _does_change after ->reconfigure
419 $self->check_size
420 unless exists $self->{req_w};
403} 421}
404 422
405sub check_size { 423sub check_size {
406 my ($self) = @_; 424 my ($self, $forced) = @_;
407 425
408 $self->_check_size; 426 $self->{force_alloc} = 1 if $forced;
409 return;
410 my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
411
412 $check_size->{$self} = $self;
413
414 $CFClient::UI::ROOT->on_refresh (_check_size => sub {
415 while (%$check_size) {
416 my @widgets = values %$check_size;
417 $_->_check_size
418 for @widgets;
419 }
420 });
421}
422
423sub _check_size {
424 my ($self) = @_;
425
426 delete $CFClient::UI::ROOT->{_check_size}{$self}; 427 $CFClient::UI::ROOT->{check_size}{$self} = $self;
427
428 $self->{parent}
429 or return 1;
430
431 my ($w, $h) = $self->{user_w} && $self->{user_h}
432 ? @$self{qw(user_w user_h)}
433 : $self->size_request;
434
435 if ($w != $self->{req_w} || $h != $self->{req_h}) {
436 $self->{req_w} = $w;
437 $self->{req_h} = $h;
438
439 $self->{parent}->_check_size
440 or $self->size_allocate (
441 (List::Util::max $self->{w}, $w),
442 (List::Util::max $self->{h}, $h),
443 );
444
445 1
446 } else {
447 0
448 }
449} 428}
450 429
451sub update { 430sub update {
452 my ($self) = @_; 431 my ($self) = @_;
453 432
454 my $update = $CFClient::UI::ROOT->{_update} ||= {}; 433 $self->{parent}->update
455 434 if $self->{parent};
456 $update->{$self} = $self;
457
458 $CFClient::UI::ROOT->on_refresh (_update => sub {
459 while (%$update) {
460 my @widgets = values %$update;
461 %$update = ();
462
463 $_->{parent} && $_->{parent}->update
464 for @widgets;
465 }
466 });
467} 435}
468 436
469sub connect { 437sub connect {
470 my ($self, $signal, $cb) = @_; 438 my ($self, $signal, $cb) = @_;
471 439
… …
479} 447}
480 448
481sub DESTROY { 449sub DESTROY {
482 my ($self) = @_; 450 my ($self) = @_;
483 451
452 delete $WIDGET{$self+0};
484 #$self->deactivate; 453 #$self->deactivate;
485} 454}
486 455
487############################################################################# 456#############################################################################
488 457
… …
497 my $class = shift; 466 my $class = shift;
498 467
499 # range [value, low, high, page] 468 # range [value, low, high, page]
500 469
501 $class->SUPER::new ( 470 $class->SUPER::new (
502 bg => [0, 0, 0, 0.2], 471 #bg => [0, 0, 0, 0.2],
503 active_bg => [1, 1, 1, 0.5], 472 #active_bg => [1, 1, 1, 0.5],
504 @_ 473 @_
505 ) 474 )
506} 475}
507 476
508sub _draw { 477sub _draw {
509 my ($self) = @_; 478 my ($self) = @_;
510 479
480 my $color = $FOCUS == $self && $self->{active_bg}
481 ? $self->{active_bg}
482 : $self->{bg};
483
484 if ($color && (@$color < 4 || $color->[3])) {
511 my ($w, $h) = @$self{qw(w h)}; 485 my ($w, $h) = @$self{qw(w h)};
512 486
513 glEnable GL_BLEND; 487 glEnable GL_BLEND;
514 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 488 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
515 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 489 glColor @$color;
516 490
517 glBegin GL_QUADS; 491 glBegin GL_QUADS;
518 glVertex 0 , 0; 492 glVertex 0 , 0;
519 glVertex 0 , $h; 493 glVertex 0 , $h;
520 glVertex $w, $h; 494 glVertex $w, $h;
521 glVertex $w, 0; 495 glVertex $w, 0;
522 glEnd; 496 glEnd;
523 497
524 glDisable GL_BLEND; 498 glDisable GL_BLEND;
499 }
525} 500}
526 501
527############################################################################# 502#############################################################################
528 503
529package CFClient::UI::Empty; 504package CFClient::UI::Empty;
… …
573 $self->{children} = [ 548 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 549 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 550 @{$self->{children}}, @widgets
576 ]; 551 ];
577 552
578 $_->check_size 553 $self->check_size (1);
579 for @widgets;
580
581 $self->update; 554 $self->update;
582} 555}
583 556
584sub children { 557sub children {
585 @{ $_[0]{children} } 558 @{ $_[0]{children} }
… …
692} 665}
693 666
694sub update { 667sub update {
695 my ($self) = @_; 668 my ($self) = @_;
696 669
697 $ROOT->on_refresh ($self => sub { $self->render_child }); 670 $ROOT->on_post_alloc ($self => sub { $self->render_child });
698 $self->SUPER::update; 671 $self->SUPER::update;
699} 672}
700 673
701sub size_allocate { 674sub size_allocate {
702 my ($self, $w, $h) = @_; 675 my ($self, $w, $h) = @_;
… …
733 my ($w, $h) = ($self->w, $self->h); 706 my ($w, $h) = ($self->w, $self->h);
734 707
735 my $tex = $self->{texture} 708 my $tex = $self->{texture}
736 or return; 709 or return;
737 710
738 glEnable GL_BLEND;
739 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
740 glEnable GL_TEXTURE_2D; 711 glEnable GL_TEXTURE_2D;
741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
742 glColor 0, 0, 0, 1; 713 glColor 0, 0, 0, 1;
743 714
744 $tex->draw_quad (0, 0, $w, $h); 715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
745 716
746 glDisable GL_BLEND;
747 glDisable GL_TEXTURE_2D; 717 glDisable GL_TEXTURE_2D;
748} 718}
749 719
750############################################################################# 720#############################################################################
751 721
… …
775 $self->{view_y} = int $y; 745 $self->{view_y} = int $y;
776 746
777 $self->update; 747 $self->update;
778} 748}
779 749
780# hmm, this does not work for topleft of $self... but we should not aks for that 750# hmm, this does not work for topleft of $self... but we should not ask for that
781sub _topleft { 751sub coord2local {
782 my ($self, $x, $y) = @_; 752 my ($self, $x, $y) = @_;
783 753
784 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 754 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
755}
756
757sub coord2global {
758 my ($self, $x, $y) = @_;
759
760 $x = List::Util::min $self->{w}, $x - $self->{view_x};
761 $y = List::Util::min $self->{h}, $y - $self->{view_y};
762
763 $self->SUPER::coord2global ($x, $y)
785} 764}
786 765
787sub find_widget { 766sub find_widget {
788 my ($self, $x, $y) = @_; 767 my ($self, $x, $y) = @_;
789 768
… …
834 $self->add ($self->{slider}); 813 $self->add ($self->{slider});
835 814
836 $self 815 $self
837} 816}
838 817
839#TODO# update range on size_allocate depeneing on child 818#TODO# update range on size_allocate depending on child
840# update viewport offset on scroll 819# update viewport offset on scroll
841 820
842############################################################################# 821#############################################################################
843 822
844package CFClient::UI::Frame; 823package CFClient::UI::Frame;
… …
848use CFClient::OpenGL; 827use CFClient::OpenGL;
849 828
850sub new { 829sub new {
851 my $class = shift; 830 my $class = shift;
852 831
853 my $self = $class->SUPER::new ( 832 $class->SUPER::new (
854 bg => [1, 1, 1, 1], 833 bg => undef,
855 border_bg => [1, 1, 1, 1],
856 border => 0.8,
857 @_ 834 @_,
858 ); 835 )
859
860 $self
861} 836}
862 837
863sub _draw { 838sub _draw {
864 my ($self) = @_; 839 my ($self) = @_;
865 840
866 my ($w, $h) = ($self->{w}, $self->{h}); 841 if ($self->{bg}) {
842 my ($w, $h) = @$self{qw(w h)};
867 843
868 glEnable GL_BLEND; 844 glEnable GL_BLEND;
869 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
870 glEnable GL_TEXTURE_2D; 846 glColor @{ $self->{bg} };
871 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
872 847
873# glBegin GL_QUADS; 848 glBegin GL_QUADS;
874# glColor 0, 0, 0, 0;
875# glVertex 0 , 0; 849 glVertex 0 , 0;
876# glVertex 0 , $h; 850 glVertex 0 , $h;
877# glVertex $w, $h; 851 glVertex $w, $h;
878# glVertex $w, 0; 852 glVertex $w, 0;
879# glEnd; 853 glEnd;
880 854
881
882 $self->child->draw;
883 glDisable GL_BLEND; 855 glDisable GL_BLEND;
884 glDisable GL_TEXTURE_2D; 856 }
857
858 $self->SUPER::_draw;
885} 859}
886 860
887############################################################################# 861#############################################################################
888 862
889package CFClient::UI::FancyFrame; 863package CFClient::UI::FancyFrame;
… …
903 877
904 my $self = $class->SUPER::new ( 878 my $self = $class->SUPER::new (
905 bg => [1, 1, 1, 1], 879 bg => [1, 1, 1, 1],
906 border_bg => [1, 1, 1, 1], 880 border_bg => [1, 1, 1, 1],
907 border => 0.6, 881 border => 0.6,
882 toplevel => 1,
908 can_events => 1, 883 can_events => 1,
909 @_ 884 @_
910 ); 885 );
911 886
912 $self->{title} &&= new CFClient::UI::Label 887 $self->{title} &&= new CFClient::UI::Label
… …
937 my ($self, $w, $h) = @_; 912 my ($self, $w, $h) = @_;
938 913
939 $h -= List::Util::max 0, $self->border * 2; 914 $h -= List::Util::max 0, $self->border * 2;
940 $w -= List::Util::max 0, $self->border * 2; 915 $w -= List::Util::max 0, $self->border * 2;
941 916
942 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 917 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
943 if $self->{title}; 918 if $self->{title};
944 919
945 $self->child->configure ($self->border, $self->border, $w, $h); 920 $self->child->configure ($self->border, $self->border, $w, $h);
946} 921}
947 922
… …
1005 my ($self) = @_; 980 my ($self) = @_;
1006 981
1007 my ($w, $h ) = ($self->{w}, $self->{h}); 982 my ($w, $h ) = ($self->{w}, $self->{h});
1008 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
1009 984
1010 glEnable GL_BLEND;
1011 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1012 glEnable GL_TEXTURE_2D; 985 glEnable GL_TEXTURE_2D;
1013 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1014 987
1015 my $border = $self->border; 988 my $border = $self->border;
1016 989
1017 glColor @{ $self->{border_bg} }; 990 glColor @{ $self->{border_bg} };
1018 $tex[1]->draw_quad (0, 0, $w, $border); 991 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
1019 $tex[3]->draw_quad (0, $border, $border, $ch); 992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
1020 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1021 $tex[4]->draw_quad (0, $h - $border, $w, $border); 994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
1022 995
1023 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1024 my $bg = $tex[0]; 997 my $bg = $tex[0];
1025 998
1026 # TODO: repeat texture not scale 999 # TODO: repeat texture not scale
… …
1030 glColor @{ $self->{bg} }; 1003 glColor @{ $self->{bg} };
1031 1004
1032 $bg->{s} = $rep_x; 1005 $bg->{s} = $rep_x;
1033 $bg->{t} = $rep_y; 1006 $bg->{t} = $rep_y;
1034 $bg->{wrap_mode} = 1; 1007 $bg->{wrap_mode} = 1;
1035 $bg->draw_quad ($border, $border, $cw, $ch); 1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 }
1036 1010
1037 glDisable GL_TEXTURE_2D; 1011 glDisable GL_TEXTURE_2D;
1038 glDisable GL_BLEND;
1039 }
1040 1012
1041 $self->{title}->draw if $self->{title}; 1013 $self->{title}->draw if $self->{title};
1042 1014
1043 $self->child->draw; 1015 $self->child->draw;
1044} 1016}
… …
1271} 1243}
1272 1244
1273sub size_allocate { 1245sub size_allocate {
1274 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h) = @_;
1275 1247
1248 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1276 my $children = $self->{children}; 1250 my $children = $self->{children};
1277 1251
1278 my @h = map $_->{req_h}, @$children; 1252 my @h = map $_->{req_h}, @$children;
1279 1253
1280 my $req_h = List::Util::sum @h; 1254 my $req_h = List::Util::sum @h;
… …
1309 1283
1310############################################################################# 1284#############################################################################
1311 1285
1312package CFClient::UI::Label; 1286package CFClient::UI::Label;
1313 1287
1314our @ISA = CFClient::UI::Base::; 1288our @ISA = CFClient::UI::DrawBG::;
1315 1289
1316use CFClient::OpenGL; 1290use CFClient::OpenGL;
1317 1291
1318sub new { 1292sub new {
1319 my ($class, %arg) = @_; 1293 my ($class, %arg) = @_;
1320 1294
1321 my $self = $class->SUPER::new ( 1295 my $self = $class->SUPER::new (
1322 fg => [1, 1, 1], 1296 fg => [1, 1, 1],
1297 #bg => none
1298 #active_bg => none
1323 #font => default_font 1299 #font => default_font
1300 #text => initial text
1301 #markup => initial narkup
1302 layout => (new CFClient::Layout),
1324 fontsize => 1, 1303 fontsize => 1,
1325 text => "",
1326 align => -1, 1304 align => -1,
1327 valign => -1, 1305 valign => -1,
1328 padding => 2, 1306 padding => 2,
1329 layout => new CFClient::Layout,
1330 can_events => 0, 1307 can_events => 0,
1331 %arg 1308 %arg
1332 ); 1309 );
1333 1310
1334 if (exists $self->{template}) { 1311 if (exists $self->{template}) {
1335 my $layout = new CFClient::Layout; 1312 my $layout = new CFClient::Layout;
1336 $layout->set_text (delete $self->{template}); 1313 $layout->set_text (delete $self->{template});
1337 $self->{template} = $layout; 1314 $self->{template} = $layout;
1338 } 1315 }
1339 1316
1340 $self->set_text (delete $self->{text}) if exists $self->{text}; 1317 if (exists $self->{markup}) {
1341 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1318 $self->set_markup (delete $self->{markup});
1319 } else {
1320 $self->set_text (delete $self->{text});
1321 }
1342 1322
1343 $self 1323 $self
1344} 1324}
1345 1325
1346sub escape { 1326sub escape($) {
1347 local $_ = $_[1]; 1327 local $_ = $_[0];
1348 1328
1349 s/&/&amp;/g; 1329 s/&/&amp;/g;
1350 s/>/&gt;/g; 1330 s/>/&gt;/g;
1351 s/</&lt;/g; 1331 s/</&lt;/g;
1352 1332
1353 $_[1] 1333 $_
1354} 1334}
1355 1335
1356sub update { 1336sub update {
1357 my ($self) = @_; 1337 my ($self) = @_;
1358 1338
… …
1364 my ($self, $text) = @_; 1344 my ($self, $text) = @_;
1365 1345
1366 return if $self->{text} eq "T$text"; 1346 return if $self->{text} eq "T$text";
1367 $self->{text} = "T$text"; 1347 $self->{text} = "T$text";
1368 1348
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1369 $self->{layout}->set_text ($text); 1350 $self->{layout}->set_text ($text);
1370 1351
1371 delete $self->{texture};
1372 $self->update; 1352 $self->update;
1373 $self->check_size; 1353 $self->check_size;
1374} 1354}
1375 1355
1376sub set_markup { 1356sub set_markup {
1377 my ($self, $markup) = @_; 1357 my ($self, $markup) = @_;
1378 1358
1379 return if $self->{text} eq "M$markup"; 1359 return if $self->{text} eq "M$markup";
1380 $self->{text} = "M$markup"; 1360 $self->{text} = "M$markup";
1381 1361
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363
1364 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1382 $self->{layout}->set_markup ($markup); 1365 $self->{layout}->set_markup ($markup);
1383 1366
1384 delete $self->{texture};
1385 $self->update; 1367 $self->update;
1386 $self->check_size; 1368 $self->check_size;
1387} 1369}
1388 1370
1389sub size_request { 1371sub size_request {
… …
1428} 1410}
1429 1411
1430sub _draw { 1412sub _draw {
1431 my ($self) = @_; 1413 my ($self) = @_;
1432 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1433 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}});
1434 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1435 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1436 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1422
1437 new_from_layout CFClient::Texture $self->{layout} 1423 my $tex = new_from_layout CFClient::Texture $self->{layout};
1424
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1427 : ($self->{w} - $tex->{w}) * 0.5);
1428
1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1431 : ($self->{h} - $tex->{h}) * 0.5);
1432
1433 $tex
1438 }; 1434 };
1439 1435
1440 glEnable GL_BLEND;
1441 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1442 glEnable GL_TEXTURE_2D; 1436 glEnable GL_TEXTURE_2D;
1443 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1444 1438
1439 if ($tex->{format} == GL_ALPHA) {
1445 glColor @{$self->{fg}}; 1440 glColor @{$self->{fg}};
1446
1447 $self->{ox} = int (
1448 $self->{align} < 0 ? $self->{padding}
1449 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1450 : ($self->{w} - $tex->{w}) * 0.5
1451 );
1452
1453 $self->{oy} = int (
1454 $self->{valign} < 0 ? $self->{padding}
1455 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1456 : ($self->{h} - $tex->{h}) * 0.5
1457 );
1458
1459 $tex->draw_quad ($self->{ox}, $self->{oy}); 1441 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1442 } else {
1443 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1444 }
1460 1445
1461 glDisable GL_TEXTURE_2D; 1446 glDisable GL_TEXTURE_2D;
1462 glDisable GL_BLEND;
1463} 1447}
1464 1448
1465############################################################################# 1449#############################################################################
1466 1450
1467package CFClient::UI::EntryBase; 1451package CFClient::UI::EntryBase;
… …
1502 $self->{layout}->set_text ("$text "); 1486 $self->{layout}->set_text ("$text ");
1503 1487
1504 $self->emit (changed => $self->{text}); 1488 $self->emit (changed => $self->{text});
1505} 1489}
1506 1490
1507sub get_text {
1508 $_[0]{text}
1509}
1510
1511sub size_request {
1512 my ($self) = @_;
1513
1514 my ($w, $h) = $self->SUPER::size_request;
1515
1516 ($w + 1, $h) # add 1 for cursor
1517}
1518
1519sub size_allocate {
1520 my ($self, $w, $h) = @_;
1521
1522 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1523}
1524
1525sub set_text { 1491sub set_text {
1526 my ($self, $text) = @_; 1492 my ($self, $text) = @_;
1527 1493
1528 $self->{cursor} = length $text; 1494 $self->{cursor} = length $text;
1529 $self->_set_text ($text); 1495 $self->_set_text ($text);
1530 $self->update; 1496 $self->update;
1497 $self->check_size;
1498}
1499
1500sub get_text {
1501 $_[0]{text}
1502}
1503
1504sub size_request {
1505 my ($self) = @_;
1506
1507 my ($w, $h) = $self->SUPER::size_request;
1508
1509 ($w + 1, $h) # add 1 for cursor
1510}
1511
1512sub size_allocate {
1513 my ($self, $w, $h) = @_;
1514
1515 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1531} 1516}
1532 1517
1533sub key_down { 1518sub key_down {
1534 my ($self, $ev) = @_; 1519 my ($self, $ev) = @_;
1535 1520
… …
1537 my $sym = $ev->{sym}; 1522 my $sym = $ev->{sym};
1538 my $uni = $ev->{unicode}; 1523 my $uni = $ev->{unicode};
1539 1524
1540 my $text = $self->get_text; 1525 my $text = $self->get_text;
1541 1526
1542 if ($sym == 8) { 1527 if ($uni == 8) {
1543 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1528 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1544 } elsif ($sym == 127) { 1529 } elsif ($uni == 127) {
1545 substr $text, $self->{cursor}, 1, ""; 1530 substr $text, $self->{cursor}, 1, "";
1546 } elsif ($sym == CFClient::SDLK_LEFT) { 1531 } elsif ($sym == CFClient::SDLK_LEFT) {
1547 --$self->{cursor} if $self->{cursor}; 1532 --$self->{cursor} if $self->{cursor};
1548 } elsif ($sym == CFClient::SDLK_RIGHT) { 1533 } elsif ($sym == CFClient::SDLK_RIGHT) {
1549 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1534 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1550 } elsif ($sym == CFClient::SDLK_HOME) { 1535 } elsif ($sym == CFClient::SDLK_HOME) {
1551 $self->{cursor} = 0; 1536 $self->{cursor} = 0;
1552 } elsif ($sym == CFClient::SDLK_END) { 1537 } elsif ($sym == CFClient::SDLK_END) {
1553 $self->{cursor} = length $text; 1538 $self->{cursor} = length $text;
1554 } elsif ($sym == 27) { 1539 } elsif ($uni == 27) {
1555 $self->emit ('escape'); 1540 $self->emit ('escape');
1556 } elsif ($uni) { 1541 } elsif ($uni) {
1557 substr $text, $self->{cursor}++, 0, chr $uni; 1542 substr $text, $self->{cursor}++, 0, chr $uni;
1558 } 1543 }
1559 1544
1560 $self->_set_text ($text); 1545 $self->_set_text ($text);
1561 $self->update; 1546 $self->update;
1547 $self->check_size;
1562} 1548}
1563 1549
1564sub focus_in { 1550sub focus_in {
1565 my ($self) = @_; 1551 my ($self) = @_;
1566 1552
… …
1695 my $class = shift; 1681 my $class = shift;
1696 1682
1697 $class->SUPER::new ( 1683 $class->SUPER::new (
1698 padding => 4, 1684 padding => 4,
1699 fg => [1, 1, 1], 1685 fg => [1, 1, 1],
1700 bg => [1, 1, 1, 0.2],
1701 active_fg => [0, 0, 1], 1686 active_fg => [0, 0, 1],
1702 can_hover => 1, 1687 can_hover => 1,
1703 align => 0, 1688 align => 0,
1704 valign => 0, 1689 valign => 0,
1705 can_events => 1, 1690 can_events => 1,
… …
1723 1708
1724 if ($GRAB == $self) { 1709 if ($GRAB == $self) {
1725 $self->{fg} = $self->{active_fg}; 1710 $self->{fg} = $self->{active_fg};
1726 } 1711 }
1727 1712
1728 glEnable GL_BLEND;
1729 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1730 glEnable GL_TEXTURE_2D; 1713 glEnable GL_TEXTURE_2D;
1731 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1732 glColor 0, 0, 0, 1; 1715 glColor 0, 0, 0, 1;
1733 1716
1734 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1717 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1735 1718
1736 glDisable GL_TEXTURE_2D; 1719 glDisable GL_TEXTURE_2D;
1737 glDisable GL_BLEND;
1738 1720
1739 $self->SUPER::_draw; 1721 $self->SUPER::_draw;
1740} 1722}
1741 1723
1742############################################################################# 1724#############################################################################
… …
1756 1738
1757 $class->SUPER::new ( 1739 $class->SUPER::new (
1758 padding => 2, 1740 padding => 2,
1759 fg => [1, 1, 1], 1741 fg => [1, 1, 1],
1760 active_fg => [1, 1, 0], 1742 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5],
1761 state => 0, 1745 state => 0,
1762 can_hover => 1, 1746 can_hover => 1,
1763 @_ 1747 @_
1764 ) 1748 )
1765} 1749}
… …
1789 1773
1790 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1774 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1791 1775
1792 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1793 1777
1794 glEnable GL_BLEND; 1778 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779
1795 glEnable GL_TEXTURE_2D; 1780 glEnable GL_TEXTURE_2D;
1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1797
1798 my $tex = $self->{state} ? $tex[1] : $tex[0];
1799
1800 $tex->draw_quad (0, 0, $s, $s); 1781 $tex->draw_quad_alpha (0, 0, $s, $s);
1801
1802 glDisable GL_TEXTURE_2D; 1782 glDisable GL_TEXTURE_2D;
1803 glDisable GL_BLEND;
1804} 1783}
1805 1784
1806############################################################################# 1785#############################################################################
1807 1786
1808package CFClient::UI::Image; 1787package CFClient::UI::Image;
… …
1851 glTranslate 0, -$self->{w}, 0; 1830 glTranslate 0, -$self->{w}, 0;
1852 1831
1853 ($w, $h) = ($h, $w); 1832 ($w, $h) = ($h, $w);
1854 } 1833 }
1855 1834
1856 glEnable GL_BLEND;
1857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1858 glEnable GL_TEXTURE_2D; 1835 glEnable GL_TEXTURE_2D;
1859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1836 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1860 1837
1861 $tex->draw_quad (0, 0, $w, $h); 1838 $tex->draw_quad_alpha (0, 0, $w, $h);
1862 1839
1863 glDisable GL_BLEND;
1864 glDisable GL_TEXTURE_2D; 1840 glDisable GL_TEXTURE_2D;
1865} 1841}
1866 1842
1867############################################################################# 1843#############################################################################
1868 1844
… …
2057 qw(s1_slider.png s1_slider_bg.png); 2033 qw(s1_slider.png s1_slider_bg.png);
2058 2034
2059sub new { 2035sub new {
2060 my $class = shift; 2036 my $class = shift;
2061 2037
2062 # range [value, low, high, page] 2038 # range [value, low, high, page, unit]
2063 2039
2064 # TODO: 0-width page 2040 # TODO: 0-width page
2065 # TODO: req_w/h are wrong with vertical 2041 # TODO: req_w/h are wrong with vertical
2066 # TODO: calculations are off 2042 # TODO: calculations are off
2067 my $self = $class->SUPER::new ( 2043 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2044 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2045 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5],
2070 range => [0, 0, 100, 10], 2048 range => [0, 0, 100, 10],
2071 req_w => $::WIDTH / 80, 2049 req_w => $::WIDTH / 80,
2072 req_h => $::WIDTH / 80, 2050 req_h => $::WIDTH / 80,
2073 vertical => 0, 2051 vertical => 0,
2074 can_hover => 1, 2052 can_hover => 1,
2075 inner_pad => 5, 2053 inner_pad => .05,
2076 @_ 2054 @_
2077 ); 2055 );
2078 2056
2057 $self->set_value ($self->{range}[0]);
2058 $self->update;
2059
2079 $self 2060 $self
2061}
2062
2063sub set_value {
2064 my ($self, $value) = @_;
2065
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067
2068 $hi = $lo + 1 if $hi <= $lo;
2069
2070 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi;
2072
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit;
2075
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079
2080 if ($value != $old_value) {
2081 $self->emit (changed => $value);
2082 $self->update;
2083 }
2080} 2084}
2081 2085
2082sub size_request { 2086sub size_request {
2083 my ($self) = @_; 2087 my ($self) = @_;
2084 2088
… …
2097 2101
2098sub mouse_motion { 2102sub mouse_motion {
2099 my ($self, $ev, $x, $y) = @_; 2103 my ($self, $ev, $x, $y) = @_;
2100 2104
2101 if ($GRAB == $self) { 2105 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107
2108 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2111
2112 $self->set_value ($x * ($hi - $lo) + $lo);
2113 }
2114}
2115
2116sub update {
2117 my ($self) = @_;
2118
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]);
2121
2102 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2122 my ($value, $lo, $hi, $page) = @{$self->{range}};
2103 2123
2104 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2124 my $inner_w = 1 - 2 * $self->{inner_pad};
2105 2125
2106 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2107 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2108 2127
2109 $x -= $inner_pad_px; # substract the padding 2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2110 $x = $x * ($hi - $lo) / $inner_w + $lo; 2129 $value = $self->{scale} * ($value - $lo);
2111 $x = $lo if $x < $lo;
2112 $x = $hi - $page if $x > $hi - $page;
2113 $self->{range}[0] = $x;
2114 2130
2115 $self->emit (changed => $x); 2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
2116 $self->update; 2132
2133 $value = 0 if $value < 0;
2134 $page = 1 - $value if $value + $page > 1;
2135
2136 $self->{knob_x} = $value;
2137 $self->{knob_w} = $page;
2117 } 2138 });
2118}
2119 2139
2120# the inner_* stuff is for generating a padding for the slider handle, 2140 $self->SUPER::update;
2121# so that the handle doesn't leave the texture. This calculation isn't 100%
2122# correct propably, but it does the job for now
2123sub _calc_inner_pad_px {
2124 my ($self, $w) = @_;
2125 ($w / 100) * $self->{inner_pad} # % to pixels
2126} 2141}
2127 2142
2128sub _draw { 2143sub _draw {
2129 my ($self) = @_; 2144 my ($self) = @_;
2130 2145
2131 $self->SUPER::_draw (); 2146 $self->SUPER::_draw ();
2132 2147
2133 my ($w, $h) = @$self{qw(w h)}; 2148 glScale $self->{w}, $self->{h};
2134 2149
2135 if ($self->{vertical}) { 2150 if ($self->{vertical}) {
2136 # draw a vertical slider like a rotated horizontal slider 2151 # draw a vertical slider like a rotated horizontal slider
2137 2152
2138 glRotate 90, 0, 0, 1; 2153 glRotate 90, 0, 0, 1;
2139 glTranslate 0, -$self->{w}, 0; 2154 glTranslate 0, 1, 0;
2140
2141 ($w, $h) = ($h, $w);
2142 } 2155 }
2143 2156
2144 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2145 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2146 2159
2147 my ($value, $lo, $hi, $page) = @{$self->{range}};
2148
2149 $hi = $value + 1 if $lo == $hi;
2150
2151 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2152 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2153
2154 $page = int $page * $inner_w / ($hi - $lo);
2155 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2156
2157 $w -= $page;
2158 $page &= ~1;
2159 glTranslate $page * 0.5, 0, 0;
2160 $page ||= 2;
2161
2162 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2163 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2164
2165 glEnable GL_BLEND;
2166 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2167 glEnable GL_TEXTURE_2D; 2160 glEnable GL_TEXTURE_2D;
2168 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2161 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2169 2162
2170 # draw background 2163 # draw background
2171 $tex[1]->draw_quad (0, 0, $w, $h); 2164 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2172 2165
2173 # draw handle 2166 # draw handle
2174 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2175 2168
2176 glDisable GL_BLEND;
2177 glDisable GL_TEXTURE_2D; 2169 glDisable GL_TEXTURE_2D;
2178} 2170}
2179 2171
2180############################################################################# 2172#############################################################################
2181 2173
… …
2192 fontsize => 1, 2184 fontsize => 1,
2193 can_events => 0, 2185 can_events => 0,
2194 #font => default_font 2186 #font => default_font
2195 @_, 2187 @_,
2196 2188
2197 layout => (new CFClient::Layout), 2189 layout => (new CFClient::Layout 1),
2198 par => [], 2190 par => [],
2199 height => 0, 2191 height => 0,
2200 children => [ 2192 children => [
2201 (new CFClient::UI::Empty expand => 1), 2193 (new CFClient::UI::Empty expand => 1),
2202 (new CFClient::UI::Slider vertical => 1), 2194 (new CFClient::UI::Slider vertical => 1),
… …
2220 2212
2221 my $layout = $self->{layout}; 2213 my $layout = $self->{layout};
2222 2214
2223 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2224 $layout->set_width ($self->{children}[0]{w}); 2216 $layout->set_width ($self->{children}[0]{w});
2225 $layout->set_text ($text); 2217 $layout->set_markup ($text);
2226 2218
2227 ($layout->size)[1] 2219 ($layout->size)[1]
2228} 2220}
2229 2221
2230sub reflow { 2222sub reflow {
… …
2268 2260
2269 return unless $self->{h} > 0; 2261 return unless $self->{h} > 0;
2270 2262
2271 delete $self->{texture}; 2263 delete $self->{texture};
2272 2264
2273 $ROOT->on_refresh ($self, sub { 2265 $ROOT->on_post_alloc ($self, sub {
2274 if (delete $self->{need_reflow}) { 2266 if (delete $self->{need_reflow}) {
2275 my $height = 0; 2267 my $height = 0;
2276 2268
2277 $height += $_->[0] = $self->text_height ($_->[2]) 2269 $height += $_->[0] = $self->text_height ($_->[2])
2278 for @{$self->{par}}; 2270 for @{$self->{par}};
… …
2286 2278
2287 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2288 glClearColor 0, 0, 0, 0; 2280 glClearColor 0, 0, 0, 0;
2289 glClear GL_COLOR_BUFFER_BIT; 2281 glClear GL_COLOR_BUFFER_BIT;
2290 2282
2291 glEnable GL_BLEND;
2292 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2293 glEnable GL_TEXTURE_2D; 2283 glEnable GL_TEXTURE_2D;
2294 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2295 2285
2296 my $top = int $self->{children}[1]{range}[0]; 2286 my $top = int $self->{children}[1]{range}[0];
2297 2287
… …
2306 2296
2307 for my $par (@{$self->{par}}) { 2297 for my $par (@{$self->{par}}) {
2308 my $h = $par->[0]; 2298 my $h = $par->[0];
2309 2299
2310 if ($y0 < $y + $h && $y < $y1) { 2300 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] });
2311 $layout->set_text ($par->[2]); 2302 $layout->set_markup ($par->[2]);
2312 2303
2313 glColor @{ $par->[1] };
2314 my ($W, $H) = $layout->size; 2304 my ($W, $H) = $layout->size;
2315 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2316 } 2306 }
2317 2307
2318 $y += $h; 2308 $y += $h;
2319 } 2309 }
2320 2310
2321 glDisable GL_TEXTURE_2D; 2311 glDisable GL_TEXTURE_2D;
2322 glDisable GL_BLEND;
2323 }; 2312 };
2324 }); 2313 });
2325} 2314}
2326 2315
2327sub _draw { 2316sub _draw {
2328 my ($self) = @_; 2317 my ($self) = @_;
2329 2318
2330 glEnable GL_BLEND;
2331 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2332 glEnable GL_TEXTURE_2D; 2319 glEnable GL_TEXTURE_2D;
2333 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2334 glColor 1, 1, 1, 1; 2321 glColor 1, 1, 1, 1;
2335 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2336 glDisable GL_TEXTURE_2D; 2323 glDisable GL_TEXTURE_2D;
2337 glDisable GL_BLEND;
2338 2324
2339 $self->{children}[1]->draw; 2325 $self->{children}[1]->draw;
2340 2326
2341} 2327}
2342 2328
… …
2436 @_, 2422 @_,
2437 can_events => 0, 2423 can_events => 0,
2438 ) 2424 )
2439} 2425}
2440 2426
2441sub set_markup { 2427sub set_tooltip_from {
2442 my ($self, $text) = @_; 2428 my ($self, $widget) = @_;
2443 2429
2444 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2430 $self->add (new CFClient::UI::Label
2445 $self->{label}->set_markup ($text); 2431 markup => $widget->{tooltip},
2446 $self->add ($self->{label}); 2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8,
2434 fg => [0, 0, 0, 1],
2435 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 );
2447} 2437}
2448 2438
2449sub size_request { 2439sub size_request {
2450 my ($self) = @_; 2440 my ($self) = @_;
2451
2452 $self->child->set_max_size ($::WIDTH * 0.3);
2453 2441
2454 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2442 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2455 2443
2456 ($w + 4, $h + 4) 2444 ($w + 4, $h + 4)
2457} 2445}
… …
2463} 2451}
2464 2452
2465sub _draw { 2453sub _draw {
2466 my ($self) = @_; 2454 my ($self) = @_;
2467 2455
2468 glPushMatrix;
2469 glTranslate 0.375, 0.375; 2456 glTranslate 0.375, 0.375;
2470 2457
2471 my ($w, $h) = @$self{qw(w h)}; 2458 my ($w, $h) = @$self{qw(w h)};
2472 2459
2473 glColor 1, 0.8, 0.4; 2460 glColor 1, 0.8, 0.4;
… …
2484 glVertex 0 , $h; 2471 glVertex 0 , $h;
2485 glVertex $w, $h; 2472 glVertex $w, $h;
2486 glVertex $w, 0; 2473 glVertex $w, 0;
2487 glEnd; 2474 glEnd;
2488 2475
2489 glPopMatrix; 2476 glTranslate 2 - 0.375, 2 - 0.375;
2490
2491 glTranslate 2, 2;
2492 $self->SUPER::_draw; 2477 $self->SUPER::_draw;
2493} 2478}
2494 2479
2495############################################################################# 2480#############################################################################
2496 2481
… …
2519 return unless $::CONN;#d# manage and cache textures differently 2504 return unless $::CONN;#d# manage and cache textures differently
2520 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2521 2506
2522 # TODO animation 2507 # TODO animation
2523 if ($tex) { 2508 if ($tex) {
2524 glEnable GL_BLEND;
2525 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2526 glEnable GL_TEXTURE_2D; 2509 glEnable GL_TEXTURE_2D;
2527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2528 glColor 1, 1, 1, 1; 2511 glColor 1, 1, 1, 1;
2529 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2530 glDisable GL_TEXTURE_2D; 2513 glDisable GL_TEXTURE_2D;
2531 glDisable GL_BLEND;
2532 } 2514 }
2533} 2515}
2534 2516
2535############################################################################# 2517#############################################################################
2536 2518
2537package CFClient::UI::InventoryItem; 2519package CFClient::UI::InventoryItem;
2538 2520
2539our @ISA = CFClient::UI::HBox::; 2521our @ISA = CFClient::UI::HBox::;
2522
2523sub _item_to_desc {
2524 my ($item) = @_;
2525
2526 my $desc =
2527 $item->{nrof} < 2
2528 ? $item->{name}
2529 : "$item->{nrof} $item->{name_pl}";
2530
2531 $item->{flags} & Crossfire::Protocol::F_OPEN
2532 and $desc .= " (open)";
2533 $item->{flags} & Crossfire::Protocol::F_APPLIED
2534 and $desc .= " (applied)";
2535 $item->{flags} & Crossfire::Protocol::F_UNPAID
2536 and $desc .= " (unpaid)";
2537 $item->{flags} & Crossfire::Protocol::F_MAGIC
2538 and $desc .= " (magic)";
2539 $item->{flags} & Crossfire::Protocol::F_CURSED
2540 and $desc .= " (cursed)";
2541 $item->{flags} & Crossfire::Protocol::F_DAMNED
2542 and $desc .= " (damned)";
2543 $item->{flags} & Crossfire::Protocol::F_LOCKED
2544 and $desc .= " *";
2545
2546 $desc
2547}
2540 2548
2541sub new { 2549sub new {
2542 my $class = shift; 2550 my $class = shift;
2543 2551
2544 my %args = @_; 2552 my %args = @_;
2545 2553
2546 my $item = $args{item}; 2554 my $item = delete $args{item};
2547 2555
2548 my $desc = $item->{nrof} < 2 2556 my $desc = _item_to_desc ($item);
2549 ? $item->{name}
2550 : "$item->{nrof} $item->{name_pl}";
2551
2552 2557
2553 my $self = $class->SUPER::new ( 2558 my $self = $class->SUPER::new (
2554 can_hover => 1, 2559 can_hover => 1,
2555 can_events => 1, 2560 can_events => 1,
2556 tooltip => (CFClient::UI::Label->escape ($desc) 2561 tooltip => ((CFClient::UI::Label::escape $desc)
2557 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2562 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2558 connect_button_down => sub { 2563 connect_button_down => sub {
2559 my ($self, $ev, $x, $y) = @_; 2564 my ($self, $ev, $x, $y) = @_;
2560 2565
2561 # todo: maybe put examine on 1? but should just be a tooltip :( 2566 # todo: maybe put examine on 1? but should just be a tooltip :(
2562 if ($ev->{button} == 1) { 2567 if ($ev->{button} == 1) {
2568 my $targ = $::CONN->{player}{tag};
2569
2570 if ($item->{container} == $::CONN->{player}{tag}) {
2571 $targ = $main::OPENCONT;
2572 }
2573
2563 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2574 $::CONN->send ("move $targ $item->{tag} 0");
2564 } elsif ($ev->{button} == 2) { 2575 } elsif ($ev->{button} == 2) {
2565 $::CONN->send ("apply $item->{tag}"); 2576 $::CONN->send ("apply $item->{tag}");
2566 } elsif ($ev->{button} == 3) { 2577 } elsif ($ev->{button} == 3) {
2567 CFClient::UI::Menu->new ( 2578 my @menu_items = (
2568 items => [
2569 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2579 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2580 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2581 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2582 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2570 [ 2583 [
2571 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2584 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2572 sub { $::CONN->send ("lock $item->{tag}") }, 2585 sub { $::CONN->send ("lock $item->{tag}") },
2573 ],
2574 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2575 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2576 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2577 ], 2586 ],
2578 )->popup ($ev); 2587 );
2588
2589 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2579 } 2590 }
2580 2591
2581 1 2592 1
2582 }, 2593 },
2583 %args 2594 %args
2584 ); 2595 );
2596
2597
2585 $self->add(new CFClient::UI::Face 2598 $self->add (new CFClient::UI::Face
2586 can_events => 0, 2599 can_events => 0,
2587 face => $item->{face}, 2600 face => $item->{face},
2588 anim => $item->{anim}, 2601 anim => $item->{anim},
2589 animspeed => $item->{animspeed}); 2602 animspeed => $item->{animspeed},
2590 $self->add(new CFClient::UI::Label 2603 );
2591 can_events => 0, 2604
2592 text => $desc); 2605 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2606
2607 $self->{item} = $item;
2608
2609 $self->update_item;
2593 2610
2594 $self 2611 $self
2612}
2613
2614sub update_item {
2615 my ($self) = @_;
2616
2617 my $desc = _item_to_desc ($self->{item});
2618
2619 $self->{name_lbl}->set_text ($desc);
2595} 2620}
2596 2621
2597############################################################################# 2622#############################################################################
2598 2623
2599package CFClient::UI::Inventory; 2624package CFClient::UI::Inventory;
… …
2615 my ($self, $items) = @_; 2640 my ($self, $items) = @_;
2616 2641
2617 $self->{scrolled}->clear; 2642 $self->{scrolled}->clear;
2618 return unless $items; 2643 return unless $items;
2619 2644
2620 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2645 my @items = sort {
2646 ($a->{type} <=> $b->{type})
2647 or ($a->{name} cmp $b->{name})
2648 } @$items;
2621 2649
2622 $self->{real_items} = \@items; 2650 $self->{real_items} = \@items;
2623 2651
2624 for my $item (@items) { 2652 for my $item (@items) {
2625 my $desc = $item->{nrof} < 2
2626 ? $item->{name}
2627 : "$item->{nrof} $item->{name_pl}";
2628
2629 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2653 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2654 $item->update_item ();
2630 } 2655 }
2656
2657 $self->{scrolled}->add (@items);
2631 2658
2632# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2659# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633} 2660}
2634 2661
2635sub size_request { 2662sub size_request {
… …
2709 } 2736 }
2710} 2737}
2711 2738
2712############################################################################# 2739#############################################################################
2713 2740
2741package CFClient::UI::Statusbox;
2742
2743our @ISA = CFClient::UI::VBox::;
2744
2745sub new {
2746 my $class = shift;
2747
2748 $class->SUPER::new (
2749 fontsize => 0.8,
2750 @_,
2751 )
2752}
2753
2754sub reorder {
2755 my ($self) = @_;
2756 my $NOW = time;
2757
2758 while (my ($k, $v) = each %{ $self->{item} }) {
2759 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2760 }
2761
2762 my @widgets;
2763
2764 my @items = sort {
2765 $a->{pri} <=> $b->{pri}
2766 or $b->{id} <=> $a->{id}
2767 } values %{ $self->{item} };
2768
2769 my $count = 10 + 1;
2770 for my $item (@items) {
2771 last unless --$count;
2772
2773 push @widgets, $item->{label} ||= do {
2774 # TODO: doesn't handle markup well (read as: at all)
2775 my $short = $item->{count} > 1
2776 ? "<b>$item->{count} ×</b> $item->{text}"
2777 : $item->{text};
2778
2779 my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2781 for ($short) {
2782 s/^\s+//;
2783 s/\s+/ /g;
2784 my $len = int 40 / $fontsize;
2785 substr $_, $len, length, "…" if $len < length;
2786 }
2787
2788 new CFClient::UI::Label
2789 markup => $short,
2790 tooltip => $item->{tooltip},
2791 tooltip_font => $::FONT_PROP,
2792 tooltip_width => 0.67,
2793 fontsize => $fontsize,
2794 fg => $item->{fg},
2795 can_events => 1,
2796 can_hover => 1
2797 };
2798 }
2799
2800 $self->clear;
2801 $self->SUPER::add (reverse @widgets);
2802}
2803
2804sub add {
2805 my ($self, $text, %arg) = @_;
2806
2807 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//;
2809
2810 my $timeout = time + ((delete $arg{timeout}) || 60);
2811
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813
2814 if (my $item = $self->{item}{$group}) {
2815 if ($item->{text} eq $text) {
2816 $item->{count}++;
2817 } else {
2818 $item->{count} = 1;
2819 $item->{text} = $item->{tooltip} = $text;
2820 }
2821 $item->{id} = ++$self->{id};
2822 $item->{timeout} = $timeout;
2823 delete $item->{label};
2824 } else {
2825 $self->{item}{$group} = {
2826 id => ++$self->{id},
2827 text => $text,
2828 timeout => $timeout,
2829 tooltip => $text,
2830 fg => [0.8, 0.8, 0.8, 0.8],
2831 pri => 0,
2832 count => 1,
2833 %arg,
2834 };
2835 }
2836
2837 $self->reorder;
2838}
2839
2840#############################################################################
2841
2714package CFClient::UI::Root; 2842package CFClient::UI::Root;
2715 2843
2716our @ISA = CFClient::UI::Container::; 2844our @ISA = CFClient::UI::Container::;
2717 2845
2718use CFClient::OpenGL; 2846use CFClient::OpenGL;
2719 2847
2848sub new {
2849 my $class = shift;
2850
2851 $class->SUPER::new (
2852 @_,
2853 )
2854}
2855
2856sub configure {
2857 my ($self, $x, $y, $w, $h) = @_;
2858
2859 $self->{w} = $w;
2860 $self->{h} = $h;
2861}
2862
2720sub check_size { 2863sub check_size {
2721 my ($self) = @_; 2864 my ($self) = @_;
2722 2865
2723 $self->configure (0, 0, $self->{w}, $self->{h}); 2866 $self->size_allocate ($self->{w}, $self->{h})
2867 if $self->{w};
2724} 2868}
2725 2869
2726sub size_request { 2870sub size_request {
2727 my ($self) = @_; 2871 my ($self) = @_;
2728 2872
… …
2730} 2874}
2731 2875
2732sub size_allocate { 2876sub size_allocate {
2733 my ($self, $w, $h) = @_; 2877 my ($self, $w, $h) = @_;
2734 2878
2735 my $old_w = $self->{old_w}; 2879 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2736 my $old_h = $self->{old_h}; 2880 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2737 2881
2738 if ($old_w && $old_h) { 2882 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2739 for my $child ($self->children) { 2883 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2740 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2741 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2742 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2743 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2744 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2745 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2746 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2747 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2748 }
2749 }
2750
2751 $self->{old_w} = $w;
2752 $self->{old_h} = $h;
2753}
2754
2755sub configure {
2756 my ($self, $x, $y, $w, $h) = @_;
2757
2758 $self->SUPER::configure ($x, $y, $w, $h);
2759 2884
2760 for my $child ($self->children) { 2885 for my $child ($self->children) {
2761 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2886 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2762 2887
2888 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2889 if exists $child->{req_x};
2890
2891 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2892 if exists $child->{req_y};
2893
2763 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2894 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2764 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2895 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2896
2765 $child->configure ($X, $Y, $W, $H); 2897 $child->configure ($X, $Y, $W, $H);
2766 } 2898 }
2767} 2899}
2768 2900
2769sub _topleft { 2901sub coord2local {
2770 my ($self, $x, $y) = @_; 2902 my ($self, $x, $y) = @_;
2771 2903
2772 ($x, $y) 2904 ($x, $y)
2773} 2905}
2774 2906
2907sub coord2global {
2908 my ($self, $x, $y) = @_;
2909
2910 ($x, $y)
2911}
2912
2775sub update { 2913sub update {
2776 my ($self) = @_; 2914 my ($self) = @_;
2777 2915
2778 $self->check_size; 2916 $self->check_size;
2779 ::refresh (); 2917 $::WANT_REFRESH++;
2780} 2918}
2781 2919
2782sub add { 2920sub add {
2783 my ($self, $child) = @_; 2921 my ($self, @children) = @_;
2784 2922
2923 for my $child (@children) {
2924 $child->{toplevel} = 1;
2925
2785 # integerize window positions 2926 # integerise window positions
2786 $child->{x} = int $child->{x}; 2927 $child->{x} = int $child->{x};
2787 $child->{y} = int $child->{y}; 2928 $child->{y} = int $child->{y};
2929 }
2788 2930
2789 $self->SUPER::add ($child); 2931 $self->SUPER::add (@children);
2790} 2932}
2791 2933
2792sub on_refresh { 2934sub on_refresh {
2793 my ($self, $id, $cb) = @_; 2935 my ($self, $id, $cb) = @_;
2794 2936
2795 $self->{refresh_hook}{$id} = $cb; 2937 $self->{refresh_hook}{$id} = $cb;
2796} 2938}
2797 2939
2940sub on_post_alloc {
2941 my ($self, $id, $cb) = @_;
2942
2943 $self->{post_alloc_hook}{$id} = $cb;
2944}
2945
2798sub draw { 2946sub draw {
2799 my ($self) = @_; 2947 my ($self) = @_;
2800 2948
2801 while (my $rcb = delete $self->{refresh_hook}) { 2949 while ($self->{refresh_hook}) {
2802 $_->() for values %$rcb; 2950 $_->()
2951 for values %{delete $self->{refresh_hook}};
2952 }
2953
2954 if ($self->{check_size}) {
2955 my @queue = ([], []);
2956
2957 for (;;) {
2958 if ($self->{check_size}) {
2959 # heuristic: check containers last
2960 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2961 for values %{delete $self->{check_size}}
2962 }
2963
2964 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2965
2966 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2967 ? @$widget{qw(user_w user_h)}
2968 : $widget->size_request;
2969
2970 if (delete $widget->{force_alloc}
2971 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2972 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2973
2974 $widget->{req_w} = $w;
2975 $widget->{req_h} = $h;
2976
2977 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2978
2979 $widget->{parent}->check_size
2980 if $widget->{parent};
2981 }
2982 }
2983 }
2984
2985 while ($self->{size_alloc}) {
2986 for (values %{delete $self->{size_alloc}}) {
2987 my ($widget, $w, $h) = @$_;
2988
2989 $w = 0 if $w < 0;
2990 $h = 0 if $h < 0;
2991
2992 $widget->{w} = $w;
2993 $widget->{h} = $h;
2994 $widget->size_allocate ($w, $h);
2995 $widget->emit (size_allocate => $w, $h);
2996 }
2997 }
2998
2999 while ($self->{post_alloc_hook}) {
3000 $_->()
3001 for values %{delete $self->{post_alloc_hook}};
2803 } 3002 }
2804 3003
2805 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3004 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2806 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2807 glClear GL_COLOR_BUFFER_BIT; 3006 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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