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.362 by root, Sat Dec 9 21:26:46 2006 UTC vs.
Revision 1.399 by root, Sat Jul 21 16:07:53 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
768 ]; 771 ];
769 772
770 $self->realloc; 773 $self->realloc;
774
775 map $_+0, @widgets
771} 776}
772 777
773sub children { 778sub children {
774 @{ $_[0]{children} } 779 @{ $_[0]{children} }
775} 780}
… …
786} 791}
787 792
788sub clear { 793sub clear {
789 my ($self) = @_; 794 my ($self) = @_;
790 795
791 my $children = delete $self->{children}; 796 my $children = $self->{children};
792 $self->{children} = []; 797 $self->{children} = [];
793 798
794 for (@$children) { 799 for (@$children) {
795 delete $_->{parent}; 800 delete $_->{parent};
796 $_->hide; 801 $_->hide;
… …
936} 941}
937 942
938############################################################################# 943#############################################################################
939 944
940package CFPlus::UI::ViewPort; 945package CFPlus::UI::ViewPort;
946
947use List::Util qw(min max);
941 948
942our @ISA = CFPlus::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
943 950
944sub new { 951sub new {
945 my $class = shift; 952 my $class = shift;
… …
954sub size_request { 961sub size_request {
955 my ($self) = @_; 962 my ($self) = @_;
956 963
957 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 964 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
958 965
959 $w = 10 if $self->{scroll_x}; 966 $w = 1 if $self->{scroll_x};
960 $h = 10 if $self->{scroll_y}; 967 $h = 1 if $self->{scroll_y};
961 968
962 ($w, $h) 969 ($w, $h)
963} 970}
964 971
965sub invoke_size_allocate { 972sub invoke_size_allocate {
… …
977} 984}
978 985
979sub set_offset { 986sub set_offset {
980 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
981 988
989 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
990 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
991
992 if ($x != $self->{view_x} or $y != $self->{view_y}) {
982 $self->{view_x} = int $x; 993 $self->{view_x} = $x;
983 $self->{view_y} = int $y; 994 $self->{view_y} = $y;
984 995
996 $self->emit (changed => $x, $y);
985 $self->update; 997 $self->update;
998 }
986} 999}
987 1000
988# hmm, this does not work for topleft of $self... but we should not ask for that 1001# hmm, this does not work for topleft of $self... but we should not ask for that
989sub coord2local { 1002sub coord2local {
990 my ($self, $x, $y) = @_; 1003 my ($self, $x, $y) = @_;
… …
1005 my ($self, $x, $y) = @_; 1018 my ($self, $x, $y) = @_;
1006 1019
1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1020 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1021 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1009 ) { 1022 ) {
1010 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1023 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1011 } else { 1024 } else {
1012 $self->CFPlus::UI::Base::find_widget ($x, $y) 1025 $self->CFPlus::UI::Base::find_widget ($x, $y)
1013 } 1026 }
1014} 1027}
1015 1028
… …
1026 1039
1027############################################################################# 1040#############################################################################
1028 1041
1029package CFPlus::UI::ScrolledWindow; 1042package CFPlus::UI::ScrolledWindow;
1030 1043
1031our @ISA = CFPlus::UI::HBox::; 1044our @ISA = CFPlus::UI::Table::;
1032 1045
1033sub new { 1046sub new {
1034 my ($class, %arg) = @_; 1047 my ($class, %arg) = @_;
1035 1048
1036 my $child = delete $arg{child}; 1049 my $child = delete $arg{child};
1037 1050
1038 my $self; 1051 my $self;
1039 1052
1040 my $slider = new CFPlus::UI::Slider 1053 my $hslider = new CFPlus::UI::Slider
1054 col => 0,
1055 row => 1,
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
1065 col => 1,
1066 row => 0,
1041 vertical => 1, 1067 vertical => 1,
1042 range => [0, 0, 1, 0.01], # HACK fix 1068 range => [0, 0, 1, 0.01], # HACK fix
1043 on_changed => sub { 1069 on_changed => sub {
1044 $self->{vp}->set_offset (0, $_[1]); 1070 $self->{vpos} = $_[1];
1071 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1045 }, 1072 },
1046 ; 1073 ;
1047 1074
1048 $self = $class->SUPER::new ( 1075 $self = $class->SUPER::new (
1049 vp => (new CFPlus::UI::ViewPort expand => 1), 1076 scroll_x => 0,
1077 scroll_y => 1,
1050 can_events => 1, 1078 can_events => 1,
1051 slider => $slider, 1079 hslider => $hslider,
1080 vslider => $vslider,
1081 col_expand => [1, 0],
1082 row_expand => [1, 0],
1052 %arg, 1083 %arg,
1053 ); 1084 );
1054 1085
1086 $self->{vp} = new CFPlus::UI::ViewPort
1087 col => 0,
1088 row => 0,
1089 expand => 1,
1090 scroll_x => $self->{scroll_x},
1091 scroll_y => $self->{scroll_y},
1092 on_changed => sub {
1093 my ($vp, $x, $y) = @_;
1094
1095 $vp->{parent}{hslider}->set_value ($x);
1096 $vp->{parent}{vslider}->set_value ($y);
1097
1098 0
1099 },
1100 ;
1101
1055 $self->SUPER::add ($self->{vp}, $self->{slider}); 1102 $self->SUPER::add ($self->{vp});
1103
1056 $self->add ($child) if $child; 1104 $self->add ($child) if $child;
1057 1105
1058 $self 1106 $self
1059} 1107}
1060
1061#TODO# update range on size_allocate depending on child
1062 1108
1063sub add { 1109sub add {
1064 my ($self, $widget) = @_; 1110 my ($self, $widget) = @_;
1065 1111
1066 $self->{vp}->add ($self->{child} = $widget); 1112 $self->{vp}->add ($self->{child} = $widget);
1067} 1113}
1068 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 start_dragging {
1142 my ($self, $ev) = @_;
1143
1144 $self->grab_focus;
1145
1146 my $ox = $self->{vp}{view_x};
1147 my $oy = $self->{vp}{view_y};
1148
1149 $self->{motion} = sub {
1150 my ($ev, $x, $y) = @_;
1151
1152 $ox -= $ev->{xrel};
1153 $oy -= $ev->{yrel};
1154
1155 $self->{vp}->set_offset ($ox, $oy);
1156 };
1157}
1158
1069sub invoke_mouse_wheel { 1159sub invoke_mouse_wheel {
1070 my ($self, $ev) = @_; 1160 my ($self, $ev) = @_;
1071 1161
1072 return 0 unless $ev->{dy}; # only vertical movements
1073
1074 $self->{slider}->emit (mouse_wheel => $ev); 1162 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1163 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1075 1164
1076 1 1165 1
1077} 1166}
1078 1167
1079sub update_slider { 1168sub invoke_button_down {
1080 my ($self) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1081 1170
1082 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1171 if ($ev->{button} == 2) {
1083} 1172 $self->start_dragging ($ev);
1173 return 1;
1174 }
1084 1175
1085sub update { 1176 0
1086 my ($self) = @_; 1177}
1087 1178
1088 $self->SUPER::update; 1179sub invoke_button_up {
1180 my ($self, $ev, $x, $y) = @_;
1089 1181
1090 $self->update_slider; 1182 if (delete $self->{motion}) {
1183 return 1;
1184 }
1185
1186 0
1187}
1188
1189sub invoke_mouse_motion {
1190 my ($self, $ev, $x, $y) = @_;
1191
1192 if ($self->{motion}) {
1193 $self->{motion}->($ev, $x, $y);
1194 return 1;
1195 }
1196
1197 0
1091} 1198}
1092 1199
1093sub invoke_size_allocate { 1200sub invoke_size_allocate {
1094 my ($self, $w, $h) = @_; 1201 my ($self, $w, $h) = @_;
1095 1202
1096 $self->update_slider; 1203 $self->update_slider;
1097
1098 $self->SUPER::invoke_size_allocate ($w, $h) 1204 $self->SUPER::invoke_size_allocate ($w, $h)
1099} 1205}
1100 1206
1101############################################################################# 1207#############################################################################
1102 1208
… …
1252 1358
1253my @border = 1359my @border =
1254 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1360 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); 1361 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1256 1362
1363my @icon =
1364 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1365 qw(x1_move.png x1_resize.png);
1366
1257sub new { 1367sub new {
1258 my ($class, %arg) = @_; 1368 my ($class, %arg) = @_;
1259 1369
1260 my $self = $class->SUPER::new ( 1370 my $self = $class->SUPER::new (
1261 bg => [1, 1, 1, 1], 1371 bg => [1, 1, 1, 1],
… …
1429 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1539 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1430 1540
1431 my $border = $self->border; 1541 my $border = $self->border;
1432 1542
1433 glColor @{ $self->{border_bg} }; 1543 glColor @{ $self->{border_bg} };
1434 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1544 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1435 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1545 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1436 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1546 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1437 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1547 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1548
1549 # move
1550 my $w2 = ($w - $border) * .5;
1551 my $h2 = ($h - $border) * .5;
1552 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1553 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1554 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1555
1556 # resize
1557 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1558 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1559 unless $self->{has_close_button};
1560 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1561 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1438 1562
1439 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1563 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1440 glColor @{ $self->{bg} }; 1564 glColor @{ $self->{bg} };
1441 1565
1442 # TODO: repeat texture not scale 1566 # TODO: repeat texture not scale
… …
1463 1587
1464############################################################################# 1588#############################################################################
1465 1589
1466package CFPlus::UI::Table; 1590package CFPlus::UI::Table;
1467 1591
1468our @ISA = CFPlus::UI::Base::; 1592our @ISA = CFPlus::UI::Container::;
1469 1593
1470use List::Util qw(max sum); 1594use List::Util qw(max sum);
1471 1595
1472use CFPlus::OpenGL; 1596use CFPlus::OpenGL;
1473 1597
1474sub new { 1598sub new {
1475 my $class = shift; 1599 my $class = shift;
1476 1600
1477 $class->SUPER::new ( 1601 $class->SUPER::new (
1478 col_expand => [], 1602 col_expand => [],
1603 row_expand => [],
1479 @_, 1604 @_,
1480 ) 1605 )
1481} 1606}
1482 1607
1483sub children {
1484 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1485}
1486
1487sub add { 1608sub add {
1609 my ($self, @widgets) = @_;
1610
1611 for my $child (@widgets) {
1612 $child->{rowspan} ||= 1;
1613 $child->{colspan} ||= 1;
1614 }
1615
1616 $self->SUPER::add (@widgets);
1617}
1618
1619sub add_at {
1488 my ($self) = shift; 1620 my $self = shift;
1621
1622 my @widgets;
1489 1623
1490 while (@_) { 1624 while (@_) {
1491 my ($x, $y, $child) = splice @_, 0, 3, (); 1625 my ($col, $row, $child) = splice @_, 0, 3, ();
1492 $child->set_parent ($self);
1493 $self->{children}[$y][$x] = $child;
1494 }
1495 1626
1496 $self->{force_realloc} = 1; 1627 $child->{row} = $row;
1497 $self->{force_size_alloc} = 1; 1628 $child->{col} = $col;
1498 $self->realloc;
1499}
1500 1629
1501sub remove { 1630 push @widgets, $child;
1631 }
1632
1633 $self->add (@widgets);
1634}
1635
1636sub get_wh {
1502 my ($self, $child) = @_; 1637 my ($self) = @_;
1503 1638
1504 # TODO: not yet implemented 1639 my (@w, @h);
1505}
1506
1507# TODO: move to container class maybe? send children a signal on removal?
1508sub clear {
1509 my ($self) = @_;
1510 1640
1511 my @children = $self->children; 1641 my @children = $self->children;
1512 delete $self->{children}; 1642
1643 # first pass, columns
1644 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1645 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1646
1647 my $sw = sum @w[$c .. $c + $cs - 1];
1648
1649 if ($w > $sw) {
1650 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1651 }
1513 1652 }
1514 for (@children) {
1515 delete $_->{parent};
1516 $_->hide;
1517 }
1518 1653
1519 $self->realloc; 1654 # second pass, rows
1520} 1655 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)}; 1656 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1535 1657
1536 $w[$x] = max $w[$x], $w; 1658 my $sh = sum @h[$r .. $r + $rs - 1];
1537 $h[$y] = max $h[$y], $h; 1659
1660 if ($h > $sh) {
1661 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1538 } 1662 }
1539 } 1663 }
1540 1664
1541 (\@w, \@h) 1665 (\@w, \@h)
1542} 1666}
… …
1558 my ($ws, $hs) = $self->get_wh; 1682 my ($ws, $hs) = $self->get_wh;
1559 1683
1560 my $req_w = (sum @$ws) || 1; 1684 my $req_w = (sum @$ws) || 1;
1561 my $req_h = (sum @$hs) || 1; 1685 my $req_h = (sum @$hs) || 1;
1562 1686
1563 # TODO: nicer code && do row_expand 1687 # now linearly scale the rows/columns to the allocated size
1564 my @col_expand = @{$self->{col_expand}}; 1688 my @col_expand = @{$self->{col_expand}};
1565 @col_expand = (1) x @$ws unless @col_expand; 1689 @col_expand = (1) x @$ws unless @col_expand;
1566 my $col_expand = (sum @col_expand) || 1; 1690 my $col_expand = (sum @col_expand) || 1;
1567 1691
1568 # linearly scale sizes
1569 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1692 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1570 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1571 1693
1572 CFPlus::UI::harmonize $ws; 1694 CFPlus::UI::harmonize $ws;
1695
1696 my @row_expand = @{$self->{row_expand}};
1697 @row_expand = (1) x @$ws unless @row_expand;
1698 my $row_expand = (sum @row_expand) || 1;
1699
1700 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1701
1573 CFPlus::UI::harmonize $hs; 1702 CFPlus::UI::harmonize $hs;
1574 1703
1575 my $y; 1704 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1705 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1576 1706
1577 for my $r (0 .. $#{$self->{children}}) { 1707 for my $widget ($self->children) {
1578 my $row = $self->{children}[$r] 1708 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1579 or next;
1580 1709
1581 my $x = 0; 1710 $widget->configure (
1582 my $row_h = $hs->[$r]; 1711 $x[$c], $y[$r],
1712 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1583 1713 );
1584 for my $c (0 .. $#$row) { 1714 }
1585 my $col_w = $ws->[$c];
1586 1715
1587 if (my $widget = $row->[$c]) { 1716 1
1588 $widget->configure ($x, $y, $col_w, $row_h); 1717}
1589 }
1590 1718
1591 $x += $col_w; 1719#############################################################################
1720
1721package CFPlus::UI::Fixed;
1722
1723use List::Util qw(min max);
1724
1725our @ISA = CFPlus::UI::Container::;
1726
1727sub add {
1728 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1729
1730 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1731 $self->SUPER::add ($child);
1732}
1733
1734sub _scale($$$) {
1735 my ($mode, $val, $max) = @_;
1736
1737 $mode eq "abs" ? $val
1738 : $mode eq "rel" ? $val * $max
1739 : 0
1740}
1741
1742sub size_request {
1743 my ($self) = @_;
1744
1745 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1746
1747 # determine overall size by querying abs widgets
1748 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1750
1751 if ($pos eq "abs") {
1752 $w = _scale $size, $w, $child->{req_w};
1753 $h = _scale $size, $h, $child->{req_h};
1754
1755 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1756 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1592 } 1757 }
1758 }
1593 1759
1594 $y += $row_h; 1760 my $W = $x2 - $x1;
1761 my $H = $y2 - $y1;
1762
1763 # now layout remaining widgets
1764 for my $child ($self->visible_children) {
1765 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1766
1767 if ($pos ne "abs") {
1768 $x = _scale $pos, $x, $W;
1769 $y = _scale $pos, $x, $H;
1770 $w = _scale $size, $w, $child->{req_w};
1771 $h = _scale $size, $h, $child->{req_h};
1772
1773 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1774 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1775 }
1776 }
1777
1778 my $W = $x2 - $x1;
1779 my $H = $y2 - $y1;
1780
1781 ($W, $H)
1782}
1783
1784sub invoke_size_allocate {
1785 my ($self, $W, $H) = @_;
1786
1787 for my $child ($self->visible_children) {
1788 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1789
1790 $x = _scale $pos, $x, $W;
1791 $y = _scale $pos, $x, $H;
1792 $w = _scale $size, $w, $child->{req_w};
1793 $h = _scale $size, $h, $child->{req_h};
1794
1795 $child->configure ($x, $y, $w, $h);
1595 } 1796 }
1596 1797
1597 1 1798 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} 1799}
1623 1800
1624############################################################################# 1801#############################################################################
1625 1802
1626package CFPlus::UI::Box; 1803package CFPlus::UI::Box;
… …
1967 my $sym = $ev->{sym}; 2144 my $sym = $ev->{sym};
1968 my $uni = $ev->{unicode}; 2145 my $uni = $ev->{unicode};
1969 2146
1970 my $text = $self->get_text; 2147 my $text = $self->get_text;
1971 2148
2149 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2150
1972 if ($uni == 8) { 2151 if ($uni == 8) {
1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2152 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974 } elsif ($uni == 127) { 2153 } elsif ($uni == 127) {
1975 substr $text, $self->{cursor}, 1, ""; 2154 substr $text, $self->{cursor}, 1, "";
1976 } elsif ($sym == CFPlus::SDLK_LEFT) { 2155 } elsif ($sym == CFPlus::SDLK_LEFT) {
1977 --$self->{cursor} if $self->{cursor}; 2156 --$self->{cursor} if $self->{cursor};
1978 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2157 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1979 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2158 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1980 } elsif ($sym == CFPlus::SDLK_HOME) { 2159 } elsif ($sym == CFPlus::SDLK_HOME) {
2160 # what a hack
1981 $self->{cursor} = 0; 2161 $self->{cursor} =
2162 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2163 ? length $1
2164 : 0;
1982 } elsif ($sym == CFPlus::SDLK_END) { 2165 } elsif ($sym == CFPlus::SDLK_END) {
2166 # uh, again
2167 $self->{cursor} =
2168 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1983 $self->{cursor} = length $text; 2169 ? $self->{cursor} + length $1
2170 : length $self->{text};
1984 } elsif ($uni == 21) { # ctrl-u 2171 } elsif ($uni == 21) { # ctrl-u
1985 $text = ""; 2172 $text = "";
1986 $self->{cursor} = 0; 2173 $self->{cursor} = 0;
1987 } elsif ($uni == 27) { 2174 } elsif ($uni == 27) {
1988 $self->emit ('escape'); 2175 $self->emit ('escape');
1989 } elsif ($uni >= 0x20 || $uni == 0x0d) { 2176 } elsif ($uni == 0x0d) {
2177 substr $text, $self->{cursor}++, 0, "\012";
2178 } elsif ($uni >= 0x20) {
1990 substr $text, $self->{cursor}++, 0, chr $uni; 2179 substr $text, $self->{cursor}++, 0, chr $uni;
1991 } else { 2180 } else {
1992 return 0; 2181 return 0;
1993 } 2182 }
1994 2183
… …
2172 2361
2173use CFPlus::OpenGL; 2362use CFPlus::OpenGL;
2174 2363
2175my @tex = 2364my @tex =
2176 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2365 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2177 qw(b1_button_active.png); 2366 qw(b1_button_inactive.png b1_button_active.png);
2178 2367
2179sub new { 2368sub new {
2180 my $class = shift; 2369 my $class = shift;
2181 2370
2182 $class->SUPER::new ( 2371 $class->SUPER::new (
2183 padding_x => 4, 2372 padding_x => 4,
2184 padding_y => 4, 2373 padding_y => 4,
2185 fg => [1, 1, 1], 2374 fg => [1.0, 1.0, 1.0],
2186 active_fg => [0, 0, 1], 2375 active_fg => [0.8, 0.8, 0.8],
2187 can_hover => 1, 2376 can_hover => 1,
2188 align => 0, 2377 align => 0,
2189 valign => 0, 2378 valign => 0,
2190 can_events => 1, 2379 can_events => 1,
2191 @_ 2380 @_
… …
2209 2398
2210 glEnable GL_TEXTURE_2D; 2399 glEnable GL_TEXTURE_2D;
2211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2212 glColor 0, 0, 0, 1; 2401 glColor 0, 0, 0, 1;
2213 2402
2403 my $tex = $tex[$GRAB == $self];
2214 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2404 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2215 2405
2216 glDisable GL_TEXTURE_2D; 2406 glDisable GL_TEXTURE_2D;
2217 2407
2218 $self->SUPER::_draw; 2408 $self->SUPER::_draw;
2219} 2409}
… …
2698sub invoke_mouse_wheel { 2888sub invoke_mouse_wheel {
2699 my ($self, $ev) = @_; 2889 my ($self, $ev) = @_;
2700 2890
2701 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2891 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2702 2892
2893 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2894
2703 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2895 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2704 2896
2705 ! ! $delta 2897 ! ! $delta
2706} 2898}
2707 2899
2708sub update { 2900sub update {
… …
2818 #font => default_font 3010 #font => default_font
2819 @_, 3011 @_,
2820 3012
2821 layout => (new CFPlus::Layout), 3013 layout => (new CFPlus::Layout),
2822 par => [], 3014 par => [],
3015 max_par => 0,
2823 height => 0, 3016 height => 0,
2824 children => [ 3017 children => [
2825 (new CFPlus::UI::Empty expand => 1), 3018 (new CFPlus::UI::Empty expand => 1),
2826 (new CFPlus::UI::Slider vertical => 1), 3019 (new CFPlus::UI::Slider vertical => 1),
2827 ], 3020 ],
… …
2950 wrapped => 1, 3143 wrapped => 1,
2951 }; 3144 };
2952 3145
2953 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3146 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2954 push @{$self->{par}}, $para; 3147 push @{$self->{par}}, $para;
3148 }
3149
3150 if (my $max = $self->{max_par}) {
3151 shift @{$self->{par}} while @{$self->{par}} > $max;
2955 } 3152 }
2956 3153
2957 $self->{need_reflow}++; 3154 $self->{need_reflow}++;
2958 $self->update; 3155 $self->update;
2959} 3156}
… …
3267 3464
3268sub new { 3465sub new {
3269 my $class = shift; 3466 my $class = shift;
3270 3467
3271 my $self = $class->SUPER::new ( 3468 my $self = $class->SUPER::new (
3469 size_w => 32,
3470 size_h => 8,
3272 aspect => 1, 3471 aspect => 1,
3273 can_events => 0, 3472 can_events => 0,
3274 @_, 3473 @_,
3275 ); 3474 );
3276 3475
3277 if ($self->{anim} && $self->{animspeed}) { 3476 if ($self->{anim} && $self->{animspeed}) {
3278 CFPlus::weaken (my $widget = $self); 3477 CFPlus::weaken (my $widget = $self);
3279 3478
3479 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3480 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3280 $self->{timer} = Event->timer ( 3481 $self->{timer} = Event->timer (
3281 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3282 hard => 1, 3482 parked => 1,
3283 interval => $self->{animspeed},
3284 cb => sub { 3483 cb => sub {
3484 return unless $::CONN && $widget;
3485
3285 ++$widget->{frame}; 3486 ++$widget->{frame};
3487 $widget->update_face;
3286 $widget->update; 3488 $widget->update;
3489
3490 $widget->update_timer;
3287 }, 3491 },
3288 ); 3492 );
3493
3494 $self->update_face;
3495 $self->update_timer;
3289 } 3496 }
3290 3497
3291 $self 3498 $self
3292} 3499}
3293 3500
3501sub update_timer {
3502 my ($self) = @_;
3503
3504 return unless $self->{timer};
3505
3506 if ($self->{visible}) {
3507 $self->{timer}->at (
3508 $self->{anim_start}
3509 + $self->{animspeed}
3510 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3511 );
3512 $self->{timer}->start;
3513 } else {
3514 $self->{timer}->stop;
3515 }
3516}
3517
3518sub update_face {
3519 my ($self) = @_;
3520
3521 return unless $::CONN;
3522
3523 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3524 if ($anim && @$anim) {
3525 delete $self->{wait_face};
3526 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3527 }
3528 }
3529}
3530
3294sub size_request { 3531sub size_request {
3295 (32, 8) 3532 my ($self) = @_;
3533
3534 if ($::CONN) {
3535 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3536 if (my $tex = $::CONN->{texture}[$faceid]) {
3537 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3538 } else {
3539 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3540 $self->realloc;
3541 });
3542 }
3543 }
3544 }
3545
3546 ($self->{size_w} || 8, $self->{size_h} || 8)
3296} 3547}
3297 3548
3298sub update { 3549sub update {
3299 my ($self) = @_; 3550 my ($self) = @_;
3300 3551
3301 return unless $self->{visible}; 3552 return unless $self->{visible};
3302 3553
3303 $self->SUPER::update; 3554 $self->SUPER::update;
3304} 3555}
3305 3556
3557sub invoke_visibility_change {
3558 my ($self) = @_;
3559
3560 $self->update_timer;
3561
3562 0
3563}
3564
3306sub _draw { 3565sub _draw {
3307 my ($self) = @_; 3566 my ($self) = @_;
3308 3567
3309 return unless $::CONN; 3568 return unless $::CONN;
3310 3569
3311 $self->SUPER::_draw; 3570 $self->SUPER::_draw;
3312 3571
3313 my $face;
3314
3315 if ($self->{frame}) {
3316 my $anim = $::CONN->{anim}[$self->{anim}]; 3572 my $faceid = $::CONN->{faceid}[$self->{face}]
3317 3573 or return;
3318 $face = $anim->[ $self->{frame} % @$anim ]
3319 if $anim && @$anim;
3320 }
3321 3574
3322 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3575 my $tex = $::CONN->{texture}[$faceid];
3323 3576
3324 if ($tex) { 3577 if ($tex) {
3325 glEnable GL_TEXTURE_2D; 3578 glEnable GL_TEXTURE_2D;
3326 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3579 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3327 glColor 0, 0, 0, 1; 3580 glColor 0, 0, 0, 1;
… …
3331} 3584}
3332 3585
3333sub destroy { 3586sub destroy {
3334 my ($self) = @_; 3587 my ($self) = @_;
3335 3588
3336 $self->{timer}->cancel 3589 (delete $self->{timer})->cancel
3337 if $self->{timer}; 3590 if $self->{timer};
3338 3591
3339 $self->SUPER::destroy; 3592 $self->SUPER::destroy;
3340} 3593}
3341 3594
… …
3985 while ($self->{post_alloc_hook}) { 4238 while ($self->{post_alloc_hook}) {
3986 $_->() 4239 $_->()
3987 for values %{delete $self->{post_alloc_hook}}; 4240 for values %{delete $self->{post_alloc_hook}};
3988 } 4241 }
3989 4242
3990
3991 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4243 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3992 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4244 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3993 glClear GL_COLOR_BUFFER_BIT; 4245 glClear GL_COLOR_BUFFER_BIT;
3994 4246
3995 glMatrixMode GL_PROJECTION; 4247 glMatrixMode GL_PROJECTION;

Diff Legend

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