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.196 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.224 by elmex, Tue May 23 20:00:55 2006 UTC

… …
11our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
12 12
13our $ROOT; 13our $ROOT;
14our $TOOLTIP; 14our $TOOLTIP;
15our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
16 18
17sub check_tooltip { 19sub check_tooltip {
18 if (!$GRAB) { 20 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
29 $TOOLTIP->set_tooltip_from ($widget); 31 $TOOLTIP->set_tooltip_from ($widget);
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
141sub full_refresh {
142 # make a copy, otherwise for complains about freed values.
143 my @widgets = values %WIDGET;
144
145 $_->update
146 for @widgets;
147}
148
149# call when resolution changes etc.
150sub rescale_widgets {
151 my ($sx, $sy) = @_;
152
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET;
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 }
167
168 $widget->reconfigure;
135 } 169 }
136} 170}
137 171
138############################################################################# 172#############################################################################
139 173
… …
158 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
160 } 194 }
161 } 195 }
162 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
163 $self 199 $self
164} 200}
165 201
166sub destroy { 202sub destroy {
167 my ($self) = @_; 203 my ($self) = @_;
… …
170 %$self = (); 206 %$self = ();
171} 207}
172 208
173sub show { 209sub show {
174 my ($self) = @_; 210 my ($self) = @_;
175
176 return if $self->{parent}; 211 return if $self->{parent};
177 212
178 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
214}
215
216sub show_centered {
217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
179} 227}
180 228
181sub hide { 229sub hide {
182 my ($self) = @_; 230 my ($self) = @_;
183 231
… …
240 288
241sub size_allocate { 289sub size_allocate {
242 # nothing to be done 290 # nothing to be done
243} 291}
244 292
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
245sub children { 300sub children {
246}
247
248# call when resolution changes etc.
249sub reconfigure {
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257 $self->update;
258} 301}
259 302
260sub set_max_size { 303sub set_max_size {
261 my ($self, $w, $h) = @_; 304 my ($self, $w, $h) = @_;
262 305
263 delete $self->{max_w}; $self->{max_w} = $w if $w; 306 delete $self->{max_w}; $self->{max_w} = $w if $w;
264 delete $self->{max_h}; $self->{max_h} = $h if $h; 307 delete $self->{max_h}; $self->{max_h} = $h if $h;
308}
309
310sub set_tooltip {
311 my ($self, $tooltip) = @_;
312
313 $self->{tooltip} = $tooltip;
314
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip;
318 }
265} 319}
266 320
267# translate global coordinates to local coordinate system 321# translate global coordinates to local coordinate system
268sub coord2local { 322sub coord2local {
269 my ($self, $x, $y) = @_; 323 my ($self, $x, $y) = @_;
… …
355 glVertex $self->{w}, 0; 409 glVertex $self->{w}, 0;
356 glVertex $self->{w}, $self->{h}; 410 glVertex $self->{w}, $self->{h};
357 glVertex 0 , $self->{h}; 411 glVertex 0 , $self->{h};
358 glEnd; 412 glEnd;
359 glPopMatrix; 413 glPopMatrix;
360 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361 } 415 }
362} 416}
363 417
364sub _draw { 418sub _draw {
365 my ($self) = @_; 419 my ($self) = @_;
… …
382sub set_parent { 436sub set_parent {
383 my ($self, $parent) = @_; 437 my ($self, $parent) = @_;
384 438
385 Scalar::Util::weaken ($self->{parent} = $parent); 439 Scalar::Util::weaken ($self->{parent} = $parent);
386 440
441 # TODO: req_w _does_change after ->reconfigure
387 $self->check_size 442 $self->check_size
388 unless exists $self->{req_w}; 443 unless exists $self->{req_w};
444
445 $self->show;
389} 446}
390 447
391sub check_size { 448sub check_size {
392 my ($self) = @_; 449 my ($self, $forced) = @_;
393 450
451 $self->{force_alloc} = 1 if $forced;
394 $CFClient::UI::ROOT->{check_size}{$self} = $self; 452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
395} 453}
396 454
397sub update { 455sub update {
398 my ($self) = @_; 456 my ($self) = @_;
… …
414} 472}
415 473
416sub DESTROY { 474sub DESTROY {
417 my ($self) = @_; 475 my ($self) = @_;
418 476
477 delete $WIDGET{$self+0};
419 #$self->deactivate; 478 #$self->deactivate;
420} 479}
421 480
422############################################################################# 481#############################################################################
423 482
… …
432 my $class = shift; 491 my $class = shift;
433 492
434 # range [value, low, high, page] 493 # range [value, low, high, page]
435 494
436 $class->SUPER::new ( 495 $class->SUPER::new (
437 bg => [0, 0, 0, 0.2], 496 #bg => [0, 0, 0, 0.2],
438 active_bg => [1, 1, 1, 0.5], 497 #active_bg => [1, 1, 1, 0.5],
439 @_ 498 @_
440 ) 499 )
441} 500}
442 501
443sub _draw { 502sub _draw {
444 my ($self) = @_; 503 my ($self) = @_;
445 504
505 my $color = $FOCUS == $self && $self->{active_bg}
506 ? $self->{active_bg}
507 : $self->{bg};
508
509 if ($color && (@$color < 4 || $color->[3])) {
446 my ($w, $h) = @$self{qw(w h)}; 510 my ($w, $h) = @$self{qw(w h)};
447 511
448 glEnable GL_BLEND; 512 glEnable GL_BLEND;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 514 glColor @$color;
451 515
452 glBegin GL_QUADS; 516 glBegin GL_QUADS;
453 glVertex 0 , 0; 517 glVertex 0 , 0;
454 glVertex 0 , $h; 518 glVertex 0 , $h;
455 glVertex $w, $h; 519 glVertex $w, $h;
456 glVertex $w, 0; 520 glVertex $w, 0;
457 glEnd; 521 glEnd;
458 522
459 glDisable GL_BLEND; 523 glDisable GL_BLEND;
524 }
460} 525}
461 526
462############################################################################# 527#############################################################################
463 528
464package CFClient::UI::Empty; 529package CFClient::UI::Empty;
… …
508 $self->{children} = [ 573 $self->{children} = [
509 sort { $a->{z} <=> $b->{z} } 574 sort { $a->{z} <=> $b->{z} }
510 @{$self->{children}}, @widgets 575 @{$self->{children}}, @widgets
511 ]; 576 ];
512 577
513 $self->check_size; 578 $self->check_size (1);
514 $self->update; 579 $self->update;
515} 580}
516 581
517sub children { 582sub children {
518 @{ $_[0]{children} } 583 @{ $_[0]{children} }
… …
625} 690}
626 691
627sub update { 692sub update {
628 my ($self) = @_; 693 my ($self) = @_;
629 694
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 695 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 696 $self->SUPER::update;
632} 697}
633 698
634sub size_allocate { 699sub size_allocate {
635 my ($self, $w, $h) = @_; 700 my ($self, $w, $h) = @_;
… …
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0; 714 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 715 glClear GL_COLOR_BUFFER_BIT;
651 716
652 $self->_render; 717 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 }; 718 };
661} 719}
662 720
663sub _draw { 721sub _draw {
664 my ($self) = @_; 722 my ($self) = @_;
… …
668 my $tex = $self->{texture} 726 my $tex = $self->{texture}
669 or return; 727 or return;
670 728
671 glEnable GL_TEXTURE_2D; 729 glEnable GL_TEXTURE_2D;
672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
673 glColor 0, 0, 0, 1; 731 glColor 1, 1, 1, 1;
674 732
675 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
676 734
677 glDisable GL_TEXTURE_2D; 735 glDisable GL_TEXTURE_2D;
678} 736}
… …
761 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
762 }, 820 },
763 ; 821 ;
764 822
765 $self = $class->SUPER::new ( 823 $self = $class->SUPER::new (
766 vp => (new CFClient::UI::ViewPort), 824 vp => (new CFClient::UI::ViewPort expand => 1),
767 slider => $slider, 825 slider => $slider,
768 @_, 826 @_,
769 ); 827 );
770 828
771 $self->{vp}->add ($self->{scrolled}); 829 $self->{vp}->add ($self->{scrolled});
… …
773 $self->add ($self->{slider}); 831 $self->add ($self->{slider});
774 832
775 $self 833 $self
776} 834}
777 835
778#TODO# update range on size_allocate depeneing on child 836#TODO# update range on size_allocate depending on child
779# update viewport offset on scroll 837# update viewport offset on scroll
780 838
781############################################################################# 839#############################################################################
782 840
783package CFClient::UI::Frame; 841package CFClient::UI::Frame;
… …
787use CFClient::OpenGL; 845use CFClient::OpenGL;
788 846
789sub new { 847sub new {
790 my $class = shift; 848 my $class = shift;
791 849
792 my $self = $class->SUPER::new ( 850 $class->SUPER::new (
793 bg => [1, 1, 1, 1], 851 bg => undef,
794 border_bg => [1, 1, 1, 1],
795 border => 0.8,
796 @_ 852 @_,
797 ); 853 )
798
799 $self
800} 854}
801 855
802sub _draw { 856sub _draw {
803 my ($self) = @_; 857 my ($self) = @_;
804 858
805 my ($w, $h) = ($self->{w}, $self->{h}); 859 if ($self->{bg}) {
860 my ($w, $h) = @$self{qw(w h)};
806 861
807 glEnable GL_BLEND; 862 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 863 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glEnable GL_TEXTURE_2D; 864 glColor @{ $self->{bg} };
810 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
811 865
812# glBegin GL_QUADS; 866 glBegin GL_QUADS;
813# glColor 0, 0, 0, 0;
814# glVertex 0 , 0; 867 glVertex 0 , 0;
815# glVertex 0 , $h; 868 glVertex 0 , $h;
816# glVertex $w, $h; 869 glVertex $w, $h;
817# glVertex $w, 0; 870 glVertex $w, 0;
818# glEnd; 871 glEnd;
819 872
820
821 $self->child->draw;
822 glDisable GL_BLEND; 873 glDisable GL_BLEND;
823 glDisable GL_TEXTURE_2D; 874 }
875
876 $self->SUPER::_draw;
824} 877}
825 878
826############################################################################# 879#############################################################################
827 880
828package CFClient::UI::FancyFrame; 881package CFClient::UI::FancyFrame;
… …
842 895
843 my $self = $class->SUPER::new ( 896 my $self = $class->SUPER::new (
844 bg => [1, 1, 1, 1], 897 bg => [1, 1, 1, 1],
845 border_bg => [1, 1, 1, 1], 898 border_bg => [1, 1, 1, 1],
846 border => 0.6, 899 border => 0.6,
900 toplevel => 1,
847 can_events => 1, 901 can_events => 1,
848 @_ 902 @_
849 ); 903 );
850 904
851 $self->{title} &&= new CFClient::UI::Label 905 $self->{title} &&= new CFClient::UI::Label
… …
876 my ($self, $w, $h) = @_; 930 my ($self, $w, $h) = @_;
877 931
878 $h -= List::Util::max 0, $self->border * 2; 932 $h -= List::Util::max 0, $self->border * 2;
879 $w -= List::Util::max 0, $self->border * 2; 933 $w -= List::Util::max 0, $self->border * 2;
880 934
881 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 935 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
882 if $self->{title}; 936 if $self->{title};
883 937
884 $self->child->configure ($self->border, $self->border, $w, $h); 938 $self->child->configure ($self->border, $self->border, $w, $h);
885} 939}
886 940
… …
944 my ($self) = @_; 998 my ($self) = @_;
945 999
946 my ($w, $h ) = ($self->{w}, $self->{h}); 1000 my ($w, $h ) = ($self->{w}, $self->{h});
947 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1001 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
948 1002
949 glEnable GL_BLEND;
950 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
951 glEnable GL_TEXTURE_2D; 1003 glEnable GL_TEXTURE_2D;
952 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
953 1005
954 my $border = $self->border; 1006 my $border = $self->border;
955 1007
956 glColor @{ $self->{border_bg} }; 1008 glColor @{ $self->{border_bg} };
957 $tex[1]->draw_quad (0, 0, $w, $border); 1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
958 $tex[3]->draw_quad (0, $border, $border, $ch); 1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
959 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
960 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
961 1013
962 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
963 my $bg = $tex[0]; 1015 my $bg = $tex[0];
964 1016
965 # TODO: repeat texture not scale 1017 # TODO: repeat texture not scale
… …
969 glColor @{ $self->{bg} }; 1021 glColor @{ $self->{bg} };
970 1022
971 $bg->{s} = $rep_x; 1023 $bg->{s} = $rep_x;
972 $bg->{t} = $rep_y; 1024 $bg->{t} = $rep_y;
973 $bg->{wrap_mode} = 1; 1025 $bg->{wrap_mode} = 1;
974 $bg->draw_quad ($border, $border, $cw, $ch); 1026 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 }
975 1028
976 glDisable GL_TEXTURE_2D; 1029 glDisable GL_TEXTURE_2D;
977 glDisable GL_BLEND;
978 }
979 1030
980 $self->{title}->draw if $self->{title}; 1031 $self->{title}->draw if $self->{title};
981 1032
982 $self->child->draw; 1033 $self->child->draw;
983} 1034}
… …
1250 1301
1251############################################################################# 1302#############################################################################
1252 1303
1253package CFClient::UI::Label; 1304package CFClient::UI::Label;
1254 1305
1255our @ISA = CFClient::UI::Base::; 1306our @ISA = CFClient::UI::DrawBG::;
1256 1307
1257use CFClient::OpenGL; 1308use CFClient::OpenGL;
1258 1309
1259sub new { 1310sub new {
1260 my ($class, %arg) = @_; 1311 my ($class, %arg) = @_;
1261 1312
1262 my $self = $class->SUPER::new ( 1313 my $self = $class->SUPER::new (
1263 fg => [1, 1, 1], 1314 fg => [1, 1, 1],
1315 #bg => none
1316 #active_bg => none
1264 #font => default_font 1317 #font => default_font
1265 #text => initial text 1318 #text => initial text
1266 #markup => initial narkup 1319 #markup => initial narkup
1320 #max_w => maximum pixel width
1321 ellipsise => 3, # end
1267 layout => (new CFClient::Layout), 1322 layout => (new CFClient::Layout),
1268 fontsize => 1, 1323 fontsize => 1,
1269 align => -1, 1324 align => -1,
1270 valign => -1, 1325 valign => -1,
1271 padding => 2, 1326 padding => 2,
… …
1286 } 1341 }
1287 1342
1288 $self 1343 $self
1289} 1344}
1290 1345
1291sub escape { 1346sub escape($) {
1292 local $_ = $_[1]; 1347 local $_ = $_[0];
1293 1348
1294 s/&/&amp;/g; 1349 s/&/&amp;/g;
1295 s/>/&gt;/g; 1350 s/>/&gt;/g;
1296 s/</&lt;/g; 1351 s/</&lt;/g;
1297 1352
1298 $_[1] 1353 $_
1299} 1354}
1300 1355
1301sub update { 1356sub update {
1302 my ($self) = @_; 1357 my ($self) = @_;
1303 1358
… …
1336sub size_request { 1391sub size_request {
1337 my ($self) = @_; 1392 my ($self) = @_;
1338 1393
1339 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1394 $self->{layout}->set_font ($self->{font}) if $self->{font};
1340 $self->{layout}->set_width ($self->{max_w} || -1); 1395 $self->{layout}->set_width ($self->{max_w} || -1);
1396 $self->{layout}->set_ellipsise ($self->{ellipsise});
1397 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1341 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1398 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1342 1399
1343 my ($w, $h) = $self->{layout}->size; 1400 my ($w, $h) = $self->{layout}->size;
1344 1401
1345 if (exists $self->{template}) { 1402 if (exists $self->{template}) {
… …
1375} 1432}
1376 1433
1377sub _draw { 1434sub _draw {
1378 my ($self) = @_; 1435 my ($self) = @_;
1379 1436
1437 $self->SUPER::_draw; # draw background, if applicable
1438
1380 my $tex = $self->{texture} ||= do { 1439 my $tex = $self->{texture} ||= do {
1381 $self->{layout}->set_foreground (@{$self->{fg}}); 1440 $self->{layout}->set_foreground (@{$self->{fg}});
1382 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1441 $self->{layout}->set_font ($self->{font}) if $self->{font};
1383 $self->{layout}->set_width ($self->{w}); 1442 $self->{layout}->set_width ($self->{w});
1443 $self->{layout}->set_ellipsise ($self->{ellipsise});
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1384 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1385 1446
1386 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1447 my $tex = new_from_layout CFClient::Texture $self->{layout};
1387 1448
1388 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1389 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390 : ($self->{w} - $tex->{w}) * 0.5; 1451 : ($self->{w} - $tex->{w}) * 0.5);
1391 1452
1392 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1393 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1394 : ($self->{h} - $tex->{h}) * 0.5; 1455 : ($self->{h} - $tex->{h}) * 0.5);
1395 1456
1396 $tex 1457 $tex
1397 }; 1458 };
1398 1459
1399 glEnable GL_TEXTURE_2D; 1460 glEnable GL_TEXTURE_2D;
… …
1454sub set_text { 1515sub set_text {
1455 my ($self, $text) = @_; 1516 my ($self, $text) = @_;
1456 1517
1457 $self->{cursor} = length $text; 1518 $self->{cursor} = length $text;
1458 $self->_set_text ($text); 1519 $self->_set_text ($text);
1520 $self->update;
1459 $self->check_size; 1521 $self->check_size;
1460 $self->update;
1461} 1522}
1462 1523
1463sub get_text { 1524sub get_text {
1464 $_[0]{text} 1525 $_[0]{text}
1465} 1526}
… …
1485 my $sym = $ev->{sym}; 1546 my $sym = $ev->{sym};
1486 my $uni = $ev->{unicode}; 1547 my $uni = $ev->{unicode};
1487 1548
1488 my $text = $self->get_text; 1549 my $text = $self->get_text;
1489 1550
1490 if ($sym == 8) { 1551 if ($uni == 8) {
1491 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1552 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1492 } elsif ($sym == 127) { 1553 } elsif ($uni == 127) {
1493 substr $text, $self->{cursor}, 1, ""; 1554 substr $text, $self->{cursor}, 1, "";
1494 } elsif ($sym == CFClient::SDLK_LEFT) { 1555 } elsif ($sym == CFClient::SDLK_LEFT) {
1495 --$self->{cursor} if $self->{cursor}; 1556 --$self->{cursor} if $self->{cursor};
1496 } elsif ($sym == CFClient::SDLK_RIGHT) { 1557 } elsif ($sym == CFClient::SDLK_RIGHT) {
1497 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1558 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1498 } elsif ($sym == CFClient::SDLK_HOME) { 1559 } elsif ($sym == CFClient::SDLK_HOME) {
1499 $self->{cursor} = 0; 1560 $self->{cursor} = 0;
1500 } elsif ($sym == CFClient::SDLK_END) { 1561 } elsif ($sym == CFClient::SDLK_END) {
1501 $self->{cursor} = length $text; 1562 $self->{cursor} = length $text;
1502 } elsif ($sym == 27) { 1563 } elsif ($uni == 27) {
1503 $self->emit ('escape'); 1564 $self->emit ('escape');
1504 } elsif ($uni) { 1565 } elsif ($uni) {
1505 substr $text, $self->{cursor}++, 0, chr $uni; 1566 substr $text, $self->{cursor}++, 0, chr $uni;
1506 } 1567 }
1507 1568
1508 $self->_set_text ($text); 1569 $self->_set_text ($text);
1509 $self->update; 1570 $self->update;
1571 $self->check_size;
1510} 1572}
1511 1573
1512sub focus_in { 1574sub focus_in {
1513 my ($self) = @_; 1575 my ($self) = @_;
1514 1576
… …
1643 my $class = shift; 1705 my $class = shift;
1644 1706
1645 $class->SUPER::new ( 1707 $class->SUPER::new (
1646 padding => 4, 1708 padding => 4,
1647 fg => [1, 1, 1], 1709 fg => [1, 1, 1],
1648 bg => [1, 1, 1, 0.2],
1649 active_fg => [0, 0, 1], 1710 active_fg => [0, 0, 1],
1650 can_hover => 1, 1711 can_hover => 1,
1651 align => 0, 1712 align => 0,
1652 valign => 0, 1713 valign => 0,
1653 can_events => 1, 1714 can_events => 1,
… …
1701 1762
1702 $class->SUPER::new ( 1763 $class->SUPER::new (
1703 padding => 2, 1764 padding => 2,
1704 fg => [1, 1, 1], 1765 fg => [1, 1, 1],
1705 active_fg => [1, 1, 0], 1766 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5],
1706 state => 0, 1769 state => 0,
1707 can_hover => 1, 1770 can_hover => 1,
1708 @_ 1771 @_
1709 ) 1772 )
1710} 1773}
… …
1734 1797
1735 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1798 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1736 1799
1737 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1738 1801
1802 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803
1739 glEnable GL_TEXTURE_2D; 1804 glEnable GL_TEXTURE_2D;
1740
1741 my $tex = $self->{state} ? $tex[1] : $tex[0];
1742
1743 $tex->draw_quad_alpha (0, 0, $s, $s); 1805 $tex->draw_quad_alpha (0, 0, $s, $s);
1744
1745 glDisable GL_TEXTURE_2D; 1806 glDisable GL_TEXTURE_2D;
1746} 1807}
1747 1808
1748############################################################################# 1809#############################################################################
1749 1810
… …
1996 qw(s1_slider.png s1_slider_bg.png); 2057 qw(s1_slider.png s1_slider_bg.png);
1997 2058
1998sub new { 2059sub new {
1999 my $class = shift; 2060 my $class = shift;
2000 2061
2001 # range [value, low, high, page] 2062 # range [value, low, high, page, unit]
2002 2063
2003 # TODO: 0-width page 2064 # TODO: 0-width page
2004 # TODO: req_w/h are wrong with vertical 2065 # TODO: req_w/h are wrong with vertical
2005 # TODO: calculations are off 2066 # TODO: calculations are off
2006 my $self = $class->SUPER::new ( 2067 my $self = $class->SUPER::new (
2007 fg => [1, 1, 1], 2068 fg => [1, 1, 1],
2008 active_fg => [0, 0, 0], 2069 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5],
2009 range => [0, 0, 100, 10], 2072 range => [0, 0, 100, 10],
2010 req_w => $::WIDTH / 80, 2073 req_w => $::WIDTH / 80,
2011 req_h => $::WIDTH / 80, 2074 req_h => $::WIDTH / 80,
2012 vertical => 0, 2075 vertical => 0,
2013 can_hover => 1, 2076 can_hover => 1,
2014 inner_pad => 5, 2077 inner_pad => 0.02,
2015 @_ 2078 @_
2016 ); 2079 );
2017 2080
2081 $self->set_value ($self->{range}[0]);
2082 $self->update;
2083
2018 $self 2084 $self
2085}
2086
2087sub set_value {
2088 my ($self, $value) = @_;
2089
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091
2092 $hi = $lo + 1 if $hi <= $lo;
2093
2094 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi;
2096
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit;
2099
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103
2104 if ($value != $old_value) {
2105 $self->emit (changed => $value);
2106 $self->update;
2107 }
2019} 2108}
2020 2109
2021sub size_request { 2110sub size_request {
2022 my ($self) = @_; 2111 my ($self) = @_;
2023 2112
… …
2036 2125
2037sub mouse_motion { 2126sub mouse_motion {
2038 my ($self, $ev, $x, $y) = @_; 2127 my ($self, $ev, $x, $y) = @_;
2039 2128
2040 if ($GRAB == $self) { 2129 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131
2132 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2135
2136 $self->set_value ($x * ($hi - $lo) + $lo);
2137 }
2138}
2139
2140sub update {
2141 my ($self) = @_;
2142
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144 $self->set_value ($self->{range}[0]);
2145
2041 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2146 my ($value, $lo, $hi, $page) = @{$self->{range}};
2042 2147
2043 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2148 my $inner_w = 1 - 2 * $self->{inner_pad};
2044 2149
2045 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2046 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2047 2151
2048 $x -= $inner_pad_px; # substract the padding 2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2049 $x = $x * ($hi - $lo) / $inner_w + $lo; 2153 $value = $self->{scale} * ($value - $lo);
2050 $x = $lo if $x < $lo;
2051 $x = $hi - $page if $x > $hi - $page;
2052 $self->{range}[0] = $x;
2053 2154
2054 $self->emit (changed => $x); 2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2055 $self->update; 2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value;
2161 $self->{knob_w} = $page;
2056 } 2162 });
2057}
2058 2163
2059# the inner_* stuff is for generating a padding for the slider handle, 2164 $self->SUPER::update;
2060# so that the handle doesn't leave the texture. This calculation isn't 100%
2061# correct propably, but it does the job for now
2062sub _calc_inner_pad_px {
2063 my ($self, $w) = @_;
2064 ($w / 100) * $self->{inner_pad} # % to pixels
2065} 2165}
2066 2166
2067sub _draw { 2167sub _draw {
2068 my ($self) = @_; 2168 my ($self) = @_;
2069 2169
2070 $self->SUPER::_draw (); 2170 $self->SUPER::_draw ();
2071 2171
2072 my ($w, $h) = @$self{qw(w h)}; 2172 glScale $self->{w}, $self->{h};
2073 2173
2074 if ($self->{vertical}) { 2174 if ($self->{vertical}) {
2075 # draw a vertical slider like a rotated horizontal slider 2175 # draw a vertical slider like a rotated horizontal slider
2076 2176
2177 glTranslate 1, 0, 0;
2077 glRotate 90, 0, 0, 1; 2178 glRotate 90, 0, 0, 1;
2078 glTranslate 0, -$self->{w}, 0;
2079
2080 ($w, $h) = ($h, $w);
2081 } 2179 }
2082 2180
2083 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2181 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2084 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2182 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2085 2183
2086 my ($value, $lo, $hi, $page) = @{$self->{range}};
2087
2088 $hi = $value + 1 if $lo == $hi;
2089
2090 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2091 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2092
2093 $page = int $page * $inner_w / ($hi - $lo);
2094 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2095
2096 $w -= $page;
2097 $page &= ~1;
2098 glTranslate $page * 0.5, 0, 0;
2099 $page ||= 2;
2100
2101 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2102 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2103
2104 glEnable GL_TEXTURE_2D; 2184 glEnable GL_TEXTURE_2D;
2105 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2106 2186
2107 # draw background 2187 # draw background
2108 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2188 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2109 2189
2110 # draw handle 2190 # draw handle
2111 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2112 2192
2113 glDisable GL_TEXTURE_2D; 2193 glDisable GL_TEXTURE_2D;
2114} 2194}
2115 2195
2116############################################################################# 2196#############################################################################
… …
2149 2229
2150 $self->{fontsize} = $fontsize; 2230 $self->{fontsize} = $fontsize;
2151 $self->reflow; 2231 $self->reflow;
2152} 2232}
2153 2233
2234sub size_allocate {
2235 my ($self, $w, $h) = @_;
2236
2237 $self->SUPER::size_allocate ($w, $h);
2238
2239 $self->{layout}->set_font ($self->{font}) if $self->{font};
2240 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2241 $self->{layout}->set_width ($self->{children}[0]{w});
2242
2243 $self->reflow;
2244}
2245
2154sub text_height { 2246sub text_height {
2155 my ($self, $text) = @_; 2247 my ($self, $text, $indent) = @_;
2156 2248
2157 my $layout = $self->{layout}; 2249 my $layout = $self->{layout};
2158 2250
2159 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2160 $layout->set_width ($self->{children}[0]{w}); 2252 $layout->set_width ($self->{children}[0]{w} - $indent);
2161 $layout->set_markup ($text); 2253 $layout->set_markup ($text);
2162 2254
2163 ($layout->size)[1] 2255 ($layout->size)[1]
2164} 2256}
2165 2257
… …
2168 2260
2169 $self->{need_reflow}++; 2261 $self->{need_reflow}++;
2170 $self->update; 2262 $self->update;
2171} 2263}
2172 2264
2173sub size_allocate {
2174 my ($self, $w, $h) = @_;
2175
2176 $self->SUPER::size_allocate ($w, $h);
2177
2178 $self->{layout}->set_font ($self->{font}) if $self->{font};
2179 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2180 $self->{layout}->set_width ($self->{children}[0]{w});
2181
2182 $self->reflow;
2183}
2184
2185sub add_paragraph { 2265sub add_paragraph {
2186 my ($self, $color, $text) = @_; 2266 my ($self, $color, $text, $indent) = @_;
2187 2267
2188 #TODO: intelligently "reformat" paragraph 2268 #TODO: intelligently "reformat" paragraph
2189 2269
2270 for my $line (split /\n/, $text) {
2190 my $height = $self->text_height ($text); 2271 my $height = $self->text_height ($line);
2191
2192 $self->{height} += $height; 2272 $self->{height} += $height;
2193
2194 push @{$self->{par}}, [$height, $color, $text]; 2273 push @{$self->{par}}, [$height, $color, $indent, $line];
2274 }
2195 2275
2196 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2197 $self->{children}[1]->update; 2277 $self->{children}[1]->update;
2198} 2278}
2199 2279
… …
2204 2284
2205 return unless $self->{h} > 0; 2285 return unless $self->{h} > 0;
2206 2286
2207 delete $self->{texture}; 2287 delete $self->{texture};
2208 2288
2209 $ROOT->on_refresh ($self, sub { 2289 $ROOT->on_post_alloc ($self, sub {
2210 if (delete $self->{need_reflow}) { 2290 if (delete $self->{need_reflow}) {
2211 my $height = 0; 2291 my $height = 0;
2212 2292
2213 $height += $_->[0] = $self->text_height ($_->[2]) 2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2214 for @{$self->{par}}; 2294 for @{$self->{par}};
2215 2295
2216 $self->{height} = $height; 2296 $self->{height} = $height;
2217 2297
2218 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2299 $self->{children}[1]->update;
2219 2300
2220 delete $self->{texture}; 2301 delete $self->{texture};
2221 } 2302 }
2222 2303
2223 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2224 glClearColor 0, 0, 0, 0; 2305 glClearColor 0.5, 0.5, 0.5, 0;
2225 glClear GL_COLOR_BUFFER_BIT; 2306 glClear GL_COLOR_BUFFER_BIT;
2226
2227 glEnable GL_TEXTURE_2D;
2228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2229 2307
2230 my $top = int $self->{children}[1]{range}[0]; 2308 my $top = int $self->{children}[1]{range}[0];
2231 2309
2232 my $y0 = $top; 2310 my $y0 = $top;
2233 my $y1 = $top + $self->{h}; 2311 my $y1 = $top + $self->{h};
… …
2236 2314
2237 my $layout = $self->{layout}; 2315 my $layout = $self->{layout};
2238 2316
2239 $layout->set_font ($self->{font}) if $self->{font}; 2317 $layout->set_font ($self->{font}) if $self->{font};
2240 2318
2319 glEnable GL_BLEND;
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321
2241 for my $par (@{$self->{par}}) { 2322 for my $par (@{$self->{par}}) {
2242 my $h = $par->[0]; 2323 my $h = $par->[0];
2243 2324
2244 if ($y0 < $y + $h && $y < $y1) { 2325 if ($y0 < $y + $h && $y < $y1) {
2245 $layout->set_foreground (@{ $par->[1] }); 2326 $layout->set_foreground (@{ $par->[1] });
2327 $layout->set_width ($self->{w} - $par->[2]);
2246 $layout->set_markup ($par->[2]); 2328 $layout->set_markup ($par->[3]);
2247 2329
2248 my ($W, $H) = $layout->size; 2330 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2249 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2331
2332 glRasterPos $par->[2], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2250 } 2334 }
2251 2335
2252 $y += $h; 2336 $y += $h;
2253 } 2337 }
2254 2338
2255 glDisable GL_TEXTURE_2D; 2339 glDisable GL_BLEND;
2256 }; 2340 };
2257 }); 2341 });
2258} 2342}
2259 2343
2260sub _draw { 2344sub _draw {
2261 my ($self) = @_; 2345 my ($self) = @_;
2262 2346
2263 glEnable GL_TEXTURE_2D; 2347 glEnable GL_TEXTURE_2D;
2264 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2265 glColor 1, 1, 1, 1; 2349 glColor 1, 1, 1, 1;
2266 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2350 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2267 glDisable GL_TEXTURE_2D; 2351 glDisable GL_TEXTURE_2D;
2268 2352
2269 $self->{children}[1]->draw; 2353 $self->{children}[1]->draw;
2270 2354
2271} 2355}
… …
2369} 2453}
2370 2454
2371sub set_tooltip_from { 2455sub set_tooltip_from {
2372 my ($self, $widget) = @_; 2456 my ($self, $widget) = @_;
2373 2457
2374 $self->{label} = new CFClient::UI::Label 2458 $self->add (new CFClient::UI::Label
2375 markup => $widget->{tooltip}, 2459 markup => $widget->{tooltip},
2376 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2377 fontsize => 0.8, 2461 fontsize => 0.8,
2378 fg => [0, 0, 0, 1], 2462 fg => [0, 0, 0, 1],
2463 ellipsise => 0,
2379 font => ($widget->{tooltip_font} || $::FONT_PROP); 2464 font => ($widget->{tooltip_font} || $::FONT_PROP),
2380 2465 );
2381 $self->add ($self->{label});
2382} 2466}
2383 2467
2384sub size_request { 2468sub size_request {
2385 my ($self) = @_; 2469 my ($self) = @_;
2386 2470
… …
2396} 2480}
2397 2481
2398sub _draw { 2482sub _draw {
2399 my ($self) = @_; 2483 my ($self) = @_;
2400 2484
2401 glPushMatrix;
2402 glTranslate 0.375, 0.375; 2485 glTranslate 0.375, 0.375;
2403 2486
2404 my ($w, $h) = @$self{qw(w h)}; 2487 my ($w, $h) = @$self{qw(w h)};
2405 2488
2406 glColor 1, 0.8, 0.4; 2489 glColor 1, 0.8, 0.4;
… …
2417 glVertex 0 , $h; 2500 glVertex 0 , $h;
2418 glVertex $w, $h; 2501 glVertex $w, $h;
2419 glVertex $w, 0; 2502 glVertex $w, 0;
2420 glEnd; 2503 glEnd;
2421 2504
2422 glPopMatrix; 2505 glTranslate 2 - 0.375, 2 - 0.375;
2423
2424 glTranslate 2, 2;
2425 $self->SUPER::_draw; 2506 $self->SUPER::_draw;
2426} 2507}
2427 2508
2428############################################################################# 2509#############################################################################
2429 2510
… …
2434use CFClient::OpenGL; 2515use CFClient::OpenGL;
2435 2516
2436sub new { 2517sub new {
2437 my $class = shift; 2518 my $class = shift;
2438 2519
2439 $class->SUPER::new ( 2520 my $self = $class->SUPER::new (
2440 aspect => 1, 2521 aspect => 1,
2441 @_, 2522 @_,
2442 ) 2523 );
2524
2525 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self);
2527
2528 $self->{timer} = Event->timer (
2529 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2530 hard => 1,
2531 interval => $self->{animspeed},
2532 cb => sub {
2533 ++$widget->{frame};
2534 $widget->update;
2535 },
2536 );
2537 }
2538
2539 $self
2443} 2540}
2444 2541
2445sub size_request { 2542sub size_request {
2446 (32, 8) 2543 (32, 8)
2447} 2544}
2448 2545
2546sub update {
2547 my ($self) = @_;
2548
2549 return unless $self->{visible};
2550
2551 $self->SUPER::update;
2552}
2553
2449sub _draw { 2554sub _draw {
2450 my ($self) = @_; 2555 my ($self) = @_;
2451 2556
2452 return unless $::CONN;#d# manage and cache textures differently 2557 return unless $::CONN;#d# manage and cache textures differently
2558
2559 my $face;
2560
2561 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}];
2563
2564 $face = $anim->[ $self->{frame} % @$anim ]
2565 if $anim && @$anim;
2566 }
2567
2453 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2568 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2454 2569
2455 # TODO animation
2456 if ($tex) { 2570 if ($tex) {
2457 glEnable GL_TEXTURE_2D; 2571 glEnable GL_TEXTURE_2D;
2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2572 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2459 glColor 1, 1, 1, 1; 2573 glColor 1, 1, 1, 1;
2460 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2574 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2461 glDisable GL_TEXTURE_2D; 2575 glDisable GL_TEXTURE_2D;
2462 } 2576 }
2463} 2577}
2464 2578
2579sub DESTROY {
2580 my ($self) = @_;
2581
2582 $self->{timer}->cancel
2583 if $self->{timer};
2584
2585 $self->SUPER::DESTROY;
2586}
2587
2465############################################################################# 2588#############################################################################
2466 2589
2467package CFClient::UI::InventoryItem; 2590package CFClient::UI::InventoryItem;
2468 2591
2469our @ISA = CFClient::UI::HBox::; 2592our @ISA = CFClient::UI::HBox::;
2593
2594sub _item_to_desc {
2595 my ($item) = @_;
2596
2597 my $desc =
2598 $item->{nrof} < 2
2599 ? $item->{name}
2600 : "$item->{nrof} × $item->{name_pl}";
2601
2602 $item->{flags} & Crossfire::Protocol::F_OPEN
2603 and $desc .= " (open)";
2604 $item->{flags} & Crossfire::Protocol::F_APPLIED
2605 and $desc .= " (applied)";
2606 $item->{flags} & Crossfire::Protocol::F_UNPAID
2607 and $desc .= " (unpaid)";
2608 $item->{flags} & Crossfire::Protocol::F_MAGIC
2609 and $desc .= " (magic)";
2610 $item->{flags} & Crossfire::Protocol::F_CURSED
2611 and $desc .= " (cursed)";
2612 $item->{flags} & Crossfire::Protocol::F_DAMNED
2613 and $desc .= " (damned)";
2614 $item->{flags} & Crossfire::Protocol::F_LOCKED
2615 and $desc .= " *";
2616
2617 $desc
2618}
2470 2619
2471sub new { 2620sub new {
2472 my $class = shift; 2621 my $class = shift;
2473 2622
2474 my %args = @_; 2623 my %args = @_;
2475 2624
2476 my $item = delete $args{item}; 2625 my $item = delete $args{item};
2477 2626
2478 my $desc = $item->{nrof} < 2 2627 my $desc = _item_to_desc ($item);
2479 ? $item->{name}
2480 : "$item->{nrof} $item->{name_pl}";
2481
2482 2628
2483 my $self = $class->SUPER::new ( 2629 my $self = $class->SUPER::new (
2484 can_hover => 1, 2630 can_hover => 1,
2485 can_events => 1, 2631 can_events => 1,
2486 tooltip => (CFClient::UI::Label->escape ($desc) 2632 tooltip => ((CFClient::UI::Label::escape $desc)
2487 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2633 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2488 connect_button_down => sub { 2634 connect_button_down => sub {
2489 my ($self, $ev, $x, $y) = @_; 2635 my ($self, $ev, $x, $y) = @_;
2490 2636
2491 # todo: maybe put examine on 1? but should just be a tooltip :( 2637 # todo: maybe put examine on 1? but should just be a tooltip :(
2638 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2639 my $targ = $::CONN->{player}{tag};
2640
2641 if ($item->{container} == $::CONN->{player}{tag}) {
2642 $targ = $main::OPENCONT;
2643 }
2644
2645 $::CONN->send ("move $targ $item->{tag} 0");
2492 if ($ev->{button} == 1) { 2646 } elsif ($ev->{button} == 1) {
2493 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2647 $::CONN->send ("examine $item->{tag}");
2494 } elsif ($ev->{button} == 2) { 2648 } elsif ($ev->{button} == 2) {
2495 $::CONN->send ("apply $item->{tag}"); 2649 $::CONN->send ("apply $item->{tag}");
2496 } elsif ($ev->{button} == 3) { 2650 } elsif ($ev->{button} == 3) {
2497 CFClient::UI::Menu->new ( 2651 my @menu_items = (
2498 items => [
2499 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2652 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2500 [
2501 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2502 sub { $::CONN->send ("lock $item->{tag}") },
2503 ],
2504 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2653 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2505 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2654 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2655 (
2656 $item->{flags} & Crossfire::Protocol::F_LOCKED
2657 ? (
2658 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2659 )
2660 : (
2661 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2506 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2662 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2663 )
2507 ], 2664 ),
2508 )->popup ($ev); 2665 );
2666
2667 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2509 } 2668 }
2510 2669
2511 1 2670 1
2512 }, 2671 },
2513 %args 2672 %args
2514 ); 2673 );
2674
2515 2675
2516 $self->add (new CFClient::UI::Face 2676 $self->add (new CFClient::UI::Face
2517 can_events => 0, 2677 can_events => 0,
2518 face => $item->{face}, 2678 face => $item->{face},
2519 anim => $item->{anim}, 2679 anim => $item->{anim},
2520 animspeed => $item->{animspeed}, 2680 animspeed => $item->{animspeed},
2521 ); 2681 );
2522 2682
2523 $self->add (new CFClient::UI::Label 2683 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2524 can_events => 0, 2684
2525 text => $desc, 2685 $self->{item} = $item;
2526 ); 2686
2687 $self->update_item;
2527 2688
2528 $self 2689 $self
2690}
2691
2692sub update_item {
2693 my ($self) = @_;
2694
2695 my $desc = _item_to_desc ($self->{item});
2696
2697 $self->{name_lbl}->set_text ($desc);
2529} 2698}
2530 2699
2531############################################################################# 2700#############################################################################
2532 2701
2533package CFClient::UI::Inventory; 2702package CFClient::UI::Inventory;
… …
2536 2705
2537sub new { 2706sub new {
2538 my $class = shift; 2707 my $class = shift;
2539 2708
2540 my $self = $class->SUPER::new ( 2709 my $self = $class->SUPER::new (
2541 scrolled => (new CFClient::UI::VBox), 2710 scrolled => (new CFClient::UI::Table),
2542 @_, 2711 @_,
2543 ); 2712 );
2544 2713
2545 $self 2714 $self
2546} 2715}
… …
2549 my ($self, $items) = @_; 2718 my ($self, $items) = @_;
2550 2719
2551 $self->{scrolled}->clear; 2720 $self->{scrolled}->clear;
2552 return unless $items; 2721 return unless $items;
2553 2722
2554 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2723 my @items = sort {
2724 ($a->{type} <=> $b->{type})
2725 or ($a->{name} cmp $b->{name})
2726 } @$items;
2555 2727
2556 $self->{real_items} = \@items; 2728 $self->{real_items} = \@items;
2557 2729
2558 for my $item (@items) { 2730 for my $item (@items) {
2559 my $desc = $item->{nrof} < 2 2731 $item->{item} = $item;
2560 ? $item->{name}
2561 : "$item->{nrof} $item->{name_pl}";
2562
2563 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2732 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2733 $item->update_item ();
2734 }
2735
2736 my $i = 0;
2737 for (@items) {
2738 $self->{scrolled}->add (0, $i, $_);
2739 my $nrof = $_->{item}->{nrof} || 1;
2740 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2564 } 2741 }
2565 2742
2566# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2743# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2567} 2744}
2568 2745
… …
2647 2824
2648package CFClient::UI::Statusbox; 2825package CFClient::UI::Statusbox;
2649 2826
2650our @ISA = CFClient::UI::VBox::; 2827our @ISA = CFClient::UI::VBox::;
2651 2828
2829sub new {
2830 my $class = shift;
2831
2832 $class->SUPER::new (
2833 fontsize => 0.8,
2834 @_,
2835 )
2836}
2837
2652sub reorder { 2838sub reorder {
2653 my ($self) = @_; 2839 my ($self) = @_;
2654 my $NOW = time; 2840 my $NOW = time;
2655 2841
2656 while (my ($k, $v) = each %{ $self->{item} }) { 2842 while (my ($k, $v) = each %{ $self->{item} }) {
2657 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2843 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2658 } 2844 }
2659 2845
2660 my @widgets; 2846 my @widgets;
2661 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 2847
2848 my @items = sort {
2849 $a->{pri} <=> $b->{pri}
2850 or $b->{id} <=> $a->{id}
2851 } values %{ $self->{item} };
2852
2662 my $count = 10 + 1; 2853 my $count = 10 + 1;
2663 for my $item (@items) { 2854 for my $item (@items) {
2664 last unless --$count; 2855 last unless --$count;
2665 2856
2666 push @widgets, $item->{label} ||= do { 2857 push @widgets, $item->{label} ||= do {
2667 # TODO: doesn't handle markup well (read as: at all) 2858 # TODO: doesn't handle markup well (read as: at all)
2668 my $short = delete $item->{text}; 2859 my $short = $item->{count} > 1
2860 ? "<b>$item->{count} ×</b> $item->{text}"
2861 : $item->{text};
2862
2669 for ($short) { 2863 for ($short) {
2670 s/^\s+//; 2864 s/^\s+//;
2671 s/\012.*//s; 2865 s/\s+/ /g;
2672 my $len = int 30 / $item->{fontsize};
2673 substr $_, $len, length, "…" if $len < length;
2674 } 2866 }
2675 2867
2676 new CFClient::UI::Label 2868 new CFClient::UI::Label
2677 markup => $short, 2869 markup => $short,
2678 tooltip => delete $item->{tooltip}, 2870 tooltip => $item->{tooltip},
2679 tooltip_font => $::FONT_PROP, 2871 tooltip_font => $::FONT_PROP,
2680 tooltip_width => 0.75, 2872 tooltip_width => 0.67,
2681 fontsize => delete $item->{fontsize}, 2873 fontsize => $item->{fontsize} || $self->{fontsize},
2682 color => delete $item->{color}, 2874 max_w => $::WIDTH * 0.44,
2875 fg => $item->{fg},
2683 can_events => 1, 2876 can_events => 1,
2684 can_hover => 1, 2877 can_hover => 1
2685 }; 2878 };
2686 } 2879 }
2687 2880
2688 $self->clear; 2881 $self->clear;
2689 $self->SUPER::add (@widgets); 2882 $self->SUPER::add (reverse @widgets);
2690} 2883}
2691 2884
2692sub add { 2885sub add {
2693 my ($self, $text, %arg) = @_; 2886 my ($self, $text, %arg) = @_;
2694 2887
2695 my $item = { 2888 $text =~ s/^\s+//;
2696 time => time, 2889 $text =~ s/\s+$//;
2890
2891 my $timeout = time + ((delete $arg{timeout}) || 60);
2892
2893 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2894
2895 if (my $item = $self->{item}{$group}) {
2896 if ($item->{text} eq $text) {
2897 $item->{count}++;
2898 } else {
2899 $item->{count} = 1;
2900 $item->{text} = $item->{tooltip} = $text;
2901 }
2902 $item->{id} = ++$self->{id};
2903 $item->{timeout} = $timeout;
2904 delete $item->{label};
2905 } else {
2906 $self->{item}{$group} = {
2907 id => ++$self->{id},
2697 text => $text, 2908 text => $text,
2698 timeout => 60, 2909 timeout => $timeout,
2699 tooltip => $text, 2910 tooltip => $text,
2700 fontsize => 0.8,
2701 color => [0.8, 0.8, 0.8, 0.8], 2911 fg => [0.8, 0.8, 0.8, 0.8],
2912 pri => 0,
2913 count => 1,
2702 %arg, 2914 %arg,
2915 };
2703 }; 2916 }
2704
2705 $item->{timeout} += time;
2706 $item->{group} ||= $item+0;
2707
2708 $item = $self->{item}{$item->{group}} ||= $item;
2709 2917
2710 $self->reorder; 2918 $self->reorder;
2919}
2920
2921sub reconfigure {
2922 my ($self) = @_;
2923
2924 delete $_->{label}
2925 for values %{ $self->{item} || {} };
2926
2927 $self->reorder;
2928 $self->SUPER::reconfigure;
2711} 2929}
2712 2930
2713############################################################################# 2931#############################################################################
2714 2932
2715package CFClient::UI::Root; 2933package CFClient::UI::Root;
… …
2747} 2965}
2748 2966
2749sub size_allocate { 2967sub size_allocate {
2750 my ($self, $w, $h) = @_; 2968 my ($self, $w, $h) = @_;
2751 2969
2752 my $old_w = $self->{old_w}; 2970 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2753 my $old_h = $self->{old_h}; 2971 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2754 2972
2755 if ($old_w && $old_h) { 2973 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2756 for my $child ($self->children) { 2974 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2757 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2758 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2759 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2760 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2761 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2762 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2763 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2764 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2765 }
2766 }
2767 2975
2768 for my $child ($self->children) { 2976 for my $child ($self->children) {
2769 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2977 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2770 2978
2979 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2980 if exists $child->{req_x};
2981
2982 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2983 if exists $child->{req_y};
2984
2771 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2985 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2772 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2986 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2987
2773 $child->configure ($X, $Y, $W, $H); 2988 $child->configure ($X, $Y, $W, $H);
2774 } 2989 }
2775
2776 $self->{old_w} = $w;
2777 $self->{old_h} = $h;
2778} 2990}
2779 2991
2780sub coord2local { 2992sub coord2local {
2781 my ($self, $x, $y) = @_; 2993 my ($self, $x, $y) = @_;
2782 2994
… …
2795 $self->check_size; 3007 $self->check_size;
2796 $::WANT_REFRESH++; 3008 $::WANT_REFRESH++;
2797} 3009}
2798 3010
2799sub add { 3011sub add {
2800 my ($self, $child) = @_; 3012 my ($self, @children) = @_;
2801 3013
3014 for my $child (@children) {
3015 $child->{toplevel} = 1;
3016
2802 # integerise window positions 3017 # integerise window positions
2803 $child->{x} = int $child->{x}; 3018 $child->{x} = int $child->{x};
2804 $child->{y} = int $child->{y}; 3019 $child->{y} = int $child->{y};
3020 }
2805 3021
2806 $self->SUPER::add ($child); 3022 $self->SUPER::add (@children);
3023
3024 while (@children) {
3025 my $w = pop @children;
3026 push @children, $w->children;
3027 $w->{visible} = 1;
3028 }
3029}
3030
3031sub remove {
3032 my ($self, @children) = @_;
3033
3034 $self->SUPER::remove (@children);
3035
3036 while (@children) {
3037 my $w = pop @children;
3038 push @children, $w->children;
3039 delete $w->{visible};
3040 }
2807} 3041}
2808 3042
2809sub on_refresh { 3043sub on_refresh {
2810 my ($self, $id, $cb) = @_; 3044 my ($self, $id, $cb) = @_;
2811 3045
2812 $self->{refresh_hook}{$id} = $cb; 3046 $self->{refresh_hook}{$id} = $cb;
2813} 3047}
2814 3048
3049sub on_post_alloc {
3050 my ($self, $id, $cb) = @_;
3051
3052 $self->{post_alloc_hook}{$id} = $cb;
3053}
3054
2815sub draw { 3055sub draw {
2816 my ($self) = @_; 3056 my ($self) = @_;
3057
3058 while ($self->{refresh_hook}) {
3059 $_->()
3060 for values %{delete $self->{refresh_hook}};
3061 }
2817 3062
2818 if ($self->{check_size}) { 3063 if ($self->{check_size}) {
2819 my @queue = ([], []); 3064 my @queue = ([], []);
2820 3065
2821 for (;;) { 3066 for (;;) {
… …
2829 3074
2830 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3075 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2831 ? @$widget{qw(user_w user_h)} 3076 ? @$widget{qw(user_w user_h)}
2832 : $widget->size_request; 3077 : $widget->size_request;
2833 3078
3079 if (delete $widget->{force_alloc}
2834 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 3080 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2835 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3081 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2836 3082
2837 $widget->{req_w} = $w; 3083 $widget->{req_w} = $w;
2838 $widget->{req_h} = $h; 3084 $widget->{req_h} = $h;
2839 3085
2840 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 3086 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2841 3087
2842 $widget->{parent}->check_size 3088 $widget->{parent}->check_size
2843 if $widget->{parent}; 3089 if $widget->{parent};
2844 } 3090 }
2845 } 3091 }
… …
2857 $widget->size_allocate ($w, $h); 3103 $widget->size_allocate ($w, $h);
2858 $widget->emit (size_allocate => $w, $h); 3104 $widget->emit (size_allocate => $w, $h);
2859 } 3105 }
2860 } 3106 }
2861 3107
2862 while ($self->{refresh_hook}) { 3108 while ($self->{post_alloc_hook}) {
2863 $_->() 3109 $_->()
2864 for values %{delete $self->{refresh_hook}}; 3110 for values %{delete $self->{post_alloc_hook}};
2865 } 3111 }
2866 3112
2867 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3113 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2868 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3114 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2869 glClear GL_COLOR_BUFFER_BIT; 3115 glClear GL_COLOR_BUFFER_BIT;
2870 3116
2871 glMatrixMode GL_PROJECTION; 3117 glMatrixMode GL_PROJECTION;
2872 glLoadIdentity; 3118 glLoadIdentity;
2873 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3119 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2874 glMatrixMode GL_MODELVIEW; 3120 glMatrixMode GL_MODELVIEW;
2875 glLoadIdentity; 3121 glLoadIdentity;
2876 3122
2877 $self->_draw; 3123 $self->_draw;
2878} 3124}
… …
2880############################################################################# 3126#############################################################################
2881 3127
2882package CFClient::UI; 3128package CFClient::UI;
2883 3129
2884$ROOT = new CFClient::UI::Root; 3130$ROOT = new CFClient::UI::Root;
2885$TOOLTIP = new CFClient::UI::Tooltip; 3131$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2886 3132
28871 31331
2888 3134

Diff Legend

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