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.374 by root, Mon Jul 16 12:36:48 2007 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 2007 UTC

… …
113 } 113 }
114 114
115 if ($GRAB) { 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 117 # mousewheel
118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9; 118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
120 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
121 } else { 125 } else {
122 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
123 } 127 }
124 } 128 }
… …
547 551
548 # parent 552 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 554}
551 555
552sub find_widget { 556#sub find_widget {
553 my ($self, $x, $y) = @_; 557# 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 558
564sub set_parent { 559sub set_parent {
565 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
566 561
567 CFPlus::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
… …
944 939
945############################################################################# 940#############################################################################
946 941
947package CFPlus::UI::ViewPort; 942package CFPlus::UI::ViewPort;
948 943
944use List::Util qw(min max);
945
949our @ISA = CFPlus::UI::Window::; 946our @ISA = CFPlus::UI::Window::;
950 947
951sub new { 948sub new {
952 my $class = shift; 949 my $class = shift;
953 950
… …
984} 981}
985 982
986sub set_offset { 983sub set_offset {
987 my ($self, $x, $y) = @_; 984 my ($self, $x, $y) = @_;
988 985
986 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
987 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
988
989 if ($x != $self->{view_x} or $y != $self->{view_y}) {
989 $self->{view_x} = int $x; 990 $self->{view_x} = $x;
990 $self->{view_y} = int $y; 991 $self->{view_y} = $y;
991 992
993 $self->emit (changed => $x, $y);
992 $self->update; 994 $self->update;
995 }
993} 996}
994 997
995# hmm, this does not work for topleft of $self... but we should not ask for that 998# hmm, this does not work for topleft of $self... but we should not ask for that
996sub coord2local { 999sub coord2local {
997 my ($self, $x, $y) = @_; 1000 my ($self, $x, $y) = @_;
… …
1012 my ($self, $x, $y) = @_; 1015 my ($self, $x, $y) = @_;
1013 1016
1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016 ) { 1019 ) {
1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1020 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1018 } else { 1021 } else {
1019 $self->CFPlus::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
1020 } 1023 }
1021} 1024}
1022 1025
… …
1072 row_expand => [1, 0], 1075 row_expand => [1, 0],
1073 %arg, 1076 %arg,
1074 ); 1077 );
1075 1078
1076 $self->{vp} = new CFPlus::UI::ViewPort 1079 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1, 1080 expand => 1,
1078 scroll_x => $self->{scroll_x}, 1081 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y}, 1082 scroll_y => $self->{scroll_y},
1083 on_changed => sub {
1084 my ($vp, $x, $y) = @_;
1085
1086 $vp->{parent}{hslider}->set_value ($x);
1087 $vp->{parent}{vslider}->set_value ($y);
1088
1089 0
1090 },
1080 ; 1091 ;
1081 1092
1082 $self->SUPER::add (0, 0, $self->{vp}); 1093 $self->SUPER::add_at (0, 0, $self->{vp});
1083 1094
1084 $self->add ($child) if $child; 1095 $self->add ($child) if $child;
1085 1096
1086 $self 1097 $self
1087} 1098}
… …
1092 my ($self, $widget) = @_; 1103 my ($self, $widget) = @_;
1093 1104
1094 $self->{vp}->add ($self->{child} = $widget); 1105 $self->{vp}->add ($self->{child} = $widget);
1095} 1106}
1096 1107
1108sub update_slider {
1109 my ($self) = @_;
1110
1111 my $child = ($self->{vp} or return)->child;
1112
1113 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1114 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115
1116 my $visible = $w1 > $w2;
1117 if ($visible != $self->{hslider}{visible}) {
1118 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1119 : $self->{hslider}->hide;
1120 }
1121
1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1123 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124
1125 my $visible = $h1 > $h2;
1126 if ($visible != $self->{vslider}{visible}) {
1127 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1128 : $self->{vslider}->hide;
1129 }
1130}
1131
1132sub update {
1133 my ($self) = @_;
1134
1135 $self->update_slider;
1136 $self->SUPER::update;
1137}
1138
1097sub invoke_mouse_wheel { 1139sub invoke_mouse_wheel {
1098 my ($self, $ev) = @_; 1140 my ($self, $ev) = @_;
1099 1141
1100 return 0 unless $ev->{dy}; # only vertical movements for now
1101
1102 $self->{vslider}->emit (mouse_wheel => $ev); 1142 $self->{vslider}->emit (mouse_wheel => $ev)
1143 if $ev->{dy};
1144
1145 $self->{hslider}->emit (mouse_wheel => $ev)
1146 if $ev->{dx};
1103 1147
1104 1 1148 1
1105} 1149}
1106 1150
1107sub update_slider { 1151sub invoke_button_down {
1108 my ($self) = @_; 1152 my ($self, $ev, $x, $y) = @_;
1109 1153
1110 my $child = ($self->{vp} or return)->child; 1154 if ($ev->{button} == 2) {
1155 $self->grab_focus;
1111 1156
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160 $self->{motion} = sub {
1161 my ($ev, $x, $y) = @_;
1114 1162
1115 my $visible = $w1 > $w2; 1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1116 if ($visible != $self->{hslider}{visible}) { 1164 $self->update;
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1165 };
1118 : $self->{hslider}->hide; 1166
1167 return 1;
1168 }
1169
1119 } 1170 0
1171}
1120 1172
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1173sub invoke_button_up {
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1174 my ($self, $ev, $x, $y) = @_;
1123 1175
1124 my $visible = $h1 > $h2; 1176 if (delete $self->{motion}) {
1125 if ($visible != $self->{vslider}{visible}) { 1177 return 1;
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1178 }
1127 : $self->{vslider}->hide; 1179
1128 } 1180 0
1129} 1181}
1130 1182
1131sub update { 1183sub invoke_mouse_motion {
1132 my ($self) = @_; 1184 my ($self, $ev, $x, $y) = @_;
1133 1185
1134 $self->SUPER::update; 1186 if ($self->{motion}) {
1135 $self->update_slider; 1187 $self->{motion}->($ev, $x, $y);
1188 return 1;
1189 }
1190
1191 0
1136} 1192}
1137 1193
1138sub invoke_size_allocate { 1194sub invoke_size_allocate {
1139 my ($self, $w, $h) = @_; 1195 my ($self, $w, $h) = @_;
1140 1196
… …
1296 1352
1297my @border = 1353my @border =
1298 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1354 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1299 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1355 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1300 1356
1357my @icon =
1358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1359 qw(x1_move.png x1_resize.png);
1360
1301sub new { 1361sub new {
1302 my ($class, %arg) = @_; 1362 my ($class, %arg) = @_;
1303 1363
1304 my $self = $class->SUPER::new ( 1364 my $self = $class->SUPER::new (
1305 bg => [1, 1, 1, 1], 1365 bg => [1, 1, 1, 1],
… …
1473 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1474 1534
1475 my $border = $self->border; 1535 my $border = $self->border;
1476 1536
1477 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1478 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1479 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1480 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1481 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1541 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1542
1543 # move
1544 my $w2 = ($w - $border) * .5;
1545 my $h2 = ($h - $border) * .5;
1546 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1547 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1548 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1549
1550 # resize
1551 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1553 unless $self->{has_close_button};
1554 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1482 1556
1483 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1484 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1485 1559
1486 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
… …
1530 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1604 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1531} 1605}
1532 1606
1533# TODO: store row/col info in child widget and use standard add/del 1607# TODO: store row/col info in child widget and use standard add/del
1534sub add { 1608sub add {
1535 my ($self) = shift; 1609 my $self = shift;
1610
1611 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1612 $self->add_at (@_);
1613}
1614
1615sub add_at {
1616 my $self = shift;
1536 1617
1537 while (@_) { 1618 while (@_) {
1538 my ($x, $y, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1620
1539 $child->set_parent ($self); 1621 $child->set_parent ($self);
1540 $self->{children}[$y][$x] = $child; 1622 $self->{children}[$row][$col] = $child;
1541 } 1623 }
1542 1624
1543 $self->{force_realloc} = 1; 1625 $self->{force_realloc} = 1;
1544 $self->{force_size_alloc} = 1; 1626 $self->{force_size_alloc} = 1;
1545 $self->realloc; 1627 $self->realloc;
… …
2322 2404
2323use CFPlus::OpenGL; 2405use CFPlus::OpenGL;
2324 2406
2325my @tex = 2407my @tex =
2326 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2408 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2327 qw(b1_button_active.png); 2409 qw(b1_button_inactive.png b1_button_active.png);
2328 2410
2329sub new { 2411sub new {
2330 my $class = shift; 2412 my $class = shift;
2331 2413
2332 $class->SUPER::new ( 2414 $class->SUPER::new (
2333 padding_x => 4, 2415 padding_x => 4,
2334 padding_y => 4, 2416 padding_y => 4,
2335 fg => [1, 1, 1], 2417 fg => [1.0, 1.0, 1.0],
2336 active_fg => [0, 0, 1], 2418 active_fg => [0.8, 0.8, 0.8],
2337 can_hover => 1, 2419 can_hover => 1,
2338 align => 0, 2420 align => 0,
2339 valign => 0, 2421 valign => 0,
2340 can_events => 1, 2422 can_events => 1,
2341 @_ 2423 @_
… …
2359 2441
2360 glEnable GL_TEXTURE_2D; 2442 glEnable GL_TEXTURE_2D;
2361 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2443 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2362 glColor 0, 0, 0, 1; 2444 glColor 0, 0, 0, 1;
2363 2445
2446 my $tex = $tex[$GRAB == $self];
2364 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2447 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365 2448
2366 glDisable GL_TEXTURE_2D; 2449 glDisable GL_TEXTURE_2D;
2367 2450
2368 $self->SUPER::_draw; 2451 $self->SUPER::_draw;
2369} 2452}
… …
3434 ); 3517 );
3435 3518
3436 if ($self->{anim} && $self->{animspeed}) { 3519 if ($self->{anim} && $self->{animspeed}) {
3437 CFPlus::weaken (my $widget = $self); 3520 CFPlus::weaken (my $widget = $self);
3438 3521
3522 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3523 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3439 $self->{timer} = Event->timer ( 3524 $self->{timer} = Event->timer (
3440 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3441 hard => 1, 3525 parked => 1,
3442 interval => $self->{animspeed},
3443 cb => sub { 3526 cb => sub {
3444 return unless $::CONN; 3527 return unless $::CONN && $widget;
3445 3528
3446 ++$widget->{frame}; 3529 ++$widget->{frame};
3447 $self->update_face; 3530 $widget->update_face;
3448 $self->update; 3531 $widget->update;
3532
3533 $widget->update_timer;
3449 }, 3534 },
3450 ); 3535 );
3451 3536
3452 $self->update_face; 3537 $self->update_face;
3538 $self->update_timer;
3453 } 3539 }
3454 3540
3455 $self 3541 $self
3542}
3543
3544sub update_timer {
3545 my ($self) = @_;
3546
3547 return unless $self->{timer};
3548
3549 if ($self->{visible}) {
3550 $self->{timer}->at (
3551 $self->{anim_start}
3552 + $self->{animspeed}
3553 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3554 );
3555 $self->{timer}->start;
3556 } else {
3557 $self->{timer}->stop;
3558 }
3456} 3559}
3457 3560
3458sub update_face { 3561sub update_face {
3459 my ($self) = @_; 3562 my ($self) = @_;
3460 3563
… …
3492 return unless $self->{visible}; 3595 return unless $self->{visible};
3493 3596
3494 $self->SUPER::update; 3597 $self->SUPER::update;
3495} 3598}
3496 3599
3600sub invoke_visibility_change {
3601 my ($self) = @_;
3602
3603 $self->update_timer;
3604
3605 0
3606}
3607
3497sub _draw { 3608sub _draw {
3498 my ($self) = @_; 3609 my ($self) = @_;
3499 3610
3500 return unless $::CONN; 3611 return unless $::CONN;
3501 3612
… …
3516} 3627}
3517 3628
3518sub destroy { 3629sub destroy {
3519 my ($self) = @_; 3630 my ($self) = @_;
3520 3631
3521 $self->{timer}->cancel 3632 (delete $self->{timer})->cancel
3522 if $self->{timer}; 3633 if $self->{timer};
3523 3634
3524 $self->SUPER::destroy; 3635 $self->SUPER::destroy;
3525} 3636}
3526 3637
… …
4170 while ($self->{post_alloc_hook}) { 4281 while ($self->{post_alloc_hook}) {
4171 $_->() 4282 $_->()
4172 for values %{delete $self->{post_alloc_hook}}; 4283 for values %{delete $self->{post_alloc_hook}};
4173 } 4284 }
4174 4285
4175
4176 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4286 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4177 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4287 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4178 glClear GL_COLOR_BUFFER_BIT; 4288 glClear GL_COLOR_BUFFER_BIT;
4179 4289
4180 glMatrixMode GL_PROJECTION; 4290 glMatrixMode GL_PROJECTION;

Diff Legend

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