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

Diff Legend

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