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.364 by root, Sat Dec 23 10:18:27 2006 UTC vs.
Revision 1.398 by root, Sat Jul 21 14:32:10 2007 UTC

… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
110 } 113 }
111 114
112 if ($GRAB) { 115 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel 117 # mousewheel
115 $ev->{dx} = 0;
116 $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
117 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
118 } else { 125 } else {
119 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
120 } 127 }
121 } 128 }
… …
265 $self->hide; 272 $self->hide;
266 $self->emit ("destroy"); 273 $self->emit ("destroy");
267 %$self = (); 274 %$self = ();
268} 275}
269 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
270sub show { 281sub show {
271 my ($self) = @_; 282 my ($self) = @_;
272 283
273 return if $self->{parent}; 284 return if $self->{parent};
274 285
… …
313sub set_visibility { 324sub set_visibility {
314 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
315 326
316 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
317 328
318 $visible ? $self->hide 329 $visible ? $self->show
319 : $self->show; 330 : $self->hide;
320} 331}
321 332
322sub toggle_visibility { 333sub toggle_visibility {
323 my ($self) = @_; 334 my ($self) = @_;
324 335
… …
540 551
541 # parent 552 # parent
542 $self->{parent} && $self->{parent}->emit ($signal, @args) 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
543} 554}
544 555
545sub find_widget { 556#sub find_widget {
546 my ($self, $x, $y) = @_; 557# in .xs
547
548 return () unless $self->{can_events};
549
550 return $self
551 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
552 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
553
554 ()
555}
556 558
557sub set_parent { 559sub set_parent {
558 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
559 561
560 CFPlus::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
… …
739 can_events => 0, 741 can_events => 0,
740 %arg, 742 %arg,
741 ); 743 );
742 744
743 $self->add (@$children) 745 $self->add (@$children)
744 if $children; 746 if $children && @$children;
745 747
746 $self 748 $self
747} 749}
748 750
749sub realloc { 751sub realloc {
… …
758 my ($self, @widgets) = @_; 760 my ($self, @widgets) = @_;
759 761
760 $_->set_parent ($self) 762 $_->set_parent ($self)
761 for @widgets; 763 for @widgets;
762 764
765 # TODO: only do this in widgets that need it, e.g. root, fixed
763 use sort 'stable'; 766 use sort 'stable';
764 767
765 $self->{children} = [ 768 $self->{children} = [
766 sort { $a->{z} <=> $b->{z} } 769 sort { $a->{z} <=> $b->{z} }
767 @{$self->{children}}, @widgets 770 @{$self->{children}}, @widgets
… …
786} 789}
787 790
788sub clear { 791sub clear {
789 my ($self) = @_; 792 my ($self) = @_;
790 793
791 my $children = delete $self->{children}; 794 my $children = $self->{children};
792 $self->{children} = []; 795 $self->{children} = [];
793 796
794 for (@$children) { 797 for (@$children) {
795 delete $_->{parent}; 798 delete $_->{parent};
796 $_->hide; 799 $_->hide;
… …
936} 939}
937 940
938############################################################################# 941#############################################################################
939 942
940package CFPlus::UI::ViewPort; 943package CFPlus::UI::ViewPort;
944
945use List::Util qw(min max);
941 946
942our @ISA = CFPlus::UI::Window::; 947our @ISA = CFPlus::UI::Window::;
943 948
944sub new { 949sub new {
945 my $class = shift; 950 my $class = shift;
… …
954sub size_request { 959sub size_request {
955 my ($self) = @_; 960 my ($self) = @_;
956 961
957 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
958 963
959 $w = 10 if $self->{scroll_x}; 964 $w = 1 if $self->{scroll_x};
960 $h = 10 if $self->{scroll_y}; 965 $h = 1 if $self->{scroll_y};
961 966
962 ($w, $h) 967 ($w, $h)
963} 968}
964 969
965sub invoke_size_allocate { 970sub invoke_size_allocate {
… …
977} 982}
978 983
979sub set_offset { 984sub set_offset {
980 my ($self, $x, $y) = @_; 985 my ($self, $x, $y) = @_;
981 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}) {
982 $self->{view_x} = int $x; 991 $self->{view_x} = $x;
983 $self->{view_y} = int $y; 992 $self->{view_y} = $y;
984 993
994 $self->emit (changed => $x, $y);
985 $self->update; 995 $self->update;
996 }
986} 997}
987 998
988# 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
989sub coord2local { 1000sub coord2local {
990 my ($self, $x, $y) = @_; 1001 my ($self, $x, $y) = @_;
… …
1005 my ($self, $x, $y) = @_; 1016 my ($self, $x, $y) = @_;
1006 1017
1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1018 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1019 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1009 ) { 1020 ) {
1010 $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})
1011 } else { 1022 } else {
1012 $self->CFPlus::UI::Base::find_widget ($x, $y) 1023 $self->CFPlus::UI::Base::find_widget ($x, $y)
1013 } 1024 }
1014} 1025}
1015 1026
… …
1026 1037
1027############################################################################# 1038#############################################################################
1028 1039
1029package CFPlus::UI::ScrolledWindow; 1040package CFPlus::UI::ScrolledWindow;
1030 1041
1031our @ISA = CFPlus::UI::HBox::; 1042our @ISA = CFPlus::UI::Table::;
1032 1043
1033sub new { 1044sub new {
1034 my ($class, %arg) = @_; 1045 my ($class, %arg) = @_;
1035 1046
1036 my $child = delete $arg{child}; 1047 my $child = delete $arg{child};
1037 1048
1038 my $self; 1049 my $self;
1039 1050
1040 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,
1041 vertical => 1, 1065 vertical => 1,
1042 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1043 on_changed => sub { 1067 on_changed => sub {
1044 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1045 }, 1070 },
1046 ; 1071 ;
1047 1072
1048 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1049 vp => (new CFPlus::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1050 can_events => 1, 1076 can_events => 1,
1051 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1052 %arg, 1081 %arg,
1053 ); 1082 );
1054 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
1055 $self->SUPER::add ($self->{vp}, $self->{slider}); 1100 $self->SUPER::add ($self->{vp});
1101
1056 $self->add ($child) if $child; 1102 $self->add ($child) if $child;
1057 1103
1058 $self 1104 $self
1059} 1105}
1060
1061#TODO# update range on size_allocate depending on child
1062 1106
1063sub add { 1107sub add {
1064 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1065 1109
1066 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1067} 1111}
1068 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
1139sub start_dragging {
1140 my ($self, $ev) = @_;
1141
1142 $self->grab_focus;
1143
1144 my $ox = $self->{vp}{view_x};
1145 my $oy = $self->{vp}{view_y};
1146
1147 $self->{motion} = sub {
1148 my ($ev, $x, $y) = @_;
1149
1150 $ox -= $ev->{xrel};
1151 $oy -= $ev->{yrel};
1152
1153 $self->{vp}->set_offset ($ox, $oy);
1154 };
1155}
1156
1069sub invoke_mouse_wheel { 1157sub invoke_mouse_wheel {
1070 my ($self, $ev) = @_; 1158 my ($self, $ev) = @_;
1071 1159
1072 return 0 unless $ev->{dy}; # only vertical movements
1073
1074 $self->{slider}->emit (mouse_wheel => $ev); 1160 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1161 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1075 1162
1076 1 1163 1
1077} 1164}
1078 1165
1079sub update_slider { 1166sub invoke_button_down {
1080 my ($self) = @_; 1167 my ($self, $ev, $x, $y) = @_;
1081 1168
1082 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1169 if ($ev->{button} == 2) {
1083} 1170 $self->start_dragging ($ev);
1171 return 1;
1172 }
1084 1173
1085sub update { 1174 0
1086 my ($self) = @_; 1175}
1087 1176
1088 $self->SUPER::update; 1177sub invoke_button_up {
1178 my ($self, $ev, $x, $y) = @_;
1089 1179
1090 $self->update_slider; 1180 if (delete $self->{motion}) {
1181 return 1;
1182 }
1183
1184 0
1185}
1186
1187sub invoke_mouse_motion {
1188 my ($self, $ev, $x, $y) = @_;
1189
1190 if ($self->{motion}) {
1191 $self->{motion}->($ev, $x, $y);
1192 return 1;
1193 }
1194
1195 0
1091} 1196}
1092 1197
1093sub invoke_size_allocate { 1198sub invoke_size_allocate {
1094 my ($self, $w, $h) = @_; 1199 my ($self, $w, $h) = @_;
1095 1200
1096 $self->update_slider; 1201 $self->update_slider;
1097
1098 $self->SUPER::invoke_size_allocate ($w, $h) 1202 $self->SUPER::invoke_size_allocate ($w, $h)
1099} 1203}
1100 1204
1101############################################################################# 1205#############################################################################
1102 1206
… …
1252 1356
1253my @border = 1357my @border =
1254 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1255 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1359 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1256 1360
1361my @icon =
1362 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1363 qw(x1_move.png x1_resize.png);
1364
1257sub new { 1365sub new {
1258 my ($class, %arg) = @_; 1366 my ($class, %arg) = @_;
1259 1367
1260 my $self = $class->SUPER::new ( 1368 my $self = $class->SUPER::new (
1261 bg => [1, 1, 1, 1], 1369 bg => [1, 1, 1, 1],
… …
1429 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1537 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1430 1538
1431 my $border = $self->border; 1539 my $border = $self->border;
1432 1540
1433 glColor @{ $self->{border_bg} }; 1541 glColor @{ $self->{border_bg} };
1434 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1542 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1435 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1543 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1436 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1544 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1437 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1545 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1546
1547 # move
1548 my $w2 = ($w - $border) * .5;
1549 my $h2 = ($h - $border) * .5;
1550 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1551 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1552 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1553
1554 # resize
1555 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1556 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1557 unless $self->{has_close_button};
1558 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1559 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1438 1560
1439 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1561 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1440 glColor @{ $self->{bg} }; 1562 glColor @{ $self->{bg} };
1441 1563
1442 # TODO: repeat texture not scale 1564 # TODO: repeat texture not scale
… …
1463 1585
1464############################################################################# 1586#############################################################################
1465 1587
1466package CFPlus::UI::Table; 1588package CFPlus::UI::Table;
1467 1589
1468our @ISA = CFPlus::UI::Base::; 1590our @ISA = CFPlus::UI::Container::;
1469 1591
1470use List::Util qw(max sum); 1592use List::Util qw(max sum);
1471 1593
1472use CFPlus::OpenGL; 1594use CFPlus::OpenGL;
1473 1595
1474sub new { 1596sub new {
1475 my $class = shift; 1597 my $class = shift;
1476 1598
1477 $class->SUPER::new ( 1599 $class->SUPER::new (
1478 col_expand => [], 1600 col_expand => [],
1601 row_expand => [],
1479 @_, 1602 @_,
1480 ) 1603 )
1481} 1604}
1482 1605
1483sub children {
1484 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1485}
1486
1487sub add { 1606sub add {
1607 my ($self, @widgets) = @_;
1608
1609 for my $child (@widgets) {
1610 $child->{rowspan} ||= 1;
1611 $child->{colspan} ||= 1;
1612 }
1613
1614 $self->SUPER::add (@widgets);
1615}
1616
1617sub add_at {
1488 my ($self) = shift; 1618 my $self = shift;
1619
1620 my @widgets;
1489 1621
1490 while (@_) { 1622 while (@_) {
1491 my ($x, $y, $child) = splice @_, 0, 3, (); 1623 my ($col, $row, $child) = splice @_, 0, 3, ();
1492 $child->set_parent ($self);
1493 $self->{children}[$y][$x] = $child;
1494 }
1495 1624
1496 $self->{force_realloc} = 1; 1625 $child->{row} = $row;
1497 $self->{force_size_alloc} = 1; 1626 $child->{col} = $col;
1498 $self->realloc;
1499}
1500 1627
1501sub remove { 1628 push @widgets, $child;
1629 }
1630
1631 $self->add (@widgets);
1632}
1633
1634sub get_wh {
1502 my ($self, $child) = @_; 1635 my ($self) = @_;
1503 1636
1504 # TODO: not yet implemented 1637 my (@w, @h);
1505}
1506
1507# TODO: move to container class maybe? send children a signal on removal?
1508sub clear {
1509 my ($self) = @_;
1510 1638
1511 my @children = $self->children; 1639 my @children = $self->children;
1512 delete $self->{children}; 1640
1641 # first pass, columns
1642 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1643 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1644
1645 my $sw = sum @w[$c .. $c + $cs - 1];
1646
1647 if ($w > $sw) {
1648 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1649 }
1513 1650 }
1514 for (@children) {
1515 delete $_->{parent};
1516 $_->hide;
1517 }
1518 1651
1519 $self->realloc; 1652 # second pass, rows
1520} 1653 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1521
1522sub get_wh {
1523 my ($self) = @_;
1524
1525 my (@w, @h);
1526
1527 for my $y (0 .. $#{$self->{children}}) {
1528 my $row = $self->{children}[$y]
1529 or next;
1530
1531 for my $x (0 .. $#$row) {
1532 my $widget = $row->[$x]
1533 or next;
1534 my ($w, $h) = @$widget{qw(req_w req_h)}; 1654 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1535 1655
1536 $w[$x] = max $w[$x], $w; 1656 my $sh = sum @h[$r .. $r + $rs - 1];
1537 $h[$y] = max $h[$y], $h; 1657
1658 if ($h > $sh) {
1659 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1538 } 1660 }
1539 } 1661 }
1540 1662
1541 (\@w, \@h) 1663 (\@w, \@h)
1542} 1664}
… …
1558 my ($ws, $hs) = $self->get_wh; 1680 my ($ws, $hs) = $self->get_wh;
1559 1681
1560 my $req_w = (sum @$ws) || 1; 1682 my $req_w = (sum @$ws) || 1;
1561 my $req_h = (sum @$hs) || 1; 1683 my $req_h = (sum @$hs) || 1;
1562 1684
1563 # TODO: nicer code && do row_expand 1685 # now linearly scale the rows/columns to the allocated size
1564 my @col_expand = @{$self->{col_expand}}; 1686 my @col_expand = @{$self->{col_expand}};
1565 @col_expand = (1) x @$ws unless @col_expand; 1687 @col_expand = (1) x @$ws unless @col_expand;
1566 my $col_expand = (sum @col_expand) || 1; 1688 my $col_expand = (sum @col_expand) || 1;
1567 1689
1568 # linearly scale sizes
1569 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1690 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1570 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1571 1691
1572 CFPlus::UI::harmonize $ws; 1692 CFPlus::UI::harmonize $ws;
1693
1694 my @row_expand = @{$self->{row_expand}};
1695 @row_expand = (1) x @$ws unless @row_expand;
1696 my $row_expand = (sum @row_expand) || 1;
1697
1698 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1699
1573 CFPlus::UI::harmonize $hs; 1700 CFPlus::UI::harmonize $hs;
1574 1701
1575 my $y; 1702 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1703 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1576 1704
1577 for my $r (0 .. $#{$self->{children}}) { 1705 for my $widget ($self->children) {
1578 my $row = $self->{children}[$r] 1706 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1579 or next;
1580 1707
1581 my $x = 0; 1708 $widget->configure (
1582 my $row_h = $hs->[$r]; 1709 $x[$c], $y[$r],
1710 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1583 1711 );
1584 for my $c (0 .. $#$row) { 1712 }
1585 my $col_w = $ws->[$c];
1586 1713
1587 if (my $widget = $row->[$c]) { 1714 1
1588 $widget->configure ($x, $y, $col_w, $row_h); 1715}
1589 }
1590 1716
1591 $x += $col_w; 1717#############################################################################
1718
1719package CFPlus::UI::Fixed;
1720
1721use List::Util qw(min max);
1722
1723our @ISA = CFPlus::UI::Container::;
1724
1725sub add {
1726 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1727
1728 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1729 $self->SUPER::add ($child);
1730}
1731
1732sub _scale($$$) {
1733 my ($mode, $val, $max) = @_;
1734
1735 $mode eq "abs" ? $val
1736 : $mode eq "rel" ? $val * $max
1737 : 0
1738}
1739
1740sub size_request {
1741 my ($self) = @_;
1742
1743 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1744
1745 # determine overall size by querying abs widgets
1746 for my $child ($self->visible_children) {
1747 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1748
1749 if ($pos eq "abs") {
1750 $w = _scale $size, $w, $child->{req_w};
1751 $h = _scale $size, $h, $child->{req_h};
1752
1753 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1754 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1592 } 1755 }
1756 }
1593 1757
1594 $y += $row_h; 1758 my $W = $x2 - $x1;
1759 my $H = $y2 - $y1;
1760
1761 # now layout remaining widgets
1762 for my $child ($self->visible_children) {
1763 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1764
1765 if ($pos ne "abs") {
1766 $x = _scale $pos, $x, $W;
1767 $y = _scale $pos, $x, $H;
1768 $w = _scale $size, $w, $child->{req_w};
1769 $h = _scale $size, $h, $child->{req_h};
1770
1771 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1772 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1773 }
1774 }
1775
1776 my $W = $x2 - $x1;
1777 my $H = $y2 - $y1;
1778
1779 ($W, $H)
1780}
1781
1782sub invoke_size_allocate {
1783 my ($self, $W, $H) = @_;
1784
1785 for my $child ($self->visible_children) {
1786 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1787
1788 $x = _scale $pos, $x, $W;
1789 $y = _scale $pos, $x, $H;
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792
1793 $child->configure ($x, $y, $w, $h);
1595 } 1794 }
1596 1795
1597 1 1796 1
1598}
1599
1600sub find_widget {
1601 my ($self, $x, $y) = @_;
1602
1603 $x -= $self->{x};
1604 $y -= $self->{y};
1605
1606 my $res;
1607
1608 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1609 $res = $_->find_widget ($x, $y)
1610 and return $res;
1611 }
1612
1613 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1614}
1615
1616sub _draw {
1617 my ($self) = @_;
1618
1619 for (grep $_, @{$self->{children}}) {
1620 $_->draw for grep $_, @$_;
1621 }
1622} 1797}
1623 1798
1624############################################################################# 1799#############################################################################
1625 1800
1626package CFPlus::UI::Box; 1801package CFPlus::UI::Box;
… …
1966 my $mod = $ev->{mod}; 2141 my $mod = $ev->{mod};
1967 my $sym = $ev->{sym}; 2142 my $sym = $ev->{sym};
1968 my $uni = $ev->{unicode}; 2143 my $uni = $ev->{unicode};
1969 2144
1970 my $text = $self->get_text; 2145 my $text = $self->get_text;
2146
2147 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1971 2148
1972 if ($uni == 8) { 2149 if ($uni == 8) {
1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2150 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974 } elsif ($uni == 127) { 2151 } elsif ($uni == 127) {
1975 substr $text, $self->{cursor}, 1, ""; 2152 substr $text, $self->{cursor}, 1, "";
… …
2182 2359
2183use CFPlus::OpenGL; 2360use CFPlus::OpenGL;
2184 2361
2185my @tex = 2362my @tex =
2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187 qw(b1_button_active.png); 2364 qw(b1_button_inactive.png b1_button_active.png);
2188 2365
2189sub new { 2366sub new {
2190 my $class = shift; 2367 my $class = shift;
2191 2368
2192 $class->SUPER::new ( 2369 $class->SUPER::new (
2193 padding_x => 4, 2370 padding_x => 4,
2194 padding_y => 4, 2371 padding_y => 4,
2195 fg => [1, 1, 1], 2372 fg => [1.0, 1.0, 1.0],
2196 active_fg => [0, 0, 1], 2373 active_fg => [0.8, 0.8, 0.8],
2197 can_hover => 1, 2374 can_hover => 1,
2198 align => 0, 2375 align => 0,
2199 valign => 0, 2376 valign => 0,
2200 can_events => 1, 2377 can_events => 1,
2201 @_ 2378 @_
… …
2219 2396
2220 glEnable GL_TEXTURE_2D; 2397 glEnable GL_TEXTURE_2D;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2398 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222 glColor 0, 0, 0, 1; 2399 glColor 0, 0, 0, 1;
2223 2400
2401 my $tex = $tex[$GRAB == $self];
2224 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2402 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2225 2403
2226 glDisable GL_TEXTURE_2D; 2404 glDisable GL_TEXTURE_2D;
2227 2405
2228 $self->SUPER::_draw; 2406 $self->SUPER::_draw;
2229} 2407}
… …
2830 #font => default_font 3008 #font => default_font
2831 @_, 3009 @_,
2832 3010
2833 layout => (new CFPlus::Layout), 3011 layout => (new CFPlus::Layout),
2834 par => [], 3012 par => [],
3013 max_par => 0,
2835 height => 0, 3014 height => 0,
2836 children => [ 3015 children => [
2837 (new CFPlus::UI::Empty expand => 1), 3016 (new CFPlus::UI::Empty expand => 1),
2838 (new CFPlus::UI::Slider vertical => 1), 3017 (new CFPlus::UI::Slider vertical => 1),
2839 ], 3018 ],
… …
2962 wrapped => 1, 3141 wrapped => 1,
2963 }; 3142 };
2964 3143
2965 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3144 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2966 push @{$self->{par}}, $para; 3145 push @{$self->{par}}, $para;
3146 }
3147
3148 if (my $max = $self->{max_par}) {
3149 shift @{$self->{par}} while @{$self->{par}} > $max;
2967 } 3150 }
2968 3151
2969 $self->{need_reflow}++; 3152 $self->{need_reflow}++;
2970 $self->update; 3153 $self->update;
2971} 3154}
… …
3279 3462
3280sub new { 3463sub new {
3281 my $class = shift; 3464 my $class = shift;
3282 3465
3283 my $self = $class->SUPER::new ( 3466 my $self = $class->SUPER::new (
3467 size_w => 32,
3468 size_h => 8,
3284 aspect => 1, 3469 aspect => 1,
3285 can_events => 0, 3470 can_events => 0,
3286 @_, 3471 @_,
3287 ); 3472 );
3288 3473
3289 if ($self->{anim} && $self->{animspeed}) { 3474 if ($self->{anim} && $self->{animspeed}) {
3290 CFPlus::weaken (my $widget = $self); 3475 CFPlus::weaken (my $widget = $self);
3291 3476
3477 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3478 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3292 $self->{timer} = Event->timer ( 3479 $self->{timer} = Event->timer (
3293 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3294 hard => 1, 3480 parked => 1,
3295 interval => $self->{animspeed},
3296 cb => sub { 3481 cb => sub {
3482 return unless $::CONN && $widget;
3483
3297 ++$widget->{frame}; 3484 ++$widget->{frame};
3485 $widget->update_face;
3298 $widget->update; 3486 $widget->update;
3487
3488 $widget->update_timer;
3299 }, 3489 },
3300 ); 3490 );
3491
3492 $self->update_face;
3493 $self->update_timer;
3301 } 3494 }
3302 3495
3303 $self 3496 $self
3304} 3497}
3305 3498
3499sub update_timer {
3500 my ($self) = @_;
3501
3502 return unless $self->{timer};
3503
3504 if ($self->{visible}) {
3505 $self->{timer}->at (
3506 $self->{anim_start}
3507 + $self->{animspeed}
3508 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3509 );
3510 $self->{timer}->start;
3511 } else {
3512 $self->{timer}->stop;
3513 }
3514}
3515
3516sub update_face {
3517 my ($self) = @_;
3518
3519 return unless $::CONN;
3520
3521 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3522 if ($anim && @$anim) {
3523 delete $self->{wait_face};
3524 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3525 }
3526 }
3527}
3528
3306sub size_request { 3529sub size_request {
3307 (32, 8) 3530 my ($self) = @_;
3531
3532 if ($::CONN) {
3533 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3534 if (my $tex = $::CONN->{texture}[$faceid]) {
3535 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3536 } else {
3537 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3538 $self->realloc;
3539 });
3540 }
3541 }
3542 }
3543
3544 ($self->{size_w} || 8, $self->{size_h} || 8)
3308} 3545}
3309 3546
3310sub update { 3547sub update {
3311 my ($self) = @_; 3548 my ($self) = @_;
3312 3549
3313 return unless $self->{visible}; 3550 return unless $self->{visible};
3314 3551
3315 $self->SUPER::update; 3552 $self->SUPER::update;
3316} 3553}
3317 3554
3555sub invoke_visibility_change {
3556 my ($self) = @_;
3557
3558 $self->update_timer;
3559
3560 0
3561}
3562
3318sub _draw { 3563sub _draw {
3319 my ($self) = @_; 3564 my ($self) = @_;
3320 3565
3321 return unless $::CONN; 3566 return unless $::CONN;
3322 3567
3323 $self->SUPER::_draw; 3568 $self->SUPER::_draw;
3324 3569
3325 my $face;
3326
3327 if ($self->{frame}) {
3328 my $anim = $::CONN->{anim}[$self->{anim}]; 3570 my $faceid = $::CONN->{faceid}[$self->{face}]
3329 3571 or return;
3330 $face = $anim->[ $self->{frame} % @$anim ]
3331 if $anim && @$anim;
3332 }
3333 3572
3334 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3573 my $tex = $::CONN->{texture}[$faceid];
3335 3574
3336 if ($tex) { 3575 if ($tex) {
3337 glEnable GL_TEXTURE_2D; 3576 glEnable GL_TEXTURE_2D;
3338 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3577 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3339 glColor 0, 0, 0, 1; 3578 glColor 0, 0, 0, 1;
… …
3343} 3582}
3344 3583
3345sub destroy { 3584sub destroy {
3346 my ($self) = @_; 3585 my ($self) = @_;
3347 3586
3348 $self->{timer}->cancel 3587 (delete $self->{timer})->cancel
3349 if $self->{timer}; 3588 if $self->{timer};
3350 3589
3351 $self->SUPER::destroy; 3590 $self->SUPER::destroy;
3352} 3591}
3353 3592
… …
3997 while ($self->{post_alloc_hook}) { 4236 while ($self->{post_alloc_hook}) {
3998 $_->() 4237 $_->()
3999 for values %{delete $self->{post_alloc_hook}}; 4238 for values %{delete $self->{post_alloc_hook}};
4000 } 4239 }
4001 4240
4002
4003 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4241 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4004 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4242 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4005 glClear GL_COLOR_BUFFER_BIT; 4243 glClear GL_COLOR_BUFFER_BIT;
4006 4244
4007 glMatrixMode GL_PROJECTION; 4245 glMatrixMode GL_PROJECTION;

Diff Legend

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