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.377 by root, Mon Jul 16 20:20:30 2007 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 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);
… …
963sub size_request { 958sub size_request {
964 my ($self) = @_; 959 my ($self) = @_;
965 960
966 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 961 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967 962
968 $w = 10 if $self->{scroll_x}; 963 $w = 1 if $self->{scroll_x};
969 $h = 10 if $self->{scroll_y}; 964 $h = 1 if $self->{scroll_y};
970 965
971 ($w, $h) 966 ($w, $h)
972} 967}
973 968
974sub invoke_size_allocate { 969sub invoke_size_allocate {
… …
986} 981}
987 982
988sub set_offset { 983sub set_offset {
989 my ($self, $x, $y) = @_; 984 my ($self, $x, $y) = @_;
990 985
991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x; 986 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; 987 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993 988
994 $self->emit (changed => $self->{view_x}, $self->{view_y}); 989 if ($x != $self->{view_x} or $y != $self->{view_y}) {
990 $self->{view_x} = $x;
991 $self->{view_y} = $y;
992
993 $self->emit (changed => $x, $y);
995 $self->update; 994 $self->update;
995 }
996} 996}
997 997
998# 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
999sub coord2local { 999sub coord2local {
1000 my ($self, $x, $y) = @_; 1000 my ($self, $x, $y) = @_;
… …
1015 my ($self, $x, $y) = @_; 1015 my ($self, $x, $y) = @_;
1016 1016
1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1019 ) { 1019 ) {
1020 $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})
1021 } else { 1021 } else {
1022 $self->CFPlus::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
1023 } 1023 }
1024} 1024}
1025 1025
… …
1088 1088
1089 0 1089 0
1090 }, 1090 },
1091 ; 1091 ;
1092 1092
1093 $self->SUPER::add (0, 0, $self->{vp}); 1093 $self->SUPER::add_at (0, 0, $self->{vp});
1094 1094
1095 $self->add ($child) if $child; 1095 $self->add ($child) if $child;
1096 1096
1097 $self 1097 $self
1098} 1098}
… …
1113 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1113 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1114 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1114 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115 1115
1116 my $visible = $w1 > $w2; 1116 my $visible = $w1 > $w2;
1117 if ($visible != $self->{hslider}{visible}) { 1117 if ($visible != $self->{hslider}{visible}) {
1118 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1118 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1119 : $self->{hslider}->hide; 1119 : $self->{hslider}->hide;
1120 } 1120 }
1121 1121
1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1123 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1123 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124 1124
1125 my $visible = $h1 > $h2; 1125 my $visible = $h1 > $h2;
1126 if ($visible != $self->{vslider}{visible}) { 1126 if ($visible != $self->{vslider}{visible}) {
1127 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1127 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1128 : $self->{vslider}->hide; 1128 : $self->{vslider}->hide;
1129 } 1129 }
1130} 1130}
1131 1131
1132sub update { 1132sub update {
1133 my ($self) = @_; 1133 my ($self) = @_;
1134 1134
1135 $self->update_slider;
1135 $self->SUPER::update; 1136 $self->SUPER::update;
1136 $self->update_slider;
1137} 1137}
1138 1138
1139sub invoke_mouse_wheel { 1139sub invoke_mouse_wheel {
1140 my ($self, $ev) = @_; 1140 my ($self, $ev) = @_;
1141 1141
1142 return 0 unless $ev->{dy}; # only vertical movements for now
1143
1144 $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};
1145 1147
1146 1 1148 1
1147} 1149}
1148 1150
1149sub invoke_button_down { 1151sub invoke_button_down {
… …
1350 1352
1351my @border = 1353my @border =
1352 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1354 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1353 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);
1354 1356
1357my @icon =
1358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1359 qw(x1_move.png x1_resize.png);
1360
1355sub new { 1361sub new {
1356 my ($class, %arg) = @_; 1362 my ($class, %arg) = @_;
1357 1363
1358 my $self = $class->SUPER::new ( 1364 my $self = $class->SUPER::new (
1359 bg => [1, 1, 1, 1], 1365 bg => [1, 1, 1, 1],
… …
1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1528 1534
1529 my $border = $self->border; 1535 my $border = $self->border;
1530 1536
1531 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1532 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1533 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1534 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1535 $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);
1536 1556
1537 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1538 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1539 1559
1540 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
… …
1584 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1604 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1585} 1605}
1586 1606
1587# 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
1588sub add { 1608sub add {
1589 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;
1590 1617
1591 while (@_) { 1618 while (@_) {
1592 my ($x, $y, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1620
1621 $child->{row} = $row;
1622 $child->{col} = $col;
1623
1624 $child->{rowspan} ||= 1;
1625 $child->{colspan} ||= 1;
1626
1593 $child->set_parent ($self); 1627 $child->set_parent ($self);
1594 $self->{children}[$y][$x] = $child; 1628 $self->{children}[$row][$col] = $child;
1595 } 1629 }
1596 1630
1597 $self->{force_realloc} = 1; 1631 $self->{force_realloc} = 1;
1598 $self->{force_size_alloc} = 1; 1632 $self->{force_size_alloc} = 1;
1599 $self->realloc; 1633 $self->realloc;
… …
1627sub get_wh { 1661sub get_wh {
1628 my ($self) = @_; 1662 my ($self) = @_;
1629 1663
1630 my (@w, @h); 1664 my (@w, @h);
1631 1665
1632 for my $y (0 .. $#{$self->{children}}) { 1666 my @children = $self->children;
1633 my $row = $self->{children}[$y]
1634 or next;
1635 1667
1636 for my $x (0 .. $#$row) { 1668 for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) {
1637 my $widget = $row->[$x] 1669 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1638 or next;
1639 my ($w, $h) = @$widget{qw(req_w req_h)};
1640 1670
1641 $w[$x] = max $w[$x], $w; 1671 my $sw = sum @w[$c .. $c + $cs - 1];
1642 $h[$y] = max $h[$y], $h; 1672 my $sh = sum @h[$r .. $r + $rs - 1];
1673
1674 if ($w > $sw) {
1675 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
1676 }
1677
1678 if ($h > $sh) {
1679 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1643 } 1680 }
1644 } 1681 }
1645 1682
1646 (\@w, \@h) 1683 (\@w, \@h)
1647} 1684}
… …
1663 my ($ws, $hs) = $self->get_wh; 1700 my ($ws, $hs) = $self->get_wh;
1664 1701
1665 my $req_w = (sum @$ws) || 1; 1702 my $req_w = (sum @$ws) || 1;
1666 my $req_h = (sum @$hs) || 1; 1703 my $req_h = (sum @$hs) || 1;
1667 1704
1668 # TODO: nicer code 1705 # now linearly scale the rows/columns to the allocated size
1669 my @col_expand = @{$self->{col_expand}}; 1706 my @col_expand = @{$self->{col_expand}};
1670 @col_expand = (1) x @$ws unless @col_expand; 1707 @col_expand = (1) x @$ws unless @col_expand;
1671 my $col_expand = (sum @col_expand) || 1; 1708 my $col_expand = (sum @col_expand) || 1;
1672 1709
1673 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1710 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1680 1717
1681 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1718 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1682 1719
1683 CFPlus::UI::harmonize $hs; 1720 CFPlus::UI::harmonize $hs;
1684 1721
1685 my $y; 1722 my (@x, @y);
1686 1723
1724 for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1725 for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1726
1687 for my $r (0 .. $#{$self->{children}}) { 1727 for my $widget ($self->children) {
1688 my $row = $self->{children}[$r] 1728 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1689 or next;
1690 1729
1691 my $x = 0; 1730 $widget->configure (
1692 my $row_h = $hs->[$r]; 1731 $x[$c], $y[$r],
1732 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1693 1733 );
1694 for my $c (0 .. $#$row) {
1695 my $col_w = $ws->[$c];
1696
1697 if (my $widget = $row->[$c]) {
1698 $widget->configure ($x, $y, $col_w, $row_h);
1699 }
1700
1701 $x += $col_w;
1702 }
1703
1704 $y += $row_h;
1705 } 1734 }
1706 1735
1707 1 1736 1
1708} 1737}
1709 1738
… …
2376 2405
2377use CFPlus::OpenGL; 2406use CFPlus::OpenGL;
2378 2407
2379my @tex = 2408my @tex =
2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2409 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2381 qw(b1_button_active.png); 2410 qw(b1_button_inactive.png b1_button_active.png);
2382 2411
2383sub new { 2412sub new {
2384 my $class = shift; 2413 my $class = shift;
2385 2414
2386 $class->SUPER::new ( 2415 $class->SUPER::new (
2387 padding_x => 4, 2416 padding_x => 4,
2388 padding_y => 4, 2417 padding_y => 4,
2389 fg => [1, 1, 1], 2418 fg => [1.0, 1.0, 1.0],
2390 active_fg => [0, 0, 1], 2419 active_fg => [0.8, 0.8, 0.8],
2391 can_hover => 1, 2420 can_hover => 1,
2392 align => 0, 2421 align => 0,
2393 valign => 0, 2422 valign => 0,
2394 can_events => 1, 2423 can_events => 1,
2395 @_ 2424 @_
… …
2413 2442
2414 glEnable GL_TEXTURE_2D; 2443 glEnable GL_TEXTURE_2D;
2415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416 glColor 0, 0, 0, 1; 2445 glColor 0, 0, 0, 1;
2417 2446
2447 my $tex = $tex[$GRAB == $self];
2418 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2448 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419 2449
2420 glDisable GL_TEXTURE_2D; 2450 glDisable GL_TEXTURE_2D;
2421 2451
2422 $self->SUPER::_draw; 2452 $self->SUPER::_draw;
2423} 2453}
… …
3488 ); 3518 );
3489 3519
3490 if ($self->{anim} && $self->{animspeed}) { 3520 if ($self->{anim} && $self->{animspeed}) {
3491 CFPlus::weaken (my $widget = $self); 3521 CFPlus::weaken (my $widget = $self);
3492 3522
3523 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3524 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3493 $self->{timer} = Event->timer ( 3525 $self->{timer} = Event->timer (
3494 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3495 hard => 1, 3526 parked => 1,
3496 interval => $self->{animspeed},
3497 cb => sub { 3527 cb => sub {
3498 return unless $::CONN; 3528 return unless $::CONN && $widget;
3499 3529
3500 ++$widget->{frame}; 3530 ++$widget->{frame};
3501 $self->update_face; 3531 $widget->update_face;
3502 $self->update; 3532 $widget->update;
3533
3534 $widget->update_timer;
3503 }, 3535 },
3504 ); 3536 );
3505 3537
3506 $self->update_face; 3538 $self->update_face;
3539 $self->update_timer;
3507 } 3540 }
3508 3541
3509 $self 3542 $self
3543}
3544
3545sub update_timer {
3546 my ($self) = @_;
3547
3548 return unless $self->{timer};
3549
3550 if ($self->{visible}) {
3551 $self->{timer}->at (
3552 $self->{anim_start}
3553 + $self->{animspeed}
3554 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3555 );
3556 $self->{timer}->start;
3557 } else {
3558 $self->{timer}->stop;
3559 }
3510} 3560}
3511 3561
3512sub update_face { 3562sub update_face {
3513 my ($self) = @_; 3563 my ($self) = @_;
3514 3564
… …
3546 return unless $self->{visible}; 3596 return unless $self->{visible};
3547 3597
3548 $self->SUPER::update; 3598 $self->SUPER::update;
3549} 3599}
3550 3600
3601sub invoke_visibility_change {
3602 my ($self) = @_;
3603
3604 $self->update_timer;
3605
3606 0
3607}
3608
3551sub _draw { 3609sub _draw {
3552 my ($self) = @_; 3610 my ($self) = @_;
3553 3611
3554 return unless $::CONN; 3612 return unless $::CONN;
3555 3613
… …
3570} 3628}
3571 3629
3572sub destroy { 3630sub destroy {
3573 my ($self) = @_; 3631 my ($self) = @_;
3574 3632
3575 $self->{timer}->cancel 3633 (delete $self->{timer})->cancel
3576 if $self->{timer}; 3634 if $self->{timer};
3577 3635
3578 $self->SUPER::destroy; 3636 $self->SUPER::destroy;
3579} 3637}
3580 3638
… …
4224 while ($self->{post_alloc_hook}) { 4282 while ($self->{post_alloc_hook}) {
4225 $_->() 4283 $_->()
4226 for values %{delete $self->{post_alloc_hook}}; 4284 for values %{delete $self->{post_alloc_hook}};
4227 } 4285 }
4228 4286
4229
4230 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4287 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4231 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4288 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4232 glClear GL_COLOR_BUFFER_BIT; 4289 glClear GL_COLOR_BUFFER_BIT;
4233 4290
4234 glMatrixMode GL_PROJECTION; 4291 glMatrixMode GL_PROJECTION;

Diff Legend

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