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.386 by root, Fri Jul 20 16:33:45 2007 UTC

… …
986} 986}
987 987
988sub set_offset { 988sub 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 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);
994 $self->update; 999 $self->update;
1000 }
995} 1001}
996 1002
997# 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
998sub coord2local { 1004sub coord2local {
999 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
1074 row_expand => [1, 0], 1080 row_expand => [1, 0],
1075 %arg, 1081 %arg,
1076 ); 1082 );
1077 1083
1078 $self->{vp} = new CFPlus::UI::ViewPort 1084 $self->{vp} = new CFPlus::UI::ViewPort
1079 expand => 1, 1085 expand => 1,
1080 scroll_x => $self->{scroll_x}, 1086 scroll_x => $self->{scroll_x},
1081 scroll_y => $self->{scroll_y}, 1087 scroll_y => $self->{scroll_y},
1088 on_changed => sub {
1089 my ($vp, $x, $y) = @_;
1090
1091 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y);
1093
1094 0
1095 },
1082 ; 1096 ;
1083 1097
1084 $self->SUPER::add (0, 0, $self->{vp}); 1098 $self->SUPER::add_at (0, 0, $self->{vp});
1085 1099
1086 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
1087 1101
1088 $self 1102 $self
1089} 1103}
… …
1104 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1105 $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]);
1106 1120
1107 my $visible = $w1 > $w2; 1121 my $visible = $w1 > $w2;
1108 if ($visible != $self->{hslider}{visible}) { 1122 if ($visible != $self->{hslider}{visible}) {
1109 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1123 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1110 : $self->{hslider}->hide; 1124 : $self->{hslider}->hide;
1111 } 1125 }
1112 1126
1113 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1114 $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]);
1115 1129
1116 my $visible = $h1 > $h2; 1130 my $visible = $h1 > $h2;
1117 if ($visible != $self->{vslider}{visible}) { 1131 if ($visible != $self->{vslider}{visible}) {
1118 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1132 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1119 : $self->{vslider}->hide; 1133 : $self->{vslider}->hide;
1120 } 1134 }
1121} 1135}
1122 1136
1123sub update { 1137sub update {
1124 my ($self) = @_; 1138 my ($self) = @_;
1125 1139
1140 $self->update_slider;
1126 $self->SUPER::update; 1141 $self->SUPER::update;
1127 $self->update_slider;
1128} 1142}
1129 1143
1130sub invoke_mouse_wheel { 1144sub invoke_mouse_wheel {
1131 my ($self, $ev) = @_; 1145 my ($self, $ev) = @_;
1132 1146
… …
1140sub invoke_button_down { 1154sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1155 my ($self, $ev, $x, $y) = @_;
1142 1156
1143 if ($ev->{button} == 2) { 1157 if ($ev->{button} == 2) {
1144 $self->grab_focus; 1158 $self->grab_focus;
1159
1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1145 1162
1146 $self->{motion} = sub { 1163 $self->{motion} = sub {
1147 my ($ev, $x, $y) = @_; 1164 my ($ev, $x, $y) = @_;
1148 1165
1149 $self->{vp}->set_offset ( 1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1150 $self->{vp}{view_x} - $ev->{xrel}, 1167 $self->update;
1151 $self->{vp}{view_y} - $ev->{yrel},
1152 );
1153 }; 1168 };
1154 1169
1155 return 1; 1170 return 1;
1156 } 1171 }
1157 1172
… …
1340 1355
1341my @border = 1356my @border =
1342 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1357 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); 1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1344 1359
1360my @icon =
1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1362 qw(x1_move.png x1_resize.png);
1363
1345sub new { 1364sub new {
1346 my ($class, %arg) = @_; 1365 my ($class, %arg) = @_;
1347 1366
1348 my $self = $class->SUPER::new ( 1367 my $self = $class->SUPER::new (
1349 bg => [1, 1, 1, 1], 1368 bg => [1, 1, 1, 1],
… …
1517 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1536 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1518 1537
1519 my $border = $self->border; 1538 my $border = $self->border;
1520 1539
1521 glColor @{ $self->{border_bg} }; 1540 glColor @{ $self->{border_bg} };
1522 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1541 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1523 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1542 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1524 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1543 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1525 $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);
1526 1559
1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1560 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1528 glColor @{ $self->{bg} }; 1561 glColor @{ $self->{bg} };
1529 1562
1530 # TODO: repeat texture not scale 1563 # TODO: repeat texture not scale
… …
1574 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1575} 1608}
1576 1609
1577# 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
1578sub add { 1611sub add {
1579 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
1618sub add_at {
1619 my $self = shift;
1580 1620
1581 while (@_) { 1621 while (@_) {
1582 my ($x, $y, $child) = splice @_, 0, 3, (); 1622 my ($col, $row, $child) = splice @_, 0, 3, ();
1623
1583 $child->set_parent ($self); 1624 $child->set_parent ($self);
1584 $self->{children}[$y][$x] = $child; 1625 $self->{children}[$row][$col] = $child;
1585 } 1626 }
1586 1627
1587 $self->{force_realloc} = 1; 1628 $self->{force_realloc} = 1;
1588 $self->{force_size_alloc} = 1; 1629 $self->{force_size_alloc} = 1;
1589 $self->realloc; 1630 $self->realloc;
… …
2366 2407
2367use CFPlus::OpenGL; 2408use CFPlus::OpenGL;
2368 2409
2369my @tex = 2410my @tex =
2370 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2371 qw(b1_button_active.png); 2412 qw(b1_button_inactive.png b1_button_active.png);
2372 2413
2373sub new { 2414sub new {
2374 my $class = shift; 2415 my $class = shift;
2375 2416
2376 $class->SUPER::new ( 2417 $class->SUPER::new (
2377 padding_x => 4, 2418 padding_x => 4,
2378 padding_y => 4, 2419 padding_y => 4,
2379 fg => [1, 1, 1], 2420 fg => [1.0, 1.0, 1.0],
2380 active_fg => [0, 0, 1], 2421 active_fg => [0.8, 0.8, 0.8],
2381 can_hover => 1, 2422 can_hover => 1,
2382 align => 0, 2423 align => 0,
2383 valign => 0, 2424 valign => 0,
2384 can_events => 1, 2425 can_events => 1,
2385 @_ 2426 @_
… …
2403 2444
2404 glEnable GL_TEXTURE_2D; 2445 glEnable GL_TEXTURE_2D;
2405 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2406 glColor 0, 0, 0, 1; 2447 glColor 0, 0, 0, 1;
2407 2448
2449 my $tex = $tex[$GRAB == $self];
2408 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2409 2451
2410 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
2411 2453
2412 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
2413} 2455}
… …
3478 ); 3520 );
3479 3521
3480 if ($self->{anim} && $self->{animspeed}) { 3522 if ($self->{anim} && $self->{animspeed}) {
3481 CFPlus::weaken (my $widget = $self); 3523 CFPlus::weaken (my $widget = $self);
3482 3524
3525 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3526 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3483 $self->{timer} = Event->timer ( 3527 $self->{timer} = Event->timer (
3484 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3485 hard => 1, 3528 parked => 1,
3486 interval => $self->{animspeed},
3487 cb => sub { 3529 cb => sub {
3488 return unless $::CONN; 3530 return unless $::CONN && $widget;
3489 3531
3490 ++$widget->{frame}; 3532 ++$widget->{frame};
3491 $self->update_face; 3533 $widget->update_face;
3492 $self->update; 3534 $widget->update;
3535
3536 $widget->update_timer;
3493 }, 3537 },
3494 ); 3538 );
3495 3539
3496 $self->update_face; 3540 $self->update_face;
3541 $self->update_timer;
3497 } 3542 }
3498 3543
3499 $self 3544 $self
3545}
3546
3547sub 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 }
3500} 3562}
3501 3563
3502sub update_face { 3564sub update_face {
3503 my ($self) = @_; 3565 my ($self) = @_;
3504 3566
… …
3536 return unless $self->{visible}; 3598 return unless $self->{visible};
3537 3599
3538 $self->SUPER::update; 3600 $self->SUPER::update;
3539} 3601}
3540 3602
3603sub invoke_visibility_change {
3604 my ($self) = @_;
3605
3606 $self->update_timer;
3607
3608 0
3609}
3610
3541sub _draw { 3611sub _draw {
3542 my ($self) = @_; 3612 my ($self) = @_;
3543 3613
3544 return unless $::CONN; 3614 return unless $::CONN;
3545 3615
… …
3560} 3630}
3561 3631
3562sub destroy { 3632sub destroy {
3563 my ($self) = @_; 3633 my ($self) = @_;
3564 3634
3565 $self->{timer}->cancel 3635 (delete $self->{timer})->cancel
3566 if $self->{timer}; 3636 if $self->{timer};
3567 3637
3568 $self->SUPER::destroy; 3638 $self->SUPER::destroy;
3569} 3639}
3570 3640
… …
4214 while ($self->{post_alloc_hook}) { 4284 while ($self->{post_alloc_hook}) {
4215 $_->() 4285 $_->()
4216 for values %{delete $self->{post_alloc_hook}}; 4286 for values %{delete $self->{post_alloc_hook}};
4217 } 4287 }
4218 4288
4219
4220 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4289 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4221 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4290 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4222 glClear GL_COLOR_BUFFER_BIT; 4291 glClear GL_COLOR_BUFFER_BIT;
4223 4292
4224 glMatrixMode GL_PROJECTION; 4293 glMatrixMode GL_PROJECTION;

Diff Legend

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