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.371 by root, Sun Jul 15 22:07:48 2007 UTC vs.
Revision 1.396 by root, Sat Jul 21 14:00:02 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});
1062 }, 1070 },
1063 ; 1071 ;
1064 1072
1065 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1066 vp => (new CFPlus::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1067 can_events => 1, 1076 can_events => 1,
1068 hslider => $hslider, 1077 hslider => $hslider,
1069 vslider => $vslider, 1078 vslider => $vslider,
1070 col_expand => [1, 0], 1079 col_expand => [1, 0],
1071 row_expand => [1, 0], 1080 row_expand => [1, 0],
1072 %arg, 1081 %arg,
1073 ); 1082 );
1074 1083
1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0,
1086 row => 0,
1087 expand => 1,
1088 scroll_x => $self->{scroll_x},
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 },
1098 ;
1099
1075 $self->SUPER::add (0, 0, $self->{vp}); 1100 $self->SUPER::add ($self->{vp});
1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078 1101
1079 $self->add ($child) if $child; 1102 $self->add ($child) if $child;
1080 1103
1081 $self 1104 $self
1082} 1105}
1083
1084#TODO# update range on size_allocate depending on child
1085 1106
1086sub add { 1107sub add {
1087 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1088 1109
1089 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1090} 1111}
1091 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
1139
1140sub start_dragging {
1141 my ($self, $ev) = @_;
1142
1143 $self->grab_focus;
1144
1145 my $ox = $self->{vp}{view_x};
1146 my $oy = $self->{vp}{view_y};
1147
1148 $self->{motion} = sub {
1149 my ($ev, $x, $y) = @_;
1150
1151 $ox -= $ev->{xrel};
1152 $oy -= $ev->{yrel};
1153
1154 $self->{vp}->set_offset ($ox, $oy);
1155 };
1156}
1157
1092sub invoke_mouse_wheel { 1158sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_; 1159 my ($self, $ev) = @_;
1094 1160
1095 return 0 unless $ev->{dy}; # only vertical movements
1096
1097 $self->{vslider}->emit (mouse_wheel => $ev); 1161 $self->{vslider}->emit (mouse_wheel => $ev)
1162 if $ev->{dy};
1163
1164 $self->{hslider}->emit (mouse_wheel => $ev)
1165 if $ev->{dx};
1098 1166
1099 1 1167 1
1100} 1168}
1101 1169
1102sub update_slider { 1170sub invoke_button_down {
1103 my ($self) = @_; 1171 my ($self, $ev, $x, $y) = @_;
1104 1172
1105 my $child = ($self->{vp} or return)->child; 1173 if ($ev->{button} == 2) {
1174 $self->start_dragging ($ev);
1106 1175
1107 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1176 return 1;
1108 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1177 }
1109 #$self->{hslider}->set_visibility ($w1 != $w2);
1110 1178
1111 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1179 0
1112 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1113 #$self->{vslider}->set_visibility ($h1 != $h2);
1114} 1180}
1115 1181
1116sub update { 1182sub invoke_button_up {
1117 my ($self) = @_; 1183 my ($self, $ev, $x, $y) = @_;
1118 1184
1119 $self->SUPER::update; 1185 if (delete $self->{motion}) {
1120 $self->update_slider; 1186 return 1;
1187 }
1188
1189 0
1190}
1191
1192sub invoke_mouse_motion {
1193 my ($self, $ev, $x, $y) = @_;
1194
1195 if ($self->{motion}) {
1196 $self->{motion}->($ev, $x, $y);
1197 return 1;
1198 }
1199
1200 0
1121} 1201}
1122 1202
1123sub invoke_size_allocate { 1203sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1204 my ($self, $w, $h) = @_;
1125 1205
… …
1281 1361
1282my @border = 1362my @border =
1283 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1284 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1364 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1285 1365
1366my @icon =
1367 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1368 qw(x1_move.png x1_resize.png);
1369
1286sub new { 1370sub new {
1287 my ($class, %arg) = @_; 1371 my ($class, %arg) = @_;
1288 1372
1289 my $self = $class->SUPER::new ( 1373 my $self = $class->SUPER::new (
1290 bg => [1, 1, 1, 1], 1374 bg => [1, 1, 1, 1],
… …
1458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1542 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1459 1543
1460 my $border = $self->border; 1544 my $border = $self->border;
1461 1545
1462 glColor @{ $self->{border_bg} }; 1546 glColor @{ $self->{border_bg} };
1463 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1547 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1464 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1548 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1465 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1549 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1466 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1550 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1551
1552 # move
1553 my $w2 = ($w - $border) * .5;
1554 my $h2 = ($h - $border) * .5;
1555 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1556 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1557 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1558
1559 # resize
1560 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1561 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1562 unless $self->{has_close_button};
1563 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1564 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1467 1565
1468 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1566 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1469 glColor @{ $self->{bg} }; 1567 glColor @{ $self->{bg} };
1470 1568
1471 # TODO: repeat texture not scale 1569 # TODO: repeat texture not scale
… …
1492 1590
1493############################################################################# 1591#############################################################################
1494 1592
1495package CFPlus::UI::Table; 1593package CFPlus::UI::Table;
1496 1594
1497our @ISA = CFPlus::UI::Base::; 1595our @ISA = CFPlus::UI::Container::;
1498 1596
1499use List::Util qw(max sum); 1597use List::Util qw(max sum);
1500 1598
1501use CFPlus::OpenGL; 1599use CFPlus::OpenGL;
1502 1600
… …
1508 row_expand => [], 1606 row_expand => [],
1509 @_, 1607 @_,
1510 ) 1608 )
1511} 1609}
1512 1610
1513sub children {
1514 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1515}
1516
1517sub add { 1611sub add {
1612 my ($self, @widgets) = @_;
1613
1614 for my $child (@widgets) {
1615 $child->{rowspan} ||= 1;
1616 $child->{colspan} ||= 1;
1617 }
1618
1619 $self->SUPER::add (@widgets);
1620}
1621
1622sub add_at {
1518 my ($self) = shift; 1623 my $self = shift;
1624
1625 my @widgets;
1519 1626
1520 while (@_) { 1627 while (@_) {
1521 my ($x, $y, $child) = splice @_, 0, 3, (); 1628 my ($col, $row, $child) = splice @_, 0, 3, ();
1522 $child->set_parent ($self);
1523 $self->{children}[$y][$x] = $child;
1524 }
1525 1629
1526 $self->{force_realloc} = 1; 1630 $child->{row} = $row;
1527 $self->{force_size_alloc} = 1; 1631 $child->{col} = $col;
1528 $self->realloc;
1529}
1530 1632
1531sub remove { 1633 push @widgets, $child;
1634 }
1635
1636 $self->add (@widgets);
1637}
1638
1639sub get_wh {
1532 my ($self, $child) = @_; 1640 my ($self) = @_;
1533 1641
1534 # TODO: not yet implemented 1642 my (@w, @h);
1535}
1536
1537# TODO: move to container class maybe? send children a signal on removal?
1538sub clear {
1539 my ($self) = @_;
1540 1643
1541 my @children = $self->children; 1644 my @children = $self->children;
1542 delete $self->{children}; 1645
1646 # first pass, columns
1647 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1648 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1649
1650 my $sw = sum @w[$c .. $c + $cs - 1];
1651
1652 if ($w > $sw) {
1653 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1654 }
1543 1655 }
1544 for (@children) {
1545 delete $_->{parent};
1546 $_->hide;
1547 }
1548 1656
1549 $self->realloc; 1657 # second pass, rows
1550} 1658 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1551
1552sub get_wh {
1553 my ($self) = @_;
1554
1555 my (@w, @h);
1556
1557 for my $y (0 .. $#{$self->{children}}) {
1558 my $row = $self->{children}[$y]
1559 or next;
1560
1561 for my $x (0 .. $#$row) {
1562 my $widget = $row->[$x]
1563 or next;
1564 my ($w, $h) = @$widget{qw(req_w req_h)}; 1659 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1565 1660
1566 $w[$x] = max $w[$x], $w; 1661 my $sh = sum @h[$r .. $r + $rs - 1];
1567 $h[$y] = max $h[$y], $h; 1662
1663 if ($h > $sh) {
1664 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1568 } 1665 }
1569 } 1666 }
1570 1667
1571 (\@w, \@h) 1668 (\@w, \@h)
1572} 1669}
… …
1588 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1589 1686
1590 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1591 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1592 1689
1593 # TODO: nicer code 1690 # now linearly scale the rows/columns to the allocated size
1594 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1595 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1596 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1597 1694
1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1605 1702
1606 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607 1704
1608 CFPlus::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1609 1706
1610 my $y; 1707 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1708 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1611 1709
1612 for my $r (0 .. $#{$self->{children}}) { 1710 for my $widget ($self->children) {
1613 my $row = $self->{children}[$r] 1711 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1614 or next;
1615 1712
1616 my $x = 0; 1713 $widget->configure (
1617 my $row_h = $hs->[$r]; 1714 $x[$c], $y[$r],
1715 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1618 1716 );
1619 for my $c (0 .. $#$row) { 1717 }
1620 my $col_w = $ws->[$c];
1621 1718
1622 if (my $widget = $row->[$c]) { 1719 1
1623 $widget->configure ($x, $y, $col_w, $row_h); 1720}
1624 }
1625 1721
1626 $x += $col_w; 1722#############################################################################
1723
1724package CFPlus::UI::Fixed;
1725
1726use List::Util qw(min max);
1727
1728our @ISA = CFPlus::UI::Container::;
1729
1730sub add {
1731 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1732
1733 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1734 $self->SUPER::add ($child);
1735}
1736
1737sub _scale($$$) {
1738 my ($mode, $val, $max) = @_;
1739
1740 $mode eq "abs" ? $val
1741 : $mode eq "rel" ? $val * $max
1742 : 0
1743}
1744
1745sub size_request {
1746 my ($self) = @_;
1747
1748 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1749
1750 # determine overall size by querying abs widgets
1751 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1753
1754 if ($pos eq "abs") {
1755 $w = _scale $size, $w, $child->{req_w};
1756 $h = _scale $size, $h, $child->{req_h};
1757
1758 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1759 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1627 } 1760 }
1761 }
1628 1762
1629 $y += $row_h; 1763 my $W = $x2 - $x1;
1764 my $H = $y2 - $y1;
1765
1766 # now layout remaining widgets
1767 for my $child ($self->visible_children) {
1768 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1769
1770 if ($pos ne "abs") {
1771 $x = _scale $pos, $x, $W;
1772 $y = _scale $pos, $x, $H;
1773 $w = _scale $size, $w, $child->{req_w};
1774 $h = _scale $size, $h, $child->{req_h};
1775
1776 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1777 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1778 }
1779 }
1780
1781 my $W = $x2 - $x1;
1782 my $H = $y2 - $y1;
1783
1784 ($W, $H)
1785}
1786
1787sub invoke_size_allocate {
1788 my ($self, $W, $H) = @_;
1789
1790 for my $child ($self->visible_children) {
1791 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1792
1793 $x = _scale $pos, $x, $W;
1794 $y = _scale $pos, $x, $H;
1795 $w = _scale $size, $w, $child->{req_w};
1796 $h = _scale $size, $h, $child->{req_h};
1797
1798 $child->configure ($x, $y, $w, $h);
1630 } 1799 }
1631 1800
1632 1 1801 1
1633}
1634
1635sub find_widget {
1636 my ($self, $x, $y) = @_;
1637
1638 $x -= $self->{x};
1639 $y -= $self->{y};
1640
1641 my $res;
1642
1643 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1644 $res = $_->find_widget ($x, $y)
1645 and return $res;
1646 }
1647
1648 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1649}
1650
1651sub _draw {
1652 my ($self) = @_;
1653
1654 for (grep $_, @{$self->{children}}) {
1655 $_->draw for grep $_, @$_;
1656 }
1657} 1802}
1658 1803
1659############################################################################# 1804#############################################################################
1660 1805
1661package CFPlus::UI::Box; 1806package CFPlus::UI::Box;
… …
2219 2364
2220use CFPlus::OpenGL; 2365use CFPlus::OpenGL;
2221 2366
2222my @tex = 2367my @tex =
2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2368 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2224 qw(b1_button_active.png); 2369 qw(b1_button_inactive.png b1_button_active.png);
2225 2370
2226sub new { 2371sub new {
2227 my $class = shift; 2372 my $class = shift;
2228 2373
2229 $class->SUPER::new ( 2374 $class->SUPER::new (
2230 padding_x => 4, 2375 padding_x => 4,
2231 padding_y => 4, 2376 padding_y => 4,
2232 fg => [1, 1, 1], 2377 fg => [1.0, 1.0, 1.0],
2233 active_fg => [0, 0, 1], 2378 active_fg => [0.8, 0.8, 0.8],
2234 can_hover => 1, 2379 can_hover => 1,
2235 align => 0, 2380 align => 0,
2236 valign => 0, 2381 valign => 0,
2237 can_events => 1, 2382 can_events => 1,
2238 @_ 2383 @_
… …
2256 2401
2257 glEnable GL_TEXTURE_2D; 2402 glEnable GL_TEXTURE_2D;
2258 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2403 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2259 glColor 0, 0, 0, 1; 2404 glColor 0, 0, 0, 1;
2260 2405
2406 my $tex = $tex[$GRAB == $self];
2261 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2407 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2262 2408
2263 glDisable GL_TEXTURE_2D; 2409 glDisable GL_TEXTURE_2D;
2264 2410
2265 $self->SUPER::_draw; 2411 $self->SUPER::_draw;
2266} 2412}
… …
3321 3467
3322sub new { 3468sub new {
3323 my $class = shift; 3469 my $class = shift;
3324 3470
3325 my $self = $class->SUPER::new ( 3471 my $self = $class->SUPER::new (
3472 size_w => 32,
3473 size_h => 8,
3326 aspect => 1, 3474 aspect => 1,
3327 can_events => 0, 3475 can_events => 0,
3328 @_, 3476 @_,
3329 ); 3477 );
3330 3478
3331 if ($self->{anim} && $self->{animspeed}) { 3479 if ($self->{anim} && $self->{animspeed}) {
3332 CFPlus::weaken (my $widget = $self); 3480 CFPlus::weaken (my $widget = $self);
3333 3481
3482 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3483 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3334 $self->{timer} = Event->timer ( 3484 $self->{timer} = Event->timer (
3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3336 hard => 1, 3485 parked => 1,
3337 interval => $self->{animspeed},
3338 cb => sub { 3486 cb => sub {
3339 delete $self->{wait_face}; 3487 return unless $::CONN && $widget;
3488
3340 ++$widget->{frame}; 3489 ++$widget->{frame};
3490 $widget->update_face;
3341 $widget->update; 3491 $widget->update;
3492
3493 $widget->update_timer;
3342 }, 3494 },
3343 ); 3495 );
3496
3497 $self->update_face;
3498 $self->update_timer;
3344 } 3499 }
3345 3500
3346 $self 3501 $self
3347} 3502}
3348 3503
3504sub update_timer {
3505 my ($self) = @_;
3506
3507 return unless $self->{timer};
3508
3509 if ($self->{visible}) {
3510 $self->{timer}->at (
3511 $self->{anim_start}
3512 + $self->{animspeed}
3513 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3514 );
3515 $self->{timer}->start;
3516 } else {
3517 $self->{timer}->stop;
3518 }
3519}
3520
3521sub update_face {
3522 my ($self) = @_;
3523
3524 return unless $::CONN;
3525
3526 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3527 if ($anim && @$anim) {
3528 delete $self->{wait_face};
3529 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3530 }
3531 }
3532}
3533
3349sub size_request { 3534sub size_request {
3350 (32, 8) 3535 my ($self) = @_;
3536
3537 if ($::CONN) {
3538 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3539 if (my $tex = $::CONN->{texture}[$faceid]) {
3540 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3541 } else {
3542 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3543 $self->realloc;
3544 });
3545 }
3546 }
3547 }
3548
3549 ($self->{size_w} || 8, $self->{size_h} || 8)
3351} 3550}
3352 3551
3353sub update { 3552sub update {
3354 my ($self) = @_; 3553 my ($self) = @_;
3355 3554
3356 return unless $self->{visible}; 3555 return unless $self->{visible};
3357 3556
3358 $self->SUPER::update; 3557 $self->SUPER::update;
3359} 3558}
3360 3559
3560sub invoke_visibility_change {
3561 my ($self) = @_;
3562
3563 $self->update_timer;
3564
3565 0
3566}
3567
3361sub _draw { 3568sub _draw {
3362 my ($self) = @_; 3569 my ($self) = @_;
3363 3570
3364 return unless $::CONN; 3571 return unless $::CONN;
3365 3572
3366 $self->SUPER::_draw; 3573 $self->SUPER::_draw;
3367 3574
3368 my $face;
3369
3370 if ($self->{frame}) {
3371 my $anim = $::CONN->{anim}[$self->{anim}];
3372
3373 $face = $anim->[ $self->{frame} % @$anim ]
3374 if $anim && @$anim;
3375 }
3376
3377 my $faceid = $::CONN->{faceid}[$face || $self->{face}] 3575 my $faceid = $::CONN->{faceid}[$self->{face}]
3378 or return; 3576 or return;
3379 3577
3380 my $tex = $::CONN->{texture}[$faceid]; 3578 my $tex = $::CONN->{texture}[$faceid];
3381 3579
3382 if ($tex) { 3580 if ($tex) {
3383 glEnable GL_TEXTURE_2D; 3581 glEnable GL_TEXTURE_2D;
3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3582 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3385 glColor 0, 0, 0, 1; 3583 glColor 0, 0, 0, 1;
3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3584 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3387 glDisable GL_TEXTURE_2D; 3585 glDisable GL_TEXTURE_2D;
3388 } else {
3389 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390 $self->update;
3391 });
3392 } 3586 }
3393} 3587}
3394 3588
3395sub destroy { 3589sub destroy {
3396 my ($self) = @_; 3590 my ($self) = @_;
3397 3591
3398 $self->{timer}->cancel 3592 (delete $self->{timer})->cancel
3399 if $self->{timer}; 3593 if $self->{timer};
3400 3594
3401 $self->SUPER::destroy; 3595 $self->SUPER::destroy;
3402} 3596}
3403 3597
… …
4047 while ($self->{post_alloc_hook}) { 4241 while ($self->{post_alloc_hook}) {
4048 $_->() 4242 $_->()
4049 for values %{delete $self->{post_alloc_hook}}; 4243 for values %{delete $self->{post_alloc_hook}};
4050 } 4244 }
4051 4245
4052
4053 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4246 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4054 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4247 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4055 glClear GL_COLOR_BUFFER_BIT; 4248 glClear GL_COLOR_BUFFER_BIT;
4056 4249
4057 glMatrixMode GL_PROJECTION; 4250 glMatrixMode GL_PROJECTION;

Diff Legend

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