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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.213 by root, Wed May 17 15:18:57 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);
39 $TOOLTIP->check_size; 40 $TOOLTIP->check_size;
40 $TOOLTIP->update; 41 $TOOLTIP->update;
41 } 42 }
… …
132 133
133 for (@$vals) { 134 for (@$vals) {
134 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
135 $rem += $_ - $i; 136 $rem += $_ - $i;
136 $_ = $i; 137 $_ = $i;
138 }
139}
140
141# call when resolution changes etc.
142sub rescale_widgets {
143 my ($sx, $sy) = @_;
144
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET;
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) {
150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
151 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
155 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
157 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
158 }
159
160 $widget->reconfigure;
137 } 161 }
138} 162}
139 163
140############################################################################# 164#############################################################################
141 165
… …
160 if (/^connect_(.*)$/) { 184 if (/^connect_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 185 $self->connect ($1 => delete $self->{$_});
162 } 186 }
163 } 187 }
164 188
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190
165 $self 191 $self
166} 192}
167 193
168sub destroy { 194sub destroy {
169 my ($self) = @_; 195 my ($self) = @_;
… …
242 268
243sub size_allocate { 269sub size_allocate {
244 # nothing to be done 270 # nothing to be done
245} 271}
246 272
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
247sub children { 280sub children {
248}
249
250# call when resolution changes etc.
251sub reconfigure {
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size;
258 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259 $self->update;
260} 281}
261 282
262sub set_max_size { 283sub set_max_size {
263 my ($self, $w, $h) = @_; 284 my ($self, $w, $h) = @_;
264 285
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 286 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 287 delete $self->{max_h}; $self->{max_h} = $h if $h;
288}
289
290sub set_tooltip {
291 my ($self, $tooltip) = @_;
292
293 $self->{tooltip} = $tooltip;
294
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip;
298 }
267} 299}
268 300
269# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
270sub coord2local { 302sub coord2local {
271 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
… …
357 glVertex $self->{w}, 0; 389 glVertex $self->{w}, 0;
358 glVertex $self->{w}, $self->{h}; 390 glVertex $self->{w}, $self->{h};
359 glVertex 0 , $self->{h}; 391 glVertex 0 , $self->{h};
360 glEnd; 392 glEnd;
361 glPopMatrix; 393 glPopMatrix;
362 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
363 } 395 }
364} 396}
365 397
366sub _draw { 398sub _draw {
367 my ($self) = @_; 399 my ($self) = @_;
… …
384sub set_parent { 416sub set_parent {
385 my ($self, $parent) = @_; 417 my ($self, $parent) = @_;
386 418
387 Scalar::Util::weaken ($self->{parent} = $parent); 419 Scalar::Util::weaken ($self->{parent} = $parent);
388 420
421 # TODO: req_w _does_change after ->reconfigure
389 $self->check_size 422 $self->check_size
390 unless exists $self->{req_w}; 423 unless exists $self->{req_w};
391} 424}
392 425
393sub check_size { 426sub check_size {
… …
417} 450}
418 451
419sub DESTROY { 452sub DESTROY {
420 my ($self) = @_; 453 my ($self) = @_;
421 454
455 delete $WIDGET{$self+0};
422 #$self->deactivate; 456 #$self->deactivate;
423} 457}
424 458
425############################################################################# 459#############################################################################
426 460
… …
435 my $class = shift; 469 my $class = shift;
436 470
437 # range [value, low, high, page] 471 # range [value, low, high, page]
438 472
439 $class->SUPER::new ( 473 $class->SUPER::new (
440 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
441 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
442 @_ 476 @_
443 ) 477 )
444} 478}
445 479
446sub _draw { 480sub _draw {
447 my ($self) = @_; 481 my ($self) = @_;
448 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
449 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
450 489
451 glEnable GL_BLEND; 490 glEnable GL_BLEND;
452 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
454 493
455 glBegin GL_QUADS; 494 glBegin GL_QUADS;
456 glVertex 0 , 0; 495 glVertex 0 , 0;
457 glVertex 0 , $h; 496 glVertex 0 , $h;
458 glVertex $w, $h; 497 glVertex $w, $h;
459 glVertex $w, 0; 498 glVertex $w, 0;
460 glEnd; 499 glEnd;
461 500
462 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
463} 503}
464 504
465############################################################################# 505#############################################################################
466 506
467package CFClient::UI::Empty; 507package CFClient::UI::Empty;
… …
628} 668}
629 669
630sub update { 670sub update {
631 my ($self) = @_; 671 my ($self) = @_;
632 672
633 $ROOT->on_refresh ($self => sub { $self->render_child }); 673 $ROOT->on_post_alloc ($self => sub { $self->render_child });
634 $self->SUPER::update; 674 $self->SUPER::update;
635} 675}
636 676
637sub size_allocate { 677sub size_allocate {
638 my ($self, $w, $h) = @_; 678 my ($self, $w, $h) = @_;
… …
776 $self->add ($self->{slider}); 816 $self->add ($self->{slider});
777 817
778 $self 818 $self
779} 819}
780 820
781#TODO# update range on size_allocate depeneing on child 821#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 822# update viewport offset on scroll
783 823
784############################################################################# 824#############################################################################
785 825
786package CFClient::UI::Frame; 826package CFClient::UI::Frame;
787 827
788our @ISA = CFClient::UI::Bin::; 828our @ISA = CFClient::UI::Bin::;
789 829
790use CFClient::OpenGL; 830use CFClient::OpenGL;
831
832sub new {
833 my $class = shift;
834
835 $class->SUPER::new (
836 bg => undef,
837 @_,
838 )
839}
840
841sub _draw {
842 my ($self) = @_;
843
844 if ($self->{bg}) {
845 my ($w, $h) = @$self{qw(w h)};
846
847 glEnable GL_BLEND;
848 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
849 glColor @{ $self->{bg} };
850
851 glBegin GL_QUADS;
852 glVertex 0 , 0;
853 glVertex 0 , $h;
854 glVertex $w, $h;
855 glVertex $w, 0;
856 glEnd;
857
858 glDisable GL_BLEND;
859 }
860
861 $self->SUPER::_draw;
862}
791 863
792############################################################################# 864#############################################################################
793 865
794package CFClient::UI::FancyFrame; 866package CFClient::UI::FancyFrame;
795 867
… …
808 880
809 my $self = $class->SUPER::new ( 881 my $self = $class->SUPER::new (
810 bg => [1, 1, 1, 1], 882 bg => [1, 1, 1, 1],
811 border_bg => [1, 1, 1, 1], 883 border_bg => [1, 1, 1, 1],
812 border => 0.6, 884 border => 0.6,
885 toplevel => 1,
813 can_events => 1, 886 can_events => 1,
814 @_ 887 @_
815 ); 888 );
816 889
817 $self->{title} &&= new CFClient::UI::Label 890 $self->{title} &&= new CFClient::UI::Label
… …
842 my ($self, $w, $h) = @_; 915 my ($self, $w, $h) = @_;
843 916
844 $h -= List::Util::max 0, $self->border * 2; 917 $h -= List::Util::max 0, $self->border * 2;
845 $w -= List::Util::max 0, $self->border * 2; 918 $w -= List::Util::max 0, $self->border * 2;
846 919
847 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 920 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
848 if $self->{title}; 921 if $self->{title};
849 922
850 $self->child->configure ($self->border, $self->border, $w, $h); 923 $self->child->configure ($self->border, $self->border, $w, $h);
851} 924}
852 925
… …
1213 1286
1214############################################################################# 1287#############################################################################
1215 1288
1216package CFClient::UI::Label; 1289package CFClient::UI::Label;
1217 1290
1218our @ISA = CFClient::UI::Base::; 1291our @ISA = CFClient::UI::DrawBG::;
1219 1292
1220use CFClient::OpenGL; 1293use CFClient::OpenGL;
1221 1294
1222sub new { 1295sub new {
1223 my ($class, %arg) = @_; 1296 my ($class, %arg) = @_;
1224 1297
1225 my $self = $class->SUPER::new ( 1298 my $self = $class->SUPER::new (
1226 fg => [1, 1, 1], 1299 fg => [1, 1, 1],
1300 #bg => none
1301 #active_bg => none
1227 #font => default_font 1302 #font => default_font
1228 #text => initial text 1303 #text => initial text
1229 #markup => initial narkup 1304 #markup => initial narkup
1305 #max_w => maximum pixel width
1306 ellipsise => 3, # end
1230 layout => (new CFClient::Layout), 1307 layout => (new CFClient::Layout),
1231 fontsize => 1, 1308 fontsize => 1,
1232 align => -1, 1309 align => -1,
1233 valign => -1, 1310 valign => -1,
1234 padding => 2, 1311 padding => 2,
… …
1249 } 1326 }
1250 1327
1251 $self 1328 $self
1252} 1329}
1253 1330
1254sub escape { 1331sub escape($) {
1255 local $_ = $_[1]; 1332 local $_ = $_[0];
1256 1333
1257 s/&/&amp;/g; 1334 s/&/&amp;/g;
1258 s/>/&gt;/g; 1335 s/>/&gt;/g;
1259 s/</&lt;/g; 1336 s/</&lt;/g;
1260 1337
1261 $_[1] 1338 $_
1262} 1339}
1263 1340
1264sub update { 1341sub update {
1265 my ($self) = @_; 1342 my ($self) = @_;
1266 1343
… …
1299sub size_request { 1376sub size_request {
1300 my ($self) = @_; 1377 my ($self) = @_;
1301 1378
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1379 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $self->{layout}->set_width ($self->{max_w} || -1); 1380 $self->{layout}->set_width ($self->{max_w} || -1);
1381 $self->{layout}->set_ellipsise ($self->{ellipsise});
1382 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1304 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305 1384
1306 my ($w, $h) = $self->{layout}->size; 1385 my ($w, $h) = $self->{layout}->size;
1307 1386
1308 if (exists $self->{template}) { 1387 if (exists $self->{template}) {
… …
1338} 1417}
1339 1418
1340sub _draw { 1419sub _draw {
1341 my ($self) = @_; 1420 my ($self) = @_;
1342 1421
1422 $self->SUPER::_draw; # draw background, if applicable
1423
1343 my $tex = $self->{texture} ||= do { 1424 my $tex = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}}); 1425 $self->{layout}->set_foreground (@{$self->{fg}});
1345 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1426 $self->{layout}->set_font ($self->{font}) if $self->{font};
1346 $self->{layout}->set_width ($self->{w}); 1427 $self->{layout}->set_width ($self->{w});
1428 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1347 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1348 1431
1349 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1432 my $tex = new_from_layout CFClient::Texture $self->{layout};
1350 1433
1351 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1434 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1352 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1435 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1353 : ($self->{w} - $tex->{w}) * 0.5; 1436 : ($self->{w} - $tex->{w}) * 0.5);
1354 1437
1355 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1438 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1356 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1439 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1357 : ($self->{h} - $tex->{h}) * 0.5; 1440 : ($self->{h} - $tex->{h}) * 0.5);
1358 1441
1359 $tex 1442 $tex
1360 }; 1443 };
1361 1444
1362 glEnable GL_TEXTURE_2D; 1445 glEnable GL_TEXTURE_2D;
… …
1417sub set_text { 1500sub set_text {
1418 my ($self, $text) = @_; 1501 my ($self, $text) = @_;
1419 1502
1420 $self->{cursor} = length $text; 1503 $self->{cursor} = length $text;
1421 $self->_set_text ($text); 1504 $self->_set_text ($text);
1505 $self->update;
1422 $self->check_size; 1506 $self->check_size;
1423 $self->update;
1424} 1507}
1425 1508
1426sub get_text { 1509sub get_text {
1427 $_[0]{text} 1510 $_[0]{text}
1428} 1511}
… …
1448 my $sym = $ev->{sym}; 1531 my $sym = $ev->{sym};
1449 my $uni = $ev->{unicode}; 1532 my $uni = $ev->{unicode};
1450 1533
1451 my $text = $self->get_text; 1534 my $text = $self->get_text;
1452 1535
1453 if ($sym == 8) { 1536 if ($uni == 8) {
1454 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1537 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1455 } elsif ($sym == 127) { 1538 } elsif ($uni == 127) {
1456 substr $text, $self->{cursor}, 1, ""; 1539 substr $text, $self->{cursor}, 1, "";
1457 } elsif ($sym == CFClient::SDLK_LEFT) { 1540 } elsif ($sym == CFClient::SDLK_LEFT) {
1458 --$self->{cursor} if $self->{cursor}; 1541 --$self->{cursor} if $self->{cursor};
1459 } elsif ($sym == CFClient::SDLK_RIGHT) { 1542 } elsif ($sym == CFClient::SDLK_RIGHT) {
1460 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1543 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1461 } elsif ($sym == CFClient::SDLK_HOME) { 1544 } elsif ($sym == CFClient::SDLK_HOME) {
1462 $self->{cursor} = 0; 1545 $self->{cursor} = 0;
1463 } elsif ($sym == CFClient::SDLK_END) { 1546 } elsif ($sym == CFClient::SDLK_END) {
1464 $self->{cursor} = length $text; 1547 $self->{cursor} = length $text;
1465 } elsif ($sym == 27) { 1548 } elsif ($uni == 27) {
1466 $self->emit ('escape'); 1549 $self->emit ('escape');
1467 } elsif ($uni) { 1550 } elsif ($uni) {
1468 substr $text, $self->{cursor}++, 0, chr $uni; 1551 substr $text, $self->{cursor}++, 0, chr $uni;
1469 } 1552 }
1470 1553
1471 $self->_set_text ($text); 1554 $self->_set_text ($text);
1472 $self->update; 1555 $self->update;
1556 $self->check_size;
1473} 1557}
1474 1558
1475sub focus_in { 1559sub focus_in {
1476 my ($self) = @_; 1560 my ($self) = @_;
1477 1561
… …
1606 my $class = shift; 1690 my $class = shift;
1607 1691
1608 $class->SUPER::new ( 1692 $class->SUPER::new (
1609 padding => 4, 1693 padding => 4,
1610 fg => [1, 1, 1], 1694 fg => [1, 1, 1],
1611 bg => [1, 1, 1, 0.2],
1612 active_fg => [0, 0, 1], 1695 active_fg => [0, 0, 1],
1613 can_hover => 1, 1696 can_hover => 1,
1614 align => 0, 1697 align => 0,
1615 valign => 0, 1698 valign => 0,
1616 can_events => 1, 1699 can_events => 1,
… …
1664 1747
1665 $class->SUPER::new ( 1748 $class->SUPER::new (
1666 padding => 2, 1749 padding => 2,
1667 fg => [1, 1, 1], 1750 fg => [1, 1, 1],
1668 active_fg => [1, 1, 0], 1751 active_fg => [1, 1, 0],
1752 bg => [0, 0, 0, 0.2],
1753 active_bg => [1, 1, 1, 0.5],
1669 state => 0, 1754 state => 0,
1670 can_hover => 1, 1755 can_hover => 1,
1671 @_ 1756 @_
1672 ) 1757 )
1673} 1758}
… …
1957 qw(s1_slider.png s1_slider_bg.png); 2042 qw(s1_slider.png s1_slider_bg.png);
1958 2043
1959sub new { 2044sub new {
1960 my $class = shift; 2045 my $class = shift;
1961 2046
1962 # range [value, low, high, page] 2047 # range [value, low, high, page, unit]
1963 2048
1964 # TODO: 0-width page 2049 # TODO: 0-width page
1965 # TODO: req_w/h are wrong with vertical 2050 # TODO: req_w/h are wrong with vertical
1966 # TODO: calculations are off 2051 # TODO: calculations are off
1967 my $self = $class->SUPER::new ( 2052 my $self = $class->SUPER::new (
1968 fg => [1, 1, 1], 2053 fg => [1, 1, 1],
1969 active_fg => [0, 0, 0], 2054 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5],
1970 range => [0, 0, 100, 10], 2057 range => [0, 0, 100, 10],
1971 req_w => $::WIDTH / 80, 2058 req_w => $::WIDTH / 80,
1972 req_h => $::WIDTH / 80, 2059 req_h => $::WIDTH / 80,
1973 vertical => 0, 2060 vertical => 0,
1974 can_hover => 1, 2061 can_hover => 1,
1975 inner_pad => 5, 2062 inner_pad => .05,
1976 @_ 2063 @_
1977 ); 2064 );
1978 2065
2066 $self->set_value ($self->{range}[0]);
2067 $self->update;
2068
1979 $self 2069 $self
2070}
2071
2072sub set_value {
2073 my ($self, $value) = @_;
2074
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076
2077 $hi = $lo + 1 if $hi <= $lo;
2078
2079 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi;
2081
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit;
2084
2085 $page = $hi - $lo if $page > $hi - $lo;
2086
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088
2089 if ($value != $old_value) {
2090 $self->emit (changed => $value);
2091 $self->update;
2092 }
1980} 2093}
1981 2094
1982sub size_request { 2095sub size_request {
1983 my ($self) = @_; 2096 my ($self) = @_;
1984 2097
… …
1997 2110
1998sub mouse_motion { 2111sub mouse_motion {
1999 my ($self, $ev, $x, $y) = @_; 2112 my ($self, $ev, $x, $y) = @_;
2000 2113
2001 if ($GRAB == $self) { 2114 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116
2117 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2120
2121 $self->set_value ($x * ($hi - $lo) + $lo);
2122 }
2123}
2124
2125sub update {
2126 my ($self) = @_;
2127
2128 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129 $self->set_value ($self->{range}[0]);
2130
2002 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2131 my ($value, $lo, $hi, $page) = @{$self->{range}};
2003 2132
2004 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2133 my $inner_w = 1 - 2 * $self->{inner_pad};
2005 2134
2006 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2135 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2007 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2008 2136
2009 $x -= $inner_pad_px; # substract the padding 2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2010 $x = $x * ($hi - $lo) / $inner_w + $lo; 2138 $value = $self->{scale} * ($value - $lo);
2011 $x = $lo if $x < $lo;
2012 $x = $hi - $page if $x > $hi - $page;
2013 $self->{range}[0] = $x;
2014 2139
2015 $self->emit (changed => $x); 2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
2016 $self->update; 2141
2142 $value = 0 if $value < 0;
2143 $page = 1 - $value if $value + $page > 1;
2144
2145 $self->{knob_x} = $value;
2146 $self->{knob_w} = $page;
2017 } 2147 });
2018}
2019 2148
2020# the inner_* stuff is for generating a padding for the slider handle, 2149 $self->SUPER::update;
2021# so that the handle doesn't leave the texture. This calculation isn't 100%
2022# correct propably, but it does the job for now
2023sub _calc_inner_pad_px {
2024 my ($self, $w) = @_;
2025 ($w / 100) * $self->{inner_pad} # % to pixels
2026} 2150}
2027 2151
2028sub _draw { 2152sub _draw {
2029 my ($self) = @_; 2153 my ($self) = @_;
2030 2154
2031 $self->SUPER::_draw (); 2155 $self->SUPER::_draw ();
2032 2156
2033 my ($w, $h) = @$self{qw(w h)}; 2157 glScale $self->{w}, $self->{h};
2034 2158
2035 if ($self->{vertical}) { 2159 if ($self->{vertical}) {
2036 # draw a vertical slider like a rotated horizontal slider 2160 # draw a vertical slider like a rotated horizontal slider
2037 2161
2038 glRotate 90, 0, 0, 1; 2162 glRotate 90, 0, 0, 1;
2039 glTranslate 0, -$self->{w}, 0; 2163 glTranslate 0, 1, 0;
2040
2041 ($w, $h) = ($h, $w);
2042 } 2164 }
2043 2165
2044 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2166 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2045 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2167 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2046 2168
2047 my ($value, $lo, $hi, $page) = @{$self->{range}};
2048
2049 $hi = $value + 1 if $lo == $hi;
2050
2051 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2052 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2053
2054 $page = int $page * $inner_w / ($hi - $lo);
2055 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2056
2057 $w -= $page;
2058 $page &= ~1;
2059 glTranslate $page * 0.5, 0, 0;
2060 $page ||= 2;
2061
2062 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2063 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2064
2065 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2067 2171
2068 # draw background 2172 # draw background
2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2173 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2070 2174
2071 # draw handle 2175 # draw handle
2072 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2176 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2073 2177
2074 glDisable GL_TEXTURE_2D; 2178 glDisable GL_TEXTURE_2D;
2075} 2179}
2076 2180
2077############################################################################# 2181#############################################################################
… …
2165 2269
2166 return unless $self->{h} > 0; 2270 return unless $self->{h} > 0;
2167 2271
2168 delete $self->{texture}; 2272 delete $self->{texture};
2169 2273
2170 $ROOT->on_refresh ($self, sub { 2274 $ROOT->on_post_alloc ($self, sub {
2171 if (delete $self->{need_reflow}) { 2275 if (delete $self->{need_reflow}) {
2172 my $height = 0; 2276 my $height = 0;
2173 2277
2174 $height += $_->[0] = $self->text_height ($_->[2]) 2278 $height += $_->[0] = $self->text_height ($_->[2])
2175 for @{$self->{par}}; 2279 for @{$self->{par}};
… …
2331 2435
2332sub set_tooltip_from { 2436sub set_tooltip_from {
2333 my ($self, $widget) = @_; 2437 my ($self, $widget) = @_;
2334 2438
2335 $self->add (new CFClient::UI::Label 2439 $self->add (new CFClient::UI::Label
2336 markup => $widget->{tooltip}, 2440 markup => $widget->{tooltip},
2337 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338 fontsize => 0.8, 2442 fontsize => 0.8,
2339 fg => [0, 0, 0, 1], 2443 fg => [0, 0, 0, 1],
2444 ellipsise => 0,
2340 font => ($widget->{tooltip_font} || $::FONT_PROP), 2445 font => ($widget->{tooltip_font} || $::FONT_PROP),
2341 ); 2446 );
2342} 2447}
2343 2448
2344sub size_request { 2449sub size_request {
2345 my ($self) = @_; 2450 my ($self) = @_;
… …
2423 2528
2424package CFClient::UI::InventoryItem; 2529package CFClient::UI::InventoryItem;
2425 2530
2426our @ISA = CFClient::UI::HBox::; 2531our @ISA = CFClient::UI::HBox::;
2427 2532
2533sub _item_to_desc {
2534 my ($item) = @_;
2535
2536 my $desc =
2537 $item->{nrof} < 2
2538 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}";
2540
2541 $item->{flags} & Crossfire::Protocol::F_OPEN
2542 and $desc .= " (open)";
2543 $item->{flags} & Crossfire::Protocol::F_APPLIED
2544 and $desc .= " (applied)";
2545 $item->{flags} & Crossfire::Protocol::F_UNPAID
2546 and $desc .= " (unpaid)";
2547 $item->{flags} & Crossfire::Protocol::F_MAGIC
2548 and $desc .= " (magic)";
2549 $item->{flags} & Crossfire::Protocol::F_CURSED
2550 and $desc .= " (cursed)";
2551 $item->{flags} & Crossfire::Protocol::F_DAMNED
2552 and $desc .= " (damned)";
2553 $item->{flags} & Crossfire::Protocol::F_LOCKED
2554 and $desc .= " *";
2555
2556 $desc
2557}
2558
2428sub new { 2559sub new {
2429 my $class = shift; 2560 my $class = shift;
2430 2561
2431 my %args = @_; 2562 my %args = @_;
2432 2563
2433 my $item = delete $args{item}; 2564 my $item = delete $args{item};
2434 2565
2435 my $desc = $item->{nrof} < 2 2566 my $desc = _item_to_desc ($item);
2436 ? $item->{name}
2437 : "$item->{nrof} $item->{name_pl}";
2438
2439 2567
2440 my $self = $class->SUPER::new ( 2568 my $self = $class->SUPER::new (
2441 can_hover => 1, 2569 can_hover => 1,
2442 can_events => 1, 2570 can_events => 1,
2443 tooltip => (CFClient::UI::Label->escape ($desc) 2571 tooltip => ((CFClient::UI::Label::escape $desc)
2444 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2445 connect_button_down => sub { 2573 connect_button_down => sub {
2446 my ($self, $ev, $x, $y) = @_; 2574 my ($self, $ev, $x, $y) = @_;
2447 2575
2448 # todo: maybe put examine on 1? but should just be a tooltip :( 2576 # todo: maybe put examine on 1? but should just be a tooltip :(
2449 if ($ev->{button} == 1) { 2577 if ($ev->{button} == 1) {
2578 my $targ = $::CONN->{player}{tag};
2579
2580 if ($item->{container} == $::CONN->{player}{tag}) {
2581 $targ = $main::OPENCONT;
2582 }
2583
2450 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2584 $::CONN->send ("move $targ $item->{tag} 0");
2451 } elsif ($ev->{button} == 2) { 2585 } elsif ($ev->{button} == 2) {
2452 $::CONN->send ("apply $item->{tag}"); 2586 $::CONN->send ("apply $item->{tag}");
2453 } elsif ($ev->{button} == 3) { 2587 } elsif ($ev->{button} == 3) {
2454 CFClient::UI::Menu->new ( 2588 my @menu_items = (
2455 items => [
2456 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2589 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2591 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2592 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2457 [ 2593 [
2458 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459 sub { $::CONN->send ("lock $item->{tag}") }, 2595 sub { $::CONN->send ("lock $item->{tag}") },
2460 ],
2461 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2462 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2463 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2464 ], 2596 ],
2465 )->popup ($ev); 2597 );
2598
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2466 } 2600 }
2467 2601
2468 1 2602 1
2469 }, 2603 },
2470 %args 2604 %args
2471 ); 2605 );
2606
2472 2607
2473 $self->add (new CFClient::UI::Face 2608 $self->add (new CFClient::UI::Face
2474 can_events => 0, 2609 can_events => 0,
2475 face => $item->{face}, 2610 face => $item->{face},
2476 anim => $item->{anim}, 2611 anim => $item->{anim},
2477 animspeed => $item->{animspeed}, 2612 animspeed => $item->{animspeed},
2478 ); 2613 );
2479 2614
2480 $self->add (new CFClient::UI::Label 2615 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2481 can_events => 0, 2616
2482 text => $desc, 2617 $self->{item} = $item;
2483 ); 2618
2619 $self->update_item;
2484 2620
2485 $self 2621 $self
2622}
2623
2624sub update_item {
2625 my ($self) = @_;
2626
2627 my $desc = _item_to_desc ($self->{item});
2628
2629 $self->{name_lbl}->set_text ($desc);
2486} 2630}
2487 2631
2488############################################################################# 2632#############################################################################
2489 2633
2490package CFClient::UI::Inventory; 2634package CFClient::UI::Inventory;
… …
2506 my ($self, $items) = @_; 2650 my ($self, $items) = @_;
2507 2651
2508 $self->{scrolled}->clear; 2652 $self->{scrolled}->clear;
2509 return unless $items; 2653 return unless $items;
2510 2654
2511 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2655 my @items = sort {
2656 ($a->{type} <=> $b->{type})
2657 or ($a->{name} cmp $b->{name})
2658 } @$items;
2512 2659
2513 $self->{real_items} = \@items; 2660 $self->{real_items} = \@items;
2514 2661
2515 for my $item (@items) { 2662 for my $item (@items) {
2516 my $desc = $item->{nrof} < 2
2517 ? $item->{name}
2518 : "$item->{nrof} $item->{name_pl}";
2519
2520 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item ();
2521 } 2665 }
2666
2667 $self->{scrolled}->add (@items);
2522 2668
2523# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2524} 2670}
2525 2671
2526sub size_request { 2672sub size_request {
… …
2604 2750
2605package CFClient::UI::Statusbox; 2751package CFClient::UI::Statusbox;
2606 2752
2607our @ISA = CFClient::UI::VBox::; 2753our @ISA = CFClient::UI::VBox::;
2608 2754
2755sub new {
2756 my $class = shift;
2757
2758 $class->SUPER::new (
2759 fontsize => 0.8,
2760 @_,
2761 )
2762}
2763
2609sub reorder { 2764sub reorder {
2610 my ($self) = @_; 2765 my ($self) = @_;
2611 my $NOW = time; 2766 my $NOW = time;
2612 2767
2613 while (my ($k, $v) = each %{ $self->{item} }) { 2768 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2631 ? "<b>$item->{count} ×</b> $item->{text}" 2786 ? "<b>$item->{count} ×</b> $item->{text}"
2632 : $item->{text}; 2787 : $item->{text};
2633 2788
2634 for ($short) { 2789 for ($short) {
2635 s/^\s+//; 2790 s/^\s+//;
2636 s/\012.*/…/s; 2791 s/\s+/ /g;
2637 my $len = int 30 / $item->{fontsize};
2638 substr $_, $len, length, "…" if $len < length;
2639 } 2792 }
2640 2793
2641 new CFClient::UI::Label 2794 new CFClient::UI::Label
2642 markup => $short, 2795 markup => $short,
2643 tooltip => $item->{tooltip}, 2796 tooltip => $item->{tooltip},
2644 tooltip_font => $::FONT_PROP, 2797 tooltip_font => $::FONT_PROP,
2645 tooltip_width => 0.67, 2798 tooltip_width => 0.67,
2646 fontsize => $item->{fontsize}, 2799 fontsize => $item->{fontsize} || $self->{fontsize},
2800 max_w => $::WIDTH * 0.44,
2647 color => $item->{color}, 2801 fg => $item->{fg},
2648 can_events => 1, 2802 can_events => 1,
2649 can_hover => 1 2803 can_hover => 1
2650 }; 2804 };
2651 } 2805 }
2652 2806
… …
2654 $self->SUPER::add (reverse @widgets); 2808 $self->SUPER::add (reverse @widgets);
2655} 2809}
2656 2810
2657sub add { 2811sub add {
2658 my ($self, $text, %arg) = @_; 2812 my ($self, $text, %arg) = @_;
2813
2814 $text =~ s/^\s+//;
2815 $text =~ s/\s+$//;
2659 2816
2660 my $timeout = time + ((delete $arg{timeout}) || 60); 2817 my $timeout = time + ((delete $arg{timeout}) || 60);
2661 2818
2662 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2819 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663 2820
… …
2666 $item->{count}++; 2823 $item->{count}++;
2667 } else { 2824 } else {
2668 $item->{count} = 1; 2825 $item->{count} = 1;
2669 $item->{text} = $item->{tooltip} = $text; 2826 $item->{text} = $item->{tooltip} = $text;
2670 } 2827 }
2828 $item->{id} = ++$self->{id};
2671 $item->{timeout} = $timeout; 2829 $item->{timeout} = $timeout;
2672 delete $item->{label}; 2830 delete $item->{label};
2673 } else { 2831 } else {
2674 $self->{item}{$group} = { 2832 $self->{item}{$group} = {
2675 id => ++$self->{id}, 2833 id => ++$self->{id},
2676 text => $text, 2834 text => $text,
2677 timeout => $timeout, 2835 timeout => $timeout,
2678 tooltip => $text, 2836 tooltip => $text,
2679 fontsize => 0.8,
2680 color => [0.8, 0.8, 0.8, 0.8], 2837 fg => [0.8, 0.8, 0.8, 0.8],
2681 pri => 0, 2838 pri => 0,
2682 count => 1, 2839 count => 1,
2683 %arg, 2840 %arg,
2684 }; 2841 };
2685 } 2842 }
2686 2843
2687 $self->reorder; 2844 $self->reorder;
2688} 2845}
2689 2846
2847sub reconfigure {
2848 my ($self) = @_;
2849
2850 delete $_->{label}
2851 for values %{ $self->{item} || {} };
2852
2853 $self->reorder;
2854 $self->SUPER::reconfigure;
2855}
2856
2690############################################################################# 2857#############################################################################
2691 2858
2692package CFClient::UI::Root; 2859package CFClient::UI::Root;
2693 2860
2694our @ISA = CFClient::UI::Container::; 2861our @ISA = CFClient::UI::Container::;
… …
2724} 2891}
2725 2892
2726sub size_allocate { 2893sub size_allocate {
2727 my ($self, $w, $h) = @_; 2894 my ($self, $w, $h) = @_;
2728 2895
2729 my $old_w = $self->{old_w}; 2896 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2730 my $old_h = $self->{old_h}; 2897 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2731 2898
2732 if ($old_w && $old_h) { 2899 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2733 for my $child ($self->children) { 2900 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2734 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2735 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2736 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2737 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2738 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2739 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2740 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2741 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2742 }
2743 }
2744 2901
2745 for my $child ($self->children) { 2902 for my $child ($self->children) {
2746 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2903 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2747 2904
2905 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2906 if exists $child->{req_x};
2907
2908 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2909 if exists $child->{req_y};
2910
2748 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2911 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2749 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2912 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2913
2750 $child->configure ($X, $Y, $W, $H); 2914 $child->configure ($X, $Y, $W, $H);
2751 } 2915 }
2752
2753 $self->{old_w} = $w;
2754 $self->{old_h} = $h;
2755} 2916}
2756 2917
2757sub coord2local { 2918sub coord2local {
2758 my ($self, $x, $y) = @_; 2919 my ($self, $x, $y) = @_;
2759 2920
… …
2772 $self->check_size; 2933 $self->check_size;
2773 $::WANT_REFRESH++; 2934 $::WANT_REFRESH++;
2774} 2935}
2775 2936
2776sub add { 2937sub add {
2777 my ($self, $child) = @_; 2938 my ($self, @children) = @_;
2778 2939
2940 for my $child (@children) {
2941 $child->{toplevel} = 1;
2942
2779 # integerise window positions 2943 # integerise window positions
2780 $child->{x} = int $child->{x}; 2944 $child->{x} = int $child->{x};
2781 $child->{y} = int $child->{y}; 2945 $child->{y} = int $child->{y};
2946 }
2782 2947
2783 $self->SUPER::add ($child); 2948 $self->SUPER::add (@children);
2784} 2949}
2785 2950
2786sub on_refresh { 2951sub on_refresh {
2787 my ($self, $id, $cb) = @_; 2952 my ($self, $id, $cb) = @_;
2788 2953
2789 $self->{refresh_hook}{$id} = $cb; 2954 $self->{refresh_hook}{$id} = $cb;
2790} 2955}
2791 2956
2957sub on_post_alloc {
2958 my ($self, $id, $cb) = @_;
2959
2960 $self->{post_alloc_hook}{$id} = $cb;
2961}
2962
2792sub draw { 2963sub draw {
2793 my ($self) = @_; 2964 my ($self) = @_;
2965
2966 while ($self->{refresh_hook}) {
2967 $_->()
2968 for values %{delete $self->{refresh_hook}};
2969 }
2794 2970
2795 if ($self->{check_size}) { 2971 if ($self->{check_size}) {
2796 my @queue = ([], []); 2972 my @queue = ([], []);
2797 2973
2798 for (;;) { 2974 for (;;) {
… …
2835 $widget->size_allocate ($w, $h); 3011 $widget->size_allocate ($w, $h);
2836 $widget->emit (size_allocate => $w, $h); 3012 $widget->emit (size_allocate => $w, $h);
2837 } 3013 }
2838 } 3014 }
2839 3015
2840 while ($self->{refresh_hook}) { 3016 while ($self->{post_alloc_hook}) {
2841 $_->() 3017 $_->()
2842 for values %{delete $self->{refresh_hook}}; 3018 for values %{delete $self->{post_alloc_hook}};
2843 } 3019 }
2844 3020
2845 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3021 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2847 glClear GL_COLOR_BUFFER_BIT; 3023 glClear GL_COLOR_BUFFER_BIT;
… …
2858############################################################################# 3034#############################################################################
2859 3035
2860package CFClient::UI; 3036package CFClient::UI;
2861 3037
2862$ROOT = new CFClient::UI::Root; 3038$ROOT = new CFClient::UI::Root;
2863$TOOLTIP = new CFClient::UI::Tooltip; 3039$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2864 3040
28651 30411
2866 3042

Diff Legend

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