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.216 by root, Fri May 19 16:43: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) = @_;
… …
716 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
717 glClearColor 0, 0, 0, 0; 692 glClearColor 0, 0, 0, 0;
718 glClear GL_COLOR_BUFFER_BIT; 693 glClear GL_COLOR_BUFFER_BIT;
719 694
720 $self->_render; 695 $self->_render;
721# glColorMask 1, 1, 1, 0;
722# glEnable GL_BLEND;
723# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
724# glRasterPos 0, 0;
725# glCopyPixels 0, 0, $self->{w}, $self->{h};
726# glDisable GL_BLEND;
727# glColorMask 1, 1, 1, 1;
728 }; 696 };
729} 697}
730 698
731sub _draw { 699sub _draw {
732 my ($self) = @_; 700 my ($self) = @_;
… …
734 my ($w, $h) = ($self->w, $self->h); 702 my ($w, $h) = ($self->w, $self->h);
735 703
736 my $tex = $self->{texture} 704 my $tex = $self->{texture}
737 or return; 705 or return;
738 706
739 glEnable GL_BLEND;
740 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
741 glEnable GL_TEXTURE_2D; 707 glEnable GL_TEXTURE_2D;
742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
743 glColor 0, 0, 0, 1; 709 glColor 1, 1, 1, 1;
744 710
745 $tex->draw_quad (0, 0, $w, $h); 711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
746 712
747 glDisable GL_BLEND;
748 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
749} 714}
750 715
751############################################################################# 716#############################################################################
752 717
… …
776 $self->{view_y} = int $y; 741 $self->{view_y} = int $y;
777 742
778 $self->update; 743 $self->update;
779} 744}
780 745
781# hmm, this does not work for topleft of $self... but we should not aks for that 746# hmm, this does not work for topleft of $self... but we should not ask for that
782sub _topleft { 747sub coord2local {
783 my ($self, $x, $y) = @_; 748 my ($self, $x, $y) = @_;
784 749
785 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 750 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
751}
752
753sub coord2global {
754 my ($self, $x, $y) = @_;
755
756 $x = List::Util::min $self->{w}, $x - $self->{view_x};
757 $y = List::Util::min $self->{h}, $y - $self->{view_y};
758
759 $self->SUPER::coord2global ($x, $y)
786} 760}
787 761
788sub find_widget { 762sub find_widget {
789 my ($self, $x, $y) = @_; 763 my ($self, $x, $y) = @_;
790 764
… …
835 $self->add ($self->{slider}); 809 $self->add ($self->{slider});
836 810
837 $self 811 $self
838} 812}
839 813
840#TODO# update range on size_allocate depeneing on child 814#TODO# update range on size_allocate depending on child
841# update viewport offset on scroll 815# update viewport offset on scroll
842 816
843############################################################################# 817#############################################################################
844 818
845package CFClient::UI::Frame; 819package CFClient::UI::Frame;
… …
849use CFClient::OpenGL; 823use CFClient::OpenGL;
850 824
851sub new { 825sub new {
852 my $class = shift; 826 my $class = shift;
853 827
854 my $self = $class->SUPER::new ( 828 $class->SUPER::new (
855 bg => [1, 1, 1, 1], 829 bg => undef,
856 border_bg => [1, 1, 1, 1],
857 border => 0.8,
858 @_ 830 @_,
859 ); 831 )
860
861 $self
862} 832}
863 833
864sub _draw { 834sub _draw {
865 my ($self) = @_; 835 my ($self) = @_;
866 836
867 my ($w, $h) = ($self->{w}, $self->{h}); 837 if ($self->{bg}) {
838 my ($w, $h) = @$self{qw(w h)};
868 839
869 glEnable GL_BLEND; 840 glEnable GL_BLEND;
870 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
871 glEnable GL_TEXTURE_2D; 842 glColor @{ $self->{bg} };
872 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
873 843
874# glBegin GL_QUADS; 844 glBegin GL_QUADS;
875# glColor 0, 0, 0, 0;
876# glVertex 0 , 0; 845 glVertex 0 , 0;
877# glVertex 0 , $h; 846 glVertex 0 , $h;
878# glVertex $w, $h; 847 glVertex $w, $h;
879# glVertex $w, 0; 848 glVertex $w, 0;
880# glEnd; 849 glEnd;
881 850
882
883 $self->child->draw;
884 glDisable GL_BLEND; 851 glDisable GL_BLEND;
885 glDisable GL_TEXTURE_2D; 852 }
853
854 $self->SUPER::_draw;
886} 855}
887 856
888############################################################################# 857#############################################################################
889 858
890package CFClient::UI::FancyFrame; 859package CFClient::UI::FancyFrame;
… …
904 873
905 my $self = $class->SUPER::new ( 874 my $self = $class->SUPER::new (
906 bg => [1, 1, 1, 1], 875 bg => [1, 1, 1, 1],
907 border_bg => [1, 1, 1, 1], 876 border_bg => [1, 1, 1, 1],
908 border => 0.6, 877 border => 0.6,
878 toplevel => 1,
909 can_events => 1, 879 can_events => 1,
910 @_ 880 @_
911 ); 881 );
912 882
913 $self->{title} &&= new CFClient::UI::Label 883 $self->{title} &&= new CFClient::UI::Label
… …
938 my ($self, $w, $h) = @_; 908 my ($self, $w, $h) = @_;
939 909
940 $h -= List::Util::max 0, $self->border * 2; 910 $h -= List::Util::max 0, $self->border * 2;
941 $w -= List::Util::max 0, $self->border * 2; 911 $w -= List::Util::max 0, $self->border * 2;
942 912
943 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
944 if $self->{title}; 914 if $self->{title};
945 915
946 $self->child->configure ($self->border, $self->border, $w, $h); 916 $self->child->configure ($self->border, $self->border, $w, $h);
947} 917}
948 918
… …
1006 my ($self) = @_; 976 my ($self) = @_;
1007 977
1008 my ($w, $h ) = ($self->{w}, $self->{h}); 978 my ($w, $h ) = ($self->{w}, $self->{h});
1009 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
1010 980
1011 glEnable GL_BLEND;
1012 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1013 glEnable GL_TEXTURE_2D; 981 glEnable GL_TEXTURE_2D;
1014 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1015 983
1016 my $border = $self->border; 984 my $border = $self->border;
1017 985
1018 glColor @{ $self->{border_bg} }; 986 glColor @{ $self->{border_bg} };
1019 $tex[1]->draw_quad (0, 0, $w, $border); 987 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
1020 $tex[3]->draw_quad (0, $border, $border, $ch); 988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
1021 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1022 $tex[4]->draw_quad (0, $h - $border, $w, $border); 990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
1023 991
1024 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1025 my $bg = $tex[0]; 993 my $bg = $tex[0];
1026 994
1027 # TODO: repeat texture not scale 995 # TODO: repeat texture not scale
… …
1031 glColor @{ $self->{bg} }; 999 glColor @{ $self->{bg} };
1032 1000
1033 $bg->{s} = $rep_x; 1001 $bg->{s} = $rep_x;
1034 $bg->{t} = $rep_y; 1002 $bg->{t} = $rep_y;
1035 $bg->{wrap_mode} = 1; 1003 $bg->{wrap_mode} = 1;
1036 $bg->draw_quad ($border, $border, $cw, $ch); 1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 }
1037 1006
1038 glDisable GL_TEXTURE_2D; 1007 glDisable GL_TEXTURE_2D;
1039 glDisable GL_BLEND;
1040 }
1041 1008
1042 $self->{title}->draw if $self->{title}; 1009 $self->{title}->draw if $self->{title};
1043 1010
1044 $self->child->draw; 1011 $self->child->draw;
1045} 1012}
… …
1272} 1239}
1273 1240
1274sub size_allocate { 1241sub size_allocate {
1275 my ($self, $w, $h) = @_; 1242 my ($self, $w, $h) = @_;
1276 1243
1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1277 my $children = $self->{children}; 1246 my $children = $self->{children};
1278 1247
1279 my @h = map $_->{req_h}, @$children; 1248 my @h = map $_->{req_h}, @$children;
1280 1249
1281 my $req_h = List::Util::sum @h; 1250 my $req_h = List::Util::sum @h;
… …
1310 1279
1311############################################################################# 1280#############################################################################
1312 1281
1313package CFClient::UI::Label; 1282package CFClient::UI::Label;
1314 1283
1315our @ISA = CFClient::UI::Base::; 1284our @ISA = CFClient::UI::DrawBG::;
1316 1285
1317use CFClient::OpenGL; 1286use CFClient::OpenGL;
1318 1287
1319sub new { 1288sub new {
1320 my ($class, %arg) = @_; 1289 my ($class, %arg) = @_;
1321 1290
1322 my $self = $class->SUPER::new ( 1291 my $self = $class->SUPER::new (
1323 fg => [1, 1, 1], 1292 fg => [1, 1, 1],
1293 #bg => none
1294 #active_bg => none
1324 #font => default_font 1295 #font => default_font
1296 #text => initial text
1297 #markup => initial narkup
1298 #max_w => maximum pixel width
1299 ellipsise => 3, # end
1300 layout => (new CFClient::Layout),
1325 fontsize => 1, 1301 fontsize => 1,
1326 text => "",
1327 align => -1, 1302 align => -1,
1328 valign => -1, 1303 valign => -1,
1329 padding => 2, 1304 padding => 2,
1330 layout => new CFClient::Layout,
1331 can_events => 0, 1305 can_events => 0,
1332 %arg 1306 %arg
1333 ); 1307 );
1334 1308
1335 if (exists $self->{template}) { 1309 if (exists $self->{template}) {
1336 my $layout = new CFClient::Layout; 1310 my $layout = new CFClient::Layout;
1337 $layout->set_text (delete $self->{template}); 1311 $layout->set_text (delete $self->{template});
1338 $self->{template} = $layout; 1312 $self->{template} = $layout;
1339 } 1313 }
1340 1314
1341 $self->set_text (delete $self->{text}) if exists $self->{text}; 1315 if (exists $self->{markup}) {
1342 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1316 $self->set_markup (delete $self->{markup});
1317 } else {
1318 $self->set_text (delete $self->{text});
1319 }
1343 1320
1344 $self 1321 $self
1345} 1322}
1346 1323
1347sub escape { 1324sub escape($) {
1348 local $_ = $_[1]; 1325 local $_ = $_[0];
1349 1326
1350 s/&/&amp;/g; 1327 s/&/&amp;/g;
1351 s/>/&gt;/g; 1328 s/>/&gt;/g;
1352 s/</&lt;/g; 1329 s/</&lt;/g;
1353 1330
1354 $_[1] 1331 $_
1355} 1332}
1356 1333
1357sub update { 1334sub update {
1358 my ($self) = @_; 1335 my ($self) = @_;
1359 1336
… …
1365 my ($self, $text) = @_; 1342 my ($self, $text) = @_;
1366 1343
1367 return if $self->{text} eq "T$text"; 1344 return if $self->{text} eq "T$text";
1368 $self->{text} = "T$text"; 1345 $self->{text} = "T$text";
1369 1346
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1348 $self->{layout}->set_text ($text);
1371 1349
1372 delete $self->{texture};
1373 $self->update; 1350 $self->update;
1374 $self->check_size; 1351 $self->check_size;
1375} 1352}
1376 1353
1377sub set_markup { 1354sub set_markup {
1378 my ($self, $markup) = @_; 1355 my ($self, $markup) = @_;
1379 1356
1380 return if $self->{text} eq "M$markup"; 1357 return if $self->{text} eq "M$markup";
1381 $self->{text} = "M$markup"; 1358 $self->{text} = "M$markup";
1382 1359
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361
1362 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1383 $self->{layout}->set_markup ($markup); 1363 $self->{layout}->set_markup ($markup);
1384 1364
1385 delete $self->{texture};
1386 $self->update; 1365 $self->update;
1387 $self->check_size; 1366 $self->check_size;
1388} 1367}
1389 1368
1390sub size_request { 1369sub size_request {
1391 my ($self) = @_; 1370 my ($self) = @_;
1392 1371
1393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1372 $self->{layout}->set_font ($self->{font}) if $self->{font};
1394 $self->{layout}->set_width ($self->{max_w} || -1); 1373 $self->{layout}->set_width ($self->{max_w} || -1);
1374 $self->{layout}->set_ellipsise ($self->{ellipsise});
1375 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1396 1377
1397 my ($w, $h) = $self->{layout}->size; 1378 my ($w, $h) = $self->{layout}->size;
1398 1379
1399 if (exists $self->{template}) { 1380 if (exists $self->{template}) {
… …
1429} 1410}
1430 1411
1431sub _draw { 1412sub _draw {
1432 my ($self) = @_; 1413 my ($self) = @_;
1433 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1434 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}});
1435 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1436 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1437 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424
1438 new_from_layout CFClient::Texture $self->{layout} 1425 my $tex = new_from_layout CFClient::Texture $self->{layout};
1426
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1429 : ($self->{w} - $tex->{w}) * 0.5);
1430
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1433 : ($self->{h} - $tex->{h}) * 0.5);
1434
1435 $tex
1439 }; 1436 };
1440 1437
1441 glEnable GL_BLEND;
1442 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1443 glEnable GL_TEXTURE_2D; 1438 glEnable GL_TEXTURE_2D;
1444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1445 1440
1441 if ($tex->{format} == GL_ALPHA) {
1446 glColor @{$self->{fg}}; 1442 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}); 1443 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1444 } else {
1445 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1446 }
1461 1447
1462 glDisable GL_TEXTURE_2D; 1448 glDisable GL_TEXTURE_2D;
1463 glDisable GL_BLEND;
1464} 1449}
1465 1450
1466############################################################################# 1451#############################################################################
1467 1452
1468package CFClient::UI::EntryBase; 1453package CFClient::UI::EntryBase;
… …
1503 $self->{layout}->set_text ("$text "); 1488 $self->{layout}->set_text ("$text ");
1504 1489
1505 $self->emit (changed => $self->{text}); 1490 $self->emit (changed => $self->{text});
1506} 1491}
1507 1492
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 { 1493sub set_text {
1527 my ($self, $text) = @_; 1494 my ($self, $text) = @_;
1528 1495
1529 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1530 $self->_set_text ($text); 1497 $self->_set_text ($text);
1531 $self->update; 1498 $self->update;
1499 $self->check_size;
1500}
1501
1502sub get_text {
1503 $_[0]{text}
1504}
1505
1506sub size_request {
1507 my ($self) = @_;
1508
1509 my ($w, $h) = $self->SUPER::size_request;
1510
1511 ($w + 1, $h) # add 1 for cursor
1512}
1513
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1532} 1518}
1533 1519
1534sub key_down { 1520sub key_down {
1535 my ($self, $ev) = @_; 1521 my ($self, $ev) = @_;
1536 1522
… …
1538 my $sym = $ev->{sym}; 1524 my $sym = $ev->{sym};
1539 my $uni = $ev->{unicode}; 1525 my $uni = $ev->{unicode};
1540 1526
1541 my $text = $self->get_text; 1527 my $text = $self->get_text;
1542 1528
1543 if ($sym == 8) { 1529 if ($uni == 8) {
1544 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1530 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1545 } elsif ($sym == 127) { 1531 } elsif ($uni == 127) {
1546 substr $text, $self->{cursor}, 1, ""; 1532 substr $text, $self->{cursor}, 1, "";
1547 } elsif ($sym == CFClient::SDLK_LEFT) { 1533 } elsif ($sym == CFClient::SDLK_LEFT) {
1548 --$self->{cursor} if $self->{cursor}; 1534 --$self->{cursor} if $self->{cursor};
1549 } elsif ($sym == CFClient::SDLK_RIGHT) { 1535 } elsif ($sym == CFClient::SDLK_RIGHT) {
1550 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1536 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1551 } elsif ($sym == CFClient::SDLK_HOME) { 1537 } elsif ($sym == CFClient::SDLK_HOME) {
1552 $self->{cursor} = 0; 1538 $self->{cursor} = 0;
1553 } elsif ($sym == CFClient::SDLK_END) { 1539 } elsif ($sym == CFClient::SDLK_END) {
1554 $self->{cursor} = length $text; 1540 $self->{cursor} = length $text;
1555 } elsif ($sym == 27) { 1541 } elsif ($uni == 27) {
1556 $self->emit ('escape'); 1542 $self->emit ('escape');
1557 } elsif ($uni) { 1543 } elsif ($uni) {
1558 substr $text, $self->{cursor}++, 0, chr $uni; 1544 substr $text, $self->{cursor}++, 0, chr $uni;
1559 } 1545 }
1560 1546
1561 $self->_set_text ($text); 1547 $self->_set_text ($text);
1562 $self->update; 1548 $self->update;
1549 $self->check_size;
1563} 1550}
1564 1551
1565sub focus_in { 1552sub focus_in {
1566 my ($self) = @_; 1553 my ($self) = @_;
1567 1554
… …
1696 my $class = shift; 1683 my $class = shift;
1697 1684
1698 $class->SUPER::new ( 1685 $class->SUPER::new (
1699 padding => 4, 1686 padding => 4,
1700 fg => [1, 1, 1], 1687 fg => [1, 1, 1],
1701 bg => [1, 1, 1, 0.2],
1702 active_fg => [0, 0, 1], 1688 active_fg => [0, 0, 1],
1703 can_hover => 1, 1689 can_hover => 1,
1704 align => 0, 1690 align => 0,
1705 valign => 0, 1691 valign => 0,
1706 can_events => 1, 1692 can_events => 1,
… …
1724 1710
1725 if ($GRAB == $self) { 1711 if ($GRAB == $self) {
1726 $self->{fg} = $self->{active_fg}; 1712 $self->{fg} = $self->{active_fg};
1727 } 1713 }
1728 1714
1729 glEnable GL_BLEND;
1730 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1731 glEnable GL_TEXTURE_2D; 1715 glEnable GL_TEXTURE_2D;
1732 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1733 glColor 0, 0, 0, 1; 1717 glColor 0, 0, 0, 1;
1734 1718
1735 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1719 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1736 1720
1737 glDisable GL_TEXTURE_2D; 1721 glDisable GL_TEXTURE_2D;
1738 glDisable GL_BLEND;
1739 1722
1740 $self->SUPER::_draw; 1723 $self->SUPER::_draw;
1741} 1724}
1742 1725
1743############################################################################# 1726#############################################################################
… …
1757 1740
1758 $class->SUPER::new ( 1741 $class->SUPER::new (
1759 padding => 2, 1742 padding => 2,
1760 fg => [1, 1, 1], 1743 fg => [1, 1, 1],
1761 active_fg => [1, 1, 0], 1744 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5],
1762 state => 0, 1747 state => 0,
1763 can_hover => 1, 1748 can_hover => 1,
1764 @_ 1749 @_
1765 ) 1750 )
1766} 1751}
… …
1790 1775
1791 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1776 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1792 1777
1793 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1794 1779
1795 glEnable GL_BLEND; 1780 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781
1796 glEnable GL_TEXTURE_2D; 1782 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); 1783 $tex->draw_quad_alpha (0, 0, $s, $s);
1802
1803 glDisable GL_TEXTURE_2D; 1784 glDisable GL_TEXTURE_2D;
1804 glDisable GL_BLEND;
1805} 1785}
1806 1786
1807############################################################################# 1787#############################################################################
1808 1788
1809package CFClient::UI::Image; 1789package CFClient::UI::Image;
… …
1852 glTranslate 0, -$self->{w}, 0; 1832 glTranslate 0, -$self->{w}, 0;
1853 1833
1854 ($w, $h) = ($h, $w); 1834 ($w, $h) = ($h, $w);
1855 } 1835 }
1856 1836
1857 glEnable GL_BLEND;
1858 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1859 glEnable GL_TEXTURE_2D; 1837 glEnable GL_TEXTURE_2D;
1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861 1839
1862 $tex->draw_quad (0, 0, $w, $h); 1840 $tex->draw_quad_alpha (0, 0, $w, $h);
1863 1841
1864 glDisable GL_BLEND;
1865 glDisable GL_TEXTURE_2D; 1842 glDisable GL_TEXTURE_2D;
1866} 1843}
1867 1844
1868############################################################################# 1845#############################################################################
1869 1846
… …
2058 qw(s1_slider.png s1_slider_bg.png); 2035 qw(s1_slider.png s1_slider_bg.png);
2059 2036
2060sub new { 2037sub new {
2061 my $class = shift; 2038 my $class = shift;
2062 2039
2063 # range [value, low, high, page] 2040 # range [value, low, high, page, unit]
2064 2041
2065 # TODO: 0-width page 2042 # TODO: 0-width page
2066 # TODO: req_w/h are wrong with vertical 2043 # TODO: req_w/h are wrong with vertical
2067 # TODO: calculations are off 2044 # TODO: calculations are off
2068 my $self = $class->SUPER::new ( 2045 my $self = $class->SUPER::new (
2069 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
2070 active_fg => [0, 0, 0], 2047 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
2071 range => [0, 0, 100, 10], 2050 range => [0, 0, 100, 10],
2072 req_w => $::WIDTH / 80, 2051 req_w => $::WIDTH / 80,
2073 req_h => $::WIDTH / 80, 2052 req_h => $::WIDTH / 80,
2074 vertical => 0, 2053 vertical => 0,
2075 can_hover => 1, 2054 can_hover => 1,
2076 inner_pad => 5, 2055 inner_pad => .05,
2077 @_ 2056 @_
2078 ); 2057 );
2079 2058
2059 $self->set_value ($self->{range}[0]);
2060 $self->update;
2061
2080 $self 2062 $self
2063}
2064
2065sub set_value {
2066 my ($self, $value) = @_;
2067
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069
2070 $hi = $lo + 1 if $hi <= $lo;
2071
2072 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi;
2074
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit;
2077
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081
2082 if ($value != $old_value) {
2083 $self->emit (changed => $value);
2084 $self->update;
2085 }
2081} 2086}
2082 2087
2083sub size_request { 2088sub size_request {
2084 my ($self) = @_; 2089 my ($self) = @_;
2085 2090
… …
2098 2103
2099sub mouse_motion { 2104sub mouse_motion {
2100 my ($self, $ev, $x, $y) = @_; 2105 my ($self, $ev, $x, $y) = @_;
2101 2106
2102 if ($GRAB == $self) { 2107 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109
2110 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2113
2114 $self->set_value ($x * ($hi - $lo) + $lo);
2115 }
2116}
2117
2118sub update {
2119 my ($self) = @_;
2120
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]);
2123
2103 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2124 my ($value, $lo, $hi, $page) = @{$self->{range}};
2104 2125
2105 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2126 my $inner_w = 1 - 2 * $self->{inner_pad};
2106 2127
2107 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2108 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2109 2129
2110 $x -= $inner_pad_px; # substract the padding 2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2111 $x = $x * ($hi - $lo) / $inner_w + $lo; 2131 $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 2132
2116 $self->emit (changed => $x); 2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2117 $self->update; 2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value;
2139 $self->{knob_w} = $page;
2118 } 2140 });
2119}
2120 2141
2121# the inner_* stuff is for generating a padding for the slider handle, 2142 $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} 2143}
2128 2144
2129sub _draw { 2145sub _draw {
2130 my ($self) = @_; 2146 my ($self) = @_;
2131 2147
2132 $self->SUPER::_draw (); 2148 $self->SUPER::_draw ();
2133 2149
2134 my ($w, $h) = @$self{qw(w h)}; 2150 glScale $self->{w}, $self->{h};
2135 2151
2136 if ($self->{vertical}) { 2152 if ($self->{vertical}) {
2137 # draw a vertical slider like a rotated horizontal slider 2153 # draw a vertical slider like a rotated horizontal slider
2138 2154
2155 glTranslate 1, 0, 0;
2139 glRotate 90, 0, 0, 1; 2156 glRotate 90, 0, 0, 1;
2140 glTranslate 0, -$self->{w}, 0;
2141
2142 ($w, $h) = ($h, $w);
2143 } 2157 }
2144 2158
2145 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2159 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2146 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2160 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2147 2161
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; 2162 glEnable GL_TEXTURE_2D;
2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2163 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170 2164
2171 # draw background 2165 # draw background
2172 $tex[1]->draw_quad (0, 0, $w, $h); 2166 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2173 2167
2174 # draw handle 2168 # draw handle
2175 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2176 2170
2177 glDisable GL_BLEND;
2178 glDisable GL_TEXTURE_2D; 2171 glDisable GL_TEXTURE_2D;
2179} 2172}
2180 2173
2181############################################################################# 2174#############################################################################
2182 2175
… …
2193 fontsize => 1, 2186 fontsize => 1,
2194 can_events => 0, 2187 can_events => 0,
2195 #font => default_font 2188 #font => default_font
2196 @_, 2189 @_,
2197 2190
2198 layout => (new CFClient::Layout), 2191 layout => (new CFClient::Layout 1),
2199 par => [], 2192 par => [],
2200 height => 0, 2193 height => 0,
2201 children => [ 2194 children => [
2202 (new CFClient::UI::Empty expand => 1), 2195 (new CFClient::UI::Empty expand => 1),
2203 (new CFClient::UI::Slider vertical => 1), 2196 (new CFClient::UI::Slider vertical => 1),
… …
2221 2214
2222 my $layout = $self->{layout}; 2215 my $layout = $self->{layout};
2223 2216
2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225 $layout->set_width ($self->{children}[0]{w}); 2218 $layout->set_width ($self->{children}[0]{w});
2226 $layout->set_text ($text); 2219 $layout->set_markup ($text);
2227 2220
2228 ($layout->size)[1] 2221 ($layout->size)[1]
2229} 2222}
2230 2223
2231sub reflow { 2224sub reflow {
… …
2269 2262
2270 return unless $self->{h} > 0; 2263 return unless $self->{h} > 0;
2271 2264
2272 delete $self->{texture}; 2265 delete $self->{texture};
2273 2266
2274 $ROOT->on_refresh ($self, sub { 2267 $ROOT->on_post_alloc ($self, sub {
2275 if (delete $self->{need_reflow}) { 2268 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2269 my $height = 0;
2277 2270
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2271 $height += $_->[0] = $self->text_height ($_->[2])
2279 for @{$self->{par}}; 2272 for @{$self->{par}};
… …
2284 2277
2285 delete $self->{texture}; 2278 delete $self->{texture};
2286 } 2279 }
2287 2280
2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2289 glClearColor 0, 0, 0, 0; 2282 glClearColor 0.5, 0.5, 0.5, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2283 glClear GL_COLOR_BUFFER_BIT;
2291 2284
2292 glEnable GL_BLEND;
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D; 2285 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 2287
2297 my $top = int $self->{children}[1]{range}[0]; 2288 my $top = int $self->{children}[1]{range}[0];
2298 2289
… …
2307 2298
2308 for my $par (@{$self->{par}}) { 2299 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2300 my $h = $par->[0];
2310 2301
2311 if ($y0 < $y + $h && $y < $y1) { 2302 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] });
2312 $layout->set_text ($par->[2]); 2304 $layout->set_markup ($par->[2]);
2313 2305
2314 glColor @{ $par->[1] };
2315 my ($W, $H) = $layout->size; 2306 my ($W, $H) = $layout->size;
2316 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2317 } 2308 }
2318 2309
2319 $y += $h; 2310 $y += $h;
2320 } 2311 }
2321 2312
2322 glDisable GL_TEXTURE_2D; 2313 glDisable GL_TEXTURE_2D;
2323 glDisable GL_BLEND;
2324 }; 2314 };
2325 }); 2315 });
2326} 2316}
2327 2317
2328sub _draw { 2318sub _draw {
2329 my ($self) = @_; 2319 my ($self) = @_;
2330 2320
2331 glEnable GL_BLEND;
2332 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2333 glEnable GL_TEXTURE_2D; 2321 glEnable GL_TEXTURE_2D;
2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1; 2323 glColor 1, 1, 1, 1;
2336 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2324 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2337 glDisable GL_TEXTURE_2D; 2325 glDisable GL_TEXTURE_2D;
2338 glDisable GL_BLEND;
2339 2326
2340 $self->{children}[1]->draw; 2327 $self->{children}[1]->draw;
2341 2328
2342} 2329}
2343 2330
… …
2437 @_, 2424 @_,
2438 can_events => 0, 2425 can_events => 0,
2439 ) 2426 )
2440} 2427}
2441 2428
2442sub set_markup { 2429sub set_tooltip_from {
2443 my ($self, $text) = @_; 2430 my ($self, $widget) = @_;
2444 2431
2445 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2432 $self->add (new CFClient::UI::Label
2446 $self->{label}->set_markup ($text); 2433 markup => $widget->{tooltip},
2447 $self->add ($self->{label}); 2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8,
2436 fg => [0, 0, 0, 1],
2437 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP),
2439 );
2448} 2440}
2449 2441
2450sub size_request { 2442sub size_request {
2451 my ($self) = @_; 2443 my ($self) = @_;
2452
2453 $self->child->set_max_size ($::WIDTH * 0.3);
2454 2444
2455 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2445 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2456 2446
2457 ($w + 4, $h + 4) 2447 ($w + 4, $h + 4)
2458} 2448}
… …
2464} 2454}
2465 2455
2466sub _draw { 2456sub _draw {
2467 my ($self) = @_; 2457 my ($self) = @_;
2468 2458
2469 glPushMatrix;
2470 glTranslate 0.375, 0.375; 2459 glTranslate 0.375, 0.375;
2471 2460
2472 my ($w, $h) = @$self{qw(w h)}; 2461 my ($w, $h) = @$self{qw(w h)};
2473 2462
2474 glColor 1, 0.8, 0.4; 2463 glColor 1, 0.8, 0.4;
… …
2485 glVertex 0 , $h; 2474 glVertex 0 , $h;
2486 glVertex $w, $h; 2475 glVertex $w, $h;
2487 glVertex $w, 0; 2476 glVertex $w, 0;
2488 glEnd; 2477 glEnd;
2489 2478
2490 glPopMatrix; 2479 glTranslate 2 - 0.375, 2 - 0.375;
2491
2492 glTranslate 2, 2;
2493 $self->SUPER::_draw; 2480 $self->SUPER::_draw;
2494} 2481}
2495 2482
2496############################################################################# 2483#############################################################################
2497 2484
… …
2520 return unless $::CONN;#d# manage and cache textures differently 2507 return unless $::CONN;#d# manage and cache textures differently
2521 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2522 2509
2523 # TODO animation 2510 # TODO animation
2524 if ($tex) { 2511 if ($tex) {
2525 glEnable GL_BLEND;
2526 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2527 glEnable GL_TEXTURE_2D; 2512 glEnable GL_TEXTURE_2D;
2528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2529 glColor 1, 1, 1, 1; 2514 glColor 1, 1, 1, 1;
2530 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2531 glDisable GL_TEXTURE_2D; 2516 glDisable GL_TEXTURE_2D;
2532 glDisable GL_BLEND;
2533 } 2517 }
2534} 2518}
2535 2519
2536############################################################################# 2520#############################################################################
2537 2521
2538package CFClient::UI::InventoryItem; 2522package CFClient::UI::InventoryItem;
2539 2523
2540our @ISA = CFClient::UI::HBox::; 2524our @ISA = CFClient::UI::HBox::;
2525
2526sub _item_to_desc {
2527 my ($item) = @_;
2528
2529 my $desc =
2530 $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2541 2551
2542sub new { 2552sub new {
2543 my $class = shift; 2553 my $class = shift;
2544 2554
2545 my %args = @_; 2555 my %args = @_;
2546 2556
2547 my $item = $args{item}; 2557 my $item = delete $args{item};
2548 2558
2549 my $desc = $item->{nrof} < 2 2559 my $desc = _item_to_desc ($item);
2550 ? $item->{name}
2551 : "$item->{nrof} $item->{name_pl}";
2552
2553 2560
2554 my $self = $class->SUPER::new ( 2561 my $self = $class->SUPER::new (
2555 can_hover => 1, 2562 can_hover => 1,
2556 can_events => 1, 2563 can_events => 1,
2557 tooltip => (CFClient::UI::Label->escape ($desc) 2564 tooltip => ((CFClient::UI::Label::escape $desc)
2558 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2559 connect_button_down => sub { 2566 connect_button_down => sub {
2560 my ($self, $ev, $x, $y) = @_; 2567 my ($self, $ev, $x, $y) = @_;
2561 2568
2562 # todo: maybe put examine on 1? but should just be a tooltip :( 2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2563 if ($ev->{button} == 1) { 2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2564 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2577 $::CONN->send ("move $targ $item->{tag} 0");
2565 } elsif ($ev->{button} == 2) { 2578 } elsif ($ev->{button} == 2) {
2566 $::CONN->send ("apply $item->{tag}"); 2579 $::CONN->send ("apply $item->{tag}");
2567 } elsif ($ev->{button} == 3) { 2580 } elsif ($ev->{button} == 3) {
2568 CFClient::UI::Menu->new ( 2581 my @menu_items = (
2569 items => [
2570 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2571 [ 2586 [
2572 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2573 sub { $::CONN->send ("lock $item->{tag}") }, 2588 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 ], 2589 ],
2579 )->popup ($ev); 2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2580 } 2593 }
2581 2594
2582 1 2595 1
2583 }, 2596 },
2584 %args 2597 %args
2585 ); 2598 );
2599
2600
2586 $self->add(new CFClient::UI::Face 2601 $self->add (new CFClient::UI::Face
2587 can_events => 0, 2602 can_events => 0,
2588 face => $item->{face}, 2603 face => $item->{face},
2589 anim => $item->{anim}, 2604 anim => $item->{anim},
2590 animspeed => $item->{animspeed}); 2605 animspeed => $item->{animspeed},
2591 $self->add(new CFClient::UI::Label 2606 );
2592 can_events => 0, 2607
2593 text => $desc); 2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610 $self->{item} = $item;
2611
2612 $self->update_item;
2594 2613
2595 $self 2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2596} 2623}
2597 2624
2598############################################################################# 2625#############################################################################
2599 2626
2600package CFClient::UI::Inventory; 2627package CFClient::UI::Inventory;
… …
2616 my ($self, $items) = @_; 2643 my ($self, $items) = @_;
2617 2644
2618 $self->{scrolled}->clear; 2645 $self->{scrolled}->clear;
2619 return unless $items; 2646 return unless $items;
2620 2647
2621 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2648 my @items = sort {
2649 ($a->{type} <=> $b->{type})
2650 or ($a->{name} cmp $b->{name})
2651 } @$items;
2622 2652
2623 $self->{real_items} = \@items; 2653 $self->{real_items} = \@items;
2624 2654
2625 for my $item (@items) { 2655 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); 2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657 $item->update_item ();
2631 } 2658 }
2659
2660 $self->{scrolled}->add (@items);
2632 2661
2633# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2634} 2663}
2635 2664
2636sub size_request { 2665sub size_request {
… …
2710 } 2739 }
2711} 2740}
2712 2741
2713############################################################################# 2742#############################################################################
2714 2743
2744package CFClient::UI::Statusbox;
2745
2746our @ISA = CFClient::UI::VBox::;
2747
2748sub new {
2749 my $class = shift;
2750
2751 $class->SUPER::new (
2752 fontsize => 0.8,
2753 @_,
2754 )
2755}
2756
2757sub reorder {
2758 my ($self) = @_;
2759 my $NOW = time;
2760
2761 while (my ($k, $v) = each %{ $self->{item} }) {
2762 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2763 }
2764
2765 my @widgets;
2766
2767 my @items = sort {
2768 $a->{pri} <=> $b->{pri}
2769 or $b->{id} <=> $a->{id}
2770 } values %{ $self->{item} };
2771
2772 my $count = 10 + 1;
2773 for my $item (@items) {
2774 last unless --$count;
2775
2776 push @widgets, $item->{label} ||= do {
2777 # TODO: doesn't handle markup well (read as: at all)
2778 my $short = $item->{count} > 1
2779 ? "<b>$item->{count} ×</b> $item->{text}"
2780 : $item->{text};
2781
2782 for ($short) {
2783 s/^\s+//;
2784 s/\s+/ /g;
2785 }
2786
2787 new CFClient::UI::Label
2788 markup => $short,
2789 tooltip => $item->{tooltip},
2790 tooltip_font => $::FONT_PROP,
2791 tooltip_width => 0.67,
2792 fontsize => $item->{fontsize} || $self->{fontsize},
2793 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg},
2795 can_events => 1,
2796 can_hover => 1
2797 };
2798 }
2799
2800 $self->clear;
2801 $self->SUPER::add (reverse @widgets);
2802}
2803
2804sub add {
2805 my ($self, $text, %arg) = @_;
2806
2807 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//;
2809
2810 my $timeout = time + ((delete $arg{timeout}) || 60);
2811
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813
2814 if (my $item = $self->{item}{$group}) {
2815 if ($item->{text} eq $text) {
2816 $item->{count}++;
2817 } else {
2818 $item->{count} = 1;
2819 $item->{text} = $item->{tooltip} = $text;
2820 }
2821 $item->{id} = ++$self->{id};
2822 $item->{timeout} = $timeout;
2823 delete $item->{label};
2824 } else {
2825 $self->{item}{$group} = {
2826 id => ++$self->{id},
2827 text => $text,
2828 timeout => $timeout,
2829 tooltip => $text,
2830 fg => [0.8, 0.8, 0.8, 0.8],
2831 pri => 0,
2832 count => 1,
2833 %arg,
2834 };
2835 }
2836
2837 $self->reorder;
2838}
2839
2840sub reconfigure {
2841 my ($self) = @_;
2842
2843 delete $_->{label}
2844 for values %{ $self->{item} || {} };
2845
2846 $self->reorder;
2847 $self->SUPER::reconfigure;
2848}
2849
2850#############################################################################
2851
2715package CFClient::UI::Root; 2852package CFClient::UI::Root;
2716 2853
2717our @ISA = CFClient::UI::Container::; 2854our @ISA = CFClient::UI::Container::;
2718 2855
2719use CFClient::OpenGL; 2856use CFClient::OpenGL;
2720 2857
2858sub new {
2859 my $class = shift;
2860
2861 $class->SUPER::new (
2862 @_,
2863 )
2864}
2865
2866sub configure {
2867 my ($self, $x, $y, $w, $h) = @_;
2868
2869 $self->{w} = $w;
2870 $self->{h} = $h;
2871}
2872
2721sub check_size { 2873sub check_size {
2722 my ($self) = @_; 2874 my ($self) = @_;
2723 2875
2724 $self->configure (0, 0, $self->{w}, $self->{h}); 2876 $self->size_allocate ($self->{w}, $self->{h})
2877 if $self->{w};
2725} 2878}
2726 2879
2727sub size_request { 2880sub size_request {
2728 my ($self) = @_; 2881 my ($self) = @_;
2729 2882
… …
2731} 2884}
2732 2885
2733sub size_allocate { 2886sub size_allocate {
2734 my ($self, $w, $h) = @_; 2887 my ($self, $w, $h) = @_;
2735 2888
2736 my $old_w = $self->{old_w}; 2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2737 my $old_h = $self->{old_h}; 2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2738 2891
2739 if ($old_w && $old_h) { 2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2740 for my $child ($self->children) { 2893 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 2894
2761 for my $child ($self->children) { 2895 for my $child ($self->children) {
2762 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2896 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2763 2897
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2899 if exists $child->{req_x};
2900
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2902 if exists $child->{req_y};
2903
2764 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2904 $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; 2905 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906
2766 $child->configure ($X, $Y, $W, $H); 2907 $child->configure ($X, $Y, $W, $H);
2767 } 2908 }
2768} 2909}
2769 2910
2770sub _topleft { 2911sub coord2local {
2771 my ($self, $x, $y) = @_; 2912 my ($self, $x, $y) = @_;
2772 2913
2773 ($x, $y) 2914 ($x, $y)
2774} 2915}
2775 2916
2917sub coord2global {
2918 my ($self, $x, $y) = @_;
2919
2920 ($x, $y)
2921}
2922
2776sub update { 2923sub update {
2777 my ($self) = @_; 2924 my ($self) = @_;
2778 2925
2779 $self->check_size; 2926 $self->check_size;
2780 ::refresh (); 2927 $::WANT_REFRESH++;
2781} 2928}
2782 2929
2783sub add { 2930sub add {
2784 my ($self, $child) = @_; 2931 my ($self, @children) = @_;
2785 2932
2933 for my $child (@children) {
2934 $child->{toplevel} = 1;
2935
2786 # integerize window positions 2936 # integerise window positions
2787 $child->{x} = int $child->{x}; 2937 $child->{x} = int $child->{x};
2788 $child->{y} = int $child->{y}; 2938 $child->{y} = int $child->{y};
2939 }
2789 2940
2790 $self->SUPER::add ($child); 2941 $self->SUPER::add (@children);
2791} 2942}
2792 2943
2793sub on_refresh { 2944sub on_refresh {
2794 my ($self, $id, $cb) = @_; 2945 my ($self, $id, $cb) = @_;
2795 2946
2796 $self->{refresh_hook}{$id} = $cb; 2947 $self->{refresh_hook}{$id} = $cb;
2797} 2948}
2798 2949
2950sub on_post_alloc {
2951 my ($self, $id, $cb) = @_;
2952
2953 $self->{post_alloc_hook}{$id} = $cb;
2954}
2955
2799sub draw { 2956sub draw {
2800 my ($self) = @_; 2957 my ($self) = @_;
2801 2958
2802 while (my $rcb = delete $self->{refresh_hook}) { 2959 while ($self->{refresh_hook}) {
2803 $_->() for values %$rcb; 2960 $_->()
2961 for values %{delete $self->{refresh_hook}};
2962 }
2963
2964 if ($self->{check_size}) {
2965 my @queue = ([], []);
2966
2967 for (;;) {
2968 if ($self->{check_size}) {
2969 # heuristic: check containers last
2970 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2971 for values %{delete $self->{check_size}}
2972 }
2973
2974 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2975
2976 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2977 ? @$widget{qw(user_w user_h)}
2978 : $widget->size_request;
2979
2980 if (delete $widget->{force_alloc}
2981 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2982 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2983
2984 $widget->{req_w} = $w;
2985 $widget->{req_h} = $h;
2986
2987 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2988
2989 $widget->{parent}->check_size
2990 if $widget->{parent};
2991 }
2992 }
2993 }
2994
2995 while ($self->{size_alloc}) {
2996 for (values %{delete $self->{size_alloc}}) {
2997 my ($widget, $w, $h) = @$_;
2998
2999 $w = 0 if $w < 0;
3000 $h = 0 if $h < 0;
3001
3002 $widget->{w} = $w;
3003 $widget->{h} = $h;
3004 $widget->size_allocate ($w, $h);
3005 $widget->emit (size_allocate => $w, $h);
3006 }
3007 }
3008
3009 while ($self->{post_alloc_hook}) {
3010 $_->()
3011 for values %{delete $self->{post_alloc_hook}};
2804 } 3012 }
2805 3013
2806 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3014 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2807 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2808 glClear GL_COLOR_BUFFER_BIT; 3016 glClear GL_COLOR_BUFFER_BIT;
… …
2819############################################################################# 3027#############################################################################
2820 3028
2821package CFClient::UI; 3029package CFClient::UI;
2822 3030
2823$ROOT = new CFClient::UI::Root; 3031$ROOT = new CFClient::UI::Root;
2824$TOOLTIP = new CFClient::UI::Tooltip; 3032$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2825 3033
28261 30341
2827 3035

Diff Legend

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