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.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
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);
994 $self->update; 994 $self->update;
995 }
995} 996}
996 997
997# 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
998sub coord2local { 999sub coord2local {
999 my ($self, $x, $y) = @_; 1000 my ($self, $x, $y) = @_;
… …
1014 my ($self, $x, $y) = @_; 1015 my ($self, $x, $y) = @_;
1015 1016
1016 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1017 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1018 ) { 1019 ) {
1019 $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})
1020 } else { 1021 } else {
1021 $self->CFPlus::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
1022 } 1023 }
1023} 1024}
1024 1025
… …
1074 row_expand => [1, 0], 1075 row_expand => [1, 0],
1075 %arg, 1076 %arg,
1076 ); 1077 );
1077 1078
1078 $self->{vp} = new CFPlus::UI::ViewPort 1079 $self->{vp} = new CFPlus::UI::ViewPort
1079 expand => 1, 1080 expand => 1,
1080 scroll_x => $self->{scroll_x}, 1081 scroll_x => $self->{scroll_x},
1081 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 },
1082 ; 1091 ;
1083 1092
1084 $self->SUPER::add (0, 0, $self->{vp}); 1093 $self->SUPER::add_at (0, 0, $self->{vp});
1085 1094
1086 $self->add ($child) if $child; 1095 $self->add ($child) if $child;
1087 1096
1088 $self 1097 $self
1089} 1098}
… …
1104 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1113 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1105 $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]);
1106 1115
1107 my $visible = $w1 > $w2; 1116 my $visible = $w1 > $w2;
1108 if ($visible != $self->{hslider}{visible}) { 1117 if ($visible != $self->{hslider}{visible}) {
1109 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1118 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1110 : $self->{hslider}->hide; 1119 : $self->{hslider}->hide;
1111 } 1120 }
1112 1121
1113 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1114 $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]);
1115 1124
1116 my $visible = $h1 > $h2; 1125 my $visible = $h1 > $h2;
1117 if ($visible != $self->{vslider}{visible}) { 1126 if ($visible != $self->{vslider}{visible}) {
1118 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1127 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1119 : $self->{vslider}->hide; 1128 : $self->{vslider}->hide;
1120 } 1129 }
1121} 1130}
1122 1131
1123sub update { 1132sub update {
1124 my ($self) = @_; 1133 my ($self) = @_;
1125 1134
1135 $self->update_slider;
1126 $self->SUPER::update; 1136 $self->SUPER::update;
1127 $self->update_slider;
1128} 1137}
1129 1138
1130sub invoke_mouse_wheel { 1139sub invoke_mouse_wheel {
1131 my ($self, $ev) = @_; 1140 my ($self, $ev) = @_;
1132 1141
1133 return 0 unless $ev->{dy}; # only vertical movements for now
1134
1135 $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};
1136 1147
1137 1 1148 1
1138} 1149}
1139 1150
1140sub invoke_button_down { 1151sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1152 my ($self, $ev, $x, $y) = @_;
1142 1153
1143 if ($ev->{button} == 2) { 1154 if ($ev->{button} == 2) {
1144 $self->grab_focus; 1155 $self->grab_focus;
1156
1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1145 1159
1146 $self->{motion} = sub { 1160 $self->{motion} = sub {
1147 my ($ev, $x, $y) = @_; 1161 my ($ev, $x, $y) = @_;
1148 1162
1149 $self->{vp}->set_offset ( 1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1150 $self->{vp}{view_x} - $ev->{xrel}, 1164 $self->update;
1151 $self->{vp}{view_y} - $ev->{yrel},
1152 );
1153 }; 1165 };
1154 1166
1155 return 1; 1167 return 1;
1156 } 1168 }
1157 1169
… …
1340 1352
1341my @border = 1353my @border =
1342 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1354 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); 1355 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1344 1356
1357my @icon =
1358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1359 qw(x1_move.png x1_resize.png);
1360
1345sub new { 1361sub new {
1346 my ($class, %arg) = @_; 1362 my ($class, %arg) = @_;
1347 1363
1348 my $self = $class->SUPER::new ( 1364 my $self = $class->SUPER::new (
1349 bg => [1, 1, 1, 1], 1365 bg => [1, 1, 1, 1],
… …
1517 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1518 1534
1519 my $border = $self->border; 1535 my $border = $self->border;
1520 1536
1521 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1522 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1523 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1524 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1525 $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);
1526 1556
1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1528 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1529 1559
1530 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
… …
1574 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1604 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1575} 1605}
1576 1606
1577# 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
1578sub add { 1608sub add {
1579 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;
1580 1617
1581 while (@_) { 1618 while (@_) {
1582 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
1583 $child->set_parent ($self); 1627 $child->set_parent ($self);
1584 $self->{children}[$y][$x] = $child; 1628 $self->{children}[$row][$col] = $child;
1585 } 1629 }
1586 1630
1587 $self->{force_realloc} = 1; 1631 $self->{force_realloc} = 1;
1588 $self->{force_size_alloc} = 1; 1632 $self->{force_size_alloc} = 1;
1589 $self->realloc; 1633 $self->realloc;
… …
1617sub get_wh { 1661sub get_wh {
1618 my ($self) = @_; 1662 my ($self) = @_;
1619 1663
1620 my (@w, @h); 1664 my (@w, @h);
1621 1665
1622 for my $y (0 .. $#{$self->{children}}) { 1666 my @children = $self->children;
1623 my $row = $self->{children}[$y]
1624 or next;
1625 1667
1626 for my $x (0 .. $#$row) { 1668 for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) {
1627 my $widget = $row->[$x] 1669 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1628 or next;
1629 my ($w, $h) = @$widget{qw(req_w req_h)};
1630 1670
1631 $w[$x] = max $w[$x], $w; 1671 my $sw = sum @w[$c .. $c + $cs - 1];
1632 $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];
1633 } 1680 }
1634 } 1681 }
1635 1682
1636 (\@w, \@h) 1683 (\@w, \@h)
1637} 1684}
… …
1653 my ($ws, $hs) = $self->get_wh; 1700 my ($ws, $hs) = $self->get_wh;
1654 1701
1655 my $req_w = (sum @$ws) || 1; 1702 my $req_w = (sum @$ws) || 1;
1656 my $req_h = (sum @$hs) || 1; 1703 my $req_h = (sum @$hs) || 1;
1657 1704
1658 # TODO: nicer code 1705 # now linearly scale the rows/columns to the allocated size
1659 my @col_expand = @{$self->{col_expand}}; 1706 my @col_expand = @{$self->{col_expand}};
1660 @col_expand = (1) x @$ws unless @col_expand; 1707 @col_expand = (1) x @$ws unless @col_expand;
1661 my $col_expand = (sum @col_expand) || 1; 1708 my $col_expand = (sum @col_expand) || 1;
1662 1709
1663 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1710 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1670 1717
1671 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1718 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1672 1719
1673 CFPlus::UI::harmonize $hs; 1720 CFPlus::UI::harmonize $hs;
1674 1721
1675 my $y; 1722 my (@x, @y);
1676 1723
1724 for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1725 for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1726
1677 for my $r (0 .. $#{$self->{children}}) { 1727 for my $widget ($self->children) {
1678 my $row = $self->{children}[$r] 1728 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1679 or next;
1680 1729
1681 my $x = 0; 1730 $widget->configure (
1682 my $row_h = $hs->[$r]; 1731 $x[$c], $y[$r],
1732 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1683 1733 );
1684 for my $c (0 .. $#$row) {
1685 my $col_w = $ws->[$c];
1686
1687 if (my $widget = $row->[$c]) {
1688 $widget->configure ($x, $y, $col_w, $row_h);
1689 }
1690
1691 $x += $col_w;
1692 }
1693
1694 $y += $row_h;
1695 } 1734 }
1696 1735
1697 1 1736 1
1698} 1737}
1699 1738
… …
2366 2405
2367use CFPlus::OpenGL; 2406use CFPlus::OpenGL;
2368 2407
2369my @tex = 2408my @tex =
2370 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2409 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2371 qw(b1_button_active.png); 2410 qw(b1_button_inactive.png b1_button_active.png);
2372 2411
2373sub new { 2412sub new {
2374 my $class = shift; 2413 my $class = shift;
2375 2414
2376 $class->SUPER::new ( 2415 $class->SUPER::new (
2377 padding_x => 4, 2416 padding_x => 4,
2378 padding_y => 4, 2417 padding_y => 4,
2379 fg => [1, 1, 1], 2418 fg => [1.0, 1.0, 1.0],
2380 active_fg => [0, 0, 1], 2419 active_fg => [0.8, 0.8, 0.8],
2381 can_hover => 1, 2420 can_hover => 1,
2382 align => 0, 2421 align => 0,
2383 valign => 0, 2422 valign => 0,
2384 can_events => 1, 2423 can_events => 1,
2385 @_ 2424 @_
… …
2403 2442
2404 glEnable GL_TEXTURE_2D; 2443 glEnable GL_TEXTURE_2D;
2405 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2406 glColor 0, 0, 0, 1; 2445 glColor 0, 0, 0, 1;
2407 2446
2447 my $tex = $tex[$GRAB == $self];
2408 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2448 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2409 2449
2410 glDisable GL_TEXTURE_2D; 2450 glDisable GL_TEXTURE_2D;
2411 2451
2412 $self->SUPER::_draw; 2452 $self->SUPER::_draw;
2413} 2453}
… …
3478 ); 3518 );
3479 3519
3480 if ($self->{anim} && $self->{animspeed}) { 3520 if ($self->{anim} && $self->{animspeed}) {
3481 CFPlus::weaken (my $widget = $self); 3521 CFPlus::weaken (my $widget = $self);
3482 3522
3523 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3524 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3483 $self->{timer} = Event->timer ( 3525 $self->{timer} = Event->timer (
3484 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3485 hard => 1, 3526 parked => 1,
3486 interval => $self->{animspeed},
3487 cb => sub { 3527 cb => sub {
3488 return unless $::CONN; 3528 return unless $::CONN && $widget;
3489 3529
3490 ++$widget->{frame}; 3530 ++$widget->{frame};
3491 $self->update_face; 3531 $widget->update_face;
3492 $self->update; 3532 $widget->update;
3533
3534 $widget->update_timer;
3493 }, 3535 },
3494 ); 3536 );
3495 3537
3496 $self->update_face; 3538 $self->update_face;
3539 $self->update_timer;
3497 } 3540 }
3498 3541
3499 $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 }
3500} 3560}
3501 3561
3502sub update_face { 3562sub update_face {
3503 my ($self) = @_; 3563 my ($self) = @_;
3504 3564
… …
3536 return unless $self->{visible}; 3596 return unless $self->{visible};
3537 3597
3538 $self->SUPER::update; 3598 $self->SUPER::update;
3539} 3599}
3540 3600
3601sub invoke_visibility_change {
3602 my ($self) = @_;
3603
3604 $self->update_timer;
3605
3606 0
3607}
3608
3541sub _draw { 3609sub _draw {
3542 my ($self) = @_; 3610 my ($self) = @_;
3543 3611
3544 return unless $::CONN; 3612 return unless $::CONN;
3545 3613
… …
3560} 3628}
3561 3629
3562sub destroy { 3630sub destroy {
3563 my ($self) = @_; 3631 my ($self) = @_;
3564 3632
3565 $self->{timer}->cancel 3633 (delete $self->{timer})->cancel
3566 if $self->{timer}; 3634 if $self->{timer};
3567 3635
3568 $self->SUPER::destroy; 3636 $self->SUPER::destroy;
3569} 3637}
3570 3638
… …
4214 while ($self->{post_alloc_hook}) { 4282 while ($self->{post_alloc_hook}) {
4215 $_->() 4283 $_->()
4216 for values %{delete $self->{post_alloc_hook}}; 4284 for values %{delete $self->{post_alloc_hook}};
4217 } 4285 }
4218 4286
4219
4220 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4287 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4221 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4288 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4222 glClear GL_COLOR_BUFFER_BIT; 4289 glClear GL_COLOR_BUFFER_BIT;
4223 4290
4224 glMatrixMode GL_PROJECTION; 4291 glMatrixMode GL_PROJECTION;

Diff Legend

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