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.369 by root, Sun Jul 15 20:25:26 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});
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
1092sub invoke_mouse_wheel { 1139sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_; 1140 my ($self, $ev) = @_;
1094 1141
1095 return 0 unless $ev->{dy}; # only vertical movements
1096
1097 $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};
1098 1147
1099 1 1148 1
1100} 1149}
1101 1150
1102sub update_slider { 1151sub invoke_button_down {
1103 my ($self) = @_; 1152 my ($self, $ev, $x, $y) = @_;
1104 1153
1105 my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w}); 1154 if ($ev->{button} == 2) {
1106 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1155 $self->grab_focus;
1107 #$self->{hslider}->set_visibility ($w1 != $w2);
1108 1156
1109 my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h}); 1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1110 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1111 #$self->{vslider}->set_visibility ($h1 != $h2); 1159
1112} 1160 $self->{motion} = sub {
1161 my ($ev, $x, $y) = @_;
1113 1162
1114sub update { 1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1115 my ($self) = @_; 1164 $self->update;
1165 };
1116 1166
1117 $self->SUPER::update; 1167 return 1;
1168 }
1118 1169
1119 $self->update_slider; 1170 0
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
1120} 1192}
1121 1193
1122sub invoke_size_allocate { 1194sub invoke_size_allocate {
1123 my ($self, $w, $h) = @_; 1195 my ($self, $w, $h) = @_;
1124 1196
1125 $self->update_slider; 1197 $self->update_slider;
1126
1127 $self->SUPER::invoke_size_allocate ($w, $h) 1198 $self->SUPER::invoke_size_allocate ($w, $h)
1128} 1199}
1129 1200
1130############################################################################# 1201#############################################################################
1131 1202
… …
1281 1352
1282my @border = 1353my @border =
1283 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1354 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); 1355 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1285 1356
1357my @icon =
1358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1359 qw(x1_move.png x1_resize.png);
1360
1286sub new { 1361sub new {
1287 my ($class, %arg) = @_; 1362 my ($class, %arg) = @_;
1288 1363
1289 my $self = $class->SUPER::new ( 1364 my $self = $class->SUPER::new (
1290 bg => [1, 1, 1, 1], 1365 bg => [1, 1, 1, 1],
… …
1458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1459 1534
1460 my $border = $self->border; 1535 my $border = $self->border;
1461 1536
1462 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1463 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1464 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1465 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1466 $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);
1467 1556
1468 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1469 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1470 1559
1471 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
… …
1492 1581
1493############################################################################# 1582#############################################################################
1494 1583
1495package CFPlus::UI::Table; 1584package CFPlus::UI::Table;
1496 1585
1497our @ISA = CFPlus::UI::Base::; 1586our @ISA = CFPlus::UI::Container::;
1498 1587
1499use List::Util qw(max sum); 1588use List::Util qw(max sum);
1500 1589
1501use CFPlus::OpenGL; 1590use CFPlus::OpenGL;
1502 1591
… …
1508 row_expand => [], 1597 row_expand => [],
1509 @_, 1598 @_,
1510 ) 1599 )
1511} 1600}
1512 1601
1513sub children {
1514 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1515}
1516
1517sub 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 {
1518 my ($self) = shift; 1614 my $self = shift;
1615
1616 my @widgets;
1519 1617
1520 while (@_) { 1618 while (@_) {
1521 my ($x, $y, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1522 $child->set_parent ($self);
1523 $self->{children}[$y][$x] = $child;
1524 }
1525 1620
1526 $self->{force_realloc} = 1; 1621 $child->{row} = $row;
1527 $self->{force_size_alloc} = 1; 1622 $child->{col} = $col;
1528 $self->realloc;
1529}
1530 1623
1531sub remove { 1624 push @widgets, $child;
1625 }
1626
1627 $self->add (@widgets);
1628}
1629
1630sub get_wh {
1532 my ($self, $child) = @_; 1631 my ($self) = @_;
1533 1632
1534 # TODO: not yet implemented 1633 my (@w, @h);
1535}
1536
1537# TODO: move to container class maybe? send children a signal on removal?
1538sub clear {
1539 my ($self) = @_;
1540 1634
1541 my @children = $self->children; 1635 my @children = $self->children;
1542 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 }
1543 1646 }
1544 for (@children) {
1545 delete $_->{parent};
1546 $_->hide;
1547 }
1548 1647
1549 $self->realloc; 1648 # second pass, rows
1550} 1649 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)}; 1650 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1565 1651
1566 $w[$x] = max $w[$x], $w; 1652 my $sh = sum @h[$r .. $r + $rs - 1];
1567 $h[$y] = max $h[$y], $h; 1653
1654 if ($h > $sh) {
1655 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1568 } 1656 }
1569 } 1657 }
1570 1658
1571 (\@w, \@h) 1659 (\@w, \@h)
1572} 1660}
… …
1588 my ($ws, $hs) = $self->get_wh; 1676 my ($ws, $hs) = $self->get_wh;
1589 1677
1590 my $req_w = (sum @$ws) || 1; 1678 my $req_w = (sum @$ws) || 1;
1591 my $req_h = (sum @$hs) || 1; 1679 my $req_h = (sum @$hs) || 1;
1592 1680
1593 # TODO: nicer code 1681 # now linearly scale the rows/columns to the allocated size
1594 my @col_expand = @{$self->{col_expand}}; 1682 my @col_expand = @{$self->{col_expand}};
1595 @col_expand = (1) x @$ws unless @col_expand; 1683 @col_expand = (1) x @$ws unless @col_expand;
1596 my $col_expand = (sum @col_expand) || 1; 1684 my $col_expand = (sum @col_expand) || 1;
1597 1685
1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1686 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1605 1693
1606 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1694 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607 1695
1608 CFPlus::UI::harmonize $hs; 1696 CFPlus::UI::harmonize $hs;
1609 1697
1610 my $y; 1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1611 1700
1612 for my $r (0 .. $#{$self->{children}}) { 1701 for my $widget ($self->children) {
1613 my $row = $self->{children}[$r] 1702 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1614 or next;
1615 1703
1616 my $x = 0; 1704 $widget->configure (
1617 my $row_h = $hs->[$r]; 1705 $x[$c], $y[$r],
1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1618 1707 );
1619 for my $c (0 .. $#$row) { 1708 }
1620 my $col_w = $ws->[$c];
1621 1709
1622 if (my $widget = $row->[$c]) { 1710 1
1623 $widget->configure ($x, $y, $col_w, $row_h); 1711}
1624 }
1625 1712
1626 $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;
1627 } 1751 }
1752 }
1628 1753
1629 $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);
1630 } 1790 }
1631 1791
1632 1 1792 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} 1793}
1658 1794
1659############################################################################# 1795#############################################################################
1660 1796
1661package CFPlus::UI::Box; 1797package CFPlus::UI::Box;
… …
2219 2355
2220use CFPlus::OpenGL; 2356use CFPlus::OpenGL;
2221 2357
2222my @tex = 2358my @tex =
2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2359 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2224 qw(b1_button_active.png); 2360 qw(b1_button_inactive.png b1_button_active.png);
2225 2361
2226sub new { 2362sub new {
2227 my $class = shift; 2363 my $class = shift;
2228 2364
2229 $class->SUPER::new ( 2365 $class->SUPER::new (
2230 padding_x => 4, 2366 padding_x => 4,
2231 padding_y => 4, 2367 padding_y => 4,
2232 fg => [1, 1, 1], 2368 fg => [1.0, 1.0, 1.0],
2233 active_fg => [0, 0, 1], 2369 active_fg => [0.8, 0.8, 0.8],
2234 can_hover => 1, 2370 can_hover => 1,
2235 align => 0, 2371 align => 0,
2236 valign => 0, 2372 valign => 0,
2237 can_events => 1, 2373 can_events => 1,
2238 @_ 2374 @_
… …
2256 2392
2257 glEnable GL_TEXTURE_2D; 2393 glEnable GL_TEXTURE_2D;
2258 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2259 glColor 0, 0, 0, 1; 2395 glColor 0, 0, 0, 1;
2260 2396
2397 my $tex = $tex[$GRAB == $self];
2261 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2398 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2262 2399
2263 glDisable GL_TEXTURE_2D; 2400 glDisable GL_TEXTURE_2D;
2264 2401
2265 $self->SUPER::_draw; 2402 $self->SUPER::_draw;
2266} 2403}
… …
3321 3458
3322sub new { 3459sub new {
3323 my $class = shift; 3460 my $class = shift;
3324 3461
3325 my $self = $class->SUPER::new ( 3462 my $self = $class->SUPER::new (
3463 size_w => 32,
3464 size_h => 8,
3326 aspect => 1, 3465 aspect => 1,
3327 can_events => 0, 3466 can_events => 0,
3328 @_, 3467 @_,
3329 ); 3468 );
3330 3469
3331 if ($self->{anim} && $self->{animspeed}) { 3470 if ($self->{anim} && $self->{animspeed}) {
3332 CFPlus::weaken (my $widget = $self); 3471 CFPlus::weaken (my $widget = $self);
3333 3472
3473 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3474 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3334 $self->{timer} = Event->timer ( 3475 $self->{timer} = Event->timer (
3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3336 hard => 1, 3476 parked => 1,
3337 interval => $self->{animspeed},
3338 cb => sub { 3477 cb => sub {
3478 return unless $::CONN && $widget;
3479
3339 ++$widget->{frame}; 3480 ++$widget->{frame};
3481 $widget->update_face;
3340 $widget->update; 3482 $widget->update;
3483
3484 $widget->update_timer;
3341 }, 3485 },
3342 ); 3486 );
3487
3488 $self->update_face;
3489 $self->update_timer;
3343 } 3490 }
3344 3491
3345 $self 3492 $self
3346} 3493}
3347 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 }
3510}
3511
3512sub update_face {
3513 my ($self) = @_;
3514
3515 return unless $::CONN;
3516
3517 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3518 if ($anim && @$anim) {
3519 delete $self->{wait_face};
3520 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3521 }
3522 }
3523}
3524
3348sub size_request { 3525sub size_request {
3349 (32, 8) 3526 my ($self) = @_;
3527
3528 if ($::CONN) {
3529 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3530 if (my $tex = $::CONN->{texture}[$faceid]) {
3531 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3532 } else {
3533 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3534 $self->realloc;
3535 });
3536 }
3537 }
3538 }
3539
3540 ($self->{size_w} || 8, $self->{size_h} || 8)
3350} 3541}
3351 3542
3352sub update { 3543sub update {
3353 my ($self) = @_; 3544 my ($self) = @_;
3354 3545
3355 return unless $self->{visible}; 3546 return unless $self->{visible};
3356 3547
3357 $self->SUPER::update; 3548 $self->SUPER::update;
3358} 3549}
3359 3550
3551sub invoke_visibility_change {
3552 my ($self) = @_;
3553
3554 $self->update_timer;
3555
3556 0
3557}
3558
3360sub _draw { 3559sub _draw {
3361 my ($self) = @_; 3560 my ($self) = @_;
3362 3561
3363 return unless $::CONN; 3562 return unless $::CONN;
3364 3563
3365 $self->SUPER::_draw; 3564 $self->SUPER::_draw;
3366 3565
3367 my $face;
3368
3369 if ($self->{frame}) {
3370 my $anim = $::CONN->{anim}[$self->{anim}]; 3566 my $faceid = $::CONN->{faceid}[$self->{face}]
3371 3567 or return;
3372 $face = $anim->[ $self->{frame} % @$anim ]
3373 if $anim && @$anim;
3374 }
3375 3568
3376 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3569 my $tex = $::CONN->{texture}[$faceid];
3377 3570
3378 if ($tex) { 3571 if ($tex) {
3379 glEnable GL_TEXTURE_2D; 3572 glEnable GL_TEXTURE_2D;
3380 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3573 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3381 glColor 0, 0, 0, 1; 3574 glColor 0, 0, 0, 1;
… …
3385} 3578}
3386 3579
3387sub destroy { 3580sub destroy {
3388 my ($self) = @_; 3581 my ($self) = @_;
3389 3582
3390 $self->{timer}->cancel 3583 (delete $self->{timer})->cancel
3391 if $self->{timer}; 3584 if $self->{timer};
3392 3585
3393 $self->SUPER::destroy; 3586 $self->SUPER::destroy;
3394} 3587}
3395 3588
… …
4039 while ($self->{post_alloc_hook}) { 4232 while ($self->{post_alloc_hook}) {
4040 $_->() 4233 $_->()
4041 for values %{delete $self->{post_alloc_hook}}; 4234 for values %{delete $self->{post_alloc_hook}};
4042 } 4235 }
4043 4236
4044
4045 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4237 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4046 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4238 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4047 glClear GL_COLOR_BUFFER_BIT; 4239 glClear GL_COLOR_BUFFER_BIT;
4048 4240
4049 glMatrixMode GL_PROJECTION; 4241 glMatrixMode GL_PROJECTION;

Diff Legend

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