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.104 by elmex, Fri Apr 14 14:02:52 2006 UTC vs.
Revision 1.106 by root, Fri Apr 14 15:14:25 2006 UTC

… …
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
62 62
63 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
65 65
66 $hover->update if $hover; 66 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 } 68 }
69 69
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
71} 71}
72 72
… …
439} 439}
440 440
441sub render_chld { 441sub render_chld {
442 my ($self) = @_; 442 my ($self) = @_;
443 443
444 $self->{texture} = 444 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445 CFClient::Texture->new_from_opengl ( 445 glClearColor 0, 0, 0, 1;
446 $self->{w}, $self->{h}, sub { $self->child->draw } 446 glClear GL_COLOR_BUFFER_BIT;
447 ); 447 $self->child->draw;
448 };
448} 449}
449 450
450sub size_allocate { 451sub size_allocate {
451 my ($self, $x, $y, $w, $h) = @_; 452 my ($self, $x, $y, $w, $h) = @_;
452 453
… …
731 my $col_expand = (sum @col_expand) || 1; 732 my $col_expand = (sum @col_expand) || 1;
732 733
733 # linearly scale sizes 734 # linearly scale sizes
734 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
735 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
737
738 $_ = int $_ for @$ws; #TODO: avoid rounding problems
739 $_ = int $_ for @$hs; #TODO: avoid rounding problems
736 740
737 my $y; 741 my $y;
738 742
739 for my $r (0 .. $#{$self->{children}}) { 743 for my $r (0 .. $#{$self->{children}}) {
740 my $row = $self->{children}[$r] 744 my $row = $self->{children}[$r]
… …
831 } 835 }
832 836
833 my $y = 0; 837 my $y = 0;
834 for (0 .. $#$children) { 838 for (0 .. $#$children) {
835 my $child = $children->[$_]; 839 my $child = $children->[$_];
836 my $h = $h[$_]; 840 my $h = int $h[$_];
837 $child->size_allocate ($y, 0, $h, $w); 841 $child->size_allocate ($y, 0, $h, $w);
838 842
839 $y += $h; 843 $y += $h;
840 } 844 }
841} 845}
… …
885 } 889 }
886 890
887 my $y = 0; 891 my $y = 0;
888 for (0 .. $#$children) { 892 for (0 .. $#$children) {
889 my $child = $children->[$_]; 893 my $child = $children->[$_];
890 my $h = $h[$_]; 894 my $h = int $h[$_];
891 $child->size_allocate (0, $y, $w, $h); 895 $child->size_allocate (0, $y, $w, $h);
892 896
893 $y += $h; 897 $y += $h;
894 } 898 }
895} 899}
… …
904 908
905sub new { 909sub new {
906 my ($class, %arg) = @_; 910 my ($class, %arg) = @_;
907 911
908 my $self = $class->SUPER::new ( 912 my $self = $class->SUPER::new (
909 fg => [1, 1, 1], 913 fg => [1, 1, 1],
910 height => $::FONTSIZE, 914 fontsize => $::FONTSIZE,
911 text => "", 915 text => "",
912 align => -1, 916 align => -1,
913 padding => 2, 917 padding => 2,
914 layout => new CFClient::Layout, 918 layout => new CFClient::Layout,
915 %arg 919 %arg
916 ); 920 );
917 921
918 $self->set_text ($self->{text}); 922 $self->set_text ($self->{text});
919 923
… …
949 953
950sub size_request { 954sub size_request {
951 my ($self) = @_; 955 my ($self) = @_;
952 956
953 $self->{layout}->set_width; 957 $self->{layout}->set_width;
954 $self->{layout}->set_height ($self->{height}); 958 $self->{layout}->set_height ($self->{fontsize});
955 my ($w, $h) = $self->{layout}->size; 959 my ($w, $h) = $self->{layout}->size;
956 960
957 ( 961 (
958 $w + $self->{padding} * 2, 962 $w + $self->{padding} * 2,
959 $h + $self->{padding} * 2, 963 $h + $self->{padding} * 2,
… …
978sub _draw { 982sub _draw {
979 my ($self) = @_; 983 my ($self) = @_;
980 984
981 my $tex = $self->{texture} ||= do { 985 my $tex = $self->{texture} ||= do {
982 $self->{layout}->set_width ($self->{w}); 986 $self->{layout}->set_width ($self->{w});
983 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); 987 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
984 new_from_layout CFClient::Texture $self->{layout} 988 new_from_layout CFClient::Texture $self->{layout}
985 }; 989 };
986 990
987 glEnable GL_BLEND; 991 glEnable GL_BLEND;
988 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 992 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
989 glEnable GL_TEXTURE_2D; 993 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
991 995
992 glColor @{$self->{fg}}; 996 glColor @{$self->{fg}};
993 997
994 my $x = 998 my $x =
995 $self->{align} < 0 ? $self->{padding} 999 $self->{align} < 0 ? $self->{padding}
996 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1000 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
997 : ($self->{w} - $tex->{w}) * 0.5; 1001 : ($self->{w} - $tex->{w}) * 0.5;
998 1002
999 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0; 1003 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
1000 $tex->draw_quad (0, 0);
1001 1004
1002 glDisable GL_TEXTURE_2D; 1005 glDisable GL_TEXTURE_2D;
1003 glDisable GL_BLEND; 1006 glDisable GL_BLEND;
1004} 1007}
1005 1008
… …
1033 1036
1034 $self->{last_activity} = $::NOW; 1037 $self->{last_activity} = $::NOW;
1035 1038
1036 $self->{text} = $text; 1039 $self->{text} = $text;
1037 $self->{layout}->set_width ($self->{w}); 1040 $self->{layout}->set_width ($self->{w});
1038 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); 1041 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1039 1042
1040 $text =~ s/./*/g if $self->{hidden}; 1043 $text =~ s/./*/g if $self->{hidden};
1041 1044
1042 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1045 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1043 1046
… …
1465 1468
1466sub new { 1469sub new {
1467 my $class = shift; 1470 my $class = shift;
1468 1471
1469 my $self = $class->SUPER::new ( 1472 my $self = $class->SUPER::new (
1473 req_w => $::WIDTH / 6,
1474 req_h => $::HEIGHT / 6,
1475 fontsize => $::FONTSIZE,
1476 @_,
1477
1478 layout => (new CFClient::Layout),
1470 par => [], 1479 par => [],
1471 @_, 1480 height => 0,
1472 children => [ 1481 children => [
1473 (new CFClient::UI::Empty expand => 1), 1482 (new CFClient::UI::Empty expand => 1),
1474 (new CFClient::UI::Slider vertical => 1), 1483 (new CFClient::UI::Slider vertical => 1),
1475 ], 1484 ],
1476 ); 1485 );
1477 1486
1478 $self 1487 $self
1479} 1488}
1480 1489
1490sub text_height {
1491 my ($self, $text) = @_;
1492
1493 my $layout = $self->{layout};
1494
1495 $layout->set_height ($self->{fontsize});
1496 $layout->set_width ($self->{w});
1497 $layout->set_text ($text);
1498
1499 ($layout->size)[1]
1500}
1501
1502sub reflow {
1503 my ($self) = @_;
1504
1505 my $height = 0;
1506
1507 for (@{$self->{par}}) {
1508 $height += $_->[0] = $self->text_height ($_->[2]);
1509 }
1510
1511 $self->{height} = $height;
1512
1513 $self->{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1514}
1515
1516sub size_request {
1517 my ($self) = @_;
1518
1519 ($self->{req_w}, $self->{req_h})
1520}
1521
1522sub size_allocate {
1523 my ($self, $x, $y, $w, $h) = @_;
1524
1525 $self->SUPER::size_allocate ($x, $y, $w, $h);
1526
1527 $self->{layout}->set_height ($self->{fontsize});
1528 $self->{layout}->set_width ($self->{w});
1529
1530 $self->reflow;
1531 $self->update;
1532}
1533
1481sub add_paragraph { 1534sub add_paragraph {
1482 my ($self, $color, $text) = @_; 1535 my ($self, $color, $text) = @_;
1483 1536
1537 #TODO: intelligently "reformat" paragraph
1538
1539 my $height = $self->text_height ($text);
1540
1541 $self->{height} += $height;
1542
1484 push @{$self->{par}}, [$color, $text]; 1543 push @{$self->{par}}, [$height, $color, $text];
1485 my $count = scalar @{$self->{par}}; 1544
1486 $self->{children}[1]{range} = [$count - 1, 0, $count, 1]; 1545 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1487 $self->{children}[1]->update; 1546 $self->{children}[1]->update;
1488} 1547}
1489 1548
1549sub update {
1550 my ($self) = @_;
1551
1552 $self->SUPER::update;
1553
1554 return unless $self->{h} > 0;
1555
1556 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1557 glClearColor 0, 0, 0, 1;
1558 glClear GL_COLOR_BUFFER_BIT;
1559
1560 my $y0 = $self->{height} - $self->{h};
1561 my $y1 = $self->{height};
1562
1563 glEnable GL_BLEND;
1564 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1565 glEnable GL_TEXTURE_2D;
1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1567
1568 my $y = 0;
1569
1570 my $layout = $self->{layout};
1571
1572 for my $par (@{$self->{par}}) {
1573 my $h = $par->[0];
1574
1575 if ($y0 < $y + $h && $y < $y1) {
1576 $layout->set_text ($par->[2]);
1577
1578 glColor @{ $par->[1] };
1579 my ($W, $H) = $layout->size;
1580 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1581 }
1582
1583 $y += $h;
1584 }
1585
1586 glDisable GL_TEXTURE_2D;
1587 glDisable GL_BLEND;
1588 };
1589}
1590
1490sub _draw { 1591sub _draw {
1491 my ($self) = @_; 1592 my ($self) = @_;
1492 1593
1493 my $par = $self->{par}; 1594 if ($self->{texture}) {
1494
1495 my $bottom = (scalar @$par) - 1;
1496
1497 my $w = $self->{children}[0]{w};
1498 my $y = $self->{h};
1499
1500 glEnable GL_BLEND;
1501 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1502 glEnable GL_TEXTURE_2D; 1595 glEnable GL_TEXTURE_2D;
1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1596 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1504 1597 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1505 # TODO: everything!
1506 while ($y > 0 && $bottom >= 0) {
1507 my $par = $par->[$bottom--];
1508
1509 my $layout = new CFClient::Layout;
1510
1511 $layout->set_height ($::FONTSIZE);
1512 $layout->set_width ($w);
1513 $layout->set_text ($par->[1]);
1514 my $tex = new_from_layout CFClient::Texture $layout;
1515 $y -= $tex->{h};
1516
1517 glColor @{ $par->[0] };
1518 $tex->draw_quad (0, $y);
1519 }
1520
1521 glDisable GL_TEXTURE_2D; 1598 glDisable GL_TEXTURE_2D;
1522 glDisable GL_BLEND; 1599 }
1600
1601 $self->{children}[1]->draw;
1602
1523} 1603}
1524 1604
1525############################################################################# 1605#############################################################################
1526 1606
1527package CFClient::UI::MapWidget; 1607package CFClient::UI::MapWidget;

Diff Legend

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