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.190 by root, Mon May 8 22:17:38 2006 UTC vs.
Revision 1.195 by root, Thu May 11 23:54:31 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
… …
23 24
24 my $tip = $widget->{tooltip}; 25 my $tip = $widget->{tooltip};
25 26
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 27 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 28
28 $TOOLTIP->set_markup ($widget->{tooltip}); 29 $TOOLTIP->set_markup ($widget->{tooltip}, $widget->{tooltip_font});
29 30
30 $TOOLTIP->show; 31 $TOOLTIP->show;
31 32
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 34
… …
232 $self->{y} = $y; 233 $self->{y} = $y;
233 $self->update; 234 $self->update;
234 } 235 }
235 236
236 if ($self->{w} != $w || $self->{h} != $h) { 237 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 238 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 $self->emit (size_allocate => $w, $h);
243 } 239 }
244} 240}
245 241
246sub size_allocate { 242sub size_allocate {
247 # nothing to be done 243 # nothing to be done
… …
256 252
257 $_->reconfigure 253 $_->reconfigure
258 for $self->children; 254 for $self->children;
259 255
260 $self->check_size; 256 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h}); 257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
262 $self->update; 258 $self->update;
263} 259}
264 260
265sub set_max_size { 261sub set_max_size {
266 my ($self, $w, $h) = @_; 262 my ($self, $w, $h) = @_;
267 263
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 265 delete $self->{max_h}; $self->{max_h} = $h if $h;
270}
271
272# return top left coordinates
273sub _topleft {
274 my ($self, $x, $y) = @_;
275
276 $self->{parent}
277 or Carp::confess "no parent widget in _topleft\n";#d#
278
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
280} 266}
281 267
282# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
283sub coord2local { 269sub coord2local {
284 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
285 271
286 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 273}
289 274
290# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
291sub coord2global { 276sub coord2global {
292 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
293 278
294 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 280}
297 281
298sub focus_in { 282sub focus_in {
299 my ($self) = @_; 283 my ($self) = @_;
300 284
… …
398 382
399sub set_parent { 383sub set_parent {
400 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
401 385
402 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 $self->check_size
389 unless exists $self->{req_w};
403} 390}
404 391
405sub check_size { 392sub check_size {
406 my ($self) = @_; 393 my ($self) = @_;
407 394
408 $self->_check_size;
409 return;
410 #TODO: but needs a vastly more difficult algorithm
411 my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
412
413 $check_size->{$self} = $self;
414
415 $CFClient::UI::ROOT->on_refresh (_check_size => sub {
416 while (%$check_size) {
417 my @widgets = values %$check_size;
418 $_->_check_size
419 for @widgets;
420 }
421 });
422}
423
424sub _check_size {
425 my ($self) = @_;
426
427 delete $CFClient::UI::ROOT->{_check_size}{$self}; 395 $CFClient::UI::ROOT->{check_size}{$self} = $self;
428
429 $self->{parent}
430 or return 1;
431
432 my ($w, $h) = $self->{user_w} && $self->{user_h}
433 ? @$self{qw(user_w user_h)}
434 : $self->size_request;
435
436 if ($w != $self->{req_w} || $h != $self->{req_h}) {
437 $self->{req_w} = $w;
438 $self->{req_h} = $h;
439
440 $self->{parent}->_check_size
441 or $self->size_allocate (
442 (List::Util::max $self->{w}, $w),
443 (List::Util::max $self->{h}, $h),
444 );
445
446 1
447 } else {
448 0
449 }
450} 396}
451 397
452sub update { 398sub update {
453 my ($self) = @_; 399 my ($self) = @_;
454 400
455 my $update = $CFClient::UI::ROOT->{_update} ||= {}; 401 $self->{parent}->update
456 402 if $self->{parent};
457 $update->{$self} = $self;
458
459 $CFClient::UI::ROOT->on_refresh (_update => sub {
460 while (%$update) {
461 my @widgets = values %$update;
462 %$update = ();
463
464 $_->{parent} && $_->{parent}->update
465 for @widgets;
466 }
467 });
468} 403}
469 404
470sub connect { 405sub connect {
471 my ($self, $signal, $cb) = @_; 406 my ($self, $signal, $cb) = @_;
472 407
… …
574 $self->{children} = [ 509 $self->{children} = [
575 sort { $a->{z} <=> $b->{z} } 510 sort { $a->{z} <=> $b->{z} }
576 @{$self->{children}}, @widgets 511 @{$self->{children}}, @widgets
577 ]; 512 ];
578 513
579 $_->check_size 514 $self->check_size;
580 for @widgets;
581
582 $self->update; 515 $self->update;
583} 516}
584 517
585sub children { 518sub children {
586 @{ $_[0]{children} } 519 @{ $_[0]{children} }
… …
734 my ($w, $h) = ($self->w, $self->h); 667 my ($w, $h) = ($self->w, $self->h);
735 668
736 my $tex = $self->{texture} 669 my $tex = $self->{texture}
737 or return; 670 or return;
738 671
739 glEnable GL_BLEND;
740 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
741 glEnable GL_TEXTURE_2D; 672 glEnable GL_TEXTURE_2D;
742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
743 glColor 0, 0, 0, 1; 674 glColor 0, 0, 0, 1;
744 675
745 $tex->draw_quad (0, 0, $w, $h); 676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
746 677
747 glDisable GL_BLEND;
748 glDisable GL_TEXTURE_2D; 678 glDisable GL_TEXTURE_2D;
749} 679}
750 680
751############################################################################# 681#############################################################################
752 682
… …
776 $self->{view_y} = int $y; 706 $self->{view_y} = int $y;
777 707
778 $self->update; 708 $self->update;
779} 709}
780 710
781# hmm, this does not work for topleft of $self... but we should not aks for that 711# hmm, this does not work for topleft of $self... but we should not ask for that
782sub _topleft { 712sub coord2local {
783 my ($self, $x, $y) = @_; 713 my ($self, $x, $y) = @_;
784 714
785 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 715 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
716}
717
718sub coord2global {
719 my ($self, $x, $y) = @_;
720
721 $x = List::Util::min $self->{w}, $x - $self->{view_x};
722 $y = List::Util::min $self->{h}, $y - $self->{view_y};
723
724 $self->SUPER::coord2global ($x, $y)
786} 725}
787 726
788sub find_widget { 727sub find_widget {
789 my ($self, $x, $y) = @_; 728 my ($self, $x, $y) = @_;
790 729
… …
1272} 1211}
1273 1212
1274sub size_allocate { 1213sub size_allocate {
1275 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1276 1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1277 my $children = $self->{children}; 1218 my $children = $self->{children};
1278 1219
1279 my @h = map $_->{req_h}, @$children; 1220 my @h = map $_->{req_h}, @$children;
1280 1221
1281 my $req_h = List::Util::sum @h; 1222 my $req_h = List::Util::sum @h;
… …
1320 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1321 1262
1322 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1323 fg => [1, 1, 1], 1264 fg => [1, 1, 1],
1324 #font => default_font 1265 #font => default_font
1266 #text => initial text
1267 #markup => initial narkup
1268 layout => (new CFClient::Layout),
1325 fontsize => 1, 1269 fontsize => 1,
1326 text => "",
1327 align => -1, 1270 align => -1,
1328 valign => -1, 1271 valign => -1,
1329 padding => 2, 1272 padding => 2,
1330 layout => new CFClient::Layout,
1331 can_events => 0, 1273 can_events => 0,
1332 %arg 1274 %arg
1333 ); 1275 );
1334 1276
1335 if (exists $self->{template}) { 1277 if (exists $self->{template}) {
1336 my $layout = new CFClient::Layout; 1278 my $layout = new CFClient::Layout;
1337 $layout->set_text (delete $self->{template}); 1279 $layout->set_text (delete $self->{template});
1338 $self->{template} = $layout; 1280 $self->{template} = $layout;
1339 } 1281 }
1340 1282
1341 $self->set_text (delete $self->{text}) if exists $self->{text}; 1283 if (exists $self->{markup}) {
1342 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1284 $self->set_markup (delete $self->{markup});
1285 } else {
1286 $self->set_text (delete $self->{text});
1287 }
1343 1288
1344 $self 1289 $self
1345} 1290}
1346 1291
1347sub escape { 1292sub escape {
… …
1365 my ($self, $text) = @_; 1310 my ($self, $text) = @_;
1366 1311
1367 return if $self->{text} eq "T$text"; 1312 return if $self->{text} eq "T$text";
1368 $self->{text} = "T$text"; 1313 $self->{text} = "T$text";
1369 1314
1315 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1316 $self->{layout}->set_text ($text);
1371 1317
1372 delete $self->{texture};
1373 $self->update; 1318 $self->update;
1374 $self->check_size; 1319 $self->check_size;
1375} 1320}
1376 1321
1377sub set_markup { 1322sub set_markup {
1378 my ($self, $markup) = @_; 1323 my ($self, $markup) = @_;
1379 1324
1380 return if $self->{text} eq "M$markup"; 1325 return if $self->{text} eq "M$markup";
1381 $self->{text} = "M$markup"; 1326 $self->{text} = "M$markup";
1382 1327
1328 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1329
1330 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1383 $self->{layout}->set_markup ($markup); 1331 $self->{layout}->set_markup ($markup);
1384 1332
1385 delete $self->{texture};
1386 $self->update; 1333 $self->update;
1387 $self->check_size; 1334 $self->check_size;
1388} 1335}
1389 1336
1390sub size_request { 1337sub size_request {
… …
1430 1377
1431sub _draw { 1378sub _draw {
1432 my ($self) = @_; 1379 my ($self) = @_;
1433 1380
1434 my $tex = $self->{texture} ||= do { 1381 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}});
1435 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1383 $self->{layout}->set_font ($self->{font}) if $self->{font};
1436 $self->{layout}->set_width ($self->{w}); 1384 $self->{layout}->set_width ($self->{w});
1437 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1386
1438 new_from_layout CFClient::Texture $self->{layout} 1387 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5;
1392
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5;
1396
1397 $tex
1439 }; 1398 };
1440 1399
1441 glEnable GL_BLEND;
1442 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1443 glEnable GL_TEXTURE_2D; 1400 glEnable GL_TEXTURE_2D;
1444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1445 1402
1403 if ($tex->{format} == GL_ALPHA) {
1446 glColor @{$self->{fg}}; 1404 glColor @{$self->{fg}};
1447
1448 $self->{ox} = int (
1449 $self->{align} < 0 ? $self->{padding}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1451 : ($self->{w} - $tex->{w}) * 0.5
1452 );
1453
1454 $self->{oy} = int (
1455 $self->{valign} < 0 ? $self->{padding}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1457 : ($self->{h} - $tex->{h}) * 0.5
1458 );
1459
1460 $tex->draw_quad ($self->{ox}, $self->{oy}); 1405 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1406 } else {
1407 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1408 }
1461 1409
1462 glDisable GL_TEXTURE_2D; 1410 glDisable GL_TEXTURE_2D;
1463 glDisable GL_BLEND;
1464} 1411}
1465 1412
1466############################################################################# 1413#############################################################################
1467 1414
1468package CFClient::UI::EntryBase; 1415package CFClient::UI::EntryBase;
… …
1503 $self->{layout}->set_text ("$text "); 1450 $self->{layout}->set_text ("$text ");
1504 1451
1505 $self->emit (changed => $self->{text}); 1452 $self->emit (changed => $self->{text});
1506} 1453}
1507 1454
1455sub set_text {
1456 my ($self, $text) = @_;
1457
1458 $self->{cursor} = length $text;
1459 $self->_set_text ($text);
1460 $self->check_size;
1461 $self->update;
1462}
1463
1508sub get_text { 1464sub get_text {
1509 $_[0]{text} 1465 $_[0]{text}
1510} 1466}
1511 1467
1512sub size_request { 1468sub size_request {
… …
1519 1475
1520sub size_allocate { 1476sub size_allocate {
1521 my ($self, $w, $h) = @_; 1477 my ($self, $w, $h) = @_;
1522 1478
1523 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1479 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1524}
1525
1526sub set_text {
1527 my ($self, $text) = @_;
1528
1529 $self->{cursor} = length $text;
1530 $self->_set_text ($text);
1531 $self->update;
1532} 1480}
1533 1481
1534sub key_down { 1482sub key_down {
1535 my ($self, $ev) = @_; 1483 my ($self, $ev) = @_;
1536 1484
… …
1724 1672
1725 if ($GRAB == $self) { 1673 if ($GRAB == $self) {
1726 $self->{fg} = $self->{active_fg}; 1674 $self->{fg} = $self->{active_fg};
1727 } 1675 }
1728 1676
1729 glEnable GL_BLEND;
1730 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1731 glEnable GL_TEXTURE_2D; 1677 glEnable GL_TEXTURE_2D;
1732 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1678 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1733 glColor 0, 0, 0, 1; 1679 glColor 0, 0, 0, 1;
1734 1680
1735 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1681 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1736 1682
1737 glDisable GL_TEXTURE_2D; 1683 glDisable GL_TEXTURE_2D;
1738 glDisable GL_BLEND;
1739 1684
1740 $self->SUPER::_draw; 1685 $self->SUPER::_draw;
1741} 1686}
1742 1687
1743############################################################################# 1688#############################################################################
… …
1790 1735
1791 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1736 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1792 1737
1793 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1738 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1794 1739
1795 glEnable GL_BLEND;
1796 glEnable GL_TEXTURE_2D; 1740 glEnable GL_TEXTURE_2D;
1797 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798 1741
1799 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1742 my $tex = $self->{state} ? $tex[1] : $tex[0];
1800 1743
1801 $tex->draw_quad (0, 0, $s, $s); 1744 $tex->draw_quad_alpha (0, 0, $s, $s);
1802 1745
1803 glDisable GL_TEXTURE_2D; 1746 glDisable GL_TEXTURE_2D;
1804 glDisable GL_BLEND;
1805} 1747}
1806 1748
1807############################################################################# 1749#############################################################################
1808 1750
1809package CFClient::UI::Image; 1751package CFClient::UI::Image;
… …
1852 glTranslate 0, -$self->{w}, 0; 1794 glTranslate 0, -$self->{w}, 0;
1853 1795
1854 ($w, $h) = ($h, $w); 1796 ($w, $h) = ($h, $w);
1855 } 1797 }
1856 1798
1857 glEnable GL_BLEND;
1858 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1859 glEnable GL_TEXTURE_2D; 1799 glEnable GL_TEXTURE_2D;
1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861 1801
1862 $tex->draw_quad (0, 0, $w, $h); 1802 $tex->draw_quad_alpha (0, 0, $w, $h);
1863 1803
1864 glDisable GL_BLEND;
1865 glDisable GL_TEXTURE_2D; 1804 glDisable GL_TEXTURE_2D;
1866} 1805}
1867 1806
1868############################################################################# 1807#############################################################################
1869 1808
… …
2161 $page ||= 2; 2100 $page ||= 2;
2162 2101
2163 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2164 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2165 2104
2166 glEnable GL_BLEND;
2167 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2168 glEnable GL_TEXTURE_2D; 2105 glEnable GL_TEXTURE_2D;
2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2106 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170 2107
2171 # draw background 2108 # draw background
2172 $tex[1]->draw_quad (0, 0, $w, $h); 2109 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
2173 2110
2174 # draw handle 2111 # draw handle
2175 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2112 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
2176 2113
2177 glDisable GL_BLEND;
2178 glDisable GL_TEXTURE_2D; 2114 glDisable GL_TEXTURE_2D;
2179} 2115}
2180 2116
2181############################################################################# 2117#############################################################################
2182 2118
… …
2193 fontsize => 1, 2129 fontsize => 1,
2194 can_events => 0, 2130 can_events => 0,
2195 #font => default_font 2131 #font => default_font
2196 @_, 2132 @_,
2197 2133
2198 layout => (new CFClient::Layout), 2134 layout => (new CFClient::Layout 1),
2199 par => [], 2135 par => [],
2200 height => 0, 2136 height => 0,
2201 children => [ 2137 children => [
2202 (new CFClient::UI::Empty expand => 1), 2138 (new CFClient::UI::Empty expand => 1),
2203 (new CFClient::UI::Slider vertical => 1), 2139 (new CFClient::UI::Slider vertical => 1),
… …
2221 2157
2222 my $layout = $self->{layout}; 2158 my $layout = $self->{layout};
2223 2159
2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2160 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225 $layout->set_width ($self->{children}[0]{w}); 2161 $layout->set_width ($self->{children}[0]{w});
2226 $layout->set_text ($text); 2162 $layout->set_markup ($text);
2227 2163
2228 ($layout->size)[1] 2164 ($layout->size)[1]
2229} 2165}
2230 2166
2231sub reflow { 2167sub reflow {
… …
2287 2223
2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2224 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2289 glClearColor 0, 0, 0, 0; 2225 glClearColor 0, 0, 0, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2226 glClear GL_COLOR_BUFFER_BIT;
2291 2227
2292 glEnable GL_BLEND;
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D; 2228 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 2230
2297 my $top = int $self->{children}[1]{range}[0]; 2231 my $top = int $self->{children}[1]{range}[0];
2298 2232
… …
2307 2241
2308 for my $par (@{$self->{par}}) { 2242 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2243 my $h = $par->[0];
2310 2244
2311 if ($y0 < $y + $h && $y < $y1) { 2245 if ($y0 < $y + $h && $y < $y1) {
2246 $layout->set_foreground (@{ $par->[1] });
2312 $layout->set_text ($par->[2]); 2247 $layout->set_markup ($par->[2]);
2313 2248
2314 glColor @{ $par->[1] };
2315 my ($W, $H) = $layout->size; 2249 my ($W, $H) = $layout->size;
2316 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2250 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2317 } 2251 }
2318 2252
2319 $y += $h; 2253 $y += $h;
2320 } 2254 }
2321 2255
2322 glDisable GL_TEXTURE_2D; 2256 glDisable GL_TEXTURE_2D;
2323 glDisable GL_BLEND;
2324 }; 2257 };
2325 }); 2258 });
2326} 2259}
2327 2260
2328sub _draw { 2261sub _draw {
2329 my ($self) = @_; 2262 my ($self) = @_;
2330 2263
2331 glEnable GL_BLEND;
2332 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2333 glEnable GL_TEXTURE_2D; 2264 glEnable GL_TEXTURE_2D;
2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1; 2266 glColor 1, 1, 1, 1;
2336 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2267 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2337 glDisable GL_TEXTURE_2D; 2268 glDisable GL_TEXTURE_2D;
2338 glDisable GL_BLEND;
2339 2269
2340 $self->{children}[1]->draw; 2270 $self->{children}[1]->draw;
2341 2271
2342} 2272}
2343 2273
… …
2438 can_events => 0, 2368 can_events => 0,
2439 ) 2369 )
2440} 2370}
2441 2371
2442sub set_markup { 2372sub set_markup {
2443 my ($self, $text) = @_; 2373 my ($self, $text, $font) = @_;
2444 2374
2445 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2375 $self->{label} = new CFClient::UI::Label
2376 fontsize => 0.8,
2377 fg => [0, 0, 0],
2378 font => ($font || $::FONT_PROP);
2379
2380 $self->{label}->set_max_size ($::WIDTH * 0.3);
2446 $self->{label}->set_markup ($text); 2381 $self->{label}->set_markup ($text);
2447 $self->add ($self->{label}); 2382 $self->add ($self->{label});
2448} 2383}
2449 2384
2450sub size_request { 2385sub size_request {
2451 my ($self) = @_; 2386 my ($self) = @_;
2452
2453 $self->child->set_max_size ($::WIDTH * 0.3);
2454 2387
2455 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2388 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2456 2389
2457 ($w + 4, $h + 4) 2390 ($w + 4, $h + 4)
2458} 2391}
… …
2520 return unless $::CONN;#d# manage and cache textures differently 2453 return unless $::CONN;#d# manage and cache textures differently
2521 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2454 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2522 2455
2523 # TODO animation 2456 # TODO animation
2524 if ($tex) { 2457 if ($tex) {
2525 glEnable GL_BLEND;
2526 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2527 glEnable GL_TEXTURE_2D; 2458 glEnable GL_TEXTURE_2D;
2528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2459 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2529 glColor 1, 1, 1, 1; 2460 glColor 1, 1, 1, 1;
2530 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2461 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2531 glDisable GL_TEXTURE_2D; 2462 glDisable GL_TEXTURE_2D;
2532 glDisable GL_BLEND;
2533 } 2463 }
2534} 2464}
2535 2465
2536############################################################################# 2466#############################################################################
2537 2467
… …
2542sub new { 2472sub new {
2543 my $class = shift; 2473 my $class = shift;
2544 2474
2545 my %args = @_; 2475 my %args = @_;
2546 2476
2547 my $item = $args{item}; 2477 my $item = delete $args{item};
2548 2478
2549 my $desc = $item->{nrof} < 2 2479 my $desc = $item->{nrof} < 2
2550 ? $item->{name} 2480 ? $item->{name}
2551 : "$item->{nrof} $item->{name_pl}"; 2481 : "$item->{nrof} $item->{name_pl}";
2552 2482
… …
2581 2511
2582 1 2512 1
2583 }, 2513 },
2584 %args 2514 %args
2585 ); 2515 );
2516
2586 $self->add(new CFClient::UI::Face 2517 $self->add (new CFClient::UI::Face
2587 can_events => 0, 2518 can_events => 0,
2588 face => $item->{face}, 2519 face => $item->{face},
2589 anim => $item->{anim}, 2520 anim => $item->{anim},
2590 animspeed => $item->{animspeed}); 2521 animspeed => $item->{animspeed},
2522 );
2523
2591 $self->add(new CFClient::UI::Label 2524 $self->add (new CFClient::UI::Label
2592 can_events => 0, 2525 can_events => 0,
2593 text => $desc); 2526 text => $desc,
2527 );
2594 2528
2595 $self 2529 $self
2596} 2530}
2597 2531
2598############################################################################# 2532#############################################################################
… …
2625 for my $item (@items) { 2559 for my $item (@items) {
2626 my $desc = $item->{nrof} < 2 2560 my $desc = $item->{nrof} < 2
2627 ? $item->{name} 2561 ? $item->{name}
2628 : "$item->{nrof} $item->{name_pl}"; 2562 : "$item->{nrof} $item->{name_pl}";
2629 2563
2630 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2564 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2631 } 2565 }
2632 2566
2633# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2567# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2634} 2568}
2635 2569
… …
2710 } 2644 }
2711} 2645}
2712 2646
2713############################################################################# 2647#############################################################################
2714 2648
2649package CFClient::UI::Statusbox;
2650
2651our @ISA = CFClient::UI::VBox::;
2652
2653sub reorder {
2654 my ($self) = @_;
2655 my $NOW = time;
2656
2657 while (my ($k, $v) = each %{ $self->{item} }) {
2658 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2659 }
2660
2661 my @widgets;
2662 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };
2663 my $count = 10 + 1;
2664 for my $item (@items) {
2665 last unless --$count;
2666
2667 push @widgets, $item->{label} ||= do {
2668 # TODO: doesn't handle markup well (read as: at all)
2669 my $short = delete $item->{text};
2670 for ($short) {
2671 s/^\s+//;
2672 s/\012.*//s;
2673 my $len = int 30 / $item->{fontsize};
2674 substr $_, $len, length, "…" if $len < length;
2675 }
2676
2677 new CFClient::UI::Label
2678 markup => $short,
2679 tooltip => delete $item->{tooltip},
2680 fontsize => delete $item->{fontsize},
2681 color => delete $item->{color},
2682 can_events => 1,
2683 can_hover => 1,
2684 };
2685 }
2686
2687 $self->clear;
2688 $self->SUPER::add (@widgets);
2689}
2690
2691sub add {
2692 my ($self, $text, %arg) = @_;
2693
2694 my $item = {
2695 time => time,
2696 text => $text,
2697 timeout => 60,
2698 tooltip => $text,
2699 fontsize => 0.8,
2700 color => [0.8, 0.8, 0.8, 0.8],
2701 %arg,
2702 };
2703
2704 $item->{timeout} += time;
2705 $item->{group} ||= $item+0;
2706
2707 $item = $self->{item}{$item->{group}} ||= $item;
2708
2709 $self->reorder;
2710}
2711
2712#############################################################################
2713
2715package CFClient::UI::Root; 2714package CFClient::UI::Root;
2716 2715
2717our @ISA = CFClient::UI::Container::; 2716our @ISA = CFClient::UI::Container::;
2718 2717
2719use CFClient::OpenGL; 2718use CFClient::OpenGL;
2720 2719
2720sub new {
2721 my $class = shift;
2722
2723 $class->SUPER::new (
2724 @_,
2725 )
2726}
2727
2728sub configure {
2729 my ($self, $x, $y, $w, $h) = @_;
2730
2731 $self->{w} = $w;
2732 $self->{h} = $h;
2733}
2734
2721sub check_size { 2735sub check_size {
2722 my ($self) = @_; 2736 my ($self) = @_;
2723 2737
2724 $self->configure (0, 0, $self->{w}, $self->{h}); 2738 $self->size_allocate ($self->{w}, $self->{h})
2739 if $self->{w};
2725} 2740}
2726 2741
2727sub size_request { 2742sub size_request {
2728 my ($self) = @_; 2743 my ($self) = @_;
2729 2744
… …
2747 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h}; 2762 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2748 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h}; 2763 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2749 } 2764 }
2750 } 2765 }
2751 2766
2752 $self->{old_w} = $w;
2753 $self->{old_h} = $h;
2754}
2755
2756sub configure {
2757 my ($self, $x, $y, $w, $h) = @_;
2758
2759 $self->SUPER::configure ($x, $y, $w, $h);
2760
2761 for my $child ($self->children) { 2767 for my $child ($self->children) {
2762 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2768 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2763 2769
2764 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2770 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2765 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2771 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2766 $child->configure ($X, $Y, $W, $H); 2772 $child->configure ($X, $Y, $W, $H);
2767 } 2773 }
2768}
2769 2774
2770sub _topleft { 2775 $self->{old_w} = $w;
2776 $self->{old_h} = $h;
2777}
2778
2779sub coord2local {
2771 my ($self, $x, $y) = @_; 2780 my ($self, $x, $y) = @_;
2772 2781
2773 ($x, $y) 2782 ($x, $y)
2774} 2783}
2775 2784
2785sub coord2global {
2786 my ($self, $x, $y) = @_;
2787
2788 ($x, $y)
2789}
2790
2776sub update { 2791sub update {
2777 my ($self) = @_; 2792 my ($self) = @_;
2778 2793
2779 $self->check_size; 2794 $self->check_size;
2780 ::refresh (); 2795 $::WANT_REFRESH++;
2781} 2796}
2782 2797
2783sub add { 2798sub add {
2784 my ($self, $child) = @_; 2799 my ($self, $child) = @_;
2785 2800
2786 # integerize window positions 2801 # integerise window positions
2787 $child->{x} = int $child->{x}; 2802 $child->{x} = int $child->{x};
2788 $child->{y} = int $child->{y}; 2803 $child->{y} = int $child->{y};
2789 2804
2790 $self->SUPER::add ($child); 2805 $self->SUPER::add ($child);
2791} 2806}
… …
2794 my ($self, $id, $cb) = @_; 2809 my ($self, $id, $cb) = @_;
2795 2810
2796 $self->{refresh_hook}{$id} = $cb; 2811 $self->{refresh_hook}{$id} = $cb;
2797} 2812}
2798 2813
2799sub draw { 2814sub draw {
2800 my ($self) = @_; 2815 my ($self) = @_;
2801 2816
2817 if ($self->{check_size}) {
2818 my @queue = ([], []);
2819
2820 for (;;) {
2821 if ($self->{check_size}) {
2822 # heuristic: check containers last
2823 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2824 for values %{delete $self->{check_size}}
2825 }
2826
2827 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2828
2829 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2830 ? @$widget{qw(user_w user_h)}
2831 : $widget->size_request;
2832
2833 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2834 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2835
2836 $widget->{req_w} = $w;
2837 $widget->{req_h} = $h;
2838
2839 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2840
2841 $widget->{parent}->check_size
2842 if $widget->{parent};
2843 }
2844 }
2845 }
2846
2847 while ($self->{size_alloc}) {
2848 for (values %{delete $self->{size_alloc}}) {
2849 my ($widget, $w, $h) = @$_;
2850
2851 $w = 0 if $w < 0;
2852 $h = 0 if $h < 0;
2853
2854 $widget->{w} = $w;
2855 $widget->{h} = $h;
2856 $widget->size_allocate ($w, $h);
2857 $widget->emit (size_allocate => $w, $h);
2858 }
2859 }
2860
2802 while (my $rcb = delete $self->{refresh_hook}) { 2861 while ($self->{refresh_hook}) {
2803 $_->() for values %$rcb; 2862 $_->()
2863 for values %{delete $self->{refresh_hook}};
2804 } 2864 }
2805 2865
2806 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2866 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2807 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2867 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2808 glClear GL_COLOR_BUFFER_BIT; 2868 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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