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.374 by root, Mon Jul 16 12:36:48 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;
… …
943} 940}
944 941
945############################################################################# 942#############################################################################
946 943
947package CFPlus::UI::ViewPort; 944package CFPlus::UI::ViewPort;
945
946use List::Util qw(min max);
948 947
949our @ISA = CFPlus::UI::Window::; 948our @ISA = CFPlus::UI::Window::;
950 949
951sub new { 950sub new {
952 my $class = shift; 951 my $class = shift;
… …
961sub size_request { 960sub size_request {
962 my ($self) = @_; 961 my ($self) = @_;
963 962
964 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 963 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965 964
966 $w = 10 if $self->{scroll_x}; 965 $w = 1 if $self->{scroll_x};
967 $h = 10 if $self->{scroll_y}; 966 $h = 1 if $self->{scroll_y};
968 967
969 ($w, $h) 968 ($w, $h)
970} 969}
971 970
972sub invoke_size_allocate { 971sub invoke_size_allocate {
… …
984} 983}
985 984
986sub set_offset { 985sub set_offset {
987 my ($self, $x, $y) = @_; 986 my ($self, $x, $y) = @_;
988 987
988 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
989 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
990
991 if ($x != $self->{view_x} or $y != $self->{view_y}) {
989 $self->{view_x} = int $x; 992 $self->{view_x} = $x;
990 $self->{view_y} = int $y; 993 $self->{view_y} = $y;
991 994
995 $self->emit (changed => $x, $y);
992 $self->update; 996 $self->update;
997 }
993} 998}
994 999
995# hmm, this does not work for topleft of $self... but we should not ask for that 1000# hmm, this does not work for topleft of $self... but we should not ask for that
996sub coord2local { 1001sub coord2local {
997 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
… …
1012 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
1013 1018
1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016 ) { 1021 ) {
1017 $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})
1018 } else { 1023 } else {
1019 $self->CFPlus::UI::Base::find_widget ($x, $y) 1024 $self->CFPlus::UI::Base::find_widget ($x, $y)
1020 } 1025 }
1021} 1026}
1022 1027
… …
1043 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
1044 1049
1045 my $self; 1050 my $self;
1046 1051
1047 my $hslider = new CFPlus::UI::Slider 1052 my $hslider = new CFPlus::UI::Slider
1053 col => 0,
1054 row => 1,
1048 vertical => 0, 1055 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix 1056 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub { 1057 on_changed => sub {
1051 $self->{hpos} = $_[1]; 1058 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 }, 1060 },
1054 ; 1061 ;
1055 1062
1056 my $vslider = new CFPlus::UI::Slider 1063 my $vslider = new CFPlus::UI::Slider
1064 col => 1,
1065 row => 0,
1057 vertical => 1, 1066 vertical => 1,
1058 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
1059 on_changed => sub { 1068 on_changed => sub {
1060 $self->{vpos} = $_[1]; 1069 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1072 row_expand => [1, 0], 1081 row_expand => [1, 0],
1073 %arg, 1082 %arg,
1074 ); 1083 );
1075 1084
1076 $self->{vp} = new CFPlus::UI::ViewPort 1085 $self->{vp} = new CFPlus::UI::ViewPort
1086 col => 0,
1087 row => 0,
1077 expand => 1, 1088 expand => 1,
1078 scroll_x => $self->{scroll_x}, 1089 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y}, 1090 scroll_y => $self->{scroll_y},
1091 on_changed => sub {
1092 my ($vp, $x, $y) = @_;
1093
1094 $vp->{parent}{hslider}->set_value ($x);
1095 $vp->{parent}{vslider}->set_value ($y);
1096
1097 0
1098 },
1080 ; 1099 ;
1081 1100
1082 $self->SUPER::add (0, 0, $self->{vp}); 1101 $self->SUPER::add ($self->{vp});
1083 1102
1084 $self->add ($child) if $child; 1103 $self->add ($child) if $child;
1085 1104
1086 $self 1105 $self
1087} 1106}
1088
1089#TODO# update range on size_allocate depending on child
1090 1107
1091sub add { 1108sub add {
1092 my ($self, $widget) = @_; 1109 my ($self, $widget) = @_;
1093 1110
1094 $self->{vp}->add ($self->{child} = $widget); 1111 $self->{vp}->add ($self->{child} = $widget);
1095} 1112}
1096 1113
1114sub update_slider {
1115 my ($self) = @_;
1116
1117 my $child = ($self->{vp} or return)->child;
1118
1119 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1120 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1121
1122 my $visible = $w1 > $w2;
1123 if ($visible != $self->{hslider_visible}) {
1124 $self->{hslider_visible} = $visible;
1125 $visible ? $self->SUPER::add ($self->{hslider})
1126 : $self->SUPER::remove ($self->{hslider});
1127 }
1128
1129 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131
1132 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider_visible}) {
1134 $self->{vslider_visible} = $visible;
1135 $visible ? $self->SUPER::add ($self->{vslider})
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);
1155 };
1156}
1157
1097sub invoke_mouse_wheel { 1158sub invoke_mouse_wheel {
1098 my ($self, $ev) = @_; 1159 my ($self, $ev) = @_;
1099 1160
1100 return 0 unless $ev->{dy}; # only vertical movements for now
1101
1102 $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};
1103 1163
1104 1 1164 1
1105} 1165}
1106 1166
1107sub update_slider { 1167sub invoke_button_down {
1108 my ($self) = @_; 1168 my ($self, $ev, $x, $y) = @_;
1109 1169
1110 my $child = ($self->{vp} or return)->child; 1170 if ($ev->{button} == 2) {
1171 $self->start_dragging ($ev);
1172 return 1;
1173 }
1111 1174
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 } 1175 0
1176}
1120 1177
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1178sub invoke_button_up {
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1179 my ($self, $ev, $x, $y) = @_;
1123 1180
1124 my $visible = $h1 > $h2; 1181 if (delete $self->{motion}) {
1125 if ($visible != $self->{vslider}{visible}) { 1182 return 1;
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1183 }
1127 : $self->{vslider}->hide; 1184
1128 } 1185 0
1129} 1186}
1130 1187
1131sub update { 1188sub invoke_mouse_motion {
1132 my ($self) = @_; 1189 my ($self, $ev, $x, $y) = @_;
1133 1190
1134 $self->SUPER::update; 1191 if ($self->{motion}) {
1135 $self->update_slider; 1192 $self->{motion}->($ev, $x, $y);
1193 return 1;
1194 }
1195
1196 0
1136} 1197}
1137 1198
1138sub invoke_size_allocate { 1199sub invoke_size_allocate {
1139 my ($self, $w, $h) = @_; 1200 my ($self, $w, $h) = @_;
1140 1201
… …
1296 1357
1297my @border = 1358my @border =
1298 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1359 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1299 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);
1300 1361
1362my @icon =
1363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1364 qw(x1_move.png x1_resize.png);
1365
1301sub new { 1366sub new {
1302 my ($class, %arg) = @_; 1367 my ($class, %arg) = @_;
1303 1368
1304 my $self = $class->SUPER::new ( 1369 my $self = $class->SUPER::new (
1305 bg => [1, 1, 1, 1], 1370 bg => [1, 1, 1, 1],
… …
1473 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1474 1539
1475 my $border = $self->border; 1540 my $border = $self->border;
1476 1541
1477 glColor @{ $self->{border_bg} }; 1542 glColor @{ $self->{border_bg} };
1478 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1543 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1479 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1544 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1480 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1545 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1481 $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);
1482 1561
1483 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1562 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1484 glColor @{ $self->{bg} }; 1563 glColor @{ $self->{bg} };
1485 1564
1486 # TODO: repeat texture not scale 1565 # TODO: repeat texture not scale
… …
1507 1586
1508############################################################################# 1587#############################################################################
1509 1588
1510package CFPlus::UI::Table; 1589package CFPlus::UI::Table;
1511 1590
1512our @ISA = CFPlus::UI::Base::; 1591our @ISA = CFPlus::UI::Container::;
1513 1592
1514use List::Util qw(max sum); 1593use List::Util qw(max sum);
1515 1594
1516use CFPlus::OpenGL; 1595use CFPlus::OpenGL;
1517 1596
1518sub new { 1597sub new {
1519 my $class = shift; 1598 my $class = shift;
1520 1599
1521 $class->SUPER::new ( 1600 $class->SUPER::new (
1522 children => [],
1523 col_expand => [], 1601 col_expand => [],
1524 row_expand => [], 1602 row_expand => [],
1525 @_, 1603 @_,
1526 ) 1604 )
1527} 1605}
1528 1606
1529sub children {
1530 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1531}
1532
1533# TODO: store row/col info in child widget and use standard add/del
1534sub 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 {
1535 my ($self) = shift; 1619 my $self = shift;
1620
1621 my @widgets;
1536 1622
1537 while (@_) { 1623 while (@_) {
1538 my ($x, $y, $child) = splice @_, 0, 3, (); 1624 my ($col, $row, $child) = splice @_, 0, 3, ();
1539 $child->set_parent ($self);
1540 $self->{children}[$y][$x] = $child;
1541 }
1542 1625
1543 $self->{force_realloc} = 1; 1626 $child->{row} = $row;
1544 $self->{force_size_alloc} = 1; 1627 $child->{col} = $col;
1545 $self->realloc;
1546}
1547 1628
1548sub remove { 1629 push @widgets, $child;
1630 }
1631
1632 $self->add (@widgets);
1633}
1634
1635sub get_wh {
1549 my ($self, $child) = @_; 1636 my ($self) = @_;
1550 1637
1551 for (@{ $self->{children} }) { 1638 my (@w, @h);
1552 for (@{ $_ || [] }) { 1639
1553 $_ = 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];
1554 } 1650 }
1555 } 1651 }
1556}
1557 1652
1558# TODO: move to container class maybe? send children a signal on removal? 1653 # second pass, rows
1559sub clear { 1654 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1560 my ($self) = @_;
1561
1562 my @children = $self->children;
1563 delete $self->{children};
1564
1565 for (@children) {
1566 delete $_->{parent};
1567 $_->hide;
1568 }
1569
1570 $self->realloc;
1571}
1572
1573sub get_wh {
1574 my ($self) = @_;
1575
1576 my (@w, @h);
1577
1578 for my $y (0 .. $#{$self->{children}}) {
1579 my $row = $self->{children}[$y]
1580 or next;
1581
1582 for my $x (0 .. $#$row) {
1583 my $widget = $row->[$x]
1584 or next;
1585 my ($w, $h) = @$widget{qw(req_w req_h)}; 1655 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1586 1656
1587 $w[$x] = max $w[$x], $w; 1657 my $sh = sum @h[$r .. $r + $rs - 1];
1588 $h[$y] = max $h[$y], $h; 1658
1659 if ($h > $sh) {
1660 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1589 } 1661 }
1590 } 1662 }
1591 1663
1592 (\@w, \@h) 1664 (\@w, \@h)
1593} 1665}
… …
1609 my ($ws, $hs) = $self->get_wh; 1681 my ($ws, $hs) = $self->get_wh;
1610 1682
1611 my $req_w = (sum @$ws) || 1; 1683 my $req_w = (sum @$ws) || 1;
1612 my $req_h = (sum @$hs) || 1; 1684 my $req_h = (sum @$hs) || 1;
1613 1685
1614 # TODO: nicer code 1686 # now linearly scale the rows/columns to the allocated size
1615 my @col_expand = @{$self->{col_expand}}; 1687 my @col_expand = @{$self->{col_expand}};
1616 @col_expand = (1) x @$ws unless @col_expand; 1688 @col_expand = (1) x @$ws unless @col_expand;
1617 my $col_expand = (sum @col_expand) || 1; 1689 my $col_expand = (sum @col_expand) || 1;
1618 1690
1619 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1691 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1626 1698
1627 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1699 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1628 1700
1629 CFPlus::UI::harmonize $hs; 1701 CFPlus::UI::harmonize $hs;
1630 1702
1631 my $y; 1703 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1704 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1632 1705
1633 for my $r (0 .. $#{$self->{children}}) { 1706 for my $widget ($self->children) {
1634 my $row = $self->{children}[$r] 1707 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1635 or next;
1636 1708
1637 my $x = 0; 1709 $widget->configure (
1638 my $row_h = $hs->[$r]; 1710 $x[$c], $y[$r],
1711 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1639 1712 );
1640 for my $c (0 .. $#$row) {
1641 my $col_w = $ws->[$c];
1642
1643 if (my $widget = $row->[$c]) {
1644 $widget->configure ($x, $y, $col_w, $row_h);
1645 }
1646
1647 $x += $col_w;
1648 }
1649
1650 $y += $row_h;
1651 } 1713 }
1652 1714
1653 1 1715 1
1654}
1655
1656sub find_widget {
1657 my ($self, $x, $y) = @_;
1658
1659 $x -= $self->{x};
1660 $y -= $self->{y};
1661
1662 my $res;
1663
1664 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1665 $res = $_->find_widget ($x, $y)
1666 and return $res;
1667 }
1668
1669 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1670}
1671
1672sub _draw {
1673 my ($self) = @_;
1674
1675 for (grep $_, @{$self->{children}}) {
1676 $_->draw for grep $_, @$_;
1677 }
1678} 1716}
1679 1717
1680############################################################################# 1718#############################################################################
1681 1719
1682package CFPlus::UI::Fixed; 1720package CFPlus::UI::Fixed;
… …
2322 2360
2323use CFPlus::OpenGL; 2361use CFPlus::OpenGL;
2324 2362
2325my @tex = 2363my @tex =
2326 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2364 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2327 qw(b1_button_active.png); 2365 qw(b1_button_inactive.png b1_button_active.png);
2328 2366
2329sub new { 2367sub new {
2330 my $class = shift; 2368 my $class = shift;
2331 2369
2332 $class->SUPER::new ( 2370 $class->SUPER::new (
2333 padding_x => 4, 2371 padding_x => 4,
2334 padding_y => 4, 2372 padding_y => 4,
2335 fg => [1, 1, 1], 2373 fg => [1.0, 1.0, 1.0],
2336 active_fg => [0, 0, 1], 2374 active_fg => [0.8, 0.8, 0.8],
2337 can_hover => 1, 2375 can_hover => 1,
2338 align => 0, 2376 align => 0,
2339 valign => 0, 2377 valign => 0,
2340 can_events => 1, 2378 can_events => 1,
2341 @_ 2379 @_
… …
2359 2397
2360 glEnable GL_TEXTURE_2D; 2398 glEnable GL_TEXTURE_2D;
2361 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2399 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2362 glColor 0, 0, 0, 1; 2400 glColor 0, 0, 0, 1;
2363 2401
2402 my $tex = $tex[$GRAB == $self];
2364 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2403 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365 2404
2366 glDisable GL_TEXTURE_2D; 2405 glDisable GL_TEXTURE_2D;
2367 2406
2368 $self->SUPER::_draw; 2407 $self->SUPER::_draw;
2369} 2408}
… …
3434 ); 3473 );
3435 3474
3436 if ($self->{anim} && $self->{animspeed}) { 3475 if ($self->{anim} && $self->{animspeed}) {
3437 CFPlus::weaken (my $widget = $self); 3476 CFPlus::weaken (my $widget = $self);
3438 3477
3478 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3479 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3439 $self->{timer} = Event->timer ( 3480 $self->{timer} = Event->timer (
3440 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3441 hard => 1, 3481 parked => 1,
3442 interval => $self->{animspeed},
3443 cb => sub { 3482 cb => sub {
3444 return unless $::CONN; 3483 return unless $::CONN && $widget;
3445 3484
3446 ++$widget->{frame}; 3485 ++$widget->{frame};
3447 $self->update_face; 3486 $widget->update_face;
3448 $self->update; 3487 $widget->update;
3488
3489 $widget->update_timer;
3449 }, 3490 },
3450 ); 3491 );
3451 3492
3452 $self->update_face; 3493 $self->update_face;
3494 $self->update_timer;
3453 } 3495 }
3454 3496
3455 $self 3497 $self
3498}
3499
3500sub update_timer {
3501 my ($self) = @_;
3502
3503 return unless $self->{timer};
3504
3505 if ($self->{visible}) {
3506 $self->{timer}->at (
3507 $self->{anim_start}
3508 + $self->{animspeed}
3509 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3510 );
3511 $self->{timer}->start;
3512 } else {
3513 $self->{timer}->stop;
3514 }
3456} 3515}
3457 3516
3458sub update_face { 3517sub update_face {
3459 my ($self) = @_; 3518 my ($self) = @_;
3460 3519
… …
3492 return unless $self->{visible}; 3551 return unless $self->{visible};
3493 3552
3494 $self->SUPER::update; 3553 $self->SUPER::update;
3495} 3554}
3496 3555
3556sub invoke_visibility_change {
3557 my ($self) = @_;
3558
3559 $self->update_timer;
3560
3561 0
3562}
3563
3497sub _draw { 3564sub _draw {
3498 my ($self) = @_; 3565 my ($self) = @_;
3499 3566
3500 return unless $::CONN; 3567 return unless $::CONN;
3501 3568
… …
3516} 3583}
3517 3584
3518sub destroy { 3585sub destroy {
3519 my ($self) = @_; 3586 my ($self) = @_;
3520 3587
3521 $self->{timer}->cancel 3588 (delete $self->{timer})->cancel
3522 if $self->{timer}; 3589 if $self->{timer};
3523 3590
3524 $self->SUPER::destroy; 3591 $self->SUPER::destroy;
3525} 3592}
3526 3593
… …
4170 while ($self->{post_alloc_hook}) { 4237 while ($self->{post_alloc_hook}) {
4171 $_->() 4238 $_->()
4172 for values %{delete $self->{post_alloc_hook}}; 4239 for values %{delete $self->{post_alloc_hook}};
4173 } 4240 }
4174 4241
4175
4176 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4242 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4177 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4243 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4178 glClear GL_COLOR_BUFFER_BIT; 4244 glClear GL_COLOR_BUFFER_BIT;
4179 4245
4180 glMatrixMode GL_PROJECTION; 4246 glMatrixMode GL_PROJECTION;

Diff Legend

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