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.366 by root, Mon Apr 23 19:17:41 2007 UTC vs.
Revision 1.379 by root, Tue Jul 17 12:04:18 2007 UTC

… …
268 $self->hide; 268 $self->hide;
269 $self->emit ("destroy"); 269 $self->emit ("destroy");
270 %$self = (); 270 %$self = ();
271} 271}
272 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
273sub show { 277sub show {
274 my ($self) = @_; 278 my ($self) = @_;
275 279
276 return if $self->{parent}; 280 return if $self->{parent};
277 281
… …
316sub set_visibility { 320sub set_visibility {
317 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
318 322
319 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
320 324
321 $visible ? $self->hide 325 $visible ? $self->show
322 : $self->show; 326 : $self->hide;
323} 327}
324 328
325sub toggle_visibility { 329sub toggle_visibility {
326 my ($self) = @_; 330 my ($self) = @_;
327 331
… …
940 944
941############################################################################# 945#############################################################################
942 946
943package CFPlus::UI::ViewPort; 947package CFPlus::UI::ViewPort;
944 948
949use List::Util qw(min max);
950
945our @ISA = CFPlus::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
946 952
947sub new { 953sub new {
948 my $class = shift; 954 my $class = shift;
949 955
… …
980} 986}
981 987
982sub set_offset { 988sub set_offset {
983 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
984 990
991 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993
994 if ($x != $self->{view_x} or $y != $self->{view_y}) {
985 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
986 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
987 997
998 $self->emit (changed => $x, $y);
988 $self->update; 999 $self->update;
1000 }
989} 1001}
990 1002
991# hmm, this does not work for topleft of $self... but we should not ask for that 1003# hmm, this does not work for topleft of $self... but we should not ask for that
992sub coord2local { 1004sub coord2local {
993 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
1029 1041
1030############################################################################# 1042#############################################################################
1031 1043
1032package CFPlus::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
1033 1045
1034our @ISA = CFPlus::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
1035 1047
1036sub new { 1048sub new {
1037 my ($class, %arg) = @_; 1049 my ($class, %arg) = @_;
1038 1050
1039 my $child = delete $arg{child}; 1051 my $child = delete $arg{child};
1040 1052
1041 my $self; 1053 my $self;
1042 1054
1043 my $slider = new CFPlus::UI::Slider 1055 my $hslider = new CFPlus::UI::Slider
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
1044 vertical => 1, 1065 vertical => 1,
1045 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1046 on_changed => sub { 1067 on_changed => sub {
1047 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1048 }, 1070 },
1049 ; 1071 ;
1050 1072
1051 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1052 vp => (new CFPlus::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1053 can_events => 1, 1076 can_events => 1,
1054 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1055 %arg, 1081 %arg,
1056 ); 1082 );
1057 1083
1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 expand => 1,
1086 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y},
1088 on_changed => sub {
1089 my ($vp, $x, $y) = @_;
1090
1091 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y);
1093
1094 0
1095 },
1096 ;
1097
1058 $self->SUPER::add ($self->{vp}, $self->{slider}); 1098 $self->SUPER::add (0, 0, $self->{vp});
1099
1059 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
1060 1101
1061 $self 1102 $self
1062} 1103}
1063 1104
… …
1067 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1068 1109
1069 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1070} 1111}
1071 1112
1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide;
1125 }
1126
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129
1130 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide;
1134 }
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142}
1143
1072sub invoke_mouse_wheel { 1144sub invoke_mouse_wheel {
1073 my ($self, $ev) = @_; 1145 my ($self, $ev) = @_;
1074 1146
1075 return 0 unless $ev->{dy}; # only vertical movements 1147 return 0 unless $ev->{dy}; # only vertical movements for now
1076 1148
1077 $self->{slider}->emit (mouse_wheel => $ev); 1149 $self->{vslider}->emit (mouse_wheel => $ev);
1078 1150
1079 1 1151 1
1080} 1152}
1081 1153
1082sub update_slider { 1154sub invoke_button_down {
1083 my ($self) = @_; 1155 my ($self, $ev, $x, $y) = @_;
1084 1156
1085 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1157 if ($ev->{button} == 2) {
1086} 1158 $self->grab_focus;
1087 1159
1088sub update { 1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1089 my ($self) = @_; 1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1090 1165
1091 $self->SUPER::update; 1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1092 1169
1093 $self->update_slider; 1170 return 1;
1171 }
1172
1173 0
1174}
1175
1176sub invoke_button_up {
1177 my ($self, $ev, $x, $y) = @_;
1178
1179 if (delete $self->{motion}) {
1180 return 1;
1181 }
1182
1183 0
1184}
1185
1186sub invoke_mouse_motion {
1187 my ($self, $ev, $x, $y) = @_;
1188
1189 if ($self->{motion}) {
1190 $self->{motion}->($ev, $x, $y);
1191 return 1;
1192 }
1193
1194 0
1094} 1195}
1095 1196
1096sub invoke_size_allocate { 1197sub invoke_size_allocate {
1097 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1098 1199
1099 $self->update_slider; 1200 $self->update_slider;
1100
1101 $self->SUPER::invoke_size_allocate ($w, $h) 1201 $self->SUPER::invoke_size_allocate ($w, $h)
1102} 1202}
1103 1203
1104############################################################################# 1204#############################################################################
1105 1205
… …
1476 1576
1477sub new { 1577sub new {
1478 my $class = shift; 1578 my $class = shift;
1479 1579
1480 $class->SUPER::new ( 1580 $class->SUPER::new (
1581 children => [],
1481 col_expand => [], 1582 col_expand => [],
1583 row_expand => [],
1482 @_, 1584 @_,
1483 ) 1585 )
1484} 1586}
1485 1587
1486sub children { 1588sub children {
1487 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1589 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1488} 1590}
1489 1591
1592# TODO: store row/col info in child widget and use standard add/del
1490sub add { 1593sub add {
1491 my ($self) = shift; 1594 my ($self) = shift;
1492 1595
1493 while (@_) { 1596 while (@_) {
1494 my ($x, $y, $child) = splice @_, 0, 3, (); 1597 my ($x, $y, $child) = splice @_, 0, 3, ();
1495 $child->set_parent ($self); 1598 $child->set_parent ($self);
1496 $self->{children}[$y][$x] = $child; 1599 $self->{children}[$y][$x] = $child;
1497 } 1600 }
1498 1601
1499 $self->{force_realloc} = 1; 1602 $self->{force_realloc} = 1;
1500 $self->{force_size_alloc} = 1; 1603 $self->{force_size_alloc} = 1;
1501 $self->realloc; 1604 $self->realloc;
1502} 1605}
1503 1606
1504sub remove { 1607sub remove {
1505 my ($self, $child) = @_; 1608 my ($self, $child) = @_;
1506 1609
1507 # TODO: not yet implemented 1610 for (@{ $self->{children} }) {
1611 for (@{ $_ || [] }) {
1612 $_ = undef if $_ == $child;
1613 }
1614 }
1508} 1615}
1509 1616
1510# TODO: move to container class maybe? send children a signal on removal? 1617# TODO: move to container class maybe? send children a signal on removal?
1511sub clear { 1618sub clear {
1512 my ($self) = @_; 1619 my ($self) = @_;
… …
1561 my ($ws, $hs) = $self->get_wh; 1668 my ($ws, $hs) = $self->get_wh;
1562 1669
1563 my $req_w = (sum @$ws) || 1; 1670 my $req_w = (sum @$ws) || 1;
1564 my $req_h = (sum @$hs) || 1; 1671 my $req_h = (sum @$hs) || 1;
1565 1672
1566 # TODO: nicer code && do row_expand 1673 # TODO: nicer code
1567 my @col_expand = @{$self->{col_expand}}; 1674 my @col_expand = @{$self->{col_expand}};
1568 @col_expand = (1) x @$ws unless @col_expand; 1675 @col_expand = (1) x @$ws unless @col_expand;
1569 my $col_expand = (sum @col_expand) || 1; 1676 my $col_expand = (sum @col_expand) || 1;
1570 1677
1571 # linearly scale sizes
1572 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1678 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1573 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1574 1679
1575 CFPlus::UI::harmonize $ws; 1680 CFPlus::UI::harmonize $ws;
1681
1682 my @row_expand = @{$self->{row_expand}};
1683 @row_expand = (1) x @$ws unless @row_expand;
1684 my $row_expand = (sum @row_expand) || 1;
1685
1686 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1687
1576 CFPlus::UI::harmonize $hs; 1688 CFPlus::UI::harmonize $hs;
1577 1689
1578 my $y; 1690 my $y;
1579 1691
1580 for my $r (0 .. $#{$self->{children}}) { 1692 for my $r (0 .. $#{$self->{children}}) {
… …
1620 my ($self) = @_; 1732 my ($self) = @_;
1621 1733
1622 for (grep $_, @{$self->{children}}) { 1734 for (grep $_, @{$self->{children}}) {
1623 $_->draw for grep $_, @$_; 1735 $_->draw for grep $_, @$_;
1624 } 1736 }
1737}
1738
1739#############################################################################
1740
1741package CFPlus::UI::Fixed;
1742
1743use List::Util qw(min max);
1744
1745our @ISA = CFPlus::UI::Container::;
1746
1747sub add {
1748 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1749
1750 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1751 $self->SUPER::add ($child);
1752}
1753
1754sub _scale($$$) {
1755 my ($mode, $val, $max) = @_;
1756
1757 $mode eq "abs" ? $val
1758 : $mode eq "rel" ? $val * $max
1759 : 0
1760}
1761
1762sub size_request {
1763 my ($self) = @_;
1764
1765 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1766
1767 # determine overall size by querying abs widgets
1768 for my $child ($self->visible_children) {
1769 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1770
1771 if ($pos eq "abs") {
1772 $w = _scale $size, $w, $child->{req_w};
1773 $h = _scale $size, $h, $child->{req_h};
1774
1775 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1776 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1777 }
1778 }
1779
1780 my $W = $x2 - $x1;
1781 my $H = $y2 - $y1;
1782
1783 # now layout remaining widgets
1784 for my $child ($self->visible_children) {
1785 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1786
1787 if ($pos ne "abs") {
1788 $x = _scale $pos, $x, $W;
1789 $y = _scale $pos, $x, $H;
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792
1793 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1794 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1795 }
1796 }
1797
1798 my $W = $x2 - $x1;
1799 my $H = $y2 - $y1;
1800
1801 ($W, $H)
1802}
1803
1804sub invoke_size_allocate {
1805 my ($self, $W, $H) = @_;
1806
1807 for my $child ($self->visible_children) {
1808 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1809
1810 $x = _scale $pos, $x, $W;
1811 $y = _scale $pos, $x, $H;
1812 $w = _scale $size, $w, $child->{req_w};
1813 $h = _scale $size, $h, $child->{req_h};
1814
1815 $child->configure ($x, $y, $w, $h);
1816 }
1817
1818 1
1625} 1819}
1626 1820
1627############################################################################# 1821#############################################################################
1628 1822
1629package CFPlus::UI::Box; 1823package CFPlus::UI::Box;
… …
1969 my $mod = $ev->{mod}; 2163 my $mod = $ev->{mod};
1970 my $sym = $ev->{sym}; 2164 my $sym = $ev->{sym};
1971 my $uni = $ev->{unicode}; 2165 my $uni = $ev->{unicode};
1972 2166
1973 my $text = $self->get_text; 2167 my $text = $self->get_text;
2168
2169 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1974 2170
1975 if ($uni == 8) { 2171 if ($uni == 8) {
1976 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2172 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1977 } elsif ($uni == 127) { 2173 } elsif ($uni == 127) {
1978 substr $text, $self->{cursor}, 1, ""; 2174 substr $text, $self->{cursor}, 1, "";
… …
3287 3483
3288sub new { 3484sub new {
3289 my $class = shift; 3485 my $class = shift;
3290 3486
3291 my $self = $class->SUPER::new ( 3487 my $self = $class->SUPER::new (
3488 size_w => 32,
3489 size_h => 8,
3292 aspect => 1, 3490 aspect => 1,
3293 can_events => 0, 3491 can_events => 0,
3294 @_, 3492 @_,
3295 ); 3493 );
3296 3494
3297 if ($self->{anim} && $self->{animspeed}) { 3495 if ($self->{anim} && $self->{animspeed}) {
3298 CFPlus::weaken (my $widget = $self); 3496 CFPlus::weaken (my $widget = $self);
3299 3497
3498 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3499 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3300 $self->{timer} = Event->timer ( 3500 $self->{timer} = Event->timer (
3301 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3302 hard => 1, 3501 parked => 1,
3303 interval => $self->{animspeed},
3304 cb => sub { 3502 cb => sub {
3503 return unless $::CONN;
3504
3505 if (!$widget) {#d#
3506 warn "animation widget timer active but widgetd estroyed\n";#d#
3507 warn $_[0]->w->active;#d#
3508 }#d#
3509
3305 ++$widget->{frame}; 3510 ++$widget->{frame};
3511 $widget->update_face;
3306 $widget->update; 3512 $widget->update;
3513
3514 $widget->update_timer;
3307 }, 3515 },
3308 ); 3516 );
3517
3518 $self->update_face;
3519 $self->update_timer;
3309 } 3520 }
3310 3521
3311 $self 3522 $self
3312} 3523}
3313 3524
3525sub update_timer {
3526 my ($self) = @_;
3527
3528 return unless $self->{timer};
3529
3530 if ($self->{visible}) {
3531 $self->{timer}->at (
3532 $self->{anim_start}
3533 + $self->{animspeed}
3534 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3535 );
3536 $self->{timer}->start;
3537 } else {
3538 $self->{timer}->stop;
3539 }
3540}
3541
3542sub update_face {
3543 my ($self) = @_;
3544
3545 return unless $::CONN;
3546
3547 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3548 if ($anim && @$anim) {
3549 delete $self->{wait_face};
3550 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3551 }
3552 }
3553}
3554
3314sub size_request { 3555sub size_request {
3315 (32, 8) 3556 my ($self) = @_;
3557
3558 if ($::CONN) {
3559 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3560 if (my $tex = $::CONN->{texture}[$faceid]) {
3561 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3562 } else {
3563 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3564 $self->realloc;
3565 });
3566 }
3567 }
3568 }
3569
3570 ($self->{size_w} || 8, $self->{size_h} || 8)
3316} 3571}
3317 3572
3318sub update { 3573sub update {
3319 my ($self) = @_; 3574 my ($self) = @_;
3320 3575
3321 return unless $self->{visible}; 3576 return unless $self->{visible};
3322 3577
3323 $self->SUPER::update; 3578 $self->SUPER::update;
3324} 3579}
3325 3580
3581sub invoke_visibility_change {
3582 my ($self) = @_;
3583
3584 $self->update_timer;
3585
3586 0
3587}
3588
3326sub _draw { 3589sub _draw {
3327 my ($self) = @_; 3590 my ($self) = @_;
3328 3591
3329 return unless $::CONN; 3592 return unless $::CONN;
3330 3593
3331 $self->SUPER::_draw; 3594 $self->SUPER::_draw;
3332 3595
3333 my $face;
3334
3335 if ($self->{frame}) {
3336 my $anim = $::CONN->{anim}[$self->{anim}]; 3596 my $faceid = $::CONN->{faceid}[$self->{face}]
3337 3597 or return;
3338 $face = $anim->[ $self->{frame} % @$anim ]
3339 if $anim && @$anim;
3340 }
3341 3598
3342 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3599 my $tex = $::CONN->{texture}[$faceid];
3343 3600
3344 if ($tex) { 3601 if ($tex) {
3345 glEnable GL_TEXTURE_2D; 3602 glEnable GL_TEXTURE_2D;
3346 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3603 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3347 glColor 0, 0, 0, 1; 3604 glColor 0, 0, 0, 1;
… …
3351} 3608}
3352 3609
3353sub destroy { 3610sub destroy {
3354 my ($self) = @_; 3611 my ($self) = @_;
3355 3612
3356 $self->{timer}->cancel 3613 (delete $self->{timer})->cancel
3357 if $self->{timer}; 3614 if $self->{timer};
3358 3615
3359 $self->SUPER::destroy; 3616 $self->SUPER::destroy;
3360} 3617}
3361 3618

Diff Legend

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