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.375 by root, Mon Jul 16 20:12:19 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
985 $self->{view_x} = int $x; 991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
986 $self->{view_y} = int $y; 992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
987 993
988 $self->update; 994 $self->update;
989} 995}
990 996
991# 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
… …
1029 1035
1030############################################################################# 1036#############################################################################
1031 1037
1032package CFPlus::UI::ScrolledWindow; 1038package CFPlus::UI::ScrolledWindow;
1033 1039
1034our @ISA = CFPlus::UI::HBox::; 1040our @ISA = CFPlus::UI::Table::;
1035 1041
1036sub new { 1042sub new {
1037 my ($class, %arg) = @_; 1043 my ($class, %arg) = @_;
1038 1044
1039 my $child = delete $arg{child}; 1045 my $child = delete $arg{child};
1040 1046
1041 my $self; 1047 my $self;
1042 1048
1043 my $slider = new CFPlus::UI::Slider 1049 my $hslider = new CFPlus::UI::Slider
1050 vertical => 0,
1051 range => [0, 0, 1, 0.01], # HACK fix
1052 on_changed => sub {
1053 $self->{hpos} = $_[1];
1054 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1055 },
1056 ;
1057
1058 my $vslider = new CFPlus::UI::Slider
1044 vertical => 1, 1059 vertical => 1,
1045 range => [0, 0, 1, 0.01], # HACK fix 1060 range => [0, 0, 1, 0.01], # HACK fix
1046 on_changed => sub { 1061 on_changed => sub {
1047 $self->{vp}->set_offset (0, $_[1]); 1062 $self->{vpos} = $_[1];
1063 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1048 }, 1064 },
1049 ; 1065 ;
1050 1066
1051 $self = $class->SUPER::new ( 1067 $self = $class->SUPER::new (
1052 vp => (new CFPlus::UI::ViewPort expand => 1), 1068 scroll_x => 0,
1069 scroll_y => 1,
1053 can_events => 1, 1070 can_events => 1,
1054 slider => $slider, 1071 hslider => $hslider,
1072 vslider => $vslider,
1073 col_expand => [1, 0],
1074 row_expand => [1, 0],
1055 %arg, 1075 %arg,
1056 ); 1076 );
1057 1077
1078 $self->{vp} = new CFPlus::UI::ViewPort
1079 expand => 1,
1080 scroll_x => $self->{scroll_x},
1081 scroll_y => $self->{scroll_y},
1082 ;
1083
1058 $self->SUPER::add ($self->{vp}, $self->{slider}); 1084 $self->SUPER::add (0, 0, $self->{vp});
1085
1059 $self->add ($child) if $child; 1086 $self->add ($child) if $child;
1060 1087
1061 $self 1088 $self
1062} 1089}
1063 1090
… …
1067 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
1068 1095
1069 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
1070} 1097}
1071 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
1072sub invoke_mouse_wheel { 1130sub invoke_mouse_wheel {
1073 my ($self, $ev) = @_; 1131 my ($self, $ev) = @_;
1074 1132
1075 return 0 unless $ev->{dy}; # only vertical movements 1133 return 0 unless $ev->{dy}; # only vertical movements for now
1076 1134
1077 $self->{slider}->emit (mouse_wheel => $ev); 1135 $self->{vslider}->emit (mouse_wheel => $ev);
1078 1136
1079 1 1137 1
1080} 1138}
1081 1139
1082sub update_slider { 1140sub invoke_button_down {
1083 my ($self) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1084 1142
1085 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1143 if ($ev->{button} == 2) {
1086} 1144 $self->grab_focus;
1145
1146 $self->{motion} = sub {
1147 my ($ev, $x, $y) = @_;
1087 1148
1088sub update { 1149 $self->{vp}->set_offset (
1089 my ($self) = @_; 1150 $self->{vp}{view_x} - $ev->{xrel},
1151 $self->{vp}{view_y} - $ev->{yrel},
1152 );
1153 };
1090 1154
1091 $self->SUPER::update; 1155 return 1;
1156 }
1092 1157
1093 $self->update_slider; 1158 0
1159}
1160
1161sub invoke_button_up {
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
1094} 1180}
1095 1181
1096sub invoke_size_allocate { 1182sub invoke_size_allocate {
1097 my ($self, $w, $h) = @_; 1183 my ($self, $w, $h) = @_;
1098 1184
1099 $self->update_slider; 1185 $self->update_slider;
1100
1101 $self->SUPER::invoke_size_allocate ($w, $h) 1186 $self->SUPER::invoke_size_allocate ($w, $h)
1102} 1187}
1103 1188
1104############################################################################# 1189#############################################################################
1105 1190
… …
1476 1561
1477sub new { 1562sub new {
1478 my $class = shift; 1563 my $class = shift;
1479 1564
1480 $class->SUPER::new ( 1565 $class->SUPER::new (
1566 children => [],
1481 col_expand => [], 1567 col_expand => [],
1568 row_expand => [],
1482 @_, 1569 @_,
1483 ) 1570 )
1484} 1571}
1485 1572
1486sub children { 1573sub children {
1487 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1574 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1488} 1575}
1489 1576
1577# TODO: store row/col info in child widget and use standard add/del
1490sub add { 1578sub add {
1491 my ($self) = shift; 1579 my ($self) = shift;
1492 1580
1493 while (@_) { 1581 while (@_) {
1494 my ($x, $y, $child) = splice @_, 0, 3, (); 1582 my ($x, $y, $child) = splice @_, 0, 3, ();
1495 $child->set_parent ($self); 1583 $child->set_parent ($self);
1496 $self->{children}[$y][$x] = $child; 1584 $self->{children}[$y][$x] = $child;
1497 } 1585 }
1498 1586
1499 $self->{force_realloc} = 1; 1587 $self->{force_realloc} = 1;
1500 $self->{force_size_alloc} = 1; 1588 $self->{force_size_alloc} = 1;
1501 $self->realloc; 1589 $self->realloc;
1502} 1590}
1503 1591
1504sub remove { 1592sub remove {
1505 my ($self, $child) = @_; 1593 my ($self, $child) = @_;
1506 1594
1507 # TODO: not yet implemented 1595 for (@{ $self->{children} }) {
1596 for (@{ $_ || [] }) {
1597 $_ = undef if $_ == $child;
1598 }
1599 }
1508} 1600}
1509 1601
1510# 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?
1511sub clear { 1603sub clear {
1512 my ($self) = @_; 1604 my ($self) = @_;
… …
1561 my ($ws, $hs) = $self->get_wh; 1653 my ($ws, $hs) = $self->get_wh;
1562 1654
1563 my $req_w = (sum @$ws) || 1; 1655 my $req_w = (sum @$ws) || 1;
1564 my $req_h = (sum @$hs) || 1; 1656 my $req_h = (sum @$hs) || 1;
1565 1657
1566 # TODO: nicer code && do row_expand 1658 # TODO: nicer code
1567 my @col_expand = @{$self->{col_expand}}; 1659 my @col_expand = @{$self->{col_expand}};
1568 @col_expand = (1) x @$ws unless @col_expand; 1660 @col_expand = (1) x @$ws unless @col_expand;
1569 my $col_expand = (sum @col_expand) || 1; 1661 my $col_expand = (sum @col_expand) || 1;
1570 1662
1571 # linearly scale sizes
1572 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1663 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1573 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1574 1664
1575 CFPlus::UI::harmonize $ws; 1665 CFPlus::UI::harmonize $ws;
1666
1667 my @row_expand = @{$self->{row_expand}};
1668 @row_expand = (1) x @$ws unless @row_expand;
1669 my $row_expand = (sum @row_expand) || 1;
1670
1671 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1672
1576 CFPlus::UI::harmonize $hs; 1673 CFPlus::UI::harmonize $hs;
1577 1674
1578 my $y; 1675 my $y;
1579 1676
1580 for my $r (0 .. $#{$self->{children}}) { 1677 for my $r (0 .. $#{$self->{children}}) {
… …
1620 my ($self) = @_; 1717 my ($self) = @_;
1621 1718
1622 for (grep $_, @{$self->{children}}) { 1719 for (grep $_, @{$self->{children}}) {
1623 $_->draw for grep $_, @$_; 1720 $_->draw for grep $_, @$_;
1624 } 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
1625} 1804}
1626 1805
1627############################################################################# 1806#############################################################################
1628 1807
1629package CFPlus::UI::Box; 1808package CFPlus::UI::Box;
… …
1969 my $mod = $ev->{mod}; 2148 my $mod = $ev->{mod};
1970 my $sym = $ev->{sym}; 2149 my $sym = $ev->{sym};
1971 my $uni = $ev->{unicode}; 2150 my $uni = $ev->{unicode};
1972 2151
1973 my $text = $self->get_text; 2152 my $text = $self->get_text;
2153
2154 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1974 2155
1975 if ($uni == 8) { 2156 if ($uni == 8) {
1976 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2157 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1977 } elsif ($uni == 127) { 2158 } elsif ($uni == 127) {
1978 substr $text, $self->{cursor}, 1, ""; 2159 substr $text, $self->{cursor}, 1, "";
… …
3287 3468
3288sub new { 3469sub new {
3289 my $class = shift; 3470 my $class = shift;
3290 3471
3291 my $self = $class->SUPER::new ( 3472 my $self = $class->SUPER::new (
3473 size_w => 32,
3474 size_h => 8,
3292 aspect => 1, 3475 aspect => 1,
3293 can_events => 0, 3476 can_events => 0,
3294 @_, 3477 @_,
3295 ); 3478 );
3296 3479
… …
3300 $self->{timer} = Event->timer ( 3483 $self->{timer} = Event->timer (
3301 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3484 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3302 hard => 1, 3485 hard => 1,
3303 interval => $self->{animspeed}, 3486 interval => $self->{animspeed},
3304 cb => sub { 3487 cb => sub {
3488 return unless $::CONN;
3489
3305 ++$widget->{frame}; 3490 ++$widget->{frame};
3491 $self->update_face;
3306 $widget->update; 3492 $self->update;
3307 }, 3493 },
3308 ); 3494 );
3495
3496 $self->update_face;
3309 } 3497 }
3310 3498
3311 $self 3499 $self
3312} 3500}
3313 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
3314sub size_request { 3515sub size_request {
3315 (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)
3316} 3531}
3317 3532
3318sub update { 3533sub update {
3319 my ($self) = @_; 3534 my ($self) = @_;
3320 3535
… …
3328 3543
3329 return unless $::CONN; 3544 return unless $::CONN;
3330 3545
3331 $self->SUPER::_draw; 3546 $self->SUPER::_draw;
3332 3547
3333 my $face;
3334
3335 if ($self->{frame}) {
3336 my $anim = $::CONN->{anim}[$self->{anim}]; 3548 my $faceid = $::CONN->{faceid}[$self->{face}]
3337 3549 or return;
3338 $face = $anim->[ $self->{frame} % @$anim ]
3339 if $anim && @$anim;
3340 }
3341 3550
3342 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3551 my $tex = $::CONN->{texture}[$faceid];
3343 3552
3344 if ($tex) { 3553 if ($tex) {
3345 glEnable GL_TEXTURE_2D; 3554 glEnable GL_TEXTURE_2D;
3346 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3347 glColor 0, 0, 0, 1; 3556 glColor 0, 0, 0, 1;

Diff Legend

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