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.379 by root, Tue Jul 17 12:04:18 2007 UTC vs.
Revision 1.400 by root, Sat Jul 21 16:15:03 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);
… …
651 my ($self) = @_; 646 my ($self) = @_;
652 647
653 warn "no draw defined for $self\n"; 648 warn "no draw defined for $self\n";
654} 649}
655 650
656my $cntx;#d#
657sub DESTROY { 651sub DESTROY {
658 my ($self) = @_; 652 my ($self) = @_;
659 653
660 return if CFPlus::in_destruct; 654 return if CFPlus::in_destruct;
661 655
… …
746 can_events => 0, 740 can_events => 0,
747 %arg, 741 %arg,
748 ); 742 );
749 743
750 $self->add (@$children) 744 $self->add (@$children)
751 if $children; 745 if $children && @$children;
752 746
753 $self 747 $self
754} 748}
755 749
756sub realloc { 750sub realloc {
… …
765 my ($self, @widgets) = @_; 759 my ($self, @widgets) = @_;
766 760
767 $_->set_parent ($self) 761 $_->set_parent ($self)
768 for @widgets; 762 for @widgets;
769 763
764 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 765 use sort 'stable';
771 766
772 $self->{children} = [ 767 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 768 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 769 @{$self->{children}}, @widgets
775 ]; 770 ];
776 771
777 $self->realloc; 772 $self->realloc;
773
774 map $_+0, @widgets
778} 775}
779 776
780sub children { 777sub children {
781 @{ $_[0]{children} } 778 @{ $_[0]{children} }
782} 779}
… …
793} 790}
794 791
795sub clear { 792sub clear {
796 my ($self) = @_; 793 my ($self) = @_;
797 794
798 my $children = delete $self->{children}; 795 my $children = $self->{children};
799 $self->{children} = []; 796 $self->{children} = [];
800 797
801 for (@$children) { 798 for (@$children) {
802 delete $_->{parent}; 799 delete $_->{parent};
803 $_->hide; 800 $_->hide;
… …
963sub size_request { 960sub size_request {
964 my ($self) = @_; 961 my ($self) = @_;
965 962
966 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 963 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967 964
968 $w = 10 if $self->{scroll_x}; 965 $w = 1 if $self->{scroll_x};
969 $h = 10 if $self->{scroll_y}; 966 $h = 1 if $self->{scroll_y};
970 967
971 ($w, $h) 968 ($w, $h)
972} 969}
973 970
974sub invoke_size_allocate { 971sub invoke_size_allocate {
… …
1020 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
1021 1018
1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1024 ) { 1021 ) {
1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1022 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1026 } else { 1023 } else {
1027 $self->CFPlus::UI::Base::find_widget ($x, $y) 1024 $self->CFPlus::UI::Base::find_widget ($x, $y)
1028 } 1025 }
1029} 1026}
1030 1027
… …
1051 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
1052 1049
1053 my $self; 1050 my $self;
1054 1051
1055 my $hslider = new CFPlus::UI::Slider 1052 my $hslider = new CFPlus::UI::Slider
1053 col => 0,
1054 row => 1,
1056 vertical => 0, 1055 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix 1056 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub { 1057 on_changed => sub {
1059 $self->{hpos} = $_[1]; 1058 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 }, 1060 },
1062 ; 1061 ;
1063 1062
1064 my $vslider = new CFPlus::UI::Slider 1063 my $vslider = new CFPlus::UI::Slider
1064 col => 1,
1065 row => 0,
1065 vertical => 1, 1066 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub { 1068 on_changed => sub {
1068 $self->{vpos} = $_[1]; 1069 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1080 row_expand => [1, 0], 1081 row_expand => [1, 0],
1081 %arg, 1082 %arg,
1082 ); 1083 );
1083 1084
1084 $self->{vp} = new CFPlus::UI::ViewPort 1085 $self->{vp} = new CFPlus::UI::ViewPort
1086 col => 0,
1087 row => 0,
1085 expand => 1, 1088 expand => 1,
1086 scroll_x => $self->{scroll_x}, 1089 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y}, 1090 scroll_y => $self->{scroll_y},
1088 on_changed => sub { 1091 on_changed => sub {
1089 my ($vp, $x, $y) = @_; 1092 my ($vp, $x, $y) = @_;
… …
1093 1096
1094 0 1097 0
1095 }, 1098 },
1096 ; 1099 ;
1097 1100
1098 $self->SUPER::add (0, 0, $self->{vp}); 1101 $self->SUPER::add ($self->{vp});
1099 1102
1100 $self->add ($child) if $child; 1103 $self->add ($child) if $child;
1101 1104
1102 $self 1105 $self
1103} 1106}
1104
1105#TODO# update range on size_allocate depending on child
1106 1107
1107sub add { 1108sub add {
1108 my ($self, $widget) = @_; 1109 my ($self, $widget) = @_;
1109 1110
1110 $self->{vp}->add ($self->{child} = $widget); 1111 $self->{vp}->add ($self->{child} = $widget);
… …
1117 1118
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1119 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1120 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120 1121
1121 my $visible = $w1 > $w2; 1122 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) { 1123 if ($visible != $self->{hslider_visible}) {
1124 $self->{hslider_visible} = $visible;
1123 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1125 $visible ? $self->SUPER::add ($self->{hslider})
1124 : $self->{hslider}->hide; 1126 : $self->SUPER::remove ($self->{hslider});
1125 } 1127 }
1126 1128
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1129 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129 1131
1130 my $visible = $h1 > $h2; 1132 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) { 1133 if ($visible != $self->{vslider_visible}) {
1134 $self->{vslider_visible} = $visible;
1132 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1135 $visible ? $self->SUPER::add ($self->{vslider})
1133 : $self->{vslider}->hide; 1136 : $self->SUPER::remove ($self->{vslider});
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);
1134 } 1155 };
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142} 1156}
1143 1157
1144sub invoke_mouse_wheel { 1158sub invoke_mouse_wheel {
1145 my ($self, $ev) = @_; 1159 my ($self, $ev) = @_;
1146 1160
1147 return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149 $self->{vslider}->emit (mouse_wheel => $ev); 1161 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1162 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1150 1163
1151 1 1164 1
1152} 1165}
1153 1166
1154sub invoke_button_down { 1167sub invoke_button_down {
1155 my ($self, $ev, $x, $y) = @_; 1168 my ($self, $ev, $x, $y) = @_;
1156 1169
1157 if ($ev->{button} == 2) { 1170 if ($ev->{button} == 2) {
1158 $self->grab_focus; 1171 $self->start_dragging ($ev);
1159
1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1165
1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1169
1170 return 1; 1172 return 1;
1171 } 1173 }
1172 1174
1173 0 1175 0
1174} 1176}
… …
1355 1357
1356my @border = 1358my @border =
1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1359 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1360 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1359 1361
1362my @icon =
1363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1364 qw(x1_move.png x1_resize.png);
1365
1360sub new { 1366sub new {
1361 my ($class, %arg) = @_; 1367 my ($class, %arg) = @_;
1362 1368
1363 my $self = $class->SUPER::new ( 1369 my $self = $class->SUPER::new (
1364 bg => [1, 1, 1, 1], 1370 bg => [1, 1, 1, 1],
… …
1532 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1533 1539
1534 my $border = $self->border; 1540 my $border = $self->border;
1535 1541
1536 glColor @{ $self->{border_bg} }; 1542 glColor @{ $self->{border_bg} };
1537 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1543 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1538 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1544 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1539 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1545 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1540 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1546 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1547
1548 # move
1549 my $w2 = ($w - $border) * .5;
1550 my $h2 = ($h - $border) * .5;
1551 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1552 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1553 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1554
1555 # resize
1556 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1557 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1558 unless $self->{has_close_button};
1559 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1560 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1541 1561
1542 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1562 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1543 glColor @{ $self->{bg} }; 1563 glColor @{ $self->{bg} };
1544 1564
1545 # TODO: repeat texture not scale 1565 # TODO: repeat texture not scale
… …
1566 1586
1567############################################################################# 1587#############################################################################
1568 1588
1569package CFPlus::UI::Table; 1589package CFPlus::UI::Table;
1570 1590
1571our @ISA = CFPlus::UI::Base::; 1591our @ISA = CFPlus::UI::Container::;
1572 1592
1573use List::Util qw(max sum); 1593use List::Util qw(max sum);
1574 1594
1575use CFPlus::OpenGL; 1595use CFPlus::OpenGL;
1576 1596
1577sub new { 1597sub new {
1578 my $class = shift; 1598 my $class = shift;
1579 1599
1580 $class->SUPER::new ( 1600 $class->SUPER::new (
1581 children => [],
1582 col_expand => [], 1601 col_expand => [],
1583 row_expand => [], 1602 row_expand => [],
1584 @_, 1603 @_,
1585 ) 1604 )
1586} 1605}
1587 1606
1588sub children {
1589 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1590}
1591
1592# TODO: store row/col info in child widget and use standard add/del
1593sub add { 1607sub add {
1608 my ($self, @widgets) = @_;
1609
1610 for my $child (@widgets) {
1611 $child->{rowspan} ||= 1;
1612 $child->{colspan} ||= 1;
1613 }
1614
1615 $self->SUPER::add (@widgets);
1616}
1617
1618sub add_at {
1594 my ($self) = shift; 1619 my $self = shift;
1620
1621 my @widgets;
1595 1622
1596 while (@_) { 1623 while (@_) {
1597 my ($x, $y, $child) = splice @_, 0, 3, (); 1624 my ($col, $row, $child) = splice @_, 0, 3, ();
1598 $child->set_parent ($self);
1599 $self->{children}[$y][$x] = $child;
1600 }
1601 1625
1602 $self->{force_realloc} = 1; 1626 $child->{row} = $row;
1603 $self->{force_size_alloc} = 1; 1627 $child->{col} = $col;
1604 $self->realloc;
1605}
1606 1628
1607sub remove { 1629 push @widgets, $child;
1630 }
1631
1632 $self->add (@widgets);
1633}
1634
1635sub get_wh {
1608 my ($self, $child) = @_; 1636 my ($self) = @_;
1609 1637
1610 for (@{ $self->{children} }) { 1638 my (@w, @h);
1611 for (@{ $_ || [] }) { 1639
1612 $_ = undef if $_ == $child; 1640 my @children = $self->children;
1641
1642 # first pass, columns
1643 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1644 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1645
1646 my $sw = sum @w[$c .. $c + $cs - 1];
1647
1648 if ($w > $sw) {
1649 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1613 } 1650 }
1614 } 1651 }
1615}
1616 1652
1617# TODO: move to container class maybe? send children a signal on removal? 1653 # second pass, rows
1618sub clear { 1654 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1619 my ($self) = @_;
1620
1621 my @children = $self->children;
1622 delete $self->{children};
1623
1624 for (@children) {
1625 delete $_->{parent};
1626 $_->hide;
1627 }
1628
1629 $self->realloc;
1630}
1631
1632sub get_wh {
1633 my ($self) = @_;
1634
1635 my (@w, @h);
1636
1637 for my $y (0 .. $#{$self->{children}}) {
1638 my $row = $self->{children}[$y]
1639 or next;
1640
1641 for my $x (0 .. $#$row) {
1642 my $widget = $row->[$x]
1643 or next;
1644 my ($w, $h) = @$widget{qw(req_w req_h)}; 1655 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1645 1656
1646 $w[$x] = max $w[$x], $w; 1657 my $sh = sum @h[$r .. $r + $rs - 1];
1647 $h[$y] = max $h[$y], $h; 1658
1659 if ($h > $sh) {
1660 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1648 } 1661 }
1649 } 1662 }
1650 1663
1651 (\@w, \@h) 1664 (\@w, \@h)
1652} 1665}
… …
1668 my ($ws, $hs) = $self->get_wh; 1681 my ($ws, $hs) = $self->get_wh;
1669 1682
1670 my $req_w = (sum @$ws) || 1; 1683 my $req_w = (sum @$ws) || 1;
1671 my $req_h = (sum @$hs) || 1; 1684 my $req_h = (sum @$hs) || 1;
1672 1685
1673 # TODO: nicer code 1686 # now linearly scale the rows/columns to the allocated size
1674 my @col_expand = @{$self->{col_expand}}; 1687 my @col_expand = @{$self->{col_expand}};
1675 @col_expand = (1) x @$ws unless @col_expand; 1688 @col_expand = (1) x @$ws unless @col_expand;
1676 my $col_expand = (sum @col_expand) || 1; 1689 my $col_expand = (sum @col_expand) || 1;
1677 1690
1678 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1691 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1685 1698
1686 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1699 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1687 1700
1688 CFPlus::UI::harmonize $hs; 1701 CFPlus::UI::harmonize $hs;
1689 1702
1690 my $y; 1703 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1704 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1691 1705
1692 for my $r (0 .. $#{$self->{children}}) { 1706 for my $widget ($self->children) {
1693 my $row = $self->{children}[$r] 1707 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1694 or next;
1695 1708
1696 my $x = 0; 1709 $widget->configure (
1697 my $row_h = $hs->[$r]; 1710 $x[$c], $y[$r],
1711 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1698 1712 );
1699 for my $c (0 .. $#$row) {
1700 my $col_w = $ws->[$c];
1701
1702 if (my $widget = $row->[$c]) {
1703 $widget->configure ($x, $y, $col_w, $row_h);
1704 }
1705
1706 $x += $col_w;
1707 }
1708
1709 $y += $row_h;
1710 } 1713 }
1711 1714
1712 1 1715 1
1713}
1714
1715sub find_widget {
1716 my ($self, $x, $y) = @_;
1717
1718 $x -= $self->{x};
1719 $y -= $self->{y};
1720
1721 my $res;
1722
1723 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1724 $res = $_->find_widget ($x, $y)
1725 and return $res;
1726 }
1727
1728 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1729}
1730
1731sub _draw {
1732 my ($self) = @_;
1733
1734 for (grep $_, @{$self->{children}}) {
1735 $_->draw for grep $_, @$_;
1736 }
1737} 1716}
1738 1717
1739############################################################################# 1718#############################################################################
1740 1719
1741package CFPlus::UI::Fixed; 1720package CFPlus::UI::Fixed;
… …
2381 2360
2382use CFPlus::OpenGL; 2361use CFPlus::OpenGL;
2383 2362
2384my @tex = 2363my @tex =
2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2364 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2386 qw(b1_button_active.png); 2365 qw(b1_button_inactive.png b1_button_active.png);
2387 2366
2388sub new { 2367sub new {
2389 my $class = shift; 2368 my $class = shift;
2390 2369
2391 $class->SUPER::new ( 2370 $class->SUPER::new (
2392 padding_x => 4, 2371 padding_x => 4,
2393 padding_y => 4, 2372 padding_y => 4,
2394 fg => [1, 1, 1], 2373 fg => [1.0, 1.0, 1.0],
2395 active_fg => [0, 0, 1], 2374 active_fg => [0.8, 0.8, 0.8],
2396 can_hover => 1, 2375 can_hover => 1,
2397 align => 0, 2376 align => 0,
2398 valign => 0, 2377 valign => 0,
2399 can_events => 1, 2378 can_events => 1,
2400 @_ 2379 @_
… …
2418 2397
2419 glEnable GL_TEXTURE_2D; 2398 glEnable GL_TEXTURE_2D;
2420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2399 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2421 glColor 0, 0, 0, 1; 2400 glColor 0, 0, 0, 1;
2422 2401
2402 my $tex = $tex[$GRAB == $self];
2423 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2403 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2424 2404
2425 glDisable GL_TEXTURE_2D; 2405 glDisable GL_TEXTURE_2D;
2426 2406
2427 $self->SUPER::_draw; 2407 $self->SUPER::_draw;
2428} 2408}
… …
3498 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3478 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3499 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3479 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3500 $self->{timer} = Event->timer ( 3480 $self->{timer} = Event->timer (
3501 parked => 1, 3481 parked => 1,
3502 cb => sub { 3482 cb => sub {
3503 return unless $::CONN; 3483 return unless $::CONN && $widget;
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 3484
3510 ++$widget->{frame}; 3485 ++$widget->{frame};
3511 $widget->update_face; 3486 $widget->update_face;
3512 $widget->update; 3487 $widget->update;
3513 3488
… …
4262 while ($self->{post_alloc_hook}) { 4237 while ($self->{post_alloc_hook}) {
4263 $_->() 4238 $_->()
4264 for values %{delete $self->{post_alloc_hook}}; 4239 for values %{delete $self->{post_alloc_hook}};
4265 } 4240 }
4266 4241
4267
4268 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4242 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4269 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4243 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4270 glClear GL_COLOR_BUFFER_BIT; 4244 glClear GL_COLOR_BUFFER_BIT;
4271 4245
4272 glMatrixMode GL_PROJECTION; 4246 glMatrixMode GL_PROJECTION;

Diff Legend

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