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.215 by root, Fri May 19 03:49:48 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) = @_;
… …
647 687
648sub render_child { 688sub render_child {
649 my ($self) = @_; 689 my ($self) = @_;
650 690
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.5, 0.5, 0.5, 1;
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}
… …
776 $self->add ($self->{slider}); 809 $self->add ($self->{slider});
777 810
778 $self 811 $self
779} 812}
780 813
781#TODO# update range on size_allocate depeneing on child 814#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 815# update viewport offset on scroll
783 816
784############################################################################# 817#############################################################################
785 818
786package CFClient::UI::Frame; 819package CFClient::UI::Frame;
787 820
788our @ISA = CFClient::UI::Bin::; 821our @ISA = CFClient::UI::Bin::;
789 822
790use 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}
791 856
792############################################################################# 857#############################################################################
793 858
794package CFClient::UI::FancyFrame; 859package CFClient::UI::FancyFrame;
795 860
… …
808 873
809 my $self = $class->SUPER::new ( 874 my $self = $class->SUPER::new (
810 bg => [1, 1, 1, 1], 875 bg => [1, 1, 1, 1],
811 border_bg => [1, 1, 1, 1], 876 border_bg => [1, 1, 1, 1],
812 border => 0.6, 877 border => 0.6,
878 toplevel => 1,
813 can_events => 1, 879 can_events => 1,
814 @_ 880 @_
815 ); 881 );
816 882
817 $self->{title} &&= new CFClient::UI::Label 883 $self->{title} &&= new CFClient::UI::Label
… …
842 my ($self, $w, $h) = @_; 908 my ($self, $w, $h) = @_;
843 909
844 $h -= List::Util::max 0, $self->border * 2; 910 $h -= List::Util::max 0, $self->border * 2;
845 $w -= List::Util::max 0, $self->border * 2; 911 $w -= List::Util::max 0, $self->border * 2;
846 912
847 $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)
848 if $self->{title}; 914 if $self->{title};
849 915
850 $self->child->configure ($self->border, $self->border, $w, $h); 916 $self->child->configure ($self->border, $self->border, $w, $h);
851} 917}
852 918
… …
1213 1279
1214############################################################################# 1280#############################################################################
1215 1281
1216package CFClient::UI::Label; 1282package CFClient::UI::Label;
1217 1283
1218our @ISA = CFClient::UI::Base::; 1284our @ISA = CFClient::UI::DrawBG::;
1219 1285
1220use CFClient::OpenGL; 1286use CFClient::OpenGL;
1221 1287
1222sub new { 1288sub new {
1223 my ($class, %arg) = @_; 1289 my ($class, %arg) = @_;
1224 1290
1225 my $self = $class->SUPER::new ( 1291 my $self = $class->SUPER::new (
1226 fg => [1, 1, 1], 1292 fg => [1, 1, 1],
1293 #bg => none
1294 #active_bg => none
1227 #font => default_font 1295 #font => default_font
1228 #text => initial text 1296 #text => initial text
1229 #markup => initial narkup 1297 #markup => initial narkup
1298 #max_w => maximum pixel width
1299 ellipsise => 3, # end
1230 layout => (new CFClient::Layout), 1300 layout => (new CFClient::Layout),
1231 fontsize => 1, 1301 fontsize => 1,
1232 align => -1, 1302 align => -1,
1233 valign => -1, 1303 valign => -1,
1234 padding => 2, 1304 padding => 2,
… …
1249 } 1319 }
1250 1320
1251 $self 1321 $self
1252} 1322}
1253 1323
1254sub escape { 1324sub escape($) {
1255 local $_ = $_[1]; 1325 local $_ = $_[0];
1256 1326
1257 s/&/&amp;/g; 1327 s/&/&amp;/g;
1258 s/>/&gt;/g; 1328 s/>/&gt;/g;
1259 s/</&lt;/g; 1329 s/</&lt;/g;
1260 1330
1261 $_[1] 1331 $_
1262} 1332}
1263 1333
1264sub update { 1334sub update {
1265 my ($self) = @_; 1335 my ($self) = @_;
1266 1336
… …
1299sub size_request { 1369sub size_request {
1300 my ($self) = @_; 1370 my ($self) = @_;
1301 1371
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1372 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $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});
1304 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305 1377
1306 my ($w, $h) = $self->{layout}->size; 1378 my ($w, $h) = $self->{layout}->size;
1307 1379
1308 if (exists $self->{template}) { 1380 if (exists $self->{template}) {
… …
1338} 1410}
1339 1411
1340sub _draw { 1412sub _draw {
1341 my ($self) = @_; 1413 my ($self) = @_;
1342 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1343 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}}); 1418 $self->{layout}->set_foreground (@{$self->{fg}});
1345 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1346 $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});
1347 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1348 1424
1349 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1425 my $tex = new_from_layout CFClient::Texture $self->{layout};
1350 1426
1351 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1352 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1353 : ($self->{w} - $tex->{w}) * 0.5; 1429 : ($self->{w} - $tex->{w}) * 0.5);
1354 1430
1355 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1356 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1357 : ($self->{h} - $tex->{h}) * 0.5; 1433 : ($self->{h} - $tex->{h}) * 0.5);
1358 1434
1359 $tex 1435 $tex
1360 }; 1436 };
1361 1437
1362 glEnable GL_TEXTURE_2D; 1438 glEnable GL_TEXTURE_2D;
… …
1417sub set_text { 1493sub set_text {
1418 my ($self, $text) = @_; 1494 my ($self, $text) = @_;
1419 1495
1420 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1421 $self->_set_text ($text); 1497 $self->_set_text ($text);
1498 $self->update;
1422 $self->check_size; 1499 $self->check_size;
1423 $self->update;
1424} 1500}
1425 1501
1426sub get_text { 1502sub get_text {
1427 $_[0]{text} 1503 $_[0]{text}
1428} 1504}
… …
1448 my $sym = $ev->{sym}; 1524 my $sym = $ev->{sym};
1449 my $uni = $ev->{unicode}; 1525 my $uni = $ev->{unicode};
1450 1526
1451 my $text = $self->get_text; 1527 my $text = $self->get_text;
1452 1528
1453 if ($sym == 8) { 1529 if ($uni == 8) {
1454 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1530 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1455 } elsif ($sym == 127) { 1531 } elsif ($uni == 127) {
1456 substr $text, $self->{cursor}, 1, ""; 1532 substr $text, $self->{cursor}, 1, "";
1457 } elsif ($sym == CFClient::SDLK_LEFT) { 1533 } elsif ($sym == CFClient::SDLK_LEFT) {
1458 --$self->{cursor} if $self->{cursor}; 1534 --$self->{cursor} if $self->{cursor};
1459 } elsif ($sym == CFClient::SDLK_RIGHT) { 1535 } elsif ($sym == CFClient::SDLK_RIGHT) {
1460 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1536 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1461 } elsif ($sym == CFClient::SDLK_HOME) { 1537 } elsif ($sym == CFClient::SDLK_HOME) {
1462 $self->{cursor} = 0; 1538 $self->{cursor} = 0;
1463 } elsif ($sym == CFClient::SDLK_END) { 1539 } elsif ($sym == CFClient::SDLK_END) {
1464 $self->{cursor} = length $text; 1540 $self->{cursor} = length $text;
1465 } elsif ($sym == 27) { 1541 } elsif ($uni == 27) {
1466 $self->emit ('escape'); 1542 $self->emit ('escape');
1467 } elsif ($uni) { 1543 } elsif ($uni) {
1468 substr $text, $self->{cursor}++, 0, chr $uni; 1544 substr $text, $self->{cursor}++, 0, chr $uni;
1469 } 1545 }
1470 1546
1471 $self->_set_text ($text); 1547 $self->_set_text ($text);
1472 $self->update; 1548 $self->update;
1549 $self->check_size;
1473} 1550}
1474 1551
1475sub focus_in { 1552sub focus_in {
1476 my ($self) = @_; 1553 my ($self) = @_;
1477 1554
… …
1606 my $class = shift; 1683 my $class = shift;
1607 1684
1608 $class->SUPER::new ( 1685 $class->SUPER::new (
1609 padding => 4, 1686 padding => 4,
1610 fg => [1, 1, 1], 1687 fg => [1, 1, 1],
1611 bg => [1, 1, 1, 0.2],
1612 active_fg => [0, 0, 1], 1688 active_fg => [0, 0, 1],
1613 can_hover => 1, 1689 can_hover => 1,
1614 align => 0, 1690 align => 0,
1615 valign => 0, 1691 valign => 0,
1616 can_events => 1, 1692 can_events => 1,
… …
1664 1740
1665 $class->SUPER::new ( 1741 $class->SUPER::new (
1666 padding => 2, 1742 padding => 2,
1667 fg => [1, 1, 1], 1743 fg => [1, 1, 1],
1668 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],
1669 state => 0, 1747 state => 0,
1670 can_hover => 1, 1748 can_hover => 1,
1671 @_ 1749 @_
1672 ) 1750 )
1673} 1751}
… …
1957 qw(s1_slider.png s1_slider_bg.png); 2035 qw(s1_slider.png s1_slider_bg.png);
1958 2036
1959sub new { 2037sub new {
1960 my $class = shift; 2038 my $class = shift;
1961 2039
1962 # range [value, low, high, page] 2040 # range [value, low, high, page, unit]
1963 2041
1964 # TODO: 0-width page 2042 # TODO: 0-width page
1965 # TODO: req_w/h are wrong with vertical 2043 # TODO: req_w/h are wrong with vertical
1966 # TODO: calculations are off 2044 # TODO: calculations are off
1967 my $self = $class->SUPER::new ( 2045 my $self = $class->SUPER::new (
1968 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
1969 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],
1970 range => [0, 0, 100, 10], 2050 range => [0, 0, 100, 10],
1971 req_w => $::WIDTH / 80, 2051 req_w => $::WIDTH / 80,
1972 req_h => $::WIDTH / 80, 2052 req_h => $::WIDTH / 80,
1973 vertical => 0, 2053 vertical => 0,
1974 can_hover => 1, 2054 can_hover => 1,
1975 inner_pad => 5, 2055 inner_pad => .05,
1976 @_ 2056 @_
1977 ); 2057 );
1978 2058
2059 $self->set_value ($self->{range}[0]);
2060 $self->update;
2061
1979 $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 }
1980} 2086}
1981 2087
1982sub size_request { 2088sub size_request {
1983 my ($self) = @_; 2089 my ($self) = @_;
1984 2090
… …
1997 2103
1998sub mouse_motion { 2104sub mouse_motion {
1999 my ($self, $ev, $x, $y) = @_; 2105 my ($self, $ev, $x, $y) = @_;
2000 2106
2001 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
2002 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2124 my ($value, $lo, $hi, $page) = @{$self->{range}};
2003 2125
2004 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2126 my $inner_w = 1 - 2 * $self->{inner_pad};
2005 2127
2006 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2007 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2008 2129
2009 $x -= $inner_pad_px; # substract the padding 2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2010 $x = $x * ($hi - $lo) / $inner_w + $lo; 2131 $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 2132
2015 $self->emit (changed => $x); 2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2016 $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;
2017 } 2140 });
2018}
2019 2141
2020# the inner_* stuff is for generating a padding for the slider handle, 2142 $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} 2143}
2027 2144
2028sub _draw { 2145sub _draw {
2029 my ($self) = @_; 2146 my ($self) = @_;
2030 2147
2031 $self->SUPER::_draw (); 2148 $self->SUPER::_draw ();
2032 2149
2033 my ($w, $h) = @$self{qw(w h)}; 2150 glScale $self->{w}, $self->{h};
2034 2151
2035 if ($self->{vertical}) { 2152 if ($self->{vertical}) {
2036 # draw a vertical slider like a rotated horizontal slider 2153 # draw a vertical slider like a rotated horizontal slider
2037 2154
2155 glTranslate 1, 0, 0;
2038 glRotate 90, 0, 0, 1; 2156 glRotate 90, 0, 0, 1;
2039 glTranslate 0, -$self->{w}, 0;
2040
2041 ($w, $h) = ($h, $w);
2042 } 2157 }
2043 2158
2044 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2159 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2045 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2160 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2046 2161
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; 2162 glEnable GL_TEXTURE_2D;
2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2163 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2067 2164
2068 # draw background 2165 # draw background
2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2166 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2070 2167
2071 # draw handle 2168 # draw handle
2072 $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);
2073 2170
2074 glDisable GL_TEXTURE_2D; 2171 glDisable GL_TEXTURE_2D;
2075} 2172}
2076 2173
2077############################################################################# 2174#############################################################################
… …
2165 2262
2166 return unless $self->{h} > 0; 2263 return unless $self->{h} > 0;
2167 2264
2168 delete $self->{texture}; 2265 delete $self->{texture};
2169 2266
2170 $ROOT->on_refresh ($self, sub { 2267 $ROOT->on_post_alloc ($self, sub {
2171 if (delete $self->{need_reflow}) { 2268 if (delete $self->{need_reflow}) {
2172 my $height = 0; 2269 my $height = 0;
2173 2270
2174 $height += $_->[0] = $self->text_height ($_->[2]) 2271 $height += $_->[0] = $self->text_height ($_->[2])
2175 for @{$self->{par}}; 2272 for @{$self->{par}};
… …
2180 2277
2181 delete $self->{texture}; 2278 delete $self->{texture};
2182 } 2279 }
2183 2280
2184 $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 {
2185 glClearColor 0, 0, 0, 0; 2282 glClearColor 0.5, 0.5, 0.5, 0;
2186 glClear GL_COLOR_BUFFER_BIT; 2283 glClear GL_COLOR_BUFFER_BIT;
2187 2284
2188 glEnable GL_TEXTURE_2D; 2285 glEnable GL_TEXTURE_2D;
2189 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2190 2287
… …
2331 2428
2332sub set_tooltip_from { 2429sub set_tooltip_from {
2333 my ($self, $widget) = @_; 2430 my ($self, $widget) = @_;
2334 2431
2335 $self->add (new CFClient::UI::Label 2432 $self->add (new CFClient::UI::Label
2336 markup => $widget->{tooltip}, 2433 markup => $widget->{tooltip},
2337 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338 fontsize => 0.8, 2435 fontsize => 0.8,
2339 fg => [0, 0, 0, 1], 2436 fg => [0, 0, 0, 1],
2437 ellipsise => 0,
2340 font => ($widget->{tooltip_font} || $::FONT_PROP), 2438 font => ($widget->{tooltip_font} || $::FONT_PROP),
2341 ); 2439 );
2342} 2440}
2343 2441
2344sub size_request { 2442sub size_request {
2345 my ($self) = @_; 2443 my ($self) = @_;
… …
2423 2521
2424package CFClient::UI::InventoryItem; 2522package CFClient::UI::InventoryItem;
2425 2523
2426our @ISA = CFClient::UI::HBox::; 2524our @ISA = CFClient::UI::HBox::;
2427 2525
2526sub _item_to_desc {
2527 my ($item) = @_;
2528
2529 my $desc =
2530 $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2551
2428sub new { 2552sub new {
2429 my $class = shift; 2553 my $class = shift;
2430 2554
2431 my %args = @_; 2555 my %args = @_;
2432 2556
2433 my $item = delete $args{item}; 2557 my $item = delete $args{item};
2434 2558
2435 my $desc = $item->{nrof} < 2 2559 my $desc = _item_to_desc ($item);
2436 ? $item->{name}
2437 : "$item->{nrof} $item->{name_pl}";
2438
2439 2560
2440 my $self = $class->SUPER::new ( 2561 my $self = $class->SUPER::new (
2441 can_hover => 1, 2562 can_hover => 1,
2442 can_events => 1, 2563 can_events => 1,
2443 tooltip => (CFClient::UI::Label->escape ($desc) 2564 tooltip => ((CFClient::UI::Label::escape $desc)
2444 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2445 connect_button_down => sub { 2566 connect_button_down => sub {
2446 my ($self, $ev, $x, $y) = @_; 2567 my ($self, $ev, $x, $y) = @_;
2447 2568
2448 # todo: maybe put examine on 1? but should just be a tooltip :( 2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2449 if ($ev->{button} == 1) { 2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2450 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2577 $::CONN->send ("move $targ $item->{tag} 0");
2451 } elsif ($ev->{button} == 2) { 2578 } elsif ($ev->{button} == 2) {
2452 $::CONN->send ("apply $item->{tag}"); 2579 $::CONN->send ("apply $item->{tag}");
2453 } elsif ($ev->{button} == 3) { 2580 } elsif ($ev->{button} == 3) {
2454 CFClient::UI::Menu->new ( 2581 my @menu_items = (
2455 items => [
2456 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2457 [ 2586 [
2458 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459 sub { $::CONN->send ("lock $item->{tag}") }, 2588 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 ], 2589 ],
2465 )->popup ($ev); 2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2466 } 2593 }
2467 2594
2468 1 2595 1
2469 }, 2596 },
2470 %args 2597 %args
2471 ); 2598 );
2599
2472 2600
2473 $self->add (new CFClient::UI::Face 2601 $self->add (new CFClient::UI::Face
2474 can_events => 0, 2602 can_events => 0,
2475 face => $item->{face}, 2603 face => $item->{face},
2476 anim => $item->{anim}, 2604 anim => $item->{anim},
2477 animspeed => $item->{animspeed}, 2605 animspeed => $item->{animspeed},
2478 ); 2606 );
2479 2607
2480 $self->add (new CFClient::UI::Label 2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2481 can_events => 0, 2609
2482 text => $desc, 2610 $self->{item} = $item;
2483 ); 2611
2612 $self->update_item;
2484 2613
2485 $self 2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2486} 2623}
2487 2624
2488############################################################################# 2625#############################################################################
2489 2626
2490package CFClient::UI::Inventory; 2627package CFClient::UI::Inventory;
… …
2506 my ($self, $items) = @_; 2643 my ($self, $items) = @_;
2507 2644
2508 $self->{scrolled}->clear; 2645 $self->{scrolled}->clear;
2509 return unless $items; 2646 return unless $items;
2510 2647
2511 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2648 my @items = sort {
2649 ($a->{type} <=> $b->{type})
2650 or ($a->{name} cmp $b->{name})
2651 } @$items;
2512 2652
2513 $self->{real_items} = \@items; 2653 $self->{real_items} = \@items;
2514 2654
2515 for my $item (@items) { 2655 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); 2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657 $item->update_item ();
2521 } 2658 }
2659
2660 $self->{scrolled}->add (@items);
2522 2661
2523# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2524} 2663}
2525 2664
2526sub size_request { 2665sub size_request {
… …
2604 2743
2605package CFClient::UI::Statusbox; 2744package CFClient::UI::Statusbox;
2606 2745
2607our @ISA = CFClient::UI::VBox::; 2746our @ISA = CFClient::UI::VBox::;
2608 2747
2748sub new {
2749 my $class = shift;
2750
2751 $class->SUPER::new (
2752 fontsize => 0.8,
2753 @_,
2754 )
2755}
2756
2609sub reorder { 2757sub reorder {
2610 my ($self) = @_; 2758 my ($self) = @_;
2611 my $NOW = time; 2759 my $NOW = time;
2612 2760
2613 while (my ($k, $v) = each %{ $self->{item} }) { 2761 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2631 ? "<b>$item->{count} ×</b> $item->{text}" 2779 ? "<b>$item->{count} ×</b> $item->{text}"
2632 : $item->{text}; 2780 : $item->{text};
2633 2781
2634 for ($short) { 2782 for ($short) {
2635 s/^\s+//; 2783 s/^\s+//;
2636 s/\012.*/…/s; 2784 s/\s+/ /g;
2637 my $len = int 30 / $item->{fontsize};
2638 substr $_, $len, length, "…" if $len < length;
2639 } 2785 }
2640 2786
2641 new CFClient::UI::Label 2787 new CFClient::UI::Label
2642 markup => $short, 2788 markup => $short,
2643 tooltip => $item->{tooltip}, 2789 tooltip => $item->{tooltip},
2644 tooltip_font => $::FONT_PROP, 2790 tooltip_font => $::FONT_PROP,
2645 tooltip_width => 0.67, 2791 tooltip_width => 0.67,
2646 fontsize => $item->{fontsize}, 2792 fontsize => $item->{fontsize} || $self->{fontsize},
2793 max_w => $::WIDTH * 0.44,
2647 color => $item->{color}, 2794 fg => $item->{fg},
2648 can_events => 1, 2795 can_events => 1,
2649 can_hover => 1 2796 can_hover => 1
2650 }; 2797 };
2651 } 2798 }
2652 2799
… …
2654 $self->SUPER::add (reverse @widgets); 2801 $self->SUPER::add (reverse @widgets);
2655} 2802}
2656 2803
2657sub add { 2804sub add {
2658 my ($self, $text, %arg) = @_; 2805 my ($self, $text, %arg) = @_;
2806
2807 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//;
2659 2809
2660 my $timeout = time + ((delete $arg{timeout}) || 60); 2810 my $timeout = time + ((delete $arg{timeout}) || 60);
2661 2811
2662 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663 2813
… …
2666 $item->{count}++; 2816 $item->{count}++;
2667 } else { 2817 } else {
2668 $item->{count} = 1; 2818 $item->{count} = 1;
2669 $item->{text} = $item->{tooltip} = $text; 2819 $item->{text} = $item->{tooltip} = $text;
2670 } 2820 }
2821 $item->{id} = ++$self->{id};
2671 $item->{timeout} = $timeout; 2822 $item->{timeout} = $timeout;
2672 delete $item->{label}; 2823 delete $item->{label};
2673 } else { 2824 } else {
2674 $self->{item}{$group} = { 2825 $self->{item}{$group} = {
2675 id => ++$self->{id}, 2826 id => ++$self->{id},
2676 text => $text, 2827 text => $text,
2677 timeout => $timeout, 2828 timeout => $timeout,
2678 tooltip => $text, 2829 tooltip => $text,
2679 fontsize => 0.8,
2680 color => [0.8, 0.8, 0.8, 0.8], 2830 fg => [0.8, 0.8, 0.8, 0.8],
2681 pri => 0, 2831 pri => 0,
2682 count => 1, 2832 count => 1,
2683 %arg, 2833 %arg,
2684 }; 2834 };
2685 } 2835 }
2686 2836
2687 $self->reorder; 2837 $self->reorder;
2688} 2838}
2689 2839
2840sub reconfigure {
2841 my ($self) = @_;
2842
2843 delete $_->{label}
2844 for values %{ $self->{item} || {} };
2845
2846 $self->reorder;
2847 $self->SUPER::reconfigure;
2848}
2849
2690############################################################################# 2850#############################################################################
2691 2851
2692package CFClient::UI::Root; 2852package CFClient::UI::Root;
2693 2853
2694our @ISA = CFClient::UI::Container::; 2854our @ISA = CFClient::UI::Container::;
… …
2724} 2884}
2725 2885
2726sub size_allocate { 2886sub size_allocate {
2727 my ($self, $w, $h) = @_; 2887 my ($self, $w, $h) = @_;
2728 2888
2729 my $old_w = $self->{old_w}; 2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2730 my $old_h = $self->{old_h}; 2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2731 2891
2732 if ($old_w && $old_h) { 2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2733 for my $child ($self->children) { 2893 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 2894
2745 for my $child ($self->children) { 2895 for my $child ($self->children) {
2746 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2896 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2747 2897
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2899 if exists $child->{req_x};
2900
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2902 if exists $child->{req_y};
2903
2748 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2904 $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; 2905 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906
2750 $child->configure ($X, $Y, $W, $H); 2907 $child->configure ($X, $Y, $W, $H);
2751 } 2908 }
2752
2753 $self->{old_w} = $w;
2754 $self->{old_h} = $h;
2755} 2909}
2756 2910
2757sub coord2local { 2911sub coord2local {
2758 my ($self, $x, $y) = @_; 2912 my ($self, $x, $y) = @_;
2759 2913
… …
2772 $self->check_size; 2926 $self->check_size;
2773 $::WANT_REFRESH++; 2927 $::WANT_REFRESH++;
2774} 2928}
2775 2929
2776sub add { 2930sub add {
2777 my ($self, $child) = @_; 2931 my ($self, @children) = @_;
2778 2932
2933 for my $child (@children) {
2934 $child->{toplevel} = 1;
2935
2779 # integerise window positions 2936 # integerise window positions
2780 $child->{x} = int $child->{x}; 2937 $child->{x} = int $child->{x};
2781 $child->{y} = int $child->{y}; 2938 $child->{y} = int $child->{y};
2939 }
2782 2940
2783 $self->SUPER::add ($child); 2941 $self->SUPER::add (@children);
2784} 2942}
2785 2943
2786sub on_refresh { 2944sub on_refresh {
2787 my ($self, $id, $cb) = @_; 2945 my ($self, $id, $cb) = @_;
2788 2946
2789 $self->{refresh_hook}{$id} = $cb; 2947 $self->{refresh_hook}{$id} = $cb;
2790} 2948}
2791 2949
2950sub on_post_alloc {
2951 my ($self, $id, $cb) = @_;
2952
2953 $self->{post_alloc_hook}{$id} = $cb;
2954}
2955
2792sub draw { 2956sub draw {
2793 my ($self) = @_; 2957 my ($self) = @_;
2958
2959 while ($self->{refresh_hook}) {
2960 $_->()
2961 for values %{delete $self->{refresh_hook}};
2962 }
2794 2963
2795 if ($self->{check_size}) { 2964 if ($self->{check_size}) {
2796 my @queue = ([], []); 2965 my @queue = ([], []);
2797 2966
2798 for (;;) { 2967 for (;;) {
… …
2835 $widget->size_allocate ($w, $h); 3004 $widget->size_allocate ($w, $h);
2836 $widget->emit (size_allocate => $w, $h); 3005 $widget->emit (size_allocate => $w, $h);
2837 } 3006 }
2838 } 3007 }
2839 3008
2840 while ($self->{refresh_hook}) { 3009 while ($self->{post_alloc_hook}) {
2841 $_->() 3010 $_->()
2842 for values %{delete $self->{refresh_hook}}; 3011 for values %{delete $self->{post_alloc_hook}};
2843 } 3012 }
2844 3013
2845 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3014 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2847 glClear GL_COLOR_BUFFER_BIT; 3016 glClear GL_COLOR_BUFFER_BIT;
… …
2858############################################################################# 3027#############################################################################
2859 3028
2860package CFClient::UI; 3029package CFClient::UI;
2861 3030
2862$ROOT = new CFClient::UI::Root; 3031$ROOT = new CFClient::UI::Root;
2863$TOOLTIP = new CFClient::UI::Tooltip; 3032$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2864 3033
28651 30341
2866 3035

Diff Legend

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