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.403 by root, Sat Jul 21 21:25:23 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 {
… …
986} 983}
987 984
988sub set_offset { 985sub set_offset {
989 my ($self, $x, $y) = @_; 986 my ($self, $x, $y) = @_;
990 987
991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x; 988 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; 989 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993 990
991 if ($x != $self->{view_x} or $y != $self->{view_y}) {
992 $self->{view_x} = $x;
993 $self->{view_y} = $y;
994
995 $self->emit (changed => $x, $y);
994 $self->update; 996 $self->update;
997 }
995} 998}
996 999
997# 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
998sub coord2local { 1001sub coord2local {
999 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
… …
1014 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
1015 1018
1016 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1017 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1018 ) { 1021 ) {
1019 $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})
1020 } else { 1023 } else {
1021 $self->CFPlus::UI::Base::find_widget ($x, $y) 1024 $self->CFPlus::UI::Base::find_widget ($x, $y)
1022 } 1025 }
1023} 1026}
1024 1027
… …
1045 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
1046 1049
1047 my $self; 1050 my $self;
1048 1051
1049 my $hslider = new CFPlus::UI::Slider 1052 my $hslider = new CFPlus::UI::Slider
1053 col => 0,
1054 row => 1,
1050 vertical => 0, 1055 vertical => 0,
1051 range => [0, 0, 1, 0.01], # HACK fix 1056 range => [0, 0, 1, 0.01], # HACK fix
1052 on_changed => sub { 1057 on_changed => sub {
1053 $self->{hpos} = $_[1]; 1058 $self->{hpos} = $_[1];
1054 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1055 }, 1060 },
1056 ; 1061 ;
1057 1062
1058 my $vslider = new CFPlus::UI::Slider 1063 my $vslider = new CFPlus::UI::Slider
1064 col => 1,
1065 row => 0,
1059 vertical => 1, 1066 vertical => 1,
1060 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
1061 on_changed => sub { 1068 on_changed => sub {
1062 $self->{vpos} = $_[1]; 1069 $self->{vpos} = $_[1];
1063 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1074 row_expand => [1, 0], 1081 row_expand => [1, 0],
1075 %arg, 1082 %arg,
1076 ); 1083 );
1077 1084
1078 $self->{vp} = new CFPlus::UI::ViewPort 1085 $self->{vp} = new CFPlus::UI::ViewPort
1086 col => 0,
1087 row => 0,
1079 expand => 1, 1088 expand => 1,
1080 scroll_x => $self->{scroll_x}, 1089 scroll_x => $self->{scroll_x},
1081 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 },
1099 on_size_allocate => sub {
1100 my ($vp, $w, $h) = @_;
1101 $vp->{parent}->update_slider;
1102 0
1103 },
1082 ; 1104 ;
1083 1105
1084 $self->SUPER::add (0, 0, $self->{vp}); 1106 $self->SUPER::add ($self->{vp});
1085 1107
1086 $self->add ($child) if $child; 1108 $self->add ($child) if $child;
1087 1109
1088 $self 1110 $self
1089} 1111}
1090
1091#TODO# update range on size_allocate depending on child
1092 1112
1093sub add { 1113sub add {
1094 my ($self, $widget) = @_; 1114 my ($self, $widget) = @_;
1095 1115
1096 $self->{vp}->add ($self->{child} = $widget); 1116 $self->{vp}->add ($self->{child} = $widget);
… …
1099sub update_slider { 1119sub update_slider {
1100 my ($self) = @_; 1120 my ($self) = @_;
1101 1121
1102 my $child = ($self->{vp} or return)->child; 1122 my $child = ($self->{vp} or return)->child;
1103 1123
1124 if ($self->{scroll_x}) {
1104 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1125 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1105 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1126 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1106 1127
1107 my $visible = $w1 > $w2; 1128 my $visible = $w1 > $w2;
1108 if ($visible != $self->{hslider}{visible}) { 1129 if ($visible != $self->{hslider_visible}) {
1130 $self->{hslider_visible} = $visible;
1109 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1131 $visible ? $self->SUPER::add ($self->{hslider})
1110 : $self->{hslider}->hide; 1132 : $self->SUPER::remove ($self->{hslider});
1133 }
1111 } 1134 }
1112 1135
1136 if ($self->{scroll_y}) {
1113 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1137 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1114 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1138 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1115 1139
1116 my $visible = $h1 > $h2; 1140 my $visible = $h1 > $h2;
1117 if ($visible != $self->{vslider}{visible}) { 1141 if ($visible != $self->{vslider_visible}) {
1142 $self->{vslider_visible} = $visible;
1118 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1143 $visible ? $self->SUPER::add ($self->{vslider})
1119 : $self->{vslider}->hide; 1144 : $self->SUPER::remove ($self->{vslider});
1145 }
1146 }
1147}
1148
1149sub start_dragging {
1150 my ($self, $ev) = @_;
1151
1152 $self->grab_focus;
1153
1154 my $ox = $self->{vp}{view_x};
1155 my $oy = $self->{vp}{view_y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1159
1160 $ox -= $ev->{xrel};
1161 $oy -= $ev->{yrel};
1162
1163 $self->{vp}->set_offset ($ox, $oy);
1120 } 1164 };
1121}
1122
1123sub update {
1124 my ($self) = @_;
1125
1126 $self->SUPER::update;
1127 $self->update_slider;
1128} 1165}
1129 1166
1130sub invoke_mouse_wheel { 1167sub invoke_mouse_wheel {
1131 my ($self, $ev) = @_; 1168 my ($self, $ev) = @_;
1132 1169
1133 return 0 unless $ev->{dy}; # only vertical movements for now
1134
1135 $self->{vslider}->emit (mouse_wheel => $ev); 1170 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1171 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1136 1172
1137 1 1173 1
1138} 1174}
1139 1175
1140sub invoke_button_down { 1176sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1177 my ($self, $ev, $x, $y) = @_;
1142 1178
1143 if ($ev->{button} == 2) { 1179 if ($ev->{button} == 2) {
1144 $self->grab_focus; 1180 $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
1155 return 1; 1181 return 1;
1156 } 1182 }
1157 1183
1158 0 1184 0
1159} 1185}
… …
1340 1366
1341my @border = 1367my @border =
1342 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1368 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); 1369 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1344 1370
1371my @icon =
1372 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1373 qw(x1_move.png x1_resize.png);
1374
1345sub new { 1375sub new {
1346 my ($class, %arg) = @_; 1376 my ($class, %arg) = @_;
1347 1377
1348 my $self = $class->SUPER::new ( 1378 my $self = $class->SUPER::new (
1349 bg => [1, 1, 1, 1], 1379 bg => [1, 1, 1, 1],
… …
1517 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1518 1548
1519 my $border = $self->border; 1549 my $border = $self->border;
1520 1550
1521 glColor @{ $self->{border_bg} }; 1551 glColor @{ $self->{border_bg} };
1522 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1523 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1524 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1525 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1555 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1556
1557 # move
1558 my $w2 = ($w - $border) * .5;
1559 my $h2 = ($h - $border) * .5;
1560 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1561 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1562 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1563
1564 # resize
1565 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1566 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1567 unless $self->{has_close_button};
1568 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1569 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1526 1570
1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1571 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1528 glColor @{ $self->{bg} }; 1572 glColor @{ $self->{bg} };
1529 1573
1530 # TODO: repeat texture not scale 1574 # TODO: repeat texture not scale
… …
1551 1595
1552############################################################################# 1596#############################################################################
1553 1597
1554package CFPlus::UI::Table; 1598package CFPlus::UI::Table;
1555 1599
1556our @ISA = CFPlus::UI::Base::; 1600our @ISA = CFPlus::UI::Container::;
1557 1601
1558use List::Util qw(max sum); 1602use List::Util qw(max sum);
1559 1603
1560use CFPlus::OpenGL; 1604use CFPlus::OpenGL;
1561 1605
1562sub new { 1606sub new {
1563 my $class = shift; 1607 my $class = shift;
1564 1608
1565 $class->SUPER::new ( 1609 $class->SUPER::new (
1566 children => [],
1567 col_expand => [], 1610 col_expand => [],
1568 row_expand => [], 1611 row_expand => [],
1569 @_, 1612 @_,
1570 ) 1613 )
1571} 1614}
1572 1615
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 { 1616sub add {
1617 my ($self, @widgets) = @_;
1618
1619 for my $child (@widgets) {
1620 $child->{rowspan} ||= 1;
1621 $child->{colspan} ||= 1;
1622 }
1623
1624 $self->SUPER::add (@widgets);
1625}
1626
1627sub add_at {
1579 my ($self) = shift; 1628 my $self = shift;
1629
1630 my @widgets;
1580 1631
1581 while (@_) { 1632 while (@_) {
1582 my ($x, $y, $child) = splice @_, 0, 3, (); 1633 my ($col, $row, $child) = splice @_, 0, 3, ();
1583 $child->set_parent ($self);
1584 $self->{children}[$y][$x] = $child;
1585 }
1586 1634
1587 $self->{force_realloc} = 1; 1635 $child->{row} = $row;
1588 $self->{force_size_alloc} = 1; 1636 $child->{col} = $col;
1589 $self->realloc;
1590}
1591 1637
1592sub remove { 1638 push @widgets, $child;
1639 }
1640
1641 $self->add (@widgets);
1642}
1643
1644sub get_wh {
1593 my ($self, $child) = @_; 1645 my ($self) = @_;
1594 1646
1595 for (@{ $self->{children} }) { 1647 my (@w, @h);
1596 for (@{ $_ || [] }) { 1648
1597 $_ = undef if $_ == $child; 1649 my @children = $self->children;
1650
1651 # first pass, columns
1652 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1653 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1654
1655 my $sw = sum @w[$c .. $c + $cs - 1];
1656
1657 if ($w > $sw) {
1658 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1598 } 1659 }
1599 } 1660 }
1600}
1601 1661
1602# TODO: move to container class maybe? send children a signal on removal? 1662 # second pass, rows
1603sub clear { 1663 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)}; 1664 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1630 1665
1631 $w[$x] = max $w[$x], $w; 1666 my $sh = sum @h[$r .. $r + $rs - 1];
1632 $h[$y] = max $h[$y], $h; 1667
1668 if ($h > $sh) {
1669 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1633 } 1670 }
1634 } 1671 }
1635 1672
1636 (\@w, \@h) 1673 (\@w, \@h)
1637} 1674}
… …
1653 my ($ws, $hs) = $self->get_wh; 1690 my ($ws, $hs) = $self->get_wh;
1654 1691
1655 my $req_w = (sum @$ws) || 1; 1692 my $req_w = (sum @$ws) || 1;
1656 my $req_h = (sum @$hs) || 1; 1693 my $req_h = (sum @$hs) || 1;
1657 1694
1658 # TODO: nicer code 1695 # now linearly scale the rows/columns to the allocated size
1659 my @col_expand = @{$self->{col_expand}}; 1696 my @col_expand = @{$self->{col_expand}};
1660 @col_expand = (1) x @$ws unless @col_expand; 1697 @col_expand = (1) x @$ws unless @col_expand;
1661 my $col_expand = (sum @col_expand) || 1; 1698 my $col_expand = (sum @col_expand) || 1;
1662 1699
1663 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1700 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1670 1707
1671 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1708 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1672 1709
1673 CFPlus::UI::harmonize $hs; 1710 CFPlus::UI::harmonize $hs;
1674 1711
1675 my $y; 1712 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1713 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1676 1714
1677 for my $r (0 .. $#{$self->{children}}) { 1715 for my $widget ($self->children) {
1678 my $row = $self->{children}[$r] 1716 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1679 or next;
1680 1717
1681 my $x = 0; 1718 $widget->configure (
1682 my $row_h = $hs->[$r]; 1719 $x[$c], $y[$r],
1720 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1683 1721 );
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 } 1722 }
1696 1723
1697 1 1724 1
1698} 1725}
1699 1726
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}
1723
1724############################################################################# 1727#############################################################################
1725 1728
1726package CFPlus::UI::Fixed; 1729package CFPlus::UI::Fixed;
1727 1730
1728use List::Util qw(min max); 1731use List::Util qw(min max);
1729 1732
1730our @ISA = CFPlus::UI::Container::; 1733our @ISA = CFPlus::UI::Container::;
1731 1734
1732sub add { 1735sub add_fixed {
1733 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_; 1736 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1734 1737
1735 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h]; 1738 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1736 $self->SUPER::add ($child); 1739 $self->SUPER::add ($child);
1737} 1740}
… …
1792 for my $child ($self->visible_children) { 1795 for my $child ($self->visible_children) {
1793 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1796 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1794 1797
1795 $x = _scale $pos, $x, $W; 1798 $x = _scale $pos, $x, $W;
1796 $y = _scale $pos, $x, $H; 1799 $y = _scale $pos, $x, $H;
1797 $w = _scale $size, $w, $child->{req_w}; 1800 $w = _scale $size, $w, $W;
1798 $h = _scale $size, $h, $child->{req_h}; 1801 $h = _scale $size, $h, $H;
1799 1802
1800 $child->configure ($x, $y, $w, $h); 1803 $child->configure ($x, $y, $w, $h);
1801 } 1804 }
1802 1805
1803 1 1806 1
… …
2366 2369
2367use CFPlus::OpenGL; 2370use CFPlus::OpenGL;
2368 2371
2369my @tex = 2372my @tex =
2370 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2373 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2371 qw(b1_button_active.png); 2374 qw(b1_button_inactive.png b1_button_active.png);
2372 2375
2373sub new { 2376sub new {
2374 my $class = shift; 2377 my $class = shift;
2375 2378
2376 $class->SUPER::new ( 2379 $class->SUPER::new (
2377 padding_x => 4, 2380 padding_x => 4,
2378 padding_y => 4, 2381 padding_y => 4,
2379 fg => [1, 1, 1], 2382 fg => [1.0, 1.0, 1.0],
2380 active_fg => [0, 0, 1], 2383 active_fg => [0.8, 0.8, 0.8],
2381 can_hover => 1, 2384 can_hover => 1,
2382 align => 0, 2385 align => 0,
2383 valign => 0, 2386 valign => 0,
2384 can_events => 1, 2387 can_events => 1,
2385 @_ 2388 @_
… …
2403 2406
2404 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
2405 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2406 glColor 0, 0, 0, 1; 2409 glColor 0, 0, 0, 1;
2407 2410
2411 my $tex = $tex[$GRAB == $self];
2408 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2412 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2409 2413
2410 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
2411 2415
2412 $self->SUPER::_draw; 2416 $self->SUPER::_draw;
2413} 2417}
… …
3478 ); 3482 );
3479 3483
3480 if ($self->{anim} && $self->{animspeed}) { 3484 if ($self->{anim} && $self->{animspeed}) {
3481 CFPlus::weaken (my $widget = $self); 3485 CFPlus::weaken (my $widget = $self);
3482 3486
3487 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3488 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3483 $self->{timer} = Event->timer ( 3489 $self->{timer} = Event->timer (
3484 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3485 hard => 1, 3490 parked => 1,
3486 interval => $self->{animspeed},
3487 cb => sub { 3491 cb => sub {
3488 return unless $::CONN; 3492 return unless $::CONN && $widget;
3489 3493
3490 ++$widget->{frame}; 3494 ++$widget->{frame};
3491 $self->update_face; 3495 $widget->update_face;
3492 $self->update; 3496 $widget->update;
3497
3498 $widget->update_timer;
3493 }, 3499 },
3494 ); 3500 );
3495 3501
3496 $self->update_face; 3502 $self->update_face;
3503 $self->update_timer;
3497 } 3504 }
3498 3505
3499 $self 3506 $self
3507}
3508
3509sub update_timer {
3510 my ($self) = @_;
3511
3512 return unless $self->{timer};
3513
3514 if ($self->{visible}) {
3515 $self->{timer}->at (
3516 $self->{anim_start}
3517 + $self->{animspeed}
3518 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3519 );
3520 $self->{timer}->start;
3521 } else {
3522 $self->{timer}->stop;
3523 }
3500} 3524}
3501 3525
3502sub update_face { 3526sub update_face {
3503 my ($self) = @_; 3527 my ($self) = @_;
3504 3528
… …
3506 3530
3507 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3531 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3508 if ($anim && @$anim) { 3532 if ($anim && @$anim) {
3509 delete $self->{wait_face}; 3533 delete $self->{wait_face};
3510 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3534 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3535 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3511 } 3536 }
3512 } 3537 }
3513} 3538}
3514 3539
3515sub size_request { 3540sub size_request {
3516 my ($self) = @_; 3541 my ($self) = @_;
3517 3542
3518 if ($::CONN) { 3543 if ($::CONN) {
3519 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3544 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3520 if (my $tex = $::CONN->{texture}[$faceid]) { 3545 if (my $tex = $::CONN->{texture}[$faceid]) {
3546 $self->{tex} = $tex;
3521 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3547 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3522 } else { 3548 } else {
3523 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3549 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3524 $self->realloc; 3550 $self->realloc;
3525 }); 3551 });
… …
3536 return unless $self->{visible}; 3562 return unless $self->{visible};
3537 3563
3538 $self->SUPER::update; 3564 $self->SUPER::update;
3539} 3565}
3540 3566
3567sub invoke_visibility_change {
3568 my ($self) = @_;
3569
3570 $self->update_timer;
3571
3572 0
3573}
3574
3541sub _draw { 3575sub _draw {
3542 my ($self) = @_; 3576 my ($self) = @_;
3543 3577
3544 return unless $::CONN;
3545
3546 $self->SUPER::_draw; 3578 $self->SUPER::_draw;
3547 3579
3548 my $faceid = $::CONN->{faceid}[$self->{face}] 3580 if (my $tex = $self->{tex}) {
3549 or return;
3550
3551 my $tex = $::CONN->{texture}[$faceid];
3552
3553 if ($tex) {
3554 glEnable GL_TEXTURE_2D; 3581 glEnable GL_TEXTURE_2D;
3555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3582 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3556 glColor 0, 0, 0, 1; 3583 glColor 0, 0, 0, 1;
3557 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3584 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3558 glDisable GL_TEXTURE_2D; 3585 glDisable GL_TEXTURE_2D;
… …
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
… …
4114 while ($self->{refresh_hook}) { 4141 while ($self->{refresh_hook}) {
4115 $_->() 4142 $_->()
4116 for values %{delete $self->{refresh_hook}}; 4143 for values %{delete $self->{refresh_hook}};
4117 } 4144 }
4118 4145
4119 if ($self->{realloc}) { 4146 while ($self->{realloc}) {
4120 my %queue; 4147 my %queue;
4121 my @queue; 4148 my @queue;
4122 my $widget; 4149 my $widget;
4123 4150
4124 outer: 4151 outer:
… …
4171 } 4198 }
4172 } 4199 }
4173 4200
4174 delete $self->{realloc}{$widget+0}; 4201 delete $self->{realloc}{$widget+0};
4175 } 4202 }
4176 }
4177 4203
4178 while (my $size_alloc = delete $self->{size_alloc}) { 4204 while (my $size_alloc = delete $self->{size_alloc}) {
4179 my @queue = sort { $b->{visible} <=> $a->{visible} } 4205 my @queue = sort { $a->{visible} <=> $b->{visible} }
4180 values %$size_alloc; 4206 values %$size_alloc;
4181 4207
4182 while () { 4208 while () {
4183 my $widget = pop @queue || last; 4209 my $widget = pop @queue || last;
4184 4210
4185 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4211 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4186 4212
4187 $w = 0 if $w < 0;
4188 $h = 0 if $h < 0;
4189
4190 $w = max $widget->{min_w}, $w; 4213 $w = max $widget->{min_w}, $w;
4191 $h = max $widget->{min_h}, $h; 4214 $h = max $widget->{min_h}, $h;
4192 4215
4193# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4216# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4194# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4217# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4195 4218
4196 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4219 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4197 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4220 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4198 4221
4199 $w = int $w + 0.5; 4222 $w = int $w + 0.5;
4200 $h = int $h + 0.5; 4223 $h = int $h + 0.5;
4201 4224
4202 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4225 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4203 $widget->{old_w} = $widget->{w}; 4226 $widget->{old_w} = $widget->{w};
4204 $widget->{old_h} = $widget->{h}; 4227 $widget->{old_h} = $widget->{h};
4205 4228
4206 $widget->{w} = $w; 4229 $widget->{w} = $w;
4207 $widget->{h} = $h; 4230 $widget->{h} = $h;
4208 4231
4209 $widget->emit (size_allocate => $w, $h); 4232 $widget->emit (size_allocate => $w, $h);
4233 }
4210 } 4234 }
4211 } 4235 }
4212 } 4236 }
4213 4237
4214 while ($self->{post_alloc_hook}) { 4238 while ($self->{post_alloc_hook}) {
4215 $_->() 4239 $_->()
4216 for values %{delete $self->{post_alloc_hook}}; 4240 for values %{delete $self->{post_alloc_hook}};
4217 } 4241 }
4218
4219 4242
4220 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4243 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4221 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4244 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4222 glClear GL_COLOR_BUFFER_BIT; 4245 glClear GL_COLOR_BUFFER_BIT;
4223 4246

Diff Legend

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