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.380 by root, Tue Jul 17 17:39:07 2007 UTC vs.
Revision 1.392 by root, Sat Jul 21 13:37:09 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);
… …
746 can_events => 0, 741 can_events => 0,
747 %arg, 742 %arg,
748 ); 743 );
749 744
750 $self->add (@$children) 745 $self->add (@$children)
751 if $children; 746 if $children && @$children;
752 747
753 $self 748 $self
754} 749}
755 750
756sub realloc { 751sub realloc {
… …
765 my ($self, @widgets) = @_; 760 my ($self, @widgets) = @_;
766 761
767 $_->set_parent ($self) 762 $_->set_parent ($self)
768 for @widgets; 763 for @widgets;
769 764
765 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 766 use sort 'stable';
771 767
772 $self->{children} = [ 768 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 769 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 770 @{$self->{children}}, @widgets
… …
963sub size_request { 959sub size_request {
964 my ($self) = @_; 960 my ($self) = @_;
965 961
966 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967 963
968 $w = 10 if $self->{scroll_x}; 964 $w = 1 if $self->{scroll_x};
969 $h = 10 if $self->{scroll_y}; 965 $h = 1 if $self->{scroll_y};
970 966
971 ($w, $h) 967 ($w, $h)
972} 968}
973 969
974sub invoke_size_allocate { 970sub invoke_size_allocate {
… …
1020 my ($self, $x, $y) = @_; 1016 my ($self, $x, $y) = @_;
1021 1017
1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1018 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1019 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1024 ) { 1020 ) {
1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1021 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1026 } else { 1022 } else {
1027 $self->CFPlus::UI::Base::find_widget ($x, $y) 1023 $self->CFPlus::UI::Base::find_widget ($x, $y)
1028 } 1024 }
1029} 1025}
1030 1026
… …
1051 my $child = delete $arg{child}; 1047 my $child = delete $arg{child};
1052 1048
1053 my $self; 1049 my $self;
1054 1050
1055 my $hslider = new CFPlus::UI::Slider 1051 my $hslider = new CFPlus::UI::Slider
1052 col => 0,
1053 row => 1,
1056 vertical => 0, 1054 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix 1055 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub { 1056 on_changed => sub {
1059 $self->{hpos} = $_[1]; 1057 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 }, 1059 },
1062 ; 1060 ;
1063 1061
1064 my $vslider = new CFPlus::UI::Slider 1062 my $vslider = new CFPlus::UI::Slider
1063 col => 1,
1064 row => 0,
1065 vertical => 1, 1065 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub { 1067 on_changed => sub {
1068 $self->{vpos} = $_[1]; 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1080 row_expand => [1, 0], 1080 row_expand => [1, 0],
1081 %arg, 1081 %arg,
1082 ); 1082 );
1083 1083
1084 $self->{vp} = new CFPlus::UI::ViewPort 1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0,
1086 row => 0,
1085 expand => 1, 1087 expand => 1,
1086 scroll_x => $self->{scroll_x}, 1088 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y}, 1089 scroll_y => $self->{scroll_y},
1088 on_changed => sub { 1090 on_changed => sub {
1089 my ($vp, $x, $y) = @_; 1091 my ($vp, $x, $y) = @_;
… …
1093 1095
1094 0 1096 0
1095 }, 1097 },
1096 ; 1098 ;
1097 1099
1098 $self->SUPER::add (0, 0, $self->{vp}); 1100 $self->SUPER::add ($self->{vp});
1099 1101
1100 $self->add ($child) if $child; 1102 $self->add ($child) if $child;
1101 1103
1102 $self 1104 $self
1103} 1105}
1104 1106
1105#TODO# update range on size_allocate depending on child 1107#TODO# update range on size_allocate depending on child?
1106 1108
1107sub add { 1109sub add {
1108 my ($self, $widget) = @_; 1110 my ($self, $widget) = @_;
1109 1111
1110 $self->{vp}->add ($self->{child} = $widget); 1112 $self->{vp}->add ($self->{child} = $widget);
… …
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120 1122
1121 my $visible = $w1 > $w2; 1123 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) { 1124 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1125 $visible ? $self->SUPER::add ($self->{hslider})
1124 : $self->{hslider}->hide; 1126 : $self->SUPER::remove ($self->{hslider});
1125 } 1127 }
1126 1128
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1129 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129 1131
1130 my $visible = $h1 > $h2; 1132 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) { 1133 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1134 $visible ? $self->SUPER::add ($self->{vslider})
1133 : $self->{vslider}->hide; 1135 : $self->SUPER::remove ($self->{vslider});
1134 } 1136 }
1135} 1137}
1136 1138
1137sub update { 1139sub update {
1138 my ($self) = @_; 1140 my ($self) = @_;
1139 1141
1142 $self->update_slider;
1140 $self->SUPER::update; 1143 $self->SUPER::update;
1141 $self->update_slider;
1142} 1144}
1143 1145
1144sub invoke_mouse_wheel { 1146sub invoke_mouse_wheel {
1145 my ($self, $ev) = @_; 1147 my ($self, $ev) = @_;
1146 1148
1147 return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149 $self->{vslider}->emit (mouse_wheel => $ev); 1149 $self->{vslider}->emit (mouse_wheel => $ev)
1150 if $ev->{dy};
1151
1152 $self->{hslider}->emit (mouse_wheel => $ev)
1153 if $ev->{dx};
1150 1154
1151 1 1155 1
1152} 1156}
1153 1157
1154sub invoke_button_down { 1158sub invoke_button_down {
… …
1355 1359
1356my @border = 1360my @border =
1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1361 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); 1362 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1359 1363
1364my @icon =
1365 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1366 qw(x1_move.png x1_resize.png);
1367
1360sub new { 1368sub new {
1361 my ($class, %arg) = @_; 1369 my ($class, %arg) = @_;
1362 1370
1363 my $self = $class->SUPER::new ( 1371 my $self = $class->SUPER::new (
1364 bg => [1, 1, 1, 1], 1372 bg => [1, 1, 1, 1],
… …
1532 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1540 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1533 1541
1534 my $border = $self->border; 1542 my $border = $self->border;
1535 1543
1536 glColor @{ $self->{border_bg} }; 1544 glColor @{ $self->{border_bg} };
1537 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1545 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1538 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1546 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1539 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1547 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1540 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1548 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1549
1550 # move
1551 my $w2 = ($w - $border) * .5;
1552 my $h2 = ($h - $border) * .5;
1553 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1554 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1555 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1556
1557 # resize
1558 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1559 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1560 unless $self->{has_close_button};
1561 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1562 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1541 1563
1542 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1564 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1543 glColor @{ $self->{bg} }; 1565 glColor @{ $self->{bg} };
1544 1566
1545 # TODO: repeat texture not scale 1567 # TODO: repeat texture not scale
… …
1566 1588
1567############################################################################# 1589#############################################################################
1568 1590
1569package CFPlus::UI::Table; 1591package CFPlus::UI::Table;
1570 1592
1571our @ISA = CFPlus::UI::Base::; 1593our @ISA = CFPlus::UI::Container::;
1572 1594
1573use List::Util qw(max sum); 1595use List::Util qw(max sum);
1574 1596
1575use CFPlus::OpenGL; 1597use CFPlus::OpenGL;
1576 1598
1577sub new { 1599sub new {
1578 my $class = shift; 1600 my $class = shift;
1579 1601
1580 $class->SUPER::new ( 1602 $class->SUPER::new (
1581 children => [],
1582 col_expand => [], 1603 col_expand => [],
1583 row_expand => [], 1604 row_expand => [],
1584 @_, 1605 @_,
1585 ) 1606 )
1586} 1607}
1587 1608
1588sub children {
1589 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1590}
1591
1592# TODO: store row/col info in child widget and use standard add/del
1593sub add { 1609sub add {
1610 my ($self, @widgets) = @_;
1611
1612 for my $child (@widgets) {
1613 $child->{rowspan} ||= 1;
1614 $child->{colspan} ||= 1;
1615 }
1616
1617 $self->SUPER::add (@widgets);
1618}
1619
1620sub add_at {
1594 my ($self) = shift; 1621 my $self = shift;
1622
1623 my @widgets;
1595 1624
1596 while (@_) { 1625 while (@_) {
1597 my ($x, $y, $child) = splice @_, 0, 3, (); 1626 my ($col, $row, $child) = splice @_, 0, 3, ();
1598 $child->set_parent ($self);
1599 $self->{children}[$y][$x] = $child;
1600 }
1601 1627
1602 $self->{force_realloc} = 1; 1628 $child->{row} = $row;
1603 $self->{force_size_alloc} = 1; 1629 $child->{col} = $col;
1604 $self->realloc;
1605}
1606 1630
1607sub remove { 1631 push @widgets, $child;
1632 }
1633
1634 $self->add (@widgets);
1635}
1636
1637sub get_wh {
1608 my ($self, $child) = @_; 1638 my ($self) = @_;
1609 1639
1610 for (@{ $self->{children} }) { 1640 my (@w, @h);
1611 for (@{ $_ || [] }) { 1641
1612 $_ = undef if $_ == $child; 1642 my @children = $self->children;
1643
1644 # first pass, columns
1645 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1646 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1647
1648 my $sw = sum @w[$c .. $c + $cs - 1];
1649
1650 if ($w > $sw) {
1651 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
1613 } 1652 }
1614 } 1653 }
1615}
1616 1654
1617# TODO: move to container class maybe? send children a signal on removal? 1655 # second pass, rows
1618sub clear { 1656 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1619 my ($self) = @_;
1620
1621 my @children = $self->children;
1622 delete $self->{children};
1623
1624 for (@children) {
1625 delete $_->{parent};
1626 $_->hide;
1627 }
1628
1629 $self->realloc;
1630}
1631
1632sub get_wh {
1633 my ($self) = @_;
1634
1635 my (@w, @h);
1636
1637 for my $y (0 .. $#{$self->{children}}) {
1638 my $row = $self->{children}[$y]
1639 or next;
1640
1641 for my $x (0 .. $#$row) {
1642 my $widget = $row->[$x]
1643 or next;
1644 my ($w, $h) = @$widget{qw(req_w req_h)}; 1657 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1645 1658
1646 $w[$x] = max $w[$x], $w; 1659 my $sh = sum @h[$r .. $r + $rs - 1];
1647 $h[$y] = max $h[$y], $h; 1660
1661 if ($h > $sh) {
1662 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1648 } 1663 }
1649 } 1664 }
1650 1665
1651 (\@w, \@h) 1666 (\@w, \@h)
1652} 1667}
… …
1668 my ($ws, $hs) = $self->get_wh; 1683 my ($ws, $hs) = $self->get_wh;
1669 1684
1670 my $req_w = (sum @$ws) || 1; 1685 my $req_w = (sum @$ws) || 1;
1671 my $req_h = (sum @$hs) || 1; 1686 my $req_h = (sum @$hs) || 1;
1672 1687
1673 # TODO: nicer code 1688 # now linearly scale the rows/columns to the allocated size
1674 my @col_expand = @{$self->{col_expand}}; 1689 my @col_expand = @{$self->{col_expand}};
1675 @col_expand = (1) x @$ws unless @col_expand; 1690 @col_expand = (1) x @$ws unless @col_expand;
1676 my $col_expand = (sum @col_expand) || 1; 1691 my $col_expand = (sum @col_expand) || 1;
1677 1692
1678 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1693 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1685 1700
1686 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1701 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1687 1702
1688 CFPlus::UI::harmonize $hs; 1703 CFPlus::UI::harmonize $hs;
1689 1704
1690 my $y; 1705 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1706 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1691 1707
1692 for my $r (0 .. $#{$self->{children}}) { 1708 for my $widget ($self->children) {
1693 my $row = $self->{children}[$r] 1709 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1694 or next;
1695 1710
1696 my $x = 0; 1711 $widget->configure (
1697 my $row_h = $hs->[$r]; 1712 $x[$c], $y[$r],
1713 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1698 1714 );
1699 for my $c (0 .. $#$row) {
1700 my $col_w = $ws->[$c];
1701
1702 if (my $widget = $row->[$c]) {
1703 $widget->configure ($x, $y, $col_w, $row_h);
1704 }
1705
1706 $x += $col_w;
1707 }
1708
1709 $y += $row_h;
1710 } 1715 }
1711 1716
1712 1 1717 1
1713}
1714
1715sub find_widget {
1716 my ($self, $x, $y) = @_;
1717
1718 $x -= $self->{x};
1719 $y -= $self->{y};
1720
1721 my $res;
1722
1723 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1724 $res = $_->find_widget ($x, $y)
1725 and return $res;
1726 }
1727
1728 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1729}
1730
1731sub _draw {
1732 my ($self) = @_;
1733
1734 for (grep $_, @{$self->{children}}) {
1735 $_->draw for grep $_, @$_;
1736 }
1737} 1718}
1738 1719
1739############################################################################# 1720#############################################################################
1740 1721
1741package CFPlus::UI::Fixed; 1722package CFPlus::UI::Fixed;
… …
2381 2362
2382use CFPlus::OpenGL; 2363use CFPlus::OpenGL;
2383 2364
2384my @tex = 2365my @tex =
2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2366 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2386 qw(b1_button_active.png); 2367 qw(b1_button_inactive.png b1_button_active.png);
2387 2368
2388sub new { 2369sub new {
2389 my $class = shift; 2370 my $class = shift;
2390 2371
2391 $class->SUPER::new ( 2372 $class->SUPER::new (
2392 padding_x => 4, 2373 padding_x => 4,
2393 padding_y => 4, 2374 padding_y => 4,
2394 fg => [1, 1, 1], 2375 fg => [1.0, 1.0, 1.0],
2395 active_fg => [0, 0, 1], 2376 active_fg => [0.8, 0.8, 0.8],
2396 can_hover => 1, 2377 can_hover => 1,
2397 align => 0, 2378 align => 0,
2398 valign => 0, 2379 valign => 0,
2399 can_events => 1, 2380 can_events => 1,
2400 @_ 2381 @_
… …
2418 2399
2419 glEnable GL_TEXTURE_2D; 2400 glEnable GL_TEXTURE_2D;
2420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2421 glColor 0, 0, 0, 1; 2402 glColor 0, 0, 0, 1;
2422 2403
2404 my $tex = $tex[$GRAB == $self];
2423 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2405 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2424 2406
2425 glDisable GL_TEXTURE_2D; 2407 glDisable GL_TEXTURE_2D;
2426 2408
2427 $self->SUPER::_draw; 2409 $self->SUPER::_draw;
2428} 2410}
… …
4257 while ($self->{post_alloc_hook}) { 4239 while ($self->{post_alloc_hook}) {
4258 $_->() 4240 $_->()
4259 for values %{delete $self->{post_alloc_hook}}; 4241 for values %{delete $self->{post_alloc_hook}};
4260 } 4242 }
4261 4243
4262
4263 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4244 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4264 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4245 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4265 glClear GL_COLOR_BUFFER_BIT; 4246 glClear GL_COLOR_BUFFER_BIT;
4266 4247
4267 glMatrixMode GL_PROJECTION; 4248 glMatrixMode GL_PROJECTION;

Diff Legend

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