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

Diff Legend

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