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.190 by root, Mon May 8 22:17:38 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->_check_size; 429 $self->{force_alloc} = 1 if $forced;
409 return;
410 #TODO: but needs a vastly more difficult algorithm
411 my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
412
413 $check_size->{$self} = $self;
414
415 $CFClient::UI::ROOT->on_refresh (_check_size => sub {
416 while (%$check_size) {
417 my @widgets = values %$check_size;
418 $_->_check_size
419 for @widgets;
420 }
421 });
422}
423
424sub _check_size {
425 my ($self) = @_;
426
427 delete $CFClient::UI::ROOT->{_check_size}{$self}; 430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
428
429 $self->{parent}
430 or return 1;
431
432 my ($w, $h) = $self->{user_w} && $self->{user_h}
433 ? @$self{qw(user_w user_h)}
434 : $self->size_request;
435
436 if ($w != $self->{req_w} || $h != $self->{req_h}) {
437 $self->{req_w} = $w;
438 $self->{req_h} = $h;
439
440 $self->{parent}->_check_size
441 or $self->size_allocate (
442 (List::Util::max $self->{w}, $w),
443 (List::Util::max $self->{h}, $h),
444 );
445
446 1
447 } else {
448 0
449 }
450} 431}
451 432
452sub update { 433sub update {
453 my ($self) = @_; 434 my ($self) = @_;
454 435
455 my $update = $CFClient::UI::ROOT->{_update} ||= {}; 436 $self->{parent}->update
456 437 if $self->{parent};
457 $update->{$self} = $self;
458
459 $CFClient::UI::ROOT->on_refresh (_update => sub {
460 while (%$update) {
461 my @widgets = values %$update;
462 %$update = ();
463
464 $_->{parent} && $_->{parent}->update
465 for @widgets;
466 }
467 });
468} 438}
469 439
470sub connect { 440sub connect {
471 my ($self, $signal, $cb) = @_; 441 my ($self, $signal, $cb) = @_;
472 442
… …
480} 450}
481 451
482sub DESTROY { 452sub DESTROY {
483 my ($self) = @_; 453 my ($self) = @_;
484 454
455 delete $WIDGET{$self+0};
485 #$self->deactivate; 456 #$self->deactivate;
486} 457}
487 458
488############################################################################# 459#############################################################################
489 460
… …
498 my $class = shift; 469 my $class = shift;
499 470
500 # range [value, low, high, page] 471 # range [value, low, high, page]
501 472
502 $class->SUPER::new ( 473 $class->SUPER::new (
503 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
504 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
505 @_ 476 @_
506 ) 477 )
507} 478}
508 479
509sub _draw { 480sub _draw {
510 my ($self) = @_; 481 my ($self) = @_;
511 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
512 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
513 489
514 glEnable GL_BLEND; 490 glEnable GL_BLEND;
515 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
516 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
517 493
518 glBegin GL_QUADS; 494 glBegin GL_QUADS;
519 glVertex 0 , 0; 495 glVertex 0 , 0;
520 glVertex 0 , $h; 496 glVertex 0 , $h;
521 glVertex $w, $h; 497 glVertex $w, $h;
522 glVertex $w, 0; 498 glVertex $w, 0;
523 glEnd; 499 glEnd;
524 500
525 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
526} 503}
527 504
528############################################################################# 505#############################################################################
529 506
530package CFClient::UI::Empty; 507package CFClient::UI::Empty;
… …
574 $self->{children} = [ 551 $self->{children} = [
575 sort { $a->{z} <=> $b->{z} } 552 sort { $a->{z} <=> $b->{z} }
576 @{$self->{children}}, @widgets 553 @{$self->{children}}, @widgets
577 ]; 554 ];
578 555
579 $_->check_size 556 $self->check_size (1);
580 for @widgets;
581
582 $self->update; 557 $self->update;
583} 558}
584 559
585sub children { 560sub children {
586 @{ $_[0]{children} } 561 @{ $_[0]{children} }
… …
693} 668}
694 669
695sub update { 670sub update {
696 my ($self) = @_; 671 my ($self) = @_;
697 672
698 $ROOT->on_refresh ($self => sub { $self->render_child }); 673 $ROOT->on_post_alloc ($self => sub { $self->render_child });
699 $self->SUPER::update; 674 $self->SUPER::update;
700} 675}
701 676
702sub size_allocate { 677sub size_allocate {
703 my ($self, $w, $h) = @_; 678 my ($self, $w, $h) = @_;
… …
734 my ($w, $h) = ($self->w, $self->h); 709 my ($w, $h) = ($self->w, $self->h);
735 710
736 my $tex = $self->{texture} 711 my $tex = $self->{texture}
737 or return; 712 or return;
738 713
739 glEnable GL_BLEND;
740 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
741 glEnable GL_TEXTURE_2D; 714 glEnable GL_TEXTURE_2D;
742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
743 glColor 0, 0, 0, 1; 716 glColor 0, 0, 0, 1;
744 717
745 $tex->draw_quad (0, 0, $w, $h); 718 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
746 719
747 glDisable GL_BLEND;
748 glDisable GL_TEXTURE_2D; 720 glDisable GL_TEXTURE_2D;
749} 721}
750 722
751############################################################################# 723#############################################################################
752 724
… …
776 $self->{view_y} = int $y; 748 $self->{view_y} = int $y;
777 749
778 $self->update; 750 $self->update;
779} 751}
780 752
781# 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
782sub _topleft { 754sub coord2local {
783 my ($self, $x, $y) = @_; 755 my ($self, $x, $y) = @_;
784 756
785 $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)
786} 767}
787 768
788sub find_widget { 769sub find_widget {
789 my ($self, $x, $y) = @_; 770 my ($self, $x, $y) = @_;
790 771
… …
835 $self->add ($self->{slider}); 816 $self->add ($self->{slider});
836 817
837 $self 818 $self
838} 819}
839 820
840#TODO# update range on size_allocate depeneing on child 821#TODO# update range on size_allocate depending on child
841# update viewport offset on scroll 822# update viewport offset on scroll
842 823
843############################################################################# 824#############################################################################
844 825
845package CFClient::UI::Frame; 826package CFClient::UI::Frame;
… …
849use CFClient::OpenGL; 830use CFClient::OpenGL;
850 831
851sub new { 832sub new {
852 my $class = shift; 833 my $class = shift;
853 834
854 my $self = $class->SUPER::new ( 835 $class->SUPER::new (
855 bg => [1, 1, 1, 1], 836 bg => undef,
856 border_bg => [1, 1, 1, 1],
857 border => 0.8,
858 @_ 837 @_,
859 ); 838 )
860
861 $self
862} 839}
863 840
864sub _draw { 841sub _draw {
865 my ($self) = @_; 842 my ($self) = @_;
866 843
867 my ($w, $h) = ($self->{w}, $self->{h}); 844 if ($self->{bg}) {
845 my ($w, $h) = @$self{qw(w h)};
868 846
869 glEnable GL_BLEND; 847 glEnable GL_BLEND;
870 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 848 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
871 glEnable GL_TEXTURE_2D; 849 glColor @{ $self->{bg} };
872 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
873 850
874# glBegin GL_QUADS; 851 glBegin GL_QUADS;
875# glColor 0, 0, 0, 0;
876# glVertex 0 , 0; 852 glVertex 0 , 0;
877# glVertex 0 , $h; 853 glVertex 0 , $h;
878# glVertex $w, $h; 854 glVertex $w, $h;
879# glVertex $w, 0; 855 glVertex $w, 0;
880# glEnd; 856 glEnd;
881 857
882
883 $self->child->draw;
884 glDisable GL_BLEND; 858 glDisable GL_BLEND;
885 glDisable GL_TEXTURE_2D; 859 }
860
861 $self->SUPER::_draw;
886} 862}
887 863
888############################################################################# 864#############################################################################
889 865
890package CFClient::UI::FancyFrame; 866package CFClient::UI::FancyFrame;
… …
904 880
905 my $self = $class->SUPER::new ( 881 my $self = $class->SUPER::new (
906 bg => [1, 1, 1, 1], 882 bg => [1, 1, 1, 1],
907 border_bg => [1, 1, 1, 1], 883 border_bg => [1, 1, 1, 1],
908 border => 0.6, 884 border => 0.6,
885 toplevel => 1,
909 can_events => 1, 886 can_events => 1,
910 @_ 887 @_
911 ); 888 );
912 889
913 $self->{title} &&= new CFClient::UI::Label 890 $self->{title} &&= new CFClient::UI::Label
… …
938 my ($self, $w, $h) = @_; 915 my ($self, $w, $h) = @_;
939 916
940 $h -= List::Util::max 0, $self->border * 2; 917 $h -= List::Util::max 0, $self->border * 2;
941 $w -= List::Util::max 0, $self->border * 2; 918 $w -= List::Util::max 0, $self->border * 2;
942 919
943 $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)
944 if $self->{title}; 921 if $self->{title};
945 922
946 $self->child->configure ($self->border, $self->border, $w, $h); 923 $self->child->configure ($self->border, $self->border, $w, $h);
947} 924}
948 925
… …
1006 my ($self) = @_; 983 my ($self) = @_;
1007 984
1008 my ($w, $h ) = ($self->{w}, $self->{h}); 985 my ($w, $h ) = ($self->{w}, $self->{h});
1009 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 986 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
1010 987
1011 glEnable GL_BLEND;
1012 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1013 glEnable GL_TEXTURE_2D; 988 glEnable GL_TEXTURE_2D;
1014 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1015 990
1016 my $border = $self->border; 991 my $border = $self->border;
1017 992
1018 glColor @{ $self->{border_bg} }; 993 glColor @{ $self->{border_bg} };
1019 $tex[1]->draw_quad (0, 0, $w, $border); 994 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
1020 $tex[3]->draw_quad (0, $border, $border, $ch); 995 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
1021 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 996 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1022 $tex[4]->draw_quad (0, $h - $border, $w, $border); 997 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
1023 998
1024 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 999 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1025 my $bg = $tex[0]; 1000 my $bg = $tex[0];
1026 1001
1027 # TODO: repeat texture not scale 1002 # TODO: repeat texture not scale
… …
1031 glColor @{ $self->{bg} }; 1006 glColor @{ $self->{bg} };
1032 1007
1033 $bg->{s} = $rep_x; 1008 $bg->{s} = $rep_x;
1034 $bg->{t} = $rep_y; 1009 $bg->{t} = $rep_y;
1035 $bg->{wrap_mode} = 1; 1010 $bg->{wrap_mode} = 1;
1036 $bg->draw_quad ($border, $border, $cw, $ch); 1011 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1012 }
1037 1013
1038 glDisable GL_TEXTURE_2D; 1014 glDisable GL_TEXTURE_2D;
1039 glDisable GL_BLEND;
1040 }
1041 1015
1042 $self->{title}->draw if $self->{title}; 1016 $self->{title}->draw if $self->{title};
1043 1017
1044 $self->child->draw; 1018 $self->child->draw;
1045} 1019}
… …
1272} 1246}
1273 1247
1274sub size_allocate { 1248sub size_allocate {
1275 my ($self, $w, $h) = @_; 1249 my ($self, $w, $h) = @_;
1276 1250
1251 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1252
1277 my $children = $self->{children}; 1253 my $children = $self->{children};
1278 1254
1279 my @h = map $_->{req_h}, @$children; 1255 my @h = map $_->{req_h}, @$children;
1280 1256
1281 my $req_h = List::Util::sum @h; 1257 my $req_h = List::Util::sum @h;
… …
1310 1286
1311############################################################################# 1287#############################################################################
1312 1288
1313package CFClient::UI::Label; 1289package CFClient::UI::Label;
1314 1290
1315our @ISA = CFClient::UI::Base::; 1291our @ISA = CFClient::UI::DrawBG::;
1316 1292
1317use CFClient::OpenGL; 1293use CFClient::OpenGL;
1318 1294
1319sub new { 1295sub new {
1320 my ($class, %arg) = @_; 1296 my ($class, %arg) = @_;
1321 1297
1322 my $self = $class->SUPER::new ( 1298 my $self = $class->SUPER::new (
1323 fg => [1, 1, 1], 1299 fg => [1, 1, 1],
1300 #bg => none
1301 #active_bg => none
1324 #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),
1325 fontsize => 1, 1308 fontsize => 1,
1326 text => "",
1327 align => -1, 1309 align => -1,
1328 valign => -1, 1310 valign => -1,
1329 padding => 2, 1311 padding => 2,
1330 layout => new CFClient::Layout,
1331 can_events => 0, 1312 can_events => 0,
1332 %arg 1313 %arg
1333 ); 1314 );
1334 1315
1335 if (exists $self->{template}) { 1316 if (exists $self->{template}) {
1336 my $layout = new CFClient::Layout; 1317 my $layout = new CFClient::Layout;
1337 $layout->set_text (delete $self->{template}); 1318 $layout->set_text (delete $self->{template});
1338 $self->{template} = $layout; 1319 $self->{template} = $layout;
1339 } 1320 }
1340 1321
1341 $self->set_text (delete $self->{text}) if exists $self->{text}; 1322 if (exists $self->{markup}) {
1342 $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 }
1343 1327
1344 $self 1328 $self
1345} 1329}
1346 1330
1347sub escape { 1331sub escape($) {
1348 local $_ = $_[1]; 1332 local $_ = $_[0];
1349 1333
1350 s/&/&amp;/g; 1334 s/&/&amp;/g;
1351 s/>/&gt;/g; 1335 s/>/&gt;/g;
1352 s/</&lt;/g; 1336 s/</&lt;/g;
1353 1337
1354 $_[1] 1338 $_
1355} 1339}
1356 1340
1357sub update { 1341sub update {
1358 my ($self) = @_; 1342 my ($self) = @_;
1359 1343
… …
1365 my ($self, $text) = @_; 1349 my ($self, $text) = @_;
1366 1350
1367 return if $self->{text} eq "T$text"; 1351 return if $self->{text} eq "T$text";
1368 $self->{text} = "T$text"; 1352 $self->{text} = "T$text";
1369 1353
1354 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1355 $self->{layout}->set_text ($text);
1371 1356
1372 delete $self->{texture};
1373 $self->update; 1357 $self->update;
1374 $self->check_size; 1358 $self->check_size;
1375} 1359}
1376 1360
1377sub set_markup { 1361sub set_markup {
1378 my ($self, $markup) = @_; 1362 my ($self, $markup) = @_;
1379 1363
1380 return if $self->{text} eq "M$markup"; 1364 return if $self->{text} eq "M$markup";
1381 $self->{text} = "M$markup"; 1365 $self->{text} = "M$markup";
1382 1366
1367 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1368
1369 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1383 $self->{layout}->set_markup ($markup); 1370 $self->{layout}->set_markup ($markup);
1384 1371
1385 delete $self->{texture};
1386 $self->update; 1372 $self->update;
1387 $self->check_size; 1373 $self->check_size;
1388} 1374}
1389 1375
1390sub size_request { 1376sub size_request {
1391 my ($self) = @_; 1377 my ($self) = @_;
1392 1378
1393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1379 $self->{layout}->set_font ($self->{font}) if $self->{font};
1394 $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});
1395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1396 1384
1397 my ($w, $h) = $self->{layout}->size; 1385 my ($w, $h) = $self->{layout}->size;
1398 1386
1399 if (exists $self->{template}) { 1387 if (exists $self->{template}) {
… …
1429} 1417}
1430 1418
1431sub _draw { 1419sub _draw {
1432 my ($self) = @_; 1420 my ($self) = @_;
1433 1421
1422 $self->SUPER::_draw; # draw background, if applicable
1423
1434 my $tex = $self->{texture} ||= do { 1424 my $tex = $self->{texture} ||= do {
1425 $self->{layout}->set_foreground (@{$self->{fg}});
1435 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1426 $self->{layout}->set_font ($self->{font}) if $self->{font};
1436 $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});
1437 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431
1438 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
1439 }; 1443 };
1440 1444
1441 glEnable GL_BLEND;
1442 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1443 glEnable GL_TEXTURE_2D; 1445 glEnable GL_TEXTURE_2D;
1444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1445 1447
1448 if ($tex->{format} == GL_ALPHA) {
1446 glColor @{$self->{fg}}; 1449 glColor @{$self->{fg}};
1447
1448 $self->{ox} = int (
1449 $self->{align} < 0 ? $self->{padding}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1451 : ($self->{w} - $tex->{w}) * 0.5
1452 );
1453
1454 $self->{oy} = int (
1455 $self->{valign} < 0 ? $self->{padding}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1457 : ($self->{h} - $tex->{h}) * 0.5
1458 );
1459
1460 $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 }
1461 1454
1462 glDisable GL_TEXTURE_2D; 1455 glDisable GL_TEXTURE_2D;
1463 glDisable GL_BLEND;
1464} 1456}
1465 1457
1466############################################################################# 1458#############################################################################
1467 1459
1468package CFClient::UI::EntryBase; 1460package CFClient::UI::EntryBase;
… …
1503 $self->{layout}->set_text ("$text "); 1495 $self->{layout}->set_text ("$text ");
1504 1496
1505 $self->emit (changed => $self->{text}); 1497 $self->emit (changed => $self->{text});
1506} 1498}
1507 1499
1508sub get_text {
1509 $_[0]{text}
1510}
1511
1512sub size_request {
1513 my ($self) = @_;
1514
1515 my ($w, $h) = $self->SUPER::size_request;
1516
1517 ($w + 1, $h) # add 1 for cursor
1518}
1519
1520sub size_allocate {
1521 my ($self, $w, $h) = @_;
1522
1523 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1524}
1525
1526sub set_text { 1500sub set_text {
1527 my ($self, $text) = @_; 1501 my ($self, $text) = @_;
1528 1502
1529 $self->{cursor} = length $text; 1503 $self->{cursor} = length $text;
1530 $self->_set_text ($text); 1504 $self->_set_text ($text);
1531 $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
1532} 1525}
1533 1526
1534sub key_down { 1527sub key_down {
1535 my ($self, $ev) = @_; 1528 my ($self, $ev) = @_;
1536 1529
… …
1538 my $sym = $ev->{sym}; 1531 my $sym = $ev->{sym};
1539 my $uni = $ev->{unicode}; 1532 my $uni = $ev->{unicode};
1540 1533
1541 my $text = $self->get_text; 1534 my $text = $self->get_text;
1542 1535
1543 if ($sym == 8) { 1536 if ($uni == 8) {
1544 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1537 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1545 } elsif ($sym == 127) { 1538 } elsif ($uni == 127) {
1546 substr $text, $self->{cursor}, 1, ""; 1539 substr $text, $self->{cursor}, 1, "";
1547 } elsif ($sym == CFClient::SDLK_LEFT) { 1540 } elsif ($sym == CFClient::SDLK_LEFT) {
1548 --$self->{cursor} if $self->{cursor}; 1541 --$self->{cursor} if $self->{cursor};
1549 } elsif ($sym == CFClient::SDLK_RIGHT) { 1542 } elsif ($sym == CFClient::SDLK_RIGHT) {
1550 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1543 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1551 } elsif ($sym == CFClient::SDLK_HOME) { 1544 } elsif ($sym == CFClient::SDLK_HOME) {
1552 $self->{cursor} = 0; 1545 $self->{cursor} = 0;
1553 } elsif ($sym == CFClient::SDLK_END) { 1546 } elsif ($sym == CFClient::SDLK_END) {
1554 $self->{cursor} = length $text; 1547 $self->{cursor} = length $text;
1555 } elsif ($sym == 27) { 1548 } elsif ($uni == 27) {
1556 $self->emit ('escape'); 1549 $self->emit ('escape');
1557 } elsif ($uni) { 1550 } elsif ($uni) {
1558 substr $text, $self->{cursor}++, 0, chr $uni; 1551 substr $text, $self->{cursor}++, 0, chr $uni;
1559 } 1552 }
1560 1553
1561 $self->_set_text ($text); 1554 $self->_set_text ($text);
1562 $self->update; 1555 $self->update;
1556 $self->check_size;
1563} 1557}
1564 1558
1565sub focus_in { 1559sub focus_in {
1566 my ($self) = @_; 1560 my ($self) = @_;
1567 1561
… …
1696 my $class = shift; 1690 my $class = shift;
1697 1691
1698 $class->SUPER::new ( 1692 $class->SUPER::new (
1699 padding => 4, 1693 padding => 4,
1700 fg => [1, 1, 1], 1694 fg => [1, 1, 1],
1701 bg => [1, 1, 1, 0.2],
1702 active_fg => [0, 0, 1], 1695 active_fg => [0, 0, 1],
1703 can_hover => 1, 1696 can_hover => 1,
1704 align => 0, 1697 align => 0,
1705 valign => 0, 1698 valign => 0,
1706 can_events => 1, 1699 can_events => 1,
… …
1724 1717
1725 if ($GRAB == $self) { 1718 if ($GRAB == $self) {
1726 $self->{fg} = $self->{active_fg}; 1719 $self->{fg} = $self->{active_fg};
1727 } 1720 }
1728 1721
1729 glEnable GL_BLEND;
1730 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1731 glEnable GL_TEXTURE_2D; 1722 glEnable GL_TEXTURE_2D;
1732 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1733 glColor 0, 0, 0, 1; 1724 glColor 0, 0, 0, 1;
1734 1725
1735 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1726 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1736 1727
1737 glDisable GL_TEXTURE_2D; 1728 glDisable GL_TEXTURE_2D;
1738 glDisable GL_BLEND;
1739 1729
1740 $self->SUPER::_draw; 1730 $self->SUPER::_draw;
1741} 1731}
1742 1732
1743############################################################################# 1733#############################################################################
… …
1757 1747
1758 $class->SUPER::new ( 1748 $class->SUPER::new (
1759 padding => 2, 1749 padding => 2,
1760 fg => [1, 1, 1], 1750 fg => [1, 1, 1],
1761 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],
1762 state => 0, 1754 state => 0,
1763 can_hover => 1, 1755 can_hover => 1,
1764 @_ 1756 @_
1765 ) 1757 )
1766} 1758}
… …
1790 1782
1791 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;
1792 1784
1793 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1785 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1794 1786
1795 glEnable GL_BLEND; 1787 my $tex = $self->{state} ? $tex[1] : $tex[0];
1788
1796 glEnable GL_TEXTURE_2D; 1789 glEnable GL_TEXTURE_2D;
1797 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798
1799 my $tex = $self->{state} ? $tex[1] : $tex[0];
1800
1801 $tex->draw_quad (0, 0, $s, $s); 1790 $tex->draw_quad_alpha (0, 0, $s, $s);
1802
1803 glDisable GL_TEXTURE_2D; 1791 glDisable GL_TEXTURE_2D;
1804 glDisable GL_BLEND;
1805} 1792}
1806 1793
1807############################################################################# 1794#############################################################################
1808 1795
1809package CFClient::UI::Image; 1796package CFClient::UI::Image;
… …
1852 glTranslate 0, -$self->{w}, 0; 1839 glTranslate 0, -$self->{w}, 0;
1853 1840
1854 ($w, $h) = ($h, $w); 1841 ($w, $h) = ($h, $w);
1855 } 1842 }
1856 1843
1857 glEnable GL_BLEND;
1858 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1859 glEnable GL_TEXTURE_2D; 1844 glEnable GL_TEXTURE_2D;
1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1845 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861 1846
1862 $tex->draw_quad (0, 0, $w, $h); 1847 $tex->draw_quad_alpha (0, 0, $w, $h);
1863 1848
1864 glDisable GL_BLEND;
1865 glDisable GL_TEXTURE_2D; 1849 glDisable GL_TEXTURE_2D;
1866} 1850}
1867 1851
1868############################################################################# 1852#############################################################################
1869 1853
… …
2058 qw(s1_slider.png s1_slider_bg.png); 2042 qw(s1_slider.png s1_slider_bg.png);
2059 2043
2060sub new { 2044sub new {
2061 my $class = shift; 2045 my $class = shift;
2062 2046
2063 # range [value, low, high, page] 2047 # range [value, low, high, page, unit]
2064 2048
2065 # TODO: 0-width page 2049 # TODO: 0-width page
2066 # TODO: req_w/h are wrong with vertical 2050 # TODO: req_w/h are wrong with vertical
2067 # TODO: calculations are off 2051 # TODO: calculations are off
2068 my $self = $class->SUPER::new ( 2052 my $self = $class->SUPER::new (
2069 fg => [1, 1, 1], 2053 fg => [1, 1, 1],
2070 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],
2071 range => [0, 0, 100, 10], 2057 range => [0, 0, 100, 10],
2072 req_w => $::WIDTH / 80, 2058 req_w => $::WIDTH / 80,
2073 req_h => $::WIDTH / 80, 2059 req_h => $::WIDTH / 80,
2074 vertical => 0, 2060 vertical => 0,
2075 can_hover => 1, 2061 can_hover => 1,
2076 inner_pad => 5, 2062 inner_pad => .05,
2077 @_ 2063 @_
2078 ); 2064 );
2079 2065
2066 $self->set_value ($self->{range}[0]);
2067 $self->update;
2068
2080 $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 }
2081} 2093}
2082 2094
2083sub size_request { 2095sub size_request {
2084 my ($self) = @_; 2096 my ($self) = @_;
2085 2097
… …
2098 2110
2099sub mouse_motion { 2111sub mouse_motion {
2100 my ($self, $ev, $x, $y) = @_; 2112 my ($self, $ev, $x, $y) = @_;
2101 2113
2102 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
2103 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2131 my ($value, $lo, $hi, $page) = @{$self->{range}};
2104 2132
2105 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2133 my $inner_w = 1 - 2 * $self->{inner_pad};
2106 2134
2107 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2135 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2108 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2109 2136
2110 $x -= $inner_pad_px; # substract the padding 2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2111 $x = $x * ($hi - $lo) / $inner_w + $lo; 2138 $value = $self->{scale} * ($value - $lo);
2112 $x = $lo if $x < $lo;
2113 $x = $hi - $page if $x > $hi - $page;
2114 $self->{range}[0] = $x;
2115 2139
2116 $self->emit (changed => $x); 2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
2117 $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;
2118 } 2147 });
2119}
2120 2148
2121# the inner_* stuff is for generating a padding for the slider handle, 2149 $self->SUPER::update;
2122# so that the handle doesn't leave the texture. This calculation isn't 100%
2123# correct propably, but it does the job for now
2124sub _calc_inner_pad_px {
2125 my ($self, $w) = @_;
2126 ($w / 100) * $self->{inner_pad} # % to pixels
2127} 2150}
2128 2151
2129sub _draw { 2152sub _draw {
2130 my ($self) = @_; 2153 my ($self) = @_;
2131 2154
2132 $self->SUPER::_draw (); 2155 $self->SUPER::_draw ();
2133 2156
2134 my ($w, $h) = @$self{qw(w h)}; 2157 glScale $self->{w}, $self->{h};
2135 2158
2136 if ($self->{vertical}) { 2159 if ($self->{vertical}) {
2137 # draw a vertical slider like a rotated horizontal slider 2160 # draw a vertical slider like a rotated horizontal slider
2138 2161
2139 glRotate 90, 0, 0, 1; 2162 glRotate 90, 0, 0, 1;
2140 glTranslate 0, -$self->{w}, 0; 2163 glTranslate 0, 1, 0;
2141
2142 ($w, $h) = ($h, $w);
2143 } 2164 }
2144 2165
2145 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2166 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2146 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2167 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2147 2168
2148 my ($value, $lo, $hi, $page) = @{$self->{range}};
2149
2150 $hi = $value + 1 if $lo == $hi;
2151
2152 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2153 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2154
2155 $page = int $page * $inner_w / ($hi - $lo);
2156 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2157
2158 $w -= $page;
2159 $page &= ~1;
2160 glTranslate $page * 0.5, 0, 0;
2161 $page ||= 2;
2162
2163 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2164 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2165
2166 glEnable GL_BLEND;
2167 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2168 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170 2171
2171 # draw background 2172 # draw background
2172 $tex[1]->draw_quad (0, 0, $w, $h); 2173 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2173 2174
2174 # draw handle 2175 # draw handle
2175 $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);
2176 2177
2177 glDisable GL_BLEND;
2178 glDisable GL_TEXTURE_2D; 2178 glDisable GL_TEXTURE_2D;
2179} 2179}
2180 2180
2181############################################################################# 2181#############################################################################
2182 2182
… …
2193 fontsize => 1, 2193 fontsize => 1,
2194 can_events => 0, 2194 can_events => 0,
2195 #font => default_font 2195 #font => default_font
2196 @_, 2196 @_,
2197 2197
2198 layout => (new CFClient::Layout), 2198 layout => (new CFClient::Layout 1),
2199 par => [], 2199 par => [],
2200 height => 0, 2200 height => 0,
2201 children => [ 2201 children => [
2202 (new CFClient::UI::Empty expand => 1), 2202 (new CFClient::UI::Empty expand => 1),
2203 (new CFClient::UI::Slider vertical => 1), 2203 (new CFClient::UI::Slider vertical => 1),
… …
2221 2221
2222 my $layout = $self->{layout}; 2222 my $layout = $self->{layout};
2223 2223
2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225 $layout->set_width ($self->{children}[0]{w}); 2225 $layout->set_width ($self->{children}[0]{w});
2226 $layout->set_text ($text); 2226 $layout->set_markup ($text);
2227 2227
2228 ($layout->size)[1] 2228 ($layout->size)[1]
2229} 2229}
2230 2230
2231sub reflow { 2231sub reflow {
… …
2269 2269
2270 return unless $self->{h} > 0; 2270 return unless $self->{h} > 0;
2271 2271
2272 delete $self->{texture}; 2272 delete $self->{texture};
2273 2273
2274 $ROOT->on_refresh ($self, sub { 2274 $ROOT->on_post_alloc ($self, sub {
2275 if (delete $self->{need_reflow}) { 2275 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2276 my $height = 0;
2277 2277
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2278 $height += $_->[0] = $self->text_height ($_->[2])
2279 for @{$self->{par}}; 2279 for @{$self->{par}};
… …
2287 2287
2288 $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 {
2289 glClearColor 0, 0, 0, 0; 2289 glClearColor 0, 0, 0, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2290 glClear GL_COLOR_BUFFER_BIT;
2291 2291
2292 glEnable GL_BLEND;
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D; 2292 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 2294
2297 my $top = int $self->{children}[1]{range}[0]; 2295 my $top = int $self->{children}[1]{range}[0];
2298 2296
… …
2307 2305
2308 for my $par (@{$self->{par}}) { 2306 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2307 my $h = $par->[0];
2310 2308
2311 if ($y0 < $y + $h && $y < $y1) { 2309 if ($y0 < $y + $h && $y < $y1) {
2310 $layout->set_foreground (@{ $par->[1] });
2312 $layout->set_text ($par->[2]); 2311 $layout->set_markup ($par->[2]);
2313 2312
2314 glColor @{ $par->[1] };
2315 my ($W, $H) = $layout->size; 2313 my ($W, $H) = $layout->size;
2316 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);
2317 } 2315 }
2318 2316
2319 $y += $h; 2317 $y += $h;
2320 } 2318 }
2321 2319
2322 glDisable GL_TEXTURE_2D; 2320 glDisable GL_TEXTURE_2D;
2323 glDisable GL_BLEND;
2324 }; 2321 };
2325 }); 2322 });
2326} 2323}
2327 2324
2328sub _draw { 2325sub _draw {
2329 my ($self) = @_; 2326 my ($self) = @_;
2330 2327
2331 glEnable GL_BLEND;
2332 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2333 glEnable GL_TEXTURE_2D; 2328 glEnable GL_TEXTURE_2D;
2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1; 2330 glColor 1, 1, 1, 1;
2336 $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});
2337 glDisable GL_TEXTURE_2D; 2332 glDisable GL_TEXTURE_2D;
2338 glDisable GL_BLEND;
2339 2333
2340 $self->{children}[1]->draw; 2334 $self->{children}[1]->draw;
2341 2335
2342} 2336}
2343 2337
… …
2437 @_, 2431 @_,
2438 can_events => 0, 2432 can_events => 0,
2439 ) 2433 )
2440} 2434}
2441 2435
2442sub set_markup { 2436sub set_tooltip_from {
2443 my ($self, $text) = @_; 2437 my ($self, $widget) = @_;
2444 2438
2445 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2439 $self->add (new CFClient::UI::Label
2446 $self->{label}->set_markup ($text); 2440 markup => $widget->{tooltip},
2447 $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 );
2448} 2447}
2449 2448
2450sub size_request { 2449sub size_request {
2451 my ($self) = @_; 2450 my ($self) = @_;
2452
2453 $self->child->set_max_size ($::WIDTH * 0.3);
2454 2451
2455 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2452 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2456 2453
2457 ($w + 4, $h + 4) 2454 ($w + 4, $h + 4)
2458} 2455}
… …
2464} 2461}
2465 2462
2466sub _draw { 2463sub _draw {
2467 my ($self) = @_; 2464 my ($self) = @_;
2468 2465
2469 glPushMatrix;
2470 glTranslate 0.375, 0.375; 2466 glTranslate 0.375, 0.375;
2471 2467
2472 my ($w, $h) = @$self{qw(w h)}; 2468 my ($w, $h) = @$self{qw(w h)};
2473 2469
2474 glColor 1, 0.8, 0.4; 2470 glColor 1, 0.8, 0.4;
… …
2485 glVertex 0 , $h; 2481 glVertex 0 , $h;
2486 glVertex $w, $h; 2482 glVertex $w, $h;
2487 glVertex $w, 0; 2483 glVertex $w, 0;
2488 glEnd; 2484 glEnd;
2489 2485
2490 glPopMatrix; 2486 glTranslate 2 - 0.375, 2 - 0.375;
2491
2492 glTranslate 2, 2;
2493 $self->SUPER::_draw; 2487 $self->SUPER::_draw;
2494} 2488}
2495 2489
2496############################################################################# 2490#############################################################################
2497 2491
… …
2520 return unless $::CONN;#d# manage and cache textures differently 2514 return unless $::CONN;#d# manage and cache textures differently
2521 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2515 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2522 2516
2523 # TODO animation 2517 # TODO animation
2524 if ($tex) { 2518 if ($tex) {
2525 glEnable GL_BLEND;
2526 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2527 glEnable GL_TEXTURE_2D; 2519 glEnable GL_TEXTURE_2D;
2528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2529 glColor 1, 1, 1, 1; 2521 glColor 1, 1, 1, 1;
2530 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2522 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2531 glDisable GL_TEXTURE_2D; 2523 glDisable GL_TEXTURE_2D;
2532 glDisable GL_BLEND;
2533 } 2524 }
2534} 2525}
2535 2526
2536############################################################################# 2527#############################################################################
2537 2528
2538package CFClient::UI::InventoryItem; 2529package CFClient::UI::InventoryItem;
2539 2530
2540our @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}
2541 2558
2542sub new { 2559sub new {
2543 my $class = shift; 2560 my $class = shift;
2544 2561
2545 my %args = @_; 2562 my %args = @_;
2546 2563
2547 my $item = $args{item}; 2564 my $item = delete $args{item};
2548 2565
2549 my $desc = $item->{nrof} < 2 2566 my $desc = _item_to_desc ($item);
2550 ? $item->{name}
2551 : "$item->{nrof} $item->{name_pl}";
2552
2553 2567
2554 my $self = $class->SUPER::new ( 2568 my $self = $class->SUPER::new (
2555 can_hover => 1, 2569 can_hover => 1,
2556 can_events => 1, 2570 can_events => 1,
2557 tooltip => (CFClient::UI::Label->escape ($desc) 2571 tooltip => ((CFClient::UI::Label::escape $desc)
2558 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2559 connect_button_down => sub { 2573 connect_button_down => sub {
2560 my ($self, $ev, $x, $y) = @_; 2574 my ($self, $ev, $x, $y) = @_;
2561 2575
2562 # 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 :(
2563 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
2564 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2584 $::CONN->send ("move $targ $item->{tag} 0");
2565 } elsif ($ev->{button} == 2) { 2585 } elsif ($ev->{button} == 2) {
2566 $::CONN->send ("apply $item->{tag}"); 2586 $::CONN->send ("apply $item->{tag}");
2567 } elsif ($ev->{button} == 3) { 2587 } elsif ($ev->{button} == 3) {
2568 CFClient::UI::Menu->new ( 2588 my @menu_items = (
2569 items => [
2570 ["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") }],
2571 [ 2593 [
2572 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2573 sub { $::CONN->send ("lock $item->{tag}") }, 2595 sub { $::CONN->send ("lock $item->{tag}") },
2574 ],
2575 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2576 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2577 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2578 ], 2596 ],
2579 )->popup ($ev); 2597 );
2598
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2580 } 2600 }
2581 2601
2582 1 2602 1
2583 }, 2603 },
2584 %args 2604 %args
2585 ); 2605 );
2606
2607
2586 $self->add(new CFClient::UI::Face 2608 $self->add (new CFClient::UI::Face
2587 can_events => 0, 2609 can_events => 0,
2588 face => $item->{face}, 2610 face => $item->{face},
2589 anim => $item->{anim}, 2611 anim => $item->{anim},
2590 animspeed => $item->{animspeed}); 2612 animspeed => $item->{animspeed},
2591 $self->add(new CFClient::UI::Label 2613 );
2592 can_events => 0, 2614
2593 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;
2594 2620
2595 $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);
2596} 2630}
2597 2631
2598############################################################################# 2632#############################################################################
2599 2633
2600package CFClient::UI::Inventory; 2634package CFClient::UI::Inventory;
… …
2616 my ($self, $items) = @_; 2650 my ($self, $items) = @_;
2617 2651
2618 $self->{scrolled}->clear; 2652 $self->{scrolled}->clear;
2619 return unless $items; 2653 return unless $items;
2620 2654
2621 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;
2622 2659
2623 $self->{real_items} = \@items; 2660 $self->{real_items} = \@items;
2624 2661
2625 for my $item (@items) { 2662 for my $item (@items) {
2626 my $desc = $item->{nrof} < 2
2627 ? $item->{name}
2628 : "$item->{nrof} $item->{name_pl}";
2629
2630 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item ();
2631 } 2665 }
2666
2667 $self->{scrolled}->add (@items);
2632 2668
2633# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2634} 2670}
2635 2671
2636sub size_request { 2672sub size_request {
… …
2710 } 2746 }
2711} 2747}
2712 2748
2713############################################################################# 2749#############################################################################
2714 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
2715package CFClient::UI::Root; 2859package CFClient::UI::Root;
2716 2860
2717our @ISA = CFClient::UI::Container::; 2861our @ISA = CFClient::UI::Container::;
2718 2862
2719use CFClient::OpenGL; 2863use CFClient::OpenGL;
2720 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
2721sub check_size { 2880sub check_size {
2722 my ($self) = @_; 2881 my ($self) = @_;
2723 2882
2724 $self->configure (0, 0, $self->{w}, $self->{h}); 2883 $self->size_allocate ($self->{w}, $self->{h})
2884 if $self->{w};
2725} 2885}
2726 2886
2727sub size_request { 2887sub size_request {
2728 my ($self) = @_; 2888 my ($self) = @_;
2729 2889
… …
2731} 2891}
2732 2892
2733sub size_allocate { 2893sub size_allocate {
2734 my ($self, $w, $h) = @_; 2894 my ($self, $w, $h) = @_;
2735 2895
2736 my $old_w = $self->{old_w}; 2896 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2737 my $old_h = $self->{old_h}; 2897 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2738 2898
2739 if ($old_w && $old_h) { 2899 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2740 for my $child ($self->children) { 2900 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2741 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2742 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2743 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2744 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2745 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2746 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2747 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2748 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2749 }
2750 }
2751
2752 $self->{old_w} = $w;
2753 $self->{old_h} = $h;
2754}
2755
2756sub configure {
2757 my ($self, $x, $y, $w, $h) = @_;
2758
2759 $self->SUPER::configure ($x, $y, $w, $h);
2760 2901
2761 for my $child ($self->children) { 2902 for my $child ($self->children) {
2762 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)};
2763 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
2764 $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;
2765 $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
2766 $child->configure ($X, $Y, $W, $H); 2914 $child->configure ($X, $Y, $W, $H);
2767 } 2915 }
2768} 2916}
2769 2917
2770sub _topleft { 2918sub coord2local {
2771 my ($self, $x, $y) = @_; 2919 my ($self, $x, $y) = @_;
2772 2920
2773 ($x, $y) 2921 ($x, $y)
2774} 2922}
2775 2923
2924sub coord2global {
2925 my ($self, $x, $y) = @_;
2926
2927 ($x, $y)
2928}
2929
2776sub update { 2930sub update {
2777 my ($self) = @_; 2931 my ($self) = @_;
2778 2932
2779 $self->check_size; 2933 $self->check_size;
2780 ::refresh (); 2934 $::WANT_REFRESH++;
2781} 2935}
2782 2936
2783sub add { 2937sub add {
2784 my ($self, $child) = @_; 2938 my ($self, @children) = @_;
2785 2939
2940 for my $child (@children) {
2941 $child->{toplevel} = 1;
2942
2786 # integerize window positions 2943 # integerise window positions
2787 $child->{x} = int $child->{x}; 2944 $child->{x} = int $child->{x};
2788 $child->{y} = int $child->{y}; 2945 $child->{y} = int $child->{y};
2946 }
2789 2947
2790 $self->SUPER::add ($child); 2948 $self->SUPER::add (@children);
2791} 2949}
2792 2950
2793sub on_refresh { 2951sub on_refresh {
2794 my ($self, $id, $cb) = @_; 2952 my ($self, $id, $cb) = @_;
2795 2953
2796 $self->{refresh_hook}{$id} = $cb; 2954 $self->{refresh_hook}{$id} = $cb;
2797} 2955}
2798 2956
2957sub on_post_alloc {
2958 my ($self, $id, $cb) = @_;
2959
2960 $self->{post_alloc_hook}{$id} = $cb;
2961}
2962
2799sub draw { 2963sub draw {
2800 my ($self) = @_; 2964 my ($self) = @_;
2801 2965
2802 while (my $rcb = delete $self->{refresh_hook}) { 2966 while ($self->{refresh_hook}) {
2803 $_->() 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}};
2804 } 3019 }
2805 3020
2806 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3021 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2807 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2808 glClear GL_COLOR_BUFFER_BIT; 3023 glClear GL_COLOR_BUFFER_BIT;
… …
2819############################################################################# 3034#############################################################################
2820 3035
2821package CFClient::UI; 3036package CFClient::UI;
2822 3037
2823$ROOT = new CFClient::UI::Root; 3038$ROOT = new CFClient::UI::Root;
2824$TOOLTIP = new CFClient::UI::Tooltip; 3039$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2825 3040
28261 30411
2827 3042

Diff Legend

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