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.366 by root, Mon Apr 23 19:17:41 2007 UTC vs.
Revision 1.394 by root, Sat Jul 21 13:54:03 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 }
… …
268 $self->hide; 272 $self->hide;
269 $self->emit ("destroy"); 273 $self->emit ("destroy");
270 %$self = (); 274 %$self = ();
271} 275}
272 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
273sub show { 281sub show {
274 my ($self) = @_; 282 my ($self) = @_;
275 283
276 return if $self->{parent}; 284 return if $self->{parent};
277 285
… …
316sub set_visibility { 324sub set_visibility {
317 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
318 326
319 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
320 328
321 $visible ? $self->hide 329 $visible ? $self->show
322 : $self->show; 330 : $self->hide;
323} 331}
324 332
325sub toggle_visibility { 333sub toggle_visibility {
326 my ($self) = @_; 334 my ($self) = @_;
327 335
… …
543 551
544 # parent 552 # parent
545 $self->{parent} && $self->{parent}->emit ($signal, @args) 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
546} 554}
547 555
548sub find_widget { 556#sub find_widget {
549 my ($self, $x, $y) = @_; 557# in .xs
550
551 return () unless $self->{can_events};
552
553 return $self
554 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
555 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
556
557 ()
558}
559 558
560sub set_parent { 559sub set_parent {
561 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
562 561
563 CFPlus::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
… …
742 can_events => 0, 741 can_events => 0,
743 %arg, 742 %arg,
744 ); 743 );
745 744
746 $self->add (@$children) 745 $self->add (@$children)
747 if $children; 746 if $children && @$children;
748 747
749 $self 748 $self
750} 749}
751 750
752sub realloc { 751sub realloc {
… …
761 my ($self, @widgets) = @_; 760 my ($self, @widgets) = @_;
762 761
763 $_->set_parent ($self) 762 $_->set_parent ($self)
764 for @widgets; 763 for @widgets;
765 764
765 # TODO: only do this in widgets that need it, e.g. root, fixed
766 use sort 'stable'; 766 use sort 'stable';
767 767
768 $self->{children} = [ 768 $self->{children} = [
769 sort { $a->{z} <=> $b->{z} } 769 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 770 @{$self->{children}}, @widgets
… …
789} 789}
790 790
791sub clear { 791sub clear {
792 my ($self) = @_; 792 my ($self) = @_;
793 793
794 my $children = delete $self->{children}; 794 my $children = $self->{children};
795 $self->{children} = []; 795 $self->{children} = [];
796 796
797 for (@$children) { 797 for (@$children) {
798 delete $_->{parent}; 798 delete $_->{parent};
799 $_->hide; 799 $_->hide;
… …
939} 939}
940 940
941############################################################################# 941#############################################################################
942 942
943package CFPlus::UI::ViewPort; 943package CFPlus::UI::ViewPort;
944
945use List::Util qw(min max);
944 946
945our @ISA = CFPlus::UI::Window::; 947our @ISA = CFPlus::UI::Window::;
946 948
947sub new { 949sub new {
948 my $class = shift; 950 my $class = shift;
… …
957sub size_request { 959sub size_request {
958 my ($self) = @_; 960 my ($self) = @_;
959 961
960 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
961 963
962 $w = 10 if $self->{scroll_x}; 964 $w = 1 if $self->{scroll_x};
963 $h = 10 if $self->{scroll_y}; 965 $h = 1 if $self->{scroll_y};
964 966
965 ($w, $h) 967 ($w, $h)
966} 968}
967 969
968sub invoke_size_allocate { 970sub invoke_size_allocate {
… …
980} 982}
981 983
982sub set_offset { 984sub set_offset {
983 my ($self, $x, $y) = @_; 985 my ($self, $x, $y) = @_;
984 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}) {
985 $self->{view_x} = int $x; 991 $self->{view_x} = $x;
986 $self->{view_y} = int $y; 992 $self->{view_y} = $y;
987 993
994 $self->emit (changed => $x, $y);
988 $self->update; 995 $self->update;
996 }
989} 997}
990 998
991# 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
992sub coord2local { 1000sub coord2local {
993 my ($self, $x, $y) = @_; 1001 my ($self, $x, $y) = @_;
… …
1008 my ($self, $x, $y) = @_; 1016 my ($self, $x, $y) = @_;
1009 1017
1010 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1018 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1011 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1019 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1012 ) { 1020 ) {
1013 $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})
1014 } else { 1022 } else {
1015 $self->CFPlus::UI::Base::find_widget ($x, $y) 1023 $self->CFPlus::UI::Base::find_widget ($x, $y)
1016 } 1024 }
1017} 1025}
1018 1026
… …
1029 1037
1030############################################################################# 1038#############################################################################
1031 1039
1032package CFPlus::UI::ScrolledWindow; 1040package CFPlus::UI::ScrolledWindow;
1033 1041
1034our @ISA = CFPlus::UI::HBox::; 1042our @ISA = CFPlus::UI::Table::;
1035 1043
1036sub new { 1044sub new {
1037 my ($class, %arg) = @_; 1045 my ($class, %arg) = @_;
1038 1046
1039 my $child = delete $arg{child}; 1047 my $child = delete $arg{child};
1040 1048
1041 my $self; 1049 my $self;
1042 1050
1043 my $slider = new CFPlus::UI::Slider 1051 my $hslider = new CFPlus::UI::Slider
1052 col => 0,
1053 row => 1,
1054 vertical => 0,
1055 range => [0, 0, 1, 0.01], # HACK fix
1056 on_changed => sub {
1057 $self->{hpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059 },
1060 ;
1061
1062 my $vslider = new CFPlus::UI::Slider
1063 col => 1,
1064 row => 0,
1044 vertical => 1, 1065 vertical => 1,
1045 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1046 on_changed => sub { 1067 on_changed => sub {
1047 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1048 }, 1070 },
1049 ; 1071 ;
1050 1072
1051 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1052 vp => (new CFPlus::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1053 can_events => 1, 1076 can_events => 1,
1054 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1055 %arg, 1081 %arg,
1056 ); 1082 );
1057 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
1058 $self->SUPER::add ($self->{vp}, $self->{slider}); 1100 $self->SUPER::add ($self->{vp});
1101
1059 $self->add ($child) if $child; 1102 $self->add ($child) if $child;
1060 1103
1061 $self 1104 $self
1062} 1105}
1063 1106
1064#TODO# update range on size_allocate depending on child 1107#TODO# update range on size_allocate depending on child?
1065 1108
1066sub add { 1109sub add {
1067 my ($self, $widget) = @_; 1110 my ($self, $widget) = @_;
1068 1111
1069 $self->{vp}->add ($self->{child} = $widget); 1112 $self->{vp}->add ($self->{child} = $widget);
1070} 1113}
1071 1114
1115sub update_slider {
1116 my ($self) = @_;
1117
1118 my $child = ($self->{vp} or return)->child;
1119
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122
1123 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider_visible}) {
1125 $self->{hslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{hslider})
1127 : $self->SUPER::remove ($self->{hslider});
1128 }
1129
1130 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1131 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1132
1133 my $visible = $h1 > $h2;
1134 if ($visible != $self->{vslider_visible}) {
1135 $self->{vslider_visible} = $visible;
1136 $visible ? $self->SUPER::add ($self->{vslider})
1137 : $self->SUPER::remove ($self->{vslider});
1138 }
1139}
1140
1141sub update {
1142 my ($self) = @_;
1143
1144 $self->update_slider;
1145 $self->SUPER::update;
1146}
1147
1072sub invoke_mouse_wheel { 1148sub invoke_mouse_wheel {
1073 my ($self, $ev) = @_; 1149 my ($self, $ev) = @_;
1074 1150
1075 return 0 unless $ev->{dy}; # only vertical movements
1076
1077 $self->{slider}->emit (mouse_wheel => $ev); 1151 $self->{vslider}->emit (mouse_wheel => $ev)
1152 if $ev->{dy};
1153
1154 $self->{hslider}->emit (mouse_wheel => $ev)
1155 if $ev->{dx};
1078 1156
1079 1 1157 1
1080} 1158}
1081 1159
1082sub update_slider { 1160sub invoke_button_down {
1083 my ($self) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1084 1162
1085 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1163 if ($ev->{button} == 2) {
1086} 1164 $self->grab_focus;
1087 1165
1088sub update { 1166 my $ox = $self->{vp}{view_x} + $ev->{x};
1089 my ($self) = @_; 1167 my $oy = $self->{vp}{view_y} + $ev->{y};
1168
1169 $self->{motion} = sub {
1170 my ($ev, $x, $y) = @_;
1090 1171
1091 $self->SUPER::update; 1172 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1173 $self->update;
1174 };
1092 1175
1093 $self->update_slider; 1176 return 1;
1177 }
1178
1179 0
1180}
1181
1182sub invoke_button_up {
1183 my ($self, $ev, $x, $y) = @_;
1184
1185 if (delete $self->{motion}) {
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
1094} 1201}
1095 1202
1096sub invoke_size_allocate { 1203sub invoke_size_allocate {
1097 my ($self, $w, $h) = @_; 1204 my ($self, $w, $h) = @_;
1098 1205
1099 $self->update_slider; 1206 $self->update_slider;
1100
1101 $self->SUPER::invoke_size_allocate ($w, $h) 1207 $self->SUPER::invoke_size_allocate ($w, $h)
1102} 1208}
1103 1209
1104############################################################################# 1210#############################################################################
1105 1211
… …
1255 1361
1256my @border = 1362my @border =
1257 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1258 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);
1259 1365
1366my @icon =
1367 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1368 qw(x1_move.png x1_resize.png);
1369
1260sub new { 1370sub new {
1261 my ($class, %arg) = @_; 1371 my ($class, %arg) = @_;
1262 1372
1263 my $self = $class->SUPER::new ( 1373 my $self = $class->SUPER::new (
1264 bg => [1, 1, 1, 1], 1374 bg => [1, 1, 1, 1],
… …
1432 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1542 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1433 1543
1434 my $border = $self->border; 1544 my $border = $self->border;
1435 1545
1436 glColor @{ $self->{border_bg} }; 1546 glColor @{ $self->{border_bg} };
1437 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1547 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1438 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1548 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1439 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1549 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1440 $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);
1441 1565
1442 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1566 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1443 glColor @{ $self->{bg} }; 1567 glColor @{ $self->{bg} };
1444 1568
1445 # TODO: repeat texture not scale 1569 # TODO: repeat texture not scale
… …
1466 1590
1467############################################################################# 1591#############################################################################
1468 1592
1469package CFPlus::UI::Table; 1593package CFPlus::UI::Table;
1470 1594
1471our @ISA = CFPlus::UI::Base::; 1595our @ISA = CFPlus::UI::Container::;
1472 1596
1473use List::Util qw(max sum); 1597use List::Util qw(max sum);
1474 1598
1475use CFPlus::OpenGL; 1599use CFPlus::OpenGL;
1476 1600
1477sub new { 1601sub new {
1478 my $class = shift; 1602 my $class = shift;
1479 1603
1480 $class->SUPER::new ( 1604 $class->SUPER::new (
1481 col_expand => [], 1605 col_expand => [],
1606 row_expand => [],
1482 @_, 1607 @_,
1483 ) 1608 )
1484} 1609}
1485 1610
1486sub children {
1487 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1488}
1489
1490sub 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 {
1491 my ($self) = shift; 1623 my $self = shift;
1624
1625 my @widgets;
1492 1626
1493 while (@_) { 1627 while (@_) {
1494 my ($x, $y, $child) = splice @_, 0, 3, (); 1628 my ($col, $row, $child) = splice @_, 0, 3, ();
1495 $child->set_parent ($self);
1496 $self->{children}[$y][$x] = $child;
1497 }
1498 1629
1499 $self->{force_realloc} = 1; 1630 $child->{row} = $row;
1500 $self->{force_size_alloc} = 1; 1631 $child->{col} = $col;
1501 $self->realloc;
1502}
1503 1632
1504sub remove { 1633 push @widgets, $child;
1634 }
1635
1636 $self->add (@widgets);
1637}
1638
1639sub get_wh {
1505 my ($self, $child) = @_; 1640 my ($self) = @_;
1506 1641
1507 # TODO: not yet implemented 1642 my (@w, @h);
1508}
1509
1510# TODO: move to container class maybe? send children a signal on removal?
1511sub clear {
1512 my ($self) = @_;
1513 1643
1514 my @children = $self->children; 1644 my @children = $self->children;
1515 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 }
1516 1655 }
1517 for (@children) {
1518 delete $_->{parent};
1519 $_->hide;
1520 }
1521 1656
1522 $self->realloc; 1657 # second pass, rows
1523} 1658 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1524
1525sub get_wh {
1526 my ($self) = @_;
1527
1528 my (@w, @h);
1529
1530 for my $y (0 .. $#{$self->{children}}) {
1531 my $row = $self->{children}[$y]
1532 or next;
1533
1534 for my $x (0 .. $#$row) {
1535 my $widget = $row->[$x]
1536 or next;
1537 my ($w, $h) = @$widget{qw(req_w req_h)}; 1659 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1538 1660
1539 $w[$x] = max $w[$x], $w; 1661 my $sh = sum @h[$r .. $r + $rs - 1];
1540 $h[$y] = max $h[$y], $h; 1662
1663 if ($h > $sh) {
1664 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1541 } 1665 }
1542 } 1666 }
1543 1667
1544 (\@w, \@h) 1668 (\@w, \@h)
1545} 1669}
… …
1561 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1562 1686
1563 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1564 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1565 1689
1566 # TODO: nicer code && do row_expand 1690 # now linearly scale the rows/columns to the allocated size
1567 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1568 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1569 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1570 1694
1571 # linearly scale sizes
1572 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1573 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1574 1696
1575 CFPlus::UI::harmonize $ws; 1697 CFPlus::UI::harmonize $ws;
1698
1699 my @row_expand = @{$self->{row_expand}};
1700 @row_expand = (1) x @$ws unless @row_expand;
1701 my $row_expand = (sum @row_expand) || 1;
1702
1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704
1576 CFPlus::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1577 1706
1578 my $y; 1707 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1708 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1579 1709
1580 for my $r (0 .. $#{$self->{children}}) { 1710 for my $widget ($self->children) {
1581 my $row = $self->{children}[$r] 1711 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1582 or next;
1583 1712
1584 my $x = 0; 1713 $widget->configure (
1585 my $row_h = $hs->[$r]; 1714 $x[$c], $y[$r],
1715 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1586 1716 );
1587 for my $c (0 .. $#$row) { 1717 }
1588 my $col_w = $ws->[$c];
1589 1718
1590 if (my $widget = $row->[$c]) { 1719 1
1591 $widget->configure ($x, $y, $col_w, $row_h); 1720}
1592 }
1593 1721
1594 $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;
1595 } 1760 }
1761 }
1596 1762
1597 $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);
1598 } 1799 }
1599 1800
1600 1 1801 1
1601}
1602
1603sub find_widget {
1604 my ($self, $x, $y) = @_;
1605
1606 $x -= $self->{x};
1607 $y -= $self->{y};
1608
1609 my $res;
1610
1611 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1612 $res = $_->find_widget ($x, $y)
1613 and return $res;
1614 }
1615
1616 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1617}
1618
1619sub _draw {
1620 my ($self) = @_;
1621
1622 for (grep $_, @{$self->{children}}) {
1623 $_->draw for grep $_, @$_;
1624 }
1625} 1802}
1626 1803
1627############################################################################# 1804#############################################################################
1628 1805
1629package CFPlus::UI::Box; 1806package CFPlus::UI::Box;
… …
1969 my $mod = $ev->{mod}; 2146 my $mod = $ev->{mod};
1970 my $sym = $ev->{sym}; 2147 my $sym = $ev->{sym};
1971 my $uni = $ev->{unicode}; 2148 my $uni = $ev->{unicode};
1972 2149
1973 my $text = $self->get_text; 2150 my $text = $self->get_text;
2151
2152 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1974 2153
1975 if ($uni == 8) { 2154 if ($uni == 8) {
1976 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2155 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1977 } elsif ($uni == 127) { 2156 } elsif ($uni == 127) {
1978 substr $text, $self->{cursor}, 1, ""; 2157 substr $text, $self->{cursor}, 1, "";
… …
2185 2364
2186use CFPlus::OpenGL; 2365use CFPlus::OpenGL;
2187 2366
2188my @tex = 2367my @tex =
2189 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2368 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2190 qw(b1_button_active.png); 2369 qw(b1_button_inactive.png b1_button_active.png);
2191 2370
2192sub new { 2371sub new {
2193 my $class = shift; 2372 my $class = shift;
2194 2373
2195 $class->SUPER::new ( 2374 $class->SUPER::new (
2196 padding_x => 4, 2375 padding_x => 4,
2197 padding_y => 4, 2376 padding_y => 4,
2198 fg => [1, 1, 1], 2377 fg => [1.0, 1.0, 1.0],
2199 active_fg => [0, 0, 1], 2378 active_fg => [0.8, 0.8, 0.8],
2200 can_hover => 1, 2379 can_hover => 1,
2201 align => 0, 2380 align => 0,
2202 valign => 0, 2381 valign => 0,
2203 can_events => 1, 2382 can_events => 1,
2204 @_ 2383 @_
… …
2222 2401
2223 glEnable GL_TEXTURE_2D; 2402 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2403 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 0, 0, 0, 1; 2404 glColor 0, 0, 0, 1;
2226 2405
2406 my $tex = $tex[$GRAB == $self];
2227 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2407 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2228 2408
2229 glDisable GL_TEXTURE_2D; 2409 glDisable GL_TEXTURE_2D;
2230 2410
2231 $self->SUPER::_draw; 2411 $self->SUPER::_draw;
2232} 2412}
… …
3287 3467
3288sub new { 3468sub new {
3289 my $class = shift; 3469 my $class = shift;
3290 3470
3291 my $self = $class->SUPER::new ( 3471 my $self = $class->SUPER::new (
3472 size_w => 32,
3473 size_h => 8,
3292 aspect => 1, 3474 aspect => 1,
3293 can_events => 0, 3475 can_events => 0,
3294 @_, 3476 @_,
3295 ); 3477 );
3296 3478
3297 if ($self->{anim} && $self->{animspeed}) { 3479 if ($self->{anim} && $self->{animspeed}) {
3298 CFPlus::weaken (my $widget = $self); 3480 CFPlus::weaken (my $widget = $self);
3299 3481
3482 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3483 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3300 $self->{timer} = Event->timer ( 3484 $self->{timer} = Event->timer (
3301 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3302 hard => 1, 3485 parked => 1,
3303 interval => $self->{animspeed},
3304 cb => sub { 3486 cb => sub {
3487 return unless $::CONN && $widget;
3488
3305 ++$widget->{frame}; 3489 ++$widget->{frame};
3490 $widget->update_face;
3306 $widget->update; 3491 $widget->update;
3492
3493 $widget->update_timer;
3307 }, 3494 },
3308 ); 3495 );
3496
3497 $self->update_face;
3498 $self->update_timer;
3309 } 3499 }
3310 3500
3311 $self 3501 $self
3312} 3502}
3313 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
3314sub size_request { 3534sub size_request {
3315 (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)
3316} 3550}
3317 3551
3318sub update { 3552sub update {
3319 my ($self) = @_; 3553 my ($self) = @_;
3320 3554
3321 return unless $self->{visible}; 3555 return unless $self->{visible};
3322 3556
3323 $self->SUPER::update; 3557 $self->SUPER::update;
3324} 3558}
3325 3559
3560sub invoke_visibility_change {
3561 my ($self) = @_;
3562
3563 $self->update_timer;
3564
3565 0
3566}
3567
3326sub _draw { 3568sub _draw {
3327 my ($self) = @_; 3569 my ($self) = @_;
3328 3570
3329 return unless $::CONN; 3571 return unless $::CONN;
3330 3572
3331 $self->SUPER::_draw; 3573 $self->SUPER::_draw;
3332 3574
3333 my $face;
3334
3335 if ($self->{frame}) {
3336 my $anim = $::CONN->{anim}[$self->{anim}]; 3575 my $faceid = $::CONN->{faceid}[$self->{face}]
3337 3576 or return;
3338 $face = $anim->[ $self->{frame} % @$anim ]
3339 if $anim && @$anim;
3340 }
3341 3577
3342 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3578 my $tex = $::CONN->{texture}[$faceid];
3343 3579
3344 if ($tex) { 3580 if ($tex) {
3345 glEnable GL_TEXTURE_2D; 3581 glEnable GL_TEXTURE_2D;
3346 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3582 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3347 glColor 0, 0, 0, 1; 3583 glColor 0, 0, 0, 1;
… …
3351} 3587}
3352 3588
3353sub destroy { 3589sub destroy {
3354 my ($self) = @_; 3590 my ($self) = @_;
3355 3591
3356 $self->{timer}->cancel 3592 (delete $self->{timer})->cancel
3357 if $self->{timer}; 3593 if $self->{timer};
3358 3594
3359 $self->SUPER::destroy; 3595 $self->SUPER::destroy;
3360} 3596}
3361 3597
… …
4005 while ($self->{post_alloc_hook}) { 4241 while ($self->{post_alloc_hook}) {
4006 $_->() 4242 $_->()
4007 for values %{delete $self->{post_alloc_hook}}; 4243 for values %{delete $self->{post_alloc_hook}};
4008 } 4244 }
4009 4245
4010
4011 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4246 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4012 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4247 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4013 glClear GL_COLOR_BUFFER_BIT; 4248 glClear GL_COLOR_BUFFER_BIT;
4014 4249
4015 glMatrixMode GL_PROJECTION; 4250 glMatrixMode GL_PROJECTION;

Diff Legend

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