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

Diff Legend

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