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.376 by root, Mon Jul 16 20:20:23 2007 UTC vs.
Revision 1.397 by root, Sat Jul 21 14:01:35 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
994 $self->emit (changed => $self->{view_x}, $self->{view_y}); 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);
995 $self->update; 995 $self->update;
996 }
996} 997}
997 998
998# 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
999sub coord2local { 1000sub coord2local {
1000 my ($self, $x, $y) = @_; 1001 my ($self, $x, $y) = @_;
… …
1015 my ($self, $x, $y) = @_; 1016 my ($self, $x, $y) = @_;
1016 1017
1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1018 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1019 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1019 ) { 1020 ) {
1020 $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})
1021 } else { 1022 } else {
1022 $self->CFPlus::UI::Base::find_widget ($x, $y) 1023 $self->CFPlus::UI::Base::find_widget ($x, $y)
1023 } 1024 }
1024} 1025}
1025 1026
… …
1046 my $child = delete $arg{child}; 1047 my $child = delete $arg{child};
1047 1048
1048 my $self; 1049 my $self;
1049 1050
1050 my $hslider = new CFPlus::UI::Slider 1051 my $hslider = new CFPlus::UI::Slider
1052 col => 0,
1053 row => 1,
1051 vertical => 0, 1054 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix 1055 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub { 1056 on_changed => sub {
1054 $self->{hpos} = $_[1]; 1057 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 }, 1059 },
1057 ; 1060 ;
1058 1061
1059 my $vslider = new CFPlus::UI::Slider 1062 my $vslider = new CFPlus::UI::Slider
1063 col => 1,
1064 row => 0,
1060 vertical => 1, 1065 vertical => 1,
1061 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1062 on_changed => sub { 1067 on_changed => sub {
1063 $self->{vpos} = $_[1]; 1068 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1075 row_expand => [1, 0], 1080 row_expand => [1, 0],
1076 %arg, 1081 %arg,
1077 ); 1082 );
1078 1083
1079 $self->{vp} = new CFPlus::UI::ViewPort 1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0,
1086 row => 0,
1080 expand => 1, 1087 expand => 1,
1081 scroll_x => $self->{scroll_x}, 1088 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y}, 1089 scroll_y => $self->{scroll_y},
1083 on_changed => sub { 1090 on_changed => sub {
1084 my ($vp, $x, $y) = @_; 1091 my ($vp, $x, $y) = @_;
1092
1085 $vp->{parent}{hslider}->set_value ($x); 1093 $vp->{parent}{hslider}->set_value ($x);
1086 $vp->{parent}{vslider}->set_value ($y); 1094 $vp->{parent}{vslider}->set_value ($y);
1087 1095
1088 0 1096 0
1089 }, 1097 },
1090 ; 1098 ;
1091 1099
1092 $self->SUPER::add (0, 0, $self->{vp}); 1100 $self->SUPER::add ($self->{vp});
1093 1101
1094 $self->add ($child) if $child; 1102 $self->add ($child) if $child;
1095 1103
1096 $self 1104 $self
1097} 1105}
1098
1099#TODO# update range on size_allocate depending on child
1100 1106
1101sub add { 1107sub add {
1102 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1103 1109
1104 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
… …
1111 1117
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $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]);
1114 1120
1115 my $visible = $w1 > $w2; 1121 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) { 1122 if ($visible != $self->{hslider_visible}) {
1123 $self->{hslider_visible} = $visible;
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1124 $visible ? $self->SUPER::add ($self->{hslider})
1118 : $self->{hslider}->hide; 1125 : $self->SUPER::remove ($self->{hslider});
1119 } 1126 }
1120 1127
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1128 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $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]);
1123 1130
1124 my $visible = $h1 > $h2; 1131 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) { 1132 if ($visible != $self->{vslider_visible}) {
1133 $self->{vslider_visible} = $visible;
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1134 $visible ? $self->SUPER::add ($self->{vslider})
1127 : $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);
1128 } 1155 };
1129}
1130
1131sub update {
1132 my ($self) = @_;
1133
1134 $self->SUPER::update;
1135 $self->update_slider;
1136} 1156}
1137 1157
1138sub invoke_mouse_wheel { 1158sub invoke_mouse_wheel {
1139 my ($self, $ev) = @_; 1159 my ($self, $ev) = @_;
1140 1160
1141 return 0 unless $ev->{dy}; # only vertical movements for now
1142
1143 $self->{vslider}->emit (mouse_wheel => $ev); 1161 $self->{vslider}->emit (mouse_wheel => $ev);
1162 $self->{hslider}->emit (mouse_wheel => $ev);
1144 1163
1145 1 1164 1
1146} 1165}
1147 1166
1148sub invoke_button_down { 1167sub invoke_button_down {
1149 my ($self, $ev, $x, $y) = @_; 1168 my ($self, $ev, $x, $y) = @_;
1150 1169
1151 if ($ev->{button} == 2) { 1170 $self->start_dragging ($ev);
1152 $self->grab_focus;
1153 1171
1154 my $ox = $self->{vp}{view_x} + $ev->{x};
1155 my $oy = $self->{vp}{view_y} + $ev->{y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1159
1160 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1161 $self->update;
1162 };
1163
1164 return 1;
1165 } 1172 1
1166
1167 0
1168} 1173}
1169 1174
1170sub invoke_button_up { 1175sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_; 1176 my ($self, $ev, $x, $y) = @_;
1172 1177
… …
1349 1354
1350my @border = 1355my @border =
1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1356 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1357 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1353 1358
1359my @icon =
1360 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1361 qw(x1_move.png x1_resize.png);
1362
1354sub new { 1363sub new {
1355 my ($class, %arg) = @_; 1364 my ($class, %arg) = @_;
1356 1365
1357 my $self = $class->SUPER::new ( 1366 my $self = $class->SUPER::new (
1358 bg => [1, 1, 1, 1], 1367 bg => [1, 1, 1, 1],
… …
1526 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1535 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1527 1536
1528 my $border = $self->border; 1537 my $border = $self->border;
1529 1538
1530 glColor @{ $self->{border_bg} }; 1539 glColor @{ $self->{border_bg} };
1531 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1540 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1532 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1541 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1533 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1542 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1534 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1543 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1544
1545 # move
1546 my $w2 = ($w - $border) * .5;
1547 my $h2 = ($h - $border) * .5;
1548 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1549 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1550 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1551
1552 # resize
1553 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1554 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1555 unless $self->{has_close_button};
1556 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1557 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1535 1558
1536 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1559 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1537 glColor @{ $self->{bg} }; 1560 glColor @{ $self->{bg} };
1538 1561
1539 # TODO: repeat texture not scale 1562 # TODO: repeat texture not scale
… …
1560 1583
1561############################################################################# 1584#############################################################################
1562 1585
1563package CFPlus::UI::Table; 1586package CFPlus::UI::Table;
1564 1587
1565our @ISA = CFPlus::UI::Base::; 1588our @ISA = CFPlus::UI::Container::;
1566 1589
1567use List::Util qw(max sum); 1590use List::Util qw(max sum);
1568 1591
1569use CFPlus::OpenGL; 1592use CFPlus::OpenGL;
1570 1593
1571sub new { 1594sub new {
1572 my $class = shift; 1595 my $class = shift;
1573 1596
1574 $class->SUPER::new ( 1597 $class->SUPER::new (
1575 children => [],
1576 col_expand => [], 1598 col_expand => [],
1577 row_expand => [], 1599 row_expand => [],
1578 @_, 1600 @_,
1579 ) 1601 )
1580} 1602}
1581 1603
1582sub children {
1583 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1584}
1585
1586# TODO: store row/col info in child widget and use standard add/del
1587sub add { 1604sub add {
1605 my ($self, @widgets) = @_;
1606
1607 for my $child (@widgets) {
1608 $child->{rowspan} ||= 1;
1609 $child->{colspan} ||= 1;
1610 }
1611
1612 $self->SUPER::add (@widgets);
1613}
1614
1615sub add_at {
1588 my ($self) = shift; 1616 my $self = shift;
1617
1618 my @widgets;
1589 1619
1590 while (@_) { 1620 while (@_) {
1591 my ($x, $y, $child) = splice @_, 0, 3, (); 1621 my ($col, $row, $child) = splice @_, 0, 3, ();
1592 $child->set_parent ($self);
1593 $self->{children}[$y][$x] = $child;
1594 }
1595 1622
1596 $self->{force_realloc} = 1; 1623 $child->{row} = $row;
1597 $self->{force_size_alloc} = 1; 1624 $child->{col} = $col;
1598 $self->realloc;
1599}
1600 1625
1601sub remove { 1626 push @widgets, $child;
1627 }
1628
1629 $self->add (@widgets);
1630}
1631
1632sub get_wh {
1602 my ($self, $child) = @_; 1633 my ($self) = @_;
1603 1634
1604 for (@{ $self->{children} }) { 1635 my (@w, @h);
1605 for (@{ $_ || [] }) { 1636
1606 $_ = undef if $_ == $child; 1637 my @children = $self->children;
1638
1639 # first pass, columns
1640 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1641 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1642
1643 my $sw = sum @w[$c .. $c + $cs - 1];
1644
1645 if ($w > $sw) {
1646 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1607 } 1647 }
1608 } 1648 }
1609}
1610 1649
1611# TODO: move to container class maybe? send children a signal on removal? 1650 # second pass, rows
1612sub clear { 1651 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1613 my ($self) = @_;
1614
1615 my @children = $self->children;
1616 delete $self->{children};
1617
1618 for (@children) {
1619 delete $_->{parent};
1620 $_->hide;
1621 }
1622
1623 $self->realloc;
1624}
1625
1626sub get_wh {
1627 my ($self) = @_;
1628
1629 my (@w, @h);
1630
1631 for my $y (0 .. $#{$self->{children}}) {
1632 my $row = $self->{children}[$y]
1633 or next;
1634
1635 for my $x (0 .. $#$row) {
1636 my $widget = $row->[$x]
1637 or next;
1638 my ($w, $h) = @$widget{qw(req_w req_h)}; 1652 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1639 1653
1640 $w[$x] = max $w[$x], $w; 1654 my $sh = sum @h[$r .. $r + $rs - 1];
1641 $h[$y] = max $h[$y], $h; 1655
1656 if ($h > $sh) {
1657 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1642 } 1658 }
1643 } 1659 }
1644 1660
1645 (\@w, \@h) 1661 (\@w, \@h)
1646} 1662}
… …
1662 my ($ws, $hs) = $self->get_wh; 1678 my ($ws, $hs) = $self->get_wh;
1663 1679
1664 my $req_w = (sum @$ws) || 1; 1680 my $req_w = (sum @$ws) || 1;
1665 my $req_h = (sum @$hs) || 1; 1681 my $req_h = (sum @$hs) || 1;
1666 1682
1667 # TODO: nicer code 1683 # now linearly scale the rows/columns to the allocated size
1668 my @col_expand = @{$self->{col_expand}}; 1684 my @col_expand = @{$self->{col_expand}};
1669 @col_expand = (1) x @$ws unless @col_expand; 1685 @col_expand = (1) x @$ws unless @col_expand;
1670 my $col_expand = (sum @col_expand) || 1; 1686 my $col_expand = (sum @col_expand) || 1;
1671 1687
1672 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1688 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1679 1695
1680 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1696 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1681 1697
1682 CFPlus::UI::harmonize $hs; 1698 CFPlus::UI::harmonize $hs;
1683 1699
1684 my $y; 1700 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1701 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1685 1702
1686 for my $r (0 .. $#{$self->{children}}) { 1703 for my $widget ($self->children) {
1687 my $row = $self->{children}[$r] 1704 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1688 or next;
1689 1705
1690 my $x = 0; 1706 $widget->configure (
1691 my $row_h = $hs->[$r]; 1707 $x[$c], $y[$r],
1708 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1692 1709 );
1693 for my $c (0 .. $#$row) {
1694 my $col_w = $ws->[$c];
1695
1696 if (my $widget = $row->[$c]) {
1697 $widget->configure ($x, $y, $col_w, $row_h);
1698 }
1699
1700 $x += $col_w;
1701 }
1702
1703 $y += $row_h;
1704 } 1710 }
1705 1711
1706 1 1712 1
1707}
1708
1709sub find_widget {
1710 my ($self, $x, $y) = @_;
1711
1712 $x -= $self->{x};
1713 $y -= $self->{y};
1714
1715 my $res;
1716
1717 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1718 $res = $_->find_widget ($x, $y)
1719 and return $res;
1720 }
1721
1722 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1723}
1724
1725sub _draw {
1726 my ($self) = @_;
1727
1728 for (grep $_, @{$self->{children}}) {
1729 $_->draw for grep $_, @$_;
1730 }
1731} 1713}
1732 1714
1733############################################################################# 1715#############################################################################
1734 1716
1735package CFPlus::UI::Fixed; 1717package CFPlus::UI::Fixed;
… …
2375 2357
2376use CFPlus::OpenGL; 2358use CFPlus::OpenGL;
2377 2359
2378my @tex = 2360my @tex =
2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2380 qw(b1_button_active.png); 2362 qw(b1_button_inactive.png b1_button_active.png);
2381 2363
2382sub new { 2364sub new {
2383 my $class = shift; 2365 my $class = shift;
2384 2366
2385 $class->SUPER::new ( 2367 $class->SUPER::new (
2386 padding_x => 4, 2368 padding_x => 4,
2387 padding_y => 4, 2369 padding_y => 4,
2388 fg => [1, 1, 1], 2370 fg => [1.0, 1.0, 1.0],
2389 active_fg => [0, 0, 1], 2371 active_fg => [0.8, 0.8, 0.8],
2390 can_hover => 1, 2372 can_hover => 1,
2391 align => 0, 2373 align => 0,
2392 valign => 0, 2374 valign => 0,
2393 can_events => 1, 2375 can_events => 1,
2394 @_ 2376 @_
… …
2412 2394
2413 glEnable GL_TEXTURE_2D; 2395 glEnable GL_TEXTURE_2D;
2414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2396 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2415 glColor 0, 0, 0, 1; 2397 glColor 0, 0, 0, 1;
2416 2398
2399 my $tex = $tex[$GRAB == $self];
2417 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2400 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418 2401
2419 glDisable GL_TEXTURE_2D; 2402 glDisable GL_TEXTURE_2D;
2420 2403
2421 $self->SUPER::_draw; 2404 $self->SUPER::_draw;
2422} 2405}
… …
3487 ); 3470 );
3488 3471
3489 if ($self->{anim} && $self->{animspeed}) { 3472 if ($self->{anim} && $self->{animspeed}) {
3490 CFPlus::weaken (my $widget = $self); 3473 CFPlus::weaken (my $widget = $self);
3491 3474
3475 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3476 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3492 $self->{timer} = Event->timer ( 3477 $self->{timer} = Event->timer (
3493 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3494 hard => 1, 3478 parked => 1,
3495 interval => $self->{animspeed},
3496 cb => sub { 3479 cb => sub {
3497 return unless $::CONN; 3480 return unless $::CONN && $widget;
3498 3481
3499 ++$widget->{frame}; 3482 ++$widget->{frame};
3500 $self->update_face; 3483 $widget->update_face;
3501 $self->update; 3484 $widget->update;
3485
3486 $widget->update_timer;
3502 }, 3487 },
3503 ); 3488 );
3504 3489
3505 $self->update_face; 3490 $self->update_face;
3491 $self->update_timer;
3506 } 3492 }
3507 3493
3508 $self 3494 $self
3495}
3496
3497sub update_timer {
3498 my ($self) = @_;
3499
3500 return unless $self->{timer};
3501
3502 if ($self->{visible}) {
3503 $self->{timer}->at (
3504 $self->{anim_start}
3505 + $self->{animspeed}
3506 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3507 );
3508 $self->{timer}->start;
3509 } else {
3510 $self->{timer}->stop;
3511 }
3509} 3512}
3510 3513
3511sub update_face { 3514sub update_face {
3512 my ($self) = @_; 3515 my ($self) = @_;
3513 3516
… …
3545 return unless $self->{visible}; 3548 return unless $self->{visible};
3546 3549
3547 $self->SUPER::update; 3550 $self->SUPER::update;
3548} 3551}
3549 3552
3553sub invoke_visibility_change {
3554 my ($self) = @_;
3555
3556 $self->update_timer;
3557
3558 0
3559}
3560
3550sub _draw { 3561sub _draw {
3551 my ($self) = @_; 3562 my ($self) = @_;
3552 3563
3553 return unless $::CONN; 3564 return unless $::CONN;
3554 3565
… …
3569} 3580}
3570 3581
3571sub destroy { 3582sub destroy {
3572 my ($self) = @_; 3583 my ($self) = @_;
3573 3584
3574 $self->{timer}->cancel 3585 (delete $self->{timer})->cancel
3575 if $self->{timer}; 3586 if $self->{timer};
3576 3587
3577 $self->SUPER::destroy; 3588 $self->SUPER::destroy;
3578} 3589}
3579 3590
… …
4223 while ($self->{post_alloc_hook}) { 4234 while ($self->{post_alloc_hook}) {
4224 $_->() 4235 $_->()
4225 for values %{delete $self->{post_alloc_hook}}; 4236 for values %{delete $self->{post_alloc_hook}};
4226 } 4237 }
4227 4238
4228
4229 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4239 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4230 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4240 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4231 glClear GL_COLOR_BUFFER_BIT; 4241 glClear GL_COLOR_BUFFER_BIT;
4232 4242
4233 glMatrixMode GL_PROJECTION; 4243 glMatrixMode GL_PROJECTION;

Diff Legend

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