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.365 by root, Thu Apr 12 07:53:31 2007 UTC vs.
Revision 1.382 by root, Thu Jul 19 19:58:56 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
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}) {
982 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
983 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
984 997
998 $self->emit (changed => $x, $y);
985 $self->update; 999 $self->update;
1000 }
986} 1001}
987 1002
988# 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
989sub coord2local { 1004sub coord2local {
990 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
1026 1041
1027############################################################################# 1042#############################################################################
1028 1043
1029package CFPlus::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
1030 1045
1031our @ISA = CFPlus::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
1032 1047
1033sub new { 1048sub new {
1034 my ($class, %arg) = @_; 1049 my ($class, %arg) = @_;
1035 1050
1036 my $child = delete $arg{child}; 1051 my $child = delete $arg{child};
1037 1052
1038 my $self; 1053 my $self;
1039 1054
1040 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
1041 vertical => 1, 1065 vertical => 1,
1042 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1043 on_changed => sub { 1067 on_changed => sub {
1044 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1045 }, 1070 },
1046 ; 1071 ;
1047 1072
1048 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1049 vp => (new CFPlus::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1050 can_events => 1, 1076 can_events => 1,
1051 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1052 %arg, 1081 %arg,
1053 ); 1082 );
1054 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
1055 $self->SUPER::add ($self->{vp}, $self->{slider}); 1098 $self->SUPER::add (0, 0, $self->{vp});
1099
1056 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
1057 1101
1058 $self 1102 $self
1059} 1103}
1060 1104
… …
1064 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1065 1109
1066 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1067} 1111}
1068 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
1069sub invoke_mouse_wheel { 1144sub invoke_mouse_wheel {
1070 my ($self, $ev) = @_; 1145 my ($self, $ev) = @_;
1071 1146
1072 return 0 unless $ev->{dy}; # only vertical movements 1147 return 0 unless $ev->{dy}; # only vertical movements for now
1073 1148
1074 $self->{slider}->emit (mouse_wheel => $ev); 1149 $self->{vslider}->emit (mouse_wheel => $ev);
1075 1150
1076 1 1151 1
1077} 1152}
1078 1153
1079sub update_slider { 1154sub invoke_button_down {
1080 my ($self) = @_; 1155 my ($self, $ev, $x, $y) = @_;
1081 1156
1082 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1157 if ($ev->{button} == 2) {
1083} 1158 $self->grab_focus;
1084 1159
1085sub update { 1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1086 my ($self) = @_; 1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1087 1165
1088 $self->SUPER::update; 1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1089 1169
1090 $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
1091} 1195}
1092 1196
1093sub invoke_size_allocate { 1197sub invoke_size_allocate {
1094 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1095 1199
1096 $self->update_slider; 1200 $self->update_slider;
1097
1098 $self->SUPER::invoke_size_allocate ($w, $h) 1201 $self->SUPER::invoke_size_allocate ($w, $h)
1099} 1202}
1100 1203
1101############################################################################# 1204#############################################################################
1102 1205
… …
1252 1355
1253my @border = 1356my @border =
1254 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1255 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1256 1359
1360my @icon =
1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1362 qw(x1_move.png x1_resize.png);
1363
1257sub new { 1364sub new {
1258 my ($class, %arg) = @_; 1365 my ($class, %arg) = @_;
1259 1366
1260 my $self = $class->SUPER::new ( 1367 my $self = $class->SUPER::new (
1261 bg => [1, 1, 1, 1], 1368 bg => [1, 1, 1, 1],
… …
1429 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1536 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1430 1537
1431 my $border = $self->border; 1538 my $border = $self->border;
1432 1539
1433 glColor @{ $self->{border_bg} }; 1540 glColor @{ $self->{border_bg} };
1434 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1541 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1435 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1542 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1436 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1543 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1437 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1544 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1545
1546 # move
1547 my $w2 = ($w - $border) * .5;
1548 my $h2 = ($h - $border) * .5;
1549 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1550 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1551 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1552
1553 # resize
1554 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1556 unless $self->{has_close_button};
1557 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1558 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1438 1559
1439 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1560 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1440 glColor @{ $self->{bg} }; 1561 glColor @{ $self->{bg} };
1441 1562
1442 # TODO: repeat texture not scale 1563 # TODO: repeat texture not scale
… …
1473 1594
1474sub new { 1595sub new {
1475 my $class = shift; 1596 my $class = shift;
1476 1597
1477 $class->SUPER::new ( 1598 $class->SUPER::new (
1599 children => [],
1478 col_expand => [], 1600 col_expand => [],
1601 row_expand => [],
1479 @_, 1602 @_,
1480 ) 1603 )
1481} 1604}
1482 1605
1483sub children { 1606sub children {
1484 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1485} 1608}
1486 1609
1610# TODO: store row/col info in child widget and use standard add/del
1487sub add { 1611sub add {
1488 my ($self) = shift; 1612 my ($self) = shift;
1489 1613
1490 while (@_) { 1614 while (@_) {
1491 my ($x, $y, $child) = splice @_, 0, 3, (); 1615 my ($x, $y, $child) = splice @_, 0, 3, ();
1492 $child->set_parent ($self); 1616 $child->set_parent ($self);
1493 $self->{children}[$y][$x] = $child; 1617 $self->{children}[$y][$x] = $child;
1494 } 1618 }
1495 1619
1496 $self->{force_realloc} = 1; 1620 $self->{force_realloc} = 1;
1497 $self->{force_size_alloc} = 1; 1621 $self->{force_size_alloc} = 1;
1498 $self->realloc; 1622 $self->realloc;
1499} 1623}
1500 1624
1501sub remove { 1625sub remove {
1502 my ($self, $child) = @_; 1626 my ($self, $child) = @_;
1503 1627
1504 # TODO: not yet implemented 1628 for (@{ $self->{children} }) {
1629 for (@{ $_ || [] }) {
1630 $_ = undef if $_ == $child;
1631 }
1632 }
1505} 1633}
1506 1634
1507# TODO: move to container class maybe? send children a signal on removal? 1635# TODO: move to container class maybe? send children a signal on removal?
1508sub clear { 1636sub clear {
1509 my ($self) = @_; 1637 my ($self) = @_;
… …
1558 my ($ws, $hs) = $self->get_wh; 1686 my ($ws, $hs) = $self->get_wh;
1559 1687
1560 my $req_w = (sum @$ws) || 1; 1688 my $req_w = (sum @$ws) || 1;
1561 my $req_h = (sum @$hs) || 1; 1689 my $req_h = (sum @$hs) || 1;
1562 1690
1563 # TODO: nicer code && do row_expand 1691 # TODO: nicer code
1564 my @col_expand = @{$self->{col_expand}}; 1692 my @col_expand = @{$self->{col_expand}};
1565 @col_expand = (1) x @$ws unless @col_expand; 1693 @col_expand = (1) x @$ws unless @col_expand;
1566 my $col_expand = (sum @col_expand) || 1; 1694 my $col_expand = (sum @col_expand) || 1;
1567 1695
1568 # linearly scale sizes
1569 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1696 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1570 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1571 1697
1572 CFPlus::UI::harmonize $ws; 1698 CFPlus::UI::harmonize $ws;
1699
1700 my @row_expand = @{$self->{row_expand}};
1701 @row_expand = (1) x @$ws unless @row_expand;
1702 my $row_expand = (sum @row_expand) || 1;
1703
1704 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1705
1573 CFPlus::UI::harmonize $hs; 1706 CFPlus::UI::harmonize $hs;
1574 1707
1575 my $y; 1708 my $y;
1576 1709
1577 for my $r (0 .. $#{$self->{children}}) { 1710 for my $r (0 .. $#{$self->{children}}) {
… …
1617 my ($self) = @_; 1750 my ($self) = @_;
1618 1751
1619 for (grep $_, @{$self->{children}}) { 1752 for (grep $_, @{$self->{children}}) {
1620 $_->draw for grep $_, @$_; 1753 $_->draw for grep $_, @$_;
1621 } 1754 }
1755}
1756
1757#############################################################################
1758
1759package CFPlus::UI::Fixed;
1760
1761use List::Util qw(min max);
1762
1763our @ISA = CFPlus::UI::Container::;
1764
1765sub add {
1766 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1767
1768 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1769 $self->SUPER::add ($child);
1770}
1771
1772sub _scale($$$) {
1773 my ($mode, $val, $max) = @_;
1774
1775 $mode eq "abs" ? $val
1776 : $mode eq "rel" ? $val * $max
1777 : 0
1778}
1779
1780sub size_request {
1781 my ($self) = @_;
1782
1783 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1784
1785 # determine overall size by querying abs widgets
1786 for my $child ($self->visible_children) {
1787 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1788
1789 if ($pos eq "abs") {
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 # now layout remaining widgets
1802 for my $child ($self->visible_children) {
1803 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1804
1805 if ($pos ne "abs") {
1806 $x = _scale $pos, $x, $W;
1807 $y = _scale $pos, $x, $H;
1808 $w = _scale $size, $w, $child->{req_w};
1809 $h = _scale $size, $h, $child->{req_h};
1810
1811 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1812 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1813 }
1814 }
1815
1816 my $W = $x2 - $x1;
1817 my $H = $y2 - $y1;
1818
1819 ($W, $H)
1820}
1821
1822sub invoke_size_allocate {
1823 my ($self, $W, $H) = @_;
1824
1825 for my $child ($self->visible_children) {
1826 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1827
1828 $x = _scale $pos, $x, $W;
1829 $y = _scale $pos, $x, $H;
1830 $w = _scale $size, $w, $child->{req_w};
1831 $h = _scale $size, $h, $child->{req_h};
1832
1833 $child->configure ($x, $y, $w, $h);
1834 }
1835
1836 1
1622} 1837}
1623 1838
1624############################################################################# 1839#############################################################################
1625 1840
1626package CFPlus::UI::Box; 1841package CFPlus::UI::Box;
… …
1966 my $mod = $ev->{mod}; 2181 my $mod = $ev->{mod};
1967 my $sym = $ev->{sym}; 2182 my $sym = $ev->{sym};
1968 my $uni = $ev->{unicode}; 2183 my $uni = $ev->{unicode};
1969 2184
1970 my $text = $self->get_text; 2185 my $text = $self->get_text;
2186
2187 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1971 2188
1972 if ($uni == 8) { 2189 if ($uni == 8) {
1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2190 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974 } elsif ($uni == 127) { 2191 } elsif ($uni == 127) {
1975 substr $text, $self->{cursor}, 1, ""; 2192 substr $text, $self->{cursor}, 1, "";
… …
2182 2399
2183use CFPlus::OpenGL; 2400use CFPlus::OpenGL;
2184 2401
2185my @tex = 2402my @tex =
2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2403 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187 qw(b1_button_active.png); 2404 qw(b1_button_inactive.png b1_button_active.png);
2188 2405
2189sub new { 2406sub new {
2190 my $class = shift; 2407 my $class = shift;
2191 2408
2192 $class->SUPER::new ( 2409 $class->SUPER::new (
2193 padding_x => 4, 2410 padding_x => 4,
2194 padding_y => 4, 2411 padding_y => 4,
2195 fg => [1, 1, 1], 2412 fg => [1.0, 1.0, 1.0],
2196 active_fg => [0, 0, 1], 2413 active_fg => [0.8, 0.8, 0.8],
2197 can_hover => 1, 2414 can_hover => 1,
2198 align => 0, 2415 align => 0,
2199 valign => 0, 2416 valign => 0,
2200 can_events => 1, 2417 can_events => 1,
2201 @_ 2418 @_
… …
2219 2436
2220 glEnable GL_TEXTURE_2D; 2437 glEnable GL_TEXTURE_2D;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2438 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222 glColor 0, 0, 0, 1; 2439 glColor 0, 0, 0, 1;
2223 2440
2441 my $tex = $tex[$GRAB == $self];
2224 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2442 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2225 2443
2226 glDisable GL_TEXTURE_2D; 2444 glDisable GL_TEXTURE_2D;
2227 2445
2228 $self->SUPER::_draw; 2446 $self->SUPER::_draw;
2229} 2447}
… …
3284 3502
3285sub new { 3503sub new {
3286 my $class = shift; 3504 my $class = shift;
3287 3505
3288 my $self = $class->SUPER::new ( 3506 my $self = $class->SUPER::new (
3507 size_w => 32,
3508 size_h => 8,
3289 aspect => 1, 3509 aspect => 1,
3290 can_events => 0, 3510 can_events => 0,
3291 @_, 3511 @_,
3292 ); 3512 );
3293 3513
3294 if ($self->{anim} && $self->{animspeed}) { 3514 if ($self->{anim} && $self->{animspeed}) {
3295 CFPlus::weaken (my $widget = $self); 3515 CFPlus::weaken (my $widget = $self);
3296 3516
3517 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3518 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3297 $self->{timer} = Event->timer ( 3519 $self->{timer} = Event->timer (
3298 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3299 hard => 1, 3520 parked => 1,
3300 interval => $self->{animspeed},
3301 cb => sub { 3521 cb => sub {
3522 return unless $::CONN && $widget;
3523
3302 ++$widget->{frame}; 3524 ++$widget->{frame};
3525 $widget->update_face;
3303 $widget->update; 3526 $widget->update;
3527
3528 $widget->update_timer;
3304 }, 3529 },
3305 ); 3530 );
3531
3532 $self->update_face;
3533 $self->update_timer;
3306 } 3534 }
3307 3535
3308 $self 3536 $self
3309} 3537}
3310 3538
3539sub update_timer {
3540 my ($self) = @_;
3541
3542 return unless $self->{timer};
3543
3544 if ($self->{visible}) {
3545 $self->{timer}->at (
3546 $self->{anim_start}
3547 + $self->{animspeed}
3548 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3549 );
3550 $self->{timer}->start;
3551 } else {
3552 $self->{timer}->stop;
3553 }
3554}
3555
3556sub update_face {
3557 my ($self) = @_;
3558
3559 return unless $::CONN;
3560
3561 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3562 if ($anim && @$anim) {
3563 delete $self->{wait_face};
3564 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3565 }
3566 }
3567}
3568
3311sub size_request { 3569sub size_request {
3312 (32, 8) 3570 my ($self) = @_;
3571
3572 if ($::CONN) {
3573 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3574 if (my $tex = $::CONN->{texture}[$faceid]) {
3575 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3576 } else {
3577 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3578 $self->realloc;
3579 });
3580 }
3581 }
3582 }
3583
3584 ($self->{size_w} || 8, $self->{size_h} || 8)
3313} 3585}
3314 3586
3315sub update { 3587sub update {
3316 my ($self) = @_; 3588 my ($self) = @_;
3317 3589
3318 return unless $self->{visible}; 3590 return unless $self->{visible};
3319 3591
3320 $self->SUPER::update; 3592 $self->SUPER::update;
3321} 3593}
3322 3594
3595sub invoke_visibility_change {
3596 my ($self) = @_;
3597
3598 $self->update_timer;
3599
3600 0
3601}
3602
3323sub _draw { 3603sub _draw {
3324 my ($self) = @_; 3604 my ($self) = @_;
3325 3605
3326 return unless $::CONN; 3606 return unless $::CONN;
3327 3607
3328 $self->SUPER::_draw; 3608 $self->SUPER::_draw;
3329 3609
3330 my $face;
3331
3332 if ($self->{frame}) {
3333 my $anim = $::CONN->{anim}[$self->{anim}]; 3610 my $faceid = $::CONN->{faceid}[$self->{face}]
3334 3611 or return;
3335 $face = $anim->[ $self->{frame} % @$anim ]
3336 if $anim && @$anim;
3337 }
3338 3612
3339 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3613 my $tex = $::CONN->{texture}[$faceid];
3340 3614
3341 if ($tex) { 3615 if ($tex) {
3342 glEnable GL_TEXTURE_2D; 3616 glEnable GL_TEXTURE_2D;
3343 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3344 glColor 0, 0, 0, 1; 3618 glColor 0, 0, 0, 1;
… …
3348} 3622}
3349 3623
3350sub destroy { 3624sub destroy {
3351 my ($self) = @_; 3625 my ($self) = @_;
3352 3626
3353 $self->{timer}->cancel 3627 (delete $self->{timer})->cancel
3354 if $self->{timer}; 3628 if $self->{timer};
3355 3629
3356 $self->SUPER::destroy; 3630 $self->SUPER::destroy;
3357} 3631}
3358 3632
… …
4002 while ($self->{post_alloc_hook}) { 4276 while ($self->{post_alloc_hook}) {
4003 $_->() 4277 $_->()
4004 for values %{delete $self->{post_alloc_hook}}; 4278 for values %{delete $self->{post_alloc_hook}};
4005 } 4279 }
4006 4280
4007
4008 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4281 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4009 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4282 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4010 glClear GL_COLOR_BUFFER_BIT; 4283 glClear GL_COLOR_BUFFER_BIT;
4011 4284
4012 glMatrixMode GL_PROJECTION; 4285 glMatrixMode GL_PROJECTION;

Diff Legend

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