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.361 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.392 by root, Sat Jul 21 13:37:09 2007 UTC

1package CFPlus::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFPlus; 9use CFPlus;
11use CFPlus::Pod; 10use CFPlus::Pod;
… …
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24 if (!$GRAB) { 23 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 28 $TOOLTIP->hide;
29 29
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 32
32 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
33 34
34 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
35 36
… …
43 } 44 }
44 } 45 }
45 } 46 }
46 47
47 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
49}); 51});
50 52
51sub get_layout { 53sub get_layout {
52 my $layout; 54 my $layout;
… …
111 } 113 }
112 114
113 if ($GRAB) { 115 if ($GRAB) {
114 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
115 # mousewheel 117 # mousewheel
116 $ev->{dx} = 0;
117 $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
118 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
119 } else { 125 } else {
120 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
121 } 127 }
122 } 128 }
… …
235 h => undef, 241 h => undef,
236 can_events => 1, 242 can_events => 1,
237 @_ 243 @_
238 }, $class; 244 }, $class;
239 245
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 247
242 for (keys %$self) { 248 for (keys %$self) {
243 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
245 } 251 }
… …
266 $self->hide; 272 $self->hide;
267 $self->emit ("destroy"); 273 $self->emit ("destroy");
268 %$self = (); 274 %$self = ();
269} 275}
270 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
271sub show { 281sub show {
272 my ($self) = @_; 282 my ($self) = @_;
273 283
274 return if $self->{parent}; 284 return if $self->{parent};
275 285
… …
314sub set_visibility { 324sub set_visibility {
315 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
316 326
317 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
318 328
319 $visible ? $self->hide 329 $visible ? $self->show
320 : $self->show; 330 : $self->hide;
321} 331}
322 332
323sub toggle_visibility { 333sub toggle_visibility {
324 my ($self) = @_; 334 my ($self) = @_;
325 335
… …
530 ? $args[0]->xy ($self) 540 ? $args[0]->xy ($self)
531 : (); 541 : ();
532 542
533 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
534 544
535 #d##TODO# stop propagating at first true, do not use sum 545 for my $cb (
536 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 546 @{$self->{signal_cb}{$signal} || []}, # before
537 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
538 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
539} 554}
540 555
541sub find_widget { 556#sub find_widget {
542 my ($self, $x, $y) = @_; 557# in .xs
543
544 return () unless $self->{can_events};
545
546 return $self
547 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
548 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
549
550 ()
551}
552 558
553sub set_parent { 559sub set_parent {
554 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
555 561
556 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
557 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
558} 564}
559 565
560sub realloc { 566sub realloc {
561 my ($self) = @_; 567 my ($self) = @_;
… …
640 my ($self) = @_; 646 my ($self) = @_;
641 647
642 warn "no draw defined for $self\n"; 648 warn "no draw defined for $self\n";
643} 649}
644 650
651my $cntx;#d#
645sub DESTROY { 652sub DESTROY {
646 my ($self) = @_; 653 my ($self) = @_;
647 654
648 return if CFPlus::in_destruct; 655 return if CFPlus::in_destruct;
649 656
… …
734 can_events => 0, 741 can_events => 0,
735 %arg, 742 %arg,
736 ); 743 );
737 744
738 $self->add (@$children) 745 $self->add (@$children)
739 if $children; 746 if $children && @$children;
740 747
741 $self 748 $self
742} 749}
743 750
744sub realloc { 751sub realloc {
… …
753 my ($self, @widgets) = @_; 760 my ($self, @widgets) = @_;
754 761
755 $_->set_parent ($self) 762 $_->set_parent ($self)
756 for @widgets; 763 for @widgets;
757 764
765 # TODO: only do this in widgets that need it, e.g. root, fixed
758 use sort 'stable'; 766 use sort 'stable';
759 767
760 $self->{children} = [ 768 $self->{children} = [
761 sort { $a->{z} <=> $b->{z} } 769 sort { $a->{z} <=> $b->{z} }
762 @{$self->{children}}, @widgets 770 @{$self->{children}}, @widgets
… …
931} 939}
932 940
933############################################################################# 941#############################################################################
934 942
935package CFPlus::UI::ViewPort; 943package CFPlus::UI::ViewPort;
944
945use List::Util qw(min max);
936 946
937our @ISA = CFPlus::UI::Window::; 947our @ISA = CFPlus::UI::Window::;
938 948
939sub new { 949sub new {
940 my $class = shift; 950 my $class = shift;
… …
949sub size_request { 959sub size_request {
950 my ($self) = @_; 960 my ($self) = @_;
951 961
952 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
953 963
954 $w = 10 if $self->{scroll_x}; 964 $w = 1 if $self->{scroll_x};
955 $h = 10 if $self->{scroll_y}; 965 $h = 1 if $self->{scroll_y};
956 966
957 ($w, $h) 967 ($w, $h)
958} 968}
959 969
960sub invoke_size_allocate { 970sub invoke_size_allocate {
… …
972} 982}
973 983
974sub set_offset { 984sub set_offset {
975 my ($self, $x, $y) = @_; 985 my ($self, $x, $y) = @_;
976 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}) {
977 $self->{view_x} = int $x; 991 $self->{view_x} = $x;
978 $self->{view_y} = int $y; 992 $self->{view_y} = $y;
979 993
994 $self->emit (changed => $x, $y);
980 $self->update; 995 $self->update;
996 }
981} 997}
982 998
983# 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
984sub coord2local { 1000sub coord2local {
985 my ($self, $x, $y) = @_; 1001 my ($self, $x, $y) = @_;
… …
1000 my ($self, $x, $y) = @_; 1016 my ($self, $x, $y) = @_;
1001 1017
1002 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1018 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1003 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1019 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1004 ) { 1020 ) {
1005 $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})
1006 } else { 1022 } else {
1007 $self->CFPlus::UI::Base::find_widget ($x, $y) 1023 $self->CFPlus::UI::Base::find_widget ($x, $y)
1008 } 1024 }
1009} 1025}
1010 1026
… …
1021 1037
1022############################################################################# 1038#############################################################################
1023 1039
1024package CFPlus::UI::ScrolledWindow; 1040package CFPlus::UI::ScrolledWindow;
1025 1041
1026our @ISA = CFPlus::UI::HBox::; 1042our @ISA = CFPlus::UI::Table::;
1027 1043
1028sub new { 1044sub new {
1029 my ($class, %arg) = @_; 1045 my ($class, %arg) = @_;
1030 1046
1031 my $child = delete $arg{child}; 1047 my $child = delete $arg{child};
1032 1048
1033 my $self; 1049 my $self;
1034 1050
1035 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,
1036 vertical => 1, 1065 vertical => 1,
1037 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1038 on_changed => sub { 1067 on_changed => sub {
1039 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1040 }, 1070 },
1041 ; 1071 ;
1042 1072
1043 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1044 vp => (new CFPlus::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1045 can_events => 1, 1076 can_events => 1,
1046 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1047 %arg, 1081 %arg,
1048 ); 1082 );
1049 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
1050 $self->SUPER::add ($self->{vp}, $self->{slider}); 1100 $self->SUPER::add ($self->{vp});
1101
1051 $self->add ($child) if $child; 1102 $self->add ($child) if $child;
1052 1103
1053 $self 1104 $self
1054} 1105}
1055 1106
1056#TODO# update range on size_allocate depending on child 1107#TODO# update range on size_allocate depending on child?
1057 1108
1058sub add { 1109sub add {
1059 my ($self, $widget) = @_; 1110 my ($self, $widget) = @_;
1060 1111
1061 $self->{vp}->add ($self->{child} = $widget); 1112 $self->{vp}->add ($self->{child} = $widget);
1062} 1113}
1063 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 $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 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider});
1136 }
1137}
1138
1139sub update {
1140 my ($self) = @_;
1141
1142 $self->update_slider;
1143 $self->SUPER::update;
1144}
1145
1064sub invoke_mouse_wheel { 1146sub invoke_mouse_wheel {
1065 my ($self, $ev) = @_; 1147 my ($self, $ev) = @_;
1066 1148
1067 return 0 unless $ev->{dy}; # only vertical movements
1068
1069 $self->{slider}->emit (mouse_wheel => $ev); 1149 $self->{vslider}->emit (mouse_wheel => $ev)
1150 if $ev->{dy};
1151
1152 $self->{hslider}->emit (mouse_wheel => $ev)
1153 if $ev->{dx};
1070 1154
1071 1 1155 1
1072} 1156}
1073 1157
1074sub update_slider { 1158sub invoke_button_down {
1075 my ($self) = @_; 1159 my ($self, $ev, $x, $y) = @_;
1076 1160
1077 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1161 if ($ev->{button} == 2) {
1078} 1162 $self->grab_focus;
1079 1163
1080sub update { 1164 my $ox = $self->{vp}{view_x} + $ev->{x};
1081 my ($self) = @_; 1165 my $oy = $self->{vp}{view_y} + $ev->{y};
1166
1167 $self->{motion} = sub {
1168 my ($ev, $x, $y) = @_;
1082 1169
1083 $self->SUPER::update; 1170 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1171 $self->update;
1172 };
1084 1173
1085 $self->update_slider; 1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_button_up {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if (delete $self->{motion}) {
1184 return 1;
1185 }
1186
1187 0
1188}
1189
1190sub invoke_mouse_motion {
1191 my ($self, $ev, $x, $y) = @_;
1192
1193 if ($self->{motion}) {
1194 $self->{motion}->($ev, $x, $y);
1195 return 1;
1196 }
1197
1198 0
1086} 1199}
1087 1200
1088sub invoke_size_allocate { 1201sub invoke_size_allocate {
1089 my ($self, $w, $h) = @_; 1202 my ($self, $w, $h) = @_;
1090 1203
1091 $self->update_slider; 1204 $self->update_slider;
1092
1093 $self->SUPER::invoke_size_allocate ($w, $h) 1205 $self->SUPER::invoke_size_allocate ($w, $h)
1094} 1206}
1095 1207
1096############################################################################# 1208#############################################################################
1097 1209
… …
1247 1359
1248my @border = 1360my @border =
1249 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1250 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1362 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1251 1363
1364my @icon =
1365 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1366 qw(x1_move.png x1_resize.png);
1367
1252sub new { 1368sub new {
1253 my ($class, %arg) = @_; 1369 my ($class, %arg) = @_;
1254 1370
1255 my $self = $class->SUPER::new ( 1371 my $self = $class->SUPER::new (
1256 bg => [1, 1, 1, 1], 1372 bg => [1, 1, 1, 1],
… …
1424 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1540 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1425 1541
1426 my $border = $self->border; 1542 my $border = $self->border;
1427 1543
1428 glColor @{ $self->{border_bg} }; 1544 glColor @{ $self->{border_bg} };
1429 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1545 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1430 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1546 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1431 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1547 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1432 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1548 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1549
1550 # move
1551 my $w2 = ($w - $border) * .5;
1552 my $h2 = ($h - $border) * .5;
1553 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1554 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1555 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1556
1557 # resize
1558 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1559 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1560 unless $self->{has_close_button};
1561 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1562 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1433 1563
1434 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1564 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1435 glColor @{ $self->{bg} }; 1565 glColor @{ $self->{bg} };
1436 1566
1437 # TODO: repeat texture not scale 1567 # TODO: repeat texture not scale
… …
1458 1588
1459############################################################################# 1589#############################################################################
1460 1590
1461package CFPlus::UI::Table; 1591package CFPlus::UI::Table;
1462 1592
1463our @ISA = CFPlus::UI::Base::; 1593our @ISA = CFPlus::UI::Container::;
1464 1594
1465use List::Util qw(max sum); 1595use List::Util qw(max sum);
1466 1596
1467use CFPlus::OpenGL; 1597use CFPlus::OpenGL;
1468 1598
1469sub new { 1599sub new {
1470 my $class = shift; 1600 my $class = shift;
1471 1601
1472 $class->SUPER::new ( 1602 $class->SUPER::new (
1473 col_expand => [], 1603 col_expand => [],
1604 row_expand => [],
1474 @_, 1605 @_,
1475 ) 1606 )
1476} 1607}
1477 1608
1478sub children {
1479 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1480}
1481
1482sub add { 1609sub add {
1610 my ($self, @widgets) = @_;
1611
1612 for my $child (@widgets) {
1613 $child->{rowspan} ||= 1;
1614 $child->{colspan} ||= 1;
1615 }
1616
1617 $self->SUPER::add (@widgets);
1618}
1619
1620sub add_at {
1483 my ($self) = shift; 1621 my $self = shift;
1622
1623 my @widgets;
1484 1624
1485 while (@_) { 1625 while (@_) {
1486 my ($x, $y, $child) = splice @_, 0, 3, (); 1626 my ($col, $row, $child) = splice @_, 0, 3, ();
1487 $child->set_parent ($self);
1488 $self->{children}[$y][$x] = $child;
1489 }
1490 1627
1491 $self->{force_realloc} = 1; 1628 $child->{row} = $row;
1492 $self->{force_size_alloc} = 1; 1629 $child->{col} = $col;
1493 $self->realloc;
1494}
1495 1630
1496sub remove { 1631 push @widgets, $child;
1632 }
1633
1634 $self->add (@widgets);
1635}
1636
1637sub get_wh {
1497 my ($self, $child) = @_; 1638 my ($self) = @_;
1498 1639
1499 # TODO: not yet implemented 1640 my (@w, @h);
1500}
1501
1502# TODO: move to container class maybe? send children a signal on removal?
1503sub clear {
1504 my ($self) = @_;
1505 1641
1506 my @children = $self->children; 1642 my @children = $self->children;
1507 delete $self->{children}; 1643
1644 # first pass, columns
1645 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1646 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1647
1648 my $sw = sum @w[$c .. $c + $cs - 1];
1649
1650 if ($w > $sw) {
1651 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
1652 }
1508 1653 }
1509 for (@children) {
1510 delete $_->{parent};
1511 $_->hide;
1512 }
1513 1654
1514 $self->realloc; 1655 # second pass, rows
1515} 1656 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1516
1517sub get_wh {
1518 my ($self) = @_;
1519
1520 my (@w, @h);
1521
1522 for my $y (0 .. $#{$self->{children}}) {
1523 my $row = $self->{children}[$y]
1524 or next;
1525
1526 for my $x (0 .. $#$row) {
1527 my $widget = $row->[$x]
1528 or next;
1529 my ($w, $h) = @$widget{qw(req_w req_h)}; 1657 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1530 1658
1531 $w[$x] = max $w[$x], $w; 1659 my $sh = sum @h[$r .. $r + $rs - 1];
1532 $h[$y] = max $h[$y], $h; 1660
1661 if ($h > $sh) {
1662 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1533 } 1663 }
1534 } 1664 }
1535 1665
1536 (\@w, \@h) 1666 (\@w, \@h)
1537} 1667}
… …
1553 my ($ws, $hs) = $self->get_wh; 1683 my ($ws, $hs) = $self->get_wh;
1554 1684
1555 my $req_w = (sum @$ws) || 1; 1685 my $req_w = (sum @$ws) || 1;
1556 my $req_h = (sum @$hs) || 1; 1686 my $req_h = (sum @$hs) || 1;
1557 1687
1558 # TODO: nicer code && do row_expand 1688 # now linearly scale the rows/columns to the allocated size
1559 my @col_expand = @{$self->{col_expand}}; 1689 my @col_expand = @{$self->{col_expand}};
1560 @col_expand = (1) x @$ws unless @col_expand; 1690 @col_expand = (1) x @$ws unless @col_expand;
1561 my $col_expand = (sum @col_expand) || 1; 1691 my $col_expand = (sum @col_expand) || 1;
1562 1692
1563 # linearly scale sizes
1564 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1693 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1565 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1566 1694
1567 CFPlus::UI::harmonize $ws; 1695 CFPlus::UI::harmonize $ws;
1696
1697 my @row_expand = @{$self->{row_expand}};
1698 @row_expand = (1) x @$ws unless @row_expand;
1699 my $row_expand = (sum @row_expand) || 1;
1700
1701 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1702
1568 CFPlus::UI::harmonize $hs; 1703 CFPlus::UI::harmonize $hs;
1569 1704
1570 my $y; 1705 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1706 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1571 1707
1572 for my $r (0 .. $#{$self->{children}}) { 1708 for my $widget ($self->children) {
1573 my $row = $self->{children}[$r] 1709 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1574 or next;
1575 1710
1576 my $x = 0; 1711 $widget->configure (
1577 my $row_h = $hs->[$r]; 1712 $x[$c], $y[$r],
1713 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1578 1714 );
1579 for my $c (0 .. $#$row) { 1715 }
1580 my $col_w = $ws->[$c];
1581 1716
1582 if (my $widget = $row->[$c]) { 1717 1
1583 $widget->configure ($x, $y, $col_w, $row_h); 1718}
1584 }
1585 1719
1586 $x += $col_w; 1720#############################################################################
1721
1722package CFPlus::UI::Fixed;
1723
1724use List::Util qw(min max);
1725
1726our @ISA = CFPlus::UI::Container::;
1727
1728sub add {
1729 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1730
1731 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1732 $self->SUPER::add ($child);
1733}
1734
1735sub _scale($$$) {
1736 my ($mode, $val, $max) = @_;
1737
1738 $mode eq "abs" ? $val
1739 : $mode eq "rel" ? $val * $max
1740 : 0
1741}
1742
1743sub size_request {
1744 my ($self) = @_;
1745
1746 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1747
1748 # determine overall size by querying abs widgets
1749 for my $child ($self->visible_children) {
1750 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1751
1752 if ($pos eq "abs") {
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1757 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1587 } 1758 }
1759 }
1588 1760
1589 $y += $row_h; 1761 my $W = $x2 - $x1;
1762 my $H = $y2 - $y1;
1763
1764 # now layout remaining widgets
1765 for my $child ($self->visible_children) {
1766 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1767
1768 if ($pos ne "abs") {
1769 $x = _scale $pos, $x, $W;
1770 $y = _scale $pos, $x, $H;
1771 $w = _scale $size, $w, $child->{req_w};
1772 $h = _scale $size, $h, $child->{req_h};
1773
1774 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1775 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1776 }
1777 }
1778
1779 my $W = $x2 - $x1;
1780 my $H = $y2 - $y1;
1781
1782 ($W, $H)
1783}
1784
1785sub invoke_size_allocate {
1786 my ($self, $W, $H) = @_;
1787
1788 for my $child ($self->visible_children) {
1789 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1790
1791 $x = _scale $pos, $x, $W;
1792 $y = _scale $pos, $x, $H;
1793 $w = _scale $size, $w, $child->{req_w};
1794 $h = _scale $size, $h, $child->{req_h};
1795
1796 $child->configure ($x, $y, $w, $h);
1590 } 1797 }
1591 1798
1592 1 1799 1
1593}
1594
1595sub find_widget {
1596 my ($self, $x, $y) = @_;
1597
1598 $x -= $self->{x};
1599 $y -= $self->{y};
1600
1601 my $res;
1602
1603 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1604 $res = $_->find_widget ($x, $y)
1605 and return $res;
1606 }
1607
1608 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1609}
1610
1611sub _draw {
1612 my ($self) = @_;
1613
1614 for (grep $_, @{$self->{children}}) {
1615 $_->draw for grep $_, @$_;
1616 }
1617} 1800}
1618 1801
1619############################################################################# 1802#############################################################################
1620 1803
1621package CFPlus::UI::Box; 1804package CFPlus::UI::Box;
… …
1962 my $sym = $ev->{sym}; 2145 my $sym = $ev->{sym};
1963 my $uni = $ev->{unicode}; 2146 my $uni = $ev->{unicode};
1964 2147
1965 my $text = $self->get_text; 2148 my $text = $self->get_text;
1966 2149
2150 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2151
1967 if ($uni == 8) { 2152 if ($uni == 8) {
1968 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2153 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1969 } elsif ($uni == 127) { 2154 } elsif ($uni == 127) {
1970 substr $text, $self->{cursor}, 1, ""; 2155 substr $text, $self->{cursor}, 1, "";
1971 } elsif ($sym == CFPlus::SDLK_LEFT) { 2156 } elsif ($sym == CFPlus::SDLK_LEFT) {
1972 --$self->{cursor} if $self->{cursor}; 2157 --$self->{cursor} if $self->{cursor};
1973 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2158 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1974 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2159 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1975 } elsif ($sym == CFPlus::SDLK_HOME) { 2160 } elsif ($sym == CFPlus::SDLK_HOME) {
2161 # what a hack
1976 $self->{cursor} = 0; 2162 $self->{cursor} =
2163 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2164 ? length $1
2165 : 0;
1977 } elsif ($sym == CFPlus::SDLK_END) { 2166 } elsif ($sym == CFPlus::SDLK_END) {
2167 # uh, again
2168 $self->{cursor} =
2169 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1978 $self->{cursor} = length $text; 2170 ? $self->{cursor} + length $1
2171 : length $self->{text};
1979 } elsif ($uni == 21) { # ctrl-u 2172 } elsif ($uni == 21) { # ctrl-u
1980 $text = ""; 2173 $text = "";
1981 $self->{cursor} = 0; 2174 $self->{cursor} = 0;
1982 } elsif ($uni == 27) { 2175 } elsif ($uni == 27) {
1983 $self->emit ('escape'); 2176 $self->emit ('escape');
1984 } elsif ($uni >= 0x20 || $uni == 0x0d) { 2177 } elsif ($uni == 0x0d) {
2178 substr $text, $self->{cursor}++, 0, "\012";
2179 } elsif ($uni >= 0x20) {
1985 substr $text, $self->{cursor}++, 0, chr $uni; 2180 substr $text, $self->{cursor}++, 0, chr $uni;
1986 } else { 2181 } else {
1987 return 0; 2182 return 0;
1988 } 2183 }
1989 2184
… …
2167 2362
2168use CFPlus::OpenGL; 2363use CFPlus::OpenGL;
2169 2364
2170my @tex = 2365my @tex =
2171 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2366 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw(b1_button_active.png); 2367 qw(b1_button_inactive.png b1_button_active.png);
2173 2368
2174sub new { 2369sub new {
2175 my $class = shift; 2370 my $class = shift;
2176 2371
2177 $class->SUPER::new ( 2372 $class->SUPER::new (
2178 padding_x => 4, 2373 padding_x => 4,
2179 padding_y => 4, 2374 padding_y => 4,
2180 fg => [1, 1, 1], 2375 fg => [1.0, 1.0, 1.0],
2181 active_fg => [0, 0, 1], 2376 active_fg => [0.8, 0.8, 0.8],
2182 can_hover => 1, 2377 can_hover => 1,
2183 align => 0, 2378 align => 0,
2184 valign => 0, 2379 valign => 0,
2185 can_events => 1, 2380 can_events => 1,
2186 @_ 2381 @_
… …
2204 2399
2205 glEnable GL_TEXTURE_2D; 2400 glEnable GL_TEXTURE_2D;
2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2207 glColor 0, 0, 0, 1; 2402 glColor 0, 0, 0, 1;
2208 2403
2404 my $tex = $tex[$GRAB == $self];
2209 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2405 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2210 2406
2211 glDisable GL_TEXTURE_2D; 2407 glDisable GL_TEXTURE_2D;
2212 2408
2213 $self->SUPER::_draw; 2409 $self->SUPER::_draw;
2214} 2410}
… …
2310 or Carp::croak "'path' or 'tex' attributes required"; 2506 or Carp::croak "'path' or 'tex' attributes required";
2311 2507
2312 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2508 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2313 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2509 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2314 2510
2315 Scalar::Util::weaken $texture_cache{$self->{path}}; 2511 CFPlus::weaken $texture_cache{$self->{path}};
2316 2512
2317 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2513 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2318 2514
2319 $self 2515 $self
2320} 2516}
… …
2693sub invoke_mouse_wheel { 2889sub invoke_mouse_wheel {
2694 my ($self, $ev) = @_; 2890 my ($self, $ev) = @_;
2695 2891
2696 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2892 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2697 2893
2894 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2895
2698 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2896 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2699 2897
2700 ! ! $delta 2898 ! ! $delta
2701} 2899}
2702 2900
2703sub update { 2901sub update {
… …
2813 #font => default_font 3011 #font => default_font
2814 @_, 3012 @_,
2815 3013
2816 layout => (new CFPlus::Layout), 3014 layout => (new CFPlus::Layout),
2817 par => [], 3015 par => [],
3016 max_par => 0,
2818 height => 0, 3017 height => 0,
2819 children => [ 3018 children => [
2820 (new CFPlus::UI::Empty expand => 1), 3019 (new CFPlus::UI::Empty expand => 1),
2821 (new CFPlus::UI::Slider vertical => 1), 3020 (new CFPlus::UI::Slider vertical => 1),
2822 ], 3021 ],
… …
2945 wrapped => 1, 3144 wrapped => 1,
2946 }; 3145 };
2947 3146
2948 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3147 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2949 push @{$self->{par}}, $para; 3148 push @{$self->{par}}, $para;
3149 }
3150
3151 if (my $max = $self->{max_par}) {
3152 shift @{$self->{par}} while @{$self->{par}} > $max;
2950 } 3153 }
2951 3154
2952 $self->{need_reflow}++; 3155 $self->{need_reflow}++;
2953 $self->update; 3156 $self->update;
2954} 3157}
… …
3262 3465
3263sub new { 3466sub new {
3264 my $class = shift; 3467 my $class = shift;
3265 3468
3266 my $self = $class->SUPER::new ( 3469 my $self = $class->SUPER::new (
3470 size_w => 32,
3471 size_h => 8,
3267 aspect => 1, 3472 aspect => 1,
3268 can_events => 0, 3473 can_events => 0,
3269 @_, 3474 @_,
3270 ); 3475 );
3271 3476
3272 if ($self->{anim} && $self->{animspeed}) { 3477 if ($self->{anim} && $self->{animspeed}) {
3273 Scalar::Util::weaken (my $widget = $self); 3478 CFPlus::weaken (my $widget = $self);
3274 3479
3480 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3481 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3275 $self->{timer} = Event->timer ( 3482 $self->{timer} = Event->timer (
3276 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3277 hard => 1, 3483 parked => 1,
3278 interval => $self->{animspeed},
3279 cb => sub { 3484 cb => sub {
3485 return unless $::CONN && $widget;
3486
3280 ++$widget->{frame}; 3487 ++$widget->{frame};
3488 $widget->update_face;
3281 $widget->update; 3489 $widget->update;
3490
3491 $widget->update_timer;
3282 }, 3492 },
3283 ); 3493 );
3494
3495 $self->update_face;
3496 $self->update_timer;
3284 } 3497 }
3285 3498
3286 $self 3499 $self
3287} 3500}
3288 3501
3502sub update_timer {
3503 my ($self) = @_;
3504
3505 return unless $self->{timer};
3506
3507 if ($self->{visible}) {
3508 $self->{timer}->at (
3509 $self->{anim_start}
3510 + $self->{animspeed}
3511 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3512 );
3513 $self->{timer}->start;
3514 } else {
3515 $self->{timer}->stop;
3516 }
3517}
3518
3519sub update_face {
3520 my ($self) = @_;
3521
3522 return unless $::CONN;
3523
3524 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3525 if ($anim && @$anim) {
3526 delete $self->{wait_face};
3527 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3528 }
3529 }
3530}
3531
3289sub size_request { 3532sub size_request {
3290 (32, 8) 3533 my ($self) = @_;
3534
3535 if ($::CONN) {
3536 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3537 if (my $tex = $::CONN->{texture}[$faceid]) {
3538 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3539 } else {
3540 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3541 $self->realloc;
3542 });
3543 }
3544 }
3545 }
3546
3547 ($self->{size_w} || 8, $self->{size_h} || 8)
3291} 3548}
3292 3549
3293sub update { 3550sub update {
3294 my ($self) = @_; 3551 my ($self) = @_;
3295 3552
3296 return unless $self->{visible}; 3553 return unless $self->{visible};
3297 3554
3298 $self->SUPER::update; 3555 $self->SUPER::update;
3299} 3556}
3300 3557
3558sub invoke_visibility_change {
3559 my ($self) = @_;
3560
3561 $self->update_timer;
3562
3563 0
3564}
3565
3301sub _draw { 3566sub _draw {
3302 my ($self) = @_; 3567 my ($self) = @_;
3303 3568
3304 return unless $::CONN; 3569 return unless $::CONN;
3305 3570
3306 $self->SUPER::_draw; 3571 $self->SUPER::_draw;
3307 3572
3308 my $face;
3309
3310 if ($self->{frame}) {
3311 my $anim = $::CONN->{anim}[$self->{anim}]; 3573 my $faceid = $::CONN->{faceid}[$self->{face}]
3312 3574 or return;
3313 $face = $anim->[ $self->{frame} % @$anim ]
3314 if $anim && @$anim;
3315 }
3316 3575
3317 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3576 my $tex = $::CONN->{texture}[$faceid];
3318 3577
3319 if ($tex) { 3578 if ($tex) {
3320 glEnable GL_TEXTURE_2D; 3579 glEnable GL_TEXTURE_2D;
3321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3580 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3322 glColor 0, 0, 0, 1; 3581 glColor 0, 0, 0, 1;
… …
3326} 3585}
3327 3586
3328sub destroy { 3587sub destroy {
3329 my ($self) = @_; 3588 my ($self) = @_;
3330 3589
3331 $self->{timer}->cancel 3590 (delete $self->{timer})->cancel
3332 if $self->{timer}; 3591 if $self->{timer};
3333 3592
3334 $self->SUPER::destroy; 3593 $self->SUPER::destroy;
3335} 3594}
3336 3595
… …
3532} 3791}
3533 3792
3534sub add { 3793sub add {
3535 my ($self, $title, $widget, $tooltip) = @_; 3794 my ($self, $title, $widget, $tooltip) = @_;
3536 3795
3537 Scalar::Util::weaken $self; 3796 CFPlus::weaken $self;
3538 3797
3539 $self->{buttonbar}->add (new CFPlus::UI::Button 3798 $self->{buttonbar}->add (new CFPlus::UI::Button
3540 markup => $title, 3799 markup => $title,
3541 tooltip => $tooltip, 3800 tooltip => $tooltip,
3542 on_activate => sub { $self->set_current_page ($widget) }, 3801 on_activate => sub { $self->set_current_page ($widget) },
… …
3626 my $self = $class->SUPER::new ( 3885 my $self = $class->SUPER::new (
3627 fontsize => 0.8, 3886 fontsize => 0.8,
3628 @_, 3887 @_,
3629 ); 3888 );
3630 3889
3631 Scalar::Util::weaken (my $this = $self); 3890 CFPlus::weaken (my $this = $self);
3632 3891
3633 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3892 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3634 3893
3635 $self 3894 $self
3636} 3895}
… …
3775 my $self = $class->SUPER::new ( 4034 my $self = $class->SUPER::new (
3776 visible => 1, 4035 visible => 1,
3777 @_, 4036 @_,
3778 ); 4037 );
3779 4038
3780 Scalar::Util::weaken ($self->{root} = $self); 4039 CFPlus::weaken ($self->{root} = $self);
3781 4040
3782 $self 4041 $self
3783} 4042}
3784 4043
3785sub size_request { 4044sub size_request {
… …
3980 while ($self->{post_alloc_hook}) { 4239 while ($self->{post_alloc_hook}) {
3981 $_->() 4240 $_->()
3982 for values %{delete $self->{post_alloc_hook}}; 4241 for values %{delete $self->{post_alloc_hook}};
3983 } 4242 }
3984 4243
3985
3986 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4244 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3987 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4245 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3988 glClear GL_COLOR_BUFFER_BIT; 4246 glClear GL_COLOR_BUFFER_BIT;
3989 4247
3990 glMatrixMode GL_PROJECTION; 4248 glMatrixMode GL_PROJECTION;

Diff Legend

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