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.375 by root, Mon Jul 16 20:12:19 2007 UTC vs.
Revision 1.396 by root, Sat Jul 21 14:00:02 2007 UTC

… …
113 } 113 }
114 114
115 if ($GRAB) { 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 117 # mousewheel
118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9; 118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
120 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
121 } else { 125 } else {
122 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
123 } 127 }
124 } 128 }
… …
547 551
548 # parent 552 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 554}
551 555
552sub find_widget { 556#sub find_widget {
553 my ($self, $x, $y) = @_; 557# in .xs
554
555 return () unless $self->{can_events};
556
557 return $self
558 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561 ()
562}
563 558
564sub set_parent { 559sub set_parent {
565 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
566 561
567 CFPlus::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
… …
746 can_events => 0, 741 can_events => 0,
747 %arg, 742 %arg,
748 ); 743 );
749 744
750 $self->add (@$children) 745 $self->add (@$children)
751 if $children; 746 if $children && @$children;
752 747
753 $self 748 $self
754} 749}
755 750
756sub realloc { 751sub realloc {
… …
765 my ($self, @widgets) = @_; 760 my ($self, @widgets) = @_;
766 761
767 $_->set_parent ($self) 762 $_->set_parent ($self)
768 for @widgets; 763 for @widgets;
769 764
765 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 766 use sort 'stable';
771 767
772 $self->{children} = [ 768 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 769 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 770 @{$self->{children}}, @widgets
… …
793} 789}
794 790
795sub clear { 791sub clear {
796 my ($self) = @_; 792 my ($self) = @_;
797 793
798 my $children = delete $self->{children}; 794 my $children = $self->{children};
799 $self->{children} = []; 795 $self->{children} = [];
800 796
801 for (@$children) { 797 for (@$children) {
802 delete $_->{parent}; 798 delete $_->{parent};
803 $_->hide; 799 $_->hide;
… …
963sub size_request { 959sub size_request {
964 my ($self) = @_; 960 my ($self) = @_;
965 961
966 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967 963
968 $w = 10 if $self->{scroll_x}; 964 $w = 1 if $self->{scroll_x};
969 $h = 10 if $self->{scroll_y}; 965 $h = 1 if $self->{scroll_y};
970 966
971 ($w, $h) 967 ($w, $h)
972} 968}
973 969
974sub invoke_size_allocate { 970sub invoke_size_allocate {
… …
986} 982}
987 983
988sub set_offset { 984sub set_offset {
989 my ($self, $x, $y) = @_; 985 my ($self, $x, $y) = @_;
990 986
991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x; 987 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y; 988 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993 989
990 if ($x != $self->{view_x} or $y != $self->{view_y}) {
991 $self->{view_x} = $x;
992 $self->{view_y} = $y;
993
994 $self->emit (changed => $x, $y);
994 $self->update; 995 $self->update;
996 }
995} 997}
996 998
997# hmm, this does not work for topleft of $self... but we should not ask for that 999# hmm, this does not work for topleft of $self... but we should not ask for that
998sub coord2local { 1000sub coord2local {
999 my ($self, $x, $y) = @_; 1001 my ($self, $x, $y) = @_;
… …
1014 my ($self, $x, $y) = @_; 1016 my ($self, $x, $y) = @_;
1015 1017
1016 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1018 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1017 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1019 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1018 ) { 1020 ) {
1019 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1021 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1020 } else { 1022 } else {
1021 $self->CFPlus::UI::Base::find_widget ($x, $y) 1023 $self->CFPlus::UI::Base::find_widget ($x, $y)
1022 } 1024 }
1023} 1025}
1024 1026
… …
1045 my $child = delete $arg{child}; 1047 my $child = delete $arg{child};
1046 1048
1047 my $self; 1049 my $self;
1048 1050
1049 my $hslider = new CFPlus::UI::Slider 1051 my $hslider = new CFPlus::UI::Slider
1052 col => 0,
1053 row => 1,
1050 vertical => 0, 1054 vertical => 0,
1051 range => [0, 0, 1, 0.01], # HACK fix 1055 range => [0, 0, 1, 0.01], # HACK fix
1052 on_changed => sub { 1056 on_changed => sub {
1053 $self->{hpos} = $_[1]; 1057 $self->{hpos} = $_[1];
1054 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1055 }, 1059 },
1056 ; 1060 ;
1057 1061
1058 my $vslider = new CFPlus::UI::Slider 1062 my $vslider = new CFPlus::UI::Slider
1063 col => 1,
1064 row => 0,
1059 vertical => 1, 1065 vertical => 1,
1060 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1061 on_changed => sub { 1067 on_changed => sub {
1062 $self->{vpos} = $_[1]; 1068 $self->{vpos} = $_[1];
1063 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1074 row_expand => [1, 0], 1080 row_expand => [1, 0],
1075 %arg, 1081 %arg,
1076 ); 1082 );
1077 1083
1078 $self->{vp} = new CFPlus::UI::ViewPort 1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0,
1086 row => 0,
1079 expand => 1, 1087 expand => 1,
1080 scroll_x => $self->{scroll_x}, 1088 scroll_x => $self->{scroll_x},
1081 scroll_y => $self->{scroll_y}, 1089 scroll_y => $self->{scroll_y},
1090 on_changed => sub {
1091 my ($vp, $x, $y) = @_;
1092
1093 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y);
1095
1096 0
1097 },
1082 ; 1098 ;
1083 1099
1084 $self->SUPER::add (0, 0, $self->{vp}); 1100 $self->SUPER::add ($self->{vp});
1085 1101
1086 $self->add ($child) if $child; 1102 $self->add ($child) if $child;
1087 1103
1088 $self 1104 $self
1089} 1105}
1090
1091#TODO# update range on size_allocate depending on child
1092 1106
1093sub add { 1107sub add {
1094 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1095 1109
1096 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
… …
1103 1117
1104 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1105 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1106 1120
1107 my $visible = $w1 > $w2; 1121 my $visible = $w1 > $w2;
1108 if ($visible != $self->{hslider}{visible}) { 1122 if ($visible != $self->{hslider_visible}) {
1123 $self->{hslider_visible} = $visible;
1109 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1124 $visible ? $self->SUPER::add ($self->{hslider})
1110 : $self->{hslider}->hide; 1125 : $self->SUPER::remove ($self->{hslider});
1111 } 1126 }
1112 1127
1113 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1128 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1114 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1129 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1115 1130
1116 my $visible = $h1 > $h2; 1131 my $visible = $h1 > $h2;
1117 if ($visible != $self->{vslider}{visible}) { 1132 if ($visible != $self->{vslider_visible}) {
1133 $self->{vslider_visible} = $visible;
1118 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1134 $visible ? $self->SUPER::add ($self->{vslider})
1119 : $self->{vslider}->hide; 1135 : $self->SUPER::remove ($self->{vslider});
1136 }
1137}
1138
1139
1140sub start_dragging {
1141 my ($self, $ev) = @_;
1142
1143 $self->grab_focus;
1144
1145 my $ox = $self->{vp}{view_x};
1146 my $oy = $self->{vp}{view_y};
1147
1148 $self->{motion} = sub {
1149 my ($ev, $x, $y) = @_;
1150
1151 $ox -= $ev->{xrel};
1152 $oy -= $ev->{yrel};
1153
1154 $self->{vp}->set_offset ($ox, $oy);
1120 } 1155 };
1121}
1122
1123sub update {
1124 my ($self) = @_;
1125
1126 $self->SUPER::update;
1127 $self->update_slider;
1128} 1156}
1129 1157
1130sub invoke_mouse_wheel { 1158sub invoke_mouse_wheel {
1131 my ($self, $ev) = @_; 1159 my ($self, $ev) = @_;
1132 1160
1133 return 0 unless $ev->{dy}; # only vertical movements for now
1134
1135 $self->{vslider}->emit (mouse_wheel => $ev); 1161 $self->{vslider}->emit (mouse_wheel => $ev)
1162 if $ev->{dy};
1163
1164 $self->{hslider}->emit (mouse_wheel => $ev)
1165 if $ev->{dx};
1136 1166
1137 1 1167 1
1138} 1168}
1139 1169
1140sub invoke_button_down { 1170sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1171 my ($self, $ev, $x, $y) = @_;
1142 1172
1143 if ($ev->{button} == 2) { 1173 if ($ev->{button} == 2) {
1144 $self->grab_focus; 1174 $self->start_dragging ($ev);
1145
1146 $self->{motion} = sub {
1147 my ($ev, $x, $y) = @_;
1148
1149 $self->{vp}->set_offset (
1150 $self->{vp}{view_x} - $ev->{xrel},
1151 $self->{vp}{view_y} - $ev->{yrel},
1152 );
1153 };
1154 1175
1155 return 1; 1176 return 1;
1156 } 1177 }
1157 1178
1158 0 1179 0
… …
1340 1361
1341my @border = 1362my @border =
1342 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1343 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1364 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1344 1365
1366my @icon =
1367 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1368 qw(x1_move.png x1_resize.png);
1369
1345sub new { 1370sub new {
1346 my ($class, %arg) = @_; 1371 my ($class, %arg) = @_;
1347 1372
1348 my $self = $class->SUPER::new ( 1373 my $self = $class->SUPER::new (
1349 bg => [1, 1, 1, 1], 1374 bg => [1, 1, 1, 1],
… …
1517 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1542 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1518 1543
1519 my $border = $self->border; 1544 my $border = $self->border;
1520 1545
1521 glColor @{ $self->{border_bg} }; 1546 glColor @{ $self->{border_bg} };
1522 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1547 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1523 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1548 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1524 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1549 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1525 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1550 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1551
1552 # move
1553 my $w2 = ($w - $border) * .5;
1554 my $h2 = ($h - $border) * .5;
1555 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1556 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1557 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1558
1559 # resize
1560 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1561 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1562 unless $self->{has_close_button};
1563 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1564 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1526 1565
1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1566 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1528 glColor @{ $self->{bg} }; 1567 glColor @{ $self->{bg} };
1529 1568
1530 # TODO: repeat texture not scale 1569 # TODO: repeat texture not scale
… …
1551 1590
1552############################################################################# 1591#############################################################################
1553 1592
1554package CFPlus::UI::Table; 1593package CFPlus::UI::Table;
1555 1594
1556our @ISA = CFPlus::UI::Base::; 1595our @ISA = CFPlus::UI::Container::;
1557 1596
1558use List::Util qw(max sum); 1597use List::Util qw(max sum);
1559 1598
1560use CFPlus::OpenGL; 1599use CFPlus::OpenGL;
1561 1600
1562sub new { 1601sub new {
1563 my $class = shift; 1602 my $class = shift;
1564 1603
1565 $class->SUPER::new ( 1604 $class->SUPER::new (
1566 children => [],
1567 col_expand => [], 1605 col_expand => [],
1568 row_expand => [], 1606 row_expand => [],
1569 @_, 1607 @_,
1570 ) 1608 )
1571} 1609}
1572 1610
1573sub children {
1574 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1575}
1576
1577# TODO: store row/col info in child widget and use standard add/del
1578sub add { 1611sub add {
1612 my ($self, @widgets) = @_;
1613
1614 for my $child (@widgets) {
1615 $child->{rowspan} ||= 1;
1616 $child->{colspan} ||= 1;
1617 }
1618
1619 $self->SUPER::add (@widgets);
1620}
1621
1622sub add_at {
1579 my ($self) = shift; 1623 my $self = shift;
1624
1625 my @widgets;
1580 1626
1581 while (@_) { 1627 while (@_) {
1582 my ($x, $y, $child) = splice @_, 0, 3, (); 1628 my ($col, $row, $child) = splice @_, 0, 3, ();
1583 $child->set_parent ($self);
1584 $self->{children}[$y][$x] = $child;
1585 }
1586 1629
1587 $self->{force_realloc} = 1; 1630 $child->{row} = $row;
1588 $self->{force_size_alloc} = 1; 1631 $child->{col} = $col;
1589 $self->realloc;
1590}
1591 1632
1592sub remove { 1633 push @widgets, $child;
1634 }
1635
1636 $self->add (@widgets);
1637}
1638
1639sub get_wh {
1593 my ($self, $child) = @_; 1640 my ($self) = @_;
1594 1641
1595 for (@{ $self->{children} }) { 1642 my (@w, @h);
1596 for (@{ $_ || [] }) { 1643
1597 $_ = undef if $_ == $child; 1644 my @children = $self->children;
1645
1646 # first pass, columns
1647 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1648 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1649
1650 my $sw = sum @w[$c .. $c + $cs - 1];
1651
1652 if ($w > $sw) {
1653 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1598 } 1654 }
1599 } 1655 }
1600}
1601 1656
1602# TODO: move to container class maybe? send children a signal on removal? 1657 # second pass, rows
1603sub clear { 1658 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1604 my ($self) = @_;
1605
1606 my @children = $self->children;
1607 delete $self->{children};
1608
1609 for (@children) {
1610 delete $_->{parent};
1611 $_->hide;
1612 }
1613
1614 $self->realloc;
1615}
1616
1617sub get_wh {
1618 my ($self) = @_;
1619
1620 my (@w, @h);
1621
1622 for my $y (0 .. $#{$self->{children}}) {
1623 my $row = $self->{children}[$y]
1624 or next;
1625
1626 for my $x (0 .. $#$row) {
1627 my $widget = $row->[$x]
1628 or next;
1629 my ($w, $h) = @$widget{qw(req_w req_h)}; 1659 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1630 1660
1631 $w[$x] = max $w[$x], $w; 1661 my $sh = sum @h[$r .. $r + $rs - 1];
1632 $h[$y] = max $h[$y], $h; 1662
1663 if ($h > $sh) {
1664 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1633 } 1665 }
1634 } 1666 }
1635 1667
1636 (\@w, \@h) 1668 (\@w, \@h)
1637} 1669}
… …
1653 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1654 1686
1655 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1656 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1657 1689
1658 # TODO: nicer code 1690 # now linearly scale the rows/columns to the allocated size
1659 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1660 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1661 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1662 1694
1663 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1670 1702
1671 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1672 1704
1673 CFPlus::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1674 1706
1675 my $y; 1707 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1708 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1676 1709
1677 for my $r (0 .. $#{$self->{children}}) { 1710 for my $widget ($self->children) {
1678 my $row = $self->{children}[$r] 1711 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1679 or next;
1680 1712
1681 my $x = 0; 1713 $widget->configure (
1682 my $row_h = $hs->[$r]; 1714 $x[$c], $y[$r],
1715 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1683 1716 );
1684 for my $c (0 .. $#$row) {
1685 my $col_w = $ws->[$c];
1686
1687 if (my $widget = $row->[$c]) {
1688 $widget->configure ($x, $y, $col_w, $row_h);
1689 }
1690
1691 $x += $col_w;
1692 }
1693
1694 $y += $row_h;
1695 } 1717 }
1696 1718
1697 1 1719 1
1698}
1699
1700sub find_widget {
1701 my ($self, $x, $y) = @_;
1702
1703 $x -= $self->{x};
1704 $y -= $self->{y};
1705
1706 my $res;
1707
1708 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1709 $res = $_->find_widget ($x, $y)
1710 and return $res;
1711 }
1712
1713 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1714}
1715
1716sub _draw {
1717 my ($self) = @_;
1718
1719 for (grep $_, @{$self->{children}}) {
1720 $_->draw for grep $_, @$_;
1721 }
1722} 1720}
1723 1721
1724############################################################################# 1722#############################################################################
1725 1723
1726package CFPlus::UI::Fixed; 1724package CFPlus::UI::Fixed;
… …
2366 2364
2367use CFPlus::OpenGL; 2365use CFPlus::OpenGL;
2368 2366
2369my @tex = 2367my @tex =
2370 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2368 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2371 qw(b1_button_active.png); 2369 qw(b1_button_inactive.png b1_button_active.png);
2372 2370
2373sub new { 2371sub new {
2374 my $class = shift; 2372 my $class = shift;
2375 2373
2376 $class->SUPER::new ( 2374 $class->SUPER::new (
2377 padding_x => 4, 2375 padding_x => 4,
2378 padding_y => 4, 2376 padding_y => 4,
2379 fg => [1, 1, 1], 2377 fg => [1.0, 1.0, 1.0],
2380 active_fg => [0, 0, 1], 2378 active_fg => [0.8, 0.8, 0.8],
2381 can_hover => 1, 2379 can_hover => 1,
2382 align => 0, 2380 align => 0,
2383 valign => 0, 2381 valign => 0,
2384 can_events => 1, 2382 can_events => 1,
2385 @_ 2383 @_
… …
2403 2401
2404 glEnable GL_TEXTURE_2D; 2402 glEnable GL_TEXTURE_2D;
2405 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2403 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2406 glColor 0, 0, 0, 1; 2404 glColor 0, 0, 0, 1;
2407 2405
2406 my $tex = $tex[$GRAB == $self];
2408 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2407 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2409 2408
2410 glDisable GL_TEXTURE_2D; 2409 glDisable GL_TEXTURE_2D;
2411 2410
2412 $self->SUPER::_draw; 2411 $self->SUPER::_draw;
2413} 2412}
… …
3478 ); 3477 );
3479 3478
3480 if ($self->{anim} && $self->{animspeed}) { 3479 if ($self->{anim} && $self->{animspeed}) {
3481 CFPlus::weaken (my $widget = $self); 3480 CFPlus::weaken (my $widget = $self);
3482 3481
3482 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3483 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3483 $self->{timer} = Event->timer ( 3484 $self->{timer} = Event->timer (
3484 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3485 hard => 1, 3485 parked => 1,
3486 interval => $self->{animspeed},
3487 cb => sub { 3486 cb => sub {
3488 return unless $::CONN; 3487 return unless $::CONN && $widget;
3489 3488
3490 ++$widget->{frame}; 3489 ++$widget->{frame};
3491 $self->update_face; 3490 $widget->update_face;
3492 $self->update; 3491 $widget->update;
3492
3493 $widget->update_timer;
3493 }, 3494 },
3494 ); 3495 );
3495 3496
3496 $self->update_face; 3497 $self->update_face;
3498 $self->update_timer;
3497 } 3499 }
3498 3500
3499 $self 3501 $self
3502}
3503
3504sub update_timer {
3505 my ($self) = @_;
3506
3507 return unless $self->{timer};
3508
3509 if ($self->{visible}) {
3510 $self->{timer}->at (
3511 $self->{anim_start}
3512 + $self->{animspeed}
3513 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3514 );
3515 $self->{timer}->start;
3516 } else {
3517 $self->{timer}->stop;
3518 }
3500} 3519}
3501 3520
3502sub update_face { 3521sub update_face {
3503 my ($self) = @_; 3522 my ($self) = @_;
3504 3523
… …
3536 return unless $self->{visible}; 3555 return unless $self->{visible};
3537 3556
3538 $self->SUPER::update; 3557 $self->SUPER::update;
3539} 3558}
3540 3559
3560sub invoke_visibility_change {
3561 my ($self) = @_;
3562
3563 $self->update_timer;
3564
3565 0
3566}
3567
3541sub _draw { 3568sub _draw {
3542 my ($self) = @_; 3569 my ($self) = @_;
3543 3570
3544 return unless $::CONN; 3571 return unless $::CONN;
3545 3572
… …
3560} 3587}
3561 3588
3562sub destroy { 3589sub destroy {
3563 my ($self) = @_; 3590 my ($self) = @_;
3564 3591
3565 $self->{timer}->cancel 3592 (delete $self->{timer})->cancel
3566 if $self->{timer}; 3593 if $self->{timer};
3567 3594
3568 $self->SUPER::destroy; 3595 $self->SUPER::destroy;
3569} 3596}
3570 3597
… …
4214 while ($self->{post_alloc_hook}) { 4241 while ($self->{post_alloc_hook}) {
4215 $_->() 4242 $_->()
4216 for values %{delete $self->{post_alloc_hook}}; 4243 for values %{delete $self->{post_alloc_hook}};
4217 } 4244 }
4218 4245
4219
4220 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4246 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4221 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4247 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4222 glClear GL_COLOR_BUFFER_BIT; 4248 glClear GL_COLOR_BUFFER_BIT;
4223 4249
4224 glMatrixMode GL_PROJECTION; 4250 glMatrixMode GL_PROJECTION;

Diff Legend

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