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.379 by root, Tue Jul 17 12:04:18 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);
… …
1020 my ($self, $x, $y) = @_; 1011 my ($self, $x, $y) = @_;
1021 1012
1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1013 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1014 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1024 ) { 1015 ) {
1025 $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})
1026 } else { 1017 } else {
1027 $self->CFPlus::UI::Base::find_widget ($x, $y) 1018 $self->CFPlus::UI::Base::find_widget ($x, $y)
1028 } 1019 }
1029} 1020}
1030 1021
… …
1093 1084
1094 0 1085 0
1095 }, 1086 },
1096 ; 1087 ;
1097 1088
1098 $self->SUPER::add (0, 0, $self->{vp}); 1089 $self->SUPER::add_at (0, 0, $self->{vp});
1099 1090
1100 $self->add ($child) if $child; 1091 $self->add ($child) if $child;
1101 1092
1102 $self 1093 $self
1103} 1094}
… …
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1109 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $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]);
1120 1111
1121 my $visible = $w1 > $w2; 1112 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) { 1113 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1114 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide; 1115 : $self->{hslider}->hide;
1125 } 1116 }
1126 1117
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $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]);
1129 1120
1130 my $visible = $h1 > $h2; 1121 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) { 1122 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1123 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide; 1124 : $self->{vslider}->hide;
1134 } 1125 }
1135} 1126}
1136 1127
1137sub update { 1128sub update {
1138 my ($self) = @_; 1129 my ($self) = @_;
1139 1130
1131 $self->update_slider;
1140 $self->SUPER::update; 1132 $self->SUPER::update;
1141 $self->update_slider;
1142} 1133}
1143 1134
1144sub invoke_mouse_wheel { 1135sub invoke_mouse_wheel {
1145 my ($self, $ev) = @_; 1136 my ($self, $ev) = @_;
1146 1137
… …
1355 1346
1356my @border = 1347my @border =
1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1348 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1358 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);
1359 1350
1351my @icon =
1352 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1353 qw(x1_move.png x1_resize.png);
1354
1360sub new { 1355sub new {
1361 my ($class, %arg) = @_; 1356 my ($class, %arg) = @_;
1362 1357
1363 my $self = $class->SUPER::new ( 1358 my $self = $class->SUPER::new (
1364 bg => [1, 1, 1, 1], 1359 bg => [1, 1, 1, 1],
… …
1532 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1533 1528
1534 my $border = $self->border; 1529 my $border = $self->border;
1535 1530
1536 glColor @{ $self->{border_bg} }; 1531 glColor @{ $self->{border_bg} };
1537 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1532 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1538 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1533 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1539 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1534 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1540 $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);
1541 1550
1542 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1551 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1543 glColor @{ $self->{bg} }; 1552 glColor @{ $self->{bg} };
1544 1553
1545 # TODO: repeat texture not scale 1554 # TODO: repeat texture not scale
… …
1589 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1598 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1590} 1599}
1591 1600
1592# 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
1593sub add { 1602sub add {
1594 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;
1595 1611
1596 while (@_) { 1612 while (@_) {
1597 my ($x, $y, $child) = splice @_, 0, 3, (); 1613 my ($col, $row, $child) = splice @_, 0, 3, ();
1614
1598 $child->set_parent ($self); 1615 $child->set_parent ($self);
1599 $self->{children}[$y][$x] = $child; 1616 $self->{children}[$row][$col] = $child;
1600 } 1617 }
1601 1618
1602 $self->{force_realloc} = 1; 1619 $self->{force_realloc} = 1;
1603 $self->{force_size_alloc} = 1; 1620 $self->{force_size_alloc} = 1;
1604 $self->realloc; 1621 $self->realloc;
… …
2381 2398
2382use CFPlus::OpenGL; 2399use CFPlus::OpenGL;
2383 2400
2384my @tex = 2401my @tex =
2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2402 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2386 qw(b1_button_active.png); 2403 qw(b1_button_inactive.png b1_button_active.png);
2387 2404
2388sub new { 2405sub new {
2389 my $class = shift; 2406 my $class = shift;
2390 2407
2391 $class->SUPER::new ( 2408 $class->SUPER::new (
2392 padding_x => 4, 2409 padding_x => 4,
2393 padding_y => 4, 2410 padding_y => 4,
2394 fg => [1, 1, 1], 2411 fg => [1.0, 1.0, 1.0],
2395 active_fg => [0, 0, 1], 2412 active_fg => [0.8, 0.8, 0.8],
2396 can_hover => 1, 2413 can_hover => 1,
2397 align => 0, 2414 align => 0,
2398 valign => 0, 2415 valign => 0,
2399 can_events => 1, 2416 can_events => 1,
2400 @_ 2417 @_
… …
2418 2435
2419 glEnable GL_TEXTURE_2D; 2436 glEnable GL_TEXTURE_2D;
2420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2421 glColor 0, 0, 0, 1; 2438 glColor 0, 0, 0, 1;
2422 2439
2440 my $tex = $tex[$GRAB == $self];
2423 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2441 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2424 2442
2425 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
2426 2444
2427 $self->SUPER::_draw; 2445 $self->SUPER::_draw;
2428} 2446}
… …
3498 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3516 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3499 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3517 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3500 $self->{timer} = Event->timer ( 3518 $self->{timer} = Event->timer (
3501 parked => 1, 3519 parked => 1,
3502 cb => sub { 3520 cb => sub {
3503 return unless $::CONN; 3521 return unless $::CONN && $widget;
3504
3505 if (!$widget) {#d#
3506 warn "animation widget timer active but widgetd estroyed\n";#d#
3507 warn $_[0]->w->active;#d#
3508 }#d#
3509 3522
3510 ++$widget->{frame}; 3523 ++$widget->{frame};
3511 $widget->update_face; 3524 $widget->update_face;
3512 $widget->update; 3525 $widget->update;
3513 3526
… …
4262 while ($self->{post_alloc_hook}) { 4275 while ($self->{post_alloc_hook}) {
4263 $_->() 4276 $_->()
4264 for values %{delete $self->{post_alloc_hook}}; 4277 for values %{delete $self->{post_alloc_hook}};
4265 } 4278 }
4266 4279
4267
4268 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4280 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4269 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4281 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4270 glClear GL_COLOR_BUFFER_BIT; 4282 glClear GL_COLOR_BUFFER_BIT;
4271 4283
4272 glMatrixMode GL_PROJECTION; 4284 glMatrixMode GL_PROJECTION;

Diff Legend

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