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.401 by root, Sat Jul 21 20:05:37 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 },
1099 on_size_allocate => sub {
1100 my ($vp, $w, $h) = @_;
1101 $vp->{parent}->update_slider;
1102 0
1103 },
1080 ; 1104 ;
1081 1105
1082 $self->SUPER::add (0, 0, $self->{vp}); 1106 $self->SUPER::add ($self->{vp});
1083 1107
1084 $self->add ($child) if $child; 1108 $self->add ($child) if $child;
1085 1109
1086 $self 1110 $self
1087} 1111}
1088
1089#TODO# update range on size_allocate depending on child
1090 1112
1091sub add { 1113sub add {
1092 my ($self, $widget) = @_; 1114 my ($self, $widget) = @_;
1093 1115
1094 $self->{vp}->add ($self->{child} = $widget); 1116 $self->{vp}->add ($self->{child} = $widget);
1095} 1117}
1096 1118
1119sub update_slider {
1120 my ($self) = @_;
1121
1122 my $child = ($self->{vp} or return)->child;
1123
1124 if ($self->{scroll_x}) {
1125 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1126 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1127
1128 my $visible = $w1 > $w2;
1129 if ($visible != $self->{hslider_visible}) {
1130 $self->{hslider_visible} = $visible;
1131 $visible ? $self->SUPER::add ($self->{hslider})
1132 : $self->SUPER::remove ($self->{hslider});
1133 }
1134 }
1135
1136 if ($self->{scroll_y}) {
1137 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1138 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1139
1140 my $visible = $h1 > $h2;
1141 if ($visible != $self->{vslider_visible}) {
1142 $self->{vslider_visible} = $visible;
1143 $visible ? $self->SUPER::add ($self->{vslider})
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);
1164 };
1165}
1166
1097sub invoke_mouse_wheel { 1167sub invoke_mouse_wheel {
1098 my ($self, $ev) = @_; 1168 my ($self, $ev) = @_;
1099 1169
1100 return 0 unless $ev->{dy}; # only vertical movements for now
1101
1102 $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};
1103 1172
1104 1 1173 1
1105} 1174}
1106 1175
1107sub update_slider { 1176sub invoke_button_down {
1108 my ($self) = @_; 1177 my ($self, $ev, $x, $y) = @_;
1109 1178
1110 my $child = ($self->{vp} or return)->child; 1179 if ($ev->{button} == 2) {
1180 $self->start_dragging ($ev);
1181 return 1;
1182 }
1111 1183
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 } 1184 0
1185}
1120 1186
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1187sub invoke_button_up {
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1188 my ($self, $ev, $x, $y) = @_;
1123 1189
1124 my $visible = $h1 > $h2; 1190 if (delete $self->{motion}) {
1125 if ($visible != $self->{vslider}{visible}) { 1191 return 1;
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1192 }
1127 : $self->{vslider}->hide; 1193
1128 } 1194 0
1129} 1195}
1130 1196
1131sub update { 1197sub invoke_mouse_motion {
1132 my ($self) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1133 1199
1134 $self->SUPER::update; 1200 if ($self->{motion}) {
1135 $self->update_slider; 1201 $self->{motion}->($ev, $x, $y);
1202 return 1;
1203 }
1204
1205 0
1136} 1206}
1137 1207
1138sub invoke_size_allocate { 1208sub invoke_size_allocate {
1139 my ($self, $w, $h) = @_; 1209 my ($self, $w, $h) = @_;
1140 1210
… …
1296 1366
1297my @border = 1367my @border =
1298 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1368 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); 1369 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1300 1370
1371my @icon =
1372 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1373 qw(x1_move.png x1_resize.png);
1374
1301sub new { 1375sub new {
1302 my ($class, %arg) = @_; 1376 my ($class, %arg) = @_;
1303 1377
1304 my $self = $class->SUPER::new ( 1378 my $self = $class->SUPER::new (
1305 bg => [1, 1, 1, 1], 1379 bg => [1, 1, 1, 1],
… …
1473 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1474 1548
1475 my $border = $self->border; 1549 my $border = $self->border;
1476 1550
1477 glColor @{ $self->{border_bg} }; 1551 glColor @{ $self->{border_bg} };
1478 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1479 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1480 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1481 $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);
1482 1570
1483 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1571 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1484 glColor @{ $self->{bg} }; 1572 glColor @{ $self->{bg} };
1485 1573
1486 # TODO: repeat texture not scale 1574 # TODO: repeat texture not scale
… …
1507 1595
1508############################################################################# 1596#############################################################################
1509 1597
1510package CFPlus::UI::Table; 1598package CFPlus::UI::Table;
1511 1599
1512our @ISA = CFPlus::UI::Base::; 1600our @ISA = CFPlus::UI::Container::;
1513 1601
1514use List::Util qw(max sum); 1602use List::Util qw(max sum);
1515 1603
1516use CFPlus::OpenGL; 1604use CFPlus::OpenGL;
1517 1605
1518sub new { 1606sub new {
1519 my $class = shift; 1607 my $class = shift;
1520 1608
1521 $class->SUPER::new ( 1609 $class->SUPER::new (
1522 children => [],
1523 col_expand => [], 1610 col_expand => [],
1524 row_expand => [], 1611 row_expand => [],
1525 @_, 1612 @_,
1526 ) 1613 )
1527} 1614}
1528 1615
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 { 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 {
1535 my ($self) = shift; 1628 my $self = shift;
1629
1630 my @widgets;
1536 1631
1537 while (@_) { 1632 while (@_) {
1538 my ($x, $y, $child) = splice @_, 0, 3, (); 1633 my ($col, $row, $child) = splice @_, 0, 3, ();
1539 $child->set_parent ($self);
1540 $self->{children}[$y][$x] = $child;
1541 }
1542 1634
1543 $self->{force_realloc} = 1; 1635 $child->{row} = $row;
1544 $self->{force_size_alloc} = 1; 1636 $child->{col} = $col;
1545 $self->realloc;
1546}
1547 1637
1548sub remove { 1638 push @widgets, $child;
1639 }
1640
1641 $self->add (@widgets);
1642}
1643
1644sub get_wh {
1549 my ($self, $child) = @_; 1645 my ($self) = @_;
1550 1646
1551 for (@{ $self->{children} }) { 1647 my (@w, @h);
1552 for (@{ $_ || [] }) { 1648
1553 $_ = 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];
1554 } 1659 }
1555 } 1660 }
1556}
1557 1661
1558# TODO: move to container class maybe? send children a signal on removal? 1662 # second pass, rows
1559sub clear { 1663 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)}; 1664 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1586 1665
1587 $w[$x] = max $w[$x], $w; 1666 my $sh = sum @h[$r .. $r + $rs - 1];
1588 $h[$y] = max $h[$y], $h; 1667
1668 if ($h > $sh) {
1669 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1589 } 1670 }
1590 } 1671 }
1591 1672
1592 (\@w, \@h) 1673 (\@w, \@h)
1593} 1674}
… …
1609 my ($ws, $hs) = $self->get_wh; 1690 my ($ws, $hs) = $self->get_wh;
1610 1691
1611 my $req_w = (sum @$ws) || 1; 1692 my $req_w = (sum @$ws) || 1;
1612 my $req_h = (sum @$hs) || 1; 1693 my $req_h = (sum @$hs) || 1;
1613 1694
1614 # TODO: nicer code 1695 # now linearly scale the rows/columns to the allocated size
1615 my @col_expand = @{$self->{col_expand}}; 1696 my @col_expand = @{$self->{col_expand}};
1616 @col_expand = (1) x @$ws unless @col_expand; 1697 @col_expand = (1) x @$ws unless @col_expand;
1617 my $col_expand = (sum @col_expand) || 1; 1698 my $col_expand = (sum @col_expand) || 1;
1618 1699
1619 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1700 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1626 1707
1627 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1708 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1628 1709
1629 CFPlus::UI::harmonize $hs; 1710 CFPlus::UI::harmonize $hs;
1630 1711
1631 my $y; 1712 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1713 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1632 1714
1633 for my $r (0 .. $#{$self->{children}}) { 1715 for my $widget ($self->children) {
1634 my $row = $self->{children}[$r] 1716 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1635 or next;
1636 1717
1637 my $x = 0; 1718 $widget->configure (
1638 my $row_h = $hs->[$r]; 1719 $x[$c], $y[$r],
1720 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1639 1721 );
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 } 1722 }
1652 1723
1653 1 1724 1
1654} 1725}
1655 1726
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}
1679
1680############################################################################# 1727#############################################################################
1681 1728
1682package CFPlus::UI::Fixed; 1729package CFPlus::UI::Fixed;
1683 1730
1684use List::Util qw(min max); 1731use List::Util qw(min max);
1685 1732
1686our @ISA = CFPlus::UI::Container::; 1733our @ISA = CFPlus::UI::Container::;
1687 1734
1688sub add { 1735sub add_fixed {
1689 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_; 1736 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1690 1737
1691 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h]; 1738 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1692 $self->SUPER::add ($child); 1739 $self->SUPER::add ($child);
1693} 1740}
… …
2322 2369
2323use CFPlus::OpenGL; 2370use CFPlus::OpenGL;
2324 2371
2325my @tex = 2372my @tex =
2326 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2373 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2327 qw(b1_button_active.png); 2374 qw(b1_button_inactive.png b1_button_active.png);
2328 2375
2329sub new { 2376sub new {
2330 my $class = shift; 2377 my $class = shift;
2331 2378
2332 $class->SUPER::new ( 2379 $class->SUPER::new (
2333 padding_x => 4, 2380 padding_x => 4,
2334 padding_y => 4, 2381 padding_y => 4,
2335 fg => [1, 1, 1], 2382 fg => [1.0, 1.0, 1.0],
2336 active_fg => [0, 0, 1], 2383 active_fg => [0.8, 0.8, 0.8],
2337 can_hover => 1, 2384 can_hover => 1,
2338 align => 0, 2385 align => 0,
2339 valign => 0, 2386 valign => 0,
2340 can_events => 1, 2387 can_events => 1,
2341 @_ 2388 @_
… …
2359 2406
2360 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
2361 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2362 glColor 0, 0, 0, 1; 2409 glColor 0, 0, 0, 1;
2363 2410
2411 my $tex = $tex[$GRAB == $self];
2364 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2412 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365 2413
2366 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
2367 2415
2368 $self->SUPER::_draw; 2416 $self->SUPER::_draw;
2369} 2417}
… …
3434 ); 3482 );
3435 3483
3436 if ($self->{anim} && $self->{animspeed}) { 3484 if ($self->{anim} && $self->{animspeed}) {
3437 CFPlus::weaken (my $widget = $self); 3485 CFPlus::weaken (my $widget = $self);
3438 3486
3487 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3488 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3439 $self->{timer} = Event->timer ( 3489 $self->{timer} = Event->timer (
3440 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3441 hard => 1, 3490 parked => 1,
3442 interval => $self->{animspeed},
3443 cb => sub { 3491 cb => sub {
3444 return unless $::CONN; 3492 return unless $::CONN && $widget;
3445 3493
3446 ++$widget->{frame}; 3494 ++$widget->{frame};
3447 $self->update_face; 3495 $widget->update_face;
3448 $self->update; 3496 $widget->update;
3497
3498 $widget->update_timer;
3449 }, 3499 },
3450 ); 3500 );
3451 3501
3452 $self->update_face; 3502 $self->update_face;
3503 $self->update_timer;
3453 } 3504 }
3454 3505
3455 $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 }
3456} 3524}
3457 3525
3458sub update_face { 3526sub update_face {
3459 my ($self) = @_; 3527 my ($self) = @_;
3460 3528
… …
3492 return unless $self->{visible}; 3560 return unless $self->{visible};
3493 3561
3494 $self->SUPER::update; 3562 $self->SUPER::update;
3495} 3563}
3496 3564
3565sub invoke_visibility_change {
3566 my ($self) = @_;
3567
3568 $self->update_timer;
3569
3570 0
3571}
3572
3497sub _draw { 3573sub _draw {
3498 my ($self) = @_; 3574 my ($self) = @_;
3499 3575
3500 return unless $::CONN; 3576 return unless $::CONN;
3501 3577
… …
3516} 3592}
3517 3593
3518sub destroy { 3594sub destroy {
3519 my ($self) = @_; 3595 my ($self) = @_;
3520 3596
3521 $self->{timer}->cancel 3597 (delete $self->{timer})->cancel
3522 if $self->{timer}; 3598 if $self->{timer};
3523 3599
3524 $self->SUPER::destroy; 3600 $self->SUPER::destroy;
3525} 3601}
3526 3602
… …
4070 while ($self->{refresh_hook}) { 4146 while ($self->{refresh_hook}) {
4071 $_->() 4147 $_->()
4072 for values %{delete $self->{refresh_hook}}; 4148 for values %{delete $self->{refresh_hook}};
4073 } 4149 }
4074 4150
4075 if ($self->{realloc}) { 4151 while ($self->{realloc}) {
4076 my %queue; 4152 my %queue;
4077 my @queue; 4153 my @queue;
4078 my $widget; 4154 my $widget;
4079 4155
4080 outer: 4156 outer:
… …
4127 } 4203 }
4128 } 4204 }
4129 4205
4130 delete $self->{realloc}{$widget+0}; 4206 delete $self->{realloc}{$widget+0};
4131 } 4207 }
4132 }
4133 4208
4134 while (my $size_alloc = delete $self->{size_alloc}) { 4209 while (my $size_alloc = delete $self->{size_alloc}) {
4135 my @queue = sort { $b->{visible} <=> $a->{visible} } 4210 my @queue = sort { $a->{visible} <=> $b->{visible} }
4136 values %$size_alloc; 4211 values %$size_alloc;
4137 4212
4138 while () { 4213 while () {
4139 my $widget = pop @queue || last; 4214 my $widget = pop @queue || last;
4140 4215
4141 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4216 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4142 4217
4143 $w = 0 if $w < 0;
4144 $h = 0 if $h < 0;
4145
4146 $w = max $widget->{min_w}, $w; 4218 $w = max $widget->{min_w}, $w;
4147 $h = max $widget->{min_h}, $h; 4219 $h = max $widget->{min_h}, $h;
4148 4220
4149# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4221# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4150# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4222# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4151 4223
4152 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4224 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4153 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4225 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4154 4226
4155 $w = int $w + 0.5; 4227 $w = int $w + 0.5;
4156 $h = int $h + 0.5; 4228 $h = int $h + 0.5;
4157 4229
4158 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4230 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4159 $widget->{old_w} = $widget->{w}; 4231 $widget->{old_w} = $widget->{w};
4160 $widget->{old_h} = $widget->{h}; 4232 $widget->{old_h} = $widget->{h};
4161 4233
4162 $widget->{w} = $w; 4234 $widget->{w} = $w;
4163 $widget->{h} = $h; 4235 $widget->{h} = $h;
4164 4236
4165 $widget->emit (size_allocate => $w, $h); 4237 $widget->emit (size_allocate => $w, $h);
4238 }
4166 } 4239 }
4167 } 4240 }
4168 } 4241 }
4169 4242
4170 while ($self->{post_alloc_hook}) { 4243 while ($self->{post_alloc_hook}) {
4171 $_->() 4244 $_->()
4172 for values %{delete $self->{post_alloc_hook}}; 4245 for values %{delete $self->{post_alloc_hook}};
4173 } 4246 }
4174
4175 4247
4176 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4248 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4177 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4249 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4178 glClear GL_COLOR_BUFFER_BIT; 4250 glClear GL_COLOR_BUFFER_BIT;
4179 4251

Diff Legend

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