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.379 by root, Tue Jul 17 12:04:18 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
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}) {
977 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
978 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
979 997
998 $self->emit (changed => $x, $y);
980 $self->update; 999 $self->update;
1000 }
981} 1001}
982 1002
983# 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
984sub coord2local { 1004sub coord2local {
985 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
1021 1041
1022############################################################################# 1042#############################################################################
1023 1043
1024package CFPlus::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
1025 1045
1026our @ISA = CFPlus::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
1027 1047
1028sub new { 1048sub new {
1029 my ($class, %arg) = @_; 1049 my ($class, %arg) = @_;
1030 1050
1031 my $child = delete $arg{child}; 1051 my $child = delete $arg{child};
1032 1052
1033 my $self; 1053 my $self;
1034 1054
1035 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
1036 vertical => 1, 1065 vertical => 1,
1037 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1038 on_changed => sub { 1067 on_changed => sub {
1039 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1040 }, 1070 },
1041 ; 1071 ;
1042 1072
1043 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1044 vp => (new CFPlus::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1045 can_events => 1, 1076 can_events => 1,
1046 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1047 %arg, 1081 %arg,
1048 ); 1082 );
1049 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
1050 $self->SUPER::add ($self->{vp}, $self->{slider}); 1098 $self->SUPER::add (0, 0, $self->{vp});
1099
1051 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
1052 1101
1053 $self 1102 $self
1054} 1103}
1055 1104
… …
1059 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1060 1109
1061 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1062} 1111}
1063 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
1064sub invoke_mouse_wheel { 1144sub invoke_mouse_wheel {
1065 my ($self, $ev) = @_; 1145 my ($self, $ev) = @_;
1066 1146
1067 return 0 unless $ev->{dy}; # only vertical movements 1147 return 0 unless $ev->{dy}; # only vertical movements for now
1068 1148
1069 $self->{slider}->emit (mouse_wheel => $ev); 1149 $self->{vslider}->emit (mouse_wheel => $ev);
1070 1150
1071 1 1151 1
1072} 1152}
1073 1153
1074sub update_slider { 1154sub invoke_button_down {
1075 my ($self) = @_; 1155 my ($self, $ev, $x, $y) = @_;
1076 1156
1077 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1157 if ($ev->{button} == 2) {
1078} 1158 $self->grab_focus;
1079 1159
1080sub update { 1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1081 my ($self) = @_; 1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1082 1165
1083 $self->SUPER::update; 1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1084 1169
1085 $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
1086} 1195}
1087 1196
1088sub invoke_size_allocate { 1197sub invoke_size_allocate {
1089 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1090 1199
1091 $self->update_slider; 1200 $self->update_slider;
1092
1093 $self->SUPER::invoke_size_allocate ($w, $h) 1201 $self->SUPER::invoke_size_allocate ($w, $h)
1094} 1202}
1095 1203
1096############################################################################# 1204#############################################################################
1097 1205
… …
1468 1576
1469sub new { 1577sub new {
1470 my $class = shift; 1578 my $class = shift;
1471 1579
1472 $class->SUPER::new ( 1580 $class->SUPER::new (
1581 children => [],
1473 col_expand => [], 1582 col_expand => [],
1583 row_expand => [],
1474 @_, 1584 @_,
1475 ) 1585 )
1476} 1586}
1477 1587
1478sub children { 1588sub children {
1479 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1589 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1480} 1590}
1481 1591
1592# TODO: store row/col info in child widget and use standard add/del
1482sub add { 1593sub add {
1483 my ($self) = shift; 1594 my ($self) = shift;
1484 1595
1485 while (@_) { 1596 while (@_) {
1486 my ($x, $y, $child) = splice @_, 0, 3, (); 1597 my ($x, $y, $child) = splice @_, 0, 3, ();
1487 $child->set_parent ($self); 1598 $child->set_parent ($self);
1488 $self->{children}[$y][$x] = $child; 1599 $self->{children}[$y][$x] = $child;
1489 } 1600 }
1490 1601
1491 $self->{force_realloc} = 1; 1602 $self->{force_realloc} = 1;
1492 $self->{force_size_alloc} = 1; 1603 $self->{force_size_alloc} = 1;
1493 $self->realloc; 1604 $self->realloc;
1494} 1605}
1495 1606
1496sub remove { 1607sub remove {
1497 my ($self, $child) = @_; 1608 my ($self, $child) = @_;
1498 1609
1499 # TODO: not yet implemented 1610 for (@{ $self->{children} }) {
1611 for (@{ $_ || [] }) {
1612 $_ = undef if $_ == $child;
1613 }
1614 }
1500} 1615}
1501 1616
1502# 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?
1503sub clear { 1618sub clear {
1504 my ($self) = @_; 1619 my ($self) = @_;
… …
1553 my ($ws, $hs) = $self->get_wh; 1668 my ($ws, $hs) = $self->get_wh;
1554 1669
1555 my $req_w = (sum @$ws) || 1; 1670 my $req_w = (sum @$ws) || 1;
1556 my $req_h = (sum @$hs) || 1; 1671 my $req_h = (sum @$hs) || 1;
1557 1672
1558 # TODO: nicer code && do row_expand 1673 # TODO: nicer code
1559 my @col_expand = @{$self->{col_expand}}; 1674 my @col_expand = @{$self->{col_expand}};
1560 @col_expand = (1) x @$ws unless @col_expand; 1675 @col_expand = (1) x @$ws unless @col_expand;
1561 my $col_expand = (sum @col_expand) || 1; 1676 my $col_expand = (sum @col_expand) || 1;
1562 1677
1563 # linearly scale sizes
1564 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1678 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1565 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1566 1679
1567 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
1568 CFPlus::UI::harmonize $hs; 1688 CFPlus::UI::harmonize $hs;
1569 1689
1570 my $y; 1690 my $y;
1571 1691
1572 for my $r (0 .. $#{$self->{children}}) { 1692 for my $r (0 .. $#{$self->{children}}) {
… …
1612 my ($self) = @_; 1732 my ($self) = @_;
1613 1733
1614 for (grep $_, @{$self->{children}}) { 1734 for (grep $_, @{$self->{children}}) {
1615 $_->draw for grep $_, @$_; 1735 $_->draw for grep $_, @$_;
1616 } 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
1617} 1819}
1618 1820
1619############################################################################# 1821#############################################################################
1620 1822
1621package CFPlus::UI::Box; 1823package CFPlus::UI::Box;
… …
1962 my $sym = $ev->{sym}; 2164 my $sym = $ev->{sym};
1963 my $uni = $ev->{unicode}; 2165 my $uni = $ev->{unicode};
1964 2166
1965 my $text = $self->get_text; 2167 my $text = $self->get_text;
1966 2168
2169 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2170
1967 if ($uni == 8) { 2171 if ($uni == 8) {
1968 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2172 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1969 } elsif ($uni == 127) { 2173 } elsif ($uni == 127) {
1970 substr $text, $self->{cursor}, 1, ""; 2174 substr $text, $self->{cursor}, 1, "";
1971 } elsif ($sym == CFPlus::SDLK_LEFT) { 2175 } elsif ($sym == CFPlus::SDLK_LEFT) {
1972 --$self->{cursor} if $self->{cursor}; 2176 --$self->{cursor} if $self->{cursor};
1973 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2177 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1974 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2178 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1975 } elsif ($sym == CFPlus::SDLK_HOME) { 2179 } elsif ($sym == CFPlus::SDLK_HOME) {
2180 # what a hack
1976 $self->{cursor} = 0; 2181 $self->{cursor} =
2182 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2183 ? length $1
2184 : 0;
1977 } elsif ($sym == CFPlus::SDLK_END) { 2185 } elsif ($sym == CFPlus::SDLK_END) {
2186 # uh, again
2187 $self->{cursor} =
2188 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1978 $self->{cursor} = length $text; 2189 ? $self->{cursor} + length $1
2190 : length $self->{text};
1979 } elsif ($uni == 21) { # ctrl-u 2191 } elsif ($uni == 21) { # ctrl-u
1980 $text = ""; 2192 $text = "";
1981 $self->{cursor} = 0; 2193 $self->{cursor} = 0;
1982 } elsif ($uni == 27) { 2194 } elsif ($uni == 27) {
1983 $self->emit ('escape'); 2195 $self->emit ('escape');
1984 } elsif ($uni >= 0x20 || $uni == 0x0d) { 2196 } elsif ($uni == 0x0d) {
2197 substr $text, $self->{cursor}++, 0, "\012";
2198 } elsif ($uni >= 0x20) {
1985 substr $text, $self->{cursor}++, 0, chr $uni; 2199 substr $text, $self->{cursor}++, 0, chr $uni;
1986 } else { 2200 } else {
1987 return 0; 2201 return 0;
1988 } 2202 }
1989 2203
… …
2310 or Carp::croak "'path' or 'tex' attributes required"; 2524 or Carp::croak "'path' or 'tex' attributes required";
2311 2525
2312 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2526 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2313 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2527 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2314 2528
2315 Scalar::Util::weaken $texture_cache{$self->{path}}; 2529 CFPlus::weaken $texture_cache{$self->{path}};
2316 2530
2317 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2531 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2318 2532
2319 $self 2533 $self
2320} 2534}
… …
2693sub invoke_mouse_wheel { 2907sub invoke_mouse_wheel {
2694 my ($self, $ev) = @_; 2908 my ($self, $ev) = @_;
2695 2909
2696 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2910 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2697 2911
2912 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2913
2698 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2914 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2699 2915
2700 ! ! $delta 2916 ! ! $delta
2701} 2917}
2702 2918
2703sub update { 2919sub update {
… …
2813 #font => default_font 3029 #font => default_font
2814 @_, 3030 @_,
2815 3031
2816 layout => (new CFPlus::Layout), 3032 layout => (new CFPlus::Layout),
2817 par => [], 3033 par => [],
3034 max_par => 0,
2818 height => 0, 3035 height => 0,
2819 children => [ 3036 children => [
2820 (new CFPlus::UI::Empty expand => 1), 3037 (new CFPlus::UI::Empty expand => 1),
2821 (new CFPlus::UI::Slider vertical => 1), 3038 (new CFPlus::UI::Slider vertical => 1),
2822 ], 3039 ],
… …
2945 wrapped => 1, 3162 wrapped => 1,
2946 }; 3163 };
2947 3164
2948 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3165 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2949 push @{$self->{par}}, $para; 3166 push @{$self->{par}}, $para;
3167 }
3168
3169 if (my $max = $self->{max_par}) {
3170 shift @{$self->{par}} while @{$self->{par}} > $max;
2950 } 3171 }
2951 3172
2952 $self->{need_reflow}++; 3173 $self->{need_reflow}++;
2953 $self->update; 3174 $self->update;
2954} 3175}
… …
3262 3483
3263sub new { 3484sub new {
3264 my $class = shift; 3485 my $class = shift;
3265 3486
3266 my $self = $class->SUPER::new ( 3487 my $self = $class->SUPER::new (
3488 size_w => 32,
3489 size_h => 8,
3267 aspect => 1, 3490 aspect => 1,
3268 can_events => 0, 3491 can_events => 0,
3269 @_, 3492 @_,
3270 ); 3493 );
3271 3494
3272 if ($self->{anim} && $self->{animspeed}) { 3495 if ($self->{anim} && $self->{animspeed}) {
3273 Scalar::Util::weaken (my $widget = $self); 3496 CFPlus::weaken (my $widget = $self);
3274 3497
3498 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3499 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3275 $self->{timer} = Event->timer ( 3500 $self->{timer} = Event->timer (
3276 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3277 hard => 1, 3501 parked => 1,
3278 interval => $self->{animspeed},
3279 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
3280 ++$widget->{frame}; 3510 ++$widget->{frame};
3511 $widget->update_face;
3281 $widget->update; 3512 $widget->update;
3513
3514 $widget->update_timer;
3282 }, 3515 },
3283 ); 3516 );
3517
3518 $self->update_face;
3519 $self->update_timer;
3284 } 3520 }
3285 3521
3286 $self 3522 $self
3287} 3523}
3288 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
3289sub size_request { 3555sub size_request {
3290 (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)
3291} 3571}
3292 3572
3293sub update { 3573sub update {
3294 my ($self) = @_; 3574 my ($self) = @_;
3295 3575
3296 return unless $self->{visible}; 3576 return unless $self->{visible};
3297 3577
3298 $self->SUPER::update; 3578 $self->SUPER::update;
3299} 3579}
3300 3580
3581sub invoke_visibility_change {
3582 my ($self) = @_;
3583
3584 $self->update_timer;
3585
3586 0
3587}
3588
3301sub _draw { 3589sub _draw {
3302 my ($self) = @_; 3590 my ($self) = @_;
3303 3591
3304 return unless $::CONN; 3592 return unless $::CONN;
3305 3593
3306 $self->SUPER::_draw; 3594 $self->SUPER::_draw;
3307 3595
3308 my $face;
3309
3310 if ($self->{frame}) {
3311 my $anim = $::CONN->{anim}[$self->{anim}]; 3596 my $faceid = $::CONN->{faceid}[$self->{face}]
3312 3597 or return;
3313 $face = $anim->[ $self->{frame} % @$anim ]
3314 if $anim && @$anim;
3315 }
3316 3598
3317 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3599 my $tex = $::CONN->{texture}[$faceid];
3318 3600
3319 if ($tex) { 3601 if ($tex) {
3320 glEnable GL_TEXTURE_2D; 3602 glEnable GL_TEXTURE_2D;
3321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3603 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3322 glColor 0, 0, 0, 1; 3604 glColor 0, 0, 0, 1;
… …
3326} 3608}
3327 3609
3328sub destroy { 3610sub destroy {
3329 my ($self) = @_; 3611 my ($self) = @_;
3330 3612
3331 $self->{timer}->cancel 3613 (delete $self->{timer})->cancel
3332 if $self->{timer}; 3614 if $self->{timer};
3333 3615
3334 $self->SUPER::destroy; 3616 $self->SUPER::destroy;
3335} 3617}
3336 3618
… …
3532} 3814}
3533 3815
3534sub add { 3816sub add {
3535 my ($self, $title, $widget, $tooltip) = @_; 3817 my ($self, $title, $widget, $tooltip) = @_;
3536 3818
3537 Scalar::Util::weaken $self; 3819 CFPlus::weaken $self;
3538 3820
3539 $self->{buttonbar}->add (new CFPlus::UI::Button 3821 $self->{buttonbar}->add (new CFPlus::UI::Button
3540 markup => $title, 3822 markup => $title,
3541 tooltip => $tooltip, 3823 tooltip => $tooltip,
3542 on_activate => sub { $self->set_current_page ($widget) }, 3824 on_activate => sub { $self->set_current_page ($widget) },
… …
3626 my $self = $class->SUPER::new ( 3908 my $self = $class->SUPER::new (
3627 fontsize => 0.8, 3909 fontsize => 0.8,
3628 @_, 3910 @_,
3629 ); 3911 );
3630 3912
3631 Scalar::Util::weaken (my $this = $self); 3913 CFPlus::weaken (my $this = $self);
3632 3914
3633 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3915 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3634 3916
3635 $self 3917 $self
3636} 3918}
… …
3775 my $self = $class->SUPER::new ( 4057 my $self = $class->SUPER::new (
3776 visible => 1, 4058 visible => 1,
3777 @_, 4059 @_,
3778 ); 4060 );
3779 4061
3780 Scalar::Util::weaken ($self->{root} = $self); 4062 CFPlus::weaken ($self->{root} = $self);
3781 4063
3782 $self 4064 $self
3783} 4065}
3784 4066
3785sub size_request { 4067sub size_request {

Diff Legend

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