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

Diff Legend

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