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.375 by root, Mon Jul 16 20:12:19 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
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);
994 $self->update; 990 $self->update;
991 }
995} 992}
996 993
997# 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
998sub coord2local { 995sub coord2local {
999 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
… …
1014 my ($self, $x, $y) = @_; 1011 my ($self, $x, $y) = @_;
1015 1012
1016 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1013 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1017 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1014 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1018 ) { 1015 ) {
1019 $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})
1020 } else { 1017 } else {
1021 $self->CFPlus::UI::Base::find_widget ($x, $y) 1018 $self->CFPlus::UI::Base::find_widget ($x, $y)
1022 } 1019 }
1023} 1020}
1024 1021
… …
1074 row_expand => [1, 0], 1071 row_expand => [1, 0],
1075 %arg, 1072 %arg,
1076 ); 1073 );
1077 1074
1078 $self->{vp} = new CFPlus::UI::ViewPort 1075 $self->{vp} = new CFPlus::UI::ViewPort
1079 expand => 1, 1076 expand => 1,
1080 scroll_x => $self->{scroll_x}, 1077 scroll_x => $self->{scroll_x},
1081 scroll_y => $self->{scroll_y}, 1078 scroll_y => $self->{scroll_y},
1079 on_changed => sub {
1080 my ($vp, $x, $y) = @_;
1081
1082 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y);
1084
1085 0
1086 },
1082 ; 1087 ;
1083 1088
1084 $self->SUPER::add (0, 0, $self->{vp}); 1089 $self->SUPER::add_at (0, 0, $self->{vp});
1085 1090
1086 $self->add ($child) if $child; 1091 $self->add ($child) if $child;
1087 1092
1088 $self 1093 $self
1089} 1094}
… …
1104 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1109 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1105 $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]);
1106 1111
1107 my $visible = $w1 > $w2; 1112 my $visible = $w1 > $w2;
1108 if ($visible != $self->{hslider}{visible}) { 1113 if ($visible != $self->{hslider}{visible}) {
1109 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1114 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1110 : $self->{hslider}->hide; 1115 : $self->{hslider}->hide;
1111 } 1116 }
1112 1117
1113 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1114 $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]);
1115 1120
1116 my $visible = $h1 > $h2; 1121 my $visible = $h1 > $h2;
1117 if ($visible != $self->{vslider}{visible}) { 1122 if ($visible != $self->{vslider}{visible}) {
1118 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1123 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1119 : $self->{vslider}->hide; 1124 : $self->{vslider}->hide;
1120 } 1125 }
1121} 1126}
1122 1127
1123sub update { 1128sub update {
1124 my ($self) = @_; 1129 my ($self) = @_;
1125 1130
1131 $self->update_slider;
1126 $self->SUPER::update; 1132 $self->SUPER::update;
1127 $self->update_slider;
1128} 1133}
1129 1134
1130sub invoke_mouse_wheel { 1135sub invoke_mouse_wheel {
1131 my ($self, $ev) = @_; 1136 my ($self, $ev) = @_;
1132 1137
… …
1140sub invoke_button_down { 1145sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1146 my ($self, $ev, $x, $y) = @_;
1142 1147
1143 if ($ev->{button} == 2) { 1148 if ($ev->{button} == 2) {
1144 $self->grab_focus; 1149 $self->grab_focus;
1150
1151 my $ox = $self->{vp}{view_x} + $ev->{x};
1152 my $oy = $self->{vp}{view_y} + $ev->{y};
1145 1153
1146 $self->{motion} = sub { 1154 $self->{motion} = sub {
1147 my ($ev, $x, $y) = @_; 1155 my ($ev, $x, $y) = @_;
1148 1156
1149 $self->{vp}->set_offset ( 1157 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1150 $self->{vp}{view_x} - $ev->{xrel}, 1158 $self->update;
1151 $self->{vp}{view_y} - $ev->{yrel},
1152 );
1153 }; 1159 };
1154 1160
1155 return 1; 1161 return 1;
1156 } 1162 }
1157 1163
… …
1340 1346
1341my @border = 1347my @border =
1342 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1348 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); 1349 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1344 1350
1351my @icon =
1352 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1353 qw(x1_move.png x1_resize.png);
1354
1345sub new { 1355sub new {
1346 my ($class, %arg) = @_; 1356 my ($class, %arg) = @_;
1347 1357
1348 my $self = $class->SUPER::new ( 1358 my $self = $class->SUPER::new (
1349 bg => [1, 1, 1, 1], 1359 bg => [1, 1, 1, 1],
… …
1517 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1518 1528
1519 my $border = $self->border; 1529 my $border = $self->border;
1520 1530
1521 glColor @{ $self->{border_bg} }; 1531 glColor @{ $self->{border_bg} };
1522 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1532 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1523 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1533 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1524 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1534 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1525 $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);
1526 1550
1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1551 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1528 glColor @{ $self->{bg} }; 1552 glColor @{ $self->{bg} };
1529 1553
1530 # TODO: repeat texture not scale 1554 # TODO: repeat texture not scale
… …
1574 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1598 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1575} 1599}
1576 1600
1577# 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
1578sub add { 1602sub add {
1579 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;
1580 1611
1581 while (@_) { 1612 while (@_) {
1582 my ($x, $y, $child) = splice @_, 0, 3, (); 1613 my ($col, $row, $child) = splice @_, 0, 3, ();
1614
1583 $child->set_parent ($self); 1615 $child->set_parent ($self);
1584 $self->{children}[$y][$x] = $child; 1616 $self->{children}[$row][$col] = $child;
1585 } 1617 }
1586 1618
1587 $self->{force_realloc} = 1; 1619 $self->{force_realloc} = 1;
1588 $self->{force_size_alloc} = 1; 1620 $self->{force_size_alloc} = 1;
1589 $self->realloc; 1621 $self->realloc;
… …
2366 2398
2367use CFPlus::OpenGL; 2399use CFPlus::OpenGL;
2368 2400
2369my @tex = 2401my @tex =
2370 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2402 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2371 qw(b1_button_active.png); 2403 qw(b1_button_inactive.png b1_button_active.png);
2372 2404
2373sub new { 2405sub new {
2374 my $class = shift; 2406 my $class = shift;
2375 2407
2376 $class->SUPER::new ( 2408 $class->SUPER::new (
2377 padding_x => 4, 2409 padding_x => 4,
2378 padding_y => 4, 2410 padding_y => 4,
2379 fg => [1, 1, 1], 2411 fg => [1.0, 1.0, 1.0],
2380 active_fg => [0, 0, 1], 2412 active_fg => [0.8, 0.8, 0.8],
2381 can_hover => 1, 2413 can_hover => 1,
2382 align => 0, 2414 align => 0,
2383 valign => 0, 2415 valign => 0,
2384 can_events => 1, 2416 can_events => 1,
2385 @_ 2417 @_
… …
2403 2435
2404 glEnable GL_TEXTURE_2D; 2436 glEnable GL_TEXTURE_2D;
2405 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2406 glColor 0, 0, 0, 1; 2438 glColor 0, 0, 0, 1;
2407 2439
2440 my $tex = $tex[$GRAB == $self];
2408 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2441 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2409 2442
2410 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
2411 2444
2412 $self->SUPER::_draw; 2445 $self->SUPER::_draw;
2413} 2446}
… …
3478 ); 3511 );
3479 3512
3480 if ($self->{anim} && $self->{animspeed}) { 3513 if ($self->{anim} && $self->{animspeed}) {
3481 CFPlus::weaken (my $widget = $self); 3514 CFPlus::weaken (my $widget = $self);
3482 3515
3516 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3517 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3483 $self->{timer} = Event->timer ( 3518 $self->{timer} = Event->timer (
3484 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3485 hard => 1, 3519 parked => 1,
3486 interval => $self->{animspeed},
3487 cb => sub { 3520 cb => sub {
3488 return unless $::CONN; 3521 return unless $::CONN && $widget;
3489 3522
3490 ++$widget->{frame}; 3523 ++$widget->{frame};
3491 $self->update_face; 3524 $widget->update_face;
3492 $self->update; 3525 $widget->update;
3526
3527 $widget->update_timer;
3493 }, 3528 },
3494 ); 3529 );
3495 3530
3496 $self->update_face; 3531 $self->update_face;
3532 $self->update_timer;
3497 } 3533 }
3498 3534
3499 $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 }
3500} 3553}
3501 3554
3502sub update_face { 3555sub update_face {
3503 my ($self) = @_; 3556 my ($self) = @_;
3504 3557
… …
3536 return unless $self->{visible}; 3589 return unless $self->{visible};
3537 3590
3538 $self->SUPER::update; 3591 $self->SUPER::update;
3539} 3592}
3540 3593
3594sub invoke_visibility_change {
3595 my ($self) = @_;
3596
3597 $self->update_timer;
3598
3599 0
3600}
3601
3541sub _draw { 3602sub _draw {
3542 my ($self) = @_; 3603 my ($self) = @_;
3543 3604
3544 return unless $::CONN; 3605 return unless $::CONN;
3545 3606
… …
3560} 3621}
3561 3622
3562sub destroy { 3623sub destroy {
3563 my ($self) = @_; 3624 my ($self) = @_;
3564 3625
3565 $self->{timer}->cancel 3626 (delete $self->{timer})->cancel
3566 if $self->{timer}; 3627 if $self->{timer};
3567 3628
3568 $self->SUPER::destroy; 3629 $self->SUPER::destroy;
3569} 3630}
3570 3631
… …
4214 while ($self->{post_alloc_hook}) { 4275 while ($self->{post_alloc_hook}) {
4215 $_->() 4276 $_->()
4216 for values %{delete $self->{post_alloc_hook}}; 4277 for values %{delete $self->{post_alloc_hook}};
4217 } 4278 }
4218 4279
4219
4220 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4280 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4221 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4281 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4222 glClear GL_COLOR_BUFFER_BIT; 4282 glClear GL_COLOR_BUFFER_BIT;
4223 4283
4224 glMatrixMode GL_PROJECTION; 4284 glMatrixMode GL_PROJECTION;

Diff Legend

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