ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.376 by root, Mon Jul 16 20:20:23 2007 UTC vs.
Revision 1.387 by root, Fri Jul 20 18:19:45 2007 UTC

… …
547 547
548 # parent 548 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 550}
551 551
552sub find_widget { 552#sub find_widget {
553 my ($self, $x, $y) = @_; 553# 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 554
564sub set_parent { 555sub set_parent {
565 my ($self, $parent) = @_; 556 my ($self, $parent) = @_;
566 557
567 CFPlus::weaken ($self->{parent} = $parent); 558 CFPlus::weaken ($self->{parent} = $parent);
… …
986} 977}
987 978
988sub set_offset { 979sub set_offset {
989 my ($self, $x, $y) = @_; 980 my ($self, $x, $y) = @_;
990 981
991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x; 982 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; 983 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993 984
994 $self->emit (changed => $self->{view_x}, $self->{view_y}); 985 if ($x != $self->{view_x} or $y != $self->{view_y}) {
986 $self->{view_x} = $x;
987 $self->{view_y} = $y;
988
989 $self->emit (changed => $x, $y);
995 $self->update; 990 $self->update;
991 }
996} 992}
997 993
998# hmm, this does not work for topleft of $self... but we should not ask for that 994# hmm, this does not work for topleft of $self... but we should not ask for that
999sub coord2local { 995sub coord2local {
1000 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
… …
1015 my ($self, $x, $y) = @_; 1011 my ($self, $x, $y) = @_;
1016 1012
1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1013 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1014 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1019 ) { 1015 ) {
1020 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1016 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1021 } else { 1017 } else {
1022 $self->CFPlus::UI::Base::find_widget ($x, $y) 1018 $self->CFPlus::UI::Base::find_widget ($x, $y)
1023 } 1019 }
1024} 1020}
1025 1021
… …
1080 expand => 1, 1076 expand => 1,
1081 scroll_x => $self->{scroll_x}, 1077 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y}, 1078 scroll_y => $self->{scroll_y},
1083 on_changed => sub { 1079 on_changed => sub {
1084 my ($vp, $x, $y) = @_; 1080 my ($vp, $x, $y) = @_;
1081
1085 $vp->{parent}{hslider}->set_value ($x); 1082 $vp->{parent}{hslider}->set_value ($x);
1086 $vp->{parent}{vslider}->set_value ($y); 1083 $vp->{parent}{vslider}->set_value ($y);
1087 1084
1088 0 1085 0
1089 }, 1086 },
1090 ; 1087 ;
1091 1088
1092 $self->SUPER::add (0, 0, $self->{vp}); 1089 $self->SUPER::add_at (0, 0, $self->{vp});
1093 1090
1094 $self->add ($child) if $child; 1091 $self->add ($child) if $child;
1095 1092
1096 $self 1093 $self
1097} 1094}
… …
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1109 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114 1111
1115 my $visible = $w1 > $w2; 1112 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) { 1113 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1114 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide; 1115 : $self->{hslider}->hide;
1119 } 1116 }
1120 1117
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123 1120
1124 my $visible = $h1 > $h2; 1121 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) { 1122 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1123 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide; 1124 : $self->{vslider}->hide;
1128 } 1125 }
1129} 1126}
1130 1127
1131sub update { 1128sub update {
1132 my ($self) = @_; 1129 my ($self) = @_;
1133 1130
1131 $self->update_slider;
1134 $self->SUPER::update; 1132 $self->SUPER::update;
1135 $self->update_slider;
1136} 1133}
1137 1134
1138sub invoke_mouse_wheel { 1135sub invoke_mouse_wheel {
1139 my ($self, $ev) = @_; 1136 my ($self, $ev) = @_;
1140 1137
… …
1349 1346
1350my @border = 1347my @border =
1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1348 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); 1349 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1353 1350
1351my @icon =
1352 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1353 qw(x1_move.png x1_resize.png);
1354
1354sub new { 1355sub new {
1355 my ($class, %arg) = @_; 1356 my ($class, %arg) = @_;
1356 1357
1357 my $self = $class->SUPER::new ( 1358 my $self = $class->SUPER::new (
1358 bg => [1, 1, 1, 1], 1359 bg => [1, 1, 1, 1],
… …
1526 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1527 1528
1528 my $border = $self->border; 1529 my $border = $self->border;
1529 1530
1530 glColor @{ $self->{border_bg} }; 1531 glColor @{ $self->{border_bg} };
1531 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1532 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1532 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1533 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1533 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1534 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1534 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1535 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1536
1537 # move
1538 my $w2 = ($w - $border) * .5;
1539 my $h2 = ($h - $border) * .5;
1540 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1541 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1542 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1543
1544 # resize
1545 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1546 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1547 unless $self->{has_close_button};
1548 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1535 1550
1536 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1551 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1537 glColor @{ $self->{bg} }; 1552 glColor @{ $self->{bg} };
1538 1553
1539 # TODO: repeat texture not scale 1554 # TODO: repeat texture not scale
… …
1583 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1598 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1584} 1599}
1585 1600
1586# TODO: store row/col info in child widget and use standard add/del 1601# TODO: store row/col info in child widget and use standard add/del
1587sub add { 1602sub add {
1588 my ($self) = shift; 1603 my $self = shift;
1604
1605 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1606 $self->add_at (@_);
1607}
1608
1609sub add_at {
1610 my $self = shift;
1589 1611
1590 while (@_) { 1612 while (@_) {
1591 my ($x, $y, $child) = splice @_, 0, 3, (); 1613 my ($col, $row, $child) = splice @_, 0, 3, ();
1614
1592 $child->set_parent ($self); 1615 $child->set_parent ($self);
1593 $self->{children}[$y][$x] = $child; 1616 $self->{children}[$row][$col] = $child;
1594 } 1617 }
1595 1618
1596 $self->{force_realloc} = 1; 1619 $self->{force_realloc} = 1;
1597 $self->{force_size_alloc} = 1; 1620 $self->{force_size_alloc} = 1;
1598 $self->realloc; 1621 $self->realloc;
… …
2375 2398
2376use CFPlus::OpenGL; 2399use CFPlus::OpenGL;
2377 2400
2378my @tex = 2401my @tex =
2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2402 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2380 qw(b1_button_active.png); 2403 qw(b1_button_inactive.png b1_button_active.png);
2381 2404
2382sub new { 2405sub new {
2383 my $class = shift; 2406 my $class = shift;
2384 2407
2385 $class->SUPER::new ( 2408 $class->SUPER::new (
2386 padding_x => 4, 2409 padding_x => 4,
2387 padding_y => 4, 2410 padding_y => 4,
2388 fg => [1, 1, 1], 2411 fg => [1.0, 1.0, 1.0],
2389 active_fg => [0, 0, 1], 2412 active_fg => [0.8, 0.8, 0.8],
2390 can_hover => 1, 2413 can_hover => 1,
2391 align => 0, 2414 align => 0,
2392 valign => 0, 2415 valign => 0,
2393 can_events => 1, 2416 can_events => 1,
2394 @_ 2417 @_
… …
2412 2435
2413 glEnable GL_TEXTURE_2D; 2436 glEnable GL_TEXTURE_2D;
2414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2415 glColor 0, 0, 0, 1; 2438 glColor 0, 0, 0, 1;
2416 2439
2440 my $tex = $tex[$GRAB == $self];
2417 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2441 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418 2442
2419 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
2420 2444
2421 $self->SUPER::_draw; 2445 $self->SUPER::_draw;
2422} 2446}
… …
3487 ); 3511 );
3488 3512
3489 if ($self->{anim} && $self->{animspeed}) { 3513 if ($self->{anim} && $self->{animspeed}) {
3490 CFPlus::weaken (my $widget = $self); 3514 CFPlus::weaken (my $widget = $self);
3491 3515
3516 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3517 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3492 $self->{timer} = Event->timer ( 3518 $self->{timer} = Event->timer (
3493 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3494 hard => 1, 3519 parked => 1,
3495 interval => $self->{animspeed},
3496 cb => sub { 3520 cb => sub {
3497 return unless $::CONN; 3521 return unless $::CONN && $widget;
3498 3522
3499 ++$widget->{frame}; 3523 ++$widget->{frame};
3500 $self->update_face; 3524 $widget->update_face;
3501 $self->update; 3525 $widget->update;
3526
3527 $widget->update_timer;
3502 }, 3528 },
3503 ); 3529 );
3504 3530
3505 $self->update_face; 3531 $self->update_face;
3532 $self->update_timer;
3506 } 3533 }
3507 3534
3508 $self 3535 $self
3536}
3537
3538sub update_timer {
3539 my ($self) = @_;
3540
3541 return unless $self->{timer};
3542
3543 if ($self->{visible}) {
3544 $self->{timer}->at (
3545 $self->{anim_start}
3546 + $self->{animspeed}
3547 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3548 );
3549 $self->{timer}->start;
3550 } else {
3551 $self->{timer}->stop;
3552 }
3509} 3553}
3510 3554
3511sub update_face { 3555sub update_face {
3512 my ($self) = @_; 3556 my ($self) = @_;
3513 3557
… …
3545 return unless $self->{visible}; 3589 return unless $self->{visible};
3546 3590
3547 $self->SUPER::update; 3591 $self->SUPER::update;
3548} 3592}
3549 3593
3594sub invoke_visibility_change {
3595 my ($self) = @_;
3596
3597 $self->update_timer;
3598
3599 0
3600}
3601
3550sub _draw { 3602sub _draw {
3551 my ($self) = @_; 3603 my ($self) = @_;
3552 3604
3553 return unless $::CONN; 3605 return unless $::CONN;
3554 3606
… …
3569} 3621}
3570 3622
3571sub destroy { 3623sub destroy {
3572 my ($self) = @_; 3624 my ($self) = @_;
3573 3625
3574 $self->{timer}->cancel 3626 (delete $self->{timer})->cancel
3575 if $self->{timer}; 3627 if $self->{timer};
3576 3628
3577 $self->SUPER::destroy; 3629 $self->SUPER::destroy;
3578} 3630}
3579 3631
… …
4223 while ($self->{post_alloc_hook}) { 4275 while ($self->{post_alloc_hook}) {
4224 $_->() 4276 $_->()
4225 for values %{delete $self->{post_alloc_hook}}; 4277 for values %{delete $self->{post_alloc_hook}};
4226 } 4278 }
4227 4279
4228
4229 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4280 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4230 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4281 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4231 glClear GL_COLOR_BUFFER_BIT; 4282 glClear GL_COLOR_BUFFER_BIT;
4232 4283
4233 glMatrixMode GL_PROJECTION; 4284 glMatrixMode GL_PROJECTION;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines