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.186 by root, Mon May 8 20:39:34 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->{parent} 426 $self->{force_alloc} = 1 if $forced;
409 or return 1; 427 $CFClient::UI::ROOT->{check_size}{$self} = $self;
410
411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
414
415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
416 $self->{req_w} = $w;
417 $self->{req_h} = $h;
418
419 $self->{parent}->check_size
420 or $self->size_allocate (
421 (List::Util::max $self->{w}, $w),
422 (List::Util::max $self->{h}, $h),
423 );
424
425 1
426 } else {
427 0
428 }
429} 428}
430 429
431sub update { 430sub update {
432 my ($self) = @_; 431 my ($self) = @_;
433 432
… …
448} 447}
449 448
450sub DESTROY { 449sub DESTROY {
451 my ($self) = @_; 450 my ($self) = @_;
452 451
452 delete $WIDGET{$self+0};
453 #$self->deactivate; 453 #$self->deactivate;
454} 454}
455 455
456############################################################################# 456#############################################################################
457 457
… …
466 my $class = shift; 466 my $class = shift;
467 467
468 # range [value, low, high, page] 468 # range [value, low, high, page]
469 469
470 $class->SUPER::new ( 470 $class->SUPER::new (
471 bg => [0, 0, 0, 0.2], 471 #bg => [0, 0, 0, 0.2],
472 active_bg => [1, 1, 1, 0.5], 472 #active_bg => [1, 1, 1, 0.5],
473 @_ 473 @_
474 ) 474 )
475} 475}
476 476
477sub _draw { 477sub _draw {
478 my ($self) = @_; 478 my ($self) = @_;
479 479
480 my $color = $FOCUS == $self && $self->{active_bg}
481 ? $self->{active_bg}
482 : $self->{bg};
483
484 if ($color && (@$color < 4 || $color->[3])) {
480 my ($w, $h) = @$self{qw(w h)}; 485 my ($w, $h) = @$self{qw(w h)};
481 486
482 glEnable GL_BLEND; 487 glEnable GL_BLEND;
483 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 488 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
484 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 489 glColor @$color;
485 490
486 glBegin GL_QUADS; 491 glBegin GL_QUADS;
487 glVertex 0 , 0; 492 glVertex 0 , 0;
488 glVertex 0 , $h; 493 glVertex 0 , $h;
489 glVertex $w, $h; 494 glVertex $w, $h;
490 glVertex $w, 0; 495 glVertex $w, 0;
491 glEnd; 496 glEnd;
492 497
493 glDisable GL_BLEND; 498 glDisable GL_BLEND;
499 }
494} 500}
495 501
496############################################################################# 502#############################################################################
497 503
498package CFClient::UI::Empty; 504package CFClient::UI::Empty;
… …
530 536
531 $self 537 $self
532} 538}
533 539
534sub add { 540sub add {
535 my ($self, $child) = @_; 541 my ($self, @widgets) = @_;
536 542
537 $child->set_parent ($self); 543 $_->set_parent ($self)
544 for @widgets;
538 545
539 use sort 'stable'; 546 use sort 'stable';
540 547
541 $self->{children} = [ 548 $self->{children} = [
542 sort { $a->{z} <=> $b->{z} } 549 sort { $a->{z} <=> $b->{z} }
543 @{$self->{children}}, $child 550 @{$self->{children}}, @widgets
544 ]; 551 ];
545 552
546 $child->check_size; 553 $self->check_size (1);
547 $self->update; 554 $self->update;
548} 555}
549 556
550sub children { 557sub children {
551 @{ $_[0]{children} } 558 @{ $_[0]{children} }
… …
658} 665}
659 666
660sub update { 667sub update {
661 my ($self) = @_; 668 my ($self) = @_;
662 669
663 $ROOT->on_refresh ($self => sub { $self->render_child }); 670 $ROOT->on_post_alloc ($self => sub { $self->render_child });
664 $self->SUPER::update; 671 $self->SUPER::update;
665} 672}
666 673
667sub size_allocate { 674sub size_allocate {
668 my ($self, $w, $h) = @_; 675 my ($self, $w, $h) = @_;
… …
699 my ($w, $h) = ($self->w, $self->h); 706 my ($w, $h) = ($self->w, $self->h);
700 707
701 my $tex = $self->{texture} 708 my $tex = $self->{texture}
702 or return; 709 or return;
703 710
704 glEnable GL_BLEND;
705 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
706 glEnable GL_TEXTURE_2D; 711 glEnable GL_TEXTURE_2D;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708 glColor 0, 0, 0, 1; 713 glColor 0, 0, 0, 1;
709 714
710 $tex->draw_quad (0, 0, $w, $h); 715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
711 716
712 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 717 glDisable GL_TEXTURE_2D;
714} 718}
715 719
716############################################################################# 720#############################################################################
717 721
… …
741 $self->{view_y} = int $y; 745 $self->{view_y} = int $y;
742 746
743 $self->update; 747 $self->update;
744} 748}
745 749
746# 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
747sub _topleft { 751sub coord2local {
748 my ($self, $x, $y) = @_; 752 my ($self, $x, $y) = @_;
749 753
750 $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)
751} 764}
752 765
753sub find_widget { 766sub find_widget {
754 my ($self, $x, $y) = @_; 767 my ($self, $x, $y) = @_;
755 768
… …
800 $self->add ($self->{slider}); 813 $self->add ($self->{slider});
801 814
802 $self 815 $self
803} 816}
804 817
805#TODO# update range on size_allocate depeneing on child 818#TODO# update range on size_allocate depending on child
806# update viewport offset on scroll 819# update viewport offset on scroll
807 820
808############################################################################# 821#############################################################################
809 822
810package CFClient::UI::Frame; 823package CFClient::UI::Frame;
… …
814use CFClient::OpenGL; 827use CFClient::OpenGL;
815 828
816sub new { 829sub new {
817 my $class = shift; 830 my $class = shift;
818 831
819 my $self = $class->SUPER::new ( 832 $class->SUPER::new (
820 bg => [1, 1, 1, 1], 833 bg => undef,
821 border_bg => [1, 1, 1, 1],
822 border => 0.8,
823 @_ 834 @_,
824 ); 835 )
825
826 $self
827} 836}
828 837
829sub _draw { 838sub _draw {
830 my ($self) = @_; 839 my ($self) = @_;
831 840
832 my ($w, $h) = ($self->{w}, $self->{h}); 841 if ($self->{bg}) {
842 my ($w, $h) = @$self{qw(w h)};
833 843
834 glEnable GL_BLEND; 844 glEnable GL_BLEND;
835 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
836 glEnable GL_TEXTURE_2D; 846 glColor @{ $self->{bg} };
837 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
838 847
839# glBegin GL_QUADS; 848 glBegin GL_QUADS;
840# glColor 0, 0, 0, 0;
841# glVertex 0 , 0; 849 glVertex 0 , 0;
842# glVertex 0 , $h; 850 glVertex 0 , $h;
843# glVertex $w, $h; 851 glVertex $w, $h;
844# glVertex $w, 0; 852 glVertex $w, 0;
845# glEnd; 853 glEnd;
846 854
847
848 $self->child->draw;
849 glDisable GL_BLEND; 855 glDisable GL_BLEND;
850 glDisable GL_TEXTURE_2D; 856 }
857
858 $self->SUPER::_draw;
851} 859}
852 860
853############################################################################# 861#############################################################################
854 862
855package CFClient::UI::FancyFrame; 863package CFClient::UI::FancyFrame;
… …
869 877
870 my $self = $class->SUPER::new ( 878 my $self = $class->SUPER::new (
871 bg => [1, 1, 1, 1], 879 bg => [1, 1, 1, 1],
872 border_bg => [1, 1, 1, 1], 880 border_bg => [1, 1, 1, 1],
873 border => 0.6, 881 border => 0.6,
882 toplevel => 1,
874 can_events => 1, 883 can_events => 1,
875 @_ 884 @_
876 ); 885 );
877 886
878 $self->{title} &&= new CFClient::UI::Label 887 $self->{title} &&= new CFClient::UI::Label
… …
903 my ($self, $w, $h) = @_; 912 my ($self, $w, $h) = @_;
904 913
905 $h -= List::Util::max 0, $self->border * 2; 914 $h -= List::Util::max 0, $self->border * 2;
906 $w -= List::Util::max 0, $self->border * 2; 915 $w -= List::Util::max 0, $self->border * 2;
907 916
908 $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)
909 if $self->{title}; 918 if $self->{title};
910 919
911 $self->child->configure ($self->border, $self->border, $w, $h); 920 $self->child->configure ($self->border, $self->border, $w, $h);
912} 921}
913 922
… …
971 my ($self) = @_; 980 my ($self) = @_;
972 981
973 my ($w, $h ) = ($self->{w}, $self->{h}); 982 my ($w, $h ) = ($self->{w}, $self->{h});
974 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
975 984
976 glEnable GL_BLEND;
977 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
978 glEnable GL_TEXTURE_2D; 985 glEnable GL_TEXTURE_2D;
979 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
980 987
981 my $border = $self->border; 988 my $border = $self->border;
982 989
983 glColor @{ $self->{border_bg} }; 990 glColor @{ $self->{border_bg} };
984 $tex[1]->draw_quad (0, 0, $w, $border); 991 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
985 $tex[3]->draw_quad (0, $border, $border, $ch); 992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
986 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
987 $tex[4]->draw_quad (0, $h - $border, $w, $border); 994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
988 995
989 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
990 my $bg = $tex[0]; 997 my $bg = $tex[0];
991 998
992 # TODO: repeat texture not scale 999 # TODO: repeat texture not scale
… …
996 glColor @{ $self->{bg} }; 1003 glColor @{ $self->{bg} };
997 1004
998 $bg->{s} = $rep_x; 1005 $bg->{s} = $rep_x;
999 $bg->{t} = $rep_y; 1006 $bg->{t} = $rep_y;
1000 $bg->{wrap_mode} = 1; 1007 $bg->{wrap_mode} = 1;
1001 $bg->draw_quad ($border, $border, $cw, $ch); 1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 }
1002 1010
1003 glDisable GL_TEXTURE_2D; 1011 glDisable GL_TEXTURE_2D;
1004 glDisable GL_BLEND;
1005 }
1006 1012
1007 $self->{title}->draw if $self->{title}; 1013 $self->{title}->draw if $self->{title};
1008 1014
1009 $self->child->draw; 1015 $self->child->draw;
1010} 1016}
… …
1237} 1243}
1238 1244
1239sub size_allocate { 1245sub size_allocate {
1240 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h) = @_;
1241 1247
1248 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1242 my $children = $self->{children}; 1250 my $children = $self->{children};
1243 1251
1244 my @h = map $_->{req_h}, @$children; 1252 my @h = map $_->{req_h}, @$children;
1245 1253
1246 my $req_h = List::Util::sum @h; 1254 my $req_h = List::Util::sum @h;
… …
1275 1283
1276############################################################################# 1284#############################################################################
1277 1285
1278package CFClient::UI::Label; 1286package CFClient::UI::Label;
1279 1287
1280our @ISA = CFClient::UI::Base::; 1288our @ISA = CFClient::UI::DrawBG::;
1281 1289
1282use CFClient::OpenGL; 1290use CFClient::OpenGL;
1283 1291
1284sub new { 1292sub new {
1285 my ($class, %arg) = @_; 1293 my ($class, %arg) = @_;
1286 1294
1287 my $self = $class->SUPER::new ( 1295 my $self = $class->SUPER::new (
1288 fg => [1, 1, 1], 1296 fg => [1, 1, 1],
1297 #bg => none
1298 #active_bg => none
1289 #font => default_font 1299 #font => default_font
1300 #text => initial text
1301 #markup => initial narkup
1302 layout => (new CFClient::Layout),
1290 fontsize => 1, 1303 fontsize => 1,
1291 text => "",
1292 align => -1, 1304 align => -1,
1293 valign => -1, 1305 valign => -1,
1294 padding => 2, 1306 padding => 2,
1295 layout => new CFClient::Layout,
1296 can_events => 0, 1307 can_events => 0,
1297 %arg 1308 %arg
1298 ); 1309 );
1299 1310
1300 if (exists $self->{template}) { 1311 if (exists $self->{template}) {
1301 my $layout = new CFClient::Layout; 1312 my $layout = new CFClient::Layout;
1302 $layout->set_text (delete $self->{template}); 1313 $layout->set_text (delete $self->{template});
1303 $self->{template} = $layout; 1314 $self->{template} = $layout;
1304 } 1315 }
1305 1316
1306 $self->set_text (delete $self->{text}) if exists $self->{text}; 1317 if (exists $self->{markup}) {
1307 $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 }
1308 1322
1309 $self 1323 $self
1310} 1324}
1311 1325
1312sub escape { 1326sub escape($) {
1313 local $_ = $_[1]; 1327 local $_ = $_[0];
1314 1328
1315 s/&/&amp;/g; 1329 s/&/&amp;/g;
1316 s/>/&gt;/g; 1330 s/>/&gt;/g;
1317 s/</&lt;/g; 1331 s/</&lt;/g;
1318 1332
1319 $_[1] 1333 $_
1320} 1334}
1321 1335
1322sub update { 1336sub update {
1323 my ($self) = @_; 1337 my ($self) = @_;
1324 1338
… …
1330 my ($self, $text) = @_; 1344 my ($self, $text) = @_;
1331 1345
1332 return if $self->{text} eq "T$text"; 1346 return if $self->{text} eq "T$text";
1333 $self->{text} = "T$text"; 1347 $self->{text} = "T$text";
1334 1348
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1335 $self->{layout}->set_text ($text); 1350 $self->{layout}->set_text ($text);
1336 1351
1337 delete $self->{texture};
1338 $self->update; 1352 $self->update;
1339 $self->check_size; 1353 $self->check_size;
1340} 1354}
1341 1355
1342sub set_markup { 1356sub set_markup {
1343 my ($self, $markup) = @_; 1357 my ($self, $markup) = @_;
1344 1358
1345 return if $self->{text} eq "M$markup"; 1359 return if $self->{text} eq "M$markup";
1346 $self->{text} = "M$markup"; 1360 $self->{text} = "M$markup";
1347 1361
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363
1364 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348 $self->{layout}->set_markup ($markup); 1365 $self->{layout}->set_markup ($markup);
1349 1366
1350 delete $self->{texture};
1351 $self->update; 1367 $self->update;
1352 $self->check_size; 1368 $self->check_size;
1353} 1369}
1354 1370
1355sub size_request { 1371sub size_request {
… …
1394} 1410}
1395 1411
1396sub _draw { 1412sub _draw {
1397 my ($self) = @_; 1413 my ($self) = @_;
1398 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1399 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1402 $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
1403 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
1404 }; 1434 };
1405 1435
1406 glEnable GL_BLEND;
1407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1408 glEnable GL_TEXTURE_2D; 1436 glEnable GL_TEXTURE_2D;
1409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1410 1438
1439 if ($tex->{format} == GL_ALPHA) {
1411 glColor @{$self->{fg}}; 1440 glColor @{$self->{fg}};
1412
1413 $self->{ox} = int (
1414 $self->{align} < 0 ? $self->{padding}
1415 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1416 : ($self->{w} - $tex->{w}) * 0.5
1417 );
1418
1419 $self->{oy} = int (
1420 $self->{valign} < 0 ? $self->{padding}
1421 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1422 : ($self->{h} - $tex->{h}) * 0.5
1423 );
1424
1425 $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 }
1426 1445
1427 glDisable GL_TEXTURE_2D; 1446 glDisable GL_TEXTURE_2D;
1428 glDisable GL_BLEND;
1429} 1447}
1430 1448
1431############################################################################# 1449#############################################################################
1432 1450
1433package CFClient::UI::EntryBase; 1451package CFClient::UI::EntryBase;
… …
1468 $self->{layout}->set_text ("$text "); 1486 $self->{layout}->set_text ("$text ");
1469 1487
1470 $self->emit (changed => $self->{text}); 1488 $self->emit (changed => $self->{text});
1471} 1489}
1472 1490
1473sub get_text {
1474 $_[0]{text}
1475}
1476
1477sub size_request {
1478 my ($self) = @_;
1479
1480 my ($w, $h) = $self->SUPER::size_request;
1481
1482 ($w + 1, $h) # add 1 for cursor
1483}
1484
1485sub size_allocate {
1486 my ($self, $w, $h) = @_;
1487
1488 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1489}
1490
1491sub set_text { 1491sub set_text {
1492 my ($self, $text) = @_; 1492 my ($self, $text) = @_;
1493 1493
1494 $self->{cursor} = length $text; 1494 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1495 $self->_set_text ($text);
1496 $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
1497} 1516}
1498 1517
1499sub key_down { 1518sub key_down {
1500 my ($self, $ev) = @_; 1519 my ($self, $ev) = @_;
1501 1520
… …
1503 my $sym = $ev->{sym}; 1522 my $sym = $ev->{sym};
1504 my $uni = $ev->{unicode}; 1523 my $uni = $ev->{unicode};
1505 1524
1506 my $text = $self->get_text; 1525 my $text = $self->get_text;
1507 1526
1508 if ($sym == 8) { 1527 if ($uni == 8) {
1509 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1528 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1510 } elsif ($sym == 127) { 1529 } elsif ($uni == 127) {
1511 substr $text, $self->{cursor}, 1, ""; 1530 substr $text, $self->{cursor}, 1, "";
1512 } elsif ($sym == CFClient::SDLK_LEFT) { 1531 } elsif ($sym == CFClient::SDLK_LEFT) {
1513 --$self->{cursor} if $self->{cursor}; 1532 --$self->{cursor} if $self->{cursor};
1514 } elsif ($sym == CFClient::SDLK_RIGHT) { 1533 } elsif ($sym == CFClient::SDLK_RIGHT) {
1515 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1534 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1516 } elsif ($sym == CFClient::SDLK_HOME) { 1535 } elsif ($sym == CFClient::SDLK_HOME) {
1517 $self->{cursor} = 0; 1536 $self->{cursor} = 0;
1518 } elsif ($sym == CFClient::SDLK_END) { 1537 } elsif ($sym == CFClient::SDLK_END) {
1519 $self->{cursor} = length $text; 1538 $self->{cursor} = length $text;
1520 } elsif ($sym == 27) { 1539 } elsif ($uni == 27) {
1521 $self->emit ('escape'); 1540 $self->emit ('escape');
1522 } elsif ($uni) { 1541 } elsif ($uni) {
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1542 substr $text, $self->{cursor}++, 0, chr $uni;
1524 } 1543 }
1525 1544
1526 $self->_set_text ($text); 1545 $self->_set_text ($text);
1527 $self->update; 1546 $self->update;
1547 $self->check_size;
1528} 1548}
1529 1549
1530sub focus_in { 1550sub focus_in {
1531 my ($self) = @_; 1551 my ($self) = @_;
1532 1552
… …
1661 my $class = shift; 1681 my $class = shift;
1662 1682
1663 $class->SUPER::new ( 1683 $class->SUPER::new (
1664 padding => 4, 1684 padding => 4,
1665 fg => [1, 1, 1], 1685 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 1686 active_fg => [0, 0, 1],
1668 can_hover => 1, 1687 can_hover => 1,
1669 align => 0, 1688 align => 0,
1670 valign => 0, 1689 valign => 0,
1671 can_events => 1, 1690 can_events => 1,
… …
1689 1708
1690 if ($GRAB == $self) { 1709 if ($GRAB == $self) {
1691 $self->{fg} = $self->{active_fg}; 1710 $self->{fg} = $self->{active_fg};
1692 } 1711 }
1693 1712
1694 glEnable GL_BLEND;
1695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1696 glEnable GL_TEXTURE_2D; 1713 glEnable GL_TEXTURE_2D;
1697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1698 glColor 0, 0, 0, 1; 1715 glColor 0, 0, 0, 1;
1699 1716
1700 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1717 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1701 1718
1702 glDisable GL_TEXTURE_2D; 1719 glDisable GL_TEXTURE_2D;
1703 glDisable GL_BLEND;
1704 1720
1705 $self->SUPER::_draw; 1721 $self->SUPER::_draw;
1706} 1722}
1707 1723
1708############################################################################# 1724#############################################################################
… …
1722 1738
1723 $class->SUPER::new ( 1739 $class->SUPER::new (
1724 padding => 2, 1740 padding => 2,
1725 fg => [1, 1, 1], 1741 fg => [1, 1, 1],
1726 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],
1727 state => 0, 1745 state => 0,
1728 can_hover => 1, 1746 can_hover => 1,
1729 @_ 1747 @_
1730 ) 1748 )
1731} 1749}
… …
1755 1773
1756 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;
1757 1775
1758 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1759 1777
1760 glEnable GL_BLEND; 1778 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779
1761 glEnable GL_TEXTURE_2D; 1780 glEnable GL_TEXTURE_2D;
1762 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1763
1764 my $tex = $self->{state} ? $tex[1] : $tex[0];
1765
1766 $tex->draw_quad (0, 0, $s, $s); 1781 $tex->draw_quad_alpha (0, 0, $s, $s);
1767
1768 glDisable GL_TEXTURE_2D; 1782 glDisable GL_TEXTURE_2D;
1769 glDisable GL_BLEND;
1770} 1783}
1771 1784
1772############################################################################# 1785#############################################################################
1773 1786
1774package CFClient::UI::Image; 1787package CFClient::UI::Image;
… …
1817 glTranslate 0, -$self->{w}, 0; 1830 glTranslate 0, -$self->{w}, 0;
1818 1831
1819 ($w, $h) = ($h, $w); 1832 ($w, $h) = ($h, $w);
1820 } 1833 }
1821 1834
1822 glEnable GL_BLEND;
1823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1824 glEnable GL_TEXTURE_2D; 1835 glEnable GL_TEXTURE_2D;
1825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1836 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1826 1837
1827 $tex->draw_quad (0, 0, $w, $h); 1838 $tex->draw_quad_alpha (0, 0, $w, $h);
1828 1839
1829 glDisable GL_BLEND;
1830 glDisable GL_TEXTURE_2D; 1840 glDisable GL_TEXTURE_2D;
1831} 1841}
1832 1842
1833############################################################################# 1843#############################################################################
1834 1844
… …
2023 qw(s1_slider.png s1_slider_bg.png); 2033 qw(s1_slider.png s1_slider_bg.png);
2024 2034
2025sub new { 2035sub new {
2026 my $class = shift; 2036 my $class = shift;
2027 2037
2028 # range [value, low, high, page] 2038 # range [value, low, high, page, unit]
2029 2039
2030 # TODO: 0-width page 2040 # TODO: 0-width page
2031 # TODO: req_w/h are wrong with vertical 2041 # TODO: req_w/h are wrong with vertical
2032 # TODO: calculations are off 2042 # TODO: calculations are off
2033 my $self = $class->SUPER::new ( 2043 my $self = $class->SUPER::new (
2034 fg => [1, 1, 1], 2044 fg => [1, 1, 1],
2035 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],
2036 range => [0, 0, 100, 10], 2048 range => [0, 0, 100, 10],
2037 req_w => $::WIDTH / 80, 2049 req_w => $::WIDTH / 80,
2038 req_h => $::WIDTH / 80, 2050 req_h => $::WIDTH / 80,
2039 vertical => 0, 2051 vertical => 0,
2040 can_hover => 1, 2052 can_hover => 1,
2041 inner_pad => 5, 2053 inner_pad => .05,
2042 @_ 2054 @_
2043 ); 2055 );
2044 2056
2057 $self->set_value ($self->{range}[0]);
2058 $self->update;
2059
2045 $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 }
2046} 2084}
2047 2085
2048sub size_request { 2086sub size_request {
2049 my ($self) = @_; 2087 my ($self) = @_;
2050 2088
… …
2063 2101
2064sub mouse_motion { 2102sub mouse_motion {
2065 my ($self, $ev, $x, $y) = @_; 2103 my ($self, $ev, $x, $y) = @_;
2066 2104
2067 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
2068 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2122 my ($value, $lo, $hi, $page) = @{$self->{range}};
2069 2123
2070 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2124 my $inner_w = 1 - 2 * $self->{inner_pad};
2071 2125
2072 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2073 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2074 2127
2075 $x -= $inner_pad_px; # substract the padding 2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2076 $x = $x * ($hi - $lo) / $inner_w + $lo; 2129 $value = $self->{scale} * ($value - $lo);
2077 $x = $lo if $x < $lo;
2078 $x = $hi - $page if $x > $hi - $page;
2079 $self->{range}[0] = $x;
2080 2130
2081 $self->emit (changed => $x); 2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
2082 $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;
2083 } 2138 });
2084}
2085 2139
2086# the inner_* stuff is for generating a padding for the slider handle, 2140 $self->SUPER::update;
2087# so that the handle doesn't leave the texture. This calculation isn't 100%
2088# correct propably, but it does the job for now
2089sub _calc_inner_pad_px {
2090 my ($self, $w) = @_;
2091 ($w / 100) * $self->{inner_pad} # % to pixels
2092} 2141}
2093 2142
2094sub _draw { 2143sub _draw {
2095 my ($self) = @_; 2144 my ($self) = @_;
2096 2145
2097 $self->SUPER::_draw (); 2146 $self->SUPER::_draw ();
2098 2147
2099 my ($w, $h) = @$self{qw(w h)}; 2148 glScale $self->{w}, $self->{h};
2100 2149
2101 if ($self->{vertical}) { 2150 if ($self->{vertical}) {
2102 # draw a vertical slider like a rotated horizontal slider 2151 # draw a vertical slider like a rotated horizontal slider
2103 2152
2104 glRotate 90, 0, 0, 1; 2153 glRotate 90, 0, 0, 1;
2105 glTranslate 0, -$self->{w}, 0; 2154 glTranslate 0, 1, 0;
2106
2107 ($w, $h) = ($h, $w);
2108 } 2155 }
2109 2156
2110 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2111 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2112 2159
2113 my ($value, $lo, $hi, $page) = @{$self->{range}};
2114
2115 $hi = $value + 1 if $lo == $hi;
2116
2117 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2118 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2119
2120 $page = int $page * $inner_w / ($hi - $lo);
2121 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2122
2123 $w -= $page;
2124 $page &= ~1;
2125 glTranslate $page * 0.5, 0, 0;
2126 $page ||= 2;
2127
2128 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2129 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2130
2131 glEnable GL_BLEND;
2132 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2133 glEnable GL_TEXTURE_2D; 2160 glEnable GL_TEXTURE_2D;
2134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2161 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2135 2162
2136 # draw background 2163 # draw background
2137 $tex[1]->draw_quad (0, 0, $w, $h); 2164 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2138 2165
2139 # draw handle 2166 # draw handle
2140 $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);
2141 2168
2142 glDisable GL_BLEND;
2143 glDisable GL_TEXTURE_2D; 2169 glDisable GL_TEXTURE_2D;
2144} 2170}
2145 2171
2146############################################################################# 2172#############################################################################
2147 2173
… …
2158 fontsize => 1, 2184 fontsize => 1,
2159 can_events => 0, 2185 can_events => 0,
2160 #font => default_font 2186 #font => default_font
2161 @_, 2187 @_,
2162 2188
2163 layout => (new CFClient::Layout), 2189 layout => (new CFClient::Layout 1),
2164 par => [], 2190 par => [],
2165 height => 0, 2191 height => 0,
2166 children => [ 2192 children => [
2167 (new CFClient::UI::Empty expand => 1), 2193 (new CFClient::UI::Empty expand => 1),
2168 (new CFClient::UI::Slider vertical => 1), 2194 (new CFClient::UI::Slider vertical => 1),
… …
2186 2212
2187 my $layout = $self->{layout}; 2213 my $layout = $self->{layout};
2188 2214
2189 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2190 $layout->set_width ($self->{children}[0]{w}); 2216 $layout->set_width ($self->{children}[0]{w});
2191 $layout->set_text ($text); 2217 $layout->set_markup ($text);
2192 2218
2193 ($layout->size)[1] 2219 ($layout->size)[1]
2194} 2220}
2195 2221
2196sub reflow { 2222sub reflow {
… …
2234 2260
2235 return unless $self->{h} > 0; 2261 return unless $self->{h} > 0;
2236 2262
2237 delete $self->{texture}; 2263 delete $self->{texture};
2238 2264
2239 $ROOT->on_refresh ($self, sub { 2265 $ROOT->on_post_alloc ($self, sub {
2240 if (delete $self->{need_reflow}) { 2266 if (delete $self->{need_reflow}) {
2241 my $height = 0; 2267 my $height = 0;
2242 2268
2243 $height += $_->[0] = $self->text_height ($_->[2]) 2269 $height += $_->[0] = $self->text_height ($_->[2])
2244 for @{$self->{par}}; 2270 for @{$self->{par}};
… …
2252 2278
2253 $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 {
2254 glClearColor 0, 0, 0, 0; 2280 glClearColor 0, 0, 0, 0;
2255 glClear GL_COLOR_BUFFER_BIT; 2281 glClear GL_COLOR_BUFFER_BIT;
2256 2282
2257 glEnable GL_BLEND;
2258 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2259 glEnable GL_TEXTURE_2D; 2283 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261 2285
2262 my $top = int $self->{children}[1]{range}[0]; 2286 my $top = int $self->{children}[1]{range}[0];
2263 2287
… …
2272 2296
2273 for my $par (@{$self->{par}}) { 2297 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2298 my $h = $par->[0];
2275 2299
2276 if ($y0 < $y + $h && $y < $y1) { 2300 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] });
2277 $layout->set_text ($par->[2]); 2302 $layout->set_markup ($par->[2]);
2278 2303
2279 glColor @{ $par->[1] };
2280 my ($W, $H) = $layout->size; 2304 my ($W, $H) = $layout->size;
2281 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);
2282 } 2306 }
2283 2307
2284 $y += $h; 2308 $y += $h;
2285 } 2309 }
2286 2310
2287 glDisable GL_TEXTURE_2D; 2311 glDisable GL_TEXTURE_2D;
2288 glDisable GL_BLEND;
2289 }; 2312 };
2290 }); 2313 });
2291} 2314}
2292 2315
2293sub _draw { 2316sub _draw {
2294 my ($self) = @_; 2317 my ($self) = @_;
2295 2318
2296 glEnable GL_BLEND;
2297 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2298 glEnable GL_TEXTURE_2D; 2319 glEnable GL_TEXTURE_2D;
2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300 glColor 1, 1, 1, 1; 2321 glColor 1, 1, 1, 1;
2301 $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});
2302 glDisable GL_TEXTURE_2D; 2323 glDisable GL_TEXTURE_2D;
2303 glDisable GL_BLEND;
2304 2324
2305 $self->{children}[1]->draw; 2325 $self->{children}[1]->draw;
2306 2326
2307} 2327}
2308 2328
… …
2402 @_, 2422 @_,
2403 can_events => 0, 2423 can_events => 0,
2404 ) 2424 )
2405} 2425}
2406 2426
2407sub set_markup { 2427sub set_tooltip_from {
2408 my ($self, $text) = @_; 2428 my ($self, $widget) = @_;
2409 2429
2410 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2430 $self->add (new CFClient::UI::Label
2411 $self->{label}->set_markup ($text); 2431 markup => $widget->{tooltip},
2412 $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 );
2413} 2437}
2414 2438
2415sub size_request { 2439sub size_request {
2416 my ($self) = @_; 2440 my ($self) = @_;
2417
2418 $self->child->set_max_size ($::WIDTH * 0.3);
2419 2441
2420 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2442 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2421 2443
2422 ($w + 4, $h + 4) 2444 ($w + 4, $h + 4)
2423} 2445}
… …
2429} 2451}
2430 2452
2431sub _draw { 2453sub _draw {
2432 my ($self) = @_; 2454 my ($self) = @_;
2433 2455
2434 glPushMatrix;
2435 glTranslate 0.375, 0.375; 2456 glTranslate 0.375, 0.375;
2436 2457
2437 my ($w, $h) = @$self{qw(w h)}; 2458 my ($w, $h) = @$self{qw(w h)};
2438 2459
2439 glColor 1, 0.8, 0.4; 2460 glColor 1, 0.8, 0.4;
… …
2450 glVertex 0 , $h; 2471 glVertex 0 , $h;
2451 glVertex $w, $h; 2472 glVertex $w, $h;
2452 glVertex $w, 0; 2473 glVertex $w, 0;
2453 glEnd; 2474 glEnd;
2454 2475
2455 glPopMatrix; 2476 glTranslate 2 - 0.375, 2 - 0.375;
2456
2457 glTranslate 2, 2;
2458 $self->SUPER::_draw; 2477 $self->SUPER::_draw;
2459} 2478}
2460 2479
2461############################################################################# 2480#############################################################################
2462 2481
… …
2485 return unless $::CONN;#d# manage and cache textures differently 2504 return unless $::CONN;#d# manage and cache textures differently
2486 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2487 2506
2488 # TODO animation 2507 # TODO animation
2489 if ($tex) { 2508 if ($tex) {
2490 glEnable GL_BLEND;
2491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492 glEnable GL_TEXTURE_2D; 2509 glEnable GL_TEXTURE_2D;
2493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494 glColor 1, 1, 1, 1; 2511 glColor 1, 1, 1, 1;
2495 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2496 glDisable GL_TEXTURE_2D; 2513 glDisable GL_TEXTURE_2D;
2497 glDisable GL_BLEND;
2498 } 2514 }
2499} 2515}
2500 2516
2501############################################################################# 2517#############################################################################
2502 2518
2503package CFClient::UI::InventoryItem; 2519package CFClient::UI::InventoryItem;
2504 2520
2505our @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}
2506 2548
2507sub new { 2549sub new {
2508 my $class = shift; 2550 my $class = shift;
2509 2551
2510 my %args = @_; 2552 my %args = @_;
2511 2553
2512 my $item = $args{item}; 2554 my $item = delete $args{item};
2513 2555
2514 my $desc = $item->{nrof} < 2 2556 my $desc = _item_to_desc ($item);
2515 ? $item->{name}
2516 : "$item->{nrof} $item->{name_pl}";
2517
2518 2557
2519 my $self = $class->SUPER::new ( 2558 my $self = $class->SUPER::new (
2520 can_hover => 1, 2559 can_hover => 1,
2521 can_events => 1, 2560 can_events => 1,
2522 tooltip => (CFClient::UI::Label->escape ($desc) 2561 tooltip => ((CFClient::UI::Label::escape $desc)
2523 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2562 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2524 connect_button_down => sub { 2563 connect_button_down => sub {
2525 my ($self, $ev, $x, $y) = @_; 2564 my ($self, $ev, $x, $y) = @_;
2526 2565
2527 # 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 :(
2528 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
2529 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2574 $::CONN->send ("move $targ $item->{tag} 0");
2530 } elsif ($ev->{button} == 2) { 2575 } elsif ($ev->{button} == 2) {
2531 $::CONN->send ("apply $item->{tag}"); 2576 $::CONN->send ("apply $item->{tag}");
2532 } elsif ($ev->{button} == 3) { 2577 } elsif ($ev->{button} == 3) {
2533 CFClient::UI::Menu->new ( 2578 my @menu_items = (
2534 items => [
2535 ["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") }],
2536 [ 2583 [
2537 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2584 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2538 sub { $::CONN->send ("lock $item->{tag}") }, 2585 sub { $::CONN->send ("lock $item->{tag}") },
2539 ],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2543 ], 2586 ],
2544 )->popup ($ev); 2587 );
2588
2589 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2545 } 2590 }
2546 2591
2547 1 2592 1
2548 }, 2593 },
2549 %args 2594 %args
2550 ); 2595 );
2596
2597
2551 $self->add(new CFClient::UI::Face 2598 $self->add (new CFClient::UI::Face
2552 can_events => 0, 2599 can_events => 0,
2553 face => $item->{face}, 2600 face => $item->{face},
2554 anim => $item->{anim}, 2601 anim => $item->{anim},
2555 animspeed => $item->{animspeed}); 2602 animspeed => $item->{animspeed},
2556 $self->add(new CFClient::UI::Label 2603 );
2557 can_events => 0, 2604
2558 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;
2559 2610
2560 $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);
2561} 2620}
2562 2621
2563############################################################################# 2622#############################################################################
2564 2623
2565package CFClient::UI::Inventory; 2624package CFClient::UI::Inventory;
… …
2581 my ($self, $items) = @_; 2640 my ($self, $items) = @_;
2582 2641
2583 $self->{scrolled}->clear; 2642 $self->{scrolled}->clear;
2584 return unless $items; 2643 return unless $items;
2585 2644
2586 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;
2587 2649
2588 $self->{real_items} = \@items; 2650 $self->{real_items} = \@items;
2589 2651
2590 for my $item (@items) { 2652 for my $item (@items) {
2591 my $desc = $item->{nrof} < 2
2592 ? $item->{name}
2593 : "$item->{nrof} $item->{name_pl}";
2594
2595 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2653 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2654 $item->update_item ();
2596 } 2655 }
2656
2657 $self->{scrolled}->add (@items);
2597 2658
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2659# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2599} 2660}
2600 2661
2601sub size_request { 2662sub size_request {
… …
2675 } 2736 }
2676} 2737}
2677 2738
2678############################################################################# 2739#############################################################################
2679 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
2680package CFClient::UI::Root; 2842package CFClient::UI::Root;
2681 2843
2682our @ISA = CFClient::UI::Container::; 2844our @ISA = CFClient::UI::Container::;
2683 2845
2684use CFClient::OpenGL; 2846use CFClient::OpenGL;
2685 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
2686sub check_size { 2863sub check_size {
2687 my ($self) = @_; 2864 my ($self) = @_;
2688 2865
2689 $self->configure (0, 0, $self->{w}, $self->{h}); 2866 $self->size_allocate ($self->{w}, $self->{h})
2867 if $self->{w};
2690} 2868}
2691 2869
2692sub size_request { 2870sub size_request {
2693 my ($self) = @_; 2871 my ($self) = @_;
2694 2872
… …
2696} 2874}
2697 2875
2698sub size_allocate { 2876sub size_allocate {
2699 my ($self, $w, $h) = @_; 2877 my ($self, $w, $h) = @_;
2700 2878
2701 my $old_w = $self->{old_w}; 2879 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2702 my $old_h = $self->{old_h}; 2880 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2703 2881
2704 if ($old_w && $old_h) { 2882 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2705 for my $child ($self->children) { 2883 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2706 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2707 $child->{w} = int 0.5 + $child->{req_w} * $w / $old_w;
2708 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2709 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2710 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2711 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2712 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2713 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2714 }
2715 }
2716
2717 $self->{old_w} = $w;
2718 $self->{old_h} = $h;
2719}
2720
2721sub configure {
2722 my ($self, $x, $y, $w, $h) = @_;
2723
2724 $self->SUPER::configure ($x, $y, $w, $h);
2725 2884
2726 for my $child ($self->children) { 2885 for my $child ($self->children) {
2727 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)};
2728 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
2729 $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;
2730 $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
2731 $child->configure ($X, $Y, $W, $H); 2897 $child->configure ($X, $Y, $W, $H);
2732 } 2898 }
2733} 2899}
2734 2900
2735sub _topleft { 2901sub coord2local {
2736 my ($self, $x, $y) = @_; 2902 my ($self, $x, $y) = @_;
2737 2903
2738 ($x, $y) 2904 ($x, $y)
2739} 2905}
2740 2906
2907sub coord2global {
2908 my ($self, $x, $y) = @_;
2909
2910 ($x, $y)
2911}
2912
2741sub update { 2913sub update {
2742 my ($self) = @_; 2914 my ($self) = @_;
2743 2915
2744 $self->check_size; 2916 $self->check_size;
2745 ::refresh (); 2917 $::WANT_REFRESH++;
2746} 2918}
2747 2919
2748sub add { 2920sub add {
2749 my ($self, $child) = @_; 2921 my ($self, @children) = @_;
2750 2922
2923 for my $child (@children) {
2924 $child->{toplevel} = 1;
2925
2751 # integerize window positions 2926 # integerise window positions
2752 $child->{x} = int $child->{x}; 2927 $child->{x} = int $child->{x};
2753 $child->{y} = int $child->{y}; 2928 $child->{y} = int $child->{y};
2929 }
2754 2930
2755 $self->SUPER::add ($child); 2931 $self->SUPER::add (@children);
2756} 2932}
2757 2933
2758sub on_refresh { 2934sub on_refresh {
2759 my ($self, $id, $cb) = @_; 2935 my ($self, $id, $cb) = @_;
2760 2936
2761 $self->{refresh_hook}{$id} = $cb; 2937 $self->{refresh_hook}{$id} = $cb;
2762} 2938}
2763 2939
2940sub on_post_alloc {
2941 my ($self, $id, $cb) = @_;
2942
2943 $self->{post_alloc_hook}{$id} = $cb;
2944}
2945
2764sub draw { 2946sub draw {
2765 my ($self) = @_; 2947 my ($self) = @_;
2766 2948
2767 while (my $rcb = delete $self->{refresh_hook}) { 2949 while ($self->{refresh_hook}) {
2768 $_->() 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}};
2769 } 3002 }
2770 3003
2771 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3004 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2772 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2773 glClear GL_COLOR_BUFFER_BIT; 3006 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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