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.192 by root, Tue May 9 22:49:32 2006 UTC vs.
Revision 1.203 by root, Sun May 14 21:13:11 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
15 18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_markup ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29
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) { 36 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 } 38 }
37 39
38 $TOOLTIP->move ($x, $y); 40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
39 } 43 }
40 44
41 return; 45 return;
42 } 46 }
43 } 47 }
… …
130 134
131 for (@$vals) { 135 for (@$vals) {
132 my $i = int $_ + $rem; 136 my $i = int $_ + $rem;
133 $rem += $_ - $i; 137 $rem += $_ - $i;
134 $_ = $i; 138 $_ = $i;
139 }
140}
141
142# call when resolution changes etc.
143sub rescale_widgets {
144 my ($sx, $sy) = @_;
145
146 for my $widget (values %WIDGET) {
147 if ($widget->{toplevel}) {
148 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
149 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
150 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
151 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
153 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
154 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
155 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
156 }
157
158 $widget->reconfigure;
135 } 159 }
136} 160}
137 161
138############################################################################# 162#############################################################################
139 163
… …
158 if (/^connect_(.*)$/) { 182 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 183 $self->connect ($1 => delete $self->{$_});
160 } 184 }
161 } 185 }
162 186
187 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
188
163 $self 189 $self
164} 190}
165 191
166sub destroy { 192sub destroy {
167 my ($self) = @_; 193 my ($self) = @_;
… …
240 266
241sub size_allocate { 267sub size_allocate {
242 # nothing to be done 268 # nothing to be done
243} 269}
244 270
271sub reconfigure {
272 my ($self) = @_;
273
274 $self->check_size (1);
275 $self->update;
276}
277
245sub children { 278sub children {
246}
247
248# call when resolution changes etc.
249sub reconfigure {
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257 $self->update;
258} 279}
259 280
260sub set_max_size { 281sub set_max_size {
261 my ($self, $w, $h) = @_; 282 my ($self, $w, $h) = @_;
262 283
… …
380} 401}
381 402
382sub set_parent { 403sub set_parent {
383 my ($self, $parent) = @_; 404 my ($self, $parent) = @_;
384 405
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
386 Scalar::Util::weaken ($self->{parent} = $parent); 406 Scalar::Util::weaken ($self->{parent} = $parent);
407
408 # TODO: req_w _does_change after ->reconfigure
409 $self->check_size
410 unless exists $self->{req_w};
387} 411}
388 412
389sub check_size { 413sub check_size {
390 my ($self) = @_; 414 my ($self, $forced) = @_;
391 415
416 $self->{force_alloc} = 1 if $forced;
392 $CFClient::UI::ROOT->{check_size}{$self} = $self; 417 $CFClient::UI::ROOT->{check_size}{$self} = $self;
393} 418}
394 419
395sub update { 420sub update {
396 my ($self) = @_; 421 my ($self) = @_;
… …
412} 437}
413 438
414sub DESTROY { 439sub DESTROY {
415 my ($self) = @_; 440 my ($self) = @_;
416 441
442 delete $WIDGET{$self+0};
417 #$self->deactivate; 443 #$self->deactivate;
418} 444}
419 445
420############################################################################# 446#############################################################################
421 447
… …
506 $self->{children} = [ 532 $self->{children} = [
507 sort { $a->{z} <=> $b->{z} } 533 sort { $a->{z} <=> $b->{z} }
508 @{$self->{children}}, @widgets 534 @{$self->{children}}, @widgets
509 ]; 535 ];
510 536
511 $_->check_size 537 $self->check_size (1);
512 for @widgets;
513
514 $self->update; 538 $self->update;
515} 539}
516 540
517sub children { 541sub children {
518 @{ $_[0]{children} } 542 @{ $_[0]{children} }
… …
625} 649}
626 650
627sub update { 651sub update {
628 my ($self) = @_; 652 my ($self) = @_;
629 653
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 654 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 655 $self->SUPER::update;
632} 656}
633 657
634sub size_allocate { 658sub size_allocate {
635 my ($self, $w, $h) = @_; 659 my ($self, $w, $h) = @_;
… …
666 my ($w, $h) = ($self->w, $self->h); 690 my ($w, $h) = ($self->w, $self->h);
667 691
668 my $tex = $self->{texture} 692 my $tex = $self->{texture}
669 or return; 693 or return;
670 694
671 glEnable GL_BLEND;
672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 695 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1; 697 glColor 0, 0, 0, 1;
676 698
677 $tex->draw_quad (0, 0, $w, $h); 699 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678 700
679 glDisable GL_BLEND;
680 glDisable GL_TEXTURE_2D; 701 glDisable GL_TEXTURE_2D;
681} 702}
682 703
683############################################################################# 704#############################################################################
684 705
… …
776 $self->add ($self->{slider}); 797 $self->add ($self->{slider});
777 798
778 $self 799 $self
779} 800}
780 801
781#TODO# update range on size_allocate depeneing on child 802#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 803# update viewport offset on scroll
783 804
784############################################################################# 805#############################################################################
785 806
786package CFClient::UI::Frame; 807package CFClient::UI::Frame;
… …
790use CFClient::OpenGL; 811use CFClient::OpenGL;
791 812
792sub new { 813sub new {
793 my $class = shift; 814 my $class = shift;
794 815
795 my $self = $class->SUPER::new ( 816 $class->SUPER::new (
796 bg => [1, 1, 1, 1], 817 bg => undef,
797 border_bg => [1, 1, 1, 1],
798 border => 0.8,
799 @_ 818 @_,
800 ); 819 )
801
802 $self
803} 820}
804 821
805sub _draw { 822sub _draw {
806 my ($self) = @_; 823 my ($self) = @_;
807 824
808 my ($w, $h) = ($self->{w}, $self->{h}); 825 if ($self->{bg}) {
826 my ($w, $h) = @$self{qw(w h)};
809 827
810 glEnable GL_BLEND; 828 glEnable GL_BLEND;
811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 829 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812 glEnable GL_TEXTURE_2D; 830 glColor @{ $self->{bg} };
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 831
815# glBegin GL_QUADS; 832 glBegin GL_QUADS;
816# glColor 0, 0, 0, 0;
817# glVertex 0 , 0; 833 glVertex 0 , 0;
818# glVertex 0 , $h; 834 glVertex 0 , $h;
819# glVertex $w, $h; 835 glVertex $w, $h;
820# glVertex $w, 0; 836 glVertex $w, 0;
821# glEnd; 837 glEnd;
822 838
823
824 $self->child->draw;
825 glDisable GL_BLEND; 839 glDisable GL_BLEND;
826 glDisable GL_TEXTURE_2D; 840 }
841
842 $self->SUPER::_draw;
827} 843}
828 844
829############################################################################# 845#############################################################################
830 846
831package CFClient::UI::FancyFrame; 847package CFClient::UI::FancyFrame;
… …
845 861
846 my $self = $class->SUPER::new ( 862 my $self = $class->SUPER::new (
847 bg => [1, 1, 1, 1], 863 bg => [1, 1, 1, 1],
848 border_bg => [1, 1, 1, 1], 864 border_bg => [1, 1, 1, 1],
849 border => 0.6, 865 border => 0.6,
866 toplevel => 1,
850 can_events => 1, 867 can_events => 1,
851 @_ 868 @_
852 ); 869 );
853 870
854 $self->{title} &&= new CFClient::UI::Label 871 $self->{title} &&= new CFClient::UI::Label
… …
947 my ($self) = @_; 964 my ($self) = @_;
948 965
949 my ($w, $h ) = ($self->{w}, $self->{h}); 966 my ($w, $h ) = ($self->{w}, $self->{h});
950 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 967 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951 968
952 glEnable GL_BLEND;
953 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954 glEnable GL_TEXTURE_2D; 969 glEnable GL_TEXTURE_2D;
955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 970 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956 971
957 my $border = $self->border; 972 my $border = $self->border;
958 973
959 glColor @{ $self->{border_bg} }; 974 glColor @{ $self->{border_bg} };
960 $tex[1]->draw_quad (0, 0, $w, $border); 975 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
961 $tex[3]->draw_quad (0, $border, $border, $ch); 976 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 977 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963 $tex[4]->draw_quad (0, $h - $border, $w, $border); 978 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964 979
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 980 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966 my $bg = $tex[0]; 981 my $bg = $tex[0];
967 982
968 # TODO: repeat texture not scale 983 # TODO: repeat texture not scale
… …
972 glColor @{ $self->{bg} }; 987 glColor @{ $self->{bg} };
973 988
974 $bg->{s} = $rep_x; 989 $bg->{s} = $rep_x;
975 $bg->{t} = $rep_y; 990 $bg->{t} = $rep_y;
976 $bg->{wrap_mode} = 1; 991 $bg->{wrap_mode} = 1;
977 $bg->draw_quad ($border, $border, $cw, $ch); 992 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
993 }
978 994
979 glDisable GL_TEXTURE_2D; 995 glDisable GL_TEXTURE_2D;
980 glDisable GL_BLEND;
981 }
982 996
983 $self->{title}->draw if $self->{title}; 997 $self->{title}->draw if $self->{title};
984 998
985 $self->child->draw; 999 $self->child->draw;
986} 1000}
… …
1213} 1227}
1214 1228
1215sub size_allocate { 1229sub size_allocate {
1216 my ($self, $w, $h) = @_; 1230 my ($self, $w, $h) = @_;
1217 1231
1232 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1233
1218 my $children = $self->{children}; 1234 my $children = $self->{children};
1219 1235
1220 my @h = map $_->{req_h}, @$children; 1236 my @h = map $_->{req_h}, @$children;
1221 1237
1222 my $req_h = List::Util::sum @h; 1238 my $req_h = List::Util::sum @h;
… …
1261 my ($class, %arg) = @_; 1277 my ($class, %arg) = @_;
1262 1278
1263 my $self = $class->SUPER::new ( 1279 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1280 fg => [1, 1, 1],
1265 #font => default_font 1281 #font => default_font
1282 #text => initial text
1283 #markup => initial narkup
1284 layout => (new CFClient::Layout),
1266 fontsize => 1, 1285 fontsize => 1,
1267 text => "",
1268 align => -1, 1286 align => -1,
1269 valign => -1, 1287 valign => -1,
1270 padding => 2, 1288 padding => 2,
1271 layout => new CFClient::Layout,
1272 can_events => 0, 1289 can_events => 0,
1273 %arg 1290 %arg
1274 ); 1291 );
1275 1292
1276 if (exists $self->{template}) { 1293 if (exists $self->{template}) {
1277 my $layout = new CFClient::Layout; 1294 my $layout = new CFClient::Layout;
1278 $layout->set_text (delete $self->{template}); 1295 $layout->set_text (delete $self->{template});
1279 $self->{template} = $layout; 1296 $self->{template} = $layout;
1280 } 1297 }
1281 1298
1282 $self->set_text (delete $self->{text}) if exists $self->{text}; 1299 if (exists $self->{markup}) {
1283 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1300 $self->set_markup (delete $self->{markup});
1301 } else {
1302 $self->set_text (delete $self->{text});
1303 }
1284 1304
1285 $self 1305 $self
1286} 1306}
1287 1307
1288sub escape { 1308sub escape {
… …
1306 my ($self, $text) = @_; 1326 my ($self, $text) = @_;
1307 1327
1308 return if $self->{text} eq "T$text"; 1328 return if $self->{text} eq "T$text";
1309 $self->{text} = "T$text"; 1329 $self->{text} = "T$text";
1310 1330
1331 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1311 $self->{layout}->set_text ($text); 1332 $self->{layout}->set_text ($text);
1312 1333
1313 $self->update; 1334 $self->update;
1314 $self->check_size; 1335 $self->check_size;
1315} 1336}
… …
1318 my ($self, $markup) = @_; 1339 my ($self, $markup) = @_;
1319 1340
1320 return if $self->{text} eq "M$markup"; 1341 return if $self->{text} eq "M$markup";
1321 $self->{text} = "M$markup"; 1342 $self->{text} = "M$markup";
1322 1343
1344 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1345
1346 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1323 $self->{layout}->set_markup ($markup); 1347 $self->{layout}->set_markup ($markup);
1324 1348
1325 $self->update; 1349 $self->update;
1326 $self->check_size; 1350 $self->check_size;
1327} 1351}
… …
1369 1393
1370sub _draw { 1394sub _draw {
1371 my ($self) = @_; 1395 my ($self) = @_;
1372 1396
1373 my $tex = $self->{texture} ||= do { 1397 my $tex = $self->{texture} ||= do {
1398 $self->{layout}->set_foreground (@{$self->{fg}});
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1399 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{w}); 1400 $self->{layout}->set_width ($self->{w});
1376 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1401 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1402
1377 new_from_layout CFClient::Texture $self->{layout} 1403 my $tex = new_from_layout CFClient::Texture $self->{layout};
1404
1405 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1406 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407 : ($self->{w} - $tex->{w}) * 0.5;
1408
1409 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1410 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411 : ($self->{h} - $tex->{h}) * 0.5;
1412
1413 $tex
1378 }; 1414 };
1379 1415
1380 glEnable GL_BLEND;
1381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1382 glEnable GL_TEXTURE_2D; 1416 glEnable GL_TEXTURE_2D;
1383 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1384 1418
1419 if ($tex->{format} == GL_ALPHA) {
1385 glColor @{$self->{fg}}; 1420 glColor @{$self->{fg}};
1386
1387 $self->{ox} = int (
1388 $self->{align} < 0 ? $self->{padding}
1389 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390 : ($self->{w} - $tex->{w}) * 0.5
1391 );
1392
1393 $self->{oy} = int (
1394 $self->{valign} < 0 ? $self->{padding}
1395 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1396 : ($self->{h} - $tex->{h}) * 0.5
1397 );
1398
1399 $tex->draw_quad ($self->{ox}, $self->{oy}); 1421 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1422 } else {
1423 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1424 }
1400 1425
1401 glDisable GL_TEXTURE_2D; 1426 glDisable GL_TEXTURE_2D;
1402 glDisable GL_BLEND;
1403} 1427}
1404 1428
1405############################################################################# 1429#############################################################################
1406 1430
1407package CFClient::UI::EntryBase; 1431package CFClient::UI::EntryBase;
… …
1442 $self->{layout}->set_text ("$text "); 1466 $self->{layout}->set_text ("$text ");
1443 1467
1444 $self->emit (changed => $self->{text}); 1468 $self->emit (changed => $self->{text});
1445} 1469}
1446 1470
1471sub set_text {
1472 my ($self, $text) = @_;
1473
1474 $self->{cursor} = length $text;
1475 $self->_set_text ($text);
1476 $self->check_size;
1477 $self->update;
1478}
1479
1447sub get_text { 1480sub get_text {
1448 $_[0]{text} 1481 $_[0]{text}
1449} 1482}
1450 1483
1451sub size_request { 1484sub size_request {
… …
1458 1491
1459sub size_allocate { 1492sub size_allocate {
1460 my ($self, $w, $h) = @_; 1493 my ($self, $w, $h) = @_;
1461 1494
1462 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1495 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1463}
1464
1465sub set_text {
1466 my ($self, $text) = @_;
1467
1468 $self->{cursor} = length $text;
1469 $self->_set_text ($text);
1470 $self->update;
1471} 1496}
1472 1497
1473sub key_down { 1498sub key_down {
1474 my ($self, $ev) = @_; 1499 my ($self, $ev) = @_;
1475 1500
… …
1477 my $sym = $ev->{sym}; 1502 my $sym = $ev->{sym};
1478 my $uni = $ev->{unicode}; 1503 my $uni = $ev->{unicode};
1479 1504
1480 my $text = $self->get_text; 1505 my $text = $self->get_text;
1481 1506
1482 if ($sym == 8) { 1507 if ($uni == 8) {
1483 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1508 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1484 } elsif ($sym == 127) { 1509 } elsif ($uni == 127) {
1485 substr $text, $self->{cursor}, 1, ""; 1510 substr $text, $self->{cursor}, 1, "";
1486 } elsif ($sym == CFClient::SDLK_LEFT) { 1511 } elsif ($sym == CFClient::SDLK_LEFT) {
1487 --$self->{cursor} if $self->{cursor}; 1512 --$self->{cursor} if $self->{cursor};
1488 } elsif ($sym == CFClient::SDLK_RIGHT) { 1513 } elsif ($sym == CFClient::SDLK_RIGHT) {
1489 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1514 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1490 } elsif ($sym == CFClient::SDLK_HOME) { 1515 } elsif ($sym == CFClient::SDLK_HOME) {
1491 $self->{cursor} = 0; 1516 $self->{cursor} = 0;
1492 } elsif ($sym == CFClient::SDLK_END) { 1517 } elsif ($sym == CFClient::SDLK_END) {
1493 $self->{cursor} = length $text; 1518 $self->{cursor} = length $text;
1494 } elsif ($sym == 27) { 1519 } elsif ($uni == 27) {
1495 $self->emit ('escape'); 1520 $self->emit ('escape');
1496 } elsif ($uni) { 1521 } elsif ($uni) {
1497 substr $text, $self->{cursor}++, 0, chr $uni; 1522 substr $text, $self->{cursor}++, 0, chr $uni;
1498 } 1523 }
1499 1524
… …
1663 1688
1664 if ($GRAB == $self) { 1689 if ($GRAB == $self) {
1665 $self->{fg} = $self->{active_fg}; 1690 $self->{fg} = $self->{active_fg};
1666 } 1691 }
1667 1692
1668 glEnable GL_BLEND;
1669 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1670 glEnable GL_TEXTURE_2D; 1693 glEnable GL_TEXTURE_2D;
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672 glColor 0, 0, 0, 1; 1695 glColor 0, 0, 0, 1;
1673 1696
1674 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1697 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1675 1698
1676 glDisable GL_TEXTURE_2D; 1699 glDisable GL_TEXTURE_2D;
1677 glDisable GL_BLEND;
1678 1700
1679 $self->SUPER::_draw; 1701 $self->SUPER::_draw;
1680} 1702}
1681 1703
1682############################################################################# 1704#############################################################################
… …
1729 1751
1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1752 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1731 1753
1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733 1755
1734 glEnable GL_BLEND; 1756 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757
1735 glEnable GL_TEXTURE_2D; 1758 glEnable GL_TEXTURE_2D;
1736 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1737
1738 my $tex = $self->{state} ? $tex[1] : $tex[0];
1739
1740 $tex->draw_quad (0, 0, $s, $s); 1759 $tex->draw_quad_alpha (0, 0, $s, $s);
1741
1742 glDisable GL_TEXTURE_2D; 1760 glDisable GL_TEXTURE_2D;
1743 glDisable GL_BLEND;
1744} 1761}
1745 1762
1746############################################################################# 1763#############################################################################
1747 1764
1748package CFClient::UI::Image; 1765package CFClient::UI::Image;
… …
1791 glTranslate 0, -$self->{w}, 0; 1808 glTranslate 0, -$self->{w}, 0;
1792 1809
1793 ($w, $h) = ($h, $w); 1810 ($w, $h) = ($h, $w);
1794 } 1811 }
1795 1812
1796 glEnable GL_BLEND;
1797 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798 glEnable GL_TEXTURE_2D; 1813 glEnable GL_TEXTURE_2D;
1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800 1815
1801 $tex->draw_quad (0, 0, $w, $h); 1816 $tex->draw_quad_alpha (0, 0, $w, $h);
1802 1817
1803 glDisable GL_BLEND;
1804 glDisable GL_TEXTURE_2D; 1818 glDisable GL_TEXTURE_2D;
1805} 1819}
1806 1820
1807############################################################################# 1821#############################################################################
1808 1822
… …
2100 $page ||= 2; 2114 $page ||= 2;
2101 2115
2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2116 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2117 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2104 2118
2105 glEnable GL_BLEND;
2106 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2107 glEnable GL_TEXTURE_2D; 2119 glEnable GL_TEXTURE_2D;
2108 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2109 2121
2110 # draw background 2122 # draw background
2111 $tex[1]->draw_quad (0, 0, $w, $h); 2123 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
2112 2124
2113 # draw handle 2125 # draw handle
2114 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2126 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
2115 2127
2116 glDisable GL_BLEND;
2117 glDisable GL_TEXTURE_2D; 2128 glDisable GL_TEXTURE_2D;
2118} 2129}
2119 2130
2120############################################################################# 2131#############################################################################
2121 2132
… …
2132 fontsize => 1, 2143 fontsize => 1,
2133 can_events => 0, 2144 can_events => 0,
2134 #font => default_font 2145 #font => default_font
2135 @_, 2146 @_,
2136 2147
2137 layout => (new CFClient::Layout), 2148 layout => (new CFClient::Layout 1),
2138 par => [], 2149 par => [],
2139 height => 0, 2150 height => 0,
2140 children => [ 2151 children => [
2141 (new CFClient::UI::Empty expand => 1), 2152 (new CFClient::UI::Empty expand => 1),
2142 (new CFClient::UI::Slider vertical => 1), 2153 (new CFClient::UI::Slider vertical => 1),
… …
2160 2171
2161 my $layout = $self->{layout}; 2172 my $layout = $self->{layout};
2162 2173
2163 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2174 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2164 $layout->set_width ($self->{children}[0]{w}); 2175 $layout->set_width ($self->{children}[0]{w});
2165 $layout->set_text ($text); 2176 $layout->set_markup ($text);
2166 2177
2167 ($layout->size)[1] 2178 ($layout->size)[1]
2168} 2179}
2169 2180
2170sub reflow { 2181sub reflow {
… …
2208 2219
2209 return unless $self->{h} > 0; 2220 return unless $self->{h} > 0;
2210 2221
2211 delete $self->{texture}; 2222 delete $self->{texture};
2212 2223
2213 $ROOT->on_refresh ($self, sub { 2224 $ROOT->on_post_alloc ($self, sub {
2214 if (delete $self->{need_reflow}) { 2225 if (delete $self->{need_reflow}) {
2215 my $height = 0; 2226 my $height = 0;
2216 2227
2217 $height += $_->[0] = $self->text_height ($_->[2]) 2228 $height += $_->[0] = $self->text_height ($_->[2])
2218 for @{$self->{par}}; 2229 for @{$self->{par}};
… …
2226 2237
2227 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2238 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2228 glClearColor 0, 0, 0, 0; 2239 glClearColor 0, 0, 0, 0;
2229 glClear GL_COLOR_BUFFER_BIT; 2240 glClear GL_COLOR_BUFFER_BIT;
2230 2241
2231 glEnable GL_BLEND;
2232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2233 glEnable GL_TEXTURE_2D; 2242 glEnable GL_TEXTURE_2D;
2234 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2235 2244
2236 my $top = int $self->{children}[1]{range}[0]; 2245 my $top = int $self->{children}[1]{range}[0];
2237 2246
… …
2246 2255
2247 for my $par (@{$self->{par}}) { 2256 for my $par (@{$self->{par}}) {
2248 my $h = $par->[0]; 2257 my $h = $par->[0];
2249 2258
2250 if ($y0 < $y + $h && $y < $y1) { 2259 if ($y0 < $y + $h && $y < $y1) {
2260 $layout->set_foreground (@{ $par->[1] });
2251 $layout->set_text ($par->[2]); 2261 $layout->set_markup ($par->[2]);
2252 2262
2253 glColor @{ $par->[1] };
2254 my ($W, $H) = $layout->size; 2263 my ($W, $H) = $layout->size;
2255 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2264 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2256 } 2265 }
2257 2266
2258 $y += $h; 2267 $y += $h;
2259 } 2268 }
2260 2269
2261 glDisable GL_TEXTURE_2D; 2270 glDisable GL_TEXTURE_2D;
2262 glDisable GL_BLEND;
2263 }; 2271 };
2264 }); 2272 });
2265} 2273}
2266 2274
2267sub _draw { 2275sub _draw {
2268 my ($self) = @_; 2276 my ($self) = @_;
2269 2277
2270 glEnable GL_BLEND;
2271 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2272 glEnable GL_TEXTURE_2D; 2278 glEnable GL_TEXTURE_2D;
2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2279 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274 glColor 1, 1, 1, 1; 2280 glColor 1, 1, 1, 1;
2275 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2281 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2276 glDisable GL_TEXTURE_2D; 2282 glDisable GL_TEXTURE_2D;
2277 glDisable GL_BLEND;
2278 2283
2279 $self->{children}[1]->draw; 2284 $self->{children}[1]->draw;
2280 2285
2281} 2286}
2282 2287
… …
2376 @_, 2381 @_,
2377 can_events => 0, 2382 can_events => 0,
2378 ) 2383 )
2379} 2384}
2380 2385
2381sub set_markup { 2386sub set_tooltip_from {
2382 my ($self, $text) = @_; 2387 my ($self, $widget) = @_;
2383 2388
2384 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2389 $self->add (new CFClient::UI::Label
2385 $self->{label}->set_markup ($text); 2390 markup => $widget->{tooltip},
2386 $self->add ($self->{label}); 2391 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392 fontsize => 0.8,
2393 fg => [0, 0, 0, 1],
2394 font => ($widget->{tooltip_font} || $::FONT_PROP),
2395 );
2387} 2396}
2388 2397
2389sub size_request { 2398sub size_request {
2390 my ($self) = @_; 2399 my ($self) = @_;
2391
2392 $self->child->set_max_size ($::WIDTH * 0.3);
2393 2400
2394 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2401 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2395 2402
2396 ($w + 4, $h + 4) 2403 ($w + 4, $h + 4)
2397} 2404}
… …
2403} 2410}
2404 2411
2405sub _draw { 2412sub _draw {
2406 my ($self) = @_; 2413 my ($self) = @_;
2407 2414
2408 glPushMatrix;
2409 glTranslate 0.375, 0.375; 2415 glTranslate 0.375, 0.375;
2410 2416
2411 my ($w, $h) = @$self{qw(w h)}; 2417 my ($w, $h) = @$self{qw(w h)};
2412 2418
2413 glColor 1, 0.8, 0.4; 2419 glColor 1, 0.8, 0.4;
… …
2424 glVertex 0 , $h; 2430 glVertex 0 , $h;
2425 glVertex $w, $h; 2431 glVertex $w, $h;
2426 glVertex $w, 0; 2432 glVertex $w, 0;
2427 glEnd; 2433 glEnd;
2428 2434
2429 glPopMatrix; 2435 glTranslate 2 - 0.375, 2 - 0.375;
2430
2431 glTranslate 2, 2;
2432 $self->SUPER::_draw; 2436 $self->SUPER::_draw;
2433} 2437}
2434 2438
2435############################################################################# 2439#############################################################################
2436 2440
… …
2459 return unless $::CONN;#d# manage and cache textures differently 2463 return unless $::CONN;#d# manage and cache textures differently
2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2464 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2461 2465
2462 # TODO animation 2466 # TODO animation
2463 if ($tex) { 2467 if ($tex) {
2464 glEnable GL_BLEND;
2465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2466 glEnable GL_TEXTURE_2D; 2468 glEnable GL_TEXTURE_2D;
2467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2468 glColor 1, 1, 1, 1; 2470 glColor 1, 1, 1, 1;
2469 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2471 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470 glDisable GL_TEXTURE_2D; 2472 glDisable GL_TEXTURE_2D;
2471 glDisable GL_BLEND;
2472 } 2473 }
2473} 2474}
2474 2475
2475############################################################################# 2476#############################################################################
2476 2477
… …
2559 my ($self, $items) = @_; 2560 my ($self, $items) = @_;
2560 2561
2561 $self->{scrolled}->clear; 2562 $self->{scrolled}->clear;
2562 return unless $items; 2563 return unless $items;
2563 2564
2564 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2565 my @items = sort {
2566 ($a->{type} <=> $b->{type})
2567 or ($a->{name} cmp $b->{name})
2568 } @$items;
2565 2569
2566 $self->{real_items} = \@items; 2570 $self->{real_items} = \@items;
2567 2571
2568 for my $item (@items) { 2572 for my $item (@items) {
2569 my $desc = $item->{nrof} < 2 2573 my $desc = $item->{nrof} < 2
2570 ? $item->{name} 2574 ? $item->{name}
2571 : "$item->{nrof} $item->{name_pl}"; 2575 : "$item->{nrof} $item->{name_pl}";
2572 2576
2573 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2577 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2574 } 2578 }
2579
2580 $self->{scrolled}->add (@items);
2575 2581
2576# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2582# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2577} 2583}
2578 2584
2579sub size_request { 2585sub size_request {
… …
2653 } 2659 }
2654} 2660}
2655 2661
2656############################################################################# 2662#############################################################################
2657 2663
2664package CFClient::UI::Statusbox;
2665
2666our @ISA = CFClient::UI::VBox::;
2667
2668sub reorder {
2669 my ($self) = @_;
2670 my $NOW = time;
2671
2672 while (my ($k, $v) = each %{ $self->{item} }) {
2673 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2674 }
2675
2676 my @widgets;
2677
2678 my @items = sort {
2679 $a->{pri} <=> $b->{pri}
2680 or $b->{id} <=> $a->{id}
2681 } values %{ $self->{item} };
2682
2683 my $count = 10 + 1;
2684 for my $item (@items) {
2685 last unless --$count;
2686
2687 push @widgets, $item->{label} ||= do {
2688 # TODO: doesn't handle markup well (read as: at all)
2689 my $short = $item->{count} > 1
2690 ? "<b>$item->{count} ×</b> $item->{text}"
2691 : $item->{text};
2692
2693 for ($short) {
2694 s/^\s+//;
2695 s/\012.*/…/s;
2696 my $len = int 40 / $item->{fontsize};
2697 substr $_, $len, length, "…" if $len < length;
2698 }
2699
2700 new CFClient::UI::Label
2701 markup => $short,
2702 tooltip => $item->{tooltip},
2703 tooltip_font => $::FONT_PROP,
2704 tooltip_width => 0.67,
2705 fontsize => $item->{fontsize},
2706 color => $item->{color},
2707 can_events => 1,
2708 can_hover => 1
2709 };
2710 }
2711
2712 $self->clear;
2713 $self->SUPER::add (reverse @widgets);
2714}
2715
2716sub add {
2717 my ($self, $text, %arg) = @_;
2718
2719 $text =~ s/^\s+//;
2720 $text =~ s/\s+$//;
2721
2722 my $timeout = time + ((delete $arg{timeout}) || 60);
2723
2724 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725
2726 if (my $item = $self->{item}{$group}) {
2727 if ($item->{text} eq $text) {
2728 $item->{count}++;
2729 } else {
2730 $item->{count} = 1;
2731 $item->{text} = $item->{tooltip} = $text;
2732 }
2733 $item->{id} = ++$self->{id};
2734 $item->{timeout} = $timeout;
2735 delete $item->{label};
2736 } else {
2737 $self->{item}{$group} = {
2738 id => ++$self->{id},
2739 text => $text,
2740 timeout => $timeout,
2741 tooltip => $text,
2742 fontsize => 0.8,
2743 color => [0.8, 0.8, 0.8, 0.8],
2744 pri => 0,
2745 count => 1,
2746 %arg,
2747 };
2748 }
2749
2750 $self->reorder;
2751}
2752
2753#############################################################################
2754
2658package CFClient::UI::Root; 2755package CFClient::UI::Root;
2659 2756
2660our @ISA = CFClient::UI::Container::; 2757our @ISA = CFClient::UI::Container::;
2661 2758
2662use CFClient::OpenGL; 2759use CFClient::OpenGL;
… …
2690} 2787}
2691 2788
2692sub size_allocate { 2789sub size_allocate {
2693 my ($self, $w, $h) = @_; 2790 my ($self, $w, $h) = @_;
2694 2791
2695 my $old_w = $self->{old_w}; 2792 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2696 my $old_h = $self->{old_h}; 2793 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2697 2794
2698 if ($old_w && $old_h) { 2795 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2699 for my $child ($self->children) { 2796 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2700 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2701 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2702 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2703 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2704 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2705 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2706 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2707 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2708 }
2709 }
2710 2797
2711 for my $child ($self->children) { 2798 for my $child ($self->children) {
2712 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2799 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2713 2800
2714 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2801 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2715 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2802 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2716 $child->configure ($X, $Y, $W, $H); 2803 $child->configure ($X, $Y, $W, $H);
2717 } 2804 }
2718
2719 $self->{old_w} = $w;
2720 $self->{old_h} = $h;
2721} 2805}
2722 2806
2723sub coord2local { 2807sub coord2local {
2724 my ($self, $x, $y) = @_; 2808 my ($self, $x, $y) = @_;
2725 2809
… …
2738 $self->check_size; 2822 $self->check_size;
2739 $::WANT_REFRESH++; 2823 $::WANT_REFRESH++;
2740} 2824}
2741 2825
2742sub add { 2826sub add {
2743 my ($self, $child) = @_; 2827 my ($self, @children) = @_;
2744 2828
2829 for my $child (@children) {
2830 $child->{toplevel} = 1;
2831
2745 # integerise window positions 2832 # integerise window positions
2746 $child->{x} = int $child->{x}; 2833 $child->{x} = int $child->{x};
2747 $child->{y} = int $child->{y}; 2834 $child->{y} = int $child->{y};
2835 }
2748 2836
2749 $self->SUPER::add ($child); 2837 $self->SUPER::add (@children);
2750} 2838}
2751 2839
2752sub on_refresh { 2840sub on_refresh {
2753 my ($self, $id, $cb) = @_; 2841 my ($self, $id, $cb) = @_;
2754 2842
2755 $self->{refresh_hook}{$id} = $cb; 2843 $self->{refresh_hook}{$id} = $cb;
2756} 2844}
2757 2845
2846sub on_post_alloc {
2847 my ($self, $id, $cb) = @_;
2848
2849 $self->{post_alloc_hook}{$id} = $cb;
2850}
2851
2758sub draw { 2852sub draw {
2759 my ($self) = @_; 2853 my ($self) = @_;
2854
2855 while ($self->{refresh_hook}) {
2856 $_->()
2857 for values %{delete $self->{refresh_hook}};
2858 }
2760 2859
2761 if ($self->{check_size}) { 2860 if ($self->{check_size}) {
2762 my @queue = ([], []); 2861 my @queue = ([], []);
2763 2862
2764 for (;;) { 2863 for (;;) {
… …
2772 2871
2773 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 2872 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2774 ? @$widget{qw(user_w user_h)} 2873 ? @$widget{qw(user_w user_h)}
2775 : $widget->size_request; 2874 : $widget->size_request;
2776 2875
2876 if (delete $widget->{force_alloc}
2777 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 2877 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2878 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2879
2778 $widget->{req_w} = $w; 2880 $widget->{req_w} = $w;
2779 $widget->{req_h} = $h; 2881 $widget->{req_h} = $h;
2780 2882
2781 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 2883 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2782 2884
2783 $widget->{parent}->check_size 2885 $widget->{parent}->check_size
2784 if $widget->{parent}; 2886 if $widget->{parent};
2785 } 2887 }
2786 } 2888 }
2787 } 2889 }
2788 2890
2789 while ($self->{size_alloc}) { 2891 while ($self->{size_alloc}) {
2790 for (values %{delete $self->{size_alloc}}) { 2892 for (values %{delete $self->{size_alloc}}) {
2791 my ($widget, $w, $h) = @$_; 2893 my ($widget, $w, $h) = @$_;
2894
2895 $w = 0 if $w < 0;
2896 $h = 0 if $h < 0;
2792 2897
2793 $widget->{w} = $w; 2898 $widget->{w} = $w;
2794 $widget->{h} = $h; 2899 $widget->{h} = $h;
2795 $widget->size_allocate ($w, $h); 2900 $widget->size_allocate ($w, $h);
2796 $widget->emit (size_allocate => $w, $h); 2901 $widget->emit (size_allocate => $w, $h);
2797 } 2902 }
2798 } 2903 }
2799 2904
2800 while ($self->{refresh_hook}) { 2905 while ($self->{post_alloc_hook}) {
2801 $_->() 2906 $_->()
2802 for values %{delete $self->{refresh_hook}}; 2907 for values %{delete $self->{post_alloc_hook}};
2803 } 2908 }
2804 2909
2805 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2910 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2806 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2911 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2807 glClear GL_COLOR_BUFFER_BIT; 2912 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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