… | |
… | |
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); |
… | |
… | |
986 | } |
981 | } |
987 | |
982 | |
988 | sub set_offset { |
983 | sub set_offset { |
989 | my ($self, $x, $y) = @_; |
984 | my ($self, $x, $y) = @_; |
990 | |
985 | |
991 | $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x; |
986 | my $x = max 0, min $self->child->{w} - $self->{w}, int $x; |
992 | $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y; |
987 | my $y = max 0, min $self->child->{h} - $self->{h}, int $y; |
993 | |
988 | |
|
|
989 | if ($x != $self->{view_x} or $y != $self->{view_y}) { |
|
|
990 | $self->{view_x} = $x; |
|
|
991 | $self->{view_y} = $y; |
|
|
992 | |
|
|
993 | $self->emit (changed => $x, $y); |
994 | $self->update; |
994 | $self->update; |
|
|
995 | } |
995 | } |
996 | } |
996 | |
997 | |
997 | # 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 |
998 | sub coord2local { |
999 | sub coord2local { |
999 | my ($self, $x, $y) = @_; |
1000 | my ($self, $x, $y) = @_; |
… | |
… | |
1014 | my ($self, $x, $y) = @_; |
1015 | my ($self, $x, $y) = @_; |
1015 | |
1016 | |
1016 | if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} |
1017 | if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} |
1017 | && $y >= $self->{y} && $y < $self->{y} + $self->{h} |
1018 | && $y >= $self->{y} && $y < $self->{y} + $self->{h} |
1018 | ) { |
1019 | ) { |
1019 | $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}) |
1020 | } else { |
1021 | } else { |
1021 | $self->CFPlus::UI::Base::find_widget ($x, $y) |
1022 | $self->CFPlus::UI::Base::find_widget ($x, $y) |
1022 | } |
1023 | } |
1023 | } |
1024 | } |
1024 | |
1025 | |
… | |
… | |
1074 | row_expand => [1, 0], |
1075 | row_expand => [1, 0], |
1075 | %arg, |
1076 | %arg, |
1076 | ); |
1077 | ); |
1077 | |
1078 | |
1078 | $self->{vp} = new CFPlus::UI::ViewPort |
1079 | $self->{vp} = new CFPlus::UI::ViewPort |
1079 | expand => 1, |
1080 | expand => 1, |
1080 | scroll_x => $self->{scroll_x}, |
1081 | scroll_x => $self->{scroll_x}, |
1081 | scroll_y => $self->{scroll_y}, |
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 | }, |
1082 | ; |
1091 | ; |
1083 | |
1092 | |
1084 | $self->SUPER::add (0, 0, $self->{vp}); |
1093 | $self->SUPER::add_at (0, 0, $self->{vp}); |
1085 | |
1094 | |
1086 | $self->add ($child) if $child; |
1095 | $self->add ($child) if $child; |
1087 | |
1096 | |
1088 | $self |
1097 | $self |
1089 | } |
1098 | } |
… | |
… | |
1104 | my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); |
1113 | my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); |
1105 | $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); |
1114 | $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); |
1106 | |
1115 | |
1107 | my $visible = $w1 > $w2; |
1116 | my $visible = $w1 > $w2; |
1108 | if ($visible != $self->{hslider}{visible}) { |
1117 | if ($visible != $self->{hslider}{visible}) { |
1109 | $visible ? $self->SUPER::add (0, 1, $self->{hslider}) |
1118 | $visible ? $self->SUPER::add_at (0, 1, $self->{hslider}) |
1110 | : $self->{hslider}->hide; |
1119 | : $self->{hslider}->hide; |
1111 | } |
1120 | } |
1112 | |
1121 | |
1113 | my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); |
1122 | my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); |
1114 | $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); |
1123 | $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); |
1115 | |
1124 | |
1116 | my $visible = $h1 > $h2; |
1125 | my $visible = $h1 > $h2; |
1117 | if ($visible != $self->{vslider}{visible}) { |
1126 | if ($visible != $self->{vslider}{visible}) { |
1118 | $visible ? $self->SUPER::add (1, 0, $self->{vslider}) |
1127 | $visible ? $self->SUPER::add_at (1, 0, $self->{vslider}) |
1119 | : $self->{vslider}->hide; |
1128 | : $self->{vslider}->hide; |
1120 | } |
1129 | } |
1121 | } |
1130 | } |
1122 | |
1131 | |
1123 | sub update { |
1132 | sub update { |
1124 | my ($self) = @_; |
1133 | my ($self) = @_; |
1125 | |
1134 | |
|
|
1135 | $self->update_slider; |
1126 | $self->SUPER::update; |
1136 | $self->SUPER::update; |
1127 | $self->update_slider; |
|
|
1128 | } |
1137 | } |
1129 | |
1138 | |
1130 | sub invoke_mouse_wheel { |
1139 | sub invoke_mouse_wheel { |
1131 | my ($self, $ev) = @_; |
1140 | my ($self, $ev) = @_; |
1132 | |
1141 | |
1133 | return 0 unless $ev->{dy}; # only vertical movements for now |
|
|
1134 | |
|
|
1135 | $self->{vslider}->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}; |
1136 | |
1147 | |
1137 | 1 |
1148 | 1 |
1138 | } |
1149 | } |
1139 | |
1150 | |
1140 | sub invoke_button_down { |
1151 | sub invoke_button_down { |
1141 | my ($self, $ev, $x, $y) = @_; |
1152 | my ($self, $ev, $x, $y) = @_; |
1142 | |
1153 | |
1143 | if ($ev->{button} == 2) { |
1154 | if ($ev->{button} == 2) { |
1144 | $self->grab_focus; |
1155 | $self->grab_focus; |
|
|
1156 | |
|
|
1157 | my $ox = $self->{vp}{view_x} + $ev->{x}; |
|
|
1158 | my $oy = $self->{vp}{view_y} + $ev->{y}; |
1145 | |
1159 | |
1146 | $self->{motion} = sub { |
1160 | $self->{motion} = sub { |
1147 | my ($ev, $x, $y) = @_; |
1161 | my ($ev, $x, $y) = @_; |
1148 | |
1162 | |
1149 | $self->{vp}->set_offset ( |
1163 | $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y}); |
1150 | $self->{vp}{view_x} - $ev->{xrel}, |
1164 | $self->update; |
1151 | $self->{vp}{view_y} - $ev->{yrel}, |
|
|
1152 | ); |
|
|
1153 | }; |
1165 | }; |
1154 | |
1166 | |
1155 | return 1; |
1167 | return 1; |
1156 | } |
1168 | } |
1157 | |
1169 | |
… | |
… | |
1340 | |
1352 | |
1341 | my @border = |
1353 | my @border = |
1342 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
1354 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
1343 | qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); |
1355 | qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); |
1344 | |
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 | |
1345 | sub new { |
1361 | sub new { |
1346 | my ($class, %arg) = @_; |
1362 | my ($class, %arg) = @_; |
1347 | |
1363 | |
1348 | my $self = $class->SUPER::new ( |
1364 | my $self = $class->SUPER::new ( |
1349 | bg => [1, 1, 1, 1], |
1365 | bg => [1, 1, 1, 1], |
… | |
… | |
1517 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
1533 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
1518 | |
1534 | |
1519 | my $border = $self->border; |
1535 | my $border = $self->border; |
1520 | |
1536 | |
1521 | glColor @{ $self->{border_bg} }; |
1537 | glColor @{ $self->{border_bg} }; |
1522 | $border[0]->draw_quad_alpha (0, 0, $w, $border); |
1538 | $border[0]->draw_quad_alpha ( 0, 0, $w, $border); |
1523 | $border[1]->draw_quad_alpha (0, $border, $border, $ch); |
1539 | $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); |
1524 | $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); |
1540 | $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); |
1525 | $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); |
1526 | |
1556 | |
1527 | if (@{$self->{bg}} < 4 || $self->{bg}[3]) { |
1557 | if (@{$self->{bg}} < 4 || $self->{bg}[3]) { |
1528 | glColor @{ $self->{bg} }; |
1558 | glColor @{ $self->{bg} }; |
1529 | |
1559 | |
1530 | # TODO: repeat texture not scale |
1560 | # TODO: repeat texture not scale |
… | |
… | |
1574 | grep $_, map @$_, grep $_, @{ $_[0]{children} } |
1604 | grep $_, map @$_, grep $_, @{ $_[0]{children} } |
1575 | } |
1605 | } |
1576 | |
1606 | |
1577 | # TODO: store row/col info in child widget and use standard add/del |
1607 | # TODO: store row/col info in child widget and use standard add/del |
1578 | sub add { |
1608 | sub add { |
1579 | 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; |
1580 | |
1617 | |
1581 | while (@_) { |
1618 | while (@_) { |
1582 | my ($x, $y, $child) = splice @_, 0, 3, (); |
1619 | my ($col, $row, $child) = splice @_, 0, 3, (); |
|
|
1620 | |
1583 | $child->set_parent ($self); |
1621 | $child->set_parent ($self); |
1584 | $self->{children}[$y][$x] = $child; |
1622 | $self->{children}[$row][$col] = $child; |
1585 | } |
1623 | } |
1586 | |
1624 | |
1587 | $self->{force_realloc} = 1; |
1625 | $self->{force_realloc} = 1; |
1588 | $self->{force_size_alloc} = 1; |
1626 | $self->{force_size_alloc} = 1; |
1589 | $self->realloc; |
1627 | $self->realloc; |
… | |
… | |
2366 | |
2404 | |
2367 | use CFPlus::OpenGL; |
2405 | use CFPlus::OpenGL; |
2368 | |
2406 | |
2369 | my @tex = |
2407 | my @tex = |
2370 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
2408 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
2371 | qw(b1_button_active.png); |
2409 | qw(b1_button_inactive.png b1_button_active.png); |
2372 | |
2410 | |
2373 | sub new { |
2411 | sub new { |
2374 | my $class = shift; |
2412 | my $class = shift; |
2375 | |
2413 | |
2376 | $class->SUPER::new ( |
2414 | $class->SUPER::new ( |
2377 | padding_x => 4, |
2415 | padding_x => 4, |
2378 | padding_y => 4, |
2416 | padding_y => 4, |
2379 | fg => [1, 1, 1], |
2417 | fg => [1.0, 1.0, 1.0], |
2380 | active_fg => [0, 0, 1], |
2418 | active_fg => [0.8, 0.8, 0.8], |
2381 | can_hover => 1, |
2419 | can_hover => 1, |
2382 | align => 0, |
2420 | align => 0, |
2383 | valign => 0, |
2421 | valign => 0, |
2384 | can_events => 1, |
2422 | can_events => 1, |
2385 | @_ |
2423 | @_ |
… | |
… | |
2403 | |
2441 | |
2404 | glEnable GL_TEXTURE_2D; |
2442 | glEnable GL_TEXTURE_2D; |
2405 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2443 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2406 | glColor 0, 0, 0, 1; |
2444 | glColor 0, 0, 0, 1; |
2407 | |
2445 | |
|
|
2446 | my $tex = $tex[$GRAB == $self]; |
2408 | $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2447 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2409 | |
2448 | |
2410 | glDisable GL_TEXTURE_2D; |
2449 | glDisable GL_TEXTURE_2D; |
2411 | |
2450 | |
2412 | $self->SUPER::_draw; |
2451 | $self->SUPER::_draw; |
2413 | } |
2452 | } |
… | |
… | |
3478 | ); |
3517 | ); |
3479 | |
3518 | |
3480 | if ($self->{anim} && $self->{animspeed}) { |
3519 | if ($self->{anim} && $self->{animspeed}) { |
3481 | CFPlus::weaken (my $widget = $self); |
3520 | CFPlus::weaken (my $widget = $self); |
3482 | |
3521 | |
|
|
3522 | $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; |
|
|
3523 | $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; |
3483 | $self->{timer} = Event->timer ( |
3524 | $self->{timer} = Event->timer ( |
3484 | at => $self->{animspeed} * int $::NOW / $self->{animspeed}, |
|
|
3485 | hard => 1, |
3525 | parked => 1, |
3486 | interval => $self->{animspeed}, |
|
|
3487 | cb => sub { |
3526 | cb => sub { |
3488 | return unless $::CONN; |
3527 | return unless $::CONN && $widget; |
3489 | |
3528 | |
3490 | ++$widget->{frame}; |
3529 | ++$widget->{frame}; |
3491 | $self->update_face; |
3530 | $widget->update_face; |
3492 | $self->update; |
3531 | $widget->update; |
|
|
3532 | |
|
|
3533 | $widget->update_timer; |
3493 | }, |
3534 | }, |
3494 | ); |
3535 | ); |
3495 | |
3536 | |
3496 | $self->update_face; |
3537 | $self->update_face; |
|
|
3538 | $self->update_timer; |
3497 | } |
3539 | } |
3498 | |
3540 | |
3499 | $self |
3541 | $self |
|
|
3542 | } |
|
|
3543 | |
|
|
3544 | sub update_timer { |
|
|
3545 | my ($self) = @_; |
|
|
3546 | |
|
|
3547 | return unless $self->{timer}; |
|
|
3548 | |
|
|
3549 | if ($self->{visible}) { |
|
|
3550 | $self->{timer}->at ( |
|
|
3551 | $self->{anim_start} |
|
|
3552 | + $self->{animspeed} |
|
|
3553 | * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed} |
|
|
3554 | ); |
|
|
3555 | $self->{timer}->start; |
|
|
3556 | } else { |
|
|
3557 | $self->{timer}->stop; |
|
|
3558 | } |
3500 | } |
3559 | } |
3501 | |
3560 | |
3502 | sub update_face { |
3561 | sub update_face { |
3503 | my ($self) = @_; |
3562 | my ($self) = @_; |
3504 | |
3563 | |
… | |
… | |
3536 | return unless $self->{visible}; |
3595 | return unless $self->{visible}; |
3537 | |
3596 | |
3538 | $self->SUPER::update; |
3597 | $self->SUPER::update; |
3539 | } |
3598 | } |
3540 | |
3599 | |
|
|
3600 | sub invoke_visibility_change { |
|
|
3601 | my ($self) = @_; |
|
|
3602 | |
|
|
3603 | $self->update_timer; |
|
|
3604 | |
|
|
3605 | 0 |
|
|
3606 | } |
|
|
3607 | |
3541 | sub _draw { |
3608 | sub _draw { |
3542 | my ($self) = @_; |
3609 | my ($self) = @_; |
3543 | |
3610 | |
3544 | return unless $::CONN; |
3611 | return unless $::CONN; |
3545 | |
3612 | |
… | |
… | |
3560 | } |
3627 | } |
3561 | |
3628 | |
3562 | sub destroy { |
3629 | sub destroy { |
3563 | my ($self) = @_; |
3630 | my ($self) = @_; |
3564 | |
3631 | |
3565 | $self->{timer}->cancel |
3632 | (delete $self->{timer})->cancel |
3566 | if $self->{timer}; |
3633 | if $self->{timer}; |
3567 | |
3634 | |
3568 | $self->SUPER::destroy; |
3635 | $self->SUPER::destroy; |
3569 | } |
3636 | } |
3570 | |
3637 | |
… | |
… | |
4214 | while ($self->{post_alloc_hook}) { |
4281 | while ($self->{post_alloc_hook}) { |
4215 | $_->() |
4282 | $_->() |
4216 | for values %{delete $self->{post_alloc_hook}}; |
4283 | for values %{delete $self->{post_alloc_hook}}; |
4217 | } |
4284 | } |
4218 | |
4285 | |
4219 | |
|
|
4220 | glViewport 0, 0, $::WIDTH, $::HEIGHT; |
4286 | glViewport 0, 0, $::WIDTH, $::HEIGHT; |
4221 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
4287 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
4222 | glClear GL_COLOR_BUFFER_BIT; |
4288 | glClear GL_COLOR_BUFFER_BIT; |
4223 | |
4289 | |
4224 | glMatrixMode GL_PROJECTION; |
4290 | glMatrixMode GL_PROJECTION; |