… | |
… | |
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 | } |
… | |
… | |
268 | $self->hide; |
272 | $self->hide; |
269 | $self->emit ("destroy"); |
273 | $self->emit ("destroy"); |
270 | %$self = (); |
274 | %$self = (); |
271 | } |
275 | } |
272 | |
276 | |
|
|
277 | sub TO_JSON { |
|
|
278 | { __widget_ref__ => $_[0]{s_id} } |
|
|
279 | } |
|
|
280 | |
273 | sub show { |
281 | sub show { |
274 | my ($self) = @_; |
282 | my ($self) = @_; |
275 | |
283 | |
276 | return if $self->{parent}; |
284 | return if $self->{parent}; |
277 | |
285 | |
… | |
… | |
316 | sub set_visibility { |
324 | sub set_visibility { |
317 | my ($self, $visible) = @_; |
325 | my ($self, $visible) = @_; |
318 | |
326 | |
319 | return if $self->{visible} == $visible; |
327 | return if $self->{visible} == $visible; |
320 | |
328 | |
321 | $visible ? $self->hide |
329 | $visible ? $self->show |
322 | : $self->show; |
330 | : $self->hide; |
323 | } |
331 | } |
324 | |
332 | |
325 | sub toggle_visibility { |
333 | sub toggle_visibility { |
326 | my ($self) = @_; |
334 | my ($self) = @_; |
327 | |
335 | |
… | |
… | |
543 | |
551 | |
544 | # parent |
552 | # parent |
545 | $self->{parent} && $self->{parent}->emit ($signal, @args) |
553 | $self->{parent} && $self->{parent}->emit ($signal, @args) |
546 | } |
554 | } |
547 | |
555 | |
548 | sub find_widget { |
556 | #sub find_widget { |
549 | my ($self, $x, $y) = @_; |
557 | # in .xs |
550 | |
|
|
551 | return () unless $self->{can_events}; |
|
|
552 | |
|
|
553 | return $self |
|
|
554 | if $x >= $self->{x} && $x < $self->{x} + $self->{w} |
|
|
555 | && $y >= $self->{y} && $y < $self->{y} + $self->{h}; |
|
|
556 | |
|
|
557 | () |
|
|
558 | } |
|
|
559 | |
558 | |
560 | sub set_parent { |
559 | sub set_parent { |
561 | my ($self, $parent) = @_; |
560 | my ($self, $parent) = @_; |
562 | |
561 | |
563 | CFPlus::weaken ($self->{parent} = $parent); |
562 | CFPlus::weaken ($self->{parent} = $parent); |
… | |
… | |
647 | my ($self) = @_; |
646 | my ($self) = @_; |
648 | |
647 | |
649 | warn "no draw defined for $self\n"; |
648 | warn "no draw defined for $self\n"; |
650 | } |
649 | } |
651 | |
650 | |
652 | my $cntx;#d# |
|
|
653 | sub DESTROY { |
651 | sub DESTROY { |
654 | my ($self) = @_; |
652 | my ($self) = @_; |
655 | |
653 | |
656 | return if CFPlus::in_destruct; |
654 | return if CFPlus::in_destruct; |
657 | |
655 | |
… | |
… | |
742 | can_events => 0, |
740 | can_events => 0, |
743 | %arg, |
741 | %arg, |
744 | ); |
742 | ); |
745 | |
743 | |
746 | $self->add (@$children) |
744 | $self->add (@$children) |
747 | if $children; |
745 | if $children && @$children; |
748 | |
746 | |
749 | $self |
747 | $self |
750 | } |
748 | } |
751 | |
749 | |
752 | sub realloc { |
750 | sub realloc { |
… | |
… | |
761 | my ($self, @widgets) = @_; |
759 | my ($self, @widgets) = @_; |
762 | |
760 | |
763 | $_->set_parent ($self) |
761 | $_->set_parent ($self) |
764 | for @widgets; |
762 | for @widgets; |
765 | |
763 | |
|
|
764 | # TODO: only do this in widgets that need it, e.g. root, fixed |
766 | use sort 'stable'; |
765 | use sort 'stable'; |
767 | |
766 | |
768 | $self->{children} = [ |
767 | $self->{children} = [ |
769 | sort { $a->{z} <=> $b->{z} } |
768 | sort { $a->{z} <=> $b->{z} } |
770 | @{$self->{children}}, @widgets |
769 | @{$self->{children}}, @widgets |
771 | ]; |
770 | ]; |
772 | |
771 | |
773 | $self->realloc; |
772 | $self->realloc; |
|
|
773 | |
|
|
774 | map $_+0, @widgets |
774 | } |
775 | } |
775 | |
776 | |
776 | sub children { |
777 | sub children { |
777 | @{ $_[0]{children} } |
778 | @{ $_[0]{children} } |
778 | } |
779 | } |
… | |
… | |
789 | } |
790 | } |
790 | |
791 | |
791 | sub clear { |
792 | sub clear { |
792 | my ($self) = @_; |
793 | my ($self) = @_; |
793 | |
794 | |
794 | my $children = delete $self->{children}; |
795 | my $children = $self->{children}; |
795 | $self->{children} = []; |
796 | $self->{children} = []; |
796 | |
797 | |
797 | for (@$children) { |
798 | for (@$children) { |
798 | delete $_->{parent}; |
799 | delete $_->{parent}; |
799 | $_->hide; |
800 | $_->hide; |
… | |
… | |
939 | } |
940 | } |
940 | |
941 | |
941 | ############################################################################# |
942 | ############################################################################# |
942 | |
943 | |
943 | package CFPlus::UI::ViewPort; |
944 | package CFPlus::UI::ViewPort; |
|
|
945 | |
|
|
946 | use List::Util qw(min max); |
944 | |
947 | |
945 | our @ISA = CFPlus::UI::Window::; |
948 | our @ISA = CFPlus::UI::Window::; |
946 | |
949 | |
947 | sub new { |
950 | sub new { |
948 | my $class = shift; |
951 | my $class = shift; |
… | |
… | |
957 | sub size_request { |
960 | sub size_request { |
958 | my ($self) = @_; |
961 | my ($self) = @_; |
959 | |
962 | |
960 | my ($w, $h) = @{$self->child}{qw(req_w req_h)}; |
963 | my ($w, $h) = @{$self->child}{qw(req_w req_h)}; |
961 | |
964 | |
962 | $w = 10 if $self->{scroll_x}; |
965 | $w = 1 if $self->{scroll_x}; |
963 | $h = 10 if $self->{scroll_y}; |
966 | $h = 1 if $self->{scroll_y}; |
964 | |
967 | |
965 | ($w, $h) |
968 | ($w, $h) |
966 | } |
969 | } |
967 | |
970 | |
968 | sub invoke_size_allocate { |
971 | sub invoke_size_allocate { |
… | |
… | |
980 | } |
983 | } |
981 | |
984 | |
982 | sub set_offset { |
985 | sub set_offset { |
983 | my ($self, $x, $y) = @_; |
986 | my ($self, $x, $y) = @_; |
984 | |
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}) { |
985 | $self->{view_x} = int $x; |
992 | $self->{view_x} = $x; |
986 | $self->{view_y} = int $y; |
993 | $self->{view_y} = $y; |
987 | |
994 | |
|
|
995 | $self->emit (changed => $x, $y); |
988 | $self->update; |
996 | $self->update; |
|
|
997 | } |
989 | } |
998 | } |
990 | |
999 | |
991 | # 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 |
992 | sub coord2local { |
1001 | sub coord2local { |
993 | my ($self, $x, $y) = @_; |
1002 | my ($self, $x, $y) = @_; |
… | |
… | |
1008 | my ($self, $x, $y) = @_; |
1017 | my ($self, $x, $y) = @_; |
1009 | |
1018 | |
1010 | if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} |
1019 | if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} |
1011 | && $y >= $self->{y} && $y < $self->{y} + $self->{h} |
1020 | && $y >= $self->{y} && $y < $self->{y} + $self->{h} |
1012 | ) { |
1021 | ) { |
1013 | $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}) |
1014 | } else { |
1023 | } else { |
1015 | $self->CFPlus::UI::Base::find_widget ($x, $y) |
1024 | $self->CFPlus::UI::Base::find_widget ($x, $y) |
1016 | } |
1025 | } |
1017 | } |
1026 | } |
1018 | |
1027 | |
… | |
… | |
1029 | |
1038 | |
1030 | ############################################################################# |
1039 | ############################################################################# |
1031 | |
1040 | |
1032 | package CFPlus::UI::ScrolledWindow; |
1041 | package CFPlus::UI::ScrolledWindow; |
1033 | |
1042 | |
1034 | our @ISA = CFPlus::UI::HBox::; |
1043 | our @ISA = CFPlus::UI::Table::; |
1035 | |
1044 | |
1036 | sub new { |
1045 | sub new { |
1037 | my ($class, %arg) = @_; |
1046 | my ($class, %arg) = @_; |
1038 | |
1047 | |
1039 | my $child = delete $arg{child}; |
1048 | my $child = delete $arg{child}; |
1040 | |
1049 | |
1041 | my $self; |
1050 | my $self; |
1042 | |
1051 | |
1043 | my $slider = new CFPlus::UI::Slider |
1052 | my $hslider = new CFPlus::UI::Slider |
|
|
1053 | col => 0, |
|
|
1054 | row => 1, |
|
|
1055 | vertical => 0, |
|
|
1056 | range => [0, 0, 1, 0.01], # HACK fix |
|
|
1057 | on_changed => sub { |
|
|
1058 | $self->{hpos} = $_[1]; |
|
|
1059 | $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); |
|
|
1060 | }, |
|
|
1061 | ; |
|
|
1062 | |
|
|
1063 | my $vslider = new CFPlus::UI::Slider |
|
|
1064 | col => 1, |
|
|
1065 | row => 0, |
1044 | vertical => 1, |
1066 | vertical => 1, |
1045 | range => [0, 0, 1, 0.01], # HACK fix |
1067 | range => [0, 0, 1, 0.01], # HACK fix |
1046 | on_changed => sub { |
1068 | on_changed => sub { |
1047 | $self->{vp}->set_offset (0, $_[1]); |
1069 | $self->{vpos} = $_[1]; |
|
|
1070 | $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); |
1048 | }, |
1071 | }, |
1049 | ; |
1072 | ; |
1050 | |
1073 | |
1051 | $self = $class->SUPER::new ( |
1074 | $self = $class->SUPER::new ( |
1052 | vp => (new CFPlus::UI::ViewPort expand => 1), |
1075 | scroll_x => 0, |
|
|
1076 | scroll_y => 1, |
1053 | can_events => 1, |
1077 | can_events => 1, |
1054 | slider => $slider, |
1078 | hslider => $hslider, |
|
|
1079 | vslider => $vslider, |
|
|
1080 | col_expand => [1, 0], |
|
|
1081 | row_expand => [1, 0], |
1055 | %arg, |
1082 | %arg, |
1056 | ); |
1083 | ); |
1057 | |
1084 | |
|
|
1085 | $self->{vp} = new CFPlus::UI::ViewPort |
|
|
1086 | col => 0, |
|
|
1087 | row => 0, |
|
|
1088 | expand => 1, |
|
|
1089 | scroll_x => $self->{scroll_x}, |
|
|
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 | ; |
|
|
1100 | |
1058 | $self->SUPER::add ($self->{vp}, $self->{slider}); |
1101 | $self->SUPER::add ($self->{vp}); |
|
|
1102 | |
1059 | $self->add ($child) if $child; |
1103 | $self->add ($child) if $child; |
1060 | |
1104 | |
1061 | $self |
1105 | $self |
1062 | } |
1106 | } |
1063 | |
|
|
1064 | #TODO# update range on size_allocate depending on child |
|
|
1065 | |
1107 | |
1066 | sub add { |
1108 | sub add { |
1067 | my ($self, $widget) = @_; |
1109 | my ($self, $widget) = @_; |
1068 | |
1110 | |
1069 | $self->{vp}->add ($self->{child} = $widget); |
1111 | $self->{vp}->add ($self->{child} = $widget); |
1070 | } |
1112 | } |
1071 | |
1113 | |
|
|
1114 | sub 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 | |
|
|
1140 | sub 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 | |
1072 | sub invoke_mouse_wheel { |
1158 | sub invoke_mouse_wheel { |
1073 | my ($self, $ev) = @_; |
1159 | my ($self, $ev) = @_; |
1074 | |
1160 | |
1075 | return 0 unless $ev->{dy}; # only vertical movements |
|
|
1076 | |
|
|
1077 | $self->{slider}->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}; |
1078 | |
1163 | |
1079 | 1 |
1164 | 1 |
1080 | } |
1165 | } |
1081 | |
1166 | |
1082 | sub update_slider { |
1167 | sub invoke_button_down { |
1083 | my ($self) = @_; |
1168 | my ($self, $ev, $x, $y) = @_; |
1084 | |
1169 | |
1085 | $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); |
1170 | if ($ev->{button} == 2) { |
1086 | } |
1171 | $self->start_dragging ($ev); |
|
|
1172 | return 1; |
|
|
1173 | } |
1087 | |
1174 | |
1088 | sub update { |
1175 | 0 |
1089 | my ($self) = @_; |
1176 | } |
1090 | |
1177 | |
1091 | $self->SUPER::update; |
1178 | sub invoke_button_up { |
|
|
1179 | my ($self, $ev, $x, $y) = @_; |
1092 | |
1180 | |
1093 | $self->update_slider; |
1181 | if (delete $self->{motion}) { |
|
|
1182 | return 1; |
|
|
1183 | } |
|
|
1184 | |
|
|
1185 | 0 |
|
|
1186 | } |
|
|
1187 | |
|
|
1188 | sub invoke_mouse_motion { |
|
|
1189 | my ($self, $ev, $x, $y) = @_; |
|
|
1190 | |
|
|
1191 | if ($self->{motion}) { |
|
|
1192 | $self->{motion}->($ev, $x, $y); |
|
|
1193 | return 1; |
|
|
1194 | } |
|
|
1195 | |
|
|
1196 | 0 |
1094 | } |
1197 | } |
1095 | |
1198 | |
1096 | sub invoke_size_allocate { |
1199 | sub invoke_size_allocate { |
1097 | my ($self, $w, $h) = @_; |
1200 | my ($self, $w, $h) = @_; |
1098 | |
1201 | |
1099 | $self->update_slider; |
1202 | $self->update_slider; |
1100 | |
|
|
1101 | $self->SUPER::invoke_size_allocate ($w, $h) |
1203 | $self->SUPER::invoke_size_allocate ($w, $h) |
1102 | } |
1204 | } |
1103 | |
1205 | |
1104 | ############################################################################# |
1206 | ############################################################################# |
1105 | |
1207 | |
… | |
… | |
1255 | |
1357 | |
1256 | my @border = |
1358 | my @border = |
1257 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
1359 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
1258 | 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); |
1259 | |
1361 | |
|
|
1362 | my @icon = |
|
|
1363 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
|
|
1364 | qw(x1_move.png x1_resize.png); |
|
|
1365 | |
1260 | sub new { |
1366 | sub new { |
1261 | my ($class, %arg) = @_; |
1367 | my ($class, %arg) = @_; |
1262 | |
1368 | |
1263 | my $self = $class->SUPER::new ( |
1369 | my $self = $class->SUPER::new ( |
1264 | bg => [1, 1, 1, 1], |
1370 | bg => [1, 1, 1, 1], |
… | |
… | |
1432 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
1538 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
1433 | |
1539 | |
1434 | my $border = $self->border; |
1540 | my $border = $self->border; |
1435 | |
1541 | |
1436 | glColor @{ $self->{border_bg} }; |
1542 | glColor @{ $self->{border_bg} }; |
1437 | $border[0]->draw_quad_alpha (0, 0, $w, $border); |
1543 | $border[0]->draw_quad_alpha ( 0, 0, $w, $border); |
1438 | $border[1]->draw_quad_alpha (0, $border, $border, $ch); |
1544 | $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); |
1439 | $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); |
1545 | $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); |
1440 | $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); |
1441 | |
1561 | |
1442 | if (@{$self->{bg}} < 4 || $self->{bg}[3]) { |
1562 | if (@{$self->{bg}} < 4 || $self->{bg}[3]) { |
1443 | glColor @{ $self->{bg} }; |
1563 | glColor @{ $self->{bg} }; |
1444 | |
1564 | |
1445 | # TODO: repeat texture not scale |
1565 | # TODO: repeat texture not scale |
… | |
… | |
1466 | |
1586 | |
1467 | ############################################################################# |
1587 | ############################################################################# |
1468 | |
1588 | |
1469 | package CFPlus::UI::Table; |
1589 | package CFPlus::UI::Table; |
1470 | |
1590 | |
1471 | our @ISA = CFPlus::UI::Base::; |
1591 | our @ISA = CFPlus::UI::Container::; |
1472 | |
1592 | |
1473 | use List::Util qw(max sum); |
1593 | use List::Util qw(max sum); |
1474 | |
1594 | |
1475 | use CFPlus::OpenGL; |
1595 | use CFPlus::OpenGL; |
1476 | |
1596 | |
1477 | sub new { |
1597 | sub new { |
1478 | my $class = shift; |
1598 | my $class = shift; |
1479 | |
1599 | |
1480 | $class->SUPER::new ( |
1600 | $class->SUPER::new ( |
1481 | col_expand => [], |
1601 | col_expand => [], |
|
|
1602 | row_expand => [], |
1482 | @_, |
1603 | @_, |
1483 | ) |
1604 | ) |
1484 | } |
1605 | } |
1485 | |
1606 | |
1486 | sub children { |
|
|
1487 | grep $_, map @$_, grep $_, @{ $_[0]{children} } |
|
|
1488 | } |
|
|
1489 | |
|
|
1490 | sub add { |
1607 | sub 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 | |
|
|
1618 | sub add_at { |
1491 | my ($self) = shift; |
1619 | my $self = shift; |
|
|
1620 | |
|
|
1621 | my @widgets; |
1492 | |
1622 | |
1493 | while (@_) { |
1623 | while (@_) { |
1494 | my ($x, $y, $child) = splice @_, 0, 3, (); |
1624 | my ($col, $row, $child) = splice @_, 0, 3, (); |
1495 | $child->set_parent ($self); |
|
|
1496 | $self->{children}[$y][$x] = $child; |
|
|
1497 | } |
|
|
1498 | |
1625 | |
1499 | $self->{force_realloc} = 1; |
1626 | $child->{row} = $row; |
1500 | $self->{force_size_alloc} = 1; |
1627 | $child->{col} = $col; |
1501 | $self->realloc; |
|
|
1502 | } |
|
|
1503 | |
1628 | |
1504 | sub remove { |
1629 | push @widgets, $child; |
|
|
1630 | } |
|
|
1631 | |
|
|
1632 | $self->add (@widgets); |
|
|
1633 | } |
|
|
1634 | |
|
|
1635 | sub get_wh { |
1505 | my ($self, $child) = @_; |
1636 | my ($self) = @_; |
1506 | |
1637 | |
1507 | # TODO: not yet implemented |
1638 | my (@w, @h); |
1508 | } |
|
|
1509 | |
|
|
1510 | # TODO: move to container class maybe? send children a signal on removal? |
|
|
1511 | sub clear { |
|
|
1512 | my ($self) = @_; |
|
|
1513 | |
1639 | |
1514 | my @children = $self->children; |
1640 | my @children = $self->children; |
1515 | delete $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]; |
|
|
1650 | } |
1516 | |
1651 | } |
1517 | for (@children) { |
|
|
1518 | delete $_->{parent}; |
|
|
1519 | $_->hide; |
|
|
1520 | } |
|
|
1521 | |
1652 | |
1522 | $self->realloc; |
1653 | # second pass, rows |
1523 | } |
1654 | for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { |
1524 | |
|
|
1525 | sub get_wh { |
|
|
1526 | my ($self) = @_; |
|
|
1527 | |
|
|
1528 | my (@w, @h); |
|
|
1529 | |
|
|
1530 | for my $y (0 .. $#{$self->{children}}) { |
|
|
1531 | my $row = $self->{children}[$y] |
|
|
1532 | or next; |
|
|
1533 | |
|
|
1534 | for my $x (0 .. $#$row) { |
|
|
1535 | my $widget = $row->[$x] |
|
|
1536 | or next; |
|
|
1537 | my ($w, $h) = @$widget{qw(req_w req_h)}; |
1655 | my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; |
1538 | |
1656 | |
1539 | $w[$x] = max $w[$x], $w; |
1657 | my $sh = sum @h[$r .. $r + $rs - 1]; |
1540 | $h[$y] = max $h[$y], $h; |
1658 | |
|
|
1659 | if ($h > $sh) { |
|
|
1660 | $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; |
1541 | } |
1661 | } |
1542 | } |
1662 | } |
1543 | |
1663 | |
1544 | (\@w, \@h) |
1664 | (\@w, \@h) |
1545 | } |
1665 | } |
… | |
… | |
1561 | my ($ws, $hs) = $self->get_wh; |
1681 | my ($ws, $hs) = $self->get_wh; |
1562 | |
1682 | |
1563 | my $req_w = (sum @$ws) || 1; |
1683 | my $req_w = (sum @$ws) || 1; |
1564 | my $req_h = (sum @$hs) || 1; |
1684 | my $req_h = (sum @$hs) || 1; |
1565 | |
1685 | |
1566 | # TODO: nicer code && do row_expand |
1686 | # now linearly scale the rows/columns to the allocated size |
1567 | my @col_expand = @{$self->{col_expand}}; |
1687 | my @col_expand = @{$self->{col_expand}}; |
1568 | @col_expand = (1) x @$ws unless @col_expand; |
1688 | @col_expand = (1) x @$ws unless @col_expand; |
1569 | my $col_expand = (sum @col_expand) || 1; |
1689 | my $col_expand = (sum @col_expand) || 1; |
1570 | |
1690 | |
1571 | # linearly scale sizes |
|
|
1572 | $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; |
1691 | $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; |
1573 | $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; |
|
|
1574 | |
1692 | |
1575 | CFPlus::UI::harmonize $ws; |
1693 | CFPlus::UI::harmonize $ws; |
|
|
1694 | |
|
|
1695 | my @row_expand = @{$self->{row_expand}}; |
|
|
1696 | @row_expand = (1) x @$ws unless @row_expand; |
|
|
1697 | my $row_expand = (sum @row_expand) || 1; |
|
|
1698 | |
|
|
1699 | $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; |
|
|
1700 | |
1576 | CFPlus::UI::harmonize $hs; |
1701 | CFPlus::UI::harmonize $hs; |
1577 | |
1702 | |
1578 | my $y; |
1703 | my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } |
|
|
1704 | my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } |
1579 | |
1705 | |
1580 | for my $r (0 .. $#{$self->{children}}) { |
1706 | for my $widget ($self->children) { |
1581 | my $row = $self->{children}[$r] |
1707 | my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; |
1582 | or next; |
|
|
1583 | |
1708 | |
1584 | my $x = 0; |
1709 | $widget->configure ( |
1585 | my $row_h = $hs->[$r]; |
1710 | $x[$c], $y[$r], |
|
|
1711 | $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], |
1586 | |
1712 | ); |
1587 | for my $c (0 .. $#$row) { |
1713 | } |
1588 | my $col_w = $ws->[$c]; |
|
|
1589 | |
1714 | |
1590 | if (my $widget = $row->[$c]) { |
1715 | 1 |
1591 | $widget->configure ($x, $y, $col_w, $row_h); |
1716 | } |
1592 | } |
|
|
1593 | |
1717 | |
1594 | $x += $col_w; |
1718 | ############################################################################# |
|
|
1719 | |
|
|
1720 | package CFPlus::UI::Fixed; |
|
|
1721 | |
|
|
1722 | use List::Util qw(min max); |
|
|
1723 | |
|
|
1724 | our @ISA = CFPlus::UI::Container::; |
|
|
1725 | |
|
|
1726 | sub add { |
|
|
1727 | my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_; |
|
|
1728 | |
|
|
1729 | $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h]; |
|
|
1730 | $self->SUPER::add ($child); |
|
|
1731 | } |
|
|
1732 | |
|
|
1733 | sub _scale($$$) { |
|
|
1734 | my ($mode, $val, $max) = @_; |
|
|
1735 | |
|
|
1736 | $mode eq "abs" ? $val |
|
|
1737 | : $mode eq "rel" ? $val * $max |
|
|
1738 | : 0 |
|
|
1739 | } |
|
|
1740 | |
|
|
1741 | sub size_request { |
|
|
1742 | my ($self) = @_; |
|
|
1743 | |
|
|
1744 | my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); |
|
|
1745 | |
|
|
1746 | # determine overall size by querying abs widgets |
|
|
1747 | for my $child ($self->visible_children) { |
|
|
1748 | my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; |
|
|
1749 | |
|
|
1750 | if ($pos eq "abs") { |
|
|
1751 | $w = _scale $size, $w, $child->{req_w}; |
|
|
1752 | $h = _scale $size, $h, $child->{req_h}; |
|
|
1753 | |
|
|
1754 | $x1 = min $x1, $x; $x2 = max $x2, $x + $w; |
|
|
1755 | $y1 = min $y1, $y; $y2 = max $y2, $y + $h; |
1595 | } |
1756 | } |
|
|
1757 | } |
1596 | |
1758 | |
1597 | $y += $row_h; |
1759 | my $W = $x2 - $x1; |
|
|
1760 | my $H = $y2 - $y1; |
|
|
1761 | |
|
|
1762 | # now layout remaining widgets |
|
|
1763 | for my $child ($self->visible_children) { |
|
|
1764 | my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; |
|
|
1765 | |
|
|
1766 | if ($pos ne "abs") { |
|
|
1767 | $x = _scale $pos, $x, $W; |
|
|
1768 | $y = _scale $pos, $x, $H; |
|
|
1769 | $w = _scale $size, $w, $child->{req_w}; |
|
|
1770 | $h = _scale $size, $h, $child->{req_h}; |
|
|
1771 | |
|
|
1772 | $x1 = min $x1, $x; $x2 = max $x2, $x + $w; |
|
|
1773 | $y1 = min $y1, $y; $y2 = max $y2, $y + $h; |
|
|
1774 | } |
|
|
1775 | } |
|
|
1776 | |
|
|
1777 | my $W = $x2 - $x1; |
|
|
1778 | my $H = $y2 - $y1; |
|
|
1779 | |
|
|
1780 | ($W, $H) |
|
|
1781 | } |
|
|
1782 | |
|
|
1783 | sub invoke_size_allocate { |
|
|
1784 | my ($self, $W, $H) = @_; |
|
|
1785 | |
|
|
1786 | for my $child ($self->visible_children) { |
|
|
1787 | my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; |
|
|
1788 | |
|
|
1789 | $x = _scale $pos, $x, $W; |
|
|
1790 | $y = _scale $pos, $x, $H; |
|
|
1791 | $w = _scale $size, $w, $child->{req_w}; |
|
|
1792 | $h = _scale $size, $h, $child->{req_h}; |
|
|
1793 | |
|
|
1794 | $child->configure ($x, $y, $w, $h); |
1598 | } |
1795 | } |
1599 | |
1796 | |
1600 | 1 |
1797 | 1 |
1601 | } |
|
|
1602 | |
|
|
1603 | sub find_widget { |
|
|
1604 | my ($self, $x, $y) = @_; |
|
|
1605 | |
|
|
1606 | $x -= $self->{x}; |
|
|
1607 | $y -= $self->{y}; |
|
|
1608 | |
|
|
1609 | my $res; |
|
|
1610 | |
|
|
1611 | for (grep $_, map @$_, grep $_, @{ $self->{children} }) { |
|
|
1612 | $res = $_->find_widget ($x, $y) |
|
|
1613 | and return $res; |
|
|
1614 | } |
|
|
1615 | |
|
|
1616 | $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) |
|
|
1617 | } |
|
|
1618 | |
|
|
1619 | sub _draw { |
|
|
1620 | my ($self) = @_; |
|
|
1621 | |
|
|
1622 | for (grep $_, @{$self->{children}}) { |
|
|
1623 | $_->draw for grep $_, @$_; |
|
|
1624 | } |
|
|
1625 | } |
1798 | } |
1626 | |
1799 | |
1627 | ############################################################################# |
1800 | ############################################################################# |
1628 | |
1801 | |
1629 | package CFPlus::UI::Box; |
1802 | package CFPlus::UI::Box; |
… | |
… | |
2187 | |
2360 | |
2188 | use CFPlus::OpenGL; |
2361 | use CFPlus::OpenGL; |
2189 | |
2362 | |
2190 | my @tex = |
2363 | my @tex = |
2191 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
2364 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
2192 | qw(b1_button_active.png); |
2365 | qw(b1_button_inactive.png b1_button_active.png); |
2193 | |
2366 | |
2194 | sub new { |
2367 | sub new { |
2195 | my $class = shift; |
2368 | my $class = shift; |
2196 | |
2369 | |
2197 | $class->SUPER::new ( |
2370 | $class->SUPER::new ( |
2198 | padding_x => 4, |
2371 | padding_x => 4, |
2199 | padding_y => 4, |
2372 | padding_y => 4, |
2200 | fg => [1, 1, 1], |
2373 | fg => [1.0, 1.0, 1.0], |
2201 | active_fg => [0, 0, 1], |
2374 | active_fg => [0.8, 0.8, 0.8], |
2202 | can_hover => 1, |
2375 | can_hover => 1, |
2203 | align => 0, |
2376 | align => 0, |
2204 | valign => 0, |
2377 | valign => 0, |
2205 | can_events => 1, |
2378 | can_events => 1, |
2206 | @_ |
2379 | @_ |
… | |
… | |
2224 | |
2397 | |
2225 | glEnable GL_TEXTURE_2D; |
2398 | glEnable GL_TEXTURE_2D; |
2226 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2399 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2227 | glColor 0, 0, 0, 1; |
2400 | glColor 0, 0, 0, 1; |
2228 | |
2401 | |
|
|
2402 | my $tex = $tex[$GRAB == $self]; |
2229 | $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2403 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2230 | |
2404 | |
2231 | glDisable GL_TEXTURE_2D; |
2405 | glDisable GL_TEXTURE_2D; |
2232 | |
2406 | |
2233 | $self->SUPER::_draw; |
2407 | $self->SUPER::_draw; |
2234 | } |
2408 | } |
… | |
… | |
3289 | |
3463 | |
3290 | sub new { |
3464 | sub new { |
3291 | my $class = shift; |
3465 | my $class = shift; |
3292 | |
3466 | |
3293 | my $self = $class->SUPER::new ( |
3467 | my $self = $class->SUPER::new ( |
|
|
3468 | size_w => 32, |
|
|
3469 | size_h => 8, |
3294 | aspect => 1, |
3470 | aspect => 1, |
3295 | can_events => 0, |
3471 | can_events => 0, |
3296 | @_, |
3472 | @_, |
3297 | ); |
3473 | ); |
3298 | |
3474 | |
3299 | if ($self->{anim} && $self->{animspeed}) { |
3475 | if ($self->{anim} && $self->{animspeed}) { |
3300 | CFPlus::weaken (my $widget = $self); |
3476 | CFPlus::weaken (my $widget = $self); |
3301 | |
3477 | |
|
|
3478 | $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; |
|
|
3479 | $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; |
3302 | $self->{timer} = Event->timer ( |
3480 | $self->{timer} = Event->timer ( |
3303 | at => $self->{animspeed} * int $::NOW / $self->{animspeed}, |
|
|
3304 | hard => 1, |
3481 | parked => 1, |
3305 | interval => $self->{animspeed}, |
|
|
3306 | cb => sub { |
3482 | cb => sub { |
|
|
3483 | return unless $::CONN && $widget; |
|
|
3484 | |
3307 | ++$widget->{frame}; |
3485 | ++$widget->{frame}; |
|
|
3486 | $widget->update_face; |
3308 | $widget->update; |
3487 | $widget->update; |
|
|
3488 | |
|
|
3489 | $widget->update_timer; |
3309 | }, |
3490 | }, |
3310 | ); |
3491 | ); |
|
|
3492 | |
|
|
3493 | $self->update_face; |
|
|
3494 | $self->update_timer; |
3311 | } |
3495 | } |
3312 | |
3496 | |
3313 | $self |
3497 | $self |
3314 | } |
3498 | } |
3315 | |
3499 | |
|
|
3500 | sub 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 | } |
|
|
3515 | } |
|
|
3516 | |
|
|
3517 | sub update_face { |
|
|
3518 | my ($self) = @_; |
|
|
3519 | |
|
|
3520 | return unless $::CONN; |
|
|
3521 | |
|
|
3522 | if (my $anim = $::CONN->{anim}[$self->{anim}]) { |
|
|
3523 | if ($anim && @$anim) { |
|
|
3524 | delete $self->{wait_face}; |
|
|
3525 | $self->{face} = $anim->[ $self->{frame} % @$anim ]; |
|
|
3526 | } |
|
|
3527 | } |
|
|
3528 | } |
|
|
3529 | |
3316 | sub size_request { |
3530 | sub size_request { |
3317 | (32, 8) |
3531 | my ($self) = @_; |
|
|
3532 | |
|
|
3533 | if ($::CONN) { |
|
|
3534 | if (my $faceid = $::CONN->{faceid}[$self->{face}]) { |
|
|
3535 | if (my $tex = $::CONN->{texture}[$faceid]) { |
|
|
3536 | return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); |
|
|
3537 | } else { |
|
|
3538 | $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { |
|
|
3539 | $self->realloc; |
|
|
3540 | }); |
|
|
3541 | } |
|
|
3542 | } |
|
|
3543 | } |
|
|
3544 | |
|
|
3545 | ($self->{size_w} || 8, $self->{size_h} || 8) |
3318 | } |
3546 | } |
3319 | |
3547 | |
3320 | sub update { |
3548 | sub update { |
3321 | my ($self) = @_; |
3549 | my ($self) = @_; |
3322 | |
3550 | |
3323 | return unless $self->{visible}; |
3551 | return unless $self->{visible}; |
3324 | |
3552 | |
3325 | $self->SUPER::update; |
3553 | $self->SUPER::update; |
3326 | } |
3554 | } |
3327 | |
3555 | |
|
|
3556 | sub invoke_visibility_change { |
|
|
3557 | my ($self) = @_; |
|
|
3558 | |
|
|
3559 | $self->update_timer; |
|
|
3560 | |
|
|
3561 | 0 |
|
|
3562 | } |
|
|
3563 | |
3328 | sub _draw { |
3564 | sub _draw { |
3329 | my ($self) = @_; |
3565 | my ($self) = @_; |
3330 | |
3566 | |
3331 | return unless $::CONN; |
3567 | return unless $::CONN; |
3332 | |
3568 | |
3333 | $self->SUPER::_draw; |
3569 | $self->SUPER::_draw; |
3334 | |
3570 | |
3335 | my $face; |
|
|
3336 | |
|
|
3337 | if ($self->{frame}) { |
|
|
3338 | my $anim = $::CONN->{anim}[$self->{anim}]; |
3571 | my $faceid = $::CONN->{faceid}[$self->{face}] |
3339 | |
3572 | or return; |
3340 | $face = $anim->[ $self->{frame} % @$anim ] |
|
|
3341 | if $anim && @$anim; |
|
|
3342 | } |
|
|
3343 | |
3573 | |
3344 | my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; |
3574 | my $tex = $::CONN->{texture}[$faceid]; |
3345 | |
3575 | |
3346 | if ($tex) { |
3576 | if ($tex) { |
3347 | glEnable GL_TEXTURE_2D; |
3577 | glEnable GL_TEXTURE_2D; |
3348 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
3578 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
3349 | glColor 0, 0, 0, 1; |
3579 | glColor 0, 0, 0, 1; |
… | |
… | |
3353 | } |
3583 | } |
3354 | |
3584 | |
3355 | sub destroy { |
3585 | sub destroy { |
3356 | my ($self) = @_; |
3586 | my ($self) = @_; |
3357 | |
3587 | |
3358 | $self->{timer}->cancel |
3588 | (delete $self->{timer})->cancel |
3359 | if $self->{timer}; |
3589 | if $self->{timer}; |
3360 | |
3590 | |
3361 | $self->SUPER::destroy; |
3591 | $self->SUPER::destroy; |
3362 | } |
3592 | } |
3363 | |
3593 | |
… | |
… | |
4007 | while ($self->{post_alloc_hook}) { |
4237 | while ($self->{post_alloc_hook}) { |
4008 | $_->() |
4238 | $_->() |
4009 | for values %{delete $self->{post_alloc_hook}}; |
4239 | for values %{delete $self->{post_alloc_hook}}; |
4010 | } |
4240 | } |
4011 | |
4241 | |
4012 | |
|
|
4013 | glViewport 0, 0, $::WIDTH, $::HEIGHT; |
4242 | glViewport 0, 0, $::WIDTH, $::HEIGHT; |
4014 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
4243 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
4015 | glClear GL_COLOR_BUFFER_BIT; |
4244 | glClear GL_COLOR_BUFFER_BIT; |
4016 | |
4245 | |
4017 | glMatrixMode GL_PROJECTION; |
4246 | glMatrixMode GL_PROJECTION; |