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.373 by root, Sun Jul 15 22:39:30 2007 UTC vs.
Revision 1.395 by root, Sat Jul 21 13:56:00 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
… …
793} 789}
794 790
795sub clear { 791sub clear {
796 my ($self) = @_; 792 my ($self) = @_;
797 793
798 my $children = delete $self->{children}; 794 my $children = $self->{children};
799 $self->{children} = []; 795 $self->{children} = [];
800 796
801 for (@$children) { 797 for (@$children) {
802 delete $_->{parent}; 798 delete $_->{parent};
803 $_->hide; 799 $_->hide;
… …
943} 939}
944 940
945############################################################################# 941#############################################################################
946 942
947package CFPlus::UI::ViewPort; 943package CFPlus::UI::ViewPort;
944
945use List::Util qw(min max);
948 946
949our @ISA = CFPlus::UI::Window::; 947our @ISA = CFPlus::UI::Window::;
950 948
951sub new { 949sub new {
952 my $class = shift; 950 my $class = shift;
… …
961sub size_request { 959sub size_request {
962 my ($self) = @_; 960 my ($self) = @_;
963 961
964 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965 963
966 $w = 10 if $self->{scroll_x}; 964 $w = 1 if $self->{scroll_x};
967 $h = 10 if $self->{scroll_y}; 965 $h = 1 if $self->{scroll_y};
968 966
969 ($w, $h) 967 ($w, $h)
970} 968}
971 969
972sub invoke_size_allocate { 970sub invoke_size_allocate {
… …
984} 982}
985 983
986sub set_offset { 984sub set_offset {
987 my ($self, $x, $y) = @_; 985 my ($self, $x, $y) = @_;
988 986
987 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
988 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
989
990 if ($x != $self->{view_x} or $y != $self->{view_y}) {
989 $self->{view_x} = int $x; 991 $self->{view_x} = $x;
990 $self->{view_y} = int $y; 992 $self->{view_y} = $y;
991 993
994 $self->emit (changed => $x, $y);
992 $self->update; 995 $self->update;
996 }
993} 997}
994 998
995# hmm, this does not work for topleft of $self... but we should not ask for that 999# hmm, this does not work for topleft of $self... but we should not ask for that
996sub coord2local { 1000sub coord2local {
997 my ($self, $x, $y) = @_; 1001 my ($self, $x, $y) = @_;
… …
1012 my ($self, $x, $y) = @_; 1016 my ($self, $x, $y) = @_;
1013 1017
1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1018 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1019 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016 ) { 1020 ) {
1017 $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})
1018 } else { 1022 } else {
1019 $self->CFPlus::UI::Base::find_widget ($x, $y) 1023 $self->CFPlus::UI::Base::find_widget ($x, $y)
1020 } 1024 }
1021} 1025}
1022 1026
… …
1043 my $child = delete $arg{child}; 1047 my $child = delete $arg{child};
1044 1048
1045 my $self; 1049 my $self;
1046 1050
1047 my $hslider = new CFPlus::UI::Slider 1051 my $hslider = new CFPlus::UI::Slider
1052 col => 0,
1053 row => 1,
1048 vertical => 0, 1054 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix 1055 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub { 1056 on_changed => sub {
1051 $self->{hpos} = $_[1]; 1057 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 }, 1059 },
1054 ; 1060 ;
1055 1061
1056 my $vslider = new CFPlus::UI::Slider 1062 my $vslider = new CFPlus::UI::Slider
1063 col => 1,
1064 row => 0,
1057 vertical => 1, 1065 vertical => 1,
1058 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1059 on_changed => sub { 1067 on_changed => sub {
1060 $self->{vpos} = $_[1]; 1068 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1072 row_expand => [1, 0], 1080 row_expand => [1, 0],
1073 %arg, 1081 %arg,
1074 ); 1082 );
1075 1083
1076 $self->{vp} = new CFPlus::UI::ViewPort 1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0,
1086 row => 0,
1077 expand => 1, 1087 expand => 1,
1078 scroll_x => $self->{scroll_x}, 1088 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y}, 1089 scroll_y => $self->{scroll_y},
1090 on_changed => sub {
1091 my ($vp, $x, $y) = @_;
1092
1093 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y);
1095
1096 0
1097 },
1080 ; 1098 ;
1081 1099
1082 $self->SUPER::add (0, 0, $self->{vp}); 1100 $self->SUPER::add ($self->{vp});
1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085 1101
1086 $self->add ($child) if $child; 1102 $self->add ($child) if $child;
1087 1103
1088 $self 1104 $self
1089} 1105}
1090
1091#TODO# update range on size_allocate depending on child
1092 1106
1093sub add { 1107sub add {
1094 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1095 1109
1096 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1097} 1111}
1098 1112
1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider_visible}) {
1123 $self->{hslider_visible} = $visible;
1124 $visible ? $self->SUPER::add ($self->{hslider})
1125 : $self->SUPER::remove ($self->{hslider});
1126 }
1127
1128 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1129 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1130
1131 my $visible = $h1 > $h2;
1132 if ($visible != $self->{vslider_visible}) {
1133 $self->{vslider_visible} = $visible;
1134 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider});
1136 }
1137}
1138
1099sub invoke_mouse_wheel { 1139sub invoke_mouse_wheel {
1100 my ($self, $ev) = @_; 1140 my ($self, $ev) = @_;
1101 1141
1102 return 0 unless $ev->{dy}; # only vertical movements
1103
1104 $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};
1105 1147
1106 1 1148 1
1107} 1149}
1108 1150
1109sub update_slider { 1151sub invoke_button_down {
1110 my ($self) = @_; 1152 my ($self, $ev, $x, $y) = @_;
1111 1153
1112 my $child = ($self->{vp} or return)->child; 1154 if ($ev->{button} == 2) {
1155 $self->grab_focus;
1113 1156
1114 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1115 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1116 #$self->{hslider}->set_visibility ($w1 != $w2); 1159
1160 $self->{motion} = sub {
1161 my ($ev, $x, $y) = @_;
1117 1162
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1164 $self->update;
1120 #$self->{vslider}->set_visibility ($h1 != $h2); 1165 };
1121}
1122 1166
1123sub update { 1167 return 1;
1124 my ($self) = @_; 1168 }
1125 1169
1126 $self->SUPER::update; 1170 0
1127 $self->update_slider; 1171}
1172
1173sub invoke_button_up {
1174 my ($self, $ev, $x, $y) = @_;
1175
1176 if (delete $self->{motion}) {
1177 return 1;
1178 }
1179
1180 0
1181}
1182
1183sub invoke_mouse_motion {
1184 my ($self, $ev, $x, $y) = @_;
1185
1186 if ($self->{motion}) {
1187 $self->{motion}->($ev, $x, $y);
1188 return 1;
1189 }
1190
1191 0
1128} 1192}
1129 1193
1130sub invoke_size_allocate { 1194sub invoke_size_allocate {
1131 my ($self, $w, $h) = @_; 1195 my ($self, $w, $h) = @_;
1132 1196
… …
1288 1352
1289my @border = 1353my @border =
1290 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1354 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1291 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);
1292 1356
1357my @icon =
1358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1359 qw(x1_move.png x1_resize.png);
1360
1293sub new { 1361sub new {
1294 my ($class, %arg) = @_; 1362 my ($class, %arg) = @_;
1295 1363
1296 my $self = $class->SUPER::new ( 1364 my $self = $class->SUPER::new (
1297 bg => [1, 1, 1, 1], 1365 bg => [1, 1, 1, 1],
… …
1465 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1466 1534
1467 my $border = $self->border; 1535 my $border = $self->border;
1468 1536
1469 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1470 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1471 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1472 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1473 $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);
1474 1556
1475 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1476 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1477 1559
1478 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
… …
1499 1581
1500############################################################################# 1582#############################################################################
1501 1583
1502package CFPlus::UI::Table; 1584package CFPlus::UI::Table;
1503 1585
1504our @ISA = CFPlus::UI::Base::; 1586our @ISA = CFPlus::UI::Container::;
1505 1587
1506use List::Util qw(max sum); 1588use List::Util qw(max sum);
1507 1589
1508use CFPlus::OpenGL; 1590use CFPlus::OpenGL;
1509 1591
… …
1515 row_expand => [], 1597 row_expand => [],
1516 @_, 1598 @_,
1517 ) 1599 )
1518} 1600}
1519 1601
1520sub children {
1521 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1522}
1523
1524sub add { 1602sub add {
1603 my ($self, @widgets) = @_;
1604
1605 for my $child (@widgets) {
1606 $child->{rowspan} ||= 1;
1607 $child->{colspan} ||= 1;
1608 }
1609
1610 $self->SUPER::add (@widgets);
1611}
1612
1613sub add_at {
1525 my ($self) = shift; 1614 my $self = shift;
1615
1616 my @widgets;
1526 1617
1527 while (@_) { 1618 while (@_) {
1528 my ($x, $y, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1529 $child->set_parent ($self);
1530 $self->{children}[$y][$x] = $child;
1531 }
1532 1620
1533 $self->{force_realloc} = 1; 1621 $child->{row} = $row;
1534 $self->{force_size_alloc} = 1; 1622 $child->{col} = $col;
1535 $self->realloc;
1536}
1537 1623
1538sub remove { 1624 push @widgets, $child;
1625 }
1626
1627 $self->add (@widgets);
1628}
1629
1630sub get_wh {
1539 my ($self, $child) = @_; 1631 my ($self) = @_;
1540 1632
1541 # TODO: not yet implemented 1633 my (@w, @h);
1542}
1543
1544# TODO: move to container class maybe? send children a signal on removal?
1545sub clear {
1546 my ($self) = @_;
1547 1634
1548 my @children = $self->children; 1635 my @children = $self->children;
1549 delete $self->{children}; 1636
1637 # first pass, columns
1638 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1639 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1640
1641 my $sw = sum @w[$c .. $c + $cs - 1];
1642
1643 if ($w > $sw) {
1644 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1645 }
1550 1646 }
1551 for (@children) {
1552 delete $_->{parent};
1553 $_->hide;
1554 }
1555 1647
1556 $self->realloc; 1648 # second pass, rows
1557} 1649 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1558
1559sub get_wh {
1560 my ($self) = @_;
1561
1562 my (@w, @h);
1563
1564 for my $y (0 .. $#{$self->{children}}) {
1565 my $row = $self->{children}[$y]
1566 or next;
1567
1568 for my $x (0 .. $#$row) {
1569 my $widget = $row->[$x]
1570 or next;
1571 my ($w, $h) = @$widget{qw(req_w req_h)}; 1650 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1572 1651
1573 $w[$x] = max $w[$x], $w; 1652 my $sh = sum @h[$r .. $r + $rs - 1];
1574 $h[$y] = max $h[$y], $h; 1653
1654 if ($h > $sh) {
1655 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1575 } 1656 }
1576 } 1657 }
1577 1658
1578 (\@w, \@h) 1659 (\@w, \@h)
1579} 1660}
… …
1595 my ($ws, $hs) = $self->get_wh; 1676 my ($ws, $hs) = $self->get_wh;
1596 1677
1597 my $req_w = (sum @$ws) || 1; 1678 my $req_w = (sum @$ws) || 1;
1598 my $req_h = (sum @$hs) || 1; 1679 my $req_h = (sum @$hs) || 1;
1599 1680
1600 # TODO: nicer code 1681 # now linearly scale the rows/columns to the allocated size
1601 my @col_expand = @{$self->{col_expand}}; 1682 my @col_expand = @{$self->{col_expand}};
1602 @col_expand = (1) x @$ws unless @col_expand; 1683 @col_expand = (1) x @$ws unless @col_expand;
1603 my $col_expand = (sum @col_expand) || 1; 1684 my $col_expand = (sum @col_expand) || 1;
1604 1685
1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1686 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1612 1693
1613 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1694 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1614 1695
1615 CFPlus::UI::harmonize $hs; 1696 CFPlus::UI::harmonize $hs;
1616 1697
1617 my $y; 1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1618 1700
1619 for my $r (0 .. $#{$self->{children}}) { 1701 for my $widget ($self->children) {
1620 my $row = $self->{children}[$r] 1702 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1621 or next;
1622 1703
1623 my $x = 0; 1704 $widget->configure (
1624 my $row_h = $hs->[$r]; 1705 $x[$c], $y[$r],
1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1625 1707 );
1626 for my $c (0 .. $#$row) { 1708 }
1627 my $col_w = $ws->[$c];
1628 1709
1629 if (my $widget = $row->[$c]) { 1710 1
1630 $widget->configure ($x, $y, $col_w, $row_h); 1711}
1631 }
1632 1712
1633 $x += $col_w; 1713#############################################################################
1714
1715package CFPlus::UI::Fixed;
1716
1717use List::Util qw(min max);
1718
1719our @ISA = CFPlus::UI::Container::;
1720
1721sub add {
1722 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1723
1724 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1725 $self->SUPER::add ($child);
1726}
1727
1728sub _scale($$$) {
1729 my ($mode, $val, $max) = @_;
1730
1731 $mode eq "abs" ? $val
1732 : $mode eq "rel" ? $val * $max
1733 : 0
1734}
1735
1736sub size_request {
1737 my ($self) = @_;
1738
1739 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1740
1741 # determine overall size by querying abs widgets
1742 for my $child ($self->visible_children) {
1743 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1744
1745 if ($pos eq "abs") {
1746 $w = _scale $size, $w, $child->{req_w};
1747 $h = _scale $size, $h, $child->{req_h};
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1634 } 1751 }
1752 }
1635 1753
1636 $y += $row_h; 1754 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1;
1756
1757 # now layout remaining widgets
1758 for my $child ($self->visible_children) {
1759 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1760
1761 if ($pos ne "abs") {
1762 $x = _scale $pos, $x, $W;
1763 $y = _scale $pos, $x, $H;
1764 $w = _scale $size, $w, $child->{req_w};
1765 $h = _scale $size, $h, $child->{req_h};
1766
1767 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1768 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1769 }
1770 }
1771
1772 my $W = $x2 - $x1;
1773 my $H = $y2 - $y1;
1774
1775 ($W, $H)
1776}
1777
1778sub invoke_size_allocate {
1779 my ($self, $W, $H) = @_;
1780
1781 for my $child ($self->visible_children) {
1782 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1783
1784 $x = _scale $pos, $x, $W;
1785 $y = _scale $pos, $x, $H;
1786 $w = _scale $size, $w, $child->{req_w};
1787 $h = _scale $size, $h, $child->{req_h};
1788
1789 $child->configure ($x, $y, $w, $h);
1637 } 1790 }
1638 1791
1639 1 1792 1
1640}
1641
1642sub find_widget {
1643 my ($self, $x, $y) = @_;
1644
1645 $x -= $self->{x};
1646 $y -= $self->{y};
1647
1648 my $res;
1649
1650 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1651 $res = $_->find_widget ($x, $y)
1652 and return $res;
1653 }
1654
1655 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1656}
1657
1658sub _draw {
1659 my ($self) = @_;
1660
1661 for (grep $_, @{$self->{children}}) {
1662 $_->draw for grep $_, @$_;
1663 }
1664} 1793}
1665 1794
1666############################################################################# 1795#############################################################################
1667 1796
1668package CFPlus::UI::Box; 1797package CFPlus::UI::Box;
… …
2226 2355
2227use CFPlus::OpenGL; 2356use CFPlus::OpenGL;
2228 2357
2229my @tex = 2358my @tex =
2230 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2359 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2231 qw(b1_button_active.png); 2360 qw(b1_button_inactive.png b1_button_active.png);
2232 2361
2233sub new { 2362sub new {
2234 my $class = shift; 2363 my $class = shift;
2235 2364
2236 $class->SUPER::new ( 2365 $class->SUPER::new (
2237 padding_x => 4, 2366 padding_x => 4,
2238 padding_y => 4, 2367 padding_y => 4,
2239 fg => [1, 1, 1], 2368 fg => [1.0, 1.0, 1.0],
2240 active_fg => [0, 0, 1], 2369 active_fg => [0.8, 0.8, 0.8],
2241 can_hover => 1, 2370 can_hover => 1,
2242 align => 0, 2371 align => 0,
2243 valign => 0, 2372 valign => 0,
2244 can_events => 1, 2373 can_events => 1,
2245 @_ 2374 @_
… …
2263 2392
2264 glEnable GL_TEXTURE_2D; 2393 glEnable GL_TEXTURE_2D;
2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2266 glColor 0, 0, 0, 1; 2395 glColor 0, 0, 0, 1;
2267 2396
2397 my $tex = $tex[$GRAB == $self];
2268 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2398 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2269 2399
2270 glDisable GL_TEXTURE_2D; 2400 glDisable GL_TEXTURE_2D;
2271 2401
2272 $self->SUPER::_draw; 2402 $self->SUPER::_draw;
2273} 2403}
… …
3338 ); 3468 );
3339 3469
3340 if ($self->{anim} && $self->{animspeed}) { 3470 if ($self->{anim} && $self->{animspeed}) {
3341 CFPlus::weaken (my $widget = $self); 3471 CFPlus::weaken (my $widget = $self);
3342 3472
3473 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3474 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3343 $self->{timer} = Event->timer ( 3475 $self->{timer} = Event->timer (
3344 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3345 hard => 1, 3476 parked => 1,
3346 interval => $self->{animspeed},
3347 cb => sub { 3477 cb => sub {
3348 return unless $::CONN; 3478 return unless $::CONN && $widget;
3349 3479
3350 ++$widget->{frame}; 3480 ++$widget->{frame};
3351 $self->update_face; 3481 $widget->update_face;
3352 $self->update; 3482 $widget->update;
3483
3484 $widget->update_timer;
3353 }, 3485 },
3354 ); 3486 );
3355 3487
3356 $self->update_face; 3488 $self->update_face;
3489 $self->update_timer;
3357 } 3490 }
3358 3491
3359 $self 3492 $self
3493}
3494
3495sub update_timer {
3496 my ($self) = @_;
3497
3498 return unless $self->{timer};
3499
3500 if ($self->{visible}) {
3501 $self->{timer}->at (
3502 $self->{anim_start}
3503 + $self->{animspeed}
3504 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3505 );
3506 $self->{timer}->start;
3507 } else {
3508 $self->{timer}->stop;
3509 }
3360} 3510}
3361 3511
3362sub update_face { 3512sub update_face {
3363 my ($self) = @_; 3513 my ($self) = @_;
3364 3514
… …
3396 return unless $self->{visible}; 3546 return unless $self->{visible};
3397 3547
3398 $self->SUPER::update; 3548 $self->SUPER::update;
3399} 3549}
3400 3550
3551sub invoke_visibility_change {
3552 my ($self) = @_;
3553
3554 $self->update_timer;
3555
3556 0
3557}
3558
3401sub _draw { 3559sub _draw {
3402 my ($self) = @_; 3560 my ($self) = @_;
3403 3561
3404 return unless $::CONN; 3562 return unless $::CONN;
3405 3563
… …
3420} 3578}
3421 3579
3422sub destroy { 3580sub destroy {
3423 my ($self) = @_; 3581 my ($self) = @_;
3424 3582
3425 $self->{timer}->cancel 3583 (delete $self->{timer})->cancel
3426 if $self->{timer}; 3584 if $self->{timer};
3427 3585
3428 $self->SUPER::destroy; 3586 $self->SUPER::destroy;
3429} 3587}
3430 3588
… …
4074 while ($self->{post_alloc_hook}) { 4232 while ($self->{post_alloc_hook}) {
4075 $_->() 4233 $_->()
4076 for values %{delete $self->{post_alloc_hook}}; 4234 for values %{delete $self->{post_alloc_hook}};
4077 } 4235 }
4078 4236
4079
4080 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4237 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4081 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4238 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4082 glClear GL_COLOR_BUFFER_BIT; 4239 glClear GL_COLOR_BUFFER_BIT;
4083 4240
4084 glMatrixMode GL_PROJECTION; 4241 glMatrixMode GL_PROJECTION;

Diff Legend

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