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.198 by root, Fri May 12 02:08:52 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) = @_;
… …
383sub set_parent { 416sub set_parent {
384 my ($self, $parent) = @_; 417 my ($self, $parent) = @_;
385 418
386 Scalar::Util::weaken ($self->{parent} = $parent); 419 Scalar::Util::weaken ($self->{parent} = $parent);
387 420
388
389 # TODO: req_w _does_change after ->reconfigure 421 # TODO: req_w _does_change after ->reconfigure
390 $self->check_size 422 $self->check_size
391 unless exists $self->{req_w}; 423 unless exists $self->{req_w};
392} 424}
393 425
… …
418} 450}
419 451
420sub DESTROY { 452sub DESTROY {
421 my ($self) = @_; 453 my ($self) = @_;
422 454
455 delete $WIDGET{$self+0};
423 #$self->deactivate; 456 #$self->deactivate;
424} 457}
425 458
426############################################################################# 459#############################################################################
427 460
… …
436 my $class = shift; 469 my $class = shift;
437 470
438 # range [value, low, high, page] 471 # range [value, low, high, page]
439 472
440 $class->SUPER::new ( 473 $class->SUPER::new (
441 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
442 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
443 @_ 476 @_
444 ) 477 )
445} 478}
446 479
447sub _draw { 480sub _draw {
448 my ($self) = @_; 481 my ($self) = @_;
449 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
450 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
451 489
452 glEnable GL_BLEND; 490 glEnable GL_BLEND;
453 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
454 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
455 493
456 glBegin GL_QUADS; 494 glBegin GL_QUADS;
457 glVertex 0 , 0; 495 glVertex 0 , 0;
458 glVertex 0 , $h; 496 glVertex 0 , $h;
459 glVertex $w, $h; 497 glVertex $w, $h;
460 glVertex $w, 0; 498 glVertex $w, 0;
461 glEnd; 499 glEnd;
462 500
463 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
464} 503}
465 504
466############################################################################# 505#############################################################################
467 506
468package CFClient::UI::Empty; 507package CFClient::UI::Empty;
… …
652 $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 {
653 glClearColor 0, 0, 0, 0; 692 glClearColor 0, 0, 0, 0;
654 glClear GL_COLOR_BUFFER_BIT; 693 glClear GL_COLOR_BUFFER_BIT;
655 694
656 $self->_render; 695 $self->_render;
657# glColorMask 1, 1, 1, 0;
658# glEnable GL_BLEND;
659# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
660# glRasterPos 0, 0;
661# glCopyPixels 0, 0, $self->{w}, $self->{h};
662# glDisable GL_BLEND;
663# glColorMask 1, 1, 1, 1;
664 }; 696 };
665} 697}
666 698
667sub _draw { 699sub _draw {
668 my ($self) = @_; 700 my ($self) = @_;
… …
672 my $tex = $self->{texture} 704 my $tex = $self->{texture}
673 or return; 705 or return;
674 706
675 glEnable GL_TEXTURE_2D; 707 glEnable GL_TEXTURE_2D;
676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
677 glColor 0, 0, 0, 1; 709 glColor 1, 1, 1, 1;
678 710
679 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
680 712
681 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
682} 714}
… …
765 $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}));
766 }, 798 },
767 ; 799 ;
768 800
769 $self = $class->SUPER::new ( 801 $self = $class->SUPER::new (
770 vp => (new CFClient::UI::ViewPort), 802 vp => (new CFClient::UI::ViewPort expand => 1),
771 slider => $slider, 803 slider => $slider,
772 @_, 804 @_,
773 ); 805 );
774 806
775 $self->{vp}->add ($self->{scrolled}); 807 $self->{vp}->add ($self->{scrolled});
… …
777 $self->add ($self->{slider}); 809 $self->add ($self->{slider});
778 810
779 $self 811 $self
780} 812}
781 813
782#TODO# update range on size_allocate depeneing on child 814#TODO# update range on size_allocate depending on child
783# update viewport offset on scroll 815# update viewport offset on scroll
784 816
785############################################################################# 817#############################################################################
786 818
787package CFClient::UI::Frame; 819package CFClient::UI::Frame;
788 820
789our @ISA = CFClient::UI::Bin::; 821our @ISA = CFClient::UI::Bin::;
790 822
791use CFClient::OpenGL; 823use CFClient::OpenGL;
824
825sub new {
826 my $class = shift;
827
828 $class->SUPER::new (
829 bg => undef,
830 @_,
831 )
832}
833
834sub _draw {
835 my ($self) = @_;
836
837 if ($self->{bg}) {
838 my ($w, $h) = @$self{qw(w h)};
839
840 glEnable GL_BLEND;
841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
842 glColor @{ $self->{bg} };
843
844 glBegin GL_QUADS;
845 glVertex 0 , 0;
846 glVertex 0 , $h;
847 glVertex $w, $h;
848 glVertex $w, 0;
849 glEnd;
850
851 glDisable GL_BLEND;
852 }
853
854 $self->SUPER::_draw;
855}
792 856
793############################################################################# 857#############################################################################
794 858
795package CFClient::UI::FancyFrame; 859package CFClient::UI::FancyFrame;
796 860
… …
809 873
810 my $self = $class->SUPER::new ( 874 my $self = $class->SUPER::new (
811 bg => [1, 1, 1, 1], 875 bg => [1, 1, 1, 1],
812 border_bg => [1, 1, 1, 1], 876 border_bg => [1, 1, 1, 1],
813 border => 0.6, 877 border => 0.6,
878 toplevel => 1,
814 can_events => 1, 879 can_events => 1,
815 @_ 880 @_
816 ); 881 );
817 882
818 $self->{title} &&= new CFClient::UI::Label 883 $self->{title} &&= new CFClient::UI::Label
… …
843 my ($self, $w, $h) = @_; 908 my ($self, $w, $h) = @_;
844 909
845 $h -= List::Util::max 0, $self->border * 2; 910 $h -= List::Util::max 0, $self->border * 2;
846 $w -= List::Util::max 0, $self->border * 2; 911 $w -= List::Util::max 0, $self->border * 2;
847 912
848 $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)
849 if $self->{title}; 914 if $self->{title};
850 915
851 $self->child->configure ($self->border, $self->border, $w, $h); 916 $self->child->configure ($self->border, $self->border, $w, $h);
852} 917}
853 918
… …
1214 1279
1215############################################################################# 1280#############################################################################
1216 1281
1217package CFClient::UI::Label; 1282package CFClient::UI::Label;
1218 1283
1219our @ISA = CFClient::UI::Base::; 1284our @ISA = CFClient::UI::DrawBG::;
1220 1285
1221use CFClient::OpenGL; 1286use CFClient::OpenGL;
1222 1287
1223sub new { 1288sub new {
1224 my ($class, %arg) = @_; 1289 my ($class, %arg) = @_;
1225 1290
1226 my $self = $class->SUPER::new ( 1291 my $self = $class->SUPER::new (
1227 fg => [1, 1, 1], 1292 fg => [1, 1, 1],
1293 #bg => none
1294 #active_bg => none
1228 #font => default_font 1295 #font => default_font
1229 #text => initial text 1296 #text => initial text
1230 #markup => initial narkup 1297 #markup => initial narkup
1298 #max_w => maximum pixel width
1299 ellipsise => 3, # end
1231 layout => (new CFClient::Layout), 1300 layout => (new CFClient::Layout),
1232 fontsize => 1, 1301 fontsize => 1,
1233 align => -1, 1302 align => -1,
1234 valign => -1, 1303 valign => -1,
1235 padding => 2, 1304 padding => 2,
… …
1250 } 1319 }
1251 1320
1252 $self 1321 $self
1253} 1322}
1254 1323
1255sub escape { 1324sub escape($) {
1256 local $_ = $_[1]; 1325 local $_ = $_[0];
1257 1326
1258 s/&/&amp;/g; 1327 s/&/&amp;/g;
1259 s/>/&gt;/g; 1328 s/>/&gt;/g;
1260 s/</&lt;/g; 1329 s/</&lt;/g;
1261 1330
1262 $_[1] 1331 $_
1263} 1332}
1264 1333
1265sub update { 1334sub update {
1266 my ($self) = @_; 1335 my ($self) = @_;
1267 1336
… …
1300sub size_request { 1369sub size_request {
1301 my ($self) = @_; 1370 my ($self) = @_;
1302 1371
1303 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1372 $self->{layout}->set_font ($self->{font}) if $self->{font};
1304 $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});
1305 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1306 1377
1307 my ($w, $h) = $self->{layout}->size; 1378 my ($w, $h) = $self->{layout}->size;
1308 1379
1309 if (exists $self->{template}) { 1380 if (exists $self->{template}) {
… …
1339} 1410}
1340 1411
1341sub _draw { 1412sub _draw {
1342 my ($self) = @_; 1413 my ($self) = @_;
1343 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1344 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1345 $self->{layout}->set_foreground (@{$self->{fg}}); 1418 $self->{layout}->set_foreground (@{$self->{fg}});
1346 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1347 $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});
1348 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1349 1424
1350 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1425 my $tex = new_from_layout CFClient::Texture $self->{layout};
1351 1426
1352 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1353 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1354 : ($self->{w} - $tex->{w}) * 0.5; 1429 : ($self->{w} - $tex->{w}) * 0.5);
1355 1430
1356 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1357 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1358 : ($self->{h} - $tex->{h}) * 0.5; 1433 : ($self->{h} - $tex->{h}) * 0.5);
1359 1434
1360 $tex 1435 $tex
1361 }; 1436 };
1362 1437
1363 glEnable GL_TEXTURE_2D; 1438 glEnable GL_TEXTURE_2D;
… …
1418sub set_text { 1493sub set_text {
1419 my ($self, $text) = @_; 1494 my ($self, $text) = @_;
1420 1495
1421 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1422 $self->_set_text ($text); 1497 $self->_set_text ($text);
1498 $self->update;
1423 $self->check_size; 1499 $self->check_size;
1424 $self->update;
1425} 1500}
1426 1501
1427sub get_text { 1502sub get_text {
1428 $_[0]{text} 1503 $_[0]{text}
1429} 1504}
… …
1449 my $sym = $ev->{sym}; 1524 my $sym = $ev->{sym};
1450 my $uni = $ev->{unicode}; 1525 my $uni = $ev->{unicode};
1451 1526
1452 my $text = $self->get_text; 1527 my $text = $self->get_text;
1453 1528
1454 if ($sym == 8) { 1529 if ($uni == 8) {
1455 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1530 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1456 } elsif ($sym == 127) { 1531 } elsif ($uni == 127) {
1457 substr $text, $self->{cursor}, 1, ""; 1532 substr $text, $self->{cursor}, 1, "";
1458 } elsif ($sym == CFClient::SDLK_LEFT) { 1533 } elsif ($sym == CFClient::SDLK_LEFT) {
1459 --$self->{cursor} if $self->{cursor}; 1534 --$self->{cursor} if $self->{cursor};
1460 } elsif ($sym == CFClient::SDLK_RIGHT) { 1535 } elsif ($sym == CFClient::SDLK_RIGHT) {
1461 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1536 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1462 } elsif ($sym == CFClient::SDLK_HOME) { 1537 } elsif ($sym == CFClient::SDLK_HOME) {
1463 $self->{cursor} = 0; 1538 $self->{cursor} = 0;
1464 } elsif ($sym == CFClient::SDLK_END) { 1539 } elsif ($sym == CFClient::SDLK_END) {
1465 $self->{cursor} = length $text; 1540 $self->{cursor} = length $text;
1466 } elsif ($sym == 27) { 1541 } elsif ($uni == 27) {
1467 $self->emit ('escape'); 1542 $self->emit ('escape');
1468 } elsif ($uni) { 1543 } elsif ($uni) {
1469 substr $text, $self->{cursor}++, 0, chr $uni; 1544 substr $text, $self->{cursor}++, 0, chr $uni;
1470 } 1545 }
1471 1546
1472 $self->_set_text ($text); 1547 $self->_set_text ($text);
1473 $self->update; 1548 $self->update;
1549 $self->check_size;
1474} 1550}
1475 1551
1476sub focus_in { 1552sub focus_in {
1477 my ($self) = @_; 1553 my ($self) = @_;
1478 1554
… …
1607 my $class = shift; 1683 my $class = shift;
1608 1684
1609 $class->SUPER::new ( 1685 $class->SUPER::new (
1610 padding => 4, 1686 padding => 4,
1611 fg => [1, 1, 1], 1687 fg => [1, 1, 1],
1612 bg => [1, 1, 1, 0.2],
1613 active_fg => [0, 0, 1], 1688 active_fg => [0, 0, 1],
1614 can_hover => 1, 1689 can_hover => 1,
1615 align => 0, 1690 align => 0,
1616 valign => 0, 1691 valign => 0,
1617 can_events => 1, 1692 can_events => 1,
… …
1665 1740
1666 $class->SUPER::new ( 1741 $class->SUPER::new (
1667 padding => 2, 1742 padding => 2,
1668 fg => [1, 1, 1], 1743 fg => [1, 1, 1],
1669 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],
1670 state => 0, 1747 state => 0,
1671 can_hover => 1, 1748 can_hover => 1,
1672 @_ 1749 @_
1673 ) 1750 )
1674} 1751}
… …
1958 qw(s1_slider.png s1_slider_bg.png); 2035 qw(s1_slider.png s1_slider_bg.png);
1959 2036
1960sub new { 2037sub new {
1961 my $class = shift; 2038 my $class = shift;
1962 2039
1963 # range [value, low, high, page] 2040 # range [value, low, high, page, unit]
1964 2041
1965 # TODO: 0-width page 2042 # TODO: 0-width page
1966 # TODO: req_w/h are wrong with vertical 2043 # TODO: req_w/h are wrong with vertical
1967 # TODO: calculations are off 2044 # TODO: calculations are off
1968 my $self = $class->SUPER::new ( 2045 my $self = $class->SUPER::new (
1969 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
1970 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],
1971 range => [0, 0, 100, 10], 2050 range => [0, 0, 100, 10],
1972 req_w => $::WIDTH / 80, 2051 req_w => $::WIDTH / 80,
1973 req_h => $::WIDTH / 80, 2052 req_h => $::WIDTH / 80,
1974 vertical => 0, 2053 vertical => 0,
1975 can_hover => 1, 2054 can_hover => 1,
1976 inner_pad => 5, 2055 inner_pad => 0.02,
1977 @_ 2056 @_
1978 ); 2057 );
1979 2058
2059 $self->set_value ($self->{range}[0]);
2060 $self->update;
2061
1980 $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 }
1981} 2086}
1982 2087
1983sub size_request { 2088sub size_request {
1984 my ($self) = @_; 2089 my ($self) = @_;
1985 2090
… …
1998 2103
1999sub mouse_motion { 2104sub mouse_motion {
2000 my ($self, $ev, $x, $y) = @_; 2105 my ($self, $ev, $x, $y) = @_;
2001 2106
2002 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
2003 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2124 my ($value, $lo, $hi, $page) = @{$self->{range}};
2004 2125
2005 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2126 my $inner_w = 1 - 2 * $self->{inner_pad};
2006 2127
2007 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2008 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2009 2129
2010 $x -= $inner_pad_px; # substract the padding 2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2011 $x = $x * ($hi - $lo) / $inner_w + $lo; 2131 $value = $self->{scale} * ($value - $lo);
2012 $x = $lo if $x < $lo;
2013 $x = $hi - $page if $x > $hi - $page;
2014 $self->{range}[0] = $x;
2015 2132
2016 $self->emit (changed => $x); 2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2017 $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;
2018 } 2140 });
2019}
2020 2141
2021# the inner_* stuff is for generating a padding for the slider handle, 2142 $self->SUPER::update;
2022# so that the handle doesn't leave the texture. This calculation isn't 100%
2023# correct propably, but it does the job for now
2024sub _calc_inner_pad_px {
2025 my ($self, $w) = @_;
2026 ($w / 100) * $self->{inner_pad} # % to pixels
2027} 2143}
2028 2144
2029sub _draw { 2145sub _draw {
2030 my ($self) = @_; 2146 my ($self) = @_;
2031 2147
2032 $self->SUPER::_draw (); 2148 $self->SUPER::_draw ();
2033 2149
2034 my ($w, $h) = @$self{qw(w h)}; 2150 glScale $self->{w}, $self->{h};
2035 2151
2036 if ($self->{vertical}) { 2152 if ($self->{vertical}) {
2037 # draw a vertical slider like a rotated horizontal slider 2153 # draw a vertical slider like a rotated horizontal slider
2038 2154
2155 glTranslate 1, 0, 0;
2039 glRotate 90, 0, 0, 1; 2156 glRotate 90, 0, 0, 1;
2040 glTranslate 0, -$self->{w}, 0;
2041
2042 ($w, $h) = ($h, $w);
2043 } 2157 }
2044 2158
2045 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2159 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2046 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2160 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2047 2161
2048 my ($value, $lo, $hi, $page) = @{$self->{range}};
2049
2050 $hi = $value + 1 if $lo == $hi;
2051
2052 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2053 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2054
2055 $page = int $page * $inner_w / ($hi - $lo);
2056 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2057
2058 $w -= $page;
2059 $page &= ~1;
2060 glTranslate $page * 0.5, 0, 0;
2061 $page ||= 2;
2062
2063 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2064 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2065
2066 glEnable GL_TEXTURE_2D; 2162 glEnable GL_TEXTURE_2D;
2067 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2163 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2068 2164
2069 # draw background 2165 # draw background
2070 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2166 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2071 2167
2072 # draw handle 2168 # draw handle
2073 $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);
2074 2170
2075 glDisable GL_TEXTURE_2D; 2171 glDisable GL_TEXTURE_2D;
2076} 2172}
2077 2173
2078############################################################################# 2174#############################################################################
… …
2181 2277
2182 delete $self->{texture}; 2278 delete $self->{texture};
2183 } 2279 }
2184 2280
2185 $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 {
2186 glClearColor 0, 0, 0, 0; 2282 glClearColor 0.5, 0.5, 0.5, 0;
2187 glClear GL_COLOR_BUFFER_BIT; 2283 glClear GL_COLOR_BUFFER_BIT;
2188 2284
2189 glEnable GL_TEXTURE_2D; 2285 glEnable GL_TEXTURE_2D;
2190 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2191 2287
… …
2223 my ($self) = @_; 2319 my ($self) = @_;
2224 2320
2225 glEnable GL_TEXTURE_2D; 2321 glEnable GL_TEXTURE_2D;
2226 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2227 glColor 1, 1, 1, 1; 2323 glColor 1, 1, 1, 1;
2228 $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});
2229 glDisable GL_TEXTURE_2D; 2325 glDisable GL_TEXTURE_2D;
2230 2326
2231 $self->{children}[1]->draw; 2327 $self->{children}[1]->draw;
2232 2328
2233} 2329}
… …
2332 2428
2333sub set_tooltip_from { 2429sub set_tooltip_from {
2334 my ($self, $widget) = @_; 2430 my ($self, $widget) = @_;
2335 2431
2336 $self->add (new CFClient::UI::Label 2432 $self->add (new CFClient::UI::Label
2337 markup => $widget->{tooltip}, 2433 markup => $widget->{tooltip},
2338 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2339 fontsize => 0.8, 2435 fontsize => 0.8,
2340 fg => [0, 0, 0, 1], 2436 fg => [0, 0, 0, 1],
2437 ellipsise => 0,
2341 font => ($widget->{tooltip_font} || $::FONT_PROP), 2438 font => ($widget->{tooltip_font} || $::FONT_PROP),
2342 ); 2439 );
2343} 2440}
2344 2441
2345sub size_request { 2442sub size_request {
2346 my ($self) = @_; 2443 my ($self) = @_;
… …
2392use CFClient::OpenGL; 2489use CFClient::OpenGL;
2393 2490
2394sub new { 2491sub new {
2395 my $class = shift; 2492 my $class = shift;
2396 2493
2397 $class->SUPER::new ( 2494 my $self = $class->SUPER::new (
2398 aspect => 1, 2495 aspect => 1,
2399 @_, 2496 @_,
2400 ) 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
2401} 2514}
2402 2515
2403sub size_request { 2516sub size_request {
2404 (32, 8) 2517 (32, 8)
2405} 2518}
2406 2519
2407sub _draw { 2520sub _draw {
2408 my ($self) = @_; 2521 my ($self) = @_;
2409 2522
2410 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
2411 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2534 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2412 2535
2413 # TODO animation
2414 if ($tex) { 2536 if ($tex) {
2415 glEnable GL_TEXTURE_2D; 2537 glEnable GL_TEXTURE_2D;
2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417 glColor 1, 1, 1, 1; 2539 glColor 1, 1, 1, 1;
2418 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419 glDisable GL_TEXTURE_2D; 2541 glDisable GL_TEXTURE_2D;
2420 } 2542 }
2421} 2543}
2422 2544
2545sub DESTROY {
2546 my ($self) = @_;
2547
2548 $self->{timer}->cancel
2549 if $self->{timer};
2550
2551 $self->SUPER::DESTROY;
2552}
2553
2423############################################################################# 2554#############################################################################
2424 2555
2425package CFClient::UI::InventoryItem; 2556package CFClient::UI::InventoryItem;
2426 2557
2427our @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}
2428 2585
2429sub new { 2586sub new {
2430 my $class = shift; 2587 my $class = shift;
2431 2588
2432 my %args = @_; 2589 my %args = @_;
2433 2590
2434 my $item = delete $args{item}; 2591 my $item = delete $args{item};
2435 2592
2436 my $desc = $item->{nrof} < 2 2593 my $desc = _item_to_desc ($item);
2437 ? $item->{name}
2438 : "$item->{nrof} $item->{name_pl}";
2439
2440 2594
2441 my $self = $class->SUPER::new ( 2595 my $self = $class->SUPER::new (
2442 can_hover => 1, 2596 can_hover => 1,
2443 can_events => 1, 2597 can_events => 1,
2444 tooltip => (CFClient::UI::Label->escape ($desc) 2598 tooltip => ((CFClient::UI::Label::escape $desc)
2445 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2599 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2446 connect_button_down => sub { 2600 connect_button_down => sub {
2447 my ($self, $ev, $x, $y) = @_; 2601 my ($self, $ev, $x, $y) = @_;
2448 2602
2449 # 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 :(
2450 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
2451 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2611 $::CONN->send ("move $targ $item->{tag} 0");
2452 } elsif ($ev->{button} == 2) { 2612 } elsif ($ev->{button} == 2) {
2453 $::CONN->send ("apply $item->{tag}"); 2613 $::CONN->send ("apply $item->{tag}");
2454 } elsif ($ev->{button} == 3) { 2614 } elsif ($ev->{button} == 3) {
2455 CFClient::UI::Menu->new ( 2615 my @menu_items = (
2456 items => [
2457 ["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") }],
2458 [ 2620 [
2459 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2621 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2460 sub { $::CONN->send ("lock $item->{tag}") }, 2622 sub { $::CONN->send ("lock $item->{tag}") },
2461 ],
2462 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2463 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2464 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2465 ], 2623 ],
2466 )->popup ($ev); 2624 );
2625
2626 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2467 } 2627 }
2468 2628
2469 1 2629 1
2470 }, 2630 },
2471 %args 2631 %args
2472 ); 2632 );
2633
2473 2634
2474 $self->add (new CFClient::UI::Face 2635 $self->add (new CFClient::UI::Face
2475 can_events => 0, 2636 can_events => 0,
2476 face => $item->{face}, 2637 face => $item->{face},
2477 anim => $item->{anim}, 2638 anim => $item->{anim},
2478 animspeed => $item->{animspeed}, 2639 animspeed => $item->{animspeed},
2479 ); 2640 );
2480 2641
2481 $self->add (new CFClient::UI::Label 2642 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2482 can_events => 0, 2643
2483 text => $desc, 2644 $self->{item} = $item;
2484 ); 2645
2646 $self->update_item;
2485 2647
2486 $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);
2487} 2657}
2488 2658
2489############################################################################# 2659#############################################################################
2490 2660
2491package CFClient::UI::Inventory; 2661package CFClient::UI::Inventory;
… …
2507 my ($self, $items) = @_; 2677 my ($self, $items) = @_;
2508 2678
2509 $self->{scrolled}->clear; 2679 $self->{scrolled}->clear;
2510 return unless $items; 2680 return unless $items;
2511 2681
2512 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;
2513 2686
2514 $self->{real_items} = \@items; 2687 $self->{real_items} = \@items;
2515 2688
2516 for my $item (@items) { 2689 for my $item (@items) {
2517 my $desc = $item->{nrof} < 2
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520
2521 $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 ();
2522 } 2692 }
2693
2694 $self->{scrolled}->add (@items);
2523 2695
2524# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2696# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2525} 2697}
2526 2698
2527sub size_request { 2699sub size_request {
… …
2605 2777
2606package CFClient::UI::Statusbox; 2778package CFClient::UI::Statusbox;
2607 2779
2608our @ISA = CFClient::UI::VBox::; 2780our @ISA = CFClient::UI::VBox::;
2609 2781
2782sub new {
2783 my $class = shift;
2784
2785 $class->SUPER::new (
2786 fontsize => 0.8,
2787 @_,
2788 )
2789}
2790
2610sub reorder { 2791sub reorder {
2611 my ($self) = @_; 2792 my ($self) = @_;
2612 my $NOW = time; 2793 my $NOW = time;
2613 2794
2614 while (my ($k, $v) = each %{ $self->{item} }) { 2795 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2632 ? "<b>$item->{count} ×</b> $item->{text}" 2813 ? "<b>$item->{count} ×</b> $item->{text}"
2633 : $item->{text}; 2814 : $item->{text};
2634 2815
2635 for ($short) { 2816 for ($short) {
2636 s/^\s+//; 2817 s/^\s+//;
2637 s/\012.*/…/s; 2818 s/\s+/ /g;
2638 my $len = int 40 / $item->{fontsize};
2639 substr $_, $len, length, "…" if $len < length;
2640 } 2819 }
2641 2820
2642 new CFClient::UI::Label 2821 new CFClient::UI::Label
2643 markup => $short, 2822 markup => $short,
2644 tooltip => $item->{tooltip}, 2823 tooltip => $item->{tooltip},
2645 tooltip_font => $::FONT_PROP, 2824 tooltip_font => $::FONT_PROP,
2646 tooltip_width => 0.67, 2825 tooltip_width => 0.67,
2647 fontsize => $item->{fontsize}, 2826 fontsize => $item->{fontsize} || $self->{fontsize},
2827 max_w => $::WIDTH * 0.44,
2648 color => $item->{color}, 2828 fg => $item->{fg},
2649 can_events => 1, 2829 can_events => 1,
2650 can_hover => 1 2830 can_hover => 1
2651 }; 2831 };
2652 } 2832 }
2653 2833
… …
2679 $self->{item}{$group} = { 2859 $self->{item}{$group} = {
2680 id => ++$self->{id}, 2860 id => ++$self->{id},
2681 text => $text, 2861 text => $text,
2682 timeout => $timeout, 2862 timeout => $timeout,
2683 tooltip => $text, 2863 tooltip => $text,
2684 fontsize => 0.8,
2685 color => [0.8, 0.8, 0.8, 0.8], 2864 fg => [0.8, 0.8, 0.8, 0.8],
2686 pri => 0, 2865 pri => 0,
2687 count => 1, 2866 count => 1,
2688 %arg, 2867 %arg,
2689 }; 2868 };
2690 } 2869 }
2691 2870
2692 $self->reorder; 2871 $self->reorder;
2693} 2872}
2694 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
2695############################################################################# 2884#############################################################################
2696 2885
2697package CFClient::UI::Root; 2886package CFClient::UI::Root;
2698 2887
2699our @ISA = CFClient::UI::Container::; 2888our @ISA = CFClient::UI::Container::;
… …
2729} 2918}
2730 2919
2731sub size_allocate { 2920sub size_allocate {
2732 my ($self, $w, $h) = @_; 2921 my ($self, $w, $h) = @_;
2733 2922
2734 my $old_w = $self->{old_w}; 2923 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2735 my $old_h = $self->{old_h}; 2924 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2736 2925
2737 if ($old_w && $old_h) { 2926 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2738 for my $child ($self->children) { 2927 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2739 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2740 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2741 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2742 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2743 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2744 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2745 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2746 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2747 }
2748 }
2749 2928
2750 for my $child ($self->children) { 2929 for my $child ($self->children) {
2751 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)};
2752 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
2753 $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;
2754 $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
2755 $child->configure ($X, $Y, $W, $H); 2941 $child->configure ($X, $Y, $W, $H);
2756 } 2942 }
2757
2758 $self->{old_w} = $w;
2759 $self->{old_h} = $h;
2760} 2943}
2761 2944
2762sub coord2local { 2945sub coord2local {
2763 my ($self, $x, $y) = @_; 2946 my ($self, $x, $y) = @_;
2764 2947
… …
2777 $self->check_size; 2960 $self->check_size;
2778 $::WANT_REFRESH++; 2961 $::WANT_REFRESH++;
2779} 2962}
2780 2963
2781sub add { 2964sub add {
2782 my ($self, $child) = @_; 2965 my ($self, @children) = @_;
2783 2966
2967 for my $child (@children) {
2968 $child->{toplevel} = 1;
2969
2784 # integerise window positions 2970 # integerise window positions
2785 $child->{x} = int $child->{x}; 2971 $child->{x} = int $child->{x};
2786 $child->{y} = int $child->{y}; 2972 $child->{y} = int $child->{y};
2973 }
2787 2974
2788 $self->SUPER::add ($child); 2975 $self->SUPER::add (@children);
2789} 2976}
2790 2977
2791sub on_refresh { 2978sub on_refresh {
2792 my ($self, $id, $cb) = @_; 2979 my ($self, $id, $cb) = @_;
2793 2980
… …
2874############################################################################# 3061#############################################################################
2875 3062
2876package CFClient::UI; 3063package CFClient::UI;
2877 3064
2878$ROOT = new CFClient::UI::Root; 3065$ROOT = new CFClient::UI::Root;
2879$TOOLTIP = new CFClient::UI::Tooltip; 3066$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2880 3067
28811 30681
2882 3069

Diff Legend

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