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.377 by root, Mon Jul 16 20:20:30 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
1086 $vp->{parent}{hslider}->set_value ($x);
1087 $vp->{parent}{vslider}->set_value ($y);
1088
1089 0
1090 },
1091 ;
1092
1050 $self->SUPER::add ($self->{vp}, $self->{slider}); 1093 $self->SUPER::add (0, 0, $self->{vp});
1094
1051 $self->add ($child) if $child; 1095 $self->add ($child) if $child;
1052 1096
1053 $self 1097 $self
1054} 1098}
1055 1099
… …
1059 my ($self, $widget) = @_; 1103 my ($self, $widget) = @_;
1060 1104
1061 $self->{vp}->add ($self->{child} = $widget); 1105 $self->{vp}->add ($self->{child} = $widget);
1062} 1106}
1063 1107
1108sub update_slider {
1109 my ($self) = @_;
1110
1111 my $child = ($self->{vp} or return)->child;
1112
1113 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1114 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115
1116 my $visible = $w1 > $w2;
1117 if ($visible != $self->{hslider}{visible}) {
1118 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1119 : $self->{hslider}->hide;
1120 }
1121
1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1123 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124
1125 my $visible = $h1 > $h2;
1126 if ($visible != $self->{vslider}{visible}) {
1127 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1128 : $self->{vslider}->hide;
1129 }
1130}
1131
1132sub update {
1133 my ($self) = @_;
1134
1135 $self->SUPER::update;
1136 $self->update_slider;
1137}
1138
1064sub invoke_mouse_wheel { 1139sub invoke_mouse_wheel {
1065 my ($self, $ev) = @_; 1140 my ($self, $ev) = @_;
1066 1141
1067 return 0 unless $ev->{dy}; # only vertical movements 1142 return 0 unless $ev->{dy}; # only vertical movements for now
1068 1143
1069 $self->{slider}->emit (mouse_wheel => $ev); 1144 $self->{vslider}->emit (mouse_wheel => $ev);
1070 1145
1071 1 1146 1
1072} 1147}
1073 1148
1074sub update_slider { 1149sub invoke_button_down {
1075 my ($self) = @_; 1150 my ($self, $ev, $x, $y) = @_;
1076 1151
1077 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1152 if ($ev->{button} == 2) {
1078} 1153 $self->grab_focus;
1079 1154
1080sub update { 1155 my $ox = $self->{vp}{view_x} + $ev->{x};
1081 my ($self) = @_; 1156 my $oy = $self->{vp}{view_y} + $ev->{y};
1157
1158 $self->{motion} = sub {
1159 my ($ev, $x, $y) = @_;
1082 1160
1083 $self->SUPER::update; 1161 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1162 $self->update;
1163 };
1084 1164
1085 $self->update_slider; 1165 return 1;
1166 }
1167
1168 0
1169}
1170
1171sub invoke_button_up {
1172 my ($self, $ev, $x, $y) = @_;
1173
1174 if (delete $self->{motion}) {
1175 return 1;
1176 }
1177
1178 0
1179}
1180
1181sub invoke_mouse_motion {
1182 my ($self, $ev, $x, $y) = @_;
1183
1184 if ($self->{motion}) {
1185 $self->{motion}->($ev, $x, $y);
1186 return 1;
1187 }
1188
1189 0
1086} 1190}
1087 1191
1088sub invoke_size_allocate { 1192sub invoke_size_allocate {
1089 my ($self, $w, $h) = @_; 1193 my ($self, $w, $h) = @_;
1090 1194
1091 $self->update_slider; 1195 $self->update_slider;
1092
1093 $self->SUPER::invoke_size_allocate ($w, $h) 1196 $self->SUPER::invoke_size_allocate ($w, $h)
1094} 1197}
1095 1198
1096############################################################################# 1199#############################################################################
1097 1200
… …
1468 1571
1469sub new { 1572sub new {
1470 my $class = shift; 1573 my $class = shift;
1471 1574
1472 $class->SUPER::new ( 1575 $class->SUPER::new (
1576 children => [],
1473 col_expand => [], 1577 col_expand => [],
1578 row_expand => [],
1474 @_, 1579 @_,
1475 ) 1580 )
1476} 1581}
1477 1582
1478sub children { 1583sub children {
1479 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1584 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1480} 1585}
1481 1586
1587# TODO: store row/col info in child widget and use standard add/del
1482sub add { 1588sub add {
1483 my ($self) = shift; 1589 my ($self) = shift;
1484 1590
1485 while (@_) { 1591 while (@_) {
1486 my ($x, $y, $child) = splice @_, 0, 3, (); 1592 my ($x, $y, $child) = splice @_, 0, 3, ();
1487 $child->set_parent ($self); 1593 $child->set_parent ($self);
1488 $self->{children}[$y][$x] = $child; 1594 $self->{children}[$y][$x] = $child;
1489 } 1595 }
1490 1596
1491 $self->{force_realloc} = 1; 1597 $self->{force_realloc} = 1;
1492 $self->{force_size_alloc} = 1; 1598 $self->{force_size_alloc} = 1;
1493 $self->realloc; 1599 $self->realloc;
1494} 1600}
1495 1601
1496sub remove { 1602sub remove {
1497 my ($self, $child) = @_; 1603 my ($self, $child) = @_;
1498 1604
1499 # TODO: not yet implemented 1605 for (@{ $self->{children} }) {
1606 for (@{ $_ || [] }) {
1607 $_ = undef if $_ == $child;
1608 }
1609 }
1500} 1610}
1501 1611
1502# TODO: move to container class maybe? send children a signal on removal? 1612# TODO: move to container class maybe? send children a signal on removal?
1503sub clear { 1613sub clear {
1504 my ($self) = @_; 1614 my ($self) = @_;
… …
1553 my ($ws, $hs) = $self->get_wh; 1663 my ($ws, $hs) = $self->get_wh;
1554 1664
1555 my $req_w = (sum @$ws) || 1; 1665 my $req_w = (sum @$ws) || 1;
1556 my $req_h = (sum @$hs) || 1; 1666 my $req_h = (sum @$hs) || 1;
1557 1667
1558 # TODO: nicer code && do row_expand 1668 # TODO: nicer code
1559 my @col_expand = @{$self->{col_expand}}; 1669 my @col_expand = @{$self->{col_expand}};
1560 @col_expand = (1) x @$ws unless @col_expand; 1670 @col_expand = (1) x @$ws unless @col_expand;
1561 my $col_expand = (sum @col_expand) || 1; 1671 my $col_expand = (sum @col_expand) || 1;
1562 1672
1563 # linearly scale sizes
1564 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1673 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1565 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1566 1674
1567 CFPlus::UI::harmonize $ws; 1675 CFPlus::UI::harmonize $ws;
1676
1677 my @row_expand = @{$self->{row_expand}};
1678 @row_expand = (1) x @$ws unless @row_expand;
1679 my $row_expand = (sum @row_expand) || 1;
1680
1681 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1682
1568 CFPlus::UI::harmonize $hs; 1683 CFPlus::UI::harmonize $hs;
1569 1684
1570 my $y; 1685 my $y;
1571 1686
1572 for my $r (0 .. $#{$self->{children}}) { 1687 for my $r (0 .. $#{$self->{children}}) {
… …
1612 my ($self) = @_; 1727 my ($self) = @_;
1613 1728
1614 for (grep $_, @{$self->{children}}) { 1729 for (grep $_, @{$self->{children}}) {
1615 $_->draw for grep $_, @$_; 1730 $_->draw for grep $_, @$_;
1616 } 1731 }
1732}
1733
1734#############################################################################
1735
1736package CFPlus::UI::Fixed;
1737
1738use List::Util qw(min max);
1739
1740our @ISA = CFPlus::UI::Container::;
1741
1742sub add {
1743 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1744
1745 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1746 $self->SUPER::add ($child);
1747}
1748
1749sub _scale($$$) {
1750 my ($mode, $val, $max) = @_;
1751
1752 $mode eq "abs" ? $val
1753 : $mode eq "rel" ? $val * $max
1754 : 0
1755}
1756
1757sub size_request {
1758 my ($self) = @_;
1759
1760 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1761
1762 # determine overall size by querying abs widgets
1763 for my $child ($self->visible_children) {
1764 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1765
1766 if ($pos eq "abs") {
1767 $w = _scale $size, $w, $child->{req_w};
1768 $h = _scale $size, $h, $child->{req_h};
1769
1770 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1771 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1772 }
1773 }
1774
1775 my $W = $x2 - $x1;
1776 my $H = $y2 - $y1;
1777
1778 # now layout remaining widgets
1779 for my $child ($self->visible_children) {
1780 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1781
1782 if ($pos ne "abs") {
1783 $x = _scale $pos, $x, $W;
1784 $y = _scale $pos, $x, $H;
1785 $w = _scale $size, $w, $child->{req_w};
1786 $h = _scale $size, $h, $child->{req_h};
1787
1788 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1789 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1790 }
1791 }
1792
1793 my $W = $x2 - $x1;
1794 my $H = $y2 - $y1;
1795
1796 ($W, $H)
1797}
1798
1799sub invoke_size_allocate {
1800 my ($self, $W, $H) = @_;
1801
1802 for my $child ($self->visible_children) {
1803 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1804
1805 $x = _scale $pos, $x, $W;
1806 $y = _scale $pos, $x, $H;
1807 $w = _scale $size, $w, $child->{req_w};
1808 $h = _scale $size, $h, $child->{req_h};
1809
1810 $child->configure ($x, $y, $w, $h);
1811 }
1812
1813 1
1617} 1814}
1618 1815
1619############################################################################# 1816#############################################################################
1620 1817
1621package CFPlus::UI::Box; 1818package CFPlus::UI::Box;
… …
1962 my $sym = $ev->{sym}; 2159 my $sym = $ev->{sym};
1963 my $uni = $ev->{unicode}; 2160 my $uni = $ev->{unicode};
1964 2161
1965 my $text = $self->get_text; 2162 my $text = $self->get_text;
1966 2163
2164 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2165
1967 if ($uni == 8) { 2166 if ($uni == 8) {
1968 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2167 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1969 } elsif ($uni == 127) { 2168 } elsif ($uni == 127) {
1970 substr $text, $self->{cursor}, 1, ""; 2169 substr $text, $self->{cursor}, 1, "";
1971 } elsif ($sym == CFPlus::SDLK_LEFT) { 2170 } elsif ($sym == CFPlus::SDLK_LEFT) {
1972 --$self->{cursor} if $self->{cursor}; 2171 --$self->{cursor} if $self->{cursor};
1973 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2172 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1974 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2173 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1975 } elsif ($sym == CFPlus::SDLK_HOME) { 2174 } elsif ($sym == CFPlus::SDLK_HOME) {
2175 # what a hack
1976 $self->{cursor} = 0; 2176 $self->{cursor} =
2177 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2178 ? length $1
2179 : 0;
1977 } elsif ($sym == CFPlus::SDLK_END) { 2180 } elsif ($sym == CFPlus::SDLK_END) {
2181 # uh, again
2182 $self->{cursor} =
2183 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1978 $self->{cursor} = length $text; 2184 ? $self->{cursor} + length $1
2185 : length $self->{text};
1979 } elsif ($uni == 21) { # ctrl-u 2186 } elsif ($uni == 21) { # ctrl-u
1980 $text = ""; 2187 $text = "";
1981 $self->{cursor} = 0; 2188 $self->{cursor} = 0;
1982 } elsif ($uni == 27) { 2189 } elsif ($uni == 27) {
1983 $self->emit ('escape'); 2190 $self->emit ('escape');
1984 } elsif ($uni >= 0x20 || $uni == 0x0d) { 2191 } elsif ($uni == 0x0d) {
2192 substr $text, $self->{cursor}++, 0, "\012";
2193 } elsif ($uni >= 0x20) {
1985 substr $text, $self->{cursor}++, 0, chr $uni; 2194 substr $text, $self->{cursor}++, 0, chr $uni;
1986 } else { 2195 } else {
1987 return 0; 2196 return 0;
1988 } 2197 }
1989 2198
… …
2310 or Carp::croak "'path' or 'tex' attributes required"; 2519 or Carp::croak "'path' or 'tex' attributes required";
2311 2520
2312 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2521 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2313 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2522 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2314 2523
2315 Scalar::Util::weaken $texture_cache{$self->{path}}; 2524 CFPlus::weaken $texture_cache{$self->{path}};
2316 2525
2317 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2526 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2318 2527
2319 $self 2528 $self
2320} 2529}
… …
2693sub invoke_mouse_wheel { 2902sub invoke_mouse_wheel {
2694 my ($self, $ev) = @_; 2903 my ($self, $ev) = @_;
2695 2904
2696 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2905 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2697 2906
2907 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2908
2698 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2909 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2699 2910
2700 ! ! $delta 2911 ! ! $delta
2701} 2912}
2702 2913
2703sub update { 2914sub update {
… …
2813 #font => default_font 3024 #font => default_font
2814 @_, 3025 @_,
2815 3026
2816 layout => (new CFPlus::Layout), 3027 layout => (new CFPlus::Layout),
2817 par => [], 3028 par => [],
3029 max_par => 0,
2818 height => 0, 3030 height => 0,
2819 children => [ 3031 children => [
2820 (new CFPlus::UI::Empty expand => 1), 3032 (new CFPlus::UI::Empty expand => 1),
2821 (new CFPlus::UI::Slider vertical => 1), 3033 (new CFPlus::UI::Slider vertical => 1),
2822 ], 3034 ],
… …
2945 wrapped => 1, 3157 wrapped => 1,
2946 }; 3158 };
2947 3159
2948 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3160 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2949 push @{$self->{par}}, $para; 3161 push @{$self->{par}}, $para;
3162 }
3163
3164 if (my $max = $self->{max_par}) {
3165 shift @{$self->{par}} while @{$self->{par}} > $max;
2950 } 3166 }
2951 3167
2952 $self->{need_reflow}++; 3168 $self->{need_reflow}++;
2953 $self->update; 3169 $self->update;
2954} 3170}
… …
3262 3478
3263sub new { 3479sub new {
3264 my $class = shift; 3480 my $class = shift;
3265 3481
3266 my $self = $class->SUPER::new ( 3482 my $self = $class->SUPER::new (
3483 size_w => 32,
3484 size_h => 8,
3267 aspect => 1, 3485 aspect => 1,
3268 can_events => 0, 3486 can_events => 0,
3269 @_, 3487 @_,
3270 ); 3488 );
3271 3489
3272 if ($self->{anim} && $self->{animspeed}) { 3490 if ($self->{anim} && $self->{animspeed}) {
3273 Scalar::Util::weaken (my $widget = $self); 3491 CFPlus::weaken (my $widget = $self);
3274 3492
3275 $self->{timer} = Event->timer ( 3493 $self->{timer} = Event->timer (
3276 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3494 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3277 hard => 1, 3495 hard => 1,
3278 interval => $self->{animspeed}, 3496 interval => $self->{animspeed},
3279 cb => sub { 3497 cb => sub {
3498 return unless $::CONN;
3499
3280 ++$widget->{frame}; 3500 ++$widget->{frame};
3501 $self->update_face;
3281 $widget->update; 3502 $self->update;
3282 }, 3503 },
3283 ); 3504 );
3505
3506 $self->update_face;
3284 } 3507 }
3285 3508
3286 $self 3509 $self
3287} 3510}
3288 3511
3512sub update_face {
3513 my ($self) = @_;
3514
3515 return unless $::CONN;
3516
3517 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3518 if ($anim && @$anim) {
3519 delete $self->{wait_face};
3520 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3521 }
3522 }
3523}
3524
3289sub size_request { 3525sub size_request {
3290 (32, 8) 3526 my ($self) = @_;
3527
3528 if ($::CONN) {
3529 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3530 if (my $tex = $::CONN->{texture}[$faceid]) {
3531 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3532 } else {
3533 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3534 $self->realloc;
3535 });
3536 }
3537 }
3538 }
3539
3540 ($self->{size_w} || 8, $self->{size_h} || 8)
3291} 3541}
3292 3542
3293sub update { 3543sub update {
3294 my ($self) = @_; 3544 my ($self) = @_;
3295 3545
… …
3303 3553
3304 return unless $::CONN; 3554 return unless $::CONN;
3305 3555
3306 $self->SUPER::_draw; 3556 $self->SUPER::_draw;
3307 3557
3308 my $face;
3309
3310 if ($self->{frame}) {
3311 my $anim = $::CONN->{anim}[$self->{anim}]; 3558 my $faceid = $::CONN->{faceid}[$self->{face}]
3312 3559 or return;
3313 $face = $anim->[ $self->{frame} % @$anim ]
3314 if $anim && @$anim;
3315 }
3316 3560
3317 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3561 my $tex = $::CONN->{texture}[$faceid];
3318 3562
3319 if ($tex) { 3563 if ($tex) {
3320 glEnable GL_TEXTURE_2D; 3564 glEnable GL_TEXTURE_2D;
3321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3565 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3322 glColor 0, 0, 0, 1; 3566 glColor 0, 0, 0, 1;
… …
3532} 3776}
3533 3777
3534sub add { 3778sub add {
3535 my ($self, $title, $widget, $tooltip) = @_; 3779 my ($self, $title, $widget, $tooltip) = @_;
3536 3780
3537 Scalar::Util::weaken $self; 3781 CFPlus::weaken $self;
3538 3782
3539 $self->{buttonbar}->add (new CFPlus::UI::Button 3783 $self->{buttonbar}->add (new CFPlus::UI::Button
3540 markup => $title, 3784 markup => $title,
3541 tooltip => $tooltip, 3785 tooltip => $tooltip,
3542 on_activate => sub { $self->set_current_page ($widget) }, 3786 on_activate => sub { $self->set_current_page ($widget) },
… …
3626 my $self = $class->SUPER::new ( 3870 my $self = $class->SUPER::new (
3627 fontsize => 0.8, 3871 fontsize => 0.8,
3628 @_, 3872 @_,
3629 ); 3873 );
3630 3874
3631 Scalar::Util::weaken (my $this = $self); 3875 CFPlus::weaken (my $this = $self);
3632 3876
3633 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3877 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3634 3878
3635 $self 3879 $self
3636} 3880}
… …
3775 my $self = $class->SUPER::new ( 4019 my $self = $class->SUPER::new (
3776 visible => 1, 4020 visible => 1,
3777 @_, 4021 @_,
3778 ); 4022 );
3779 4023
3780 Scalar::Util::weaken ($self->{root} = $self); 4024 CFPlus::weaken ($self->{root} = $self);
3781 4025
3782 $self 4026 $self
3783} 4027}
3784 4028
3785sub size_request { 4029sub size_request {

Diff Legend

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