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.363 by root, Sun Dec 10 00:06:49 2006 UTC vs.
Revision 1.376 by root, Mon Jul 16 20:20:23 2007 UTC

… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
265 $self->hide; 268 $self->hide;
266 $self->emit ("destroy"); 269 $self->emit ("destroy");
267 %$self = (); 270 %$self = ();
268} 271}
269 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
270sub show { 277sub show {
271 my ($self) = @_; 278 my ($self) = @_;
272 279
273 return if $self->{parent}; 280 return if $self->{parent};
274 281
… …
313sub set_visibility { 320sub set_visibility {
314 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
315 322
316 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
317 324
318 $visible ? $self->hide 325 $visible ? $self->show
319 : $self->show; 326 : $self->hide;
320} 327}
321 328
322sub toggle_visibility { 329sub toggle_visibility {
323 my ($self) = @_; 330 my ($self) = @_;
324 331
… …
937 944
938############################################################################# 945#############################################################################
939 946
940package CFPlus::UI::ViewPort; 947package CFPlus::UI::ViewPort;
941 948
949use List::Util qw(min max);
950
942our @ISA = CFPlus::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
943 952
944sub new { 953sub new {
945 my $class = shift; 954 my $class = shift;
946 955
… …
977} 986}
978 987
979sub set_offset { 988sub set_offset {
980 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
981 990
982 $self->{view_x} = int $x; 991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
983 $self->{view_y} = int $y; 992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
984 993
994 $self->emit (changed => $self->{view_x}, $self->{view_y});
985 $self->update; 995 $self->update;
986} 996}
987 997
988# 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
989sub coord2local { 999sub coord2local {
… …
1026 1036
1027############################################################################# 1037#############################################################################
1028 1038
1029package CFPlus::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
1030 1040
1031our @ISA = CFPlus::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
1032 1042
1033sub new { 1043sub new {
1034 my ($class, %arg) = @_; 1044 my ($class, %arg) = @_;
1035 1045
1036 my $child = delete $arg{child}; 1046 my $child = delete $arg{child};
1037 1047
1038 my $self; 1048 my $self;
1039 1049
1040 my $slider = new CFPlus::UI::Slider 1050 my $hslider = new CFPlus::UI::Slider
1051 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub {
1054 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 },
1057 ;
1058
1059 my $vslider = new CFPlus::UI::Slider
1041 vertical => 1, 1060 vertical => 1,
1042 range => [0, 0, 1, 0.01], # HACK fix 1061 range => [0, 0, 1, 0.01], # HACK fix
1043 on_changed => sub { 1062 on_changed => sub {
1044 $self->{vp}->set_offset (0, $_[1]); 1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1045 }, 1065 },
1046 ; 1066 ;
1047 1067
1048 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
1049 vp => (new CFPlus::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1050 can_events => 1, 1071 can_events => 1,
1051 slider => $slider, 1072 hslider => $hslider,
1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
1052 %arg, 1076 %arg,
1053 ); 1077 );
1054 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
1055 $self->SUPER::add ($self->{vp}, $self->{slider}); 1092 $self->SUPER::add (0, 0, $self->{vp});
1093
1056 $self->add ($child) if $child; 1094 $self->add ($child) if $child;
1057 1095
1058 $self 1096 $self
1059} 1097}
1060 1098
… …
1064 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
1065 1103
1066 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
1067} 1105}
1068 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
1069sub invoke_mouse_wheel { 1138sub invoke_mouse_wheel {
1070 my ($self, $ev) = @_; 1139 my ($self, $ev) = @_;
1071 1140
1072 return 0 unless $ev->{dy}; # only vertical movements 1141 return 0 unless $ev->{dy}; # only vertical movements for now
1073 1142
1074 $self->{slider}->emit (mouse_wheel => $ev); 1143 $self->{vslider}->emit (mouse_wheel => $ev);
1075 1144
1076 1 1145 1
1077} 1146}
1078 1147
1079sub update_slider { 1148sub invoke_button_down {
1080 my ($self) = @_; 1149 my ($self, $ev, $x, $y) = @_;
1081 1150
1082 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1151 if ($ev->{button} == 2) {
1083} 1152 $self->grab_focus;
1084 1153
1085sub update { 1154 my $ox = $self->{vp}{view_x} + $ev->{x};
1086 my ($self) = @_; 1155 my $oy = $self->{vp}{view_y} + $ev->{y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1087 1159
1088 $self->SUPER::update; 1160 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1161 $self->update;
1162 };
1089 1163
1090 $self->update_slider; 1164 return 1;
1165 }
1166
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
1091} 1189}
1092 1190
1093sub invoke_size_allocate { 1191sub invoke_size_allocate {
1094 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1095 1193
1096 $self->update_slider; 1194 $self->update_slider;
1097
1098 $self->SUPER::invoke_size_allocate ($w, $h) 1195 $self->SUPER::invoke_size_allocate ($w, $h)
1099} 1196}
1100 1197
1101############################################################################# 1198#############################################################################
1102 1199
… …
1473 1570
1474sub new { 1571sub new {
1475 my $class = shift; 1572 my $class = shift;
1476 1573
1477 $class->SUPER::new ( 1574 $class->SUPER::new (
1575 children => [],
1478 col_expand => [], 1576 col_expand => [],
1577 row_expand => [],
1479 @_, 1578 @_,
1480 ) 1579 )
1481} 1580}
1482 1581
1483sub children { 1582sub children {
1484 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1583 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1485} 1584}
1486 1585
1586# TODO: store row/col info in child widget and use standard add/del
1487sub add { 1587sub add {
1488 my ($self) = shift; 1588 my ($self) = shift;
1489 1589
1490 while (@_) { 1590 while (@_) {
1491 my ($x, $y, $child) = splice @_, 0, 3, (); 1591 my ($x, $y, $child) = splice @_, 0, 3, ();
1492 $child->set_parent ($self); 1592 $child->set_parent ($self);
1493 $self->{children}[$y][$x] = $child; 1593 $self->{children}[$y][$x] = $child;
1494 } 1594 }
1495 1595
1496 $self->{force_realloc} = 1; 1596 $self->{force_realloc} = 1;
1497 $self->{force_size_alloc} = 1; 1597 $self->{force_size_alloc} = 1;
1498 $self->realloc; 1598 $self->realloc;
1499} 1599}
1500 1600
1501sub remove { 1601sub remove {
1502 my ($self, $child) = @_; 1602 my ($self, $child) = @_;
1503 1603
1504 # TODO: not yet implemented 1604 for (@{ $self->{children} }) {
1605 for (@{ $_ || [] }) {
1606 $_ = undef if $_ == $child;
1607 }
1608 }
1505} 1609}
1506 1610
1507# 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?
1508sub clear { 1612sub clear {
1509 my ($self) = @_; 1613 my ($self) = @_;
… …
1558 my ($ws, $hs) = $self->get_wh; 1662 my ($ws, $hs) = $self->get_wh;
1559 1663
1560 my $req_w = (sum @$ws) || 1; 1664 my $req_w = (sum @$ws) || 1;
1561 my $req_h = (sum @$hs) || 1; 1665 my $req_h = (sum @$hs) || 1;
1562 1666
1563 # TODO: nicer code && do row_expand 1667 # TODO: nicer code
1564 my @col_expand = @{$self->{col_expand}}; 1668 my @col_expand = @{$self->{col_expand}};
1565 @col_expand = (1) x @$ws unless @col_expand; 1669 @col_expand = (1) x @$ws unless @col_expand;
1566 my $col_expand = (sum @col_expand) || 1; 1670 my $col_expand = (sum @col_expand) || 1;
1567 1671
1568 # linearly scale sizes
1569 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1672 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1570 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1571 1673
1572 CFPlus::UI::harmonize $ws; 1674 CFPlus::UI::harmonize $ws;
1675
1676 my @row_expand = @{$self->{row_expand}};
1677 @row_expand = (1) x @$ws unless @row_expand;
1678 my $row_expand = (sum @row_expand) || 1;
1679
1680 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1681
1573 CFPlus::UI::harmonize $hs; 1682 CFPlus::UI::harmonize $hs;
1574 1683
1575 my $y; 1684 my $y;
1576 1685
1577 for my $r (0 .. $#{$self->{children}}) { 1686 for my $r (0 .. $#{$self->{children}}) {
… …
1617 my ($self) = @_; 1726 my ($self) = @_;
1618 1727
1619 for (grep $_, @{$self->{children}}) { 1728 for (grep $_, @{$self->{children}}) {
1620 $_->draw for grep $_, @$_; 1729 $_->draw for grep $_, @$_;
1621 } 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
1622} 1813}
1623 1814
1624############################################################################# 1815#############################################################################
1625 1816
1626package CFPlus::UI::Box; 1817package CFPlus::UI::Box;
… …
1966 my $mod = $ev->{mod}; 2157 my $mod = $ev->{mod};
1967 my $sym = $ev->{sym}; 2158 my $sym = $ev->{sym};
1968 my $uni = $ev->{unicode}; 2159 my $uni = $ev->{unicode};
1969 2160
1970 my $text = $self->get_text; 2161 my $text = $self->get_text;
2162
2163 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1971 2164
1972 if ($uni == 8) { 2165 if ($uni == 8) {
1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2166 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974 } elsif ($uni == 127) { 2167 } elsif ($uni == 127) {
1975 substr $text, $self->{cursor}, 1, ""; 2168 substr $text, $self->{cursor}, 1, "";
… …
2708sub invoke_mouse_wheel { 2901sub invoke_mouse_wheel {
2709 my ($self, $ev) = @_; 2902 my ($self, $ev) = @_;
2710 2903
2711 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2904 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2712 2905
2906 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2907
2713 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2908 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2714 2909
2715 ! ! $delta 2910 ! ! $delta
2716} 2911}
2717 2912
2718sub update { 2913sub update {
… …
2828 #font => default_font 3023 #font => default_font
2829 @_, 3024 @_,
2830 3025
2831 layout => (new CFPlus::Layout), 3026 layout => (new CFPlus::Layout),
2832 par => [], 3027 par => [],
3028 max_par => 0,
2833 height => 0, 3029 height => 0,
2834 children => [ 3030 children => [
2835 (new CFPlus::UI::Empty expand => 1), 3031 (new CFPlus::UI::Empty expand => 1),
2836 (new CFPlus::UI::Slider vertical => 1), 3032 (new CFPlus::UI::Slider vertical => 1),
2837 ], 3033 ],
… …
2960 wrapped => 1, 3156 wrapped => 1,
2961 }; 3157 };
2962 3158
2963 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3159 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2964 push @{$self->{par}}, $para; 3160 push @{$self->{par}}, $para;
3161 }
3162
3163 if (my $max = $self->{max_par}) {
3164 shift @{$self->{par}} while @{$self->{par}} > $max;
2965 } 3165 }
2966 3166
2967 $self->{need_reflow}++; 3167 $self->{need_reflow}++;
2968 $self->update; 3168 $self->update;
2969} 3169}
… …
3277 3477
3278sub new { 3478sub new {
3279 my $class = shift; 3479 my $class = shift;
3280 3480
3281 my $self = $class->SUPER::new ( 3481 my $self = $class->SUPER::new (
3482 size_w => 32,
3483 size_h => 8,
3282 aspect => 1, 3484 aspect => 1,
3283 can_events => 0, 3485 can_events => 0,
3284 @_, 3486 @_,
3285 ); 3487 );
3286 3488
… …
3290 $self->{timer} = Event->timer ( 3492 $self->{timer} = Event->timer (
3291 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3493 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3292 hard => 1, 3494 hard => 1,
3293 interval => $self->{animspeed}, 3495 interval => $self->{animspeed},
3294 cb => sub { 3496 cb => sub {
3497 return unless $::CONN;
3498
3295 ++$widget->{frame}; 3499 ++$widget->{frame};
3500 $self->update_face;
3296 $widget->update; 3501 $self->update;
3297 }, 3502 },
3298 ); 3503 );
3504
3505 $self->update_face;
3299 } 3506 }
3300 3507
3301 $self 3508 $self
3302} 3509}
3303 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
3304sub size_request { 3524sub size_request {
3305 (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)
3306} 3540}
3307 3541
3308sub update { 3542sub update {
3309 my ($self) = @_; 3543 my ($self) = @_;
3310 3544
… …
3318 3552
3319 return unless $::CONN; 3553 return unless $::CONN;
3320 3554
3321 $self->SUPER::_draw; 3555 $self->SUPER::_draw;
3322 3556
3323 my $face;
3324
3325 if ($self->{frame}) {
3326 my $anim = $::CONN->{anim}[$self->{anim}]; 3557 my $faceid = $::CONN->{faceid}[$self->{face}]
3327 3558 or return;
3328 $face = $anim->[ $self->{frame} % @$anim ]
3329 if $anim && @$anim;
3330 }
3331 3559
3332 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3560 my $tex = $::CONN->{texture}[$faceid];
3333 3561
3334 if ($tex) { 3562 if ($tex) {
3335 glEnable GL_TEXTURE_2D; 3563 glEnable GL_TEXTURE_2D;
3336 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3337 glColor 0, 0, 0, 1; 3565 glColor 0, 0, 0, 1;

Diff Legend

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