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.213 by root, Wed May 17 15:18:57 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 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET;
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) {
150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
151 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
155 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
157 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
158 }
159
160 $widget->reconfigure;
135 } 161 }
136} 162}
137 163
138############################################################################# 164#############################################################################
139 165
… …
158 if (/^connect_(.*)$/) { 184 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 185 $self->connect ($1 => delete $self->{$_});
160 } 186 }
161 } 187 }
162 188
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190
163 $self 191 $self
164} 192}
165 193
166sub destroy { 194sub destroy {
167 my ($self) = @_; 195 my ($self) = @_;
… …
232 $self->{y} = $y; 260 $self->{y} = $y;
233 $self->update; 261 $self->update;
234 } 262 }
235 263
236 if ($self->{w} != $w || $self->{h} != $h) { 264 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 265 $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 } 266 }
244} 267}
245 268
246sub size_allocate { 269sub size_allocate {
247 # nothing to be done 270 # nothing to be done
248} 271}
249 272
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
250sub children { 280sub 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} 281}
264 282
265sub set_max_size { 283sub set_max_size {
266 my ($self, $w, $h) = @_; 284 my ($self, $w, $h) = @_;
267 285
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 286 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 287 delete $self->{max_h}; $self->{max_h} = $h if $h;
270} 288}
271 289
272# return top left coordinates 290sub set_tooltip {
273sub _topleft {
274 my ($self, $x, $y) = @_; 291 my ($self, $tooltip) = @_;
275 292
276 $self->{parent} 293 $self->{tooltip} = $tooltip;
277 or Carp::confess "no parent widget in _topleft\n";#d#
278 294
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 295 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip;
298 }
280} 299}
281 300
282# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
283sub coord2local { 302sub coord2local {
284 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
285 304
286 my ($X, $Y) = $self->_topleft; 305 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 306}
289 307
290# translate local coordinates to global coordinate system 308# translate local coordinates to global coordinate system
291sub coord2global { 309sub coord2global {
292 my ($self, $x, $y) = @_; 310 my ($self, $x, $y) = @_;
293 311
294 my ($X, $Y) = $self->_topleft; 312 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 313}
297 314
298sub focus_in { 315sub focus_in {
299 my ($self) = @_; 316 my ($self) = @_;
300 317
… …
372 glVertex $self->{w}, 0; 389 glVertex $self->{w}, 0;
373 glVertex $self->{w}, $self->{h}; 390 glVertex $self->{w}, $self->{h};
374 glVertex 0 , $self->{h}; 391 glVertex 0 , $self->{h};
375 glEnd; 392 glEnd;
376 glPopMatrix; 393 glPopMatrix;
377 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378 } 395 }
379} 396}
380 397
381sub _draw { 398sub _draw {
382 my ($self) = @_; 399 my ($self) = @_;
… …
398 415
399sub set_parent { 416sub set_parent {
400 my ($self, $parent) = @_; 417 my ($self, $parent) = @_;
401 418
402 Scalar::Util::weaken ($self->{parent} = $parent); 419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
403} 424}
404 425
405sub check_size { 426sub check_size {
406 my ($self) = @_; 427 my ($self, $forced) = @_;
407 428
408 $self->{parent} 429 $self->{force_alloc} = 1 if $forced;
409 or return 1; 430 $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} 431}
430 432
431sub update { 433sub update {
432 my ($self) = @_; 434 my ($self) = @_;
433 435
… …
448} 450}
449 451
450sub DESTROY { 452sub DESTROY {
451 my ($self) = @_; 453 my ($self) = @_;
452 454
455 delete $WIDGET{$self+0};
453 #$self->deactivate; 456 #$self->deactivate;
454} 457}
455 458
456############################################################################# 459#############################################################################
457 460
… …
466 my $class = shift; 469 my $class = shift;
467 470
468 # range [value, low, high, page] 471 # range [value, low, high, page]
469 472
470 $class->SUPER::new ( 473 $class->SUPER::new (
471 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
472 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
473 @_ 476 @_
474 ) 477 )
475} 478}
476 479
477sub _draw { 480sub _draw {
478 my ($self) = @_; 481 my ($self) = @_;
479 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
480 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
481 489
482 glEnable GL_BLEND; 490 glEnable GL_BLEND;
483 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
484 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
485 493
486 glBegin GL_QUADS; 494 glBegin GL_QUADS;
487 glVertex 0 , 0; 495 glVertex 0 , 0;
488 glVertex 0 , $h; 496 glVertex 0 , $h;
489 glVertex $w, $h; 497 glVertex $w, $h;
490 glVertex $w, 0; 498 glVertex $w, 0;
491 glEnd; 499 glEnd;
492 500
493 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
494} 503}
495 504
496############################################################################# 505#############################################################################
497 506
498package CFClient::UI::Empty; 507package CFClient::UI::Empty;
… …
530 539
531 $self 540 $self
532} 541}
533 542
534sub add { 543sub add {
535 my ($self, $child) = @_; 544 my ($self, @widgets) = @_;
536 545
537 $child->set_parent ($self); 546 $_->set_parent ($self)
547 for @widgets;
538 548
539 use sort 'stable'; 549 use sort 'stable';
540 550
541 $self->{children} = [ 551 $self->{children} = [
542 sort { $a->{z} <=> $b->{z} } 552 sort { $a->{z} <=> $b->{z} }
543 @{$self->{children}}, $child 553 @{$self->{children}}, @widgets
544 ]; 554 ];
545 555
546 $child->check_size; 556 $self->check_size (1);
547 $self->update; 557 $self->update;
548} 558}
549 559
550sub children { 560sub children {
551 @{ $_[0]{children} } 561 @{ $_[0]{children} }
… …
658} 668}
659 669
660sub update { 670sub update {
661 my ($self) = @_; 671 my ($self) = @_;
662 672
663 $ROOT->on_refresh ($self => sub { $self->render_child }); 673 $ROOT->on_post_alloc ($self => sub { $self->render_child });
664 $self->SUPER::update; 674 $self->SUPER::update;
665} 675}
666 676
667sub size_allocate { 677sub size_allocate {
668 my ($self, $w, $h) = @_; 678 my ($self, $w, $h) = @_;
… …
699 my ($w, $h) = ($self->w, $self->h); 709 my ($w, $h) = ($self->w, $self->h);
700 710
701 my $tex = $self->{texture} 711 my $tex = $self->{texture}
702 or return; 712 or return;
703 713
704 glEnable GL_BLEND;
705 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
706 glEnable GL_TEXTURE_2D; 714 glEnable GL_TEXTURE_2D;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708 glColor 0, 0, 0, 1; 716 glColor 0, 0, 0, 1;
709 717
710 $tex->draw_quad (0, 0, $w, $h); 718 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
711 719
712 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 720 glDisable GL_TEXTURE_2D;
714} 721}
715 722
716############################################################################# 723#############################################################################
717 724
… …
741 $self->{view_y} = int $y; 748 $self->{view_y} = int $y;
742 749
743 $self->update; 750 $self->update;
744} 751}
745 752
746# hmm, this does not work for topleft of $self... but we should not aks for that 753# hmm, this does not work for topleft of $self... but we should not ask for that
747sub _topleft { 754sub coord2local {
748 my ($self, $x, $y) = @_; 755 my ($self, $x, $y) = @_;
749 756
750 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 757 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
758}
759
760sub coord2global {
761 my ($self, $x, $y) = @_;
762
763 $x = List::Util::min $self->{w}, $x - $self->{view_x};
764 $y = List::Util::min $self->{h}, $y - $self->{view_y};
765
766 $self->SUPER::coord2global ($x, $y)
751} 767}
752 768
753sub find_widget { 769sub find_widget {
754 my ($self, $x, $y) = @_; 770 my ($self, $x, $y) = @_;
755 771
… …
800 $self->add ($self->{slider}); 816 $self->add ($self->{slider});
801 817
802 $self 818 $self
803} 819}
804 820
805#TODO# update range on size_allocate depeneing on child 821#TODO# update range on size_allocate depending on child
806# update viewport offset on scroll 822# update viewport offset on scroll
807 823
808############################################################################# 824#############################################################################
809 825
810package CFClient::UI::Frame; 826package CFClient::UI::Frame;
… …
814use CFClient::OpenGL; 830use CFClient::OpenGL;
815 831
816sub new { 832sub new {
817 my $class = shift; 833 my $class = shift;
818 834
819 my $self = $class->SUPER::new ( 835 $class->SUPER::new (
820 bg => [1, 1, 1, 1], 836 bg => undef,
821 border_bg => [1, 1, 1, 1],
822 border => 0.8,
823 @_ 837 @_,
824 ); 838 )
825
826 $self
827} 839}
828 840
829sub _draw { 841sub _draw {
830 my ($self) = @_; 842 my ($self) = @_;
831 843
832 my ($w, $h) = ($self->{w}, $self->{h}); 844 if ($self->{bg}) {
845 my ($w, $h) = @$self{qw(w h)};
833 846
834 glEnable GL_BLEND; 847 glEnable GL_BLEND;
835 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 848 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
836 glEnable GL_TEXTURE_2D; 849 glColor @{ $self->{bg} };
837 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
838 850
839# glBegin GL_QUADS; 851 glBegin GL_QUADS;
840# glColor 0, 0, 0, 0;
841# glVertex 0 , 0; 852 glVertex 0 , 0;
842# glVertex 0 , $h; 853 glVertex 0 , $h;
843# glVertex $w, $h; 854 glVertex $w, $h;
844# glVertex $w, 0; 855 glVertex $w, 0;
845# glEnd; 856 glEnd;
846 857
847
848 $self->child->draw;
849 glDisable GL_BLEND; 858 glDisable GL_BLEND;
850 glDisable GL_TEXTURE_2D; 859 }
860
861 $self->SUPER::_draw;
851} 862}
852 863
853############################################################################# 864#############################################################################
854 865
855package CFClient::UI::FancyFrame; 866package CFClient::UI::FancyFrame;
… …
869 880
870 my $self = $class->SUPER::new ( 881 my $self = $class->SUPER::new (
871 bg => [1, 1, 1, 1], 882 bg => [1, 1, 1, 1],
872 border_bg => [1, 1, 1, 1], 883 border_bg => [1, 1, 1, 1],
873 border => 0.6, 884 border => 0.6,
885 toplevel => 1,
874 can_events => 1, 886 can_events => 1,
875 @_ 887 @_
876 ); 888 );
877 889
878 $self->{title} &&= new CFClient::UI::Label 890 $self->{title} &&= new CFClient::UI::Label
… …
903 my ($self, $w, $h) = @_; 915 my ($self, $w, $h) = @_;
904 916
905 $h -= List::Util::max 0, $self->border * 2; 917 $h -= List::Util::max 0, $self->border * 2;
906 $w -= List::Util::max 0, $self->border * 2; 918 $w -= List::Util::max 0, $self->border * 2;
907 919
908 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 920 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
909 if $self->{title}; 921 if $self->{title};
910 922
911 $self->child->configure ($self->border, $self->border, $w, $h); 923 $self->child->configure ($self->border, $self->border, $w, $h);
912} 924}
913 925
… …
971 my ($self) = @_; 983 my ($self) = @_;
972 984
973 my ($w, $h ) = ($self->{w}, $self->{h}); 985 my ($w, $h ) = ($self->{w}, $self->{h});
974 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 986 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
975 987
976 glEnable GL_BLEND;
977 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
978 glEnable GL_TEXTURE_2D; 988 glEnable GL_TEXTURE_2D;
979 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
980 990
981 my $border = $self->border; 991 my $border = $self->border;
982 992
983 glColor @{ $self->{border_bg} }; 993 glColor @{ $self->{border_bg} };
984 $tex[1]->draw_quad (0, 0, $w, $border); 994 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
985 $tex[3]->draw_quad (0, $border, $border, $ch); 995 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
986 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 996 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
987 $tex[4]->draw_quad (0, $h - $border, $w, $border); 997 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
988 998
989 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 999 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
990 my $bg = $tex[0]; 1000 my $bg = $tex[0];
991 1001
992 # TODO: repeat texture not scale 1002 # TODO: repeat texture not scale
… …
996 glColor @{ $self->{bg} }; 1006 glColor @{ $self->{bg} };
997 1007
998 $bg->{s} = $rep_x; 1008 $bg->{s} = $rep_x;
999 $bg->{t} = $rep_y; 1009 $bg->{t} = $rep_y;
1000 $bg->{wrap_mode} = 1; 1010 $bg->{wrap_mode} = 1;
1001 $bg->draw_quad ($border, $border, $cw, $ch); 1011 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1012 }
1002 1013
1003 glDisable GL_TEXTURE_2D; 1014 glDisable GL_TEXTURE_2D;
1004 glDisable GL_BLEND;
1005 }
1006 1015
1007 $self->{title}->draw if $self->{title}; 1016 $self->{title}->draw if $self->{title};
1008 1017
1009 $self->child->draw; 1018 $self->child->draw;
1010} 1019}
… …
1237} 1246}
1238 1247
1239sub size_allocate { 1248sub size_allocate {
1240 my ($self, $w, $h) = @_; 1249 my ($self, $w, $h) = @_;
1241 1250
1251 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1252
1242 my $children = $self->{children}; 1253 my $children = $self->{children};
1243 1254
1244 my @h = map $_->{req_h}, @$children; 1255 my @h = map $_->{req_h}, @$children;
1245 1256
1246 my $req_h = List::Util::sum @h; 1257 my $req_h = List::Util::sum @h;
… …
1275 1286
1276############################################################################# 1287#############################################################################
1277 1288
1278package CFClient::UI::Label; 1289package CFClient::UI::Label;
1279 1290
1280our @ISA = CFClient::UI::Base::; 1291our @ISA = CFClient::UI::DrawBG::;
1281 1292
1282use CFClient::OpenGL; 1293use CFClient::OpenGL;
1283 1294
1284sub new { 1295sub new {
1285 my ($class, %arg) = @_; 1296 my ($class, %arg) = @_;
1286 1297
1287 my $self = $class->SUPER::new ( 1298 my $self = $class->SUPER::new (
1288 fg => [1, 1, 1], 1299 fg => [1, 1, 1],
1300 #bg => none
1301 #active_bg => none
1289 #font => default_font 1302 #font => default_font
1303 #text => initial text
1304 #markup => initial narkup
1305 #max_w => maximum pixel width
1306 ellipsise => 3, # end
1307 layout => (new CFClient::Layout),
1290 fontsize => 1, 1308 fontsize => 1,
1291 text => "",
1292 align => -1, 1309 align => -1,
1293 valign => -1, 1310 valign => -1,
1294 padding => 2, 1311 padding => 2,
1295 layout => new CFClient::Layout,
1296 can_events => 0, 1312 can_events => 0,
1297 %arg 1313 %arg
1298 ); 1314 );
1299 1315
1300 if (exists $self->{template}) { 1316 if (exists $self->{template}) {
1301 my $layout = new CFClient::Layout; 1317 my $layout = new CFClient::Layout;
1302 $layout->set_text (delete $self->{template}); 1318 $layout->set_text (delete $self->{template});
1303 $self->{template} = $layout; 1319 $self->{template} = $layout;
1304 } 1320 }
1305 1321
1306 $self->set_text (delete $self->{text}) if exists $self->{text}; 1322 if (exists $self->{markup}) {
1307 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1323 $self->set_markup (delete $self->{markup});
1324 } else {
1325 $self->set_text (delete $self->{text});
1326 }
1308 1327
1309 $self 1328 $self
1310} 1329}
1311 1330
1312sub escape { 1331sub escape($) {
1313 local $_ = $_[1]; 1332 local $_ = $_[0];
1314 1333
1315 s/&/&amp;/g; 1334 s/&/&amp;/g;
1316 s/>/&gt;/g; 1335 s/>/&gt;/g;
1317 s/</&lt;/g; 1336 s/</&lt;/g;
1318 1337
1319 $_[1] 1338 $_
1320} 1339}
1321 1340
1322sub update { 1341sub update {
1323 my ($self) = @_; 1342 my ($self) = @_;
1324 1343
… …
1330 my ($self, $text) = @_; 1349 my ($self, $text) = @_;
1331 1350
1332 return if $self->{text} eq "T$text"; 1351 return if $self->{text} eq "T$text";
1333 $self->{text} = "T$text"; 1352 $self->{text} = "T$text";
1334 1353
1354 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1335 $self->{layout}->set_text ($text); 1355 $self->{layout}->set_text ($text);
1336 1356
1337 delete $self->{texture};
1338 $self->update; 1357 $self->update;
1339 $self->check_size; 1358 $self->check_size;
1340} 1359}
1341 1360
1342sub set_markup { 1361sub set_markup {
1343 my ($self, $markup) = @_; 1362 my ($self, $markup) = @_;
1344 1363
1345 return if $self->{text} eq "M$markup"; 1364 return if $self->{text} eq "M$markup";
1346 $self->{text} = "M$markup"; 1365 $self->{text} = "M$markup";
1347 1366
1367 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1368
1369 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348 $self->{layout}->set_markup ($markup); 1370 $self->{layout}->set_markup ($markup);
1349 1371
1350 delete $self->{texture};
1351 $self->update; 1372 $self->update;
1352 $self->check_size; 1373 $self->check_size;
1353} 1374}
1354 1375
1355sub size_request { 1376sub size_request {
1356 my ($self) = @_; 1377 my ($self) = @_;
1357 1378
1358 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1379 $self->{layout}->set_font ($self->{font}) if $self->{font};
1359 $self->{layout}->set_width ($self->{max_w} || -1); 1380 $self->{layout}->set_width ($self->{max_w} || -1);
1381 $self->{layout}->set_ellipsise ($self->{ellipsise});
1382 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1360 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1361 1384
1362 my ($w, $h) = $self->{layout}->size; 1385 my ($w, $h) = $self->{layout}->size;
1363 1386
1364 if (exists $self->{template}) { 1387 if (exists $self->{template}) {
… …
1394} 1417}
1395 1418
1396sub _draw { 1419sub _draw {
1397 my ($self) = @_; 1420 my ($self) = @_;
1398 1421
1422 $self->SUPER::_draw; # draw background, if applicable
1423
1399 my $tex = $self->{texture} ||= do { 1424 my $tex = $self->{texture} ||= do {
1425 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1426 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $self->{layout}->set_width ($self->{w}); 1427 $self->{layout}->set_width ($self->{w});
1428 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431
1403 new_from_layout CFClient::Texture $self->{layout} 1432 my $tex = new_from_layout CFClient::Texture $self->{layout};
1433
1434 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1435 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1436 : ($self->{w} - $tex->{w}) * 0.5);
1437
1438 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1439 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1440 : ($self->{h} - $tex->{h}) * 0.5);
1441
1442 $tex
1404 }; 1443 };
1405 1444
1406 glEnable GL_BLEND;
1407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1408 glEnable GL_TEXTURE_2D; 1445 glEnable GL_TEXTURE_2D;
1409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1410 1447
1448 if ($tex->{format} == GL_ALPHA) {
1411 glColor @{$self->{fg}}; 1449 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}); 1450 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1451 } else {
1452 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1453 }
1426 1454
1427 glDisable GL_TEXTURE_2D; 1455 glDisable GL_TEXTURE_2D;
1428 glDisable GL_BLEND;
1429} 1456}
1430 1457
1431############################################################################# 1458#############################################################################
1432 1459
1433package CFClient::UI::EntryBase; 1460package CFClient::UI::EntryBase;
… …
1468 $self->{layout}->set_text ("$text "); 1495 $self->{layout}->set_text ("$text ");
1469 1496
1470 $self->emit (changed => $self->{text}); 1497 $self->emit (changed => $self->{text});
1471} 1498}
1472 1499
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 { 1500sub set_text {
1492 my ($self, $text) = @_; 1501 my ($self, $text) = @_;
1493 1502
1494 $self->{cursor} = length $text; 1503 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1504 $self->_set_text ($text);
1496 $self->update; 1505 $self->update;
1506 $self->check_size;
1507}
1508
1509sub get_text {
1510 $_[0]{text}
1511}
1512
1513sub size_request {
1514 my ($self) = @_;
1515
1516 my ($w, $h) = $self->SUPER::size_request;
1517
1518 ($w + 1, $h) # add 1 for cursor
1519}
1520
1521sub size_allocate {
1522 my ($self, $w, $h) = @_;
1523
1524 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1497} 1525}
1498 1526
1499sub key_down { 1527sub key_down {
1500 my ($self, $ev) = @_; 1528 my ($self, $ev) = @_;
1501 1529
… …
1503 my $sym = $ev->{sym}; 1531 my $sym = $ev->{sym};
1504 my $uni = $ev->{unicode}; 1532 my $uni = $ev->{unicode};
1505 1533
1506 my $text = $self->get_text; 1534 my $text = $self->get_text;
1507 1535
1508 if ($sym == 8) { 1536 if ($uni == 8) {
1509 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1537 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1510 } elsif ($sym == 127) { 1538 } elsif ($uni == 127) {
1511 substr $text, $self->{cursor}, 1, ""; 1539 substr $text, $self->{cursor}, 1, "";
1512 } elsif ($sym == CFClient::SDLK_LEFT) { 1540 } elsif ($sym == CFClient::SDLK_LEFT) {
1513 --$self->{cursor} if $self->{cursor}; 1541 --$self->{cursor} if $self->{cursor};
1514 } elsif ($sym == CFClient::SDLK_RIGHT) { 1542 } elsif ($sym == CFClient::SDLK_RIGHT) {
1515 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1543 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1516 } elsif ($sym == CFClient::SDLK_HOME) { 1544 } elsif ($sym == CFClient::SDLK_HOME) {
1517 $self->{cursor} = 0; 1545 $self->{cursor} = 0;
1518 } elsif ($sym == CFClient::SDLK_END) { 1546 } elsif ($sym == CFClient::SDLK_END) {
1519 $self->{cursor} = length $text; 1547 $self->{cursor} = length $text;
1520 } elsif ($sym == 27) { 1548 } elsif ($uni == 27) {
1521 $self->emit ('escape'); 1549 $self->emit ('escape');
1522 } elsif ($uni) { 1550 } elsif ($uni) {
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1551 substr $text, $self->{cursor}++, 0, chr $uni;
1524 } 1552 }
1525 1553
1526 $self->_set_text ($text); 1554 $self->_set_text ($text);
1527 $self->update; 1555 $self->update;
1556 $self->check_size;
1528} 1557}
1529 1558
1530sub focus_in { 1559sub focus_in {
1531 my ($self) = @_; 1560 my ($self) = @_;
1532 1561
… …
1661 my $class = shift; 1690 my $class = shift;
1662 1691
1663 $class->SUPER::new ( 1692 $class->SUPER::new (
1664 padding => 4, 1693 padding => 4,
1665 fg => [1, 1, 1], 1694 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 1695 active_fg => [0, 0, 1],
1668 can_hover => 1, 1696 can_hover => 1,
1669 align => 0, 1697 align => 0,
1670 valign => 0, 1698 valign => 0,
1671 can_events => 1, 1699 can_events => 1,
… …
1689 1717
1690 if ($GRAB == $self) { 1718 if ($GRAB == $self) {
1691 $self->{fg} = $self->{active_fg}; 1719 $self->{fg} = $self->{active_fg};
1692 } 1720 }
1693 1721
1694 glEnable GL_BLEND;
1695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1696 glEnable GL_TEXTURE_2D; 1722 glEnable GL_TEXTURE_2D;
1697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1698 glColor 0, 0, 0, 1; 1724 glColor 0, 0, 0, 1;
1699 1725
1700 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1726 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1701 1727
1702 glDisable GL_TEXTURE_2D; 1728 glDisable GL_TEXTURE_2D;
1703 glDisable GL_BLEND;
1704 1729
1705 $self->SUPER::_draw; 1730 $self->SUPER::_draw;
1706} 1731}
1707 1732
1708############################################################################# 1733#############################################################################
… …
1722 1747
1723 $class->SUPER::new ( 1748 $class->SUPER::new (
1724 padding => 2, 1749 padding => 2,
1725 fg => [1, 1, 1], 1750 fg => [1, 1, 1],
1726 active_fg => [1, 1, 0], 1751 active_fg => [1, 1, 0],
1752 bg => [0, 0, 0, 0.2],
1753 active_bg => [1, 1, 1, 0.5],
1727 state => 0, 1754 state => 0,
1728 can_hover => 1, 1755 can_hover => 1,
1729 @_ 1756 @_
1730 ) 1757 )
1731} 1758}
… …
1755 1782
1756 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1783 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1757 1784
1758 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1785 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1759 1786
1760 glEnable GL_BLEND; 1787 my $tex = $self->{state} ? $tex[1] : $tex[0];
1788
1761 glEnable GL_TEXTURE_2D; 1789 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); 1790 $tex->draw_quad_alpha (0, 0, $s, $s);
1767
1768 glDisable GL_TEXTURE_2D; 1791 glDisable GL_TEXTURE_2D;
1769 glDisable GL_BLEND;
1770} 1792}
1771 1793
1772############################################################################# 1794#############################################################################
1773 1795
1774package CFClient::UI::Image; 1796package CFClient::UI::Image;
… …
1817 glTranslate 0, -$self->{w}, 0; 1839 glTranslate 0, -$self->{w}, 0;
1818 1840
1819 ($w, $h) = ($h, $w); 1841 ($w, $h) = ($h, $w);
1820 } 1842 }
1821 1843
1822 glEnable GL_BLEND;
1823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1824 glEnable GL_TEXTURE_2D; 1844 glEnable GL_TEXTURE_2D;
1825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1845 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1826 1846
1827 $tex->draw_quad (0, 0, $w, $h); 1847 $tex->draw_quad_alpha (0, 0, $w, $h);
1828 1848
1829 glDisable GL_BLEND;
1830 glDisable GL_TEXTURE_2D; 1849 glDisable GL_TEXTURE_2D;
1831} 1850}
1832 1851
1833############################################################################# 1852#############################################################################
1834 1853
… …
2023 qw(s1_slider.png s1_slider_bg.png); 2042 qw(s1_slider.png s1_slider_bg.png);
2024 2043
2025sub new { 2044sub new {
2026 my $class = shift; 2045 my $class = shift;
2027 2046
2028 # range [value, low, high, page] 2047 # range [value, low, high, page, unit]
2029 2048
2030 # TODO: 0-width page 2049 # TODO: 0-width page
2031 # TODO: req_w/h are wrong with vertical 2050 # TODO: req_w/h are wrong with vertical
2032 # TODO: calculations are off 2051 # TODO: calculations are off
2033 my $self = $class->SUPER::new ( 2052 my $self = $class->SUPER::new (
2034 fg => [1, 1, 1], 2053 fg => [1, 1, 1],
2035 active_fg => [0, 0, 0], 2054 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5],
2036 range => [0, 0, 100, 10], 2057 range => [0, 0, 100, 10],
2037 req_w => $::WIDTH / 80, 2058 req_w => $::WIDTH / 80,
2038 req_h => $::WIDTH / 80, 2059 req_h => $::WIDTH / 80,
2039 vertical => 0, 2060 vertical => 0,
2040 can_hover => 1, 2061 can_hover => 1,
2041 inner_pad => 5, 2062 inner_pad => .05,
2042 @_ 2063 @_
2043 ); 2064 );
2044 2065
2066 $self->set_value ($self->{range}[0]);
2067 $self->update;
2068
2045 $self 2069 $self
2070}
2071
2072sub set_value {
2073 my ($self, $value) = @_;
2074
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076
2077 $hi = $lo + 1 if $hi <= $lo;
2078
2079 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi;
2081
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit;
2084
2085 $page = $hi - $lo if $page > $hi - $lo;
2086
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088
2089 if ($value != $old_value) {
2090 $self->emit (changed => $value);
2091 $self->update;
2092 }
2046} 2093}
2047 2094
2048sub size_request { 2095sub size_request {
2049 my ($self) = @_; 2096 my ($self) = @_;
2050 2097
… …
2063 2110
2064sub mouse_motion { 2111sub mouse_motion {
2065 my ($self, $ev, $x, $y) = @_; 2112 my ($self, $ev, $x, $y) = @_;
2066 2113
2067 if ($GRAB == $self) { 2114 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116
2117 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2120
2121 $self->set_value ($x * ($hi - $lo) + $lo);
2122 }
2123}
2124
2125sub update {
2126 my ($self) = @_;
2127
2128 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129 $self->set_value ($self->{range}[0]);
2130
2068 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2131 my ($value, $lo, $hi, $page) = @{$self->{range}};
2069 2132
2070 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2133 my $inner_w = 1 - 2 * $self->{inner_pad};
2071 2134
2072 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2135 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2073 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2074 2136
2075 $x -= $inner_pad_px; # substract the padding 2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2076 $x = $x * ($hi - $lo) / $inner_w + $lo; 2138 $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 2139
2081 $self->emit (changed => $x); 2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
2082 $self->update; 2141
2142 $value = 0 if $value < 0;
2143 $page = 1 - $value if $value + $page > 1;
2144
2145 $self->{knob_x} = $value;
2146 $self->{knob_w} = $page;
2083 } 2147 });
2084}
2085 2148
2086# the inner_* stuff is for generating a padding for the slider handle, 2149 $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} 2150}
2093 2151
2094sub _draw { 2152sub _draw {
2095 my ($self) = @_; 2153 my ($self) = @_;
2096 2154
2097 $self->SUPER::_draw (); 2155 $self->SUPER::_draw ();
2098 2156
2099 my ($w, $h) = @$self{qw(w h)}; 2157 glScale $self->{w}, $self->{h};
2100 2158
2101 if ($self->{vertical}) { 2159 if ($self->{vertical}) {
2102 # draw a vertical slider like a rotated horizontal slider 2160 # draw a vertical slider like a rotated horizontal slider
2103 2161
2104 glRotate 90, 0, 0, 1; 2162 glRotate 90, 0, 0, 1;
2105 glTranslate 0, -$self->{w}, 0; 2163 glTranslate 0, 1, 0;
2106
2107 ($w, $h) = ($h, $w);
2108 } 2164 }
2109 2165
2110 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2166 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2111 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2167 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2112 2168
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; 2169 glEnable GL_TEXTURE_2D;
2134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2135 2171
2136 # draw background 2172 # draw background
2137 $tex[1]->draw_quad (0, 0, $w, $h); 2173 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2138 2174
2139 # draw handle 2175 # draw handle
2140 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2176 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2141 2177
2142 glDisable GL_BLEND;
2143 glDisable GL_TEXTURE_2D; 2178 glDisable GL_TEXTURE_2D;
2144} 2179}
2145 2180
2146############################################################################# 2181#############################################################################
2147 2182
… …
2158 fontsize => 1, 2193 fontsize => 1,
2159 can_events => 0, 2194 can_events => 0,
2160 #font => default_font 2195 #font => default_font
2161 @_, 2196 @_,
2162 2197
2163 layout => (new CFClient::Layout), 2198 layout => (new CFClient::Layout 1),
2164 par => [], 2199 par => [],
2165 height => 0, 2200 height => 0,
2166 children => [ 2201 children => [
2167 (new CFClient::UI::Empty expand => 1), 2202 (new CFClient::UI::Empty expand => 1),
2168 (new CFClient::UI::Slider vertical => 1), 2203 (new CFClient::UI::Slider vertical => 1),
… …
2186 2221
2187 my $layout = $self->{layout}; 2222 my $layout = $self->{layout};
2188 2223
2189 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2190 $layout->set_width ($self->{children}[0]{w}); 2225 $layout->set_width ($self->{children}[0]{w});
2191 $layout->set_text ($text); 2226 $layout->set_markup ($text);
2192 2227
2193 ($layout->size)[1] 2228 ($layout->size)[1]
2194} 2229}
2195 2230
2196sub reflow { 2231sub reflow {
… …
2234 2269
2235 return unless $self->{h} > 0; 2270 return unless $self->{h} > 0;
2236 2271
2237 delete $self->{texture}; 2272 delete $self->{texture};
2238 2273
2239 $ROOT->on_refresh ($self, sub { 2274 $ROOT->on_post_alloc ($self, sub {
2240 if (delete $self->{need_reflow}) { 2275 if (delete $self->{need_reflow}) {
2241 my $height = 0; 2276 my $height = 0;
2242 2277
2243 $height += $_->[0] = $self->text_height ($_->[2]) 2278 $height += $_->[0] = $self->text_height ($_->[2])
2244 for @{$self->{par}}; 2279 for @{$self->{par}};
… …
2252 2287
2253 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2254 glClearColor 0, 0, 0, 0; 2289 glClearColor 0, 0, 0, 0;
2255 glClear GL_COLOR_BUFFER_BIT; 2290 glClear GL_COLOR_BUFFER_BIT;
2256 2291
2257 glEnable GL_BLEND;
2258 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2259 glEnable GL_TEXTURE_2D; 2292 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261 2294
2262 my $top = int $self->{children}[1]{range}[0]; 2295 my $top = int $self->{children}[1]{range}[0];
2263 2296
… …
2272 2305
2273 for my $par (@{$self->{par}}) { 2306 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2307 my $h = $par->[0];
2275 2308
2276 if ($y0 < $y + $h && $y < $y1) { 2309 if ($y0 < $y + $h && $y < $y1) {
2310 $layout->set_foreground (@{ $par->[1] });
2277 $layout->set_text ($par->[2]); 2311 $layout->set_markup ($par->[2]);
2278 2312
2279 glColor @{ $par->[1] };
2280 my ($W, $H) = $layout->size; 2313 my ($W, $H) = $layout->size;
2281 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2314 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2282 } 2315 }
2283 2316
2284 $y += $h; 2317 $y += $h;
2285 } 2318 }
2286 2319
2287 glDisable GL_TEXTURE_2D; 2320 glDisable GL_TEXTURE_2D;
2288 glDisable GL_BLEND;
2289 }; 2321 };
2290 }); 2322 });
2291} 2323}
2292 2324
2293sub _draw { 2325sub _draw {
2294 my ($self) = @_; 2326 my ($self) = @_;
2295 2327
2296 glEnable GL_BLEND;
2297 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2298 glEnable GL_TEXTURE_2D; 2328 glEnable GL_TEXTURE_2D;
2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300 glColor 1, 1, 1, 1; 2330 glColor 1, 1, 1, 1;
2301 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2331 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2302 glDisable GL_TEXTURE_2D; 2332 glDisable GL_TEXTURE_2D;
2303 glDisable GL_BLEND;
2304 2333
2305 $self->{children}[1]->draw; 2334 $self->{children}[1]->draw;
2306 2335
2307} 2336}
2308 2337
… …
2402 @_, 2431 @_,
2403 can_events => 0, 2432 can_events => 0,
2404 ) 2433 )
2405} 2434}
2406 2435
2407sub set_markup { 2436sub set_tooltip_from {
2408 my ($self, $text) = @_; 2437 my ($self, $widget) = @_;
2409 2438
2410 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2439 $self->add (new CFClient::UI::Label
2411 $self->{label}->set_markup ($text); 2440 markup => $widget->{tooltip},
2412 $self->add ($self->{label}); 2441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2442 fontsize => 0.8,
2443 fg => [0, 0, 0, 1],
2444 ellipsise => 0,
2445 font => ($widget->{tooltip_font} || $::FONT_PROP),
2446 );
2413} 2447}
2414 2448
2415sub size_request { 2449sub size_request {
2416 my ($self) = @_; 2450 my ($self) = @_;
2417
2418 $self->child->set_max_size ($::WIDTH * 0.3);
2419 2451
2420 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2452 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2421 2453
2422 ($w + 4, $h + 4) 2454 ($w + 4, $h + 4)
2423} 2455}
… …
2429} 2461}
2430 2462
2431sub _draw { 2463sub _draw {
2432 my ($self) = @_; 2464 my ($self) = @_;
2433 2465
2434 glPushMatrix;
2435 glTranslate 0.375, 0.375; 2466 glTranslate 0.375, 0.375;
2436 2467
2437 my ($w, $h) = @$self{qw(w h)}; 2468 my ($w, $h) = @$self{qw(w h)};
2438 2469
2439 glColor 1, 0.8, 0.4; 2470 glColor 1, 0.8, 0.4;
… …
2450 glVertex 0 , $h; 2481 glVertex 0 , $h;
2451 glVertex $w, $h; 2482 glVertex $w, $h;
2452 glVertex $w, 0; 2483 glVertex $w, 0;
2453 glEnd; 2484 glEnd;
2454 2485
2455 glPopMatrix; 2486 glTranslate 2 - 0.375, 2 - 0.375;
2456
2457 glTranslate 2, 2;
2458 $self->SUPER::_draw; 2487 $self->SUPER::_draw;
2459} 2488}
2460 2489
2461############################################################################# 2490#############################################################################
2462 2491
… …
2485 return unless $::CONN;#d# manage and cache textures differently 2514 return unless $::CONN;#d# manage and cache textures differently
2486 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2515 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2487 2516
2488 # TODO animation 2517 # TODO animation
2489 if ($tex) { 2518 if ($tex) {
2490 glEnable GL_BLEND;
2491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492 glEnable GL_TEXTURE_2D; 2519 glEnable GL_TEXTURE_2D;
2493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494 glColor 1, 1, 1, 1; 2521 glColor 1, 1, 1, 1;
2495 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2522 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2496 glDisable GL_TEXTURE_2D; 2523 glDisable GL_TEXTURE_2D;
2497 glDisable GL_BLEND;
2498 } 2524 }
2499} 2525}
2500 2526
2501############################################################################# 2527#############################################################################
2502 2528
2503package CFClient::UI::InventoryItem; 2529package CFClient::UI::InventoryItem;
2504 2530
2505our @ISA = CFClient::UI::HBox::; 2531our @ISA = CFClient::UI::HBox::;
2532
2533sub _item_to_desc {
2534 my ($item) = @_;
2535
2536 my $desc =
2537 $item->{nrof} < 2
2538 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}";
2540
2541 $item->{flags} & Crossfire::Protocol::F_OPEN
2542 and $desc .= " (open)";
2543 $item->{flags} & Crossfire::Protocol::F_APPLIED
2544 and $desc .= " (applied)";
2545 $item->{flags} & Crossfire::Protocol::F_UNPAID
2546 and $desc .= " (unpaid)";
2547 $item->{flags} & Crossfire::Protocol::F_MAGIC
2548 and $desc .= " (magic)";
2549 $item->{flags} & Crossfire::Protocol::F_CURSED
2550 and $desc .= " (cursed)";
2551 $item->{flags} & Crossfire::Protocol::F_DAMNED
2552 and $desc .= " (damned)";
2553 $item->{flags} & Crossfire::Protocol::F_LOCKED
2554 and $desc .= " *";
2555
2556 $desc
2557}
2506 2558
2507sub new { 2559sub new {
2508 my $class = shift; 2560 my $class = shift;
2509 2561
2510 my %args = @_; 2562 my %args = @_;
2511 2563
2512 my $item = $args{item}; 2564 my $item = delete $args{item};
2513 2565
2514 my $desc = $item->{nrof} < 2 2566 my $desc = _item_to_desc ($item);
2515 ? $item->{name}
2516 : "$item->{nrof} $item->{name_pl}";
2517
2518 2567
2519 my $self = $class->SUPER::new ( 2568 my $self = $class->SUPER::new (
2520 can_hover => 1, 2569 can_hover => 1,
2521 can_events => 1, 2570 can_events => 1,
2522 tooltip => (CFClient::UI::Label->escape ($desc) 2571 tooltip => ((CFClient::UI::Label::escape $desc)
2523 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2524 connect_button_down => sub { 2573 connect_button_down => sub {
2525 my ($self, $ev, $x, $y) = @_; 2574 my ($self, $ev, $x, $y) = @_;
2526 2575
2527 # todo: maybe put examine on 1? but should just be a tooltip :( 2576 # todo: maybe put examine on 1? but should just be a tooltip :(
2528 if ($ev->{button} == 1) { 2577 if ($ev->{button} == 1) {
2578 my $targ = $::CONN->{player}{tag};
2579
2580 if ($item->{container} == $::CONN->{player}{tag}) {
2581 $targ = $main::OPENCONT;
2582 }
2583
2529 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2584 $::CONN->send ("move $targ $item->{tag} 0");
2530 } elsif ($ev->{button} == 2) { 2585 } elsif ($ev->{button} == 2) {
2531 $::CONN->send ("apply $item->{tag}"); 2586 $::CONN->send ("apply $item->{tag}");
2532 } elsif ($ev->{button} == 3) { 2587 } elsif ($ev->{button} == 3) {
2533 CFClient::UI::Menu->new ( 2588 my @menu_items = (
2534 items => [
2535 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2589 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2591 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2592 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2536 [ 2593 [
2537 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2538 sub { $::CONN->send ("lock $item->{tag}") }, 2595 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 ], 2596 ],
2544 )->popup ($ev); 2597 );
2598
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2545 } 2600 }
2546 2601
2547 1 2602 1
2548 }, 2603 },
2549 %args 2604 %args
2550 ); 2605 );
2606
2607
2551 $self->add(new CFClient::UI::Face 2608 $self->add (new CFClient::UI::Face
2552 can_events => 0, 2609 can_events => 0,
2553 face => $item->{face}, 2610 face => $item->{face},
2554 anim => $item->{anim}, 2611 anim => $item->{anim},
2555 animspeed => $item->{animspeed}); 2612 animspeed => $item->{animspeed},
2556 $self->add(new CFClient::UI::Label 2613 );
2557 can_events => 0, 2614
2558 text => $desc); 2615 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2616
2617 $self->{item} = $item;
2618
2619 $self->update_item;
2559 2620
2560 $self 2621 $self
2622}
2623
2624sub update_item {
2625 my ($self) = @_;
2626
2627 my $desc = _item_to_desc ($self->{item});
2628
2629 $self->{name_lbl}->set_text ($desc);
2561} 2630}
2562 2631
2563############################################################################# 2632#############################################################################
2564 2633
2565package CFClient::UI::Inventory; 2634package CFClient::UI::Inventory;
… …
2581 my ($self, $items) = @_; 2650 my ($self, $items) = @_;
2582 2651
2583 $self->{scrolled}->clear; 2652 $self->{scrolled}->clear;
2584 return unless $items; 2653 return unless $items;
2585 2654
2586 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2655 my @items = sort {
2656 ($a->{type} <=> $b->{type})
2657 or ($a->{name} cmp $b->{name})
2658 } @$items;
2587 2659
2588 $self->{real_items} = \@items; 2660 $self->{real_items} = \@items;
2589 2661
2590 for my $item (@items) { 2662 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); 2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item ();
2596 } 2665 }
2666
2667 $self->{scrolled}->add (@items);
2597 2668
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2599} 2670}
2600 2671
2601sub size_request { 2672sub size_request {
… …
2675 } 2746 }
2676} 2747}
2677 2748
2678############################################################################# 2749#############################################################################
2679 2750
2751package CFClient::UI::Statusbox;
2752
2753our @ISA = CFClient::UI::VBox::;
2754
2755sub new {
2756 my $class = shift;
2757
2758 $class->SUPER::new (
2759 fontsize => 0.8,
2760 @_,
2761 )
2762}
2763
2764sub reorder {
2765 my ($self) = @_;
2766 my $NOW = time;
2767
2768 while (my ($k, $v) = each %{ $self->{item} }) {
2769 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2770 }
2771
2772 my @widgets;
2773
2774 my @items = sort {
2775 $a->{pri} <=> $b->{pri}
2776 or $b->{id} <=> $a->{id}
2777 } values %{ $self->{item} };
2778
2779 my $count = 10 + 1;
2780 for my $item (@items) {
2781 last unless --$count;
2782
2783 push @widgets, $item->{label} ||= do {
2784 # TODO: doesn't handle markup well (read as: at all)
2785 my $short = $item->{count} > 1
2786 ? "<b>$item->{count} ×</b> $item->{text}"
2787 : $item->{text};
2788
2789 for ($short) {
2790 s/^\s+//;
2791 s/\s+/ /g;
2792 }
2793
2794 new CFClient::UI::Label
2795 markup => $short,
2796 tooltip => $item->{tooltip},
2797 tooltip_font => $::FONT_PROP,
2798 tooltip_width => 0.67,
2799 fontsize => $item->{fontsize} || $self->{fontsize},
2800 max_w => $::WIDTH * 0.44,
2801 fg => $item->{fg},
2802 can_events => 1,
2803 can_hover => 1
2804 };
2805 }
2806
2807 $self->clear;
2808 $self->SUPER::add (reverse @widgets);
2809}
2810
2811sub add {
2812 my ($self, $text, %arg) = @_;
2813
2814 $text =~ s/^\s+//;
2815 $text =~ s/\s+$//;
2816
2817 my $timeout = time + ((delete $arg{timeout}) || 60);
2818
2819 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2820
2821 if (my $item = $self->{item}{$group}) {
2822 if ($item->{text} eq $text) {
2823 $item->{count}++;
2824 } else {
2825 $item->{count} = 1;
2826 $item->{text} = $item->{tooltip} = $text;
2827 }
2828 $item->{id} = ++$self->{id};
2829 $item->{timeout} = $timeout;
2830 delete $item->{label};
2831 } else {
2832 $self->{item}{$group} = {
2833 id => ++$self->{id},
2834 text => $text,
2835 timeout => $timeout,
2836 tooltip => $text,
2837 fg => [0.8, 0.8, 0.8, 0.8],
2838 pri => 0,
2839 count => 1,
2840 %arg,
2841 };
2842 }
2843
2844 $self->reorder;
2845}
2846
2847sub reconfigure {
2848 my ($self) = @_;
2849
2850 delete $_->{label}
2851 for values %{ $self->{item} || {} };
2852
2853 $self->reorder;
2854 $self->SUPER::reconfigure;
2855}
2856
2857#############################################################################
2858
2680package CFClient::UI::Root; 2859package CFClient::UI::Root;
2681 2860
2682our @ISA = CFClient::UI::Container::; 2861our @ISA = CFClient::UI::Container::;
2683 2862
2684use CFClient::OpenGL; 2863use CFClient::OpenGL;
2685 2864
2865sub new {
2866 my $class = shift;
2867
2868 $class->SUPER::new (
2869 @_,
2870 )
2871}
2872
2873sub configure {
2874 my ($self, $x, $y, $w, $h) = @_;
2875
2876 $self->{w} = $w;
2877 $self->{h} = $h;
2878}
2879
2686sub check_size { 2880sub check_size {
2687 my ($self) = @_; 2881 my ($self) = @_;
2688 2882
2689 $self->configure (0, 0, $self->{w}, $self->{h}); 2883 $self->size_allocate ($self->{w}, $self->{h})
2884 if $self->{w};
2690} 2885}
2691 2886
2692sub size_request { 2887sub size_request {
2693 my ($self) = @_; 2888 my ($self) = @_;
2694 2889
… …
2696} 2891}
2697 2892
2698sub size_allocate { 2893sub size_allocate {
2699 my ($self, $w, $h) = @_; 2894 my ($self, $w, $h) = @_;
2700 2895
2701 my $old_w = $self->{old_w}; 2896 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2702 my $old_h = $self->{old_h}; 2897 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2703 2898
2704 if ($old_w && $old_h) { 2899 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2705 for my $child ($self->children) { 2900 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 2901
2726 for my $child ($self->children) { 2902 for my $child ($self->children) {
2727 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2903 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2728 2904
2905 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2906 if exists $child->{req_x};
2907
2908 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2909 if exists $child->{req_y};
2910
2729 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2911 $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; 2912 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2913
2731 $child->configure ($X, $Y, $W, $H); 2914 $child->configure ($X, $Y, $W, $H);
2732 } 2915 }
2733} 2916}
2734 2917
2735sub _topleft { 2918sub coord2local {
2736 my ($self, $x, $y) = @_; 2919 my ($self, $x, $y) = @_;
2737 2920
2738 ($x, $y) 2921 ($x, $y)
2739} 2922}
2740 2923
2924sub coord2global {
2925 my ($self, $x, $y) = @_;
2926
2927 ($x, $y)
2928}
2929
2741sub update { 2930sub update {
2742 my ($self) = @_; 2931 my ($self) = @_;
2743 2932
2744 $self->check_size; 2933 $self->check_size;
2745 ::refresh (); 2934 $::WANT_REFRESH++;
2746} 2935}
2747 2936
2748sub add { 2937sub add {
2749 my ($self, $child) = @_; 2938 my ($self, @children) = @_;
2750 2939
2940 for my $child (@children) {
2941 $child->{toplevel} = 1;
2942
2751 # integerize window positions 2943 # integerise window positions
2752 $child->{x} = int $child->{x}; 2944 $child->{x} = int $child->{x};
2753 $child->{y} = int $child->{y}; 2945 $child->{y} = int $child->{y};
2946 }
2754 2947
2755 $self->SUPER::add ($child); 2948 $self->SUPER::add (@children);
2756} 2949}
2757 2950
2758sub on_refresh { 2951sub on_refresh {
2759 my ($self, $id, $cb) = @_; 2952 my ($self, $id, $cb) = @_;
2760 2953
2761 $self->{refresh_hook}{$id} = $cb; 2954 $self->{refresh_hook}{$id} = $cb;
2762} 2955}
2763 2956
2957sub on_post_alloc {
2958 my ($self, $id, $cb) = @_;
2959
2960 $self->{post_alloc_hook}{$id} = $cb;
2961}
2962
2764sub draw { 2963sub draw {
2765 my ($self) = @_; 2964 my ($self) = @_;
2766 2965
2767 while (my $rcb = delete $self->{refresh_hook}) { 2966 while ($self->{refresh_hook}) {
2768 $_->() for values %$rcb; 2967 $_->()
2968 for values %{delete $self->{refresh_hook}};
2969 }
2970
2971 if ($self->{check_size}) {
2972 my @queue = ([], []);
2973
2974 for (;;) {
2975 if ($self->{check_size}) {
2976 # heuristic: check containers last
2977 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2978 for values %{delete $self->{check_size}}
2979 }
2980
2981 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2982
2983 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2984 ? @$widget{qw(user_w user_h)}
2985 : $widget->size_request;
2986
2987 if (delete $widget->{force_alloc}
2988 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2989 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2990
2991 $widget->{req_w} = $w;
2992 $widget->{req_h} = $h;
2993
2994 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2995
2996 $widget->{parent}->check_size
2997 if $widget->{parent};
2998 }
2999 }
3000 }
3001
3002 while ($self->{size_alloc}) {
3003 for (values %{delete $self->{size_alloc}}) {
3004 my ($widget, $w, $h) = @$_;
3005
3006 $w = 0 if $w < 0;
3007 $h = 0 if $h < 0;
3008
3009 $widget->{w} = $w;
3010 $widget->{h} = $h;
3011 $widget->size_allocate ($w, $h);
3012 $widget->emit (size_allocate => $w, $h);
3013 }
3014 }
3015
3016 while ($self->{post_alloc_hook}) {
3017 $_->()
3018 for values %{delete $self->{post_alloc_hook}};
2769 } 3019 }
2770 3020
2771 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3021 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2772 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2773 glClear GL_COLOR_BUFFER_BIT; 3023 glClear GL_COLOR_BUFFER_BIT;
… …
2784############################################################################# 3034#############################################################################
2785 3035
2786package CFClient::UI; 3036package CFClient::UI;
2787 3037
2788$ROOT = new CFClient::UI::Root; 3038$ROOT = new CFClient::UI::Root;
2789$TOOLTIP = new CFClient::UI::Tooltip; 3039$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2790 3040
27911 30411
2792 3042

Diff Legend

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