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.182 by root, Sun Apr 30 11:17:08 2006 UTC vs.
Revision 1.212 by elmex, Wed May 17 14:55:14 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 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155 }
156
157 $widget->reconfigure;
135 } 158 }
136} 159}
137 160
138############################################################################# 161#############################################################################
139 162
… …
158 if (/^connect_(.*)$/) { 181 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 182 $self->connect ($1 => delete $self->{$_});
160 } 183 }
161 } 184 }
162 185
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
163 $self 188 $self
164} 189}
165 190
166sub destroy { 191sub destroy {
167 my ($self) = @_; 192 my ($self) = @_;
… …
232 $self->{y} = $y; 257 $self->{y} = $y;
233 $self->update; 258 $self->update;
234 } 259 }
235 260
236 if ($self->{w} != $w || $self->{h} != $h) { 261 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 262 $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 } 263 }
244} 264}
245 265
246sub size_allocate { 266sub size_allocate {
247 # nothing to be done 267 # nothing to be done
248} 268}
249 269
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
250sub children { 277sub children {
251}
252
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $_->check_size;
261} 278}
262 279
263sub set_max_size { 280sub set_max_size {
264 my ($self, $w, $h) = @_; 281 my ($self, $w, $h) = @_;
265 282
266 delete $self->{max_w}; $self->{max_w} = $w if $w; 283 delete $self->{max_w}; $self->{max_w} = $w if $w;
267 delete $self->{max_h}; $self->{max_h} = $h if $h; 284 delete $self->{max_h}; $self->{max_h} = $h if $h;
268} 285}
269 286
270# return top left coordinates 287sub set_tooltip {
271sub _topleft {
272 my ($self, $x, $y) = @_; 288 my ($self, $tooltip) = @_;
273 289
274 $self->{parent} 290 $self->{tooltip} = $tooltip;
275 or Carp::confess "no parent widget in _topleft\n";#d#
276 291
277 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 292 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner};
294 CFClient::UI::check_tooltip;
295 }
278} 296}
279 297
280# translate global coordinates to local coordinate system 298# translate global coordinates to local coordinate system
281sub coord2local { 299sub coord2local {
282 my ($self, $x, $y) = @_; 300 my ($self, $x, $y) = @_;
283 301
284 my ($X, $Y) = $self->_topleft; 302 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285 ($x - $X, $y - $Y)
286} 303}
287 304
288# translate local coordinates to global coordinate system 305# translate local coordinates to global coordinate system
289sub coord2global { 306sub coord2global {
290 my ($self, $x, $y) = @_; 307 my ($self, $x, $y) = @_;
291 308
292 my ($X, $Y) = $self->_topleft; 309 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293 ($x + $X, $y + $Y)
294} 310}
295 311
296sub focus_in { 312sub focus_in {
297 my ($self) = @_; 313 my ($self) = @_;
298 314
… …
370 glVertex $self->{w}, 0; 386 glVertex $self->{w}, 0;
371 glVertex $self->{w}, $self->{h}; 387 glVertex $self->{w}, $self->{h};
372 glVertex 0 , $self->{h}; 388 glVertex 0 , $self->{h};
373 glEnd; 389 glEnd;
374 glPopMatrix; 390 glPopMatrix;
375 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 391 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
376 } 392 }
377} 393}
378 394
379sub _draw { 395sub _draw {
380 my ($self) = @_; 396 my ($self) = @_;
… …
396 412
397sub set_parent { 413sub set_parent {
398 my ($self, $parent) = @_; 414 my ($self, $parent) = @_;
399 415
400 Scalar::Util::weaken ($self->{parent} = $parent); 416 Scalar::Util::weaken ($self->{parent} = $parent);
417
418 # TODO: req_w _does_change after ->reconfigure
419 $self->check_size
420 unless exists $self->{req_w};
401} 421}
402 422
403sub check_size { 423sub check_size {
404 my ($self) = @_; 424 my ($self, $forced) = @_;
405 425
406 $self->{parent} 426 $self->{force_alloc} = 1 if $forced;
407 or return 1; 427 $CFClient::UI::ROOT->{check_size}{$self} = $self;
408
409 my ($w, $h) = $self->{user_w} && $self->{user_h}
410 ? @$self{qw(user_w user_h)}
411 : $self->size_request;
412
413 if ($w != $self->{req_w} || $h != $self->{req_h}) {
414 $self->{req_w} = $w;
415 $self->{req_h} = $h;
416
417 $self->{parent}->check_size
418 or $self->size_allocate (
419 (List::Util::max $self->{w}, $w),
420 (List::Util::max $self->{h}, $h),
421 );
422
423 1
424 } else {
425 0
426 }
427} 428}
428 429
429sub update { 430sub update {
430 my ($self) = @_; 431 my ($self) = @_;
431 432
… …
446} 447}
447 448
448sub DESTROY { 449sub DESTROY {
449 my ($self) = @_; 450 my ($self) = @_;
450 451
452 delete $WIDGET{$self+0};
451 #$self->deactivate; 453 #$self->deactivate;
452} 454}
453 455
454############################################################################# 456#############################################################################
455 457
… …
464 my $class = shift; 466 my $class = shift;
465 467
466 # range [value, low, high, page] 468 # range [value, low, high, page]
467 469
468 $class->SUPER::new ( 470 $class->SUPER::new (
469 bg => [0, 0, 0, 0.2], 471 #bg => [0, 0, 0, 0.2],
470 active_bg => [1, 1, 1, 0.5], 472 #active_bg => [1, 1, 1, 0.5],
471 @_ 473 @_
472 ) 474 )
473} 475}
474 476
475sub _draw { 477sub _draw {
476 my ($self) = @_; 478 my ($self) = @_;
477 479
480 my $color = $FOCUS == $self && $self->{active_bg}
481 ? $self->{active_bg}
482 : $self->{bg};
483
484 if ($color && (@$color < 4 || $color->[3])) {
478 my ($w, $h) = @$self{qw(w h)}; 485 my ($w, $h) = @$self{qw(w h)};
479 486
480 glEnable GL_BLEND; 487 glEnable GL_BLEND;
481 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 488 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
482 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 489 glColor @$color;
483 490
484 glBegin GL_QUADS; 491 glBegin GL_QUADS;
485 glVertex 0 , 0; 492 glVertex 0 , 0;
486 glVertex 0 , $h; 493 glVertex 0 , $h;
487 glVertex $w, $h; 494 glVertex $w, $h;
488 glVertex $w, 0; 495 glVertex $w, 0;
489 glEnd; 496 glEnd;
490 497
491 glDisable GL_BLEND; 498 glDisable GL_BLEND;
499 }
492} 500}
493 501
494############################################################################# 502#############################################################################
495 503
496package CFClient::UI::Empty; 504package CFClient::UI::Empty;
… …
528 536
529 $self 537 $self
530} 538}
531 539
532sub add { 540sub add {
533 my ($self, $child) = @_; 541 my ($self, @widgets) = @_;
534 542
535 $child->set_parent ($self); 543 $_->set_parent ($self)
544 for @widgets;
536 545
537 use sort 'stable'; 546 use sort 'stable';
538 547
539 $self->{children} = [ 548 $self->{children} = [
540 sort { $a->{z} <=> $b->{z} } 549 sort { $a->{z} <=> $b->{z} }
541 @{$self->{children}}, $child 550 @{$self->{children}}, @widgets
542 ]; 551 ];
543 552
544 $child->check_size; 553 $self->check_size (1);
545 $self->update; 554 $self->update;
546} 555}
547 556
548sub children { 557sub children {
549 @{ $_[0]{children} } 558 @{ $_[0]{children} }
… …
656} 665}
657 666
658sub update { 667sub update {
659 my ($self) = @_; 668 my ($self) = @_;
660 669
661 $ROOT->on_refresh ($self => sub { $self->render_child }); 670 $ROOT->on_post_alloc ($self => sub { $self->render_child });
662 $self->SUPER::update; 671 $self->SUPER::update;
663} 672}
664 673
665sub size_allocate { 674sub size_allocate {
666 my ($self, $w, $h) = @_; 675 my ($self, $w, $h) = @_;
… …
697 my ($w, $h) = ($self->w, $self->h); 706 my ($w, $h) = ($self->w, $self->h);
698 707
699 my $tex = $self->{texture} 708 my $tex = $self->{texture}
700 or return; 709 or return;
701 710
702 glEnable GL_BLEND;
703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704 glEnable GL_TEXTURE_2D; 711 glEnable GL_TEXTURE_2D;
705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1; 713 glColor 0, 0, 0, 1;
707 714
708 $tex->draw_quad (0, 0, $w, $h); 715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709 716
710 glDisable GL_BLEND;
711 glDisable GL_TEXTURE_2D; 717 glDisable GL_TEXTURE_2D;
712} 718}
713 719
714############################################################################# 720#############################################################################
715 721
… …
737 743
738 $self->{view_x} = int $x; 744 $self->{view_x} = int $x;
739 $self->{view_y} = int $y; 745 $self->{view_y} = int $y;
740 746
741 $self->update; 747 $self->update;
748}
749
750# hmm, this does not work for topleft of $self... but we should not ask for that
751sub coord2local {
752 my ($self, $x, $y) = @_;
753
754 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
755}
756
757sub coord2global {
758 my ($self, $x, $y) = @_;
759
760 $x = List::Util::min $self->{w}, $x - $self->{view_x};
761 $y = List::Util::min $self->{h}, $y - $self->{view_y};
762
763 $self->SUPER::coord2global ($x, $y)
764}
765
766sub find_widget {
767 my ($self, $x, $y) = @_;
768
769 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
770 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
771 ) {
772 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
773 } else {
774 $self->CFClient::UI::Base::find_widget ($x, $y)
775 }
742} 776}
743 777
744sub _render { 778sub _render {
745 my ($self) = @_; 779 my ($self) = @_;
746 780
… …
779 $self->add ($self->{slider}); 813 $self->add ($self->{slider});
780 814
781 $self 815 $self
782} 816}
783 817
784#TODO# update range on size_allocate depeneing on child 818#TODO# update range on size_allocate depending on child
785# update viewport offset on scroll 819# update viewport offset on scroll
786 820
787############################################################################# 821#############################################################################
788 822
789package CFClient::UI::Frame; 823package CFClient::UI::Frame;
… …
793use CFClient::OpenGL; 827use CFClient::OpenGL;
794 828
795sub new { 829sub new {
796 my $class = shift; 830 my $class = shift;
797 831
798 my $self = $class->SUPER::new ( 832 $class->SUPER::new (
799 bg => [1, 1, 1, 1], 833 bg => undef,
800 border_bg => [1, 1, 1, 1],
801 border => 0.8,
802 @_ 834 @_,
803 ); 835 )
804
805 $self
806} 836}
807 837
808sub _draw { 838sub _draw {
809 my ($self) = @_; 839 my ($self) = @_;
810 840
811 my ($w, $h) = ($self->{w}, $self->{h}); 841 if ($self->{bg}) {
842 my ($w, $h) = @$self{qw(w h)};
812 843
813 glEnable GL_BLEND; 844 glEnable GL_BLEND;
814 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
815 glEnable GL_TEXTURE_2D; 846 glColor @{ $self->{bg} };
816 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
817 847
818# glBegin GL_QUADS; 848 glBegin GL_QUADS;
819# glColor 0, 0, 0, 0;
820# glVertex 0 , 0; 849 glVertex 0 , 0;
821# glVertex 0 , $h; 850 glVertex 0 , $h;
822# glVertex $w, $h; 851 glVertex $w, $h;
823# glVertex $w, 0; 852 glVertex $w, 0;
824# glEnd; 853 glEnd;
825 854
826
827 $self->child->draw;
828 glDisable GL_BLEND; 855 glDisable GL_BLEND;
829 glDisable GL_TEXTURE_2D; 856 }
857
858 $self->SUPER::_draw;
830} 859}
831 860
832############################################################################# 861#############################################################################
833 862
834package CFClient::UI::FancyFrame; 863package CFClient::UI::FancyFrame;
… …
848 877
849 my $self = $class->SUPER::new ( 878 my $self = $class->SUPER::new (
850 bg => [1, 1, 1, 1], 879 bg => [1, 1, 1, 1],
851 border_bg => [1, 1, 1, 1], 880 border_bg => [1, 1, 1, 1],
852 border => 0.6, 881 border => 0.6,
882 toplevel => 1,
853 can_events => 1, 883 can_events => 1,
854 @_ 884 @_
855 ); 885 );
856 886
857 $self->{title} &&= new CFClient::UI::Label 887 $self->{title} &&= new CFClient::UI::Label
… …
882 my ($self, $w, $h) = @_; 912 my ($self, $w, $h) = @_;
883 913
884 $h -= List::Util::max 0, $self->border * 2; 914 $h -= List::Util::max 0, $self->border * 2;
885 $w -= List::Util::max 0, $self->border * 2; 915 $w -= List::Util::max 0, $self->border * 2;
886 916
887 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 917 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
888 if $self->{title}; 918 if $self->{title};
889 919
890 $self->child->configure ($self->border, $self->border, $w, $h); 920 $self->child->configure ($self->border, $self->border, $w, $h);
891} 921}
892 922
… …
950 my ($self) = @_; 980 my ($self) = @_;
951 981
952 my ($w, $h ) = ($self->{w}, $self->{h}); 982 my ($w, $h ) = ($self->{w}, $self->{h});
953 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
954 984
955 glEnable GL_BLEND;
956 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
957 glEnable GL_TEXTURE_2D; 985 glEnable GL_TEXTURE_2D;
958 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
959 987
960 my $border = $self->border; 988 my $border = $self->border;
961 989
962 glColor @{ $self->{border_bg} }; 990 glColor @{ $self->{border_bg} };
963 $tex[1]->draw_quad (0, 0, $w, $border); 991 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
964 $tex[3]->draw_quad (0, $border, $border, $ch); 992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
965 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
966 $tex[4]->draw_quad (0, $h - $border, $w, $border); 994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
967 995
968 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
969 my $bg = $tex[0]; 997 my $bg = $tex[0];
970 998
971 # TODO: repeat texture not scale 999 # TODO: repeat texture not scale
… …
975 glColor @{ $self->{bg} }; 1003 glColor @{ $self->{bg} };
976 1004
977 $bg->{s} = $rep_x; 1005 $bg->{s} = $rep_x;
978 $bg->{t} = $rep_y; 1006 $bg->{t} = $rep_y;
979 $bg->{wrap_mode} = 1; 1007 $bg->{wrap_mode} = 1;
980 $bg->draw_quad ($border, $border, $cw, $ch); 1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 }
981 1010
982 glDisable GL_TEXTURE_2D; 1011 glDisable GL_TEXTURE_2D;
983 glDisable GL_BLEND;
984 }
985 1012
986 $self->{title}->draw if $self->{title}; 1013 $self->{title}->draw if $self->{title};
987 1014
988 $self->child->draw; 1015 $self->child->draw;
989} 1016}
… …
1216} 1243}
1217 1244
1218sub size_allocate { 1245sub size_allocate {
1219 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h) = @_;
1220 1247
1248 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1221 my $children = $self->{children}; 1250 my $children = $self->{children};
1222 1251
1223 my @h = map $_->{req_h}, @$children; 1252 my @h = map $_->{req_h}, @$children;
1224 1253
1225 my $req_h = List::Util::sum @h; 1254 my $req_h = List::Util::sum @h;
… …
1254 1283
1255############################################################################# 1284#############################################################################
1256 1285
1257package CFClient::UI::Label; 1286package CFClient::UI::Label;
1258 1287
1259our @ISA = CFClient::UI::Base::; 1288our @ISA = CFClient::UI::DrawBG::;
1260 1289
1261use CFClient::OpenGL; 1290use CFClient::OpenGL;
1262 1291
1263sub new { 1292sub new {
1264 my ($class, %arg) = @_; 1293 my ($class, %arg) = @_;
1265 1294
1266 my $self = $class->SUPER::new ( 1295 my $self = $class->SUPER::new (
1267 fg => [1, 1, 1], 1296 fg => [1, 1, 1],
1297 #bg => none
1298 #active_bg => none
1268 #font => default_font 1299 #font => default_font
1300 #text => initial text
1301 #markup => initial narkup
1302 layout => (new CFClient::Layout),
1269 fontsize => 1, 1303 fontsize => 1,
1270 text => "",
1271 align => -1, 1304 align => -1,
1272 valign => -1, 1305 valign => -1,
1273 padding => 2, 1306 padding => 2,
1274 layout => new CFClient::Layout,
1275 can_events => 0, 1307 can_events => 0,
1276 %arg 1308 %arg
1277 ); 1309 );
1278 1310
1279 if (exists $self->{template}) { 1311 if (exists $self->{template}) {
1280 my $layout = new CFClient::Layout; 1312 my $layout = new CFClient::Layout;
1281 $layout->set_text (delete $self->{template}); 1313 $layout->set_text (delete $self->{template});
1282 $self->{template} = $layout; 1314 $self->{template} = $layout;
1283 } 1315 }
1284 1316
1285 $self->set_text (delete $self->{text}) if exists $self->{text}; 1317 if (exists $self->{markup}) {
1286 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1318 $self->set_markup (delete $self->{markup});
1319 } else {
1320 $self->set_text (delete $self->{text});
1321 }
1287 1322
1288 $self 1323 $self
1289} 1324}
1290 1325
1291sub escape { 1326sub escape($) {
1292 local $_ = $_[1]; 1327 local $_ = $_[0];
1293 1328
1294 s/&/&amp;/g; 1329 s/&/&amp;/g;
1295 s/>/&gt;/g; 1330 s/>/&gt;/g;
1296 s/</&lt;/g; 1331 s/</&lt;/g;
1297 1332
1298 $_[1] 1333 $_
1299} 1334}
1300 1335
1301sub update { 1336sub update {
1302 my ($self) = @_; 1337 my ($self) = @_;
1303 1338
1304 delete $self->{texture}; 1339 delete $self->{texture};
1305 $self->SUPER::update; 1340 $self->SUPER::update;
1306} 1341}
1307 1342
1308sub reconfigure {
1309 my ($self) = @_;
1310
1311 delete $self->{texture};
1312}
1313
1314sub set_text { 1343sub set_text {
1315 my ($self, $text) = @_; 1344 my ($self, $text) = @_;
1316 1345
1317 return if $self->{text} eq "T$text"; 1346 return if $self->{text} eq "T$text";
1318 $self->{text} = "T$text"; 1347 $self->{text} = "T$text";
1319 1348
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1320 $self->{layout}->set_text ($text); 1350 $self->{layout}->set_text ($text);
1321 1351
1322 delete $self->{texture};
1323 $self->update; 1352 $self->update;
1324 $self->check_size; 1353 $self->check_size;
1325} 1354}
1326 1355
1327sub set_markup { 1356sub set_markup {
1328 my ($self, $markup) = @_; 1357 my ($self, $markup) = @_;
1329 1358
1330 return if $self->{text} eq "M$markup"; 1359 return if $self->{text} eq "M$markup";
1331 $self->{text} = "M$markup"; 1360 $self->{text} = "M$markup";
1332 1361
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363
1364 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1333 $self->{layout}->set_markup ($markup); 1365 $self->{layout}->set_markup ($markup);
1334 1366
1335 delete $self->{texture};
1336 $self->update; 1367 $self->update;
1337 $self->check_size; 1368 $self->check_size;
1338} 1369}
1339 1370
1340sub size_request { 1371sub size_request {
… …
1371sub set_fontsize { 1402sub set_fontsize {
1372 my ($self, $fontsize) = @_; 1403 my ($self, $fontsize) = @_;
1373 1404
1374 $self->{fontsize} = $fontsize; 1405 $self->{fontsize} = $fontsize;
1375 delete $self->{texture}; 1406 delete $self->{texture};
1407
1408 $self->update;
1376 $self->check_size; 1409 $self->check_size;
1377 $self->update;
1378} 1410}
1379 1411
1380sub _draw { 1412sub _draw {
1381 my ($self) = @_; 1413 my ($self) = @_;
1382 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1383 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}});
1384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1385 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1386 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1422
1387 new_from_layout CFClient::Texture $self->{layout} 1423 my $tex = new_from_layout CFClient::Texture $self->{layout};
1424
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1427 : ($self->{w} - $tex->{w}) * 0.5);
1428
1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1431 : ($self->{h} - $tex->{h}) * 0.5);
1432
1433 $tex
1388 }; 1434 };
1389 1435
1390 glEnable GL_BLEND;
1391 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1392 glEnable GL_TEXTURE_2D; 1436 glEnable GL_TEXTURE_2D;
1393 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1394 1438
1439 if ($tex->{format} == GL_ALPHA) {
1395 glColor @{$self->{fg}}; 1440 glColor @{$self->{fg}};
1396
1397 $self->{ox} = int (
1398 $self->{align} < 0 ? $self->{padding}
1399 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1400 : ($self->{w} - $tex->{w}) * 0.5
1401 );
1402
1403 $self->{oy} = int (
1404 $self->{valign} < 0 ? $self->{padding}
1405 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1406 : ($self->{h} - $tex->{h}) * 0.5
1407 );
1408
1409 $tex->draw_quad ($self->{ox}, $self->{oy}); 1441 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1442 } else {
1443 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1444 }
1410 1445
1411 glDisable GL_TEXTURE_2D; 1446 glDisable GL_TEXTURE_2D;
1412 glDisable GL_BLEND;
1413} 1447}
1414 1448
1415############################################################################# 1449#############################################################################
1416 1450
1417package CFClient::UI::EntryBase; 1451package CFClient::UI::EntryBase;
… …
1452 $self->{layout}->set_text ("$text "); 1486 $self->{layout}->set_text ("$text ");
1453 1487
1454 $self->emit (changed => $self->{text}); 1488 $self->emit (changed => $self->{text});
1455} 1489}
1456 1490
1457sub get_text {
1458 $_[0]{text}
1459}
1460
1461sub size_request {
1462 my ($self) = @_;
1463
1464 my ($w, $h) = $self->SUPER::size_request;
1465
1466 ($w + 1, $h) # add 1 for cursor
1467}
1468
1469sub size_allocate {
1470 my ($self, $w, $h) = @_;
1471
1472 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1473}
1474
1475sub set_text { 1491sub set_text {
1476 my ($self, $text) = @_; 1492 my ($self, $text) = @_;
1477 1493
1478 $self->{cursor} = length $text; 1494 $self->{cursor} = length $text;
1479 $self->_set_text ($text); 1495 $self->_set_text ($text);
1480 $self->update; 1496 $self->update;
1497 $self->check_size;
1498}
1499
1500sub get_text {
1501 $_[0]{text}
1502}
1503
1504sub size_request {
1505 my ($self) = @_;
1506
1507 my ($w, $h) = $self->SUPER::size_request;
1508
1509 ($w + 1, $h) # add 1 for cursor
1510}
1511
1512sub size_allocate {
1513 my ($self, $w, $h) = @_;
1514
1515 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1481} 1516}
1482 1517
1483sub key_down { 1518sub key_down {
1484 my ($self, $ev) = @_; 1519 my ($self, $ev) = @_;
1485 1520
… …
1487 my $sym = $ev->{sym}; 1522 my $sym = $ev->{sym};
1488 my $uni = $ev->{unicode}; 1523 my $uni = $ev->{unicode};
1489 1524
1490 my $text = $self->get_text; 1525 my $text = $self->get_text;
1491 1526
1492 if ($sym == 8) { 1527 if ($uni == 8) {
1493 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1528 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1494 } elsif ($sym == 127) { 1529 } elsif ($uni == 127) {
1495 substr $text, $self->{cursor}, 1, ""; 1530 substr $text, $self->{cursor}, 1, "";
1496 } elsif ($sym == CFClient::SDLK_LEFT) { 1531 } elsif ($sym == CFClient::SDLK_LEFT) {
1497 --$self->{cursor} if $self->{cursor}; 1532 --$self->{cursor} if $self->{cursor};
1498 } elsif ($sym == CFClient::SDLK_RIGHT) { 1533 } elsif ($sym == CFClient::SDLK_RIGHT) {
1499 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1534 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1500 } elsif ($sym == CFClient::SDLK_HOME) { 1535 } elsif ($sym == CFClient::SDLK_HOME) {
1501 $self->{cursor} = 0; 1536 $self->{cursor} = 0;
1502 } elsif ($sym == CFClient::SDLK_END) { 1537 } elsif ($sym == CFClient::SDLK_END) {
1503 $self->{cursor} = length $text; 1538 $self->{cursor} = length $text;
1504 } elsif ($sym == 27) { 1539 } elsif ($uni == 27) {
1505 $self->emit ('escape'); 1540 $self->emit ('escape');
1506 } elsif ($uni) { 1541 } elsif ($uni) {
1507 substr $text, $self->{cursor}++, 0, chr $uni; 1542 substr $text, $self->{cursor}++, 0, chr $uni;
1508 } 1543 }
1509 1544
1510 $self->_set_text ($text); 1545 $self->_set_text ($text);
1511 $self->update; 1546 $self->update;
1547 $self->check_size;
1512} 1548}
1513 1549
1514sub focus_in { 1550sub focus_in {
1515 my ($self) = @_; 1551 my ($self) = @_;
1516 1552
… …
1645 my $class = shift; 1681 my $class = shift;
1646 1682
1647 $class->SUPER::new ( 1683 $class->SUPER::new (
1648 padding => 4, 1684 padding => 4,
1649 fg => [1, 1, 1], 1685 fg => [1, 1, 1],
1650 bg => [1, 1, 1, 0.2],
1651 active_fg => [0, 0, 1], 1686 active_fg => [0, 0, 1],
1652 can_hover => 1, 1687 can_hover => 1,
1653 align => 0, 1688 align => 0,
1654 valign => 0, 1689 valign => 0,
1655 can_events => 1, 1690 can_events => 1,
… …
1673 1708
1674 if ($GRAB == $self) { 1709 if ($GRAB == $self) {
1675 $self->{fg} = $self->{active_fg}; 1710 $self->{fg} = $self->{active_fg};
1676 } 1711 }
1677 1712
1678 glEnable GL_BLEND;
1679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1680 glEnable GL_TEXTURE_2D; 1713 glEnable GL_TEXTURE_2D;
1681 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1682 glColor 0, 0, 0, 1; 1715 glColor 0, 0, 0, 1;
1683 1716
1684 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1717 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1685 1718
1686 glDisable GL_TEXTURE_2D; 1719 glDisable GL_TEXTURE_2D;
1687 glDisable GL_BLEND;
1688 1720
1689 $self->SUPER::_draw; 1721 $self->SUPER::_draw;
1690} 1722}
1691 1723
1692############################################################################# 1724#############################################################################
… …
1706 1738
1707 $class->SUPER::new ( 1739 $class->SUPER::new (
1708 padding => 2, 1740 padding => 2,
1709 fg => [1, 1, 1], 1741 fg => [1, 1, 1],
1710 active_fg => [1, 1, 0], 1742 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5],
1711 state => 0, 1745 state => 0,
1712 can_hover => 1, 1746 can_hover => 1,
1713 @_ 1747 @_
1714 ) 1748 )
1715} 1749}
… …
1739 1773
1740 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1774 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1741 1775
1742 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1743 1777
1744 glEnable GL_BLEND; 1778 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779
1745 glEnable GL_TEXTURE_2D; 1780 glEnable GL_TEXTURE_2D;
1746 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1747
1748 my $tex = $self->{state} ? $tex[1] : $tex[0];
1749
1750 $tex->draw_quad (0, 0, $s, $s); 1781 $tex->draw_quad_alpha (0, 0, $s, $s);
1751
1752 glDisable GL_TEXTURE_2D; 1782 glDisable GL_TEXTURE_2D;
1753 glDisable GL_BLEND;
1754} 1783}
1755 1784
1756############################################################################# 1785#############################################################################
1757 1786
1758package CFClient::UI::Image; 1787package CFClient::UI::Image;
… …
1801 glTranslate 0, -$self->{w}, 0; 1830 glTranslate 0, -$self->{w}, 0;
1802 1831
1803 ($w, $h) = ($h, $w); 1832 ($w, $h) = ($h, $w);
1804 } 1833 }
1805 1834
1806 glEnable GL_BLEND;
1807 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1808 glEnable GL_TEXTURE_2D; 1835 glEnable GL_TEXTURE_2D;
1809 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1836 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1810 1837
1811 $tex->draw_quad (0, 0, $w, $h); 1838 $tex->draw_quad_alpha (0, 0, $w, $h);
1812 1839
1813 glDisable GL_BLEND;
1814 glDisable GL_TEXTURE_2D; 1840 glDisable GL_TEXTURE_2D;
1815} 1841}
1816 1842
1817############################################################################# 1843#############################################################################
1818 1844
… …
2007 qw(s1_slider.png s1_slider_bg.png); 2033 qw(s1_slider.png s1_slider_bg.png);
2008 2034
2009sub new { 2035sub new {
2010 my $class = shift; 2036 my $class = shift;
2011 2037
2012 # range [value, low, high, page] 2038 # range [value, low, high, page, unit]
2013 2039
2014 # TODO: 0-width page 2040 # TODO: 0-width page
2015 # TODO: req_w/h are wrong with vertical 2041 # TODO: req_w/h are wrong with vertical
2016 # TODO: calculations are off 2042 # TODO: calculations are off
2017 my $self = $class->SUPER::new ( 2043 my $self = $class->SUPER::new (
2018 fg => [1, 1, 1], 2044 fg => [1, 1, 1],
2019 active_fg => [0, 0, 0], 2045 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5],
2020 range => [0, 0, 100, 10], 2048 range => [0, 0, 100, 10],
2021 req_w => $::WIDTH / 80, 2049 req_w => $::WIDTH / 80,
2022 req_h => $::WIDTH / 80, 2050 req_h => $::WIDTH / 80,
2023 vertical => 0, 2051 vertical => 0,
2024 can_hover => 1, 2052 can_hover => 1,
2025 inner_pad => 5, 2053 inner_pad => .05,
2026 @_ 2054 @_
2027 ); 2055 );
2028 2056
2057 $self->set_value ($self->{range}[0]);
2058 $self->update;
2059
2029 $self 2060 $self
2061}
2062
2063sub set_value {
2064 my ($self, $value) = @_;
2065
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067
2068 $hi = $lo + 1 if $hi <= $lo;
2069
2070 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi;
2072
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit;
2075
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079
2080 if ($value != $old_value) {
2081 $self->emit (changed => $value);
2082 $self->update;
2083 }
2030} 2084}
2031 2085
2032sub size_request { 2086sub size_request {
2033 my ($self) = @_; 2087 my ($self) = @_;
2034 2088
… …
2047 2101
2048sub mouse_motion { 2102sub mouse_motion {
2049 my ($self, $ev, $x, $y) = @_; 2103 my ($self, $ev, $x, $y) = @_;
2050 2104
2051 if ($GRAB == $self) { 2105 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107
2108 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2111
2112 $self->set_value ($x * ($hi - $lo) + $lo);
2113 }
2114}
2115
2116sub update {
2117 my ($self) = @_;
2118
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]);
2121
2052 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2122 my ($value, $lo, $hi, $page) = @{$self->{range}};
2053 2123
2054 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2124 my $inner_w = 1 - 2 * $self->{inner_pad};
2055 2125
2056 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2057 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2058 2127
2059 $x -= $inner_pad_px; # substract the padding 2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2060 $x = $x * ($hi - $lo) / $inner_w + $lo; 2129 $value = $self->{scale} * ($value - $lo);
2061 $x = $lo if $x < $lo;
2062 $x = $hi - $page if $x > $hi - $page;
2063 $self->{range}[0] = $x;
2064 2130
2065 $self->emit (changed => $x); 2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
2066 $self->update; 2132
2133 $value = 0 if $value < 0;
2134 $page = 1 - $value if $value + $page > 1;
2135
2136 $self->{knob_x} = $value;
2137 $self->{knob_w} = $page;
2067 } 2138 });
2068}
2069 2139
2070# the inner_* stuff is for generating a padding for the slider handle, 2140 $self->SUPER::update;
2071# so that the handle doesn't leave the texture. This calculation isn't 100%
2072# correct propably, but it does the job for now
2073sub _calc_inner_pad_px {
2074 my ($self, $w) = @_;
2075 ($w / 100) * $self->{inner_pad} # % to pixels
2076} 2141}
2077 2142
2078sub _draw { 2143sub _draw {
2079 my ($self) = @_; 2144 my ($self) = @_;
2080 2145
2081 $self->SUPER::_draw (); 2146 $self->SUPER::_draw ();
2082 2147
2083 my ($w, $h) = @$self{qw(w h)}; 2148 glScale $self->{w}, $self->{h};
2084 2149
2085 if ($self->{vertical}) { 2150 if ($self->{vertical}) {
2086 # draw a vertical slider like a rotated horizontal slider 2151 # draw a vertical slider like a rotated horizontal slider
2087 2152
2088 glRotate 90, 0, 0, 1; 2153 glRotate 90, 0, 0, 1;
2089 glTranslate 0, -$self->{w}, 0; 2154 glTranslate 0, 1, 0;
2090
2091 ($w, $h) = ($h, $w);
2092 } 2155 }
2093 2156
2094 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2095 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2096 2159
2097 my ($value, $lo, $hi, $page) = @{$self->{range}};
2098
2099 $hi = $value + 1 if $lo == $hi;
2100
2101 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2102 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2103
2104 $page = int $page * $inner_w / ($hi - $lo);
2105 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2106
2107 $w -= $page;
2108 $page &= ~1;
2109 glTranslate $page * 0.5, 0, 0;
2110 $page ||= 2;
2111
2112 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2113 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2114
2115 glEnable GL_BLEND;
2116 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2117 glEnable GL_TEXTURE_2D; 2160 glEnable GL_TEXTURE_2D;
2118 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2161 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2119 2162
2120 # draw background 2163 # draw background
2121 $tex[1]->draw_quad (0, 0, $w, $h); 2164 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2122 2165
2123 # draw handle 2166 # draw handle
2124 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2125 2168
2126 glDisable GL_BLEND;
2127 glDisable GL_TEXTURE_2D; 2169 glDisable GL_TEXTURE_2D;
2128} 2170}
2129 2171
2130############################################################################# 2172#############################################################################
2131 2173
… …
2142 fontsize => 1, 2184 fontsize => 1,
2143 can_events => 0, 2185 can_events => 0,
2144 #font => default_font 2186 #font => default_font
2145 @_, 2187 @_,
2146 2188
2147 layout => (new CFClient::Layout), 2189 layout => (new CFClient::Layout 1),
2148 par => [], 2190 par => [],
2149 height => 0, 2191 height => 0,
2150 children => [ 2192 children => [
2151 (new CFClient::UI::Empty expand => 1), 2193 (new CFClient::UI::Empty expand => 1),
2152 (new CFClient::UI::Slider vertical => 1), 2194 (new CFClient::UI::Slider vertical => 1),
… …
2170 2212
2171 my $layout = $self->{layout}; 2213 my $layout = $self->{layout};
2172 2214
2173 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2174 $layout->set_width ($self->{children}[0]{w}); 2216 $layout->set_width ($self->{children}[0]{w});
2175 $layout->set_text ($text); 2217 $layout->set_markup ($text);
2176 2218
2177 ($layout->size)[1] 2219 ($layout->size)[1]
2178} 2220}
2179 2221
2180sub reflow { 2222sub reflow {
… …
2218 2260
2219 return unless $self->{h} > 0; 2261 return unless $self->{h} > 0;
2220 2262
2221 delete $self->{texture}; 2263 delete $self->{texture};
2222 2264
2223 $ROOT->on_refresh ($self, sub { 2265 $ROOT->on_post_alloc ($self, sub {
2224 if (delete $self->{need_reflow}) { 2266 if (delete $self->{need_reflow}) {
2225 my $height = 0; 2267 my $height = 0;
2226 2268
2227 $height += $_->[0] = $self->text_height ($_->[2]) 2269 $height += $_->[0] = $self->text_height ($_->[2])
2228 for @{$self->{par}}; 2270 for @{$self->{par}};
… …
2236 2278
2237 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2238 glClearColor 0, 0, 0, 0; 2280 glClearColor 0, 0, 0, 0;
2239 glClear GL_COLOR_BUFFER_BIT; 2281 glClear GL_COLOR_BUFFER_BIT;
2240 2282
2241 glEnable GL_BLEND;
2242 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2243 glEnable GL_TEXTURE_2D; 2283 glEnable GL_TEXTURE_2D;
2244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2245 2285
2246 my $top = int $self->{children}[1]{range}[0]; 2286 my $top = int $self->{children}[1]{range}[0];
2247 2287
… …
2256 2296
2257 for my $par (@{$self->{par}}) { 2297 for my $par (@{$self->{par}}) {
2258 my $h = $par->[0]; 2298 my $h = $par->[0];
2259 2299
2260 if ($y0 < $y + $h && $y < $y1) { 2300 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] });
2261 $layout->set_text ($par->[2]); 2302 $layout->set_markup ($par->[2]);
2262 2303
2263 glColor @{ $par->[1] };
2264 my ($W, $H) = $layout->size; 2304 my ($W, $H) = $layout->size;
2265 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2266 } 2306 }
2267 2307
2268 $y += $h; 2308 $y += $h;
2269 } 2309 }
2270 2310
2271 glDisable GL_TEXTURE_2D; 2311 glDisable GL_TEXTURE_2D;
2272 glDisable GL_BLEND;
2273 }; 2312 };
2274 }); 2313 });
2275} 2314}
2276 2315
2277sub _draw { 2316sub _draw {
2278 my ($self) = @_; 2317 my ($self) = @_;
2279 2318
2280 glEnable GL_BLEND;
2281 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2282 glEnable GL_TEXTURE_2D; 2319 glEnable GL_TEXTURE_2D;
2283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2284 glColor 1, 1, 1, 1; 2321 glColor 1, 1, 1, 1;
2285 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2286 glDisable GL_TEXTURE_2D; 2323 glDisable GL_TEXTURE_2D;
2287 glDisable GL_BLEND;
2288 2324
2289 $self->{children}[1]->draw; 2325 $self->{children}[1]->draw;
2290 2326
2291} 2327}
2292 2328
… …
2386 @_, 2422 @_,
2387 can_events => 0, 2423 can_events => 0,
2388 ) 2424 )
2389} 2425}
2390 2426
2391sub set_markup { 2427sub set_tooltip_from {
2392 my ($self, $text) = @_; 2428 my ($self, $widget) = @_;
2393 2429
2394 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2430 $self->add (new CFClient::UI::Label
2395 $self->{label}->set_markup ($text); 2431 markup => $widget->{tooltip},
2396 $self->add ($self->{label}); 2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8,
2434 fg => [0, 0, 0, 1],
2435 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 );
2397} 2437}
2398 2438
2399sub size_request { 2439sub size_request {
2400 my ($self) = @_; 2440 my ($self) = @_;
2401
2402 $self->child->set_max_size ($::WIDTH * 0.3);
2403 2441
2404 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2442 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2405 2443
2406 ($w + 4, $h + 4) 2444 ($w + 4, $h + 4)
2407} 2445}
… …
2413} 2451}
2414 2452
2415sub _draw { 2453sub _draw {
2416 my ($self) = @_; 2454 my ($self) = @_;
2417 2455
2418 glPushMatrix;
2419 glTranslate 0.375, 0.375; 2456 glTranslate 0.375, 0.375;
2420 2457
2421 my ($w, $h) = @$self{qw(w h)}; 2458 my ($w, $h) = @$self{qw(w h)};
2422 2459
2423 glColor 1, 0.8, 0.4; 2460 glColor 1, 0.8, 0.4;
… …
2434 glVertex 0 , $h; 2471 glVertex 0 , $h;
2435 glVertex $w, $h; 2472 glVertex $w, $h;
2436 glVertex $w, 0; 2473 glVertex $w, 0;
2437 glEnd; 2474 glEnd;
2438 2475
2439 glPopMatrix; 2476 glTranslate 2 - 0.375, 2 - 0.375;
2440
2441 glTranslate 2, 2;
2442 $self->SUPER::_draw; 2477 $self->SUPER::_draw;
2443} 2478}
2444 2479
2445############################################################################# 2480#############################################################################
2446 2481
… …
2464} 2499}
2465 2500
2466sub _draw { 2501sub _draw {
2467 my ($self) = @_; 2502 my ($self) = @_;
2468 2503
2504 return unless $::CONN;#d# manage and cache textures differently
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2470 2506
2471 # TODO animation 2507 # TODO animation
2472 if ($tex) { 2508 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D; 2509 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1; 2511 glColor 1, 1, 1, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D; 2513 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND;
2481 } 2514 }
2515}
2516
2517#############################################################################
2518
2519package CFClient::UI::InventoryItem;
2520
2521our @ISA = CFClient::UI::HBox::;
2522
2523sub _item_to_desc {
2524 my ($item) = @_;
2525
2526 my $desc =
2527 $item->{nrof} < 2
2528 ? $item->{name}
2529 : "$item->{nrof} $item->{name_pl}";
2530
2531 $item->{flags} & Crossfire::Protocol::F_OPEN
2532 and $desc .= " (open)";
2533 $item->{flags} & Crossfire::Protocol::F_APPLIED
2534 and $desc .= " (applied)";
2535 $item->{flags} & Crossfire::Protocol::F_UNPAID
2536 and $desc .= " (unpaid)";
2537 $item->{flags} & Crossfire::Protocol::F_MAGIC
2538 and $desc .= " (magic)";
2539 $item->{flags} & Crossfire::Protocol::F_CURSED
2540 and $desc .= " (cursed)";
2541 $item->{flags} & Crossfire::Protocol::F_DAMNED
2542 and $desc .= " (damned)";
2543 $item->{flags} & Crossfire::Protocol::F_LOCKED
2544 and $desc .= " *";
2545
2546 $desc
2547}
2548
2549sub new {
2550 my $class = shift;
2551
2552 my %args = @_;
2553
2554 my $item = delete $args{item};
2555
2556 my $desc = _item_to_desc ($item);
2557
2558 my $self = $class->SUPER::new (
2559 can_hover => 1,
2560 can_events => 1,
2561 tooltip => ((CFClient::UI::Label::escape $desc)
2562 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2563 connect_button_down => sub {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 # todo: maybe put examine on 1? but should just be a tooltip :(
2567 if ($ev->{button} == 1) {
2568 my $targ = $::CONN->{player}{tag};
2569
2570 if ($item->{container} == $::CONN->{player}{tag}) {
2571 $targ = $main::OPENCONT;
2572 }
2573
2574 $::CONN->send ("move $targ $item->{tag} 0");
2575 } elsif ($ev->{button} == 2) {
2576 $::CONN->send ("apply $item->{tag}");
2577 } elsif ($ev->{button} == 3) {
2578 my @menu_items = (
2579 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2580 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2581 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2582 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2583 [
2584 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2585 sub { $::CONN->send ("lock $item->{tag}") },
2586 ],
2587 );
2588
2589 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2590 }
2591
2592 1
2593 },
2594 %args
2595 );
2596
2597
2598 $self->add (new CFClient::UI::Face
2599 can_events => 0,
2600 face => $item->{face},
2601 anim => $item->{anim},
2602 animspeed => $item->{animspeed},
2603 );
2604
2605 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2606
2607 $self->{item} = $item;
2608
2609 $self->update_item;
2610
2611 $self
2612}
2613
2614sub update_item {
2615 my ($self) = @_;
2616
2617 my $desc = _item_to_desc ($self->{item});
2618
2619 $self->{name_lbl}->set_text ($desc);
2620}
2621
2622#############################################################################
2623
2624package CFClient::UI::Inventory;
2625
2626our @ISA = CFClient::UI::ScrolledWindow::;
2627
2628sub new {
2629 my $class = shift;
2630
2631 my $self = $class->SUPER::new (
2632 scrolled => (new CFClient::UI::VBox),
2633 @_,
2634 );
2635
2636 $self
2637}
2638
2639sub set_items {
2640 my ($self, $items) = @_;
2641
2642 $self->{scrolled}->clear;
2643 return unless $items;
2644
2645 my @items = sort {
2646 ($a->{type} <=> $b->{type})
2647 or ($a->{name} cmp $b->{name})
2648 } @$items;
2649
2650 $self->{real_items} = \@items;
2651
2652 for my $item (@items) {
2653 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2654 $item->update_item ();
2655 }
2656
2657 $self->{scrolled}->add (@items);
2658
2659# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2660}
2661
2662sub size_request {
2663 my ($self) = @_;
2664 ($self->{req_w}, $self->{req_h});
2482} 2665}
2483 2666
2484############################################################################# 2667#############################################################################
2485 2668
2486package CFClient::UI::Menu; 2669package CFClient::UI::Menu;
… …
2553 } 2736 }
2554} 2737}
2555 2738
2556############################################################################# 2739#############################################################################
2557 2740
2741package CFClient::UI::Statusbox;
2742
2743our @ISA = CFClient::UI::VBox::;
2744
2745sub new {
2746 my $class = shift;
2747
2748 $class->SUPER::new (
2749 fontsize => 0.8,
2750 @_,
2751 )
2752}
2753
2754sub reorder {
2755 my ($self) = @_;
2756 my $NOW = time;
2757
2758 while (my ($k, $v) = each %{ $self->{item} }) {
2759 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2760 }
2761
2762 my @widgets;
2763
2764 my @items = sort {
2765 $a->{pri} <=> $b->{pri}
2766 or $b->{id} <=> $a->{id}
2767 } values %{ $self->{item} };
2768
2769 my $count = 10 + 1;
2770 for my $item (@items) {
2771 last unless --$count;
2772
2773 push @widgets, $item->{label} ||= do {
2774 # TODO: doesn't handle markup well (read as: at all)
2775 my $short = $item->{count} > 1
2776 ? "<b>$item->{count} ×</b> $item->{text}"
2777 : $item->{text};
2778
2779 my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2781 for ($short) {
2782 s/^\s+//;
2783 s/\s+/ /g;
2784 my $len = int 40 / $fontsize;
2785 substr $_, $len, length, "…" if $len < length;
2786 }
2787
2788 new CFClient::UI::Label
2789 markup => $short,
2790 tooltip => $item->{tooltip},
2791 tooltip_font => $::FONT_PROP,
2792 tooltip_width => 0.67,
2793 fontsize => $fontsize,
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
2840#############################################################################
2841
2558package CFClient::UI::Root; 2842package CFClient::UI::Root;
2559 2843
2560our @ISA = CFClient::UI::Container::; 2844our @ISA = CFClient::UI::Container::;
2561 2845
2562use CFClient::OpenGL; 2846use CFClient::OpenGL;
2563 2847
2564sub check_size { 2848sub new {
2565 my ($self) = @_; 2849 my $class = shift;
2566 2850
2567 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2851 $class->SUPER::new (
2568} 2852 @_,
2569 2853 )
2570sub size_request {
2571 ($::WIDTH, $::HEIGHT)
2572} 2854}
2573 2855
2574sub configure { 2856sub configure {
2575 my ($self, $x, $y, $w, $h) = @_; 2857 my ($self, $x, $y, $w, $h) = @_;
2576 2858
2577 $self->SUPER::configure ($x, $y, $w, $h); 2859 $self->{w} = $w;
2860 $self->{h} = $h;
2861}
2578 2862
2863sub check_size {
2864 my ($self) = @_;
2865
2866 $self->size_allocate ($self->{w}, $self->{h})
2867 if $self->{w};
2868}
2869
2870sub size_request {
2871 my ($self) = @_;
2872
2873 ($self->{w}, $self->{h})
2874}
2875
2876sub size_allocate {
2877 my ($self, $w, $h) = @_;
2878
2879 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2880 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2881
2882 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2883 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2884
2579 for my $child (@{$self->{children}}) { 2885 for my $child ($self->children) {
2580 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2886 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2581 2887
2888 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2889 if exists $child->{req_x};
2890
2891 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2892 if exists $child->{req_y};
2893
2582 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2894 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2583 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2895 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2896
2584 $child->configure ($X, $Y, $W,$H); 2897 $child->configure ($X, $Y, $W, $H);
2585 } 2898 }
2586} 2899}
2587 2900
2588sub _topleft { 2901sub coord2local {
2589 my ($self, $x, $y) = @_; 2902 my ($self, $x, $y) = @_;
2590 2903
2591 ($x, $y) 2904 ($x, $y)
2592} 2905}
2593 2906
2907sub coord2global {
2908 my ($self, $x, $y) = @_;
2909
2910 ($x, $y)
2911}
2912
2594sub update { 2913sub update {
2595 my ($self) = @_; 2914 my ($self) = @_;
2596 2915
2597 $self->check_size; 2916 $self->check_size;
2598 ::refresh (); 2917 $::WANT_REFRESH++;
2599} 2918}
2600 2919
2601sub add { 2920sub add {
2602 my ($self, $child) = @_; 2921 my ($self, @children) = @_;
2603 2922
2923 for my $child (@children) {
2924 $child->{toplevel} = 1;
2925
2604 # integerize window positions 2926 # integerise window positions
2605 $child->{x} = int $child->{x}; 2927 $child->{x} = int $child->{x};
2606 $child->{y} = int $child->{y}; 2928 $child->{y} = int $child->{y};
2929 }
2607 2930
2608 $self->SUPER::add ($child); 2931 $self->SUPER::add (@children);
2609} 2932}
2610 2933
2611sub on_refresh { 2934sub on_refresh {
2612 my ($self, $id, $cb) = @_; 2935 my ($self, $id, $cb) = @_;
2613 2936
2614 $self->{refresh_hook}{$id} = $cb; 2937 $self->{refresh_hook}{$id} = $cb;
2615} 2938}
2616 2939
2940sub on_post_alloc {
2941 my ($self, $id, $cb) = @_;
2942
2943 $self->{post_alloc_hook}{$id} = $cb;
2944}
2945
2617sub draw { 2946sub draw {
2618 my ($self) = @_; 2947 my ($self) = @_;
2619 2948
2620 while (my $rcb = delete $self->{refresh_hook}) { 2949 while ($self->{refresh_hook}) {
2621 $_->() for values %$rcb; 2950 $_->()
2951 for values %{delete $self->{refresh_hook}};
2952 }
2953
2954 if ($self->{check_size}) {
2955 my @queue = ([], []);
2956
2957 for (;;) {
2958 if ($self->{check_size}) {
2959 # heuristic: check containers last
2960 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2961 for values %{delete $self->{check_size}}
2962 }
2963
2964 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2965
2966 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2967 ? @$widget{qw(user_w user_h)}
2968 : $widget->size_request;
2969
2970 if (delete $widget->{force_alloc}
2971 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2972 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2973
2974 $widget->{req_w} = $w;
2975 $widget->{req_h} = $h;
2976
2977 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2978
2979 $widget->{parent}->check_size
2980 if $widget->{parent};
2981 }
2982 }
2983 }
2984
2985 while ($self->{size_alloc}) {
2986 for (values %{delete $self->{size_alloc}}) {
2987 my ($widget, $w, $h) = @$_;
2988
2989 $w = 0 if $w < 0;
2990 $h = 0 if $h < 0;
2991
2992 $widget->{w} = $w;
2993 $widget->{h} = $h;
2994 $widget->size_allocate ($w, $h);
2995 $widget->emit (size_allocate => $w, $h);
2996 }
2997 }
2998
2999 while ($self->{post_alloc_hook}) {
3000 $_->()
3001 for values %{delete $self->{post_alloc_hook}};
2622 } 3002 }
2623 3003
2624 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3004 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2625 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2626 glClear GL_COLOR_BUFFER_BIT; 3006 glClear GL_COLOR_BUFFER_BIT;
… …
2634 $self->_draw; 3014 $self->_draw;
2635} 3015}
2636 3016
2637############################################################################# 3017#############################################################################
2638 3018
2639package CFClient::UI::Inventory;
2640
2641our @ISA = CFClient::UI::ScrolledWindow::;
2642
2643sub new {
2644 my $class = shift;
2645
2646 my $self = $class->SUPER::new (
2647 scrolled => (new CFClient::UI::VBox),
2648 @_,
2649 );
2650
2651 $self
2652}
2653
2654sub set_items {
2655 my ($self, $items) = @_;
2656
2657 $self->{scrolled}->clear;
2658 return unless $items;
2659
2660 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2661
2662 $self->{real_items} = \@items;
2663
2664 for my $item (@items) {
2665 my $desc = $item->{nrof} < 2
2666 ? $item->{name}
2667 : "$item->{nrof} $item->{name_pl}";
2668
2669 my $hb = new CFClient::UI::HBox;
2670
2671 $hb->add (my $f = new CFClient::UI::Face
2672 can_events => 0,
2673 face => $item->{face},
2674 anim => $item->{anim},
2675 animspeed => $item->{animspeed},
2676 expand => 1,
2677 );
2678 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2679 $self->{scrolled}->add ($hb);
2680 }
2681
2682# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2683}
2684
2685sub size_request {
2686 my ($self) = @_;
2687 (100, 200)
2688}
2689
2690#############################################################################
2691
2692package CFClient::UI; 3019package CFClient::UI;
2693 3020
2694$ROOT = new CFClient::UI::Root; 3021$ROOT = new CFClient::UI::Root;
2695$TOOLTIP = new CFClient::UI::Tooltip; 3022$TOOLTIP = new CFClient::UI::Tooltip;
2696 3023

Diff Legend

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