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.353 by root, Thu Nov 16 19:42:45 2006 UTC vs.
Revision 1.401 by root, Sat Jul 21 20:05:37 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 }
… …
262 268
263sub destroy { 269sub destroy {
264 my ($self) = @_; 270 my ($self) = @_;
265 271
266 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
267 %$self = (); 274 %$self = ();
275}
276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
268} 279}
269 280
270sub show { 281sub show {
271 my ($self) = @_; 282 my ($self) = @_;
272 283
… …
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
… …
502 513
503 defined wantarray and CFPlus::guard { 514 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} }; 516 @{ $self->{signal_cb}{$signal} };
506 } 517 }
518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
507} 524}
508 525
509my %has_coords = ( 526my %has_coords = (
510 button_down => 1, 527 button_down => 1,
511 button_up => 1, 528 button_up => 1,
… …
514); 531);
515 532
516sub emit { 533sub emit {
517 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
518 535
519 # I do not really like this solution, but I dislike duplication 536 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, too. 537 # and needlessly verbose code, either.
521 my @append 538 my @append
522 = $has_coords{$signal} 539 = $has_coords{$signal}
523 ? $args[0]->xy ($self) 540 ? $args[0]->xy ($self)
524 : (); 541 : ();
525 542
526 #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#
527 544
528 #d##TODO# stop propagating at first true, do not use sum 545 for my $cb (
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 546 @{$self->{signal_cb}{$signal} || []}, # before
530 || ($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
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
532} 554}
533 555
534sub find_widget { 556#sub find_widget {
535 my ($self, $x, $y) = @_; 557# in .xs
536
537 return () unless $self->{can_events};
538
539 return $self
540 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
541 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
542
543 ()
544}
545 558
546sub set_parent { 559sub set_parent {
547 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
548 561
549 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
550 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
551} 564}
552 565
553sub realloc { 566sub realloc {
554 my ($self) = @_; 567 my ($self) = @_;
… …
638sub DESTROY { 651sub DESTROY {
639 my ($self) = @_; 652 my ($self) = @_;
640 653
641 return if CFPlus::in_destruct; 654 return if CFPlus::in_destruct;
642 655
643 delete $WIDGET{$self+0};
644
645 eval { $self->destroy }; 656 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 657 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
658
659 delete $WIDGET{$self+0};
647} 660}
648 661
649############################################################################# 662#############################################################################
650 663
651package CFPlus::UI::DrawBG; 664package CFPlus::UI::DrawBG;
… …
727 can_events => 0, 740 can_events => 0,
728 %arg, 741 %arg,
729 ); 742 );
730 743
731 $self->add (@$children) 744 $self->add (@$children)
732 if $children; 745 if $children && @$children;
733 746
734 $self 747 $self
735} 748}
736 749
737sub realloc { 750sub realloc {
… …
746 my ($self, @widgets) = @_; 759 my ($self, @widgets) = @_;
747 760
748 $_->set_parent ($self) 761 $_->set_parent ($self)
749 for @widgets; 762 for @widgets;
750 763
764 # TODO: only do this in widgets that need it, e.g. root, fixed
751 use sort 'stable'; 765 use sort 'stable';
752 766
753 $self->{children} = [ 767 $self->{children} = [
754 sort { $a->{z} <=> $b->{z} } 768 sort { $a->{z} <=> $b->{z} }
755 @{$self->{children}}, @widgets 769 @{$self->{children}}, @widgets
756 ]; 770 ];
757 771
758 $self->realloc; 772 $self->realloc;
773
774 map $_+0, @widgets
759} 775}
760 776
761sub children { 777sub children {
762 @{ $_[0]{children} } 778 @{ $_[0]{children} }
763} 779}
… …
774} 790}
775 791
776sub clear { 792sub clear {
777 my ($self) = @_; 793 my ($self) = @_;
778 794
779 my $children = delete $self->{children}; 795 my $children = $self->{children};
780 $self->{children} = []; 796 $self->{children} = [];
781 797
782 for (@$children) { 798 for (@$children) {
783 delete $_->{parent}; 799 delete $_->{parent};
784 $_->hide; 800 $_->hide;
… …
924} 940}
925 941
926############################################################################# 942#############################################################################
927 943
928package CFPlus::UI::ViewPort; 944package CFPlus::UI::ViewPort;
945
946use List::Util qw(min max);
929 947
930our @ISA = CFPlus::UI::Window::; 948our @ISA = CFPlus::UI::Window::;
931 949
932sub new { 950sub new {
933 my $class = shift; 951 my $class = shift;
… …
942sub size_request { 960sub size_request {
943 my ($self) = @_; 961 my ($self) = @_;
944 962
945 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 963 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946 964
947 $w = 10 if $self->{scroll_x}; 965 $w = 1 if $self->{scroll_x};
948 $h = 10 if $self->{scroll_y}; 966 $h = 1 if $self->{scroll_y};
949 967
950 ($w, $h) 968 ($w, $h)
951} 969}
952 970
953sub invoke_size_allocate { 971sub invoke_size_allocate {
… …
965} 983}
966 984
967sub set_offset { 985sub set_offset {
968 my ($self, $x, $y) = @_; 986 my ($self, $x, $y) = @_;
969 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}) {
970 $self->{view_x} = int $x; 992 $self->{view_x} = $x;
971 $self->{view_y} = int $y; 993 $self->{view_y} = $y;
972 994
995 $self->emit (changed => $x, $y);
973 $self->update; 996 $self->update;
997 }
974} 998}
975 999
976# 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
977sub coord2local { 1001sub coord2local {
978 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
… …
993 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
994 1018
995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
997 ) { 1021 ) {
998 $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})
999 } else { 1023 } else {
1000 $self->CFPlus::UI::Base::find_widget ($x, $y) 1024 $self->CFPlus::UI::Base::find_widget ($x, $y)
1001 } 1025 }
1002} 1026}
1003 1027
… …
1014 1038
1015############################################################################# 1039#############################################################################
1016 1040
1017package CFPlus::UI::ScrolledWindow; 1041package CFPlus::UI::ScrolledWindow;
1018 1042
1019our @ISA = CFPlus::UI::HBox::; 1043our @ISA = CFPlus::UI::Table::;
1020 1044
1021sub new { 1045sub new {
1022 my ($class, %arg) = @_; 1046 my ($class, %arg) = @_;
1023 1047
1024 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
1025 1049
1026 my $self; 1050 my $self;
1027 1051
1028 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,
1029 vertical => 1, 1066 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1068 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1069 $self->{vpos} = $_[1];
1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1071 },
1034 ; 1072 ;
1035 1073
1036 $self = $class->SUPER::new ( 1074 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1075 scroll_x => 0,
1076 scroll_y => 1,
1038 can_events => 1, 1077 can_events => 1,
1039 slider => $slider, 1078 hslider => $hslider,
1079 vslider => $vslider,
1080 col_expand => [1, 0],
1081 row_expand => [1, 0],
1040 %arg, 1082 %arg,
1041 ); 1083 );
1042 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 on_size_allocate => sub {
1100 my ($vp, $w, $h) = @_;
1101 $vp->{parent}->update_slider;
1102 0
1103 },
1104 ;
1105
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1106 $self->SUPER::add ($self->{vp});
1107
1044 $self->add ($child) if $child; 1108 $self->add ($child) if $child;
1045 1109
1046 $self 1110 $self
1047} 1111}
1048
1049#TODO# update range on size_allocate depending on child
1050 1112
1051sub add { 1113sub add {
1052 my ($self, $widget) = @_; 1114 my ($self, $widget) = @_;
1053 1115
1054 $self->{vp}->add ($self->{child} = $widget); 1116 $self->{vp}->add ($self->{child} = $widget);
1055} 1117}
1056 1118
1119sub update_slider {
1120 my ($self) = @_;
1121
1122 my $child = ($self->{vp} or return)->child;
1123
1124 if ($self->{scroll_x}) {
1125 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1126 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1127
1128 my $visible = $w1 > $w2;
1129 if ($visible != $self->{hslider_visible}) {
1130 $self->{hslider_visible} = $visible;
1131 $visible ? $self->SUPER::add ($self->{hslider})
1132 : $self->SUPER::remove ($self->{hslider});
1133 }
1134 }
1135
1136 if ($self->{scroll_y}) {
1137 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1138 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1139
1140 my $visible = $h1 > $h2;
1141 if ($visible != $self->{vslider_visible}) {
1142 $self->{vslider_visible} = $visible;
1143 $visible ? $self->SUPER::add ($self->{vslider})
1144 : $self->SUPER::remove ($self->{vslider});
1145 }
1146 }
1147}
1148
1149sub start_dragging {
1150 my ($self, $ev) = @_;
1151
1152 $self->grab_focus;
1153
1154 my $ox = $self->{vp}{view_x};
1155 my $oy = $self->{vp}{view_y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1159
1160 $ox -= $ev->{xrel};
1161 $oy -= $ev->{yrel};
1162
1163 $self->{vp}->set_offset ($ox, $oy);
1164 };
1165}
1166
1057sub invoke_mouse_wheel { 1167sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1168 my ($self, $ev) = @_;
1059 1169
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev); 1170 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1171 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1063 1172
1064 1 1173 1
1065} 1174}
1066 1175
1067sub update_slider { 1176sub invoke_button_down {
1068 my ($self) = @_; 1177 my ($self, $ev, $x, $y) = @_;
1069 1178
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1179 if ($ev->{button} == 2) {
1071} 1180 $self->start_dragging ($ev);
1181 return 1;
1182 }
1072 1183
1073sub update { 1184 0
1074 my ($self) = @_; 1185}
1075 1186
1076 $self->SUPER::update; 1187sub invoke_button_up {
1188 my ($self, $ev, $x, $y) = @_;
1077 1189
1078 $self->update_slider; 1190 if (delete $self->{motion}) {
1191 return 1;
1192 }
1193
1194 0
1195}
1196
1197sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_;
1199
1200 if ($self->{motion}) {
1201 $self->{motion}->($ev, $x, $y);
1202 return 1;
1203 }
1204
1205 0
1079} 1206}
1080 1207
1081sub invoke_size_allocate { 1208sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1209 my ($self, $w, $h) = @_;
1083 1210
1084 $self->update_slider; 1211 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1212 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1213}
1088 1214
1089############################################################################# 1215#############################################################################
1090 1216
… …
1240 1366
1241my @border = 1367my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1368 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1243 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1369 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244 1370
1371my @icon =
1372 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1373 qw(x1_move.png x1_resize.png);
1374
1245sub new { 1375sub new {
1246 my ($class, %arg) = @_; 1376 my ($class, %arg) = @_;
1247 1377
1248 my $self = $class->SUPER::new ( 1378 my $self = $class->SUPER::new (
1249 bg => [1, 1, 1, 1], 1379 bg => [1, 1, 1, 1],
… …
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1418 1548
1419 my $border = $self->border; 1549 my $border = $self->border;
1420 1550
1421 glColor @{ $self->{border_bg} }; 1551 glColor @{ $self->{border_bg} };
1422 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1423 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1424 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1425 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1555 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1556
1557 # move
1558 my $w2 = ($w - $border) * .5;
1559 my $h2 = ($h - $border) * .5;
1560 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1561 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1562 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1563
1564 # resize
1565 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1566 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1567 unless $self->{has_close_button};
1568 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1569 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1426 1570
1427 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1571 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1428 glColor @{ $self->{bg} }; 1572 glColor @{ $self->{bg} };
1429 1573
1430 # TODO: repeat texture not scale 1574 # TODO: repeat texture not scale
… …
1451 1595
1452############################################################################# 1596#############################################################################
1453 1597
1454package CFPlus::UI::Table; 1598package CFPlus::UI::Table;
1455 1599
1456our @ISA = CFPlus::UI::Base::; 1600our @ISA = CFPlus::UI::Container::;
1457 1601
1458use List::Util qw(max sum); 1602use List::Util qw(max sum);
1459 1603
1460use CFPlus::OpenGL; 1604use CFPlus::OpenGL;
1461 1605
1462sub new { 1606sub new {
1463 my $class = shift; 1607 my $class = shift;
1464 1608
1465 $class->SUPER::new ( 1609 $class->SUPER::new (
1466 col_expand => [], 1610 col_expand => [],
1611 row_expand => [],
1467 @_, 1612 @_,
1468 ) 1613 )
1469} 1614}
1470 1615
1471sub children {
1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473}
1474
1475sub add { 1616sub add {
1617 my ($self, @widgets) = @_;
1618
1619 for my $child (@widgets) {
1620 $child->{rowspan} ||= 1;
1621 $child->{colspan} ||= 1;
1622 }
1623
1624 $self->SUPER::add (@widgets);
1625}
1626
1627sub add_at {
1476 my ($self) = shift; 1628 my $self = shift;
1629
1630 my @widgets;
1477 1631
1478 while (@_) { 1632 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, (); 1633 my ($col, $row, $child) = splice @_, 0, 3, ();
1480 $child->set_parent ($self);
1481 $self->{children}[$y][$x] = $child;
1482 }
1483 1634
1484 $self->{force_realloc} = 1; 1635 $child->{row} = $row;
1485 $self->{force_size_alloc} = 1; 1636 $child->{col} = $col;
1486 $self->realloc;
1487}
1488 1637
1489sub remove { 1638 push @widgets, $child;
1639 }
1640
1641 $self->add (@widgets);
1642}
1643
1644sub get_wh {
1490 my ($self, $child) = @_; 1645 my ($self) = @_;
1491 1646
1492 # TODO: not yet implemented 1647 my (@w, @h);
1493}
1494
1495# TODO: move to container class maybe? send children a signal on removal?
1496sub clear {
1497 my ($self) = @_;
1498 1648
1499 my @children = $self->children; 1649 my @children = $self->children;
1500 delete $self->{children}; 1650
1651 # first pass, columns
1652 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1653 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1654
1655 my $sw = sum @w[$c .. $c + $cs - 1];
1656
1657 if ($w > $sw) {
1658 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1659 }
1501 1660 }
1502 for (@children) {
1503 delete $_->{parent};
1504 $_->hide;
1505 }
1506 1661
1507 $self->realloc; 1662 # second pass, rows
1508} 1663 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1509
1510sub get_wh {
1511 my ($self) = @_;
1512
1513 my (@w, @h);
1514
1515 for my $y (0 .. $#{$self->{children}}) {
1516 my $row = $self->{children}[$y]
1517 or next;
1518
1519 for my $x (0 .. $#$row) {
1520 my $widget = $row->[$x]
1521 or next;
1522 my ($w, $h) = @$widget{qw(req_w req_h)}; 1664 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1523 1665
1524 $w[$x] = max $w[$x], $w; 1666 my $sh = sum @h[$r .. $r + $rs - 1];
1525 $h[$y] = max $h[$y], $h; 1667
1668 if ($h > $sh) {
1669 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1526 } 1670 }
1527 } 1671 }
1528 1672
1529 (\@w, \@h) 1673 (\@w, \@h)
1530} 1674}
… …
1546 my ($ws, $hs) = $self->get_wh; 1690 my ($ws, $hs) = $self->get_wh;
1547 1691
1548 my $req_w = (sum @$ws) || 1; 1692 my $req_w = (sum @$ws) || 1;
1549 my $req_h = (sum @$hs) || 1; 1693 my $req_h = (sum @$hs) || 1;
1550 1694
1551 # TODO: nicer code && do row_expand 1695 # now linearly scale the rows/columns to the allocated size
1552 my @col_expand = @{$self->{col_expand}}; 1696 my @col_expand = @{$self->{col_expand}};
1553 @col_expand = (1) x @$ws unless @col_expand; 1697 @col_expand = (1) x @$ws unless @col_expand;
1554 my $col_expand = (sum @col_expand) || 1; 1698 my $col_expand = (sum @col_expand) || 1;
1555 1699
1556 # linearly scale sizes
1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1700 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559 1701
1560 CFPlus::UI::harmonize $ws; 1702 CFPlus::UI::harmonize $ws;
1703
1704 my @row_expand = @{$self->{row_expand}};
1705 @row_expand = (1) x @$ws unless @row_expand;
1706 my $row_expand = (sum @row_expand) || 1;
1707
1708 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1709
1561 CFPlus::UI::harmonize $hs; 1710 CFPlus::UI::harmonize $hs;
1562 1711
1563 my $y; 1712 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1713 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1564 1714
1565 for my $r (0 .. $#{$self->{children}}) { 1715 for my $widget ($self->children) {
1566 my $row = $self->{children}[$r] 1716 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1567 or next;
1568 1717
1569 my $x = 0; 1718 $widget->configure (
1570 my $row_h = $hs->[$r]; 1719 $x[$c], $y[$r],
1720 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1571 1721 );
1572 for my $c (0 .. $#$row) { 1722 }
1573 my $col_w = $ws->[$c];
1574 1723
1575 if (my $widget = $row->[$c]) { 1724 1
1576 $widget->configure ($x, $y, $col_w, $row_h); 1725}
1577 }
1578 1726
1579 $x += $col_w; 1727#############################################################################
1728
1729package CFPlus::UI::Fixed;
1730
1731use List::Util qw(min max);
1732
1733our @ISA = CFPlus::UI::Container::;
1734
1735sub add_fixed {
1736 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1737
1738 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1739 $self->SUPER::add ($child);
1740}
1741
1742sub _scale($$$) {
1743 my ($mode, $val, $max) = @_;
1744
1745 $mode eq "abs" ? $val
1746 : $mode eq "rel" ? $val * $max
1747 : 0
1748}
1749
1750sub size_request {
1751 my ($self) = @_;
1752
1753 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1754
1755 # determine overall size by querying abs widgets
1756 for my $child ($self->visible_children) {
1757 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1758
1759 if ($pos eq "abs") {
1760 $w = _scale $size, $w, $child->{req_w};
1761 $h = _scale $size, $h, $child->{req_h};
1762
1763 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1764 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1580 } 1765 }
1766 }
1581 1767
1582 $y += $row_h; 1768 my $W = $x2 - $x1;
1769 my $H = $y2 - $y1;
1770
1771 # now layout remaining widgets
1772 for my $child ($self->visible_children) {
1773 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1774
1775 if ($pos ne "abs") {
1776 $x = _scale $pos, $x, $W;
1777 $y = _scale $pos, $x, $H;
1778 $w = _scale $size, $w, $child->{req_w};
1779 $h = _scale $size, $h, $child->{req_h};
1780
1781 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1782 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1783 }
1784 }
1785
1786 my $W = $x2 - $x1;
1787 my $H = $y2 - $y1;
1788
1789 ($W, $H)
1790}
1791
1792sub invoke_size_allocate {
1793 my ($self, $W, $H) = @_;
1794
1795 for my $child ($self->visible_children) {
1796 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1797
1798 $x = _scale $pos, $x, $W;
1799 $y = _scale $pos, $x, $H;
1800 $w = _scale $size, $w, $child->{req_w};
1801 $h = _scale $size, $h, $child->{req_h};
1802
1803 $child->configure ($x, $y, $w, $h);
1583 } 1804 }
1584 1805
1585 1 1806 1
1586}
1587
1588sub find_widget {
1589 my ($self, $x, $y) = @_;
1590
1591 $x -= $self->{x};
1592 $y -= $self->{y};
1593
1594 my $res;
1595
1596 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1597 $res = $_->find_widget ($x, $y)
1598 and return $res;
1599 }
1600
1601 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1602}
1603
1604sub _draw {
1605 my ($self) = @_;
1606
1607 for (grep $_, @{$self->{children}}) {
1608 $_->draw for grep $_, @$_;
1609 }
1610} 1807}
1611 1808
1612############################################################################# 1809#############################################################################
1613 1810
1614package CFPlus::UI::Box; 1811package CFPlus::UI::Box;
… …
1900 active_fg => [0, 0, 0], 2097 active_fg => [0, 0, 0],
1901 can_hover => 1, 2098 can_hover => 1,
1902 can_focus => 1, 2099 can_focus => 1,
1903 valign => 0, 2100 valign => 0,
1904 can_events => 1, 2101 can_events => 1,
2102 ellipsise => 0,
1905 #text => ... 2103 #text => ...
1906 #hidden => "*", 2104 #hidden => "*",
1907 @_ 2105 @_
1908 ) 2106 )
1909} 2107}
… …
1953 my $mod = $ev->{mod}; 2151 my $mod = $ev->{mod};
1954 my $sym = $ev->{sym}; 2152 my $sym = $ev->{sym};
1955 my $uni = $ev->{unicode}; 2153 my $uni = $ev->{unicode};
1956 2154
1957 my $text = $self->get_text; 2155 my $text = $self->get_text;
2156
2157 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1958 2158
1959 if ($uni == 8) { 2159 if ($uni == 8) {
1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2160 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1961 } elsif ($uni == 127) { 2161 } elsif ($uni == 127) {
1962 substr $text, $self->{cursor}, 1, ""; 2162 substr $text, $self->{cursor}, 1, "";
1963 } elsif ($sym == CFPlus::SDLK_LEFT) { 2163 } elsif ($sym == CFPlus::SDLK_LEFT) {
1964 --$self->{cursor} if $self->{cursor}; 2164 --$self->{cursor} if $self->{cursor};
1965 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2165 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1966 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2166 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1967 } elsif ($sym == CFPlus::SDLK_HOME) { 2167 } elsif ($sym == CFPlus::SDLK_HOME) {
2168 # what a hack
1968 $self->{cursor} = 0; 2169 $self->{cursor} =
2170 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2171 ? length $1
2172 : 0;
1969 } elsif ($sym == CFPlus::SDLK_END) { 2173 } elsif ($sym == CFPlus::SDLK_END) {
2174 # uh, again
2175 $self->{cursor} =
2176 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1970 $self->{cursor} = length $text; 2177 ? $self->{cursor} + length $1
2178 : length $self->{text};
1971 } elsif ($uni == 21) { # ctrl-u 2179 } elsif ($uni == 21) { # ctrl-u
1972 $text = ""; 2180 $text = "";
1973 $self->{cursor} = 0; 2181 $self->{cursor} = 0;
1974 } elsif ($uni == 27) { 2182 } elsif ($uni == 27) {
1975 $self->emit ('escape'); 2183 $self->emit ('escape');
1976 } elsif ($uni) { 2184 } elsif ($uni == 0x0d) {
2185 substr $text, $self->{cursor}++, 0, "\012";
2186 } elsif ($uni >= 0x20) {
1977 substr $text, $self->{cursor}++, 0, chr $uni; 2187 substr $text, $self->{cursor}++, 0, chr $uni;
1978 } else { 2188 } else {
1979 return 0; 2189 return 0;
1980 } 2190 }
1981 2191
1982 $self->_set_text ($text); 2192 $self->_set_text ($text);
1983 2193
1984 $self->realloc; 2194 $self->realloc;
2195 $self->update;
1985 2196
1986 1 2197 1
1987} 2198}
1988 2199
1989sub invoke_focus_in { 2200sub invoke_focus_in {
… …
2058 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2269 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2059 glEnd; 2270 glEnd;
2060 } 2271 }
2061} 2272}
2062 2273
2274#############################################################################
2275
2063package CFPlus::UI::Entry; 2276package CFPlus::UI::Entry;
2064 2277
2065our @ISA = CFPlus::UI::EntryBase::; 2278our @ISA = CFPlus::UI::EntryBase::;
2066 2279
2067use CFPlus::OpenGL; 2280use CFPlus::OpenGL;
… …
2069sub invoke_key_down { 2282sub invoke_key_down {
2070 my ($self, $ev) = @_; 2283 my ($self, $ev) = @_;
2071 2284
2072 my $sym = $ev->{sym}; 2285 my $sym = $ev->{sym};
2073 2286
2074 if ($sym == 13) { 2287 if ($ev->{uni} == 0x0d || $sym == 13) {
2075 unshift @{$self->{history}}, 2288 unshift @{$self->{history}},
2076 my $txt = $self->get_text; 2289 my $txt = $self->get_text;
2077 2290
2078 $self->{history_pointer} = -1; 2291 $self->{history_pointer} = -1;
2079 $self->{history_saveback} = ''; 2292 $self->{history_saveback} = '';
… …
2109 1 2322 1
2110} 2323}
2111 2324
2112############################################################################# 2325#############################################################################
2113 2326
2327package CFPlus::UI::TextEdit;
2328
2329our @ISA = CFPlus::UI::EntryBase::;
2330
2331use CFPlus::OpenGL;
2332
2333sub move_cursor_ver {
2334 my ($self, $dy) = @_;
2335
2336 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2337
2338 $y += $dy;
2339
2340 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2341 $self->{cursor} = $index;
2342 delete $self->{cur_h};
2343 $self->update;
2344 return;
2345 }
2346}
2347
2348sub invoke_key_down {
2349 my ($self, $ev) = @_;
2350
2351 my $sym = $ev->{sym};
2352
2353 if ($sym == CFPlus::SDLK_UP) {
2354 $self->move_cursor_ver (-1);
2355 } elsif ($sym == CFPlus::SDLK_DOWN) {
2356 $self->move_cursor_ver (+1);
2357 } else {
2358 return $self->SUPER::invoke_key_down ($ev)
2359 }
2360
2361 1
2362}
2363
2364#############################################################################
2365
2114package CFPlus::UI::Button; 2366package CFPlus::UI::Button;
2115 2367
2116our @ISA = CFPlus::UI::Label::; 2368our @ISA = CFPlus::UI::Label::;
2117 2369
2118use CFPlus::OpenGL; 2370use CFPlus::OpenGL;
2119 2371
2120my @tex = 2372my @tex =
2121 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2373 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2122 qw(b1_button_active.png); 2374 qw(b1_button_inactive.png b1_button_active.png);
2123 2375
2124sub new { 2376sub new {
2125 my $class = shift; 2377 my $class = shift;
2126 2378
2127 $class->SUPER::new ( 2379 $class->SUPER::new (
2128 padding_x => 4, 2380 padding_x => 4,
2129 padding_y => 4, 2381 padding_y => 4,
2130 fg => [1, 1, 1], 2382 fg => [1.0, 1.0, 1.0],
2131 active_fg => [0, 0, 1], 2383 active_fg => [0.8, 0.8, 0.8],
2132 can_hover => 1, 2384 can_hover => 1,
2133 align => 0, 2385 align => 0,
2134 valign => 0, 2386 valign => 0,
2135 can_events => 1, 2387 can_events => 1,
2136 @_ 2388 @_
… …
2154 2406
2155 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
2156 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2157 glColor 0, 0, 0, 1; 2409 glColor 0, 0, 0, 1;
2158 2410
2411 my $tex = $tex[$GRAB == $self];
2159 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2412 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2160 2413
2161 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
2162 2415
2163 $self->SUPER::_draw; 2416 $self->SUPER::_draw;
2164} 2417}
… …
2260 or Carp::croak "'path' or 'tex' attributes required"; 2513 or Carp::croak "'path' or 'tex' attributes required";
2261 2514
2262 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2515 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2263 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2516 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2264 2517
2265 Scalar::Util::weaken $texture_cache{$self->{path}}; 2518 CFPlus::weaken $texture_cache{$self->{path}};
2266 2519
2267 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2520 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2268 2521
2269 $self 2522 $self
2270} 2523}
… …
2643sub invoke_mouse_wheel { 2896sub invoke_mouse_wheel {
2644 my ($self, $ev) = @_; 2897 my ($self, $ev) = @_;
2645 2898
2646 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2899 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2647 2900
2901 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2902
2648 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2903 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2649 2904
2650 ! ! $delta 2905 ! ! $delta
2651} 2906}
2652 2907
2653sub update { 2908sub update {
… …
2763 #font => default_font 3018 #font => default_font
2764 @_, 3019 @_,
2765 3020
2766 layout => (new CFPlus::Layout), 3021 layout => (new CFPlus::Layout),
2767 par => [], 3022 par => [],
3023 max_par => 0,
2768 height => 0, 3024 height => 0,
2769 children => [ 3025 children => [
2770 (new CFPlus::UI::Empty expand => 1), 3026 (new CFPlus::UI::Empty expand => 1),
2771 (new CFPlus::UI::Slider vertical => 1), 3027 (new CFPlus::UI::Slider vertical => 1),
2772 ], 3028 ],
… …
2895 wrapped => 1, 3151 wrapped => 1,
2896 }; 3152 };
2897 3153
2898 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3154 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2899 push @{$self->{par}}, $para; 3155 push @{$self->{par}}, $para;
3156 }
3157
3158 if (my $max = $self->{max_par}) {
3159 shift @{$self->{par}} while @{$self->{par}} > $max;
2900 } 3160 }
2901 3161
2902 $self->{need_reflow}++; 3162 $self->{need_reflow}++;
2903 $self->update; 3163 $self->update;
2904} 3164}
… …
3212 3472
3213sub new { 3473sub new {
3214 my $class = shift; 3474 my $class = shift;
3215 3475
3216 my $self = $class->SUPER::new ( 3476 my $self = $class->SUPER::new (
3477 size_w => 32,
3478 size_h => 8,
3217 aspect => 1, 3479 aspect => 1,
3218 can_events => 0, 3480 can_events => 0,
3219 @_, 3481 @_,
3220 ); 3482 );
3221 3483
3222 if ($self->{anim} && $self->{animspeed}) { 3484 if ($self->{anim} && $self->{animspeed}) {
3223 Scalar::Util::weaken (my $widget = $self); 3485 CFPlus::weaken (my $widget = $self);
3224 3486
3487 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3488 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3225 $self->{timer} = Event->timer ( 3489 $self->{timer} = Event->timer (
3226 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3227 hard => 1, 3490 parked => 1,
3228 interval => $self->{animspeed},
3229 cb => sub { 3491 cb => sub {
3492 return unless $::CONN && $widget;
3493
3230 ++$widget->{frame}; 3494 ++$widget->{frame};
3495 $widget->update_face;
3231 $widget->update; 3496 $widget->update;
3497
3498 $widget->update_timer;
3232 }, 3499 },
3233 ); 3500 );
3501
3502 $self->update_face;
3503 $self->update_timer;
3234 } 3504 }
3235 3505
3236 $self 3506 $self
3237} 3507}
3238 3508
3509sub update_timer {
3510 my ($self) = @_;
3511
3512 return unless $self->{timer};
3513
3514 if ($self->{visible}) {
3515 $self->{timer}->at (
3516 $self->{anim_start}
3517 + $self->{animspeed}
3518 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3519 );
3520 $self->{timer}->start;
3521 } else {
3522 $self->{timer}->stop;
3523 }
3524}
3525
3526sub update_face {
3527 my ($self) = @_;
3528
3529 return unless $::CONN;
3530
3531 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3532 if ($anim && @$anim) {
3533 delete $self->{wait_face};
3534 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3535 }
3536 }
3537}
3538
3239sub size_request { 3539sub size_request {
3240 (32, 8) 3540 my ($self) = @_;
3541
3542 if ($::CONN) {
3543 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3544 if (my $tex = $::CONN->{texture}[$faceid]) {
3545 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3546 } else {
3547 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3548 $self->realloc;
3549 });
3550 }
3551 }
3552 }
3553
3554 ($self->{size_w} || 8, $self->{size_h} || 8)
3241} 3555}
3242 3556
3243sub update { 3557sub update {
3244 my ($self) = @_; 3558 my ($self) = @_;
3245 3559
3246 return unless $self->{visible}; 3560 return unless $self->{visible};
3247 3561
3248 $self->SUPER::update; 3562 $self->SUPER::update;
3249} 3563}
3250 3564
3565sub invoke_visibility_change {
3566 my ($self) = @_;
3567
3568 $self->update_timer;
3569
3570 0
3571}
3572
3251sub _draw { 3573sub _draw {
3252 my ($self) = @_; 3574 my ($self) = @_;
3253 3575
3254 return unless $::CONN; 3576 return unless $::CONN;
3255 3577
3256 $self->SUPER::_draw; 3578 $self->SUPER::_draw;
3257 3579
3258 my $face;
3259
3260 if ($self->{frame}) {
3261 my $anim = $::CONN->{anim}[$self->{anim}]; 3580 my $faceid = $::CONN->{faceid}[$self->{face}]
3262 3581 or return;
3263 $face = $anim->[ $self->{frame} % @$anim ]
3264 if $anim && @$anim;
3265 }
3266 3582
3267 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3583 my $tex = $::CONN->{texture}[$faceid];
3268 3584
3269 if ($tex) { 3585 if ($tex) {
3270 glEnable GL_TEXTURE_2D; 3586 glEnable GL_TEXTURE_2D;
3271 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3587 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3272 glColor 0, 0, 0, 1; 3588 glColor 0, 0, 0, 1;
… …
3276} 3592}
3277 3593
3278sub destroy { 3594sub destroy {
3279 my ($self) = @_; 3595 my ($self) = @_;
3280 3596
3281 $self->{timer}->cancel 3597 (delete $self->{timer})->cancel
3282 if $self->{timer}; 3598 if $self->{timer};
3283 3599
3284 $self->SUPER::destroy; 3600 $self->SUPER::destroy;
3285} 3601}
3286 3602
… …
3482} 3798}
3483 3799
3484sub add { 3800sub add {
3485 my ($self, $title, $widget, $tooltip) = @_; 3801 my ($self, $title, $widget, $tooltip) = @_;
3486 3802
3487 Scalar::Util::weaken $self; 3803 CFPlus::weaken $self;
3488 3804
3489 $self->{buttonbar}->add (new CFPlus::UI::Button 3805 $self->{buttonbar}->add (new CFPlus::UI::Button
3490 markup => $title, 3806 markup => $title,
3491 tooltip => $tooltip, 3807 tooltip => $tooltip,
3492 on_activate => sub { $self->set_current_page ($widget) }, 3808 on_activate => sub { $self->set_current_page ($widget) },
… …
3576 my $self = $class->SUPER::new ( 3892 my $self = $class->SUPER::new (
3577 fontsize => 0.8, 3893 fontsize => 0.8,
3578 @_, 3894 @_,
3579 ); 3895 );
3580 3896
3581 Scalar::Util::weaken (my $this = $self); 3897 CFPlus::weaken (my $this = $self);
3582 3898
3583 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3899 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3584 3900
3585 $self 3901 $self
3586} 3902}
… …
3709 $self->SUPER::destroy; 4025 $self->SUPER::destroy;
3710} 4026}
3711 4027
3712############################################################################# 4028#############################################################################
3713 4029
3714package CFPlus::UI::Inventory;
3715
3716our @ISA = CFPlus::UI::Table::;
3717
3718sub new {
3719 my $class = shift;
3720
3721 my $self = $class->SUPER::new (
3722 col_expand => [0, 1, 0],
3723 items => [],
3724 @_,
3725 );
3726
3727 $self->set_sort_order (undef);
3728
3729 $self
3730}
3731
3732sub update_items {
3733 my ($self) = @_;
3734
3735 $self->clear;
3736
3737 my @item = $self->{sort}->(@{ $self->{items} });
3738
3739 my @adds;
3740 my $row = 0;
3741 for my $item ($self->{sort}->(@{ $self->{items} })) {
3742 CFPlus::Item::update_widgets $item;
3743
3744 push @adds, 0, $row, $item->{face_widget};
3745 push @adds, 1, $row, $item->{desc_widget};
3746 push @adds, 2, $row, $item->{weight_widget};
3747
3748 $row++;
3749 }
3750
3751 $self->add (@adds);
3752}
3753
3754sub set_sort_order {
3755 my ($self, $order) = @_;
3756
3757 $self->{sort} = $order ||= sub {
3758 sort {
3759 $a->{type} <=> $b->{type}
3760 or $a->{name} cmp $b->{name}
3761 } @_
3762 };
3763
3764 $self->update_items;
3765}
3766
3767sub set_items {
3768 my ($self, $items) = @_;
3769
3770 $self->{items} = [$items ? values %$items : ()];
3771 $self->update_items;
3772}
3773
3774#############################################################################
3775
3776package CFPlus::UI::SpellList;
3777
3778our @ISA = CFPlus::UI::Table::;
3779
3780sub new {
3781 my $class = shift;
3782
3783 my $self = $class->SUPER::new (
3784 binding => [],
3785 commands => [],
3786 @_,
3787 )
3788}
3789
3790my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3791
3792my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3793 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3794my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3795 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3796my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3797 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3798my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3799 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3800my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3801 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3802
3803sub rebuild_spell_list {
3804 my ($self) = @_;
3805
3806 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3807 $self->clear;
3808
3809 return unless $::CONN;
3810
3811 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3812 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3813 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3814 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3815 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3816
3817 my $row = 0;
3818
3819 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3820 my $spell = $self->{spell}{$_};
3821
3822 $row++;
3823
3824 my $spell_cb = sub {
3825 my ($widget, $ev) = @_;
3826
3827 if ($ev->{button} == 1) {
3828 $::CONN->user_send ("cast $spell->{name}");
3829 } elsif ($ev->{button} == 2) {
3830 $::CONN->user_send ("invoke $spell->{name}");
3831 } elsif ($ev->{button} == 3) {
3832 (new CFPlus::UI::Menu
3833 items => [
3834 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3835 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3836 ],
3837 )->popup ($ev);
3838 } else {
3839 return 0;
3840 }
3841
3842 1
3843 };
3844
3845 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3846
3847 #TODO: add path info to tooltip
3848 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3849
3850 $self->add (0, $row, new CFPlus::UI::Face
3851 face => $spell->{face},
3852 can_hover => 1,
3853 can_events => 1,
3854 tooltip => $tooltip,
3855 on_button_down => $spell_cb,
3856 );
3857
3858 $self->add (1, $row, new CFPlus::UI::Label
3859 expand => 1,
3860 text => $spell->{name},
3861 can_hover => 1,
3862 can_events => 1,
3863 tooltip => $tooltip,
3864 on_button_down => $spell_cb,
3865 );
3866
3867 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3868 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3869 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3870 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3871 }
3872 });
3873}
3874
3875sub add_spell {
3876 my ($self, $spell) = @_;
3877
3878 $self->{spell}->{$spell->{name}} = $spell;
3879 $self->rebuild_spell_list;
3880}
3881
3882sub remove_spell {
3883 my ($self, $spell) = @_;
3884
3885 delete $self->{spell}->{$spell->{name}};
3886 $self->rebuild_spell_list;
3887}
3888
3889sub clear_spells {
3890 my ($self) = @_;
3891
3892 $self->{spell} = {};
3893 $self->rebuild_spell_list;
3894}
3895
3896#############################################################################
3897
3898package CFPlus::UI::Root; 4030package CFPlus::UI::Root;
3899 4031
3900our @ISA = CFPlus::UI::Container::; 4032our @ISA = CFPlus::UI::Container::;
3901 4033
3902use List::Util qw(min max); 4034use List::Util qw(min max);
… …
3909 my $self = $class->SUPER::new ( 4041 my $self = $class->SUPER::new (
3910 visible => 1, 4042 visible => 1,
3911 @_, 4043 @_,
3912 ); 4044 );
3913 4045
3914 Scalar::Util::weaken ($self->{root} = $self); 4046 CFPlus::weaken ($self->{root} = $self);
3915 4047
3916 $self 4048 $self
3917} 4049}
3918 4050
3919sub size_request { 4051sub size_request {
… …
4014 while ($self->{refresh_hook}) { 4146 while ($self->{refresh_hook}) {
4015 $_->() 4147 $_->()
4016 for values %{delete $self->{refresh_hook}}; 4148 for values %{delete $self->{refresh_hook}};
4017 } 4149 }
4018 4150
4019 if ($self->{realloc}) { 4151 while ($self->{realloc}) {
4020 my %queue; 4152 my %queue;
4021 my @queue; 4153 my @queue;
4022 my $widget; 4154 my $widget;
4023 4155
4024 outer: 4156 outer:
… …
4071 } 4203 }
4072 } 4204 }
4073 4205
4074 delete $self->{realloc}{$widget+0}; 4206 delete $self->{realloc}{$widget+0};
4075 } 4207 }
4076 }
4077 4208
4078 while (my $size_alloc = delete $self->{size_alloc}) { 4209 while (my $size_alloc = delete $self->{size_alloc}) {
4079 my @queue = sort { $b->{visible} <=> $a->{visible} } 4210 my @queue = sort { $a->{visible} <=> $b->{visible} }
4080 values %$size_alloc; 4211 values %$size_alloc;
4081 4212
4082 while () { 4213 while () {
4083 my $widget = pop @queue || last; 4214 my $widget = pop @queue || last;
4084 4215
4085 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4216 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4086 4217
4087 $w = 0 if $w < 0;
4088 $h = 0 if $h < 0;
4089
4090 $w = max $widget->{min_w}, $w; 4218 $w = max $widget->{min_w}, $w;
4091 $h = max $widget->{min_h}, $h; 4219 $h = max $widget->{min_h}, $h;
4092 4220
4093# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4221# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4094# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4222# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4095 4223
4096 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4224 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4097 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4225 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4098 4226
4099 $w = int $w + 0.5; 4227 $w = int $w + 0.5;
4100 $h = int $h + 0.5; 4228 $h = int $h + 0.5;
4101 4229
4102 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4230 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4103 $widget->{old_w} = $widget->{w}; 4231 $widget->{old_w} = $widget->{w};
4104 $widget->{old_h} = $widget->{h}; 4232 $widget->{old_h} = $widget->{h};
4105 4233
4106 $widget->{w} = $w; 4234 $widget->{w} = $w;
4107 $widget->{h} = $h; 4235 $widget->{h} = $h;
4108 4236
4109 $widget->emit (size_allocate => $w, $h); 4237 $widget->emit (size_allocate => $w, $h);
4238 }
4110 } 4239 }
4111 } 4240 }
4112 } 4241 }
4113 4242
4114 while ($self->{post_alloc_hook}) { 4243 while ($self->{post_alloc_hook}) {
4115 $_->() 4244 $_->()
4116 for values %{delete $self->{post_alloc_hook}}; 4245 for values %{delete $self->{post_alloc_hook}};
4117 } 4246 }
4118
4119 4247
4120 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4248 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4121 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4249 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4122 glClear GL_COLOR_BUFFER_BIT; 4250 glClear GL_COLOR_BUFFER_BIT;
4123 4251

Diff Legend

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