… | |
… | |
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); |
… | |
… | |
940 | |
939 | |
941 | ############################################################################# |
940 | ############################################################################# |
942 | |
941 | |
943 | package CFPlus::UI::ViewPort; |
942 | package CFPlus::UI::ViewPort; |
944 | |
943 | |
|
|
944 | use List::Util qw(min max); |
|
|
945 | |
945 | our @ISA = CFPlus::UI::Window::; |
946 | our @ISA = CFPlus::UI::Window::; |
946 | |
947 | |
947 | sub new { |
948 | sub new { |
948 | my $class = shift; |
949 | my $class = shift; |
949 | |
950 | |
… | |
… | |
957 | sub size_request { |
958 | sub size_request { |
958 | my ($self) = @_; |
959 | my ($self) = @_; |
959 | |
960 | |
960 | my ($w, $h) = @{$self->child}{qw(req_w req_h)}; |
961 | my ($w, $h) = @{$self->child}{qw(req_w req_h)}; |
961 | |
962 | |
962 | $w = 10 if $self->{scroll_x}; |
963 | $w = 1 if $self->{scroll_x}; |
963 | $h = 10 if $self->{scroll_y}; |
964 | $h = 1 if $self->{scroll_y}; |
964 | |
965 | |
965 | ($w, $h) |
966 | ($w, $h) |
966 | } |
967 | } |
967 | |
968 | |
968 | sub invoke_size_allocate { |
969 | sub invoke_size_allocate { |
… | |
… | |
980 | } |
981 | } |
981 | |
982 | |
982 | sub set_offset { |
983 | sub set_offset { |
983 | my ($self, $x, $y) = @_; |
984 | my ($self, $x, $y) = @_; |
984 | |
985 | |
|
|
986 | my $x = max 0, min $self->child->{w} - $self->{w}, int $x; |
|
|
987 | my $y = max 0, min $self->child->{h} - $self->{h}, int $y; |
|
|
988 | |
|
|
989 | if ($x != $self->{view_x} or $y != $self->{view_y}) { |
985 | $self->{view_x} = int $x; |
990 | $self->{view_x} = $x; |
986 | $self->{view_y} = int $y; |
991 | $self->{view_y} = $y; |
987 | |
992 | |
|
|
993 | $self->emit (changed => $x, $y); |
988 | $self->update; |
994 | $self->update; |
|
|
995 | } |
989 | } |
996 | } |
990 | |
997 | |
991 | # hmm, this does not work for topleft of $self... but we should not ask for that |
998 | # hmm, this does not work for topleft of $self... but we should not ask for that |
992 | sub coord2local { |
999 | sub coord2local { |
993 | my ($self, $x, $y) = @_; |
1000 | my ($self, $x, $y) = @_; |
… | |
… | |
1008 | my ($self, $x, $y) = @_; |
1015 | my ($self, $x, $y) = @_; |
1009 | |
1016 | |
1010 | if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} |
1017 | if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} |
1011 | && $y >= $self->{y} && $y < $self->{y} + $self->{h} |
1018 | && $y >= $self->{y} && $y < $self->{y} + $self->{h} |
1012 | ) { |
1019 | ) { |
1013 | $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) |
1020 | $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) |
1014 | } else { |
1021 | } else { |
1015 | $self->CFPlus::UI::Base::find_widget ($x, $y) |
1022 | $self->CFPlus::UI::Base::find_widget ($x, $y) |
1016 | } |
1023 | } |
1017 | } |
1024 | } |
1018 | |
1025 | |
… | |
… | |
1029 | |
1036 | |
1030 | ############################################################################# |
1037 | ############################################################################# |
1031 | |
1038 | |
1032 | package CFPlus::UI::ScrolledWindow; |
1039 | package CFPlus::UI::ScrolledWindow; |
1033 | |
1040 | |
1034 | our @ISA = CFPlus::UI::HBox::; |
1041 | our @ISA = CFPlus::UI::Table::; |
1035 | |
1042 | |
1036 | sub new { |
1043 | sub new { |
1037 | my ($class, %arg) = @_; |
1044 | my ($class, %arg) = @_; |
1038 | |
1045 | |
1039 | my $child = delete $arg{child}; |
1046 | my $child = delete $arg{child}; |
1040 | |
1047 | |
1041 | my $self; |
1048 | my $self; |
1042 | |
1049 | |
1043 | my $slider = new CFPlus::UI::Slider |
1050 | my $hslider = new CFPlus::UI::Slider |
|
|
1051 | vertical => 0, |
|
|
1052 | range => [0, 0, 1, 0.01], # HACK fix |
|
|
1053 | on_changed => sub { |
|
|
1054 | $self->{hpos} = $_[1]; |
|
|
1055 | $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); |
|
|
1056 | }, |
|
|
1057 | ; |
|
|
1058 | |
|
|
1059 | my $vslider = new CFPlus::UI::Slider |
1044 | vertical => 1, |
1060 | vertical => 1, |
1045 | range => [0, 0, 1, 0.01], # HACK fix |
1061 | range => [0, 0, 1, 0.01], # HACK fix |
1046 | on_changed => sub { |
1062 | on_changed => sub { |
1047 | $self->{vp}->set_offset (0, $_[1]); |
1063 | $self->{vpos} = $_[1]; |
|
|
1064 | $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); |
1048 | }, |
1065 | }, |
1049 | ; |
1066 | ; |
1050 | |
1067 | |
1051 | $self = $class->SUPER::new ( |
1068 | $self = $class->SUPER::new ( |
1052 | vp => (new CFPlus::UI::ViewPort expand => 1), |
1069 | scroll_x => 0, |
|
|
1070 | scroll_y => 1, |
1053 | can_events => 1, |
1071 | can_events => 1, |
1054 | slider => $slider, |
1072 | hslider => $hslider, |
|
|
1073 | vslider => $vslider, |
|
|
1074 | col_expand => [1, 0], |
|
|
1075 | row_expand => [1, 0], |
1055 | %arg, |
1076 | %arg, |
1056 | ); |
1077 | ); |
1057 | |
1078 | |
1058 | $self->SUPER::add ($self->{vp}, $self->{slider}); |
1079 | $self->{vp} = new CFPlus::UI::ViewPort |
|
|
1080 | expand => 1, |
|
|
1081 | scroll_x => $self->{scroll_x}, |
|
|
1082 | scroll_y => $self->{scroll_y}, |
|
|
1083 | on_changed => sub { |
|
|
1084 | my ($vp, $x, $y) = @_; |
|
|
1085 | |
|
|
1086 | $vp->{parent}{hslider}->set_value ($x); |
|
|
1087 | $vp->{parent}{vslider}->set_value ($y); |
|
|
1088 | |
|
|
1089 | 0 |
|
|
1090 | }, |
|
|
1091 | ; |
|
|
1092 | |
|
|
1093 | $self->SUPER::add_at (0, 0, $self->{vp}); |
|
|
1094 | |
1059 | $self->add ($child) if $child; |
1095 | $self->add ($child) if $child; |
1060 | |
1096 | |
1061 | $self |
1097 | $self |
1062 | } |
1098 | } |
1063 | |
1099 | |
… | |
… | |
1067 | my ($self, $widget) = @_; |
1103 | my ($self, $widget) = @_; |
1068 | |
1104 | |
1069 | $self->{vp}->add ($self->{child} = $widget); |
1105 | $self->{vp}->add ($self->{child} = $widget); |
1070 | } |
1106 | } |
1071 | |
1107 | |
|
|
1108 | sub update_slider { |
|
|
1109 | my ($self) = @_; |
|
|
1110 | |
|
|
1111 | my $child = ($self->{vp} or return)->child; |
|
|
1112 | |
|
|
1113 | my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); |
|
|
1114 | $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); |
|
|
1115 | |
|
|
1116 | my $visible = $w1 > $w2; |
|
|
1117 | if ($visible != $self->{hslider}{visible}) { |
|
|
1118 | $visible ? $self->SUPER::add_at (0, 1, $self->{hslider}) |
|
|
1119 | : $self->{hslider}->hide; |
|
|
1120 | } |
|
|
1121 | |
|
|
1122 | my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); |
|
|
1123 | $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); |
|
|
1124 | |
|
|
1125 | my $visible = $h1 > $h2; |
|
|
1126 | if ($visible != $self->{vslider}{visible}) { |
|
|
1127 | $visible ? $self->SUPER::add_at (1, 0, $self->{vslider}) |
|
|
1128 | : $self->{vslider}->hide; |
|
|
1129 | } |
|
|
1130 | } |
|
|
1131 | |
|
|
1132 | sub update { |
|
|
1133 | my ($self) = @_; |
|
|
1134 | |
|
|
1135 | $self->update_slider; |
|
|
1136 | $self->SUPER::update; |
|
|
1137 | } |
|
|
1138 | |
1072 | sub invoke_mouse_wheel { |
1139 | sub invoke_mouse_wheel { |
1073 | my ($self, $ev) = @_; |
1140 | my ($self, $ev) = @_; |
1074 | |
1141 | |
1075 | return 0 unless $ev->{dy}; # only vertical movements |
|
|
1076 | |
|
|
1077 | $self->{slider}->emit (mouse_wheel => $ev); |
1142 | $self->{vslider}->emit (mouse_wheel => $ev) |
|
|
1143 | if $ev->{dy}; |
|
|
1144 | |
|
|
1145 | $self->{hslider}->emit (mouse_wheel => $ev) |
|
|
1146 | if $ev->{dx}; |
1078 | |
1147 | |
1079 | 1 |
1148 | 1 |
1080 | } |
1149 | } |
1081 | |
1150 | |
1082 | sub update_slider { |
1151 | sub invoke_button_down { |
1083 | my ($self) = @_; |
1152 | my ($self, $ev, $x, $y) = @_; |
1084 | |
1153 | |
1085 | $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); |
1154 | if ($ev->{button} == 2) { |
1086 | } |
1155 | $self->grab_focus; |
1087 | |
1156 | |
1088 | sub update { |
1157 | my $ox = $self->{vp}{view_x} + $ev->{x}; |
1089 | my ($self) = @_; |
1158 | my $oy = $self->{vp}{view_y} + $ev->{y}; |
|
|
1159 | |
|
|
1160 | $self->{motion} = sub { |
|
|
1161 | my ($ev, $x, $y) = @_; |
1090 | |
1162 | |
1091 | $self->SUPER::update; |
1163 | $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y}); |
|
|
1164 | $self->update; |
|
|
1165 | }; |
1092 | |
1166 | |
1093 | $self->update_slider; |
1167 | return 1; |
|
|
1168 | } |
|
|
1169 | |
|
|
1170 | 0 |
|
|
1171 | } |
|
|
1172 | |
|
|
1173 | sub invoke_button_up { |
|
|
1174 | my ($self, $ev, $x, $y) = @_; |
|
|
1175 | |
|
|
1176 | if (delete $self->{motion}) { |
|
|
1177 | return 1; |
|
|
1178 | } |
|
|
1179 | |
|
|
1180 | 0 |
|
|
1181 | } |
|
|
1182 | |
|
|
1183 | sub invoke_mouse_motion { |
|
|
1184 | my ($self, $ev, $x, $y) = @_; |
|
|
1185 | |
|
|
1186 | if ($self->{motion}) { |
|
|
1187 | $self->{motion}->($ev, $x, $y); |
|
|
1188 | return 1; |
|
|
1189 | } |
|
|
1190 | |
|
|
1191 | 0 |
1094 | } |
1192 | } |
1095 | |
1193 | |
1096 | sub invoke_size_allocate { |
1194 | sub invoke_size_allocate { |
1097 | my ($self, $w, $h) = @_; |
1195 | my ($self, $w, $h) = @_; |
1098 | |
1196 | |
1099 | $self->update_slider; |
1197 | $self->update_slider; |
1100 | |
|
|
1101 | $self->SUPER::invoke_size_allocate ($w, $h) |
1198 | $self->SUPER::invoke_size_allocate ($w, $h) |
1102 | } |
1199 | } |
1103 | |
1200 | |
1104 | ############################################################################# |
1201 | ############################################################################# |
1105 | |
1202 | |
… | |
… | |
1255 | |
1352 | |
1256 | my @border = |
1353 | my @border = |
1257 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
1354 | 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); |
1355 | qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); |
1259 | |
1356 | |
|
|
1357 | my @icon = |
|
|
1358 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
|
|
1359 | qw(x1_move.png x1_resize.png); |
|
|
1360 | |
1260 | sub new { |
1361 | sub new { |
1261 | my ($class, %arg) = @_; |
1362 | my ($class, %arg) = @_; |
1262 | |
1363 | |
1263 | my $self = $class->SUPER::new ( |
1364 | my $self = $class->SUPER::new ( |
1264 | bg => [1, 1, 1, 1], |
1365 | bg => [1, 1, 1, 1], |
… | |
… | |
1432 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
1533 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
1433 | |
1534 | |
1434 | my $border = $self->border; |
1535 | my $border = $self->border; |
1435 | |
1536 | |
1436 | glColor @{ $self->{border_bg} }; |
1537 | glColor @{ $self->{border_bg} }; |
1437 | $border[0]->draw_quad_alpha (0, 0, $w, $border); |
1538 | $border[0]->draw_quad_alpha ( 0, 0, $w, $border); |
1438 | $border[1]->draw_quad_alpha (0, $border, $border, $ch); |
1539 | $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); |
1439 | $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); |
1540 | $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); |
1440 | $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); |
1541 | $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); |
|
|
1542 | |
|
|
1543 | # move |
|
|
1544 | my $w2 = ($w - $border) * .5; |
|
|
1545 | my $h2 = ($h - $border) * .5; |
|
|
1546 | $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); |
|
|
1547 | $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); |
|
|
1548 | $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); |
|
|
1549 | |
|
|
1550 | # resize |
|
|
1551 | $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); |
|
|
1552 | $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) |
|
|
1553 | unless $self->{has_close_button}; |
|
|
1554 | $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); |
|
|
1555 | $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); |
1441 | |
1556 | |
1442 | if (@{$self->{bg}} < 4 || $self->{bg}[3]) { |
1557 | if (@{$self->{bg}} < 4 || $self->{bg}[3]) { |
1443 | glColor @{ $self->{bg} }; |
1558 | glColor @{ $self->{bg} }; |
1444 | |
1559 | |
1445 | # TODO: repeat texture not scale |
1560 | # TODO: repeat texture not scale |
… | |
… | |
1476 | |
1591 | |
1477 | sub new { |
1592 | sub new { |
1478 | my $class = shift; |
1593 | my $class = shift; |
1479 | |
1594 | |
1480 | $class->SUPER::new ( |
1595 | $class->SUPER::new ( |
|
|
1596 | children => [], |
1481 | col_expand => [], |
1597 | col_expand => [], |
|
|
1598 | row_expand => [], |
1482 | @_, |
1599 | @_, |
1483 | ) |
1600 | ) |
1484 | } |
1601 | } |
1485 | |
1602 | |
1486 | sub children { |
1603 | sub children { |
1487 | grep $_, map @$_, grep $_, @{ $_[0]{children} } |
1604 | grep $_, map @$_, grep $_, @{ $_[0]{children} } |
1488 | } |
1605 | } |
1489 | |
1606 | |
|
|
1607 | # TODO: store row/col info in child widget and use standard add/del |
1490 | sub add { |
1608 | sub add { |
1491 | my ($self) = shift; |
1609 | my $self = shift; |
|
|
1610 | |
|
|
1611 | Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d# |
|
|
1612 | $self->add_at (@_); |
|
|
1613 | } |
|
|
1614 | |
|
|
1615 | sub add_at { |
|
|
1616 | my $self = shift; |
1492 | |
1617 | |
1493 | while (@_) { |
1618 | while (@_) { |
1494 | my ($x, $y, $child) = splice @_, 0, 3, (); |
1619 | my ($col, $row, $child) = splice @_, 0, 3, (); |
|
|
1620 | |
|
|
1621 | $child->{row} = $row; |
|
|
1622 | $child->{col} = $col; |
|
|
1623 | |
|
|
1624 | $child->{rowspan} ||= 1; |
|
|
1625 | $child->{colspan} ||= 1; |
|
|
1626 | |
1495 | $child->set_parent ($self); |
1627 | $child->set_parent ($self); |
1496 | $self->{children}[$y][$x] = $child; |
1628 | $self->{children}[$row][$col] = $child; |
1497 | } |
1629 | } |
1498 | |
1630 | |
1499 | $self->{force_realloc} = 1; |
1631 | $self->{force_realloc} = 1; |
1500 | $self->{force_size_alloc} = 1; |
1632 | $self->{force_size_alloc} = 1; |
1501 | $self->realloc; |
1633 | $self->realloc; |
1502 | } |
1634 | } |
1503 | |
1635 | |
1504 | sub remove { |
1636 | sub remove { |
1505 | my ($self, $child) = @_; |
1637 | my ($self, $child) = @_; |
1506 | |
1638 | |
1507 | # TODO: not yet implemented |
1639 | for (@{ $self->{children} }) { |
|
|
1640 | for (@{ $_ || [] }) { |
|
|
1641 | $_ = undef if $_ == $child; |
|
|
1642 | } |
|
|
1643 | } |
1508 | } |
1644 | } |
1509 | |
1645 | |
1510 | # TODO: move to container class maybe? send children a signal on removal? |
1646 | # TODO: move to container class maybe? send children a signal on removal? |
1511 | sub clear { |
1647 | sub clear { |
1512 | my ($self) = @_; |
1648 | my ($self) = @_; |
… | |
… | |
1525 | sub get_wh { |
1661 | sub get_wh { |
1526 | my ($self) = @_; |
1662 | my ($self) = @_; |
1527 | |
1663 | |
1528 | my (@w, @h); |
1664 | my (@w, @h); |
1529 | |
1665 | |
1530 | for my $y (0 .. $#{$self->{children}}) { |
1666 | my @children = $self->children; |
1531 | my $row = $self->{children}[$y] |
|
|
1532 | or next; |
|
|
1533 | |
1667 | |
1534 | for my $x (0 .. $#$row) { |
1668 | for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) { |
1535 | my $widget = $row->[$x] |
1669 | my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; |
1536 | or next; |
|
|
1537 | my ($w, $h) = @$widget{qw(req_w req_h)}; |
|
|
1538 | |
1670 | |
1539 | $w[$x] = max $w[$x], $w; |
1671 | my $sw = sum @w[$c .. $c + $cs - 1]; |
1540 | $h[$y] = max $h[$y], $h; |
1672 | my $sh = sum @h[$r .. $r + $rs - 1]; |
|
|
1673 | |
|
|
1674 | if ($w > $sw) { |
|
|
1675 | $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1]; |
|
|
1676 | } |
|
|
1677 | |
|
|
1678 | if ($h > $sh) { |
|
|
1679 | $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1]; |
1541 | } |
1680 | } |
1542 | } |
1681 | } |
1543 | |
1682 | |
1544 | (\@w, \@h) |
1683 | (\@w, \@h) |
1545 | } |
1684 | } |
… | |
… | |
1561 | my ($ws, $hs) = $self->get_wh; |
1700 | my ($ws, $hs) = $self->get_wh; |
1562 | |
1701 | |
1563 | my $req_w = (sum @$ws) || 1; |
1702 | my $req_w = (sum @$ws) || 1; |
1564 | my $req_h = (sum @$hs) || 1; |
1703 | my $req_h = (sum @$hs) || 1; |
1565 | |
1704 | |
1566 | # TODO: nicer code && do row_expand |
1705 | # now linearly scale the rows/columns to the allocated size |
1567 | my @col_expand = @{$self->{col_expand}}; |
1706 | my @col_expand = @{$self->{col_expand}}; |
1568 | @col_expand = (1) x @$ws unless @col_expand; |
1707 | @col_expand = (1) x @$ws unless @col_expand; |
1569 | my $col_expand = (sum @col_expand) || 1; |
1708 | my $col_expand = (sum @col_expand) || 1; |
1570 | |
1709 | |
1571 | # linearly scale sizes |
|
|
1572 | $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; |
1710 | $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; |
1573 | $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; |
|
|
1574 | |
1711 | |
1575 | CFPlus::UI::harmonize $ws; |
1712 | CFPlus::UI::harmonize $ws; |
|
|
1713 | |
|
|
1714 | my @row_expand = @{$self->{row_expand}}; |
|
|
1715 | @row_expand = (1) x @$ws unless @row_expand; |
|
|
1716 | my $row_expand = (sum @row_expand) || 1; |
|
|
1717 | |
|
|
1718 | $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; |
|
|
1719 | |
1576 | CFPlus::UI::harmonize $hs; |
1720 | CFPlus::UI::harmonize $hs; |
1577 | |
1721 | |
1578 | my $y; |
1722 | my (@x, @y); |
1579 | |
1723 | |
|
|
1724 | for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } |
|
|
1725 | for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } |
|
|
1726 | |
1580 | for my $r (0 .. $#{$self->{children}}) { |
1727 | for my $widget ($self->children) { |
1581 | my $row = $self->{children}[$r] |
1728 | my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; |
1582 | or next; |
|
|
1583 | |
1729 | |
1584 | my $x = 0; |
1730 | $widget->configure ( |
1585 | my $row_h = $hs->[$r]; |
1731 | $x[$c], $y[$r], |
|
|
1732 | $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], |
1586 | |
1733 | ); |
1587 | for my $c (0 .. $#$row) { |
|
|
1588 | my $col_w = $ws->[$c]; |
|
|
1589 | |
|
|
1590 | if (my $widget = $row->[$c]) { |
|
|
1591 | $widget->configure ($x, $y, $col_w, $row_h); |
|
|
1592 | } |
|
|
1593 | |
|
|
1594 | $x += $col_w; |
|
|
1595 | } |
|
|
1596 | |
|
|
1597 | $y += $row_h; |
|
|
1598 | } |
1734 | } |
1599 | |
1735 | |
1600 | 1 |
1736 | 1 |
1601 | } |
1737 | } |
1602 | |
1738 | |
… | |
… | |
1620 | my ($self) = @_; |
1756 | my ($self) = @_; |
1621 | |
1757 | |
1622 | for (grep $_, @{$self->{children}}) { |
1758 | for (grep $_, @{$self->{children}}) { |
1623 | $_->draw for grep $_, @$_; |
1759 | $_->draw for grep $_, @$_; |
1624 | } |
1760 | } |
|
|
1761 | } |
|
|
1762 | |
|
|
1763 | ############################################################################# |
|
|
1764 | |
|
|
1765 | package CFPlus::UI::Fixed; |
|
|
1766 | |
|
|
1767 | use List::Util qw(min max); |
|
|
1768 | |
|
|
1769 | our @ISA = CFPlus::UI::Container::; |
|
|
1770 | |
|
|
1771 | sub add { |
|
|
1772 | my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_; |
|
|
1773 | |
|
|
1774 | $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h]; |
|
|
1775 | $self->SUPER::add ($child); |
|
|
1776 | } |
|
|
1777 | |
|
|
1778 | sub _scale($$$) { |
|
|
1779 | my ($mode, $val, $max) = @_; |
|
|
1780 | |
|
|
1781 | $mode eq "abs" ? $val |
|
|
1782 | : $mode eq "rel" ? $val * $max |
|
|
1783 | : 0 |
|
|
1784 | } |
|
|
1785 | |
|
|
1786 | sub size_request { |
|
|
1787 | my ($self) = @_; |
|
|
1788 | |
|
|
1789 | my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); |
|
|
1790 | |
|
|
1791 | # determine overall size by querying abs widgets |
|
|
1792 | for my $child ($self->visible_children) { |
|
|
1793 | my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; |
|
|
1794 | |
|
|
1795 | if ($pos eq "abs") { |
|
|
1796 | $w = _scale $size, $w, $child->{req_w}; |
|
|
1797 | $h = _scale $size, $h, $child->{req_h}; |
|
|
1798 | |
|
|
1799 | $x1 = min $x1, $x; $x2 = max $x2, $x + $w; |
|
|
1800 | $y1 = min $y1, $y; $y2 = max $y2, $y + $h; |
|
|
1801 | } |
|
|
1802 | } |
|
|
1803 | |
|
|
1804 | my $W = $x2 - $x1; |
|
|
1805 | my $H = $y2 - $y1; |
|
|
1806 | |
|
|
1807 | # now layout remaining widgets |
|
|
1808 | for my $child ($self->visible_children) { |
|
|
1809 | my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; |
|
|
1810 | |
|
|
1811 | if ($pos ne "abs") { |
|
|
1812 | $x = _scale $pos, $x, $W; |
|
|
1813 | $y = _scale $pos, $x, $H; |
|
|
1814 | $w = _scale $size, $w, $child->{req_w}; |
|
|
1815 | $h = _scale $size, $h, $child->{req_h}; |
|
|
1816 | |
|
|
1817 | $x1 = min $x1, $x; $x2 = max $x2, $x + $w; |
|
|
1818 | $y1 = min $y1, $y; $y2 = max $y2, $y + $h; |
|
|
1819 | } |
|
|
1820 | } |
|
|
1821 | |
|
|
1822 | my $W = $x2 - $x1; |
|
|
1823 | my $H = $y2 - $y1; |
|
|
1824 | |
|
|
1825 | ($W, $H) |
|
|
1826 | } |
|
|
1827 | |
|
|
1828 | sub invoke_size_allocate { |
|
|
1829 | my ($self, $W, $H) = @_; |
|
|
1830 | |
|
|
1831 | for my $child ($self->visible_children) { |
|
|
1832 | my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; |
|
|
1833 | |
|
|
1834 | $x = _scale $pos, $x, $W; |
|
|
1835 | $y = _scale $pos, $x, $H; |
|
|
1836 | $w = _scale $size, $w, $child->{req_w}; |
|
|
1837 | $h = _scale $size, $h, $child->{req_h}; |
|
|
1838 | |
|
|
1839 | $child->configure ($x, $y, $w, $h); |
|
|
1840 | } |
|
|
1841 | |
|
|
1842 | 1 |
1625 | } |
1843 | } |
1626 | |
1844 | |
1627 | ############################################################################# |
1845 | ############################################################################# |
1628 | |
1846 | |
1629 | package CFPlus::UI::Box; |
1847 | package CFPlus::UI::Box; |
… | |
… | |
2187 | |
2405 | |
2188 | use CFPlus::OpenGL; |
2406 | use CFPlus::OpenGL; |
2189 | |
2407 | |
2190 | my @tex = |
2408 | my @tex = |
2191 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
2409 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
2192 | qw(b1_button_active.png); |
2410 | qw(b1_button_inactive.png b1_button_active.png); |
2193 | |
2411 | |
2194 | sub new { |
2412 | sub new { |
2195 | my $class = shift; |
2413 | my $class = shift; |
2196 | |
2414 | |
2197 | $class->SUPER::new ( |
2415 | $class->SUPER::new ( |
2198 | padding_x => 4, |
2416 | padding_x => 4, |
2199 | padding_y => 4, |
2417 | padding_y => 4, |
2200 | fg => [1, 1, 1], |
2418 | fg => [1.0, 1.0, 1.0], |
2201 | active_fg => [0, 0, 1], |
2419 | active_fg => [0.8, 0.8, 0.8], |
2202 | can_hover => 1, |
2420 | can_hover => 1, |
2203 | align => 0, |
2421 | align => 0, |
2204 | valign => 0, |
2422 | valign => 0, |
2205 | can_events => 1, |
2423 | can_events => 1, |
2206 | @_ |
2424 | @_ |
… | |
… | |
2224 | |
2442 | |
2225 | glEnable GL_TEXTURE_2D; |
2443 | glEnable GL_TEXTURE_2D; |
2226 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2444 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2227 | glColor 0, 0, 0, 1; |
2445 | glColor 0, 0, 0, 1; |
2228 | |
2446 | |
|
|
2447 | my $tex = $tex[$GRAB == $self]; |
2229 | $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2448 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2230 | |
2449 | |
2231 | glDisable GL_TEXTURE_2D; |
2450 | glDisable GL_TEXTURE_2D; |
2232 | |
2451 | |
2233 | $self->SUPER::_draw; |
2452 | $self->SUPER::_draw; |
2234 | } |
2453 | } |
… | |
… | |
3289 | |
3508 | |
3290 | sub new { |
3509 | sub new { |
3291 | my $class = shift; |
3510 | my $class = shift; |
3292 | |
3511 | |
3293 | my $self = $class->SUPER::new ( |
3512 | my $self = $class->SUPER::new ( |
|
|
3513 | size_w => 32, |
|
|
3514 | size_h => 8, |
3294 | aspect => 1, |
3515 | aspect => 1, |
3295 | can_events => 0, |
3516 | can_events => 0, |
3296 | @_, |
3517 | @_, |
3297 | ); |
3518 | ); |
3298 | |
3519 | |
3299 | if ($self->{anim} && $self->{animspeed}) { |
3520 | if ($self->{anim} && $self->{animspeed}) { |
3300 | CFPlus::weaken (my $widget = $self); |
3521 | CFPlus::weaken (my $widget = $self); |
3301 | |
3522 | |
|
|
3523 | $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; |
|
|
3524 | $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; |
3302 | $self->{timer} = Event->timer ( |
3525 | $self->{timer} = Event->timer ( |
3303 | at => $self->{animspeed} * int $::NOW / $self->{animspeed}, |
|
|
3304 | hard => 1, |
3526 | parked => 1, |
3305 | interval => $self->{animspeed}, |
|
|
3306 | cb => sub { |
3527 | cb => sub { |
|
|
3528 | return unless $::CONN && $widget; |
|
|
3529 | |
3307 | ++$widget->{frame}; |
3530 | ++$widget->{frame}; |
|
|
3531 | $widget->update_face; |
3308 | $widget->update; |
3532 | $widget->update; |
|
|
3533 | |
|
|
3534 | $widget->update_timer; |
3309 | }, |
3535 | }, |
3310 | ); |
3536 | ); |
|
|
3537 | |
|
|
3538 | $self->update_face; |
|
|
3539 | $self->update_timer; |
3311 | } |
3540 | } |
3312 | |
3541 | |
3313 | $self |
3542 | $self |
3314 | } |
3543 | } |
3315 | |
3544 | |
|
|
3545 | sub update_timer { |
|
|
3546 | my ($self) = @_; |
|
|
3547 | |
|
|
3548 | return unless $self->{timer}; |
|
|
3549 | |
|
|
3550 | if ($self->{visible}) { |
|
|
3551 | $self->{timer}->at ( |
|
|
3552 | $self->{anim_start} |
|
|
3553 | + $self->{animspeed} |
|
|
3554 | * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed} |
|
|
3555 | ); |
|
|
3556 | $self->{timer}->start; |
|
|
3557 | } else { |
|
|
3558 | $self->{timer}->stop; |
|
|
3559 | } |
|
|
3560 | } |
|
|
3561 | |
|
|
3562 | sub update_face { |
|
|
3563 | my ($self) = @_; |
|
|
3564 | |
|
|
3565 | return unless $::CONN; |
|
|
3566 | |
|
|
3567 | if (my $anim = $::CONN->{anim}[$self->{anim}]) { |
|
|
3568 | if ($anim && @$anim) { |
|
|
3569 | delete $self->{wait_face}; |
|
|
3570 | $self->{face} = $anim->[ $self->{frame} % @$anim ]; |
|
|
3571 | } |
|
|
3572 | } |
|
|
3573 | } |
|
|
3574 | |
3316 | sub size_request { |
3575 | sub size_request { |
3317 | (32, 8) |
3576 | my ($self) = @_; |
|
|
3577 | |
|
|
3578 | if ($::CONN) { |
|
|
3579 | if (my $faceid = $::CONN->{faceid}[$self->{face}]) { |
|
|
3580 | if (my $tex = $::CONN->{texture}[$faceid]) { |
|
|
3581 | return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); |
|
|
3582 | } else { |
|
|
3583 | $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { |
|
|
3584 | $self->realloc; |
|
|
3585 | }); |
|
|
3586 | } |
|
|
3587 | } |
|
|
3588 | } |
|
|
3589 | |
|
|
3590 | ($self->{size_w} || 8, $self->{size_h} || 8) |
3318 | } |
3591 | } |
3319 | |
3592 | |
3320 | sub update { |
3593 | sub update { |
3321 | my ($self) = @_; |
3594 | my ($self) = @_; |
3322 | |
3595 | |
3323 | return unless $self->{visible}; |
3596 | return unless $self->{visible}; |
3324 | |
3597 | |
3325 | $self->SUPER::update; |
3598 | $self->SUPER::update; |
3326 | } |
3599 | } |
3327 | |
3600 | |
|
|
3601 | sub invoke_visibility_change { |
|
|
3602 | my ($self) = @_; |
|
|
3603 | |
|
|
3604 | $self->update_timer; |
|
|
3605 | |
|
|
3606 | 0 |
|
|
3607 | } |
|
|
3608 | |
3328 | sub _draw { |
3609 | sub _draw { |
3329 | my ($self) = @_; |
3610 | my ($self) = @_; |
3330 | |
3611 | |
3331 | return unless $::CONN; |
3612 | return unless $::CONN; |
3332 | |
3613 | |
3333 | $self->SUPER::_draw; |
3614 | $self->SUPER::_draw; |
3334 | |
3615 | |
3335 | my $face; |
|
|
3336 | |
|
|
3337 | if ($self->{frame}) { |
|
|
3338 | my $anim = $::CONN->{anim}[$self->{anim}]; |
3616 | my $faceid = $::CONN->{faceid}[$self->{face}] |
3339 | |
3617 | or return; |
3340 | $face = $anim->[ $self->{frame} % @$anim ] |
|
|
3341 | if $anim && @$anim; |
|
|
3342 | } |
|
|
3343 | |
3618 | |
3344 | my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; |
3619 | my $tex = $::CONN->{texture}[$faceid]; |
3345 | |
3620 | |
3346 | if ($tex) { |
3621 | if ($tex) { |
3347 | glEnable GL_TEXTURE_2D; |
3622 | glEnable GL_TEXTURE_2D; |
3348 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
3623 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
3349 | glColor 0, 0, 0, 1; |
3624 | glColor 0, 0, 0, 1; |
… | |
… | |
3353 | } |
3628 | } |
3354 | |
3629 | |
3355 | sub destroy { |
3630 | sub destroy { |
3356 | my ($self) = @_; |
3631 | my ($self) = @_; |
3357 | |
3632 | |
3358 | $self->{timer}->cancel |
3633 | (delete $self->{timer})->cancel |
3359 | if $self->{timer}; |
3634 | if $self->{timer}; |
3360 | |
3635 | |
3361 | $self->SUPER::destroy; |
3636 | $self->SUPER::destroy; |
3362 | } |
3637 | } |
3363 | |
3638 | |
… | |
… | |
4007 | while ($self->{post_alloc_hook}) { |
4282 | while ($self->{post_alloc_hook}) { |
4008 | $_->() |
4283 | $_->() |
4009 | for values %{delete $self->{post_alloc_hook}}; |
4284 | for values %{delete $self->{post_alloc_hook}}; |
4010 | } |
4285 | } |
4011 | |
4286 | |
4012 | |
|
|
4013 | glViewport 0, 0, $::WIDTH, $::HEIGHT; |
4287 | glViewport 0, 0, $::WIDTH, $::HEIGHT; |
4014 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
4288 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
4015 | glClear GL_COLOR_BUFFER_BIT; |
4289 | glClear GL_COLOR_BUFFER_BIT; |
4016 | |
4290 | |
4017 | glMatrixMode GL_PROJECTION; |
4291 | glMatrixMode GL_PROJECTION; |