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

Diff Legend

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