… | |
… | |
986 | } |
986 | } |
987 | |
987 | |
988 | sub set_offset { |
988 | sub set_offset { |
989 | my ($self, $x, $y) = @_; |
989 | my ($self, $x, $y) = @_; |
990 | |
990 | |
991 | $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x; |
991 | 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; |
992 | my $y = max 0, min $self->child->{h} - $self->{h}, int $y; |
993 | |
993 | |
994 | $self->emit (changed => $self->{view_x}, $self->{view_y}); |
994 | if ($x != $self->{view_x} or $y != $self->{view_y}) { |
|
|
995 | $self->{view_x} = $x; |
|
|
996 | $self->{view_y} = $y; |
|
|
997 | |
|
|
998 | $self->emit (changed => $x, $y); |
995 | $self->update; |
999 | $self->update; |
|
|
1000 | } |
996 | } |
1001 | } |
997 | |
1002 | |
998 | # hmm, this does not work for topleft of $self... but we should not ask for that |
1003 | # hmm, this does not work for topleft of $self... but we should not ask for that |
999 | sub coord2local { |
1004 | sub coord2local { |
1000 | my ($self, $x, $y) = @_; |
1005 | my ($self, $x, $y) = @_; |
… | |
… | |
1080 | expand => 1, |
1085 | expand => 1, |
1081 | scroll_x => $self->{scroll_x}, |
1086 | scroll_x => $self->{scroll_x}, |
1082 | scroll_y => $self->{scroll_y}, |
1087 | scroll_y => $self->{scroll_y}, |
1083 | on_changed => sub { |
1088 | on_changed => sub { |
1084 | my ($vp, $x, $y) = @_; |
1089 | my ($vp, $x, $y) = @_; |
|
|
1090 | |
1085 | $vp->{parent}{hslider}->set_value ($x); |
1091 | $vp->{parent}{hslider}->set_value ($x); |
1086 | $vp->{parent}{vslider}->set_value ($y); |
1092 | $vp->{parent}{vslider}->set_value ($y); |
1087 | |
1093 | |
1088 | 0 |
1094 | 0 |
1089 | }, |
1095 | }, |
1090 | ; |
1096 | ; |
1091 | |
1097 | |
1092 | $self->SUPER::add (0, 0, $self->{vp}); |
1098 | $self->SUPER::add_at (0, 0, $self->{vp}); |
1093 | |
1099 | |
1094 | $self->add ($child) if $child; |
1100 | $self->add ($child) if $child; |
1095 | |
1101 | |
1096 | $self |
1102 | $self |
1097 | } |
1103 | } |
… | |
… | |
1112 | my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); |
1118 | my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); |
1113 | $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); |
1119 | $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); |
1114 | |
1120 | |
1115 | my $visible = $w1 > $w2; |
1121 | my $visible = $w1 > $w2; |
1116 | if ($visible != $self->{hslider}{visible}) { |
1122 | if ($visible != $self->{hslider}{visible}) { |
1117 | $visible ? $self->SUPER::add (0, 1, $self->{hslider}) |
1123 | $visible ? $self->SUPER::add_at (0, 1, $self->{hslider}) |
1118 | : $self->{hslider}->hide; |
1124 | : $self->{hslider}->hide; |
1119 | } |
1125 | } |
1120 | |
1126 | |
1121 | my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); |
1127 | my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); |
1122 | $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); |
1128 | $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); |
1123 | |
1129 | |
1124 | my $visible = $h1 > $h2; |
1130 | my $visible = $h1 > $h2; |
1125 | if ($visible != $self->{vslider}{visible}) { |
1131 | if ($visible != $self->{vslider}{visible}) { |
1126 | $visible ? $self->SUPER::add (1, 0, $self->{vslider}) |
1132 | $visible ? $self->SUPER::add_at (1, 0, $self->{vslider}) |
1127 | : $self->{vslider}->hide; |
1133 | : $self->{vslider}->hide; |
1128 | } |
1134 | } |
1129 | } |
1135 | } |
1130 | |
1136 | |
1131 | sub update { |
1137 | sub update { |
1132 | my ($self) = @_; |
1138 | my ($self) = @_; |
1133 | |
1139 | |
|
|
1140 | $self->update_slider; |
1134 | $self->SUPER::update; |
1141 | $self->SUPER::update; |
1135 | $self->update_slider; |
|
|
1136 | } |
1142 | } |
1137 | |
1143 | |
1138 | sub invoke_mouse_wheel { |
1144 | sub invoke_mouse_wheel { |
1139 | my ($self, $ev) = @_; |
1145 | my ($self, $ev) = @_; |
1140 | |
1146 | |
… | |
… | |
1349 | |
1355 | |
1350 | my @border = |
1356 | my @border = |
1351 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
1357 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
1352 | qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); |
1358 | qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); |
1353 | |
1359 | |
|
|
1360 | my @icon = |
|
|
1361 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
|
|
1362 | qw(x1_move.png x1_resize.png); |
|
|
1363 | |
1354 | sub new { |
1364 | sub new { |
1355 | my ($class, %arg) = @_; |
1365 | my ($class, %arg) = @_; |
1356 | |
1366 | |
1357 | my $self = $class->SUPER::new ( |
1367 | my $self = $class->SUPER::new ( |
1358 | bg => [1, 1, 1, 1], |
1368 | bg => [1, 1, 1, 1], |
… | |
… | |
1526 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
1536 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
1527 | |
1537 | |
1528 | my $border = $self->border; |
1538 | my $border = $self->border; |
1529 | |
1539 | |
1530 | glColor @{ $self->{border_bg} }; |
1540 | glColor @{ $self->{border_bg} }; |
1531 | $border[0]->draw_quad_alpha (0, 0, $w, $border); |
1541 | $border[0]->draw_quad_alpha ( 0, 0, $w, $border); |
1532 | $border[1]->draw_quad_alpha (0, $border, $border, $ch); |
1542 | $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); |
1533 | $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); |
1543 | $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); |
1534 | $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); |
1544 | $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); |
|
|
1545 | |
|
|
1546 | # move |
|
|
1547 | my $w2 = ($w - $border) * .5; |
|
|
1548 | my $h2 = ($h - $border) * .5; |
|
|
1549 | $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); |
|
|
1550 | $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); |
|
|
1551 | $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); |
|
|
1552 | |
|
|
1553 | # resize |
|
|
1554 | $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); |
|
|
1555 | $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) |
|
|
1556 | unless $self->{has_close_button}; |
|
|
1557 | $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); |
|
|
1558 | $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); |
1535 | |
1559 | |
1536 | if (@{$self->{bg}} < 4 || $self->{bg}[3]) { |
1560 | if (@{$self->{bg}} < 4 || $self->{bg}[3]) { |
1537 | glColor @{ $self->{bg} }; |
1561 | glColor @{ $self->{bg} }; |
1538 | |
1562 | |
1539 | # TODO: repeat texture not scale |
1563 | # TODO: repeat texture not scale |
… | |
… | |
1583 | grep $_, map @$_, grep $_, @{ $_[0]{children} } |
1607 | grep $_, map @$_, grep $_, @{ $_[0]{children} } |
1584 | } |
1608 | } |
1585 | |
1609 | |
1586 | # TODO: store row/col info in child widget and use standard add/del |
1610 | # TODO: store row/col info in child widget and use standard add/del |
1587 | sub add { |
1611 | sub add { |
1588 | my ($self) = shift; |
1612 | my $self = shift; |
|
|
1613 | |
|
|
1614 | Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d# |
|
|
1615 | $self->add_at (@_); |
|
|
1616 | } |
|
|
1617 | |
|
|
1618 | sub add_at { |
|
|
1619 | my $self = shift; |
1589 | |
1620 | |
1590 | while (@_) { |
1621 | while (@_) { |
1591 | my ($x, $y, $child) = splice @_, 0, 3, (); |
1622 | my ($col, $row, $child) = splice @_, 0, 3, (); |
|
|
1623 | |
1592 | $child->set_parent ($self); |
1624 | $child->set_parent ($self); |
1593 | $self->{children}[$y][$x] = $child; |
1625 | $self->{children}[$row][$col] = $child; |
1594 | } |
1626 | } |
1595 | |
1627 | |
1596 | $self->{force_realloc} = 1; |
1628 | $self->{force_realloc} = 1; |
1597 | $self->{force_size_alloc} = 1; |
1629 | $self->{force_size_alloc} = 1; |
1598 | $self->realloc; |
1630 | $self->realloc; |
… | |
… | |
2375 | |
2407 | |
2376 | use CFPlus::OpenGL; |
2408 | use CFPlus::OpenGL; |
2377 | |
2409 | |
2378 | my @tex = |
2410 | my @tex = |
2379 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
2411 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
2380 | qw(b1_button_active.png); |
2412 | qw(b1_button_inactive.png b1_button_active.png); |
2381 | |
2413 | |
2382 | sub new { |
2414 | sub new { |
2383 | my $class = shift; |
2415 | my $class = shift; |
2384 | |
2416 | |
2385 | $class->SUPER::new ( |
2417 | $class->SUPER::new ( |
2386 | padding_x => 4, |
2418 | padding_x => 4, |
2387 | padding_y => 4, |
2419 | padding_y => 4, |
2388 | fg => [1, 1, 1], |
2420 | fg => [1.0, 1.0, 1.0], |
2389 | active_fg => [0, 0, 1], |
2421 | active_fg => [0.8, 0.8, 0.8], |
2390 | can_hover => 1, |
2422 | can_hover => 1, |
2391 | align => 0, |
2423 | align => 0, |
2392 | valign => 0, |
2424 | valign => 0, |
2393 | can_events => 1, |
2425 | can_events => 1, |
2394 | @_ |
2426 | @_ |
… | |
… | |
2412 | |
2444 | |
2413 | glEnable GL_TEXTURE_2D; |
2445 | glEnable GL_TEXTURE_2D; |
2414 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2446 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2415 | glColor 0, 0, 0, 1; |
2447 | glColor 0, 0, 0, 1; |
2416 | |
2448 | |
|
|
2449 | my $tex = $tex[$GRAB == $self]; |
2417 | $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2450 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2418 | |
2451 | |
2419 | glDisable GL_TEXTURE_2D; |
2452 | glDisable GL_TEXTURE_2D; |
2420 | |
2453 | |
2421 | $self->SUPER::_draw; |
2454 | $self->SUPER::_draw; |
2422 | } |
2455 | } |
… | |
… | |
3487 | ); |
3520 | ); |
3488 | |
3521 | |
3489 | if ($self->{anim} && $self->{animspeed}) { |
3522 | if ($self->{anim} && $self->{animspeed}) { |
3490 | CFPlus::weaken (my $widget = $self); |
3523 | CFPlus::weaken (my $widget = $self); |
3491 | |
3524 | |
|
|
3525 | $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; |
|
|
3526 | $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; |
3492 | $self->{timer} = Event->timer ( |
3527 | $self->{timer} = Event->timer ( |
3493 | at => $self->{animspeed} * int $::NOW / $self->{animspeed}, |
|
|
3494 | hard => 1, |
3528 | parked => 1, |
3495 | interval => $self->{animspeed}, |
|
|
3496 | cb => sub { |
3529 | cb => sub { |
3497 | return unless $::CONN; |
3530 | return unless $::CONN && $widget; |
3498 | |
3531 | |
3499 | ++$widget->{frame}; |
3532 | ++$widget->{frame}; |
3500 | $self->update_face; |
3533 | $widget->update_face; |
3501 | $self->update; |
3534 | $widget->update; |
|
|
3535 | |
|
|
3536 | $widget->update_timer; |
3502 | }, |
3537 | }, |
3503 | ); |
3538 | ); |
3504 | |
3539 | |
3505 | $self->update_face; |
3540 | $self->update_face; |
|
|
3541 | $self->update_timer; |
3506 | } |
3542 | } |
3507 | |
3543 | |
3508 | $self |
3544 | $self |
|
|
3545 | } |
|
|
3546 | |
|
|
3547 | sub update_timer { |
|
|
3548 | my ($self) = @_; |
|
|
3549 | |
|
|
3550 | return unless $self->{timer}; |
|
|
3551 | |
|
|
3552 | if ($self->{visible}) { |
|
|
3553 | $self->{timer}->at ( |
|
|
3554 | $self->{anim_start} |
|
|
3555 | + $self->{animspeed} |
|
|
3556 | * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed} |
|
|
3557 | ); |
|
|
3558 | $self->{timer}->start; |
|
|
3559 | } else { |
|
|
3560 | $self->{timer}->stop; |
|
|
3561 | } |
3509 | } |
3562 | } |
3510 | |
3563 | |
3511 | sub update_face { |
3564 | sub update_face { |
3512 | my ($self) = @_; |
3565 | my ($self) = @_; |
3513 | |
3566 | |
… | |
… | |
3545 | return unless $self->{visible}; |
3598 | return unless $self->{visible}; |
3546 | |
3599 | |
3547 | $self->SUPER::update; |
3600 | $self->SUPER::update; |
3548 | } |
3601 | } |
3549 | |
3602 | |
|
|
3603 | sub invoke_visibility_change { |
|
|
3604 | my ($self) = @_; |
|
|
3605 | |
|
|
3606 | $self->update_timer; |
|
|
3607 | |
|
|
3608 | 0 |
|
|
3609 | } |
|
|
3610 | |
3550 | sub _draw { |
3611 | sub _draw { |
3551 | my ($self) = @_; |
3612 | my ($self) = @_; |
3552 | |
3613 | |
3553 | return unless $::CONN; |
3614 | return unless $::CONN; |
3554 | |
3615 | |
… | |
… | |
3569 | } |
3630 | } |
3570 | |
3631 | |
3571 | sub destroy { |
3632 | sub destroy { |
3572 | my ($self) = @_; |
3633 | my ($self) = @_; |
3573 | |
3634 | |
3574 | $self->{timer}->cancel |
3635 | (delete $self->{timer})->cancel |
3575 | if $self->{timer}; |
3636 | if $self->{timer}; |
3576 | |
3637 | |
3577 | $self->SUPER::destroy; |
3638 | $self->SUPER::destroy; |
3578 | } |
3639 | } |
3579 | |
3640 | |
… | |
… | |
4223 | while ($self->{post_alloc_hook}) { |
4284 | while ($self->{post_alloc_hook}) { |
4224 | $_->() |
4285 | $_->() |
4225 | for values %{delete $self->{post_alloc_hook}}; |
4286 | for values %{delete $self->{post_alloc_hook}}; |
4226 | } |
4287 | } |
4227 | |
4288 | |
4228 | |
|
|
4229 | glViewport 0, 0, $::WIDTH, $::HEIGHT; |
4289 | glViewport 0, 0, $::WIDTH, $::HEIGHT; |
4230 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
4290 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
4231 | glClear GL_COLOR_BUFFER_BIT; |
4291 | glClear GL_COLOR_BUFFER_BIT; |
4232 | |
4292 | |
4233 | glMatrixMode GL_PROJECTION; |
4293 | glMatrixMode GL_PROJECTION; |