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.371 by root, Sun Jul 15 22:07:48 2007 UTC vs.
Revision 1.377 by root, Mon Jul 16 20:20:30 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
994 $self->emit (changed => $self->{view_x}, $self->{view_y});
992 $self->update; 995 $self->update;
993} 996}
994 997
995# hmm, this does not work for topleft of $self... but we should not ask for that 998# hmm, this does not work for topleft of $self... but we should not ask for that
996sub coord2local { 999sub coord2local {
… …
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1062 }, 1065 },
1063 ; 1066 ;
1064 1067
1065 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
1066 vp => (new CFPlus::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1067 can_events => 1, 1071 can_events => 1,
1068 hslider => $hslider, 1072 hslider => $hslider,
1069 vslider => $vslider, 1073 vslider => $vslider,
1070 col_expand => [1, 0], 1074 col_expand => [1, 0],
1071 row_expand => [1, 0], 1075 row_expand => [1, 0],
1072 %arg, 1076 %arg,
1073 ); 1077 );
1074 1078
1079 $self->{vp} = new CFPlus::UI::ViewPort
1080 expand => 1,
1081 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y},
1083 on_changed => sub {
1084 my ($vp, $x, $y) = @_;
1085
1086 $vp->{parent}{hslider}->set_value ($x);
1087 $vp->{parent}{vslider}->set_value ($y);
1088
1089 0
1090 },
1091 ;
1092
1075 $self->SUPER::add (0, 0, $self->{vp}); 1093 $self->SUPER::add (0, 0, $self->{vp});
1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078 1094
1079 $self->add ($child) if $child; 1095 $self->add ($child) if $child;
1080 1096
1081 $self 1097 $self
1082} 1098}
… …
1087 my ($self, $widget) = @_; 1103 my ($self, $widget) = @_;
1088 1104
1089 $self->{vp}->add ($self->{child} = $widget); 1105 $self->{vp}->add ($self->{child} = $widget);
1090} 1106}
1091 1107
1108sub update_slider {
1109 my ($self) = @_;
1110
1111 my $child = ($self->{vp} or return)->child;
1112
1113 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1114 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115
1116 my $visible = $w1 > $w2;
1117 if ($visible != $self->{hslider}{visible}) {
1118 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1119 : $self->{hslider}->hide;
1120 }
1121
1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1123 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124
1125 my $visible = $h1 > $h2;
1126 if ($visible != $self->{vslider}{visible}) {
1127 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1128 : $self->{vslider}->hide;
1129 }
1130}
1131
1132sub update {
1133 my ($self) = @_;
1134
1135 $self->SUPER::update;
1136 $self->update_slider;
1137}
1138
1092sub invoke_mouse_wheel { 1139sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_; 1140 my ($self, $ev) = @_;
1094 1141
1095 return 0 unless $ev->{dy}; # only vertical movements 1142 return 0 unless $ev->{dy}; # only vertical movements for now
1096 1143
1097 $self->{vslider}->emit (mouse_wheel => $ev); 1144 $self->{vslider}->emit (mouse_wheel => $ev);
1098 1145
1099 1 1146 1
1100} 1147}
1101 1148
1102sub update_slider { 1149sub invoke_button_down {
1103 my ($self) = @_; 1150 my ($self, $ev, $x, $y) = @_;
1104 1151
1105 my $child = ($self->{vp} or return)->child; 1152 if ($ev->{button} == 2) {
1153 $self->grab_focus;
1106 1154
1107 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1155 my $ox = $self->{vp}{view_x} + $ev->{x};
1108 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1156 my $oy = $self->{vp}{view_y} + $ev->{y};
1109 #$self->{hslider}->set_visibility ($w1 != $w2); 1157
1158 $self->{motion} = sub {
1159 my ($ev, $x, $y) = @_;
1110 1160
1111 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1161 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1112 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1162 $self->update;
1113 #$self->{vslider}->set_visibility ($h1 != $h2); 1163 };
1114}
1115 1164
1116sub update { 1165 return 1;
1117 my ($self) = @_; 1166 }
1118 1167
1119 $self->SUPER::update; 1168 0
1120 $self->update_slider; 1169}
1170
1171sub invoke_button_up {
1172 my ($self, $ev, $x, $y) = @_;
1173
1174 if (delete $self->{motion}) {
1175 return 1;
1176 }
1177
1178 0
1179}
1180
1181sub invoke_mouse_motion {
1182 my ($self, $ev, $x, $y) = @_;
1183
1184 if ($self->{motion}) {
1185 $self->{motion}->($ev, $x, $y);
1186 return 1;
1187 }
1188
1189 0
1121} 1190}
1122 1191
1123sub invoke_size_allocate { 1192sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1193 my ($self, $w, $h) = @_;
1125 1194
… …
1502 1571
1503sub new { 1572sub new {
1504 my $class = shift; 1573 my $class = shift;
1505 1574
1506 $class->SUPER::new ( 1575 $class->SUPER::new (
1576 children => [],
1507 col_expand => [], 1577 col_expand => [],
1508 row_expand => [], 1578 row_expand => [],
1509 @_, 1579 @_,
1510 ) 1580 )
1511} 1581}
1512 1582
1513sub children { 1583sub children {
1514 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1584 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1515} 1585}
1516 1586
1587# TODO: store row/col info in child widget and use standard add/del
1517sub add { 1588sub add {
1518 my ($self) = shift; 1589 my ($self) = shift;
1519 1590
1520 while (@_) { 1591 while (@_) {
1521 my ($x, $y, $child) = splice @_, 0, 3, (); 1592 my ($x, $y, $child) = splice @_, 0, 3, ();
1522 $child->set_parent ($self); 1593 $child->set_parent ($self);
1523 $self->{children}[$y][$x] = $child; 1594 $self->{children}[$y][$x] = $child;
1524 } 1595 }
1525 1596
1526 $self->{force_realloc} = 1; 1597 $self->{force_realloc} = 1;
1527 $self->{force_size_alloc} = 1; 1598 $self->{force_size_alloc} = 1;
1528 $self->realloc; 1599 $self->realloc;
1529} 1600}
1530 1601
1531sub remove { 1602sub remove {
1532 my ($self, $child) = @_; 1603 my ($self, $child) = @_;
1533 1604
1534 # TODO: not yet implemented 1605 for (@{ $self->{children} }) {
1606 for (@{ $_ || [] }) {
1607 $_ = undef if $_ == $child;
1608 }
1609 }
1535} 1610}
1536 1611
1537# TODO: move to container class maybe? send children a signal on removal? 1612# TODO: move to container class maybe? send children a signal on removal?
1538sub clear { 1613sub clear {
1539 my ($self) = @_; 1614 my ($self) = @_;
… …
1652 my ($self) = @_; 1727 my ($self) = @_;
1653 1728
1654 for (grep $_, @{$self->{children}}) { 1729 for (grep $_, @{$self->{children}}) {
1655 $_->draw for grep $_, @$_; 1730 $_->draw for grep $_, @$_;
1656 } 1731 }
1732}
1733
1734#############################################################################
1735
1736package CFPlus::UI::Fixed;
1737
1738use List::Util qw(min max);
1739
1740our @ISA = CFPlus::UI::Container::;
1741
1742sub add {
1743 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1744
1745 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1746 $self->SUPER::add ($child);
1747}
1748
1749sub _scale($$$) {
1750 my ($mode, $val, $max) = @_;
1751
1752 $mode eq "abs" ? $val
1753 : $mode eq "rel" ? $val * $max
1754 : 0
1755}
1756
1757sub size_request {
1758 my ($self) = @_;
1759
1760 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1761
1762 # determine overall size by querying abs widgets
1763 for my $child ($self->visible_children) {
1764 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1765
1766 if ($pos eq "abs") {
1767 $w = _scale $size, $w, $child->{req_w};
1768 $h = _scale $size, $h, $child->{req_h};
1769
1770 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1771 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1772 }
1773 }
1774
1775 my $W = $x2 - $x1;
1776 my $H = $y2 - $y1;
1777
1778 # now layout remaining widgets
1779 for my $child ($self->visible_children) {
1780 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1781
1782 if ($pos ne "abs") {
1783 $x = _scale $pos, $x, $W;
1784 $y = _scale $pos, $x, $H;
1785 $w = _scale $size, $w, $child->{req_w};
1786 $h = _scale $size, $h, $child->{req_h};
1787
1788 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1789 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1790 }
1791 }
1792
1793 my $W = $x2 - $x1;
1794 my $H = $y2 - $y1;
1795
1796 ($W, $H)
1797}
1798
1799sub invoke_size_allocate {
1800 my ($self, $W, $H) = @_;
1801
1802 for my $child ($self->visible_children) {
1803 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1804
1805 $x = _scale $pos, $x, $W;
1806 $y = _scale $pos, $x, $H;
1807 $w = _scale $size, $w, $child->{req_w};
1808 $h = _scale $size, $h, $child->{req_h};
1809
1810 $child->configure ($x, $y, $w, $h);
1811 }
1812
1813 1
1657} 1814}
1658 1815
1659############################################################################# 1816#############################################################################
1660 1817
1661package CFPlus::UI::Box; 1818package CFPlus::UI::Box;
… …
3321 3478
3322sub new { 3479sub new {
3323 my $class = shift; 3480 my $class = shift;
3324 3481
3325 my $self = $class->SUPER::new ( 3482 my $self = $class->SUPER::new (
3483 size_w => 32,
3484 size_h => 8,
3326 aspect => 1, 3485 aspect => 1,
3327 can_events => 0, 3486 can_events => 0,
3328 @_, 3487 @_,
3329 ); 3488 );
3330 3489
… …
3334 $self->{timer} = Event->timer ( 3493 $self->{timer} = Event->timer (
3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3494 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3336 hard => 1, 3495 hard => 1,
3337 interval => $self->{animspeed}, 3496 interval => $self->{animspeed},
3338 cb => sub { 3497 cb => sub {
3339 delete $self->{wait_face}; 3498 return unless $::CONN;
3499
3340 ++$widget->{frame}; 3500 ++$widget->{frame};
3501 $self->update_face;
3341 $widget->update; 3502 $self->update;
3342 }, 3503 },
3343 ); 3504 );
3505
3506 $self->update_face;
3344 } 3507 }
3345 3508
3346 $self 3509 $self
3347} 3510}
3348 3511
3512sub update_face {
3513 my ($self) = @_;
3514
3515 return unless $::CONN;
3516
3517 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3518 if ($anim && @$anim) {
3519 delete $self->{wait_face};
3520 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3521 }
3522 }
3523}
3524
3349sub size_request { 3525sub size_request {
3350 (32, 8) 3526 my ($self) = @_;
3527
3528 if ($::CONN) {
3529 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3530 if (my $tex = $::CONN->{texture}[$faceid]) {
3531 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3532 } else {
3533 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3534 $self->realloc;
3535 });
3536 }
3537 }
3538 }
3539
3540 ($self->{size_w} || 8, $self->{size_h} || 8)
3351} 3541}
3352 3542
3353sub update { 3543sub update {
3354 my ($self) = @_; 3544 my ($self) = @_;
3355 3545
… …
3363 3553
3364 return unless $::CONN; 3554 return unless $::CONN;
3365 3555
3366 $self->SUPER::_draw; 3556 $self->SUPER::_draw;
3367 3557
3368 my $face;
3369
3370 if ($self->{frame}) {
3371 my $anim = $::CONN->{anim}[$self->{anim}];
3372
3373 $face = $anim->[ $self->{frame} % @$anim ]
3374 if $anim && @$anim;
3375 }
3376
3377 my $faceid = $::CONN->{faceid}[$face || $self->{face}] 3558 my $faceid = $::CONN->{faceid}[$self->{face}]
3378 or return; 3559 or return;
3379 3560
3380 my $tex = $::CONN->{texture}[$faceid]; 3561 my $tex = $::CONN->{texture}[$faceid];
3381 3562
3382 if ($tex) { 3563 if ($tex) {
3383 glEnable GL_TEXTURE_2D; 3564 glEnable GL_TEXTURE_2D;
3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3565 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3385 glColor 0, 0, 0, 1; 3566 glColor 0, 0, 0, 1;
3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3567 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3387 glDisable GL_TEXTURE_2D; 3568 glDisable GL_TEXTURE_2D;
3388 } else {
3389 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390 $self->update;
3391 });
3392 } 3569 }
3393} 3570}
3394 3571
3395sub destroy { 3572sub destroy {
3396 my ($self) = @_; 3573 my ($self) = @_;

Diff Legend

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