ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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