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.372 by root, Sun Jul 15 22:13:43 2007 UTC vs.
Revision 1.375 by root, Mon Jul 16 20:12:19 2007 UTC

… …
944 944
945############################################################################# 945#############################################################################
946 946
947package CFPlus::UI::ViewPort; 947package CFPlus::UI::ViewPort;
948 948
949use List::Util qw(min max);
950
949our @ISA = CFPlus::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
950 952
951sub new { 953sub new {
952 my $class = shift; 954 my $class = shift;
953 955
… …
984} 986}
985 987
986sub set_offset { 988sub set_offset {
987 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
988 990
989 $self->{view_x} = int $x; 991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
990 $self->{view_y} = int $y; 992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
991 993
992 $self->update; 994 $self->update;
993} 995}
994 996
995# hmm, this does not work for topleft of $self... but we should not ask for that 997# hmm, this does not work for topleft of $self... but we should not ask for that
… …
1078 scroll_x => $self->{scroll_x}, 1080 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y}, 1081 scroll_y => $self->{scroll_y},
1080 ; 1082 ;
1081 1083
1082 $self->SUPER::add (0, 0, $self->{vp}); 1084 $self->SUPER::add (0, 0, $self->{vp});
1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085 1085
1086 $self->add ($child) if $child; 1086 $self->add ($child) if $child;
1087 1087
1088 $self 1088 $self
1089} 1089}
… …
1094 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
1095 1095
1096 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
1097} 1097}
1098 1098
1099sub update_slider {
1100 my ($self) = @_;
1101
1102 my $child = ($self->{vp} or return)->child;
1103
1104 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1105 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1106
1107 my $visible = $w1 > $w2;
1108 if ($visible != $self->{hslider}{visible}) {
1109 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1110 : $self->{hslider}->hide;
1111 }
1112
1113 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1114 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1115
1116 my $visible = $h1 > $h2;
1117 if ($visible != $self->{vslider}{visible}) {
1118 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1119 : $self->{vslider}->hide;
1120 }
1121}
1122
1123sub update {
1124 my ($self) = @_;
1125
1126 $self->SUPER::update;
1127 $self->update_slider;
1128}
1129
1099sub invoke_mouse_wheel { 1130sub invoke_mouse_wheel {
1100 my ($self, $ev) = @_; 1131 my ($self, $ev) = @_;
1101 1132
1102 return 0 unless $ev->{dy}; # only vertical movements 1133 return 0 unless $ev->{dy}; # only vertical movements for now
1103 1134
1104 $self->{vslider}->emit (mouse_wheel => $ev); 1135 $self->{vslider}->emit (mouse_wheel => $ev);
1105 1136
1106 1 1137 1
1107} 1138}
1108 1139
1109sub update_slider { 1140sub invoke_button_down {
1110 my ($self) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1111 1142
1112 my $child = ($self->{vp} or return)->child; 1143 if ($ev->{button} == 2) {
1144 $self->grab_focus;
1145
1146 $self->{motion} = sub {
1147 my ($ev, $x, $y) = @_;
1113 1148
1114 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1149 $self->{vp}->set_offset (
1115 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1150 $self->{vp}{view_x} - $ev->{xrel},
1116 #$self->{hslider}->set_visibility ($w1 != $w2); 1151 $self->{vp}{view_y} - $ev->{yrel},
1152 );
1153 };
1117 1154
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1155 return 1;
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1156 }
1120 #$self->{vslider}->set_visibility ($h1 != $h2);
1121}
1122 1157
1123sub update { 1158 0
1124 my ($self) = @_; 1159}
1125 1160
1126 $self->SUPER::update; 1161sub invoke_button_up {
1127 $self->update_slider; 1162 my ($self, $ev, $x, $y) = @_;
1163
1164 if (delete $self->{motion}) {
1165 return 1;
1166 }
1167
1168 0
1169}
1170
1171sub invoke_mouse_motion {
1172 my ($self, $ev, $x, $y) = @_;
1173
1174 if ($self->{motion}) {
1175 $self->{motion}->($ev, $x, $y);
1176 return 1;
1177 }
1178
1179 0
1128} 1180}
1129 1181
1130sub invoke_size_allocate { 1182sub invoke_size_allocate {
1131 my ($self, $w, $h) = @_; 1183 my ($self, $w, $h) = @_;
1132 1184
… …
1509 1561
1510sub new { 1562sub new {
1511 my $class = shift; 1563 my $class = shift;
1512 1564
1513 $class->SUPER::new ( 1565 $class->SUPER::new (
1566 children => [],
1514 col_expand => [], 1567 col_expand => [],
1515 row_expand => [], 1568 row_expand => [],
1516 @_, 1569 @_,
1517 ) 1570 )
1518} 1571}
1519 1572
1520sub children { 1573sub children {
1521 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1574 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1522} 1575}
1523 1576
1577# TODO: store row/col info in child widget and use standard add/del
1524sub add { 1578sub add {
1525 my ($self) = shift; 1579 my ($self) = shift;
1526 1580
1527 while (@_) { 1581 while (@_) {
1528 my ($x, $y, $child) = splice @_, 0, 3, (); 1582 my ($x, $y, $child) = splice @_, 0, 3, ();
1529 $child->set_parent ($self); 1583 $child->set_parent ($self);
1530 $self->{children}[$y][$x] = $child; 1584 $self->{children}[$y][$x] = $child;
1531 } 1585 }
1532 1586
1533 $self->{force_realloc} = 1; 1587 $self->{force_realloc} = 1;
1534 $self->{force_size_alloc} = 1; 1588 $self->{force_size_alloc} = 1;
1535 $self->realloc; 1589 $self->realloc;
1536} 1590}
1537 1591
1538sub remove { 1592sub remove {
1539 my ($self, $child) = @_; 1593 my ($self, $child) = @_;
1540 1594
1541 # TODO: not yet implemented 1595 for (@{ $self->{children} }) {
1596 for (@{ $_ || [] }) {
1597 $_ = undef if $_ == $child;
1598 }
1599 }
1542} 1600}
1543 1601
1544# TODO: move to container class maybe? send children a signal on removal? 1602# TODO: move to container class maybe? send children a signal on removal?
1545sub clear { 1603sub clear {
1546 my ($self) = @_; 1604 my ($self) = @_;
… …
1659 my ($self) = @_; 1717 my ($self) = @_;
1660 1718
1661 for (grep $_, @{$self->{children}}) { 1719 for (grep $_, @{$self->{children}}) {
1662 $_->draw for grep $_, @$_; 1720 $_->draw for grep $_, @$_;
1663 } 1721 }
1722}
1723
1724#############################################################################
1725
1726package CFPlus::UI::Fixed;
1727
1728use List::Util qw(min max);
1729
1730our @ISA = CFPlus::UI::Container::;
1731
1732sub add {
1733 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1734
1735 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1736 $self->SUPER::add ($child);
1737}
1738
1739sub _scale($$$) {
1740 my ($mode, $val, $max) = @_;
1741
1742 $mode eq "abs" ? $val
1743 : $mode eq "rel" ? $val * $max
1744 : 0
1745}
1746
1747sub size_request {
1748 my ($self) = @_;
1749
1750 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1751
1752 # determine overall size by querying abs widgets
1753 for my $child ($self->visible_children) {
1754 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1755
1756 if ($pos eq "abs") {
1757 $w = _scale $size, $w, $child->{req_w};
1758 $h = _scale $size, $h, $child->{req_h};
1759
1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1762 }
1763 }
1764
1765 my $W = $x2 - $x1;
1766 my $H = $y2 - $y1;
1767
1768 # now layout remaining widgets
1769 for my $child ($self->visible_children) {
1770 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1771
1772 if ($pos ne "abs") {
1773 $x = _scale $pos, $x, $W;
1774 $y = _scale $pos, $x, $H;
1775 $w = _scale $size, $w, $child->{req_w};
1776 $h = _scale $size, $h, $child->{req_h};
1777
1778 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1779 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1780 }
1781 }
1782
1783 my $W = $x2 - $x1;
1784 my $H = $y2 - $y1;
1785
1786 ($W, $H)
1787}
1788
1789sub invoke_size_allocate {
1790 my ($self, $W, $H) = @_;
1791
1792 for my $child ($self->visible_children) {
1793 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1794
1795 $x = _scale $pos, $x, $W;
1796 $y = _scale $pos, $x, $H;
1797 $w = _scale $size, $w, $child->{req_w};
1798 $h = _scale $size, $h, $child->{req_h};
1799
1800 $child->configure ($x, $y, $w, $h);
1801 }
1802
1803 1
1664} 1804}
1665 1805
1666############################################################################# 1806#############################################################################
1667 1807
1668package CFPlus::UI::Box; 1808package CFPlus::UI::Box;
… …
3328 3468
3329sub new { 3469sub new {
3330 my $class = shift; 3470 my $class = shift;
3331 3471
3332 my $self = $class->SUPER::new ( 3472 my $self = $class->SUPER::new (
3473 size_w => 32,
3474 size_h => 8,
3333 aspect => 1, 3475 aspect => 1,
3334 can_events => 0, 3476 can_events => 0,
3335 @_, 3477 @_,
3336 ); 3478 );
3337 3479
… …
3341 $self->{timer} = Event->timer ( 3483 $self->{timer} = Event->timer (
3342 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3484 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3343 hard => 1, 3485 hard => 1,
3344 interval => $self->{animspeed}, 3486 interval => $self->{animspeed},
3345 cb => sub { 3487 cb => sub {
3346 delete $self->{wait_face}; 3488 return unless $::CONN;
3489
3347 ++$widget->{frame}; 3490 ++$widget->{frame};
3491 $self->update_face;
3348 $widget->update; 3492 $self->update;
3349 }, 3493 },
3350 ); 3494 );
3495
3496 $self->update_face;
3351 } 3497 }
3352 3498
3353 $self 3499 $self
3354} 3500}
3355 3501
3502sub update_face {
3503 my ($self) = @_;
3504
3505 return unless $::CONN;
3506
3507 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3508 if ($anim && @$anim) {
3509 delete $self->{wait_face};
3510 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3511 }
3512 }
3513}
3514
3356sub size_request { 3515sub size_request {
3357 (32, 8) 3516 my ($self) = @_;
3517
3518 if ($::CONN) {
3519 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3520 if (my $tex = $::CONN->{texture}[$faceid]) {
3521 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3522 } else {
3523 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3524 $self->realloc;
3525 });
3526 }
3527 }
3528 }
3529
3530 ($self->{size_w} || 8, $self->{size_h} || 8)
3358} 3531}
3359 3532
3360sub update { 3533sub update {
3361 my ($self) = @_; 3534 my ($self) = @_;
3362 3535
… …
3370 3543
3371 return unless $::CONN; 3544 return unless $::CONN;
3372 3545
3373 $self->SUPER::_draw; 3546 $self->SUPER::_draw;
3374 3547
3375 my $face;
3376
3377 if ($self->{frame}) {
3378 my $anim = $::CONN->{anim}[$self->{anim}];
3379
3380 $face = $anim->[ $self->{frame} % @$anim ]
3381 if $anim && @$anim;
3382 }
3383
3384 my $faceid = $::CONN->{faceid}[$face || $self->{face}] 3548 my $faceid = $::CONN->{faceid}[$self->{face}]
3385 or return; 3549 or return;
3386 3550
3387 my $tex = $::CONN->{texture}[$faceid]; 3551 my $tex = $::CONN->{texture}[$faceid];
3388 3552
3389 if ($tex) { 3553 if ($tex) {
3390 glEnable GL_TEXTURE_2D; 3554 glEnable GL_TEXTURE_2D;
3391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3392 glColor 0, 0, 0, 1; 3556 glColor 0, 0, 0, 1;
3393 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3557 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3394 glDisable GL_TEXTURE_2D; 3558 glDisable GL_TEXTURE_2D;
3395 } else {
3396 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3397 $self->update;
3398 });
3399 } 3559 }
3400} 3560}
3401 3561
3402sub destroy { 3562sub destroy {
3403 my ($self) = @_; 3563 my ($self) = @_;

Diff Legend

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