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.361 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.376 by root, Mon Jul 16 20:20:23 2007 UTC

1package CFPlus::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFPlus; 9use CFPlus;
11use CFPlus::Pod; 10use CFPlus::Pod;
… …
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24 if (!$GRAB) { 23 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 28 $TOOLTIP->hide;
29 29
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 32
32 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
33 34
34 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
35 36
… …
43 } 44 }
44 } 45 }
45 } 46 }
46 47
47 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
49}); 51});
50 52
51sub get_layout { 53sub get_layout {
52 my $layout; 54 my $layout;
… …
235 h => undef, 237 h => undef,
236 can_events => 1, 238 can_events => 1,
237 @_ 239 @_
238 }, $class; 240 }, $class;
239 241
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 243
242 for (keys %$self) { 244 for (keys %$self) {
243 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
245 } 247 }
… …
266 $self->hide; 268 $self->hide;
267 $self->emit ("destroy"); 269 $self->emit ("destroy");
268 %$self = (); 270 %$self = ();
269} 271}
270 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
271sub show { 277sub show {
272 my ($self) = @_; 278 my ($self) = @_;
273 279
274 return if $self->{parent}; 280 return if $self->{parent};
275 281
… …
314sub set_visibility { 320sub set_visibility {
315 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
316 322
317 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
318 324
319 $visible ? $self->hide 325 $visible ? $self->show
320 : $self->show; 326 : $self->hide;
321} 327}
322 328
323sub toggle_visibility { 329sub toggle_visibility {
324 my ($self) = @_; 330 my ($self) = @_;
325 331
… …
530 ? $args[0]->xy ($self) 536 ? $args[0]->xy ($self)
531 : (); 537 : ();
532 538
533 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
534 540
535 #d##TODO# stop propagating at first true, do not use sum 541 for my $cb (
536 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 542 @{$self->{signal_cb}{$signal} || []}, # before
537 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
538 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
539} 550}
540 551
541sub find_widget { 552sub find_widget {
542 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
543 554
… …
551} 562}
552 563
553sub set_parent { 564sub set_parent {
554 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
555 566
556 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
557 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
558} 569}
559 570
560sub realloc { 571sub realloc {
561 my ($self) = @_; 572 my ($self) = @_;
… …
640 my ($self) = @_; 651 my ($self) = @_;
641 652
642 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
643} 654}
644 655
656my $cntx;#d#
645sub DESTROY { 657sub DESTROY {
646 my ($self) = @_; 658 my ($self) = @_;
647 659
648 return if CFPlus::in_destruct; 660 return if CFPlus::in_destruct;
649 661
… …
932 944
933############################################################################# 945#############################################################################
934 946
935package CFPlus::UI::ViewPort; 947package CFPlus::UI::ViewPort;
936 948
949use List::Util qw(min max);
950
937our @ISA = CFPlus::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
938 952
939sub new { 953sub new {
940 my $class = shift; 954 my $class = shift;
941 955
… …
972} 986}
973 987
974sub set_offset { 988sub set_offset {
975 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
976 990
977 $self->{view_x} = int $x; 991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
978 $self->{view_y} = int $y; 992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
979 993
994 $self->emit (changed => $self->{view_x}, $self->{view_y});
980 $self->update; 995 $self->update;
981} 996}
982 997
983# 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
984sub coord2local { 999sub coord2local {
… …
1021 1036
1022############################################################################# 1037#############################################################################
1023 1038
1024package CFPlus::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
1025 1040
1026our @ISA = CFPlus::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
1027 1042
1028sub new { 1043sub new {
1029 my ($class, %arg) = @_; 1044 my ($class, %arg) = @_;
1030 1045
1031 my $child = delete $arg{child}; 1046 my $child = delete $arg{child};
1032 1047
1033 my $self; 1048 my $self;
1034 1049
1035 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
1036 vertical => 1, 1060 vertical => 1,
1037 range => [0, 0, 1, 0.01], # HACK fix 1061 range => [0, 0, 1, 0.01], # HACK fix
1038 on_changed => sub { 1062 on_changed => sub {
1039 $self->{vp}->set_offset (0, $_[1]); 1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1040 }, 1065 },
1041 ; 1066 ;
1042 1067
1043 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
1044 vp => (new CFPlus::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1045 can_events => 1, 1071 can_events => 1,
1046 slider => $slider, 1072 hslider => $hslider,
1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
1047 %arg, 1076 %arg,
1048 ); 1077 );
1049 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
1050 $self->SUPER::add ($self->{vp}, $self->{slider}); 1092 $self->SUPER::add (0, 0, $self->{vp});
1093
1051 $self->add ($child) if $child; 1094 $self->add ($child) if $child;
1052 1095
1053 $self 1096 $self
1054} 1097}
1055 1098
… …
1059 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
1060 1103
1061 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
1062} 1105}
1063 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
1064sub invoke_mouse_wheel { 1138sub invoke_mouse_wheel {
1065 my ($self, $ev) = @_; 1139 my ($self, $ev) = @_;
1066 1140
1067 return 0 unless $ev->{dy}; # only vertical movements 1141 return 0 unless $ev->{dy}; # only vertical movements for now
1068 1142
1069 $self->{slider}->emit (mouse_wheel => $ev); 1143 $self->{vslider}->emit (mouse_wheel => $ev);
1070 1144
1071 1 1145 1
1072} 1146}
1073 1147
1074sub update_slider { 1148sub invoke_button_down {
1075 my ($self) = @_; 1149 my ($self, $ev, $x, $y) = @_;
1076 1150
1077 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1151 if ($ev->{button} == 2) {
1078} 1152 $self->grab_focus;
1079 1153
1080sub update { 1154 my $ox = $self->{vp}{view_x} + $ev->{x};
1081 my ($self) = @_; 1155 my $oy = $self->{vp}{view_y} + $ev->{y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1082 1159
1083 $self->SUPER::update; 1160 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1161 $self->update;
1162 };
1084 1163
1085 $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
1086} 1189}
1087 1190
1088sub invoke_size_allocate { 1191sub invoke_size_allocate {
1089 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1090 1193
1091 $self->update_slider; 1194 $self->update_slider;
1092
1093 $self->SUPER::invoke_size_allocate ($w, $h) 1195 $self->SUPER::invoke_size_allocate ($w, $h)
1094} 1196}
1095 1197
1096############################################################################# 1198#############################################################################
1097 1199
… …
1468 1570
1469sub new { 1571sub new {
1470 my $class = shift; 1572 my $class = shift;
1471 1573
1472 $class->SUPER::new ( 1574 $class->SUPER::new (
1575 children => [],
1473 col_expand => [], 1576 col_expand => [],
1577 row_expand => [],
1474 @_, 1578 @_,
1475 ) 1579 )
1476} 1580}
1477 1581
1478sub children { 1582sub children {
1479 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1583 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1480} 1584}
1481 1585
1586# TODO: store row/col info in child widget and use standard add/del
1482sub add { 1587sub add {
1483 my ($self) = shift; 1588 my ($self) = shift;
1484 1589
1485 while (@_) { 1590 while (@_) {
1486 my ($x, $y, $child) = splice @_, 0, 3, (); 1591 my ($x, $y, $child) = splice @_, 0, 3, ();
1487 $child->set_parent ($self); 1592 $child->set_parent ($self);
1488 $self->{children}[$y][$x] = $child; 1593 $self->{children}[$y][$x] = $child;
1489 } 1594 }
1490 1595
1491 $self->{force_realloc} = 1; 1596 $self->{force_realloc} = 1;
1492 $self->{force_size_alloc} = 1; 1597 $self->{force_size_alloc} = 1;
1493 $self->realloc; 1598 $self->realloc;
1494} 1599}
1495 1600
1496sub remove { 1601sub remove {
1497 my ($self, $child) = @_; 1602 my ($self, $child) = @_;
1498 1603
1499 # TODO: not yet implemented 1604 for (@{ $self->{children} }) {
1605 for (@{ $_ || [] }) {
1606 $_ = undef if $_ == $child;
1607 }
1608 }
1500} 1609}
1501 1610
1502# 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?
1503sub clear { 1612sub clear {
1504 my ($self) = @_; 1613 my ($self) = @_;
… …
1553 my ($ws, $hs) = $self->get_wh; 1662 my ($ws, $hs) = $self->get_wh;
1554 1663
1555 my $req_w = (sum @$ws) || 1; 1664 my $req_w = (sum @$ws) || 1;
1556 my $req_h = (sum @$hs) || 1; 1665 my $req_h = (sum @$hs) || 1;
1557 1666
1558 # TODO: nicer code && do row_expand 1667 # TODO: nicer code
1559 my @col_expand = @{$self->{col_expand}}; 1668 my @col_expand = @{$self->{col_expand}};
1560 @col_expand = (1) x @$ws unless @col_expand; 1669 @col_expand = (1) x @$ws unless @col_expand;
1561 my $col_expand = (sum @col_expand) || 1; 1670 my $col_expand = (sum @col_expand) || 1;
1562 1671
1563 # linearly scale sizes
1564 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1672 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1565 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1566 1673
1567 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
1568 CFPlus::UI::harmonize $hs; 1682 CFPlus::UI::harmonize $hs;
1569 1683
1570 my $y; 1684 my $y;
1571 1685
1572 for my $r (0 .. $#{$self->{children}}) { 1686 for my $r (0 .. $#{$self->{children}}) {
… …
1612 my ($self) = @_; 1726 my ($self) = @_;
1613 1727
1614 for (grep $_, @{$self->{children}}) { 1728 for (grep $_, @{$self->{children}}) {
1615 $_->draw for grep $_, @$_; 1729 $_->draw for grep $_, @$_;
1616 } 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
1617} 1813}
1618 1814
1619############################################################################# 1815#############################################################################
1620 1816
1621package CFPlus::UI::Box; 1817package CFPlus::UI::Box;
… …
1962 my $sym = $ev->{sym}; 2158 my $sym = $ev->{sym};
1963 my $uni = $ev->{unicode}; 2159 my $uni = $ev->{unicode};
1964 2160
1965 my $text = $self->get_text; 2161 my $text = $self->get_text;
1966 2162
2163 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2164
1967 if ($uni == 8) { 2165 if ($uni == 8) {
1968 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2166 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1969 } elsif ($uni == 127) { 2167 } elsif ($uni == 127) {
1970 substr $text, $self->{cursor}, 1, ""; 2168 substr $text, $self->{cursor}, 1, "";
1971 } elsif ($sym == CFPlus::SDLK_LEFT) { 2169 } elsif ($sym == CFPlus::SDLK_LEFT) {
1972 --$self->{cursor} if $self->{cursor}; 2170 --$self->{cursor} if $self->{cursor};
1973 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2171 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1974 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2172 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1975 } elsif ($sym == CFPlus::SDLK_HOME) { 2173 } elsif ($sym == CFPlus::SDLK_HOME) {
2174 # what a hack
1976 $self->{cursor} = 0; 2175 $self->{cursor} =
2176 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2177 ? length $1
2178 : 0;
1977 } elsif ($sym == CFPlus::SDLK_END) { 2179 } elsif ($sym == CFPlus::SDLK_END) {
2180 # uh, again
2181 $self->{cursor} =
2182 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1978 $self->{cursor} = length $text; 2183 ? $self->{cursor} + length $1
2184 : length $self->{text};
1979 } elsif ($uni == 21) { # ctrl-u 2185 } elsif ($uni == 21) { # ctrl-u
1980 $text = ""; 2186 $text = "";
1981 $self->{cursor} = 0; 2187 $self->{cursor} = 0;
1982 } elsif ($uni == 27) { 2188 } elsif ($uni == 27) {
1983 $self->emit ('escape'); 2189 $self->emit ('escape');
1984 } elsif ($uni >= 0x20 || $uni == 0x0d) { 2190 } elsif ($uni == 0x0d) {
2191 substr $text, $self->{cursor}++, 0, "\012";
2192 } elsif ($uni >= 0x20) {
1985 substr $text, $self->{cursor}++, 0, chr $uni; 2193 substr $text, $self->{cursor}++, 0, chr $uni;
1986 } else { 2194 } else {
1987 return 0; 2195 return 0;
1988 } 2196 }
1989 2197
… …
2310 or Carp::croak "'path' or 'tex' attributes required"; 2518 or Carp::croak "'path' or 'tex' attributes required";
2311 2519
2312 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2520 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2313 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2521 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2314 2522
2315 Scalar::Util::weaken $texture_cache{$self->{path}}; 2523 CFPlus::weaken $texture_cache{$self->{path}};
2316 2524
2317 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2525 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2318 2526
2319 $self 2527 $self
2320} 2528}
… …
2693sub invoke_mouse_wheel { 2901sub invoke_mouse_wheel {
2694 my ($self, $ev) = @_; 2902 my ($self, $ev) = @_;
2695 2903
2696 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2904 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2697 2905
2906 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2907
2698 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2908 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2699 2909
2700 ! ! $delta 2910 ! ! $delta
2701} 2911}
2702 2912
2703sub update { 2913sub update {
… …
2813 #font => default_font 3023 #font => default_font
2814 @_, 3024 @_,
2815 3025
2816 layout => (new CFPlus::Layout), 3026 layout => (new CFPlus::Layout),
2817 par => [], 3027 par => [],
3028 max_par => 0,
2818 height => 0, 3029 height => 0,
2819 children => [ 3030 children => [
2820 (new CFPlus::UI::Empty expand => 1), 3031 (new CFPlus::UI::Empty expand => 1),
2821 (new CFPlus::UI::Slider vertical => 1), 3032 (new CFPlus::UI::Slider vertical => 1),
2822 ], 3033 ],
… …
2945 wrapped => 1, 3156 wrapped => 1,
2946 }; 3157 };
2947 3158
2948 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3159 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2949 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;
2950 } 3165 }
2951 3166
2952 $self->{need_reflow}++; 3167 $self->{need_reflow}++;
2953 $self->update; 3168 $self->update;
2954} 3169}
… …
3262 3477
3263sub new { 3478sub new {
3264 my $class = shift; 3479 my $class = shift;
3265 3480
3266 my $self = $class->SUPER::new ( 3481 my $self = $class->SUPER::new (
3482 size_w => 32,
3483 size_h => 8,
3267 aspect => 1, 3484 aspect => 1,
3268 can_events => 0, 3485 can_events => 0,
3269 @_, 3486 @_,
3270 ); 3487 );
3271 3488
3272 if ($self->{anim} && $self->{animspeed}) { 3489 if ($self->{anim} && $self->{animspeed}) {
3273 Scalar::Util::weaken (my $widget = $self); 3490 CFPlus::weaken (my $widget = $self);
3274 3491
3275 $self->{timer} = Event->timer ( 3492 $self->{timer} = Event->timer (
3276 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3493 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3277 hard => 1, 3494 hard => 1,
3278 interval => $self->{animspeed}, 3495 interval => $self->{animspeed},
3279 cb => sub { 3496 cb => sub {
3497 return unless $::CONN;
3498
3280 ++$widget->{frame}; 3499 ++$widget->{frame};
3500 $self->update_face;
3281 $widget->update; 3501 $self->update;
3282 }, 3502 },
3283 ); 3503 );
3504
3505 $self->update_face;
3284 } 3506 }
3285 3507
3286 $self 3508 $self
3287} 3509}
3288 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
3289sub size_request { 3524sub size_request {
3290 (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)
3291} 3540}
3292 3541
3293sub update { 3542sub update {
3294 my ($self) = @_; 3543 my ($self) = @_;
3295 3544
… …
3303 3552
3304 return unless $::CONN; 3553 return unless $::CONN;
3305 3554
3306 $self->SUPER::_draw; 3555 $self->SUPER::_draw;
3307 3556
3308 my $face;
3309
3310 if ($self->{frame}) {
3311 my $anim = $::CONN->{anim}[$self->{anim}]; 3557 my $faceid = $::CONN->{faceid}[$self->{face}]
3312 3558 or return;
3313 $face = $anim->[ $self->{frame} % @$anim ]
3314 if $anim && @$anim;
3315 }
3316 3559
3317 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3560 my $tex = $::CONN->{texture}[$faceid];
3318 3561
3319 if ($tex) { 3562 if ($tex) {
3320 glEnable GL_TEXTURE_2D; 3563 glEnable GL_TEXTURE_2D;
3321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3322 glColor 0, 0, 0, 1; 3565 glColor 0, 0, 0, 1;
… …
3532} 3775}
3533 3776
3534sub add { 3777sub add {
3535 my ($self, $title, $widget, $tooltip) = @_; 3778 my ($self, $title, $widget, $tooltip) = @_;
3536 3779
3537 Scalar::Util::weaken $self; 3780 CFPlus::weaken $self;
3538 3781
3539 $self->{buttonbar}->add (new CFPlus::UI::Button 3782 $self->{buttonbar}->add (new CFPlus::UI::Button
3540 markup => $title, 3783 markup => $title,
3541 tooltip => $tooltip, 3784 tooltip => $tooltip,
3542 on_activate => sub { $self->set_current_page ($widget) }, 3785 on_activate => sub { $self->set_current_page ($widget) },
… …
3626 my $self = $class->SUPER::new ( 3869 my $self = $class->SUPER::new (
3627 fontsize => 0.8, 3870 fontsize => 0.8,
3628 @_, 3871 @_,
3629 ); 3872 );
3630 3873
3631 Scalar::Util::weaken (my $this = $self); 3874 CFPlus::weaken (my $this = $self);
3632 3875
3633 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3876 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3634 3877
3635 $self 3878 $self
3636} 3879}
… …
3775 my $self = $class->SUPER::new ( 4018 my $self = $class->SUPER::new (
3776 visible => 1, 4019 visible => 1,
3777 @_, 4020 @_,
3778 ); 4021 );
3779 4022
3780 Scalar::Util::weaken ($self->{root} = $self); 4023 CFPlus::weaken ($self->{root} = $self);
3781 4024
3782 $self 4025 $self
3783} 4026}
3784 4027
3785sub size_request { 4028sub size_request {

Diff Legend

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