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

Diff Legend

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