… | |
… | |
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 | |
552 | sub 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 | |
564 | sub set_parent { |
559 | sub set_parent { |
565 | my ($self, $parent) = @_; |
560 | my ($self, $parent) = @_; |
566 | |
561 | |
567 | CFPlus::weaken ($self->{parent} = $parent); |
562 | CFPlus::weaken ($self->{parent} = $parent); |
… | |
… | |
746 | can_events => 0, |
741 | can_events => 0, |
747 | %arg, |
742 | %arg, |
748 | ); |
743 | ); |
749 | |
744 | |
750 | $self->add (@$children) |
745 | $self->add (@$children) |
751 | if $children; |
746 | if $children && @$children; |
752 | |
747 | |
753 | $self |
748 | $self |
754 | } |
749 | } |
755 | |
750 | |
756 | sub realloc { |
751 | sub realloc { |
… | |
… | |
765 | my ($self, @widgets) = @_; |
760 | my ($self, @widgets) = @_; |
766 | |
761 | |
767 | $_->set_parent ($self) |
762 | $_->set_parent ($self) |
768 | for @widgets; |
763 | for @widgets; |
769 | |
764 | |
|
|
765 | # TODO: only do this in widgets that need it, e.g. root, fixed |
770 | use sort 'stable'; |
766 | use sort 'stable'; |
771 | |
767 | |
772 | $self->{children} = [ |
768 | $self->{children} = [ |
773 | sort { $a->{z} <=> $b->{z} } |
769 | sort { $a->{z} <=> $b->{z} } |
774 | @{$self->{children}}, @widgets |
770 | @{$self->{children}}, @widgets |
775 | ]; |
771 | ]; |
776 | |
772 | |
777 | $self->realloc; |
773 | $self->realloc; |
|
|
774 | |
|
|
775 | map $_+0, @widgets |
778 | } |
776 | } |
779 | |
777 | |
780 | sub children { |
778 | sub children { |
781 | @{ $_[0]{children} } |
779 | @{ $_[0]{children} } |
782 | } |
780 | } |
… | |
… | |
793 | } |
791 | } |
794 | |
792 | |
795 | sub clear { |
793 | sub clear { |
796 | my ($self) = @_; |
794 | my ($self) = @_; |
797 | |
795 | |
798 | my $children = delete $self->{children}; |
796 | my $children = $self->{children}; |
799 | $self->{children} = []; |
797 | $self->{children} = []; |
800 | |
798 | |
801 | for (@$children) { |
799 | for (@$children) { |
802 | delete $_->{parent}; |
800 | delete $_->{parent}; |
803 | $_->hide; |
801 | $_->hide; |
… | |
… | |
943 | } |
941 | } |
944 | |
942 | |
945 | ############################################################################# |
943 | ############################################################################# |
946 | |
944 | |
947 | package CFPlus::UI::ViewPort; |
945 | package CFPlus::UI::ViewPort; |
|
|
946 | |
|
|
947 | use List::Util qw(min max); |
948 | |
948 | |
949 | our @ISA = CFPlus::UI::Window::; |
949 | our @ISA = CFPlus::UI::Window::; |
950 | |
950 | |
951 | sub new { |
951 | sub new { |
952 | my $class = shift; |
952 | my $class = shift; |
… | |
… | |
961 | sub size_request { |
961 | sub size_request { |
962 | my ($self) = @_; |
962 | my ($self) = @_; |
963 | |
963 | |
964 | my ($w, $h) = @{$self->child}{qw(req_w req_h)}; |
964 | my ($w, $h) = @{$self->child}{qw(req_w req_h)}; |
965 | |
965 | |
966 | $w = 10 if $self->{scroll_x}; |
966 | $w = 1 if $self->{scroll_x}; |
967 | $h = 10 if $self->{scroll_y}; |
967 | $h = 1 if $self->{scroll_y}; |
968 | |
968 | |
969 | ($w, $h) |
969 | ($w, $h) |
970 | } |
970 | } |
971 | |
971 | |
972 | sub invoke_size_allocate { |
972 | sub invoke_size_allocate { |
… | |
… | |
984 | } |
984 | } |
985 | |
985 | |
986 | sub set_offset { |
986 | sub set_offset { |
987 | my ($self, $x, $y) = @_; |
987 | my ($self, $x, $y) = @_; |
988 | |
988 | |
|
|
989 | my $x = max 0, min $self->child->{w} - $self->{w}, int $x; |
|
|
990 | my $y = max 0, min $self->child->{h} - $self->{h}, int $y; |
|
|
991 | |
|
|
992 | if ($x != $self->{view_x} or $y != $self->{view_y}) { |
989 | $self->{view_x} = int $x; |
993 | $self->{view_x} = $x; |
990 | $self->{view_y} = int $y; |
994 | $self->{view_y} = $y; |
991 | |
995 | |
|
|
996 | $self->emit (changed => $x, $y); |
992 | $self->update; |
997 | $self->update; |
|
|
998 | } |
993 | } |
999 | } |
994 | |
1000 | |
995 | # hmm, this does not work for topleft of $self... but we should not ask for that |
1001 | # hmm, this does not work for topleft of $self... but we should not ask for that |
996 | sub coord2local { |
1002 | sub coord2local { |
997 | my ($self, $x, $y) = @_; |
1003 | my ($self, $x, $y) = @_; |
… | |
… | |
1012 | my ($self, $x, $y) = @_; |
1018 | my ($self, $x, $y) = @_; |
1013 | |
1019 | |
1014 | if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} |
1020 | if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} |
1015 | && $y >= $self->{y} && $y < $self->{y} + $self->{h} |
1021 | && $y >= $self->{y} && $y < $self->{y} + $self->{h} |
1016 | ) { |
1022 | ) { |
1017 | $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) |
1023 | $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) |
1018 | } else { |
1024 | } else { |
1019 | $self->CFPlus::UI::Base::find_widget ($x, $y) |
1025 | $self->CFPlus::UI::Base::find_widget ($x, $y) |
1020 | } |
1026 | } |
1021 | } |
1027 | } |
1022 | |
1028 | |
… | |
… | |
1043 | my $child = delete $arg{child}; |
1049 | my $child = delete $arg{child}; |
1044 | |
1050 | |
1045 | my $self; |
1051 | my $self; |
1046 | |
1052 | |
1047 | my $hslider = new CFPlus::UI::Slider |
1053 | my $hslider = new CFPlus::UI::Slider |
|
|
1054 | col => 0, |
|
|
1055 | row => 1, |
1048 | vertical => 0, |
1056 | vertical => 0, |
1049 | range => [0, 0, 1, 0.01], # HACK fix |
1057 | range => [0, 0, 1, 0.01], # HACK fix |
1050 | on_changed => sub { |
1058 | on_changed => sub { |
1051 | $self->{hpos} = $_[1]; |
1059 | $self->{hpos} = $_[1]; |
1052 | $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); |
1060 | $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); |
1053 | }, |
1061 | }, |
1054 | ; |
1062 | ; |
1055 | |
1063 | |
1056 | my $vslider = new CFPlus::UI::Slider |
1064 | my $vslider = new CFPlus::UI::Slider |
|
|
1065 | col => 1, |
|
|
1066 | row => 0, |
1057 | vertical => 1, |
1067 | vertical => 1, |
1058 | range => [0, 0, 1, 0.01], # HACK fix |
1068 | range => [0, 0, 1, 0.01], # HACK fix |
1059 | on_changed => sub { |
1069 | on_changed => sub { |
1060 | $self->{vpos} = $_[1]; |
1070 | $self->{vpos} = $_[1]; |
1061 | $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); |
1071 | $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); |
… | |
… | |
1072 | row_expand => [1, 0], |
1082 | row_expand => [1, 0], |
1073 | %arg, |
1083 | %arg, |
1074 | ); |
1084 | ); |
1075 | |
1085 | |
1076 | $self->{vp} = new CFPlus::UI::ViewPort |
1086 | $self->{vp} = new CFPlus::UI::ViewPort |
|
|
1087 | col => 0, |
|
|
1088 | row => 0, |
1077 | expand => 1, |
1089 | expand => 1, |
1078 | scroll_x => $self->{scroll_x}, |
1090 | scroll_x => $self->{scroll_x}, |
1079 | scroll_y => $self->{scroll_y}, |
1091 | scroll_y => $self->{scroll_y}, |
|
|
1092 | on_changed => sub { |
|
|
1093 | my ($vp, $x, $y) = @_; |
|
|
1094 | |
|
|
1095 | $vp->{parent}{hslider}->set_value ($x); |
|
|
1096 | $vp->{parent}{vslider}->set_value ($y); |
|
|
1097 | |
|
|
1098 | 0 |
|
|
1099 | }, |
1080 | ; |
1100 | ; |
1081 | |
1101 | |
1082 | $self->SUPER::add (0, 0, $self->{vp}); |
1102 | $self->SUPER::add ($self->{vp}); |
1083 | $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y}; |
|
|
1084 | $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x}; |
|
|
1085 | |
1103 | |
1086 | $self->add ($child) if $child; |
1104 | $self->add ($child) if $child; |
1087 | |
1105 | |
1088 | $self |
1106 | $self |
1089 | } |
1107 | } |
1090 | |
|
|
1091 | #TODO# update range on size_allocate depending on child |
|
|
1092 | |
1108 | |
1093 | sub add { |
1109 | sub add { |
1094 | my ($self, $widget) = @_; |
1110 | my ($self, $widget) = @_; |
1095 | |
1111 | |
1096 | $self->{vp}->add ($self->{child} = $widget); |
1112 | $self->{vp}->add ($self->{child} = $widget); |
1097 | } |
1113 | } |
1098 | |
1114 | |
|
|
1115 | sub update_slider { |
|
|
1116 | my ($self) = @_; |
|
|
1117 | |
|
|
1118 | my $child = ($self->{vp} or return)->child; |
|
|
1119 | |
|
|
1120 | my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); |
|
|
1121 | $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); |
|
|
1122 | |
|
|
1123 | my $visible = $w1 > $w2; |
|
|
1124 | if ($visible != $self->{hslider_visible}) { |
|
|
1125 | $self->{hslider_visible} = $visible; |
|
|
1126 | $visible ? $self->SUPER::add ($self->{hslider}) |
|
|
1127 | : $self->SUPER::remove ($self->{hslider}); |
|
|
1128 | } |
|
|
1129 | |
|
|
1130 | my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); |
|
|
1131 | $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); |
|
|
1132 | |
|
|
1133 | my $visible = $h1 > $h2; |
|
|
1134 | if ($visible != $self->{vslider_visible}) { |
|
|
1135 | $self->{vslider_visible} = $visible; |
|
|
1136 | $visible ? $self->SUPER::add ($self->{vslider}) |
|
|
1137 | : $self->SUPER::remove ($self->{vslider}); |
|
|
1138 | } |
|
|
1139 | } |
|
|
1140 | |
|
|
1141 | sub start_dragging { |
|
|
1142 | my ($self, $ev) = @_; |
|
|
1143 | |
|
|
1144 | $self->grab_focus; |
|
|
1145 | |
|
|
1146 | my $ox = $self->{vp}{view_x}; |
|
|
1147 | my $oy = $self->{vp}{view_y}; |
|
|
1148 | |
|
|
1149 | $self->{motion} = sub { |
|
|
1150 | my ($ev, $x, $y) = @_; |
|
|
1151 | |
|
|
1152 | $ox -= $ev->{xrel}; |
|
|
1153 | $oy -= $ev->{yrel}; |
|
|
1154 | |
|
|
1155 | $self->{vp}->set_offset ($ox, $oy); |
|
|
1156 | }; |
|
|
1157 | } |
|
|
1158 | |
1099 | sub invoke_mouse_wheel { |
1159 | sub invoke_mouse_wheel { |
1100 | my ($self, $ev) = @_; |
1160 | my ($self, $ev) = @_; |
1101 | |
1161 | |
1102 | return 0 unless $ev->{dy}; # only vertical movements |
|
|
1103 | |
|
|
1104 | $self->{vslider}->emit (mouse_wheel => $ev); |
1162 | $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible}; |
|
|
1163 | $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible}; |
1105 | |
1164 | |
1106 | 1 |
1165 | 1 |
1107 | } |
1166 | } |
1108 | |
1167 | |
1109 | sub update_slider { |
1168 | sub invoke_button_down { |
1110 | my ($self) = @_; |
1169 | my ($self, $ev, $x, $y) = @_; |
1111 | |
1170 | |
1112 | my $child = ($self->{vp} or return)->child; |
1171 | if ($ev->{button} == 2) { |
|
|
1172 | $self->start_dragging ($ev); |
|
|
1173 | return 1; |
|
|
1174 | } |
1113 | |
1175 | |
1114 | my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); |
1176 | 0 |
1115 | $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); |
|
|
1116 | #$self->{hslider}->set_visibility ($w1 != $w2); |
|
|
1117 | |
|
|
1118 | my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); |
|
|
1119 | $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); |
|
|
1120 | #$self->{vslider}->set_visibility ($h1 != $h2); |
|
|
1121 | } |
1177 | } |
1122 | |
1178 | |
1123 | sub update { |
1179 | sub invoke_button_up { |
1124 | my ($self) = @_; |
1180 | my ($self, $ev, $x, $y) = @_; |
1125 | |
1181 | |
1126 | $self->SUPER::update; |
1182 | if (delete $self->{motion}) { |
1127 | $self->update_slider; |
1183 | return 1; |
|
|
1184 | } |
|
|
1185 | |
|
|
1186 | 0 |
|
|
1187 | } |
|
|
1188 | |
|
|
1189 | sub invoke_mouse_motion { |
|
|
1190 | my ($self, $ev, $x, $y) = @_; |
|
|
1191 | |
|
|
1192 | if ($self->{motion}) { |
|
|
1193 | $self->{motion}->($ev, $x, $y); |
|
|
1194 | return 1; |
|
|
1195 | } |
|
|
1196 | |
|
|
1197 | 0 |
1128 | } |
1198 | } |
1129 | |
1199 | |
1130 | sub invoke_size_allocate { |
1200 | sub invoke_size_allocate { |
1131 | my ($self, $w, $h) = @_; |
1201 | my ($self, $w, $h) = @_; |
1132 | |
1202 | |
… | |
… | |
1288 | |
1358 | |
1289 | my @border = |
1359 | my @border = |
1290 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
1360 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
1291 | qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); |
1361 | qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); |
1292 | |
1362 | |
|
|
1363 | my @icon = |
|
|
1364 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
|
|
1365 | qw(x1_move.png x1_resize.png); |
|
|
1366 | |
1293 | sub new { |
1367 | sub new { |
1294 | my ($class, %arg) = @_; |
1368 | my ($class, %arg) = @_; |
1295 | |
1369 | |
1296 | my $self = $class->SUPER::new ( |
1370 | my $self = $class->SUPER::new ( |
1297 | bg => [1, 1, 1, 1], |
1371 | bg => [1, 1, 1, 1], |
… | |
… | |
1465 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
1539 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
1466 | |
1540 | |
1467 | my $border = $self->border; |
1541 | my $border = $self->border; |
1468 | |
1542 | |
1469 | glColor @{ $self->{border_bg} }; |
1543 | glColor @{ $self->{border_bg} }; |
1470 | $border[0]->draw_quad_alpha (0, 0, $w, $border); |
1544 | $border[0]->draw_quad_alpha ( 0, 0, $w, $border); |
1471 | $border[1]->draw_quad_alpha (0, $border, $border, $ch); |
1545 | $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); |
1472 | $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); |
1546 | $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); |
1473 | $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); |
1547 | $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); |
|
|
1548 | |
|
|
1549 | # move |
|
|
1550 | my $w2 = ($w - $border) * .5; |
|
|
1551 | my $h2 = ($h - $border) * .5; |
|
|
1552 | $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); |
|
|
1553 | $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); |
|
|
1554 | $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); |
|
|
1555 | |
|
|
1556 | # resize |
|
|
1557 | $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); |
|
|
1558 | $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) |
|
|
1559 | unless $self->{has_close_button}; |
|
|
1560 | $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); |
|
|
1561 | $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); |
1474 | |
1562 | |
1475 | if (@{$self->{bg}} < 4 || $self->{bg}[3]) { |
1563 | if (@{$self->{bg}} < 4 || $self->{bg}[3]) { |
1476 | glColor @{ $self->{bg} }; |
1564 | glColor @{ $self->{bg} }; |
1477 | |
1565 | |
1478 | # TODO: repeat texture not scale |
1566 | # TODO: repeat texture not scale |
… | |
… | |
1499 | |
1587 | |
1500 | ############################################################################# |
1588 | ############################################################################# |
1501 | |
1589 | |
1502 | package CFPlus::UI::Table; |
1590 | package CFPlus::UI::Table; |
1503 | |
1591 | |
1504 | our @ISA = CFPlus::UI::Base::; |
1592 | our @ISA = CFPlus::UI::Container::; |
1505 | |
1593 | |
1506 | use List::Util qw(max sum); |
1594 | use List::Util qw(max sum); |
1507 | |
1595 | |
1508 | use CFPlus::OpenGL; |
1596 | use CFPlus::OpenGL; |
1509 | |
1597 | |
… | |
… | |
1515 | row_expand => [], |
1603 | row_expand => [], |
1516 | @_, |
1604 | @_, |
1517 | ) |
1605 | ) |
1518 | } |
1606 | } |
1519 | |
1607 | |
1520 | sub children { |
|
|
1521 | grep $_, map @$_, grep $_, @{ $_[0]{children} } |
|
|
1522 | } |
|
|
1523 | |
|
|
1524 | sub add { |
1608 | sub add { |
|
|
1609 | my ($self, @widgets) = @_; |
|
|
1610 | |
|
|
1611 | for my $child (@widgets) { |
|
|
1612 | $child->{rowspan} ||= 1; |
|
|
1613 | $child->{colspan} ||= 1; |
|
|
1614 | } |
|
|
1615 | |
|
|
1616 | $self->SUPER::add (@widgets); |
|
|
1617 | } |
|
|
1618 | |
|
|
1619 | sub add_at { |
1525 | my ($self) = shift; |
1620 | my $self = shift; |
|
|
1621 | |
|
|
1622 | my @widgets; |
1526 | |
1623 | |
1527 | while (@_) { |
1624 | while (@_) { |
1528 | my ($x, $y, $child) = splice @_, 0, 3, (); |
1625 | my ($col, $row, $child) = splice @_, 0, 3, (); |
1529 | $child->set_parent ($self); |
|
|
1530 | $self->{children}[$y][$x] = $child; |
|
|
1531 | } |
|
|
1532 | |
1626 | |
1533 | $self->{force_realloc} = 1; |
1627 | $child->{row} = $row; |
1534 | $self->{force_size_alloc} = 1; |
1628 | $child->{col} = $col; |
1535 | $self->realloc; |
|
|
1536 | } |
|
|
1537 | |
1629 | |
1538 | sub remove { |
1630 | push @widgets, $child; |
|
|
1631 | } |
|
|
1632 | |
|
|
1633 | $self->add (@widgets); |
|
|
1634 | } |
|
|
1635 | |
|
|
1636 | sub get_wh { |
1539 | my ($self, $child) = @_; |
1637 | my ($self) = @_; |
1540 | |
1638 | |
1541 | # TODO: not yet implemented |
1639 | my (@w, @h); |
1542 | } |
|
|
1543 | |
|
|
1544 | # TODO: move to container class maybe? send children a signal on removal? |
|
|
1545 | sub clear { |
|
|
1546 | my ($self) = @_; |
|
|
1547 | |
1640 | |
1548 | my @children = $self->children; |
1641 | my @children = $self->children; |
1549 | delete $self->{children}; |
1642 | |
|
|
1643 | # first pass, columns |
|
|
1644 | for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { |
|
|
1645 | my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; |
|
|
1646 | |
|
|
1647 | my $sw = sum @w[$c .. $c + $cs - 1]; |
|
|
1648 | |
|
|
1649 | if ($w > $sw) { |
|
|
1650 | $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; |
|
|
1651 | } |
1550 | |
1652 | } |
1551 | for (@children) { |
|
|
1552 | delete $_->{parent}; |
|
|
1553 | $_->hide; |
|
|
1554 | } |
|
|
1555 | |
1653 | |
1556 | $self->realloc; |
1654 | # second pass, rows |
1557 | } |
1655 | for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { |
1558 | |
|
|
1559 | sub get_wh { |
|
|
1560 | my ($self) = @_; |
|
|
1561 | |
|
|
1562 | my (@w, @h); |
|
|
1563 | |
|
|
1564 | for my $y (0 .. $#{$self->{children}}) { |
|
|
1565 | my $row = $self->{children}[$y] |
|
|
1566 | or next; |
|
|
1567 | |
|
|
1568 | for my $x (0 .. $#$row) { |
|
|
1569 | my $widget = $row->[$x] |
|
|
1570 | or next; |
|
|
1571 | my ($w, $h) = @$widget{qw(req_w req_h)}; |
1656 | my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; |
1572 | |
1657 | |
1573 | $w[$x] = max $w[$x], $w; |
1658 | my $sh = sum @h[$r .. $r + $rs - 1]; |
1574 | $h[$y] = max $h[$y], $h; |
1659 | |
|
|
1660 | if ($h > $sh) { |
|
|
1661 | $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; |
1575 | } |
1662 | } |
1576 | } |
1663 | } |
1577 | |
1664 | |
1578 | (\@w, \@h) |
1665 | (\@w, \@h) |
1579 | } |
1666 | } |
… | |
… | |
1595 | my ($ws, $hs) = $self->get_wh; |
1682 | my ($ws, $hs) = $self->get_wh; |
1596 | |
1683 | |
1597 | my $req_w = (sum @$ws) || 1; |
1684 | my $req_w = (sum @$ws) || 1; |
1598 | my $req_h = (sum @$hs) || 1; |
1685 | my $req_h = (sum @$hs) || 1; |
1599 | |
1686 | |
1600 | # TODO: nicer code |
1687 | # now linearly scale the rows/columns to the allocated size |
1601 | my @col_expand = @{$self->{col_expand}}; |
1688 | my @col_expand = @{$self->{col_expand}}; |
1602 | @col_expand = (1) x @$ws unless @col_expand; |
1689 | @col_expand = (1) x @$ws unless @col_expand; |
1603 | my $col_expand = (sum @col_expand) || 1; |
1690 | my $col_expand = (sum @col_expand) || 1; |
1604 | |
1691 | |
1605 | $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; |
1692 | $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; |
… | |
… | |
1612 | |
1699 | |
1613 | $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; |
1700 | $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; |
1614 | |
1701 | |
1615 | CFPlus::UI::harmonize $hs; |
1702 | CFPlus::UI::harmonize $hs; |
1616 | |
1703 | |
1617 | my $y; |
1704 | my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } |
|
|
1705 | my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } |
1618 | |
1706 | |
1619 | for my $r (0 .. $#{$self->{children}}) { |
1707 | for my $widget ($self->children) { |
1620 | my $row = $self->{children}[$r] |
1708 | my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; |
1621 | or next; |
|
|
1622 | |
1709 | |
1623 | my $x = 0; |
1710 | $widget->configure ( |
1624 | my $row_h = $hs->[$r]; |
1711 | $x[$c], $y[$r], |
|
|
1712 | $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], |
1625 | |
1713 | ); |
1626 | for my $c (0 .. $#$row) { |
1714 | } |
1627 | my $col_w = $ws->[$c]; |
|
|
1628 | |
1715 | |
1629 | if (my $widget = $row->[$c]) { |
1716 | 1 |
1630 | $widget->configure ($x, $y, $col_w, $row_h); |
1717 | } |
1631 | } |
|
|
1632 | |
1718 | |
1633 | $x += $col_w; |
1719 | ############################################################################# |
|
|
1720 | |
|
|
1721 | package CFPlus::UI::Fixed; |
|
|
1722 | |
|
|
1723 | use List::Util qw(min max); |
|
|
1724 | |
|
|
1725 | our @ISA = CFPlus::UI::Container::; |
|
|
1726 | |
|
|
1727 | sub add { |
|
|
1728 | my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_; |
|
|
1729 | |
|
|
1730 | $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h]; |
|
|
1731 | $self->SUPER::add ($child); |
|
|
1732 | } |
|
|
1733 | |
|
|
1734 | sub _scale($$$) { |
|
|
1735 | my ($mode, $val, $max) = @_; |
|
|
1736 | |
|
|
1737 | $mode eq "abs" ? $val |
|
|
1738 | : $mode eq "rel" ? $val * $max |
|
|
1739 | : 0 |
|
|
1740 | } |
|
|
1741 | |
|
|
1742 | sub size_request { |
|
|
1743 | my ($self) = @_; |
|
|
1744 | |
|
|
1745 | my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); |
|
|
1746 | |
|
|
1747 | # determine overall size by querying abs widgets |
|
|
1748 | for my $child ($self->visible_children) { |
|
|
1749 | my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; |
|
|
1750 | |
|
|
1751 | if ($pos eq "abs") { |
|
|
1752 | $w = _scale $size, $w, $child->{req_w}; |
|
|
1753 | $h = _scale $size, $h, $child->{req_h}; |
|
|
1754 | |
|
|
1755 | $x1 = min $x1, $x; $x2 = max $x2, $x + $w; |
|
|
1756 | $y1 = min $y1, $y; $y2 = max $y2, $y + $h; |
1634 | } |
1757 | } |
|
|
1758 | } |
1635 | |
1759 | |
1636 | $y += $row_h; |
1760 | my $W = $x2 - $x1; |
|
|
1761 | my $H = $y2 - $y1; |
|
|
1762 | |
|
|
1763 | # now layout remaining widgets |
|
|
1764 | for my $child ($self->visible_children) { |
|
|
1765 | my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; |
|
|
1766 | |
|
|
1767 | if ($pos ne "abs") { |
|
|
1768 | $x = _scale $pos, $x, $W; |
|
|
1769 | $y = _scale $pos, $x, $H; |
|
|
1770 | $w = _scale $size, $w, $child->{req_w}; |
|
|
1771 | $h = _scale $size, $h, $child->{req_h}; |
|
|
1772 | |
|
|
1773 | $x1 = min $x1, $x; $x2 = max $x2, $x + $w; |
|
|
1774 | $y1 = min $y1, $y; $y2 = max $y2, $y + $h; |
|
|
1775 | } |
|
|
1776 | } |
|
|
1777 | |
|
|
1778 | my $W = $x2 - $x1; |
|
|
1779 | my $H = $y2 - $y1; |
|
|
1780 | |
|
|
1781 | ($W, $H) |
|
|
1782 | } |
|
|
1783 | |
|
|
1784 | sub invoke_size_allocate { |
|
|
1785 | my ($self, $W, $H) = @_; |
|
|
1786 | |
|
|
1787 | for my $child ($self->visible_children) { |
|
|
1788 | my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; |
|
|
1789 | |
|
|
1790 | $x = _scale $pos, $x, $W; |
|
|
1791 | $y = _scale $pos, $x, $H; |
|
|
1792 | $w = _scale $size, $w, $child->{req_w}; |
|
|
1793 | $h = _scale $size, $h, $child->{req_h}; |
|
|
1794 | |
|
|
1795 | $child->configure ($x, $y, $w, $h); |
1637 | } |
1796 | } |
1638 | |
1797 | |
1639 | 1 |
1798 | 1 |
1640 | } |
|
|
1641 | |
|
|
1642 | sub find_widget { |
|
|
1643 | my ($self, $x, $y) = @_; |
|
|
1644 | |
|
|
1645 | $x -= $self->{x}; |
|
|
1646 | $y -= $self->{y}; |
|
|
1647 | |
|
|
1648 | my $res; |
|
|
1649 | |
|
|
1650 | for (grep $_, map @$_, grep $_, @{ $self->{children} }) { |
|
|
1651 | $res = $_->find_widget ($x, $y) |
|
|
1652 | and return $res; |
|
|
1653 | } |
|
|
1654 | |
|
|
1655 | $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) |
|
|
1656 | } |
|
|
1657 | |
|
|
1658 | sub _draw { |
|
|
1659 | my ($self) = @_; |
|
|
1660 | |
|
|
1661 | for (grep $_, @{$self->{children}}) { |
|
|
1662 | $_->draw for grep $_, @$_; |
|
|
1663 | } |
|
|
1664 | } |
1799 | } |
1665 | |
1800 | |
1666 | ############################################################################# |
1801 | ############################################################################# |
1667 | |
1802 | |
1668 | package CFPlus::UI::Box; |
1803 | package CFPlus::UI::Box; |
… | |
… | |
2226 | |
2361 | |
2227 | use CFPlus::OpenGL; |
2362 | use CFPlus::OpenGL; |
2228 | |
2363 | |
2229 | my @tex = |
2364 | my @tex = |
2230 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
2365 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
2231 | qw(b1_button_active.png); |
2366 | qw(b1_button_inactive.png b1_button_active.png); |
2232 | |
2367 | |
2233 | sub new { |
2368 | sub new { |
2234 | my $class = shift; |
2369 | my $class = shift; |
2235 | |
2370 | |
2236 | $class->SUPER::new ( |
2371 | $class->SUPER::new ( |
2237 | padding_x => 4, |
2372 | padding_x => 4, |
2238 | padding_y => 4, |
2373 | padding_y => 4, |
2239 | fg => [1, 1, 1], |
2374 | fg => [1.0, 1.0, 1.0], |
2240 | active_fg => [0, 0, 1], |
2375 | active_fg => [0.8, 0.8, 0.8], |
2241 | can_hover => 1, |
2376 | can_hover => 1, |
2242 | align => 0, |
2377 | align => 0, |
2243 | valign => 0, |
2378 | valign => 0, |
2244 | can_events => 1, |
2379 | can_events => 1, |
2245 | @_ |
2380 | @_ |
… | |
… | |
2263 | |
2398 | |
2264 | glEnable GL_TEXTURE_2D; |
2399 | glEnable GL_TEXTURE_2D; |
2265 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2400 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2266 | glColor 0, 0, 0, 1; |
2401 | glColor 0, 0, 0, 1; |
2267 | |
2402 | |
|
|
2403 | my $tex = $tex[$GRAB == $self]; |
2268 | $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2404 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2269 | |
2405 | |
2270 | glDisable GL_TEXTURE_2D; |
2406 | glDisable GL_TEXTURE_2D; |
2271 | |
2407 | |
2272 | $self->SUPER::_draw; |
2408 | $self->SUPER::_draw; |
2273 | } |
2409 | } |
… | |
… | |
3328 | |
3464 | |
3329 | sub new { |
3465 | sub new { |
3330 | my $class = shift; |
3466 | my $class = shift; |
3331 | |
3467 | |
3332 | my $self = $class->SUPER::new ( |
3468 | my $self = $class->SUPER::new ( |
|
|
3469 | size_w => 32, |
|
|
3470 | size_h => 8, |
3333 | aspect => 1, |
3471 | aspect => 1, |
3334 | can_events => 0, |
3472 | can_events => 0, |
3335 | @_, |
3473 | @_, |
3336 | ); |
3474 | ); |
3337 | |
3475 | |
3338 | if ($self->{anim} && $self->{animspeed}) { |
3476 | if ($self->{anim} && $self->{animspeed}) { |
3339 | CFPlus::weaken (my $widget = $self); |
3477 | CFPlus::weaken (my $widget = $self); |
3340 | |
3478 | |
|
|
3479 | $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; |
|
|
3480 | $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; |
3341 | $self->{timer} = Event->timer ( |
3481 | $self->{timer} = Event->timer ( |
3342 | at => $self->{animspeed} * int $::NOW / $self->{animspeed}, |
|
|
3343 | hard => 1, |
3482 | parked => 1, |
3344 | interval => $self->{animspeed}, |
|
|
3345 | cb => sub { |
3483 | cb => sub { |
3346 | delete $self->{wait_face}; |
3484 | return unless $::CONN && $widget; |
|
|
3485 | |
3347 | ++$widget->{frame}; |
3486 | ++$widget->{frame}; |
|
|
3487 | $widget->update_face; |
3348 | $widget->update; |
3488 | $widget->update; |
|
|
3489 | |
|
|
3490 | $widget->update_timer; |
3349 | }, |
3491 | }, |
3350 | ); |
3492 | ); |
|
|
3493 | |
|
|
3494 | $self->update_face; |
|
|
3495 | $self->update_timer; |
3351 | } |
3496 | } |
3352 | |
3497 | |
3353 | $self |
3498 | $self |
3354 | } |
3499 | } |
3355 | |
3500 | |
|
|
3501 | sub update_timer { |
|
|
3502 | my ($self) = @_; |
|
|
3503 | |
|
|
3504 | return unless $self->{timer}; |
|
|
3505 | |
|
|
3506 | if ($self->{visible}) { |
|
|
3507 | $self->{timer}->at ( |
|
|
3508 | $self->{anim_start} |
|
|
3509 | + $self->{animspeed} |
|
|
3510 | * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed} |
|
|
3511 | ); |
|
|
3512 | $self->{timer}->start; |
|
|
3513 | } else { |
|
|
3514 | $self->{timer}->stop; |
|
|
3515 | } |
|
|
3516 | } |
|
|
3517 | |
|
|
3518 | sub update_face { |
|
|
3519 | my ($self) = @_; |
|
|
3520 | |
|
|
3521 | return unless $::CONN; |
|
|
3522 | |
|
|
3523 | if (my $anim = $::CONN->{anim}[$self->{anim}]) { |
|
|
3524 | if ($anim && @$anim) { |
|
|
3525 | delete $self->{wait_face}; |
|
|
3526 | $self->{face} = $anim->[ $self->{frame} % @$anim ]; |
|
|
3527 | } |
|
|
3528 | } |
|
|
3529 | } |
|
|
3530 | |
3356 | sub size_request { |
3531 | sub size_request { |
3357 | (32, 8) |
3532 | my ($self) = @_; |
|
|
3533 | |
|
|
3534 | if ($::CONN) { |
|
|
3535 | if (my $faceid = $::CONN->{faceid}[$self->{face}]) { |
|
|
3536 | if (my $tex = $::CONN->{texture}[$faceid]) { |
|
|
3537 | return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); |
|
|
3538 | } else { |
|
|
3539 | $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { |
|
|
3540 | $self->realloc; |
|
|
3541 | }); |
|
|
3542 | } |
|
|
3543 | } |
|
|
3544 | } |
|
|
3545 | |
|
|
3546 | ($self->{size_w} || 8, $self->{size_h} || 8) |
3358 | } |
3547 | } |
3359 | |
3548 | |
3360 | sub update { |
3549 | sub update { |
3361 | my ($self) = @_; |
3550 | my ($self) = @_; |
3362 | |
3551 | |
3363 | return unless $self->{visible}; |
3552 | return unless $self->{visible}; |
3364 | |
3553 | |
3365 | $self->SUPER::update; |
3554 | $self->SUPER::update; |
3366 | } |
3555 | } |
3367 | |
3556 | |
|
|
3557 | sub invoke_visibility_change { |
|
|
3558 | my ($self) = @_; |
|
|
3559 | |
|
|
3560 | $self->update_timer; |
|
|
3561 | |
|
|
3562 | 0 |
|
|
3563 | } |
|
|
3564 | |
3368 | sub _draw { |
3565 | sub _draw { |
3369 | my ($self) = @_; |
3566 | my ($self) = @_; |
3370 | |
3567 | |
3371 | return unless $::CONN; |
3568 | return unless $::CONN; |
3372 | |
3569 | |
3373 | $self->SUPER::_draw; |
3570 | $self->SUPER::_draw; |
3374 | |
3571 | |
3375 | my $face; |
|
|
3376 | |
|
|
3377 | if ($self->{frame}) { |
|
|
3378 | my $anim = $::CONN->{anim}[$self->{anim}]; |
|
|
3379 | |
|
|
3380 | $face = $anim->[ $self->{frame} % @$anim ] |
|
|
3381 | if $anim && @$anim; |
|
|
3382 | } |
|
|
3383 | |
|
|
3384 | my $faceid = $::CONN->{faceid}[$face || $self->{face}] |
3572 | my $faceid = $::CONN->{faceid}[$self->{face}] |
3385 | or return; |
3573 | or return; |
3386 | |
3574 | |
3387 | my $tex = $::CONN->{texture}[$faceid]; |
3575 | my $tex = $::CONN->{texture}[$faceid]; |
3388 | |
3576 | |
3389 | if ($tex) { |
3577 | if ($tex) { |
3390 | glEnable GL_TEXTURE_2D; |
3578 | glEnable GL_TEXTURE_2D; |
3391 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
3579 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
3392 | glColor 0, 0, 0, 1; |
3580 | glColor 0, 0, 0, 1; |
3393 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
3581 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
3394 | glDisable GL_TEXTURE_2D; |
3582 | glDisable GL_TEXTURE_2D; |
3395 | } else { |
|
|
3396 | $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { |
|
|
3397 | $self->update; |
|
|
3398 | }); |
|
|
3399 | } |
3583 | } |
3400 | } |
3584 | } |
3401 | |
3585 | |
3402 | sub destroy { |
3586 | sub destroy { |
3403 | my ($self) = @_; |
3587 | my ($self) = @_; |
3404 | |
3588 | |
3405 | $self->{timer}->cancel |
3589 | (delete $self->{timer})->cancel |
3406 | if $self->{timer}; |
3590 | if $self->{timer}; |
3407 | |
3591 | |
3408 | $self->SUPER::destroy; |
3592 | $self->SUPER::destroy; |
3409 | } |
3593 | } |
3410 | |
3594 | |
… | |
… | |
4054 | while ($self->{post_alloc_hook}) { |
4238 | while ($self->{post_alloc_hook}) { |
4055 | $_->() |
4239 | $_->() |
4056 | for values %{delete $self->{post_alloc_hook}}; |
4240 | for values %{delete $self->{post_alloc_hook}}; |
4057 | } |
4241 | } |
4058 | |
4242 | |
4059 | |
|
|
4060 | glViewport 0, 0, $::WIDTH, $::HEIGHT; |
4243 | glViewport 0, 0, $::WIDTH, $::HEIGHT; |
4061 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
4244 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
4062 | glClear GL_COLOR_BUFFER_BIT; |
4245 | glClear GL_COLOR_BUFFER_BIT; |
4063 | |
4246 | |
4064 | glMatrixMode GL_PROJECTION; |
4247 | glMatrixMode GL_PROJECTION; |