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.193 by root, Wed May 10 21:12:26 2006 UTC vs.
Revision 1.201 by root, Sat May 13 23:17:49 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_tooltip_from ($widget);
29
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31 31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) { 34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 } 36 }
37 37
38 $TOOLTIP->move ($x, $y); 38 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size;
40 $TOOLTIP->update;
39 } 41 }
40 42
41 return; 43 return;
42 } 44 }
43 } 45 }
… …
250 my ($self) = @_; 252 my ($self) = @_;
251 253
252 $_->reconfigure 254 $_->reconfigure
253 for $self->children; 255 for $self->children;
254 256
255 $self->check_size; 257 $self->check_size (1);
256 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257 $self->update; 258 $self->update;
258} 259}
259 260
260sub set_max_size { 261sub set_max_size {
261 my ($self, $w, $h) = @_; 262 my ($self, $w, $h) = @_;
… …
382sub set_parent { 383sub set_parent {
383 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
384 385
385 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
386 387
388 # TODO: req_w _does_change after ->reconfigure
387 $self->check_size 389 $self->check_size
388 unless exists $self->{req_w}; 390 unless exists $self->{req_w};
389} 391}
390 392
391sub check_size { 393sub check_size {
392 my ($self) = @_; 394 my ($self, $forced) = @_;
393 395
396 $self->{force_alloc} = 1 if $forced;
394 $CFClient::UI::ROOT->{check_size}{$self} = $self; 397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
395} 398}
396 399
397sub update { 400sub update {
398 my ($self) = @_; 401 my ($self) = @_;
… …
508 $self->{children} = [ 511 $self->{children} = [
509 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
510 @{$self->{children}}, @widgets 513 @{$self->{children}}, @widgets
511 ]; 514 ];
512 515
513 $self->check_size; 516 $self->check_size (1);
514 $self->update; 517 $self->update;
515} 518}
516 519
517sub children { 520sub children {
518 @{ $_[0]{children} } 521 @{ $_[0]{children} }
… …
625} 628}
626 629
627sub update { 630sub update {
628 my ($self) = @_; 631 my ($self) = @_;
629 632
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 633 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 634 $self->SUPER::update;
632} 635}
633 636
634sub size_allocate { 637sub size_allocate {
635 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
… …
666 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
667 670
668 my $tex = $self->{texture} 671 my $tex = $self->{texture}
669 or return; 672 or return;
670 673
671 glEnable GL_BLEND;
672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1; 676 glColor 0, 0, 0, 1;
676 677
677 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678 679
679 glDisable GL_BLEND;
680 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
681} 681}
682 682
683############################################################################# 683#############################################################################
684 684
… …
776 $self->add ($self->{slider}); 776 $self->add ($self->{slider});
777 777
778 $self 778 $self
779} 779}
780 780
781#TODO# update range on size_allocate depeneing on child 781#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 782# update viewport offset on scroll
783 783
784############################################################################# 784#############################################################################
785 785
786package CFClient::UI::Frame; 786package CFClient::UI::Frame;
… …
790use CFClient::OpenGL; 790use CFClient::OpenGL;
791 791
792sub new { 792sub new {
793 my $class = shift; 793 my $class = shift;
794 794
795 my $self = $class->SUPER::new ( 795 $class->SUPER::new (
796 bg => [1, 1, 1, 1], 796 bg => undef,
797 border_bg => [1, 1, 1, 1],
798 border => 0.8,
799 @_ 797 @_,
800 ); 798 )
801
802 $self
803} 799}
804 800
805sub _draw { 801sub _draw {
806 my ($self) = @_; 802 my ($self) = @_;
807 803
808 my ($w, $h) = ($self->{w}, $self->{h}); 804 if ($self->{bg}) {
805 my ($w, $h) = @$self{qw(w h)};
809 806
810 glEnable GL_BLEND; 807 glEnable GL_BLEND;
811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812 glEnable GL_TEXTURE_2D; 809 glColor @{ $self->{bg} };
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 810
815# glBegin GL_QUADS; 811 glBegin GL_QUADS;
816# glColor 0, 0, 0, 0;
817# glVertex 0 , 0; 812 glVertex 0 , 0;
818# glVertex 0 , $h; 813 glVertex 0 , $h;
819# glVertex $w, $h; 814 glVertex $w, $h;
820# glVertex $w, 0; 815 glVertex $w, 0;
821# glEnd; 816 glEnd;
822 817
823
824 $self->child->draw;
825 glDisable GL_BLEND; 818 glDisable GL_BLEND;
826 glDisable GL_TEXTURE_2D; 819 }
820
821 $self->SUPER::_draw;
827} 822}
828 823
829############################################################################# 824#############################################################################
830 825
831package CFClient::UI::FancyFrame; 826package CFClient::UI::FancyFrame;
… …
947 my ($self) = @_; 942 my ($self) = @_;
948 943
949 my ($w, $h ) = ($self->{w}, $self->{h}); 944 my ($w, $h ) = ($self->{w}, $self->{h});
950 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951 946
952 glEnable GL_BLEND;
953 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954 glEnable GL_TEXTURE_2D; 947 glEnable GL_TEXTURE_2D;
955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956 949
957 my $border = $self->border; 950 my $border = $self->border;
958 951
959 glColor @{ $self->{border_bg} }; 952 glColor @{ $self->{border_bg} };
960 $tex[1]->draw_quad (0, 0, $w, $border); 953 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
961 $tex[3]->draw_quad (0, $border, $border, $ch); 954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963 $tex[4]->draw_quad (0, $h - $border, $w, $border); 956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964 957
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966 my $bg = $tex[0]; 959 my $bg = $tex[0];
967 960
968 # TODO: repeat texture not scale 961 # TODO: repeat texture not scale
… …
972 glColor @{ $self->{bg} }; 965 glColor @{ $self->{bg} };
973 966
974 $bg->{s} = $rep_x; 967 $bg->{s} = $rep_x;
975 $bg->{t} = $rep_y; 968 $bg->{t} = $rep_y;
976 $bg->{wrap_mode} = 1; 969 $bg->{wrap_mode} = 1;
977 $bg->draw_quad ($border, $border, $cw, $ch); 970 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 }
978 972
979 glDisable GL_TEXTURE_2D; 973 glDisable GL_TEXTURE_2D;
980 glDisable GL_BLEND;
981 }
982 974
983 $self->{title}->draw if $self->{title}; 975 $self->{title}->draw if $self->{title};
984 976
985 $self->child->draw; 977 $self->child->draw;
986} 978}
… …
1263 my ($class, %arg) = @_; 1255 my ($class, %arg) = @_;
1264 1256
1265 my $self = $class->SUPER::new ( 1257 my $self = $class->SUPER::new (
1266 fg => [1, 1, 1], 1258 fg => [1, 1, 1],
1267 #font => default_font 1259 #font => default_font
1260 #text => initial text
1261 #markup => initial narkup
1262 layout => (new CFClient::Layout),
1268 fontsize => 1, 1263 fontsize => 1,
1269 text => "",
1270 align => -1, 1264 align => -1,
1271 valign => -1, 1265 valign => -1,
1272 padding => 2, 1266 padding => 2,
1273 layout => new CFClient::Layout,
1274 can_events => 0, 1267 can_events => 0,
1275 %arg 1268 %arg
1276 ); 1269 );
1277 1270
1278 if (exists $self->{template}) { 1271 if (exists $self->{template}) {
1279 my $layout = new CFClient::Layout; 1272 my $layout = new CFClient::Layout;
1280 $layout->set_text (delete $self->{template}); 1273 $layout->set_text (delete $self->{template});
1281 $self->{template} = $layout; 1274 $self->{template} = $layout;
1282 } 1275 }
1283 1276
1284 $self->set_text (delete $self->{text}) if exists $self->{text}; 1277 if (exists $self->{markup}) {
1285 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1278 $self->set_markup (delete $self->{markup});
1279 } else {
1280 $self->set_text (delete $self->{text});
1281 }
1286 1282
1287 $self 1283 $self
1288} 1284}
1289 1285
1290sub escape { 1286sub escape {
… …
1308 my ($self, $text) = @_; 1304 my ($self, $text) = @_;
1309 1305
1310 return if $self->{text} eq "T$text"; 1306 return if $self->{text} eq "T$text";
1311 $self->{text} = "T$text"; 1307 $self->{text} = "T$text";
1312 1308
1309 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1313 $self->{layout}->set_text ($text); 1310 $self->{layout}->set_text ($text);
1314 1311
1315 $self->update; 1312 $self->update;
1316 $self->check_size; 1313 $self->check_size;
1317} 1314}
… …
1320 my ($self, $markup) = @_; 1317 my ($self, $markup) = @_;
1321 1318
1322 return if $self->{text} eq "M$markup"; 1319 return if $self->{text} eq "M$markup";
1323 $self->{text} = "M$markup"; 1320 $self->{text} = "M$markup";
1324 1321
1322 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1323
1324 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1325 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1326 1326
1327 $self->update; 1327 $self->update;
1328 $self->check_size; 1328 $self->check_size;
1329} 1329}
… …
1371 1371
1372sub _draw { 1372sub _draw {
1373 my ($self) = @_; 1373 my ($self) = @_;
1374 1374
1375 my $tex = $self->{texture} ||= do { 1375 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}});
1376 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1377 $self->{layout}->set_font ($self->{font}) if $self->{font};
1377 $self->{layout}->set_width ($self->{w}); 1378 $self->{layout}->set_width ($self->{w});
1378 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1380
1379 new_from_layout CFClient::Texture $self->{layout} 1381 my $tex = new_from_layout CFClient::Texture $self->{layout};
1382
1383 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1384 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385 : ($self->{w} - $tex->{w}) * 0.5;
1386
1387 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1388 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389 : ($self->{h} - $tex->{h}) * 0.5;
1390
1391 $tex
1380 }; 1392 };
1381 1393
1382 glEnable GL_BLEND;
1383 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1384 glEnable GL_TEXTURE_2D; 1394 glEnable GL_TEXTURE_2D;
1385 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1386 1396
1397 if ($tex->{format} == GL_ALPHA) {
1387 glColor @{$self->{fg}}; 1398 glColor @{$self->{fg}};
1388
1389 $self->{ox} = int (
1390 $self->{align} < 0 ? $self->{padding}
1391 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1392 : ($self->{w} - $tex->{w}) * 0.5
1393 );
1394
1395 $self->{oy} = int (
1396 $self->{valign} < 0 ? $self->{padding}
1397 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1398 : ($self->{h} - $tex->{h}) * 0.5
1399 );
1400
1401 $tex->draw_quad ($self->{ox}, $self->{oy}); 1399 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1400 } else {
1401 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1402 }
1402 1403
1403 glDisable GL_TEXTURE_2D; 1404 glDisable GL_TEXTURE_2D;
1404 glDisable GL_BLEND;
1405} 1405}
1406 1406
1407############################################################################# 1407#############################################################################
1408 1408
1409package CFClient::UI::EntryBase; 1409package CFClient::UI::EntryBase;
… …
1444 $self->{layout}->set_text ("$text "); 1444 $self->{layout}->set_text ("$text ");
1445 1445
1446 $self->emit (changed => $self->{text}); 1446 $self->emit (changed => $self->{text});
1447} 1447}
1448 1448
1449sub set_text {
1450 my ($self, $text) = @_;
1451
1452 $self->{cursor} = length $text;
1453 $self->_set_text ($text);
1454 $self->check_size;
1455 $self->update;
1456}
1457
1449sub get_text { 1458sub get_text {
1450 $_[0]{text} 1459 $_[0]{text}
1451} 1460}
1452 1461
1453sub size_request { 1462sub size_request {
… …
1460 1469
1461sub size_allocate { 1470sub size_allocate {
1462 my ($self, $w, $h) = @_; 1471 my ($self, $w, $h) = @_;
1463 1472
1464 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1473 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1465}
1466
1467sub set_text {
1468 my ($self, $text) = @_;
1469
1470 $self->{cursor} = length $text;
1471 $self->_set_text ($text);
1472 $self->update;
1473} 1474}
1474 1475
1475sub key_down { 1476sub key_down {
1476 my ($self, $ev) = @_; 1477 my ($self, $ev) = @_;
1477 1478
… …
1479 my $sym = $ev->{sym}; 1480 my $sym = $ev->{sym};
1480 my $uni = $ev->{unicode}; 1481 my $uni = $ev->{unicode};
1481 1482
1482 my $text = $self->get_text; 1483 my $text = $self->get_text;
1483 1484
1484 if ($sym == 8) { 1485 if ($uni == 8) {
1485 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1486 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1486 } elsif ($sym == 127) { 1487 } elsif ($uni == 127) {
1487 substr $text, $self->{cursor}, 1, ""; 1488 substr $text, $self->{cursor}, 1, "";
1488 } elsif ($sym == CFClient::SDLK_LEFT) { 1489 } elsif ($sym == CFClient::SDLK_LEFT) {
1489 --$self->{cursor} if $self->{cursor}; 1490 --$self->{cursor} if $self->{cursor};
1490 } elsif ($sym == CFClient::SDLK_RIGHT) { 1491 } elsif ($sym == CFClient::SDLK_RIGHT) {
1491 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1492 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1492 } elsif ($sym == CFClient::SDLK_HOME) { 1493 } elsif ($sym == CFClient::SDLK_HOME) {
1493 $self->{cursor} = 0; 1494 $self->{cursor} = 0;
1494 } elsif ($sym == CFClient::SDLK_END) { 1495 } elsif ($sym == CFClient::SDLK_END) {
1495 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1496 } elsif ($sym == 27) { 1497 } elsif ($uni == 27) {
1497 $self->emit ('escape'); 1498 $self->emit ('escape');
1498 } elsif ($uni) { 1499 } elsif ($uni) {
1499 substr $text, $self->{cursor}++, 0, chr $uni; 1500 substr $text, $self->{cursor}++, 0, chr $uni;
1500 } 1501 }
1501 1502
… …
1665 1666
1666 if ($GRAB == $self) { 1667 if ($GRAB == $self) {
1667 $self->{fg} = $self->{active_fg}; 1668 $self->{fg} = $self->{active_fg};
1668 } 1669 }
1669 1670
1670 glEnable GL_BLEND;
1671 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672 glEnable GL_TEXTURE_2D; 1671 glEnable GL_TEXTURE_2D;
1673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1674 glColor 0, 0, 0, 1; 1673 glColor 0, 0, 0, 1;
1675 1674
1676 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1675 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1677 1676
1678 glDisable GL_TEXTURE_2D; 1677 glDisable GL_TEXTURE_2D;
1679 glDisable GL_BLEND;
1680 1678
1681 $self->SUPER::_draw; 1679 $self->SUPER::_draw;
1682} 1680}
1683 1681
1684############################################################################# 1682#############################################################################
… …
1731 1729
1732 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1733 1731
1734 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1735 1733
1736 glEnable GL_BLEND; 1734 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735
1737 glEnable GL_TEXTURE_2D; 1736 glEnable GL_TEXTURE_2D;
1738 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1739
1740 my $tex = $self->{state} ? $tex[1] : $tex[0];
1741
1742 $tex->draw_quad (0, 0, $s, $s); 1737 $tex->draw_quad_alpha (0, 0, $s, $s);
1743
1744 glDisable GL_TEXTURE_2D; 1738 glDisable GL_TEXTURE_2D;
1745 glDisable GL_BLEND;
1746} 1739}
1747 1740
1748############################################################################# 1741#############################################################################
1749 1742
1750package CFClient::UI::Image; 1743package CFClient::UI::Image;
… …
1793 glTranslate 0, -$self->{w}, 0; 1786 glTranslate 0, -$self->{w}, 0;
1794 1787
1795 ($w, $h) = ($h, $w); 1788 ($w, $h) = ($h, $w);
1796 } 1789 }
1797 1790
1798 glEnable GL_BLEND;
1799 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1800 glEnable GL_TEXTURE_2D; 1791 glEnable GL_TEXTURE_2D;
1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802 1793
1803 $tex->draw_quad (0, 0, $w, $h); 1794 $tex->draw_quad_alpha (0, 0, $w, $h);
1804 1795
1805 glDisable GL_BLEND;
1806 glDisable GL_TEXTURE_2D; 1796 glDisable GL_TEXTURE_2D;
1807} 1797}
1808 1798
1809############################################################################# 1799#############################################################################
1810 1800
… …
2102 $page ||= 2; 2092 $page ||= 2;
2103 2093
2104 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2105 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2106 2096
2107 glEnable GL_BLEND;
2108 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2109 glEnable GL_TEXTURE_2D; 2097 glEnable GL_TEXTURE_2D;
2110 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2111 2099
2112 # draw background 2100 # draw background
2113 $tex[1]->draw_quad (0, 0, $w, $h); 2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
2114 2102
2115 # draw handle 2103 # draw handle
2116 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2104 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
2117 2105
2118 glDisable GL_BLEND;
2119 glDisable GL_TEXTURE_2D; 2106 glDisable GL_TEXTURE_2D;
2120} 2107}
2121 2108
2122############################################################################# 2109#############################################################################
2123 2110
… …
2134 fontsize => 1, 2121 fontsize => 1,
2135 can_events => 0, 2122 can_events => 0,
2136 #font => default_font 2123 #font => default_font
2137 @_, 2124 @_,
2138 2125
2139 layout => (new CFClient::Layout), 2126 layout => (new CFClient::Layout 1),
2140 par => [], 2127 par => [],
2141 height => 0, 2128 height => 0,
2142 children => [ 2129 children => [
2143 (new CFClient::UI::Empty expand => 1), 2130 (new CFClient::UI::Empty expand => 1),
2144 (new CFClient::UI::Slider vertical => 1), 2131 (new CFClient::UI::Slider vertical => 1),
… …
2162 2149
2163 my $layout = $self->{layout}; 2150 my $layout = $self->{layout};
2164 2151
2165 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2166 $layout->set_width ($self->{children}[0]{w}); 2153 $layout->set_width ($self->{children}[0]{w});
2167 $layout->set_text ($text); 2154 $layout->set_markup ($text);
2168 2155
2169 ($layout->size)[1] 2156 ($layout->size)[1]
2170} 2157}
2171 2158
2172sub reflow { 2159sub reflow {
… …
2210 2197
2211 return unless $self->{h} > 0; 2198 return unless $self->{h} > 0;
2212 2199
2213 delete $self->{texture}; 2200 delete $self->{texture};
2214 2201
2215 $ROOT->on_refresh ($self, sub { 2202 $ROOT->on_post_alloc ($self, sub {
2216 if (delete $self->{need_reflow}) { 2203 if (delete $self->{need_reflow}) {
2217 my $height = 0; 2204 my $height = 0;
2218 2205
2219 $height += $_->[0] = $self->text_height ($_->[2]) 2206 $height += $_->[0] = $self->text_height ($_->[2])
2220 for @{$self->{par}}; 2207 for @{$self->{par}};
… …
2228 2215
2229 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2216 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2230 glClearColor 0, 0, 0, 0; 2217 glClearColor 0, 0, 0, 0;
2231 glClear GL_COLOR_BUFFER_BIT; 2218 glClear GL_COLOR_BUFFER_BIT;
2232 2219
2233 glEnable GL_BLEND;
2234 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2235 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
2236 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2237 2222
2238 my $top = int $self->{children}[1]{range}[0]; 2223 my $top = int $self->{children}[1]{range}[0];
2239 2224
… …
2248 2233
2249 for my $par (@{$self->{par}}) { 2234 for my $par (@{$self->{par}}) {
2250 my $h = $par->[0]; 2235 my $h = $par->[0];
2251 2236
2252 if ($y0 < $y + $h && $y < $y1) { 2237 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] });
2253 $layout->set_text ($par->[2]); 2239 $layout->set_markup ($par->[2]);
2254 2240
2255 glColor @{ $par->[1] };
2256 my ($W, $H) = $layout->size; 2241 my ($W, $H) = $layout->size;
2257 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2242 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2258 } 2243 }
2259 2244
2260 $y += $h; 2245 $y += $h;
2261 } 2246 }
2262 2247
2263 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
2264 glDisable GL_BLEND;
2265 }; 2249 };
2266 }); 2250 });
2267} 2251}
2268 2252
2269sub _draw { 2253sub _draw {
2270 my ($self) = @_; 2254 my ($self) = @_;
2271 2255
2272 glEnable GL_BLEND;
2273 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2274 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
2275 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2276 glColor 1, 1, 1, 1; 2258 glColor 1, 1, 1, 1;
2277 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2259 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2278 glDisable GL_TEXTURE_2D; 2260 glDisable GL_TEXTURE_2D;
2279 glDisable GL_BLEND;
2280 2261
2281 $self->{children}[1]->draw; 2262 $self->{children}[1]->draw;
2282 2263
2283} 2264}
2284 2265
… …
2378 @_, 2359 @_,
2379 can_events => 0, 2360 can_events => 0,
2380 ) 2361 )
2381} 2362}
2382 2363
2383sub set_markup { 2364sub set_tooltip_from {
2384 my ($self, $text) = @_; 2365 my ($self, $widget) = @_;
2385 2366
2386 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2367 $self->add (new CFClient::UI::Label
2387 $self->{label}->set_markup ($text); 2368 markup => $widget->{tooltip},
2388 $self->add ($self->{label}); 2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8,
2371 fg => [0, 0, 0, 1],
2372 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 );
2389} 2374}
2390 2375
2391sub size_request { 2376sub size_request {
2392 my ($self) = @_; 2377 my ($self) = @_;
2393
2394 $self->child->set_max_size ($::WIDTH * 0.3);
2395 2378
2396 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2379 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2397 2380
2398 ($w + 4, $h + 4) 2381 ($w + 4, $h + 4)
2399} 2382}
… …
2405} 2388}
2406 2389
2407sub _draw { 2390sub _draw {
2408 my ($self) = @_; 2391 my ($self) = @_;
2409 2392
2410 glPushMatrix;
2411 glTranslate 0.375, 0.375; 2393 glTranslate 0.375, 0.375;
2412 2394
2413 my ($w, $h) = @$self{qw(w h)}; 2395 my ($w, $h) = @$self{qw(w h)};
2414 2396
2415 glColor 1, 0.8, 0.4; 2397 glColor 1, 0.8, 0.4;
… …
2426 glVertex 0 , $h; 2408 glVertex 0 , $h;
2427 glVertex $w, $h; 2409 glVertex $w, $h;
2428 glVertex $w, 0; 2410 glVertex $w, 0;
2429 glEnd; 2411 glEnd;
2430 2412
2431 glPopMatrix; 2413 glTranslate 2 - 0.375, 2 - 0.375;
2432
2433 glTranslate 2, 2;
2434 $self->SUPER::_draw; 2414 $self->SUPER::_draw;
2435} 2415}
2436 2416
2437############################################################################# 2417#############################################################################
2438 2418
… …
2461 return unless $::CONN;#d# manage and cache textures differently 2441 return unless $::CONN;#d# manage and cache textures differently
2462 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2463 2443
2464 # TODO animation 2444 # TODO animation
2465 if ($tex) { 2445 if ($tex) {
2466 glEnable GL_BLEND;
2467 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2468 glEnable GL_TEXTURE_2D; 2446 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 2448 glColor 1, 1, 1, 1;
2471 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 2450 glDisable GL_TEXTURE_2D;
2473 glDisable GL_BLEND;
2474 } 2451 }
2475} 2452}
2476 2453
2477############################################################################# 2454#############################################################################
2478 2455
… …
2561 my ($self, $items) = @_; 2538 my ($self, $items) = @_;
2562 2539
2563 $self->{scrolled}->clear; 2540 $self->{scrolled}->clear;
2564 return unless $items; 2541 return unless $items;
2565 2542
2566 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2543 my @items = sort {
2544 ($a->{type} <=> $b->{type})
2545 or ($a->{name} cmp $b->{name})
2546 } @$items;
2567 2547
2568 $self->{real_items} = \@items; 2548 $self->{real_items} = \@items;
2569 2549
2570 for my $item (@items) { 2550 for my $item (@items) {
2571 my $desc = $item->{nrof} < 2 2551 my $desc = $item->{nrof} < 2
2572 ? $item->{name} 2552 ? $item->{name}
2573 : "$item->{nrof} $item->{name_pl}"; 2553 : "$item->{nrof} $item->{name_pl}";
2574 2554
2575 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2555 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2576 } 2556 }
2557
2558 $self->{scrolled}->add (@items);
2577 2559
2578# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2560# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2579} 2561}
2580 2562
2581sub size_request { 2563sub size_request {
… …
2651 $self->hide; 2633 $self->hide;
2652 2634
2653 $self->emit ("popdown"); 2635 $self->emit ("popdown");
2654 $self->{hover}[1]->() if $self->{hover}; 2636 $self->{hover}[1]->() if $self->{hover};
2655 } 2637 }
2638}
2639
2640#############################################################################
2641
2642package CFClient::UI::Statusbox;
2643
2644our @ISA = CFClient::UI::VBox::;
2645
2646sub reorder {
2647 my ($self) = @_;
2648 my $NOW = time;
2649
2650 while (my ($k, $v) = each %{ $self->{item} }) {
2651 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2652 }
2653
2654 my @widgets;
2655
2656 my @items = sort {
2657 $a->{pri} <=> $b->{pri}
2658 or $b->{id} <=> $a->{id}
2659 } values %{ $self->{item} };
2660
2661 my $count = 10 + 1;
2662 for my $item (@items) {
2663 last unless --$count;
2664
2665 push @widgets, $item->{label} ||= do {
2666 # TODO: doesn't handle markup well (read as: at all)
2667 my $short = $item->{count} > 1
2668 ? "<b>$item->{count} ×</b> $item->{text}"
2669 : $item->{text};
2670
2671 for ($short) {
2672 s/^\s+//;
2673 s/\012.*/…/s;
2674 my $len = int 40 / $item->{fontsize};
2675 substr $_, $len, length, "…" if $len < length;
2676 }
2677
2678 new CFClient::UI::Label
2679 markup => $short,
2680 tooltip => $item->{tooltip},
2681 tooltip_font => $::FONT_PROP,
2682 tooltip_width => 0.67,
2683 fontsize => $item->{fontsize},
2684 color => $item->{color},
2685 can_events => 1,
2686 can_hover => 1
2687 };
2688 }
2689
2690 $self->clear;
2691 $self->SUPER::add (reverse @widgets);
2692}
2693
2694sub add {
2695 my ($self, $text, %arg) = @_;
2696
2697 $text =~ s/^\s+//;
2698 $text =~ s/\s+$//;
2699
2700 my $timeout = time + ((delete $arg{timeout}) || 60);
2701
2702 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2703
2704 if (my $item = $self->{item}{$group}) {
2705 if ($item->{text} eq $text) {
2706 $item->{count}++;
2707 } else {
2708 $item->{count} = 1;
2709 $item->{text} = $item->{tooltip} = $text;
2710 }
2711 $item->{id} = ++$self->{id};
2712 $item->{timeout} = $timeout;
2713 delete $item->{label};
2714 } else {
2715 $self->{item}{$group} = {
2716 id => ++$self->{id},
2717 text => $text,
2718 timeout => $timeout,
2719 tooltip => $text,
2720 fontsize => 0.8,
2721 color => [0.8, 0.8, 0.8, 0.8],
2722 pri => 0,
2723 count => 1,
2724 %arg,
2725 };
2726 }
2727
2728 $self->reorder;
2656} 2729}
2657 2730
2658############################################################################# 2731#############################################################################
2659 2732
2660package CFClient::UI::Root; 2733package CFClient::UI::Root;
… …
2755 my ($self, $id, $cb) = @_; 2828 my ($self, $id, $cb) = @_;
2756 2829
2757 $self->{refresh_hook}{$id} = $cb; 2830 $self->{refresh_hook}{$id} = $cb;
2758} 2831}
2759 2832
2833sub on_post_alloc {
2834 my ($self, $id, $cb) = @_;
2835
2836 $self->{post_alloc_hook}{$id} = $cb;
2837}
2838
2760sub draw { 2839sub draw {
2761 my ($self) = @_; 2840 my ($self) = @_;
2841
2842 while ($self->{refresh_hook}) {
2843 $_->()
2844 for values %{delete $self->{refresh_hook}};
2845 }
2762 2846
2763 if ($self->{check_size}) { 2847 if ($self->{check_size}) {
2764 my @queue = ([], []); 2848 my @queue = ([], []);
2765 2849
2766 for (;;) { 2850 for (;;) {
… …
2774 2858
2775 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 2859 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2776 ? @$widget{qw(user_w user_h)} 2860 ? @$widget{qw(user_w user_h)}
2777 : $widget->size_request; 2861 : $widget->size_request;
2778 2862
2863 if (delete $widget->{force_alloc}
2779 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 2864 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2780 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 2865 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2781 2866
2782 $widget->{req_w} = $w; 2867 $widget->{req_w} = $w;
2783 $widget->{req_h} = $h; 2868 $widget->{req_h} = $h;
2784 2869
2785 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 2870 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2786 2871
2787 $widget->{parent}->check_size 2872 $widget->{parent}->check_size
2788 if $widget->{parent}; 2873 if $widget->{parent};
2789 } 2874 }
2790 } 2875 }
… …
2802 $widget->size_allocate ($w, $h); 2887 $widget->size_allocate ($w, $h);
2803 $widget->emit (size_allocate => $w, $h); 2888 $widget->emit (size_allocate => $w, $h);
2804 } 2889 }
2805 } 2890 }
2806 2891
2807 while ($self->{refresh_hook}) { 2892 while ($self->{post_alloc_hook}) {
2808 $_->() 2893 $_->()
2809 for values %{delete $self->{refresh_hook}}; 2894 for values %{delete $self->{post_alloc_hook}};
2810 } 2895 }
2811 2896
2812 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2897 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2813 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2898 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2814 glClear GL_COLOR_BUFFER_BIT; 2899 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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