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.199 by root, Fri May 12 15:45:42 2006 UTC vs.
Revision 1.217 by root, Fri May 19 23:18:42 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
247sub children {
248}
249
250# call when resolution changes etc.
251sub reconfigure { 273sub reconfigure {
252 my ($self) = @_; 274 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256 275
257 $self->check_size (1); 276 $self->check_size (1);
258 $self->update; 277 $self->update;
259} 278}
260 279
280sub children {
281}
282
261sub set_max_size { 283sub set_max_size {
262 my ($self, $w, $h) = @_; 284 my ($self, $w, $h) = @_;
263 285
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 286 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 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 }
266} 299}
267 300
268# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
269sub coord2local { 302sub coord2local {
270 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
… …
356 glVertex $self->{w}, 0; 389 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h}; 390 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h}; 391 glVertex 0 , $self->{h};
359 glEnd; 392 glEnd;
360 glPopMatrix; 393 glPopMatrix;
361 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;
362 } 395 }
363} 396}
364 397
365sub _draw { 398sub _draw {
366 my ($self) = @_; 399 my ($self) = @_;
… …
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;
… …
651 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652 glClearColor 0, 0, 0, 0; 692 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT; 693 glClear GL_COLOR_BUFFER_BIT;
654 694
655 $self->_render; 695 $self->_render;
656# glColorMask 1, 1, 1, 0;
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 }; 696 };
664} 697}
665 698
666sub _draw { 699sub _draw {
667 my ($self) = @_; 700 my ($self) = @_;
… …
671 my $tex = $self->{texture} 704 my $tex = $self->{texture}
672 or return; 705 or return;
673 706
674 glEnable GL_TEXTURE_2D; 707 glEnable GL_TEXTURE_2D;
675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1; 709 glColor 1, 1, 1, 1;
677 710
678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679 712
680 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
681} 714}
… …
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 }, 798 },
766 ; 799 ;
767 800
768 $self = $class->SUPER::new ( 801 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 802 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 803 slider => $slider,
771 @_, 804 @_,
772 ); 805 );
773 806
774 $self->{vp}->add ($self->{scrolled}); 807 $self->{vp}->add ($self->{scrolled});
… …
840 873
841 my $self = $class->SUPER::new ( 874 my $self = $class->SUPER::new (
842 bg => [1, 1, 1, 1], 875 bg => [1, 1, 1, 1],
843 border_bg => [1, 1, 1, 1], 876 border_bg => [1, 1, 1, 1],
844 border => 0.6, 877 border => 0.6,
878 toplevel => 1,
845 can_events => 1, 879 can_events => 1,
846 @_ 880 @_
847 ); 881 );
848 882
849 $self->{title} &&= new CFClient::UI::Label 883 $self->{title} &&= new CFClient::UI::Label
… …
874 my ($self, $w, $h) = @_; 908 my ($self, $w, $h) = @_;
875 909
876 $h -= List::Util::max 0, $self->border * 2; 910 $h -= List::Util::max 0, $self->border * 2;
877 $w -= List::Util::max 0, $self->border * 2; 911 $w -= List::Util::max 0, $self->border * 2;
878 912
879 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
880 if $self->{title}; 914 if $self->{title};
881 915
882 $self->child->configure ($self->border, $self->border, $w, $h); 916 $self->child->configure ($self->border, $self->border, $w, $h);
883} 917}
884 918
… …
1245 1279
1246############################################################################# 1280#############################################################################
1247 1281
1248package CFClient::UI::Label; 1282package CFClient::UI::Label;
1249 1283
1250our @ISA = CFClient::UI::Base::; 1284our @ISA = CFClient::UI::DrawBG::;
1251 1285
1252use CFClient::OpenGL; 1286use CFClient::OpenGL;
1253 1287
1254sub new { 1288sub new {
1255 my ($class, %arg) = @_; 1289 my ($class, %arg) = @_;
1256 1290
1257 my $self = $class->SUPER::new ( 1291 my $self = $class->SUPER::new (
1258 fg => [1, 1, 1], 1292 fg => [1, 1, 1],
1293 #bg => none
1294 #active_bg => none
1259 #font => default_font 1295 #font => default_font
1260 #text => initial text 1296 #text => initial text
1261 #markup => initial narkup 1297 #markup => initial narkup
1298 #max_w => maximum pixel width
1299 ellipsise => 3, # end
1262 layout => (new CFClient::Layout), 1300 layout => (new CFClient::Layout),
1263 fontsize => 1, 1301 fontsize => 1,
1264 align => -1, 1302 align => -1,
1265 valign => -1, 1303 valign => -1,
1266 padding => 2, 1304 padding => 2,
… …
1281 } 1319 }
1282 1320
1283 $self 1321 $self
1284} 1322}
1285 1323
1286sub escape { 1324sub escape($) {
1287 local $_ = $_[1]; 1325 local $_ = $_[0];
1288 1326
1289 s/&/&amp;/g; 1327 s/&/&amp;/g;
1290 s/>/&gt;/g; 1328 s/>/&gt;/g;
1291 s/</&lt;/g; 1329 s/</&lt;/g;
1292 1330
1293 $_[1] 1331 $_
1294} 1332}
1295 1333
1296sub update { 1334sub update {
1297 my ($self) = @_; 1335 my ($self) = @_;
1298 1336
… …
1331sub size_request { 1369sub size_request {
1332 my ($self) = @_; 1370 my ($self) = @_;
1333 1371
1334 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1372 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $self->{layout}->set_width ($self->{max_w} || -1); 1373 $self->{layout}->set_width ($self->{max_w} || -1);
1374 $self->{layout}->set_ellipsise ($self->{ellipsise});
1375 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337 1377
1338 my ($w, $h) = $self->{layout}->size; 1378 my ($w, $h) = $self->{layout}->size;
1339 1379
1340 if (exists $self->{template}) { 1380 if (exists $self->{template}) {
… …
1370} 1410}
1371 1411
1372sub _draw { 1412sub _draw {
1373 my ($self) = @_; 1413 my ($self) = @_;
1374 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1375 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}}); 1418 $self->{layout}->set_foreground (@{$self->{fg}});
1377 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1378 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1380 1424
1381 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1425 my $tex = new_from_layout CFClient::Texture $self->{layout};
1382 1426
1383 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1384 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385 : ($self->{w} - $tex->{w}) * 0.5; 1429 : ($self->{w} - $tex->{w}) * 0.5);
1386 1430
1387 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1388 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389 : ($self->{h} - $tex->{h}) * 0.5; 1433 : ($self->{h} - $tex->{h}) * 0.5);
1390 1434
1391 $tex 1435 $tex
1392 }; 1436 };
1393 1437
1394 glEnable GL_TEXTURE_2D; 1438 glEnable GL_TEXTURE_2D;
… …
1449sub set_text { 1493sub set_text {
1450 my ($self, $text) = @_; 1494 my ($self, $text) = @_;
1451 1495
1452 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1453 $self->_set_text ($text); 1497 $self->_set_text ($text);
1498 $self->update;
1454 $self->check_size; 1499 $self->check_size;
1455 $self->update;
1456} 1500}
1457 1501
1458sub get_text { 1502sub get_text {
1459 $_[0]{text} 1503 $_[0]{text}
1460} 1504}
… …
1480 my $sym = $ev->{sym}; 1524 my $sym = $ev->{sym};
1481 my $uni = $ev->{unicode}; 1525 my $uni = $ev->{unicode};
1482 1526
1483 my $text = $self->get_text; 1527 my $text = $self->get_text;
1484 1528
1485 if ($sym == 8) { 1529 if ($uni == 8) {
1486 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1530 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1487 } elsif ($sym == 127) { 1531 } elsif ($uni == 127) {
1488 substr $text, $self->{cursor}, 1, ""; 1532 substr $text, $self->{cursor}, 1, "";
1489 } elsif ($sym == CFClient::SDLK_LEFT) { 1533 } elsif ($sym == CFClient::SDLK_LEFT) {
1490 --$self->{cursor} if $self->{cursor}; 1534 --$self->{cursor} if $self->{cursor};
1491 } elsif ($sym == CFClient::SDLK_RIGHT) { 1535 } elsif ($sym == CFClient::SDLK_RIGHT) {
1492 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1536 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1493 } elsif ($sym == CFClient::SDLK_HOME) { 1537 } elsif ($sym == CFClient::SDLK_HOME) {
1494 $self->{cursor} = 0; 1538 $self->{cursor} = 0;
1495 } elsif ($sym == CFClient::SDLK_END) { 1539 } elsif ($sym == CFClient::SDLK_END) {
1496 $self->{cursor} = length $text; 1540 $self->{cursor} = length $text;
1497 } elsif ($sym == 27) { 1541 } elsif ($uni == 27) {
1498 $self->emit ('escape'); 1542 $self->emit ('escape');
1499 } elsif ($uni) { 1543 } elsif ($uni) {
1500 substr $text, $self->{cursor}++, 0, chr $uni; 1544 substr $text, $self->{cursor}++, 0, chr $uni;
1501 } 1545 }
1502 1546
1503 $self->_set_text ($text); 1547 $self->_set_text ($text);
1504 $self->update; 1548 $self->update;
1549 $self->check_size;
1505} 1550}
1506 1551
1507sub focus_in { 1552sub focus_in {
1508 my ($self) = @_; 1553 my ($self) = @_;
1509 1554
… …
1638 my $class = shift; 1683 my $class = shift;
1639 1684
1640 $class->SUPER::new ( 1685 $class->SUPER::new (
1641 padding => 4, 1686 padding => 4,
1642 fg => [1, 1, 1], 1687 fg => [1, 1, 1],
1643 bg => [1, 1, 1, 0.2],
1644 active_fg => [0, 0, 1], 1688 active_fg => [0, 0, 1],
1645 can_hover => 1, 1689 can_hover => 1,
1646 align => 0, 1690 align => 0,
1647 valign => 0, 1691 valign => 0,
1648 can_events => 1, 1692 can_events => 1,
… …
1696 1740
1697 $class->SUPER::new ( 1741 $class->SUPER::new (
1698 padding => 2, 1742 padding => 2,
1699 fg => [1, 1, 1], 1743 fg => [1, 1, 1],
1700 active_fg => [1, 1, 0], 1744 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5],
1701 state => 0, 1747 state => 0,
1702 can_hover => 1, 1748 can_hover => 1,
1703 @_ 1749 @_
1704 ) 1750 )
1705} 1751}
… …
1989 qw(s1_slider.png s1_slider_bg.png); 2035 qw(s1_slider.png s1_slider_bg.png);
1990 2036
1991sub new { 2037sub new {
1992 my $class = shift; 2038 my $class = shift;
1993 2039
1994 # range [value, low, high, page] 2040 # range [value, low, high, page, unit]
1995 2041
1996 # TODO: 0-width page 2042 # TODO: 0-width page
1997 # TODO: req_w/h are wrong with vertical 2043 # TODO: req_w/h are wrong with vertical
1998 # TODO: calculations are off 2044 # TODO: calculations are off
1999 my $self = $class->SUPER::new ( 2045 my $self = $class->SUPER::new (
2000 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
2001 active_fg => [0, 0, 0], 2047 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
2002 range => [0, 0, 100, 10], 2050 range => [0, 0, 100, 10],
2003 req_w => $::WIDTH / 80, 2051 req_w => $::WIDTH / 80,
2004 req_h => $::WIDTH / 80, 2052 req_h => $::WIDTH / 80,
2005 vertical => 0, 2053 vertical => 0,
2006 can_hover => 1, 2054 can_hover => 1,
2007 inner_pad => 5, 2055 inner_pad => 0.02,
2008 @_ 2056 @_
2009 ); 2057 );
2010 2058
2059 $self->set_value ($self->{range}[0]);
2060 $self->update;
2061
2011 $self 2062 $self
2063}
2064
2065sub set_value {
2066 my ($self, $value) = @_;
2067
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069
2070 $hi = $lo + 1 if $hi <= $lo;
2071
2072 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi;
2074
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit;
2077
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081
2082 if ($value != $old_value) {
2083 $self->emit (changed => $value);
2084 $self->update;
2085 }
2012} 2086}
2013 2087
2014sub size_request { 2088sub size_request {
2015 my ($self) = @_; 2089 my ($self) = @_;
2016 2090
… …
2029 2103
2030sub mouse_motion { 2104sub mouse_motion {
2031 my ($self, $ev, $x, $y) = @_; 2105 my ($self, $ev, $x, $y) = @_;
2032 2106
2033 if ($GRAB == $self) { 2107 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109
2110 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2113
2114 $self->set_value ($x * ($hi - $lo) + $lo);
2115 }
2116}
2117
2118sub update {
2119 my ($self) = @_;
2120
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]);
2123
2034 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2124 my ($value, $lo, $hi, $page) = @{$self->{range}};
2035 2125
2036 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2126 my $inner_w = 1 - 2 * $self->{inner_pad};
2037 2127
2038 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2039 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2040 2129
2041 $x -= $inner_pad_px; # substract the padding 2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2042 $x = $x * ($hi - $lo) / $inner_w + $lo; 2131 $value = $self->{scale} * ($value - $lo);
2043 $x = $lo if $x < $lo;
2044 $x = $hi - $page if $x > $hi - $page;
2045 $self->{range}[0] = $x;
2046 2132
2047 $self->emit (changed => $x); 2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2048 $self->update; 2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value;
2139 $self->{knob_w} = $page;
2049 } 2140 });
2050}
2051 2141
2052# the inner_* stuff is for generating a padding for the slider handle, 2142 $self->SUPER::update;
2053# so that the handle doesn't leave the texture. This calculation isn't 100%
2054# correct propably, but it does the job for now
2055sub _calc_inner_pad_px {
2056 my ($self, $w) = @_;
2057 ($w / 100) * $self->{inner_pad} # % to pixels
2058} 2143}
2059 2144
2060sub _draw { 2145sub _draw {
2061 my ($self) = @_; 2146 my ($self) = @_;
2062 2147
2063 $self->SUPER::_draw (); 2148 $self->SUPER::_draw ();
2064 2149
2065 my ($w, $h) = @$self{qw(w h)}; 2150 glScale $self->{w}, $self->{h};
2066 2151
2067 if ($self->{vertical}) { 2152 if ($self->{vertical}) {
2068 # draw a vertical slider like a rotated horizontal slider 2153 # draw a vertical slider like a rotated horizontal slider
2069 2154
2155 glTranslate 1, 0, 0;
2070 glRotate 90, 0, 0, 1; 2156 glRotate 90, 0, 0, 1;
2071 glTranslate 0, -$self->{w}, 0;
2072
2073 ($w, $h) = ($h, $w);
2074 } 2157 }
2075 2158
2076 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2159 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2077 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2160 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2078 2161
2079 my ($value, $lo, $hi, $page) = @{$self->{range}};
2080
2081 $hi = $value + 1 if $lo == $hi;
2082
2083 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2084 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2085
2086 $page = int $page * $inner_w / ($hi - $lo);
2087 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2088
2089 $w -= $page;
2090 $page &= ~1;
2091 glTranslate $page * 0.5, 0, 0;
2092 $page ||= 2;
2093
2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2096
2097 glEnable GL_TEXTURE_2D; 2162 glEnable GL_TEXTURE_2D;
2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2163 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2099 2164
2100 # draw background 2165 # draw background
2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2166 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2102 2167
2103 # draw handle 2168 # draw handle
2104 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2105 2170
2106 glDisable GL_TEXTURE_2D; 2171 glDisable GL_TEXTURE_2D;
2107} 2172}
2108 2173
2109############################################################################# 2174#############################################################################
… …
2212 2277
2213 delete $self->{texture}; 2278 delete $self->{texture};
2214 } 2279 }
2215 2280
2216 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2217 glClearColor 0, 0, 0, 0; 2282 glClearColor 0.5, 0.5, 0.5, 0;
2218 glClear GL_COLOR_BUFFER_BIT; 2283 glClear GL_COLOR_BUFFER_BIT;
2219 2284
2220 glEnable GL_TEXTURE_2D; 2285 glEnable GL_TEXTURE_2D;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222 2287
… …
2254 my ($self) = @_; 2319 my ($self) = @_;
2255 2320
2256 glEnable GL_TEXTURE_2D; 2321 glEnable GL_TEXTURE_2D;
2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2258 glColor 1, 1, 1, 1; 2323 glColor 1, 1, 1, 1;
2259 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2324 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2260 glDisable GL_TEXTURE_2D; 2325 glDisable GL_TEXTURE_2D;
2261 2326
2262 $self->{children}[1]->draw; 2327 $self->{children}[1]->draw;
2263 2328
2264} 2329}
… …
2363 2428
2364sub set_tooltip_from { 2429sub set_tooltip_from {
2365 my ($self, $widget) = @_; 2430 my ($self, $widget) = @_;
2366 2431
2367 $self->add (new CFClient::UI::Label 2432 $self->add (new CFClient::UI::Label
2368 markup => $widget->{tooltip}, 2433 markup => $widget->{tooltip},
2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8, 2435 fontsize => 0.8,
2371 fg => [0, 0, 0, 1], 2436 fg => [0, 0, 0, 1],
2437 ellipsise => 0,
2372 font => ($widget->{tooltip_font} || $::FONT_PROP), 2438 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 ); 2439 );
2374} 2440}
2375 2441
2376sub size_request { 2442sub size_request {
2377 my ($self) = @_; 2443 my ($self) = @_;
… …
2423use CFClient::OpenGL; 2489use CFClient::OpenGL;
2424 2490
2425sub new { 2491sub new {
2426 my $class = shift; 2492 my $class = shift;
2427 2493
2428 $class->SUPER::new ( 2494 my $self = $class->SUPER::new (
2429 aspect => 1, 2495 aspect => 1,
2430 @_, 2496 @_,
2431 ) 2497 );
2498
2499 if ($self->{anim} && $self->{animspeed}) {
2500 Scalar::Util::weaken (my $widget = $self);
2501
2502 $self->{timer} = Event->timer (
2503 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2504 hard => 1,
2505 interval => $self->{animspeed},
2506 cb => sub {
2507 ++$widget->{frame};
2508 $widget->update;
2509 },
2510 );
2511 }
2512
2513 $self
2432} 2514}
2433 2515
2434sub size_request { 2516sub size_request {
2435 (32, 8) 2517 (32, 8)
2436} 2518}
2437 2519
2438sub _draw { 2520sub _draw {
2439 my ($self) = @_; 2521 my ($self) = @_;
2440 2522
2441 return unless $::CONN;#d# manage and cache textures differently 2523 return unless $::CONN;#d# manage and cache textures differently
2524
2525 my $face;
2526
2527 if ($self->{frame}) {
2528 my $anim = $::CONN->{anim}[$self->{anim}];
2529
2530 $face = $anim->[ $self->{frame} % @$anim ]
2531 if $anim && @$anim;
2532 }
2533
2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2534 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2443 2535
2444 # TODO animation
2445 if ($tex) { 2536 if ($tex) {
2446 glEnable GL_TEXTURE_2D; 2537 glEnable GL_TEXTURE_2D;
2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448 glColor 1, 1, 1, 1; 2539 glColor 1, 1, 1, 1;
2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450 glDisable GL_TEXTURE_2D; 2541 glDisable GL_TEXTURE_2D;
2451 } 2542 }
2452} 2543}
2453 2544
2545sub DESTROY {
2546 my ($self) = @_;
2547
2548 $self->{timer}->cancel
2549 if $self->{timer};
2550
2551 $self->SUPER::DESTROY;
2552}
2553
2454############################################################################# 2554#############################################################################
2455 2555
2456package CFClient::UI::InventoryItem; 2556package CFClient::UI::InventoryItem;
2457 2557
2458our @ISA = CFClient::UI::HBox::; 2558our @ISA = CFClient::UI::HBox::;
2559
2560sub _item_to_desc {
2561 my ($item) = @_;
2562
2563 my $desc =
2564 $item->{nrof} < 2
2565 ? $item->{name}
2566 : "$item->{nrof} × $item->{name_pl}";
2567
2568 $item->{flags} & Crossfire::Protocol::F_OPEN
2569 and $desc .= " (open)";
2570 $item->{flags} & Crossfire::Protocol::F_APPLIED
2571 and $desc .= " (applied)";
2572 $item->{flags} & Crossfire::Protocol::F_UNPAID
2573 and $desc .= " (unpaid)";
2574 $item->{flags} & Crossfire::Protocol::F_MAGIC
2575 and $desc .= " (magic)";
2576 $item->{flags} & Crossfire::Protocol::F_CURSED
2577 and $desc .= " (cursed)";
2578 $item->{flags} & Crossfire::Protocol::F_DAMNED
2579 and $desc .= " (damned)";
2580 $item->{flags} & Crossfire::Protocol::F_LOCKED
2581 and $desc .= " *";
2582
2583 $desc
2584}
2459 2585
2460sub new { 2586sub new {
2461 my $class = shift; 2587 my $class = shift;
2462 2588
2463 my %args = @_; 2589 my %args = @_;
2464 2590
2465 my $item = delete $args{item}; 2591 my $item = delete $args{item};
2466 2592
2467 my $desc = $item->{nrof} < 2 2593 my $desc = _item_to_desc ($item);
2468 ? $item->{name}
2469 : "$item->{nrof} $item->{name_pl}";
2470
2471 2594
2472 my $self = $class->SUPER::new ( 2595 my $self = $class->SUPER::new (
2473 can_hover => 1, 2596 can_hover => 1,
2474 can_events => 1, 2597 can_events => 1,
2475 tooltip => (CFClient::UI::Label->escape ($desc) 2598 tooltip => ((CFClient::UI::Label::escape $desc)
2476 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2599 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2477 connect_button_down => sub { 2600 connect_button_down => sub {
2478 my ($self, $ev, $x, $y) = @_; 2601 my ($self, $ev, $x, $y) = @_;
2479 2602
2480 # todo: maybe put examine on 1? but should just be a tooltip :( 2603 # todo: maybe put examine on 1? but should just be a tooltip :(
2481 if ($ev->{button} == 1) { 2604 if ($ev->{button} == 1) {
2605 my $targ = $::CONN->{player}{tag};
2606
2607 if ($item->{container} == $::CONN->{player}{tag}) {
2608 $targ = $main::OPENCONT;
2609 }
2610
2482 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2611 $::CONN->send ("move $targ $item->{tag} 0");
2483 } elsif ($ev->{button} == 2) { 2612 } elsif ($ev->{button} == 2) {
2484 $::CONN->send ("apply $item->{tag}"); 2613 $::CONN->send ("apply $item->{tag}");
2485 } elsif ($ev->{button} == 3) { 2614 } elsif ($ev->{button} == 3) {
2486 CFClient::UI::Menu->new ( 2615 my @menu_items = (
2487 items => [
2488 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2616 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2617 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2618 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2619 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2489 [ 2620 [
2490 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2621 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491 sub { $::CONN->send ("lock $item->{tag}") }, 2622 sub { $::CONN->send ("lock $item->{tag}") },
2492 ],
2493 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2494 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2495 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2496 ], 2623 ],
2497 )->popup ($ev); 2624 );
2625
2626 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2498 } 2627 }
2499 2628
2500 1 2629 1
2501 }, 2630 },
2502 %args 2631 %args
2503 ); 2632 );
2633
2504 2634
2505 $self->add (new CFClient::UI::Face 2635 $self->add (new CFClient::UI::Face
2506 can_events => 0, 2636 can_events => 0,
2507 face => $item->{face}, 2637 face => $item->{face},
2508 anim => $item->{anim}, 2638 anim => $item->{anim},
2509 animspeed => $item->{animspeed}, 2639 animspeed => $item->{animspeed},
2510 ); 2640 );
2511 2641
2512 $self->add (new CFClient::UI::Label 2642 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2513 can_events => 0, 2643
2514 text => $desc, 2644 $self->{item} = $item;
2515 ); 2645
2646 $self->update_item;
2516 2647
2517 $self 2648 $self
2649}
2650
2651sub update_item {
2652 my ($self) = @_;
2653
2654 my $desc = _item_to_desc ($self->{item});
2655
2656 $self->{name_lbl}->set_text ($desc);
2518} 2657}
2519 2658
2520############################################################################# 2659#############################################################################
2521 2660
2522package CFClient::UI::Inventory; 2661package CFClient::UI::Inventory;
… …
2538 my ($self, $items) = @_; 2677 my ($self, $items) = @_;
2539 2678
2540 $self->{scrolled}->clear; 2679 $self->{scrolled}->clear;
2541 return unless $items; 2680 return unless $items;
2542 2681
2543 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2682 my @items = sort {
2683 ($a->{type} <=> $b->{type})
2684 or ($a->{name} cmp $b->{name})
2685 } @$items;
2544 2686
2545 $self->{real_items} = \@items; 2687 $self->{real_items} = \@items;
2546 2688
2547 for my $item (@items) { 2689 for my $item (@items) {
2548 my $desc = $item->{nrof} < 2
2549 ? $item->{name}
2550 : "$item->{nrof} $item->{name_pl}";
2551
2552 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2690 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2691 $item->update_item ();
2553 } 2692 }
2693
2694 $self->{scrolled}->add (@items);
2554 2695
2555# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2696# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2556} 2697}
2557 2698
2558sub size_request { 2699sub size_request {
… …
2636 2777
2637package CFClient::UI::Statusbox; 2778package CFClient::UI::Statusbox;
2638 2779
2639our @ISA = CFClient::UI::VBox::; 2780our @ISA = CFClient::UI::VBox::;
2640 2781
2782sub new {
2783 my $class = shift;
2784
2785 $class->SUPER::new (
2786 fontsize => 0.8,
2787 @_,
2788 )
2789}
2790
2641sub reorder { 2791sub reorder {
2642 my ($self) = @_; 2792 my ($self) = @_;
2643 my $NOW = time; 2793 my $NOW = time;
2644 2794
2645 while (my ($k, $v) = each %{ $self->{item} }) { 2795 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2663 ? "<b>$item->{count} ×</b> $item->{text}" 2813 ? "<b>$item->{count} ×</b> $item->{text}"
2664 : $item->{text}; 2814 : $item->{text};
2665 2815
2666 for ($short) { 2816 for ($short) {
2667 s/^\s+//; 2817 s/^\s+//;
2668 s/\012.*/…/s; 2818 s/\s+/ /g;
2669 my $len = int 40 / $item->{fontsize};
2670 substr $_, $len, length, "…" if $len < length;
2671 } 2819 }
2672 2820
2673 new CFClient::UI::Label 2821 new CFClient::UI::Label
2674 markup => $short, 2822 markup => $short,
2675 tooltip => $item->{tooltip}, 2823 tooltip => $item->{tooltip},
2676 tooltip_font => $::FONT_PROP, 2824 tooltip_font => $::FONT_PROP,
2677 tooltip_width => 0.67, 2825 tooltip_width => 0.67,
2678 fontsize => $item->{fontsize}, 2826 fontsize => $item->{fontsize} || $self->{fontsize},
2827 max_w => $::WIDTH * 0.44,
2679 color => $item->{color}, 2828 fg => $item->{fg},
2680 can_events => 1, 2829 can_events => 1,
2681 can_hover => 1 2830 can_hover => 1
2682 }; 2831 };
2683 } 2832 }
2684 2833
… …
2710 $self->{item}{$group} = { 2859 $self->{item}{$group} = {
2711 id => ++$self->{id}, 2860 id => ++$self->{id},
2712 text => $text, 2861 text => $text,
2713 timeout => $timeout, 2862 timeout => $timeout,
2714 tooltip => $text, 2863 tooltip => $text,
2715 fontsize => 0.8,
2716 color => [0.8, 0.8, 0.8, 0.8], 2864 fg => [0.8, 0.8, 0.8, 0.8],
2717 pri => 0, 2865 pri => 0,
2718 count => 1, 2866 count => 1,
2719 %arg, 2867 %arg,
2720 }; 2868 };
2721 } 2869 }
2722 2870
2723 $self->reorder; 2871 $self->reorder;
2724} 2872}
2725 2873
2874sub reconfigure {
2875 my ($self) = @_;
2876
2877 delete $_->{label}
2878 for values %{ $self->{item} || {} };
2879
2880 $self->reorder;
2881 $self->SUPER::reconfigure;
2882}
2883
2726############################################################################# 2884#############################################################################
2727 2885
2728package CFClient::UI::Root; 2886package CFClient::UI::Root;
2729 2887
2730our @ISA = CFClient::UI::Container::; 2888our @ISA = CFClient::UI::Container::;
… …
2760} 2918}
2761 2919
2762sub size_allocate { 2920sub size_allocate {
2763 my ($self, $w, $h) = @_; 2921 my ($self, $w, $h) = @_;
2764 2922
2765 my $old_w = $self->{old_w}; 2923 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2766 my $old_h = $self->{old_h}; 2924 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2767 2925
2768 if ($old_w && $old_h) { 2926 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2769 for my $child ($self->children) { 2927 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2770 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2771 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2772 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2773 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2774 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2775 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2776 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2777 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2778 }
2779 }
2780 2928
2781 for my $child ($self->children) { 2929 for my $child ($self->children) {
2782 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2930 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2783 2931
2932 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2933 if exists $child->{req_x};
2934
2935 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2936 if exists $child->{req_y};
2937
2784 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2938 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2785 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2939 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2940
2786 $child->configure ($X, $Y, $W, $H); 2941 $child->configure ($X, $Y, $W, $H);
2787 } 2942 }
2788
2789 $self->{old_w} = $w;
2790 $self->{old_h} = $h;
2791} 2943}
2792 2944
2793sub coord2local { 2945sub coord2local {
2794 my ($self, $x, $y) = @_; 2946 my ($self, $x, $y) = @_;
2795 2947
… …
2808 $self->check_size; 2960 $self->check_size;
2809 $::WANT_REFRESH++; 2961 $::WANT_REFRESH++;
2810} 2962}
2811 2963
2812sub add { 2964sub add {
2813 my ($self, $child) = @_; 2965 my ($self, @children) = @_;
2814 2966
2967 for my $child (@children) {
2968 $child->{toplevel} = 1;
2969
2815 # integerise window positions 2970 # integerise window positions
2816 $child->{x} = int $child->{x}; 2971 $child->{x} = int $child->{x};
2817 $child->{y} = int $child->{y}; 2972 $child->{y} = int $child->{y};
2973 }
2818 2974
2819 $self->SUPER::add ($child); 2975 $self->SUPER::add (@children);
2820} 2976}
2821 2977
2822sub on_refresh { 2978sub on_refresh {
2823 my ($self, $id, $cb) = @_; 2979 my ($self, $id, $cb) = @_;
2824 2980
… …
2905############################################################################# 3061#############################################################################
2906 3062
2907package CFClient::UI; 3063package CFClient::UI;
2908 3064
2909$ROOT = new CFClient::UI::Root; 3065$ROOT = new CFClient::UI::Root;
2910$TOOLTIP = new CFClient::UI::Tooltip; 3066$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2911 3067
29121 30681
2913 3069

Diff Legend

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