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.343 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.400 by root, Sat Jul 21 16:15:03 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;
… …
898 glClear GL_COLOR_BUFFER_BIT; 914 glClear GL_COLOR_BUFFER_BIT;
899 915
900 { 916 {
901 package CFPlus::UI::Base; 917 package CFPlus::UI::Base;
902 918
903 ($draw_x, $draw_y, $draw_w, $draw_h) = 919 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 920 (0, 0, $self->{w}, $self->{h});
921
922 $self->_render;
905 } 923 }
906
907 $self->_render;
908 }; 924 };
909} 925}
910 926
911sub _draw { 927sub _draw {
912 my ($self) = @_; 928 my ($self) = @_;
913
914 my ($w, $h) = @$self{qw(w h)};
915 929
916 my $tex = $self->{texture} 930 my $tex = $self->{texture}
917 or return; 931 or return;
918 932
919 glEnable GL_TEXTURE_2D; 933 glEnable GL_TEXTURE_2D;
920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
921 glColor 0, 0, 0, 1; 935 glColor 0, 0, 0, 1;
922 936
923 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 937 $tex->draw_quad_alpha_premultiplied (0, 0);
924 938
925 glDisable GL_TEXTURE_2D; 939 glDisable GL_TEXTURE_2D;
926} 940}
927 941
928############################################################################# 942#############################################################################
929 943
930package CFPlus::UI::ViewPort; 944package CFPlus::UI::ViewPort;
945
946use List::Util qw(min max);
931 947
932our @ISA = CFPlus::UI::Window::; 948our @ISA = CFPlus::UI::Window::;
933 949
934sub new { 950sub new {
935 my $class = shift; 951 my $class = shift;
… …
944sub size_request { 960sub size_request {
945 my ($self) = @_; 961 my ($self) = @_;
946 962
947 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 963 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
948 964
949 $w = 10 if $self->{scroll_x}; 965 $w = 1 if $self->{scroll_x};
950 $h = 10 if $self->{scroll_y}; 966 $h = 1 if $self->{scroll_y};
951 967
952 ($w, $h) 968 ($w, $h)
953} 969}
954 970
955sub invoke_size_allocate { 971sub invoke_size_allocate {
… …
967} 983}
968 984
969sub set_offset { 985sub set_offset {
970 my ($self, $x, $y) = @_; 986 my ($self, $x, $y) = @_;
971 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}) {
972 $self->{view_x} = int $x; 992 $self->{view_x} = $x;
973 $self->{view_y} = int $y; 993 $self->{view_y} = $y;
974 994
995 $self->emit (changed => $x, $y);
975 $self->update; 996 $self->update;
997 }
976} 998}
977 999
978# 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
979sub coord2local { 1001sub coord2local {
980 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
… …
995 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
996 1018
997 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
998 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
999 ) { 1021 ) {
1000 $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})
1001 } else { 1023 } else {
1002 $self->CFPlus::UI::Base::find_widget ($x, $y) 1024 $self->CFPlus::UI::Base::find_widget ($x, $y)
1003 } 1025 }
1004} 1026}
1005 1027
… …
1016 1038
1017############################################################################# 1039#############################################################################
1018 1040
1019package CFPlus::UI::ScrolledWindow; 1041package CFPlus::UI::ScrolledWindow;
1020 1042
1021our @ISA = CFPlus::UI::HBox::; 1043our @ISA = CFPlus::UI::Table::;
1022 1044
1023sub new { 1045sub new {
1024 my ($class, %arg) = @_; 1046 my ($class, %arg) = @_;
1025 1047
1026 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
1027 1049
1028 my $self; 1050 my $self;
1029 1051
1030 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,
1031 vertical => 1, 1066 vertical => 1,
1032 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
1033 on_changed => sub { 1068 on_changed => sub {
1034 $self->{vp}->set_offset (0, $_[1]); 1069 $self->{vpos} = $_[1];
1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1035 }, 1071 },
1036 ; 1072 ;
1037 1073
1038 $self = $class->SUPER::new ( 1074 $self = $class->SUPER::new (
1039 vp => (new CFPlus::UI::ViewPort expand => 1), 1075 scroll_x => 0,
1076 scroll_y => 1,
1040 can_events => 1, 1077 can_events => 1,
1041 slider => $slider, 1078 hslider => $hslider,
1079 vslider => $vslider,
1080 col_expand => [1, 0],
1081 row_expand => [1, 0],
1042 %arg, 1082 %arg,
1043 ); 1083 );
1044 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
1045 $self->SUPER::add ($self->{vp}, $self->{slider}); 1101 $self->SUPER::add ($self->{vp});
1102
1046 $self->add ($child) if $child; 1103 $self->add ($child) if $child;
1047 1104
1048 $self 1105 $self
1049} 1106}
1050
1051#TODO# update range on size_allocate depending on child
1052 1107
1053sub add { 1108sub add {
1054 my ($self, $widget) = @_; 1109 my ($self, $widget) = @_;
1055 1110
1056 $self->{vp}->add ($self->{child} = $widget); 1111 $self->{vp}->add ($self->{child} = $widget);
1057} 1112}
1058 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
1059sub invoke_mouse_wheel { 1158sub invoke_mouse_wheel {
1060 my ($self, $ev) = @_; 1159 my ($self, $ev) = @_;
1061 1160
1062 return 0 unless $ev->{dy}; # only vertical movements
1063
1064 $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};
1065 1163
1066 1 1164 1
1067} 1165}
1068 1166
1069sub update_slider { 1167sub invoke_button_down {
1070 my ($self) = @_; 1168 my ($self, $ev, $x, $y) = @_;
1071 1169
1072 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1170 if ($ev->{button} == 2) {
1073} 1171 $self->start_dragging ($ev);
1172 return 1;
1173 }
1074 1174
1075sub update { 1175 0
1076 my ($self) = @_; 1176}
1077 1177
1078 $self->SUPER::update; 1178sub invoke_button_up {
1179 my ($self, $ev, $x, $y) = @_;
1079 1180
1080 $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
1081} 1197}
1082 1198
1083sub invoke_size_allocate { 1199sub invoke_size_allocate {
1084 my ($self, $w, $h) = @_; 1200 my ($self, $w, $h) = @_;
1085 1201
1086 $self->update_slider; 1202 $self->update_slider;
1087
1088 $self->SUPER::invoke_size_allocate ($w, $h) 1203 $self->SUPER::invoke_size_allocate ($w, $h)
1089} 1204}
1090 1205
1091############################################################################# 1206#############################################################################
1092 1207
… …
1134 1249
1135our @ISA = CFPlus::UI::Bin::; 1250our @ISA = CFPlus::UI::Bin::;
1136 1251
1137use CFPlus::OpenGL; 1252use CFPlus::OpenGL;
1138 1253
1254sub new {
1255 my ($class, %arg) = @_;
1256
1257 if ((exists $arg{label}) && !ref $arg{label}) {
1258 $arg{label} = new CFPlus::UI::Label
1259 align => 1,
1260 valign => 0,
1261 text => $arg{label},
1262 fontsize => ($arg{border} || 0.8) * 0.75;
1263 }
1264
1265 my $self = $class->SUPER::new (
1266 # label => "",
1267 fg => [0.6, 0.3, 0.1],
1268 border => 0.8,
1269 style => 'single',
1270 %arg,
1271 );
1272
1273 $self
1274}
1275
1276sub add {
1277 my ($self, @widgets) = @_;
1278
1279 $self->SUPER::add (@widgets);
1280 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1281}
1282
1283sub border {
1284 int $_[0]{border} * $::FONTSIZE
1285}
1286
1287sub size_request {
1288 my ($self) = @_;
1289
1290 ($self->{label_w}, undef) = $self->{label}->size_request
1291 if $self->{label};
1292
1293 my ($w, $h) = $self->SUPER::size_request;
1294
1295 (
1296 $w + $self->border * 2,
1297 $h + $self->border * 2,
1298 )
1299}
1300
1301sub invoke_size_allocate {
1302 my ($self, $w, $h) = @_;
1303
1304 my $border = $self->border;
1305
1306 $w -= List::Util::max 0, $border * 2;
1307 $h -= List::Util::max 0, $border * 2;
1308
1309 if (my $label = $self->{label}) {
1310 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1311 $label->{h} = List::Util::min $h, $border;
1312 $label->invoke_size_allocate ($label->{w}, $label->{h});
1313 }
1314
1315 $self->child->configure ($border, $border, $w, $h);
1316
1317 1
1318}
1319
1320sub _draw {
1321 my ($self) = @_;
1322
1323 my $child = $self->{children}[0];
1324
1325 my $border = $self->border;
1326 my ($w, $h) = ($self->{w}, $self->{h});
1327
1328 $child->draw;
1329
1330 glColor @{$self->{fg}};
1331 glBegin GL_LINE_STRIP;
1332 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1333 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1334 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1335 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1336 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1337 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1338 glEnd;
1339
1340 if ($self->{label}) {
1341 glTranslate $border * 2, 0;
1342 $self->{label}->_draw;
1343 }
1344}
1345
1346#############################################################################
1347
1348package CFPlus::UI::Toplevel;
1349
1350our @ISA = CFPlus::UI::Bin::;
1351
1352use CFPlus::OpenGL;
1353
1139my $bg = 1354my $bg =
1140 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1355 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1141 mipmap => 1, wrap => 1; 1356 mipmap => 1, wrap => 1;
1142 1357
1143my @border = 1358my @border =
1144 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1359 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1145 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);
1361
1362my @icon =
1363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1364 qw(x1_move.png x1_resize.png);
1146 1365
1147sub new { 1366sub new {
1148 my ($class, %arg) = @_; 1367 my ($class, %arg) = @_;
1149 1368
1150 my $self = $class->SUPER::new ( 1369 my $self = $class->SUPER::new (
… …
1319 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1320 1539
1321 my $border = $self->border; 1540 my $border = $self->border;
1322 1541
1323 glColor @{ $self->{border_bg} }; 1542 glColor @{ $self->{border_bg} };
1324 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1543 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1325 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1544 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1326 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1545 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1327 $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);
1328 1561
1329 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1562 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1330 glColor @{ $self->{bg} }; 1563 glColor @{ $self->{bg} };
1331 1564
1332 # TODO: repeat texture not scale 1565 # TODO: repeat texture not scale
… …
1353 1586
1354############################################################################# 1587#############################################################################
1355 1588
1356package CFPlus::UI::Table; 1589package CFPlus::UI::Table;
1357 1590
1358our @ISA = CFPlus::UI::Base::; 1591our @ISA = CFPlus::UI::Container::;
1359 1592
1360use List::Util qw(max sum); 1593use List::Util qw(max sum);
1361 1594
1362use CFPlus::OpenGL; 1595use CFPlus::OpenGL;
1363 1596
1364sub new { 1597sub new {
1365 my $class = shift; 1598 my $class = shift;
1366 1599
1367 $class->SUPER::new ( 1600 $class->SUPER::new (
1368 col_expand => [], 1601 col_expand => [],
1602 row_expand => [],
1369 @_, 1603 @_,
1370 ) 1604 )
1371} 1605}
1372 1606
1373sub children {
1374 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1375}
1376
1377sub 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 {
1378 my ($self) = shift; 1619 my $self = shift;
1620
1621 my @widgets;
1379 1622
1380 while (@_) { 1623 while (@_) {
1381 my ($x, $y, $child) = splice @_, 0, 3, (); 1624 my ($col, $row, $child) = splice @_, 0, 3, ();
1382 $child->set_parent ($self);
1383 $self->{children}[$y][$x] = $child;
1384 }
1385 1625
1386 $self->{force_realloc} = 1; 1626 $child->{row} = $row;
1387 $self->{force_size_alloc} = 1; 1627 $child->{col} = $col;
1388 $self->realloc;
1389}
1390 1628
1391sub remove { 1629 push @widgets, $child;
1630 }
1631
1632 $self->add (@widgets);
1633}
1634
1635sub get_wh {
1392 my ($self, $child) = @_; 1636 my ($self) = @_;
1393 1637
1394 # TODO: not yet implemented 1638 my (@w, @h);
1395}
1396
1397# TODO: move to container class maybe? send children a signal on removal?
1398sub clear {
1399 my ($self) = @_;
1400 1639
1401 my @children = $self->children; 1640 my @children = $self->children;
1402 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 }
1403 1651 }
1404 for (@children) {
1405 delete $_->{parent};
1406 $_->hide;
1407 }
1408 1652
1409 $self->realloc; 1653 # second pass, rows
1410} 1654 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1411
1412sub get_wh {
1413 my ($self) = @_;
1414
1415 my (@w, @h);
1416
1417 for my $y (0 .. $#{$self->{children}}) {
1418 my $row = $self->{children}[$y]
1419 or next;
1420
1421 for my $x (0 .. $#$row) {
1422 my $widget = $row->[$x]
1423 or next;
1424 my ($w, $h) = @$widget{qw(req_w req_h)}; 1655 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1425 1656
1426 $w[$x] = max $w[$x], $w; 1657 my $sh = sum @h[$r .. $r + $rs - 1];
1427 $h[$y] = max $h[$y], $h; 1658
1659 if ($h > $sh) {
1660 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1428 } 1661 }
1429 } 1662 }
1430 1663
1431 (\@w, \@h) 1664 (\@w, \@h)
1432} 1665}
… …
1448 my ($ws, $hs) = $self->get_wh; 1681 my ($ws, $hs) = $self->get_wh;
1449 1682
1450 my $req_w = (sum @$ws) || 1; 1683 my $req_w = (sum @$ws) || 1;
1451 my $req_h = (sum @$hs) || 1; 1684 my $req_h = (sum @$hs) || 1;
1452 1685
1453 # TODO: nicer code && do row_expand 1686 # now linearly scale the rows/columns to the allocated size
1454 my @col_expand = @{$self->{col_expand}}; 1687 my @col_expand = @{$self->{col_expand}};
1455 @col_expand = (1) x @$ws unless @col_expand; 1688 @col_expand = (1) x @$ws unless @col_expand;
1456 my $col_expand = (sum @col_expand) || 1; 1689 my $col_expand = (sum @col_expand) || 1;
1457 1690
1458 # linearly scale sizes
1459 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1691 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1460 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1461 1692
1462 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
1463 CFPlus::UI::harmonize $hs; 1701 CFPlus::UI::harmonize $hs;
1464 1702
1465 my $y; 1703 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1704 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1466 1705
1467 for my $r (0 .. $#{$self->{children}}) { 1706 for my $widget ($self->children) {
1468 my $row = $self->{children}[$r] 1707 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1469 or next;
1470 1708
1471 my $x = 0; 1709 $widget->configure (
1472 my $row_h = $hs->[$r]; 1710 $x[$c], $y[$r],
1711 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1473 1712 );
1474 for my $c (0 .. $#$row) { 1713 }
1475 my $col_w = $ws->[$c];
1476 1714
1477 if (my $widget = $row->[$c]) { 1715 1
1478 $widget->configure ($x, $y, $col_w, $row_h); 1716}
1479 }
1480 1717
1481 $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;
1482 } 1756 }
1757 }
1483 1758
1484 $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);
1485 } 1795 }
1486 1796
1487 1 1797 1
1488}
1489
1490sub find_widget {
1491 my ($self, $x, $y) = @_;
1492
1493 $x -= $self->{x};
1494 $y -= $self->{y};
1495
1496 my $res;
1497
1498 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1499 $res = $_->find_widget ($x, $y)
1500 and return $res;
1501 }
1502
1503 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1504}
1505
1506sub _draw {
1507 my ($self) = @_;
1508
1509 for (grep $_, @{$self->{children}}) {
1510 $_->draw for grep $_, @$_;
1511 }
1512} 1798}
1513 1799
1514############################################################################# 1800#############################################################################
1515 1801
1516package CFPlus::UI::Box; 1802package CFPlus::UI::Box;
… …
1802 active_fg => [0, 0, 0], 2088 active_fg => [0, 0, 0],
1803 can_hover => 1, 2089 can_hover => 1,
1804 can_focus => 1, 2090 can_focus => 1,
1805 valign => 0, 2091 valign => 0,
1806 can_events => 1, 2092 can_events => 1,
2093 ellipsise => 0,
1807 #text => ... 2094 #text => ...
1808 #hidden => "*", 2095 #hidden => "*",
1809 @_ 2096 @_
1810 ) 2097 )
1811} 2098}
… …
1855 my $mod = $ev->{mod}; 2142 my $mod = $ev->{mod};
1856 my $sym = $ev->{sym}; 2143 my $sym = $ev->{sym};
1857 my $uni = $ev->{unicode}; 2144 my $uni = $ev->{unicode};
1858 2145
1859 my $text = $self->get_text; 2146 my $text = $self->get_text;
2147
2148 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1860 2149
1861 if ($uni == 8) { 2150 if ($uni == 8) {
1862 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2151 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1863 } elsif ($uni == 127) { 2152 } elsif ($uni == 127) {
1864 substr $text, $self->{cursor}, 1, ""; 2153 substr $text, $self->{cursor}, 1, "";
1865 } elsif ($sym == CFPlus::SDLK_LEFT) { 2154 } elsif ($sym == CFPlus::SDLK_LEFT) {
1866 --$self->{cursor} if $self->{cursor}; 2155 --$self->{cursor} if $self->{cursor};
1867 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2156 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1868 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2157 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1869 } elsif ($sym == CFPlus::SDLK_HOME) { 2158 } elsif ($sym == CFPlus::SDLK_HOME) {
2159 # what a hack
2160 $self->{cursor} =
2161 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2162 ? length $1
2163 : 0;
2164 } elsif ($sym == CFPlus::SDLK_END) {
2165 # uh, again
2166 $self->{cursor} =
2167 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2168 ? $self->{cursor} + length $1
2169 : length $self->{text};
2170 } elsif ($uni == 21) { # ctrl-u
2171 $text = "";
1870 $self->{cursor} = 0; 2172 $self->{cursor} = 0;
1871 } elsif ($sym == CFPlus::SDLK_END) {
1872 $self->{cursor} = length $text;
1873 } elsif ($uni == 27) { 2173 } elsif ($uni == 27) {
1874 $self->emit ('escape'); 2174 $self->emit ('escape');
1875 } elsif ($uni) { 2175 } elsif ($uni == 0x0d) {
2176 substr $text, $self->{cursor}++, 0, "\012";
2177 } elsif ($uni >= 0x20) {
1876 substr $text, $self->{cursor}++, 0, chr $uni; 2178 substr $text, $self->{cursor}++, 0, chr $uni;
1877 } else { 2179 } else {
1878 return 0; 2180 return 0;
1879 } 2181 }
1880 2182
1881 $self->_set_text ($text); 2183 $self->_set_text ($text);
1882 2184
1883 $self->realloc; 2185 $self->realloc;
2186 $self->update;
1884 2187
1885 1 2188 1
1886} 2189}
1887 2190
1888sub invoke_focus_in { 2191sub invoke_focus_in {
… …
1950 utf8::encode $text; 2253 utf8::encode $text;
1951 2254
1952 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2255 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1953 } 2256 }
1954 2257
1955 glColor @{$self->{fg}};
1956 glBegin GL_LINES; 2258 glBegin GL_LINES;
1957 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2259 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1958 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2260 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1959 glEnd; 2261 glEnd;
1960 } 2262 }
1961} 2263}
2264
2265#############################################################################
1962 2266
1963package CFPlus::UI::Entry; 2267package CFPlus::UI::Entry;
1964 2268
1965our @ISA = CFPlus::UI::EntryBase::; 2269our @ISA = CFPlus::UI::EntryBase::;
1966 2270
… …
1969sub invoke_key_down { 2273sub invoke_key_down {
1970 my ($self, $ev) = @_; 2274 my ($self, $ev) = @_;
1971 2275
1972 my $sym = $ev->{sym}; 2276 my $sym = $ev->{sym};
1973 2277
1974 if ($sym == 13) { 2278 if ($ev->{uni} == 0x0d || $sym == 13) {
1975 unshift @{$self->{history}}, 2279 unshift @{$self->{history}},
1976 my $txt = $self->get_text; 2280 my $txt = $self->get_text;
1977 2281
1978 $self->{history_pointer} = -1; 2282 $self->{history_pointer} = -1;
1979 $self->{history_saveback} = ''; 2283 $self->{history_saveback} = '';
… …
2009 1 2313 1
2010} 2314}
2011 2315
2012############################################################################# 2316#############################################################################
2013 2317
2318package CFPlus::UI::TextEdit;
2319
2320our @ISA = CFPlus::UI::EntryBase::;
2321
2322use CFPlus::OpenGL;
2323
2324sub move_cursor_ver {
2325 my ($self, $dy) = @_;
2326
2327 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2328
2329 $y += $dy;
2330
2331 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2332 $self->{cursor} = $index;
2333 delete $self->{cur_h};
2334 $self->update;
2335 return;
2336 }
2337}
2338
2339sub invoke_key_down {
2340 my ($self, $ev) = @_;
2341
2342 my $sym = $ev->{sym};
2343
2344 if ($sym == CFPlus::SDLK_UP) {
2345 $self->move_cursor_ver (-1);
2346 } elsif ($sym == CFPlus::SDLK_DOWN) {
2347 $self->move_cursor_ver (+1);
2348 } else {
2349 return $self->SUPER::invoke_key_down ($ev)
2350 }
2351
2352 1
2353}
2354
2355#############################################################################
2356
2014package CFPlus::UI::Button; 2357package CFPlus::UI::Button;
2015 2358
2016our @ISA = CFPlus::UI::Label::; 2359our @ISA = CFPlus::UI::Label::;
2017 2360
2018use CFPlus::OpenGL; 2361use CFPlus::OpenGL;
2019 2362
2020my @tex = 2363my @tex =
2021 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2364 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2022 qw(b1_button_active.png); 2365 qw(b1_button_inactive.png b1_button_active.png);
2023 2366
2024sub new { 2367sub new {
2025 my $class = shift; 2368 my $class = shift;
2026 2369
2027 $class->SUPER::new ( 2370 $class->SUPER::new (
2028 padding_x => 4, 2371 padding_x => 4,
2029 padding_y => 4, 2372 padding_y => 4,
2030 fg => [1, 1, 1], 2373 fg => [1.0, 1.0, 1.0],
2031 active_fg => [0, 0, 1], 2374 active_fg => [0.8, 0.8, 0.8],
2032 can_hover => 1, 2375 can_hover => 1,
2033 align => 0, 2376 align => 0,
2034 valign => 0, 2377 valign => 0,
2035 can_events => 1, 2378 can_events => 1,
2036 @_ 2379 @_
… …
2054 2397
2055 glEnable GL_TEXTURE_2D; 2398 glEnable GL_TEXTURE_2D;
2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2399 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057 glColor 0, 0, 0, 1; 2400 glColor 0, 0, 0, 1;
2058 2401
2402 my $tex = $tex[$GRAB == $self];
2059 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2403 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2060 2404
2061 glDisable GL_TEXTURE_2D; 2405 glDisable GL_TEXTURE_2D;
2062 2406
2063 $self->SUPER::_draw; 2407 $self->SUPER::_draw;
2064} 2408}
… …
2160 or Carp::croak "'path' or 'tex' attributes required"; 2504 or Carp::croak "'path' or 'tex' attributes required";
2161 2505
2162 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2506 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2163 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2507 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2164 2508
2165 Scalar::Util::weaken $texture_cache{$self->{path}}; 2509 CFPlus::weaken $texture_cache{$self->{path}};
2166 2510
2167 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2511 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2168 2512
2169 $self 2513 $self
2170} 2514}
… …
2543sub invoke_mouse_wheel { 2887sub invoke_mouse_wheel {
2544 my ($self, $ev) = @_; 2888 my ($self, $ev) = @_;
2545 2889
2546 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2890 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2547 2891
2892 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2893
2548 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2894 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2549 2895
2550 ! ! $delta 2896 ! ! $delta
2551} 2897}
2552 2898
2553sub update { 2899sub update {
… …
2663 #font => default_font 3009 #font => default_font
2664 @_, 3010 @_,
2665 3011
2666 layout => (new CFPlus::Layout), 3012 layout => (new CFPlus::Layout),
2667 par => [], 3013 par => [],
3014 max_par => 0,
2668 height => 0, 3015 height => 0,
2669 children => [ 3016 children => [
2670 (new CFPlus::UI::Empty expand => 1), 3017 (new CFPlus::UI::Empty expand => 1),
2671 (new CFPlus::UI::Slider vertical => 1), 3018 (new CFPlus::UI::Slider vertical => 1),
2672 ], 3019 ],
… …
2751sub set_offset { 3098sub set_offset {
2752 my ($self, $offset) = @_; 3099 my ($self, $offset) = @_;
2753 3100
2754 # todo: base offset on lines or so, not on pixels 3101 # todo: base offset on lines or so, not on pixels
2755 $self->{children}[1]->set_value ($offset); 3102 $self->{children}[1]->set_value ($offset);
3103}
3104
3105sub current_paragraph {
3106 my ($self) = @_;
3107
3108 $self->{top_paragraph} - 1
3109}
3110
3111sub scroll_to {
3112 my ($self, $para) = @_;
3113
3114 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3115
3116 $self->{scroll_to} = $para;
3117 $self->update;
2756} 3118}
2757 3119
2758sub clear { 3120sub clear {
2759 my ($self) = @_; 3121 my ($self) = @_;
2760 3122
… …
2782 3144
2783 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3145 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2784 push @{$self->{par}}, $para; 3146 push @{$self->{par}}, $para;
2785 } 3147 }
2786 3148
3149 if (my $max = $self->{max_par}) {
3150 shift @{$self->{par}} while @{$self->{par}} > $max;
3151 }
3152
2787 $self->{need_reflow}++; 3153 $self->{need_reflow}++;
2788 $self->update; 3154 $self->update;
2789} 3155}
2790 3156
2791sub scroll_to_bottom { 3157sub scroll_to_bottom {
2792 my ($self) = @_; 3158 my ($self) = @_;
2793 3159
2794 $self->{scroll_to_bottom} = 1; 3160 $self->{scroll_to} = $#{$self->{par}};
2795 $self->update; 3161 $self->update;
2796} 3162}
2797 3163
3164sub force_uptodate {
3165 my ($self) = @_;
3166
3167 if (delete $self->{need_reflow}) {
3168 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3169
3170 my $height = 0;
3171
3172 for my $para (@{$self->{par}}) {
3173 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3174 my $layout = $self->get_layout ($para);
3175 my ($w, $h) = $layout->size;
3176
3177 $para->{w} = $w + $para->{indent};
3178 $para->{h} = $h;
3179 $para->{wrapped} = $layout->has_wrapped;
3180 }
3181
3182 $para->{y} = $height;
3183 $height += $para->{h};
3184 }
3185
3186 $self->{height} = $height;
3187 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3188
3189 delete $self->{texture};
3190 }
3191
3192 if (my $paridx = delete $self->{scroll_to}) {
3193 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3194 }
3195}
3196
2798sub update { 3197sub update {
2799 my ($self) = @_; 3198 my ($self) = @_;
2800 3199
2801 $self->SUPER::update; 3200 $self->SUPER::update;
2802 3201
2803 return unless $self->{h} > 0; 3202 return unless $self->{h} > 0;
2804 3203
2805 delete $self->{texture}; 3204 delete $self->{texture};
2806 3205
2807 $ROOT->on_post_alloc ($self => sub { 3206 $ROOT->on_post_alloc ($self => sub {
3207 $self->force_uptodate;
3208
2808 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3209 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2809
2810 if (delete $self->{need_reflow}) {
2811 my $height = 0;
2812
2813 for my $para (@{$self->{par}}) {
2814 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2815 my $layout = $self->get_layout ($para);
2816 my ($w, $h) = $layout->size;
2817
2818 $para->{w} = $w + $para->{indent};
2819 $para->{h} = $h;
2820 $para->{wrapped} = $layout->has_wrapped;
2821 }
2822
2823 $height += $para->{h};
2824 }
2825
2826 $self->{height} = $height;
2827
2828 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2829
2830 delete $self->{texture};
2831 }
2832
2833 if (delete $self->{scroll_to_bottom}) {
2834 $self->{children}[1]->set_value (1e10);
2835 }
2836 3210
2837 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3211 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2838 glClearColor 0, 0, 0, 0; 3212 glClearColor 0, 0, 0, 0;
2839 glClear GL_COLOR_BUFFER_BIT; 3213 glClear GL_COLOR_BUFFER_BIT;
2840 3214
3215 package CFPlus::UI::Base;
3216 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3217 (0, 0, $self->{w}, $self->{h});
3218
3219 my $top = int $self->{children}[1]{range}[0];
3220
3221 my $paridx = 0;
3222 my $top_paragraph;
2841 my $top = int $self->{children}[1]{range}[0]; 3223 my $top = int $self->{children}[1]{range}[0];
2842 3224
2843 my $y0 = $top; 3225 my $y0 = $top;
2844 my $y1 = $top + $H; 3226 my $y1 = $top + $H;
2845 3227
2846 my $y = 0;
2847
2848 for my $para (@{$self->{par}}) { 3228 for my $para (@{$self->{par}}) {
2849 my $h = $para->{h}; 3229 my $h = $para->{h};
3230 my $y = $para->{y};
2850 3231
2851 if ($y0 < $y + $h && $y < $y1) { 3232 if ($y0 < $y + $h && $y < $y1) {
2852
2853 my $layout = $self->get_layout ($para); 3233 my $layout = $self->get_layout ($para);
2854 3234
2855 $layout->render ($para->{indent}, $y - $y0); 3235 $layout->render ($para->{indent}, $y - $y0);
2856 3236
2857 if (my @w = @{ $para->{widget} }) { 3237 if (my @w = @{ $para->{widget} }) {
… …
2866 $_->draw; 3246 $_->draw;
2867 } 3247 }
2868 } 3248 }
2869 } 3249 }
2870 3250
2871 $y += $h; 3251 $paridx++;
3252 $top_paragraph ||= $paridx if $y >= $top;
2872 } 3253 }
3254
3255 $self->{top_paragraph} = $top_paragraph;
2873 }; 3256 };
2874 }); 3257 });
2875} 3258}
2876 3259
2877sub reconfigure { 3260sub reconfigure {
… …
3080 3463
3081sub new { 3464sub new {
3082 my $class = shift; 3465 my $class = shift;
3083 3466
3084 my $self = $class->SUPER::new ( 3467 my $self = $class->SUPER::new (
3468 size_w => 32,
3469 size_h => 8,
3085 aspect => 1, 3470 aspect => 1,
3086 can_events => 0, 3471 can_events => 0,
3087 @_, 3472 @_,
3088 ); 3473 );
3089 3474
3090 if ($self->{anim} && $self->{animspeed}) { 3475 if ($self->{anim} && $self->{animspeed}) {
3091 Scalar::Util::weaken (my $widget = $self); 3476 CFPlus::weaken (my $widget = $self);
3092 3477
3478 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3479 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3093 $self->{timer} = Event->timer ( 3480 $self->{timer} = Event->timer (
3094 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3095 hard => 1, 3481 parked => 1,
3096 interval => $self->{animspeed},
3097 cb => sub { 3482 cb => sub {
3483 return unless $::CONN && $widget;
3484
3098 ++$widget->{frame}; 3485 ++$widget->{frame};
3486 $widget->update_face;
3099 $widget->update; 3487 $widget->update;
3488
3489 $widget->update_timer;
3100 }, 3490 },
3101 ); 3491 );
3492
3493 $self->update_face;
3494 $self->update_timer;
3102 } 3495 }
3103 3496
3104 $self 3497 $self
3105} 3498}
3106 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
3107sub size_request { 3530sub size_request {
3108 (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)
3109} 3546}
3110 3547
3111sub update { 3548sub update {
3112 my ($self) = @_; 3549 my ($self) = @_;
3113 3550
3114 return unless $self->{visible}; 3551 return unless $self->{visible};
3115 3552
3116 $self->SUPER::update; 3553 $self->SUPER::update;
3117} 3554}
3118 3555
3556sub invoke_visibility_change {
3557 my ($self) = @_;
3558
3559 $self->update_timer;
3560
3561 0
3562}
3563
3119sub _draw { 3564sub _draw {
3120 my ($self) = @_; 3565 my ($self) = @_;
3121 3566
3122 return unless $::CONN; 3567 return unless $::CONN;
3123 3568
3124 $self->SUPER::_draw; 3569 $self->SUPER::_draw;
3125 3570
3126 my $face;
3127
3128 if ($self->{frame}) {
3129 my $anim = $::CONN->{anim}[$self->{anim}]; 3571 my $faceid = $::CONN->{faceid}[$self->{face}]
3130 3572 or return;
3131 $face = $anim->[ $self->{frame} % @$anim ]
3132 if $anim && @$anim;
3133 }
3134 3573
3135 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3574 my $tex = $::CONN->{texture}[$faceid];
3136 3575
3137 if ($tex) { 3576 if ($tex) {
3138 glEnable GL_TEXTURE_2D; 3577 glEnable GL_TEXTURE_2D;
3139 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3578 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3140 glColor 0, 0, 0, 1; 3579 glColor 0, 0, 0, 1;
… …
3144} 3583}
3145 3584
3146sub destroy { 3585sub destroy {
3147 my ($self) = @_; 3586 my ($self) = @_;
3148 3587
3149 $self->{timer}->cancel 3588 (delete $self->{timer})->cancel
3150 if $self->{timer}; 3589 if $self->{timer};
3151 3590
3152 $self->SUPER::destroy; 3591 $self->SUPER::destroy;
3153} 3592}
3154 3593
… …
3156 3595
3157package CFPlus::UI::Buttonbar; 3596package CFPlus::UI::Buttonbar;
3158 3597
3159our @ISA = CFPlus::UI::HBox::; 3598our @ISA = CFPlus::UI::HBox::;
3160 3599
3161# TODO: should actualyl wrap buttons and other goodies. 3600# TODO: should actually wrap buttons and other goodies.
3162 3601
3163############################################################################# 3602#############################################################################
3164 3603
3165package CFPlus::UI::Menu; 3604package CFPlus::UI::Menu;
3166 3605
3167our @ISA = CFPlus::UI::FancyFrame::; 3606our @ISA = CFPlus::UI::Toplevel::;
3168 3607
3169use CFPlus::OpenGL; 3608use CFPlus::OpenGL;
3170 3609
3171sub new { 3610sub new {
3172 my $class = shift; 3611 my $class = shift;
… …
3350} 3789}
3351 3790
3352sub add { 3791sub add {
3353 my ($self, $title, $widget, $tooltip) = @_; 3792 my ($self, $title, $widget, $tooltip) = @_;
3354 3793
3355 Scalar::Util::weaken $self; 3794 CFPlus::weaken $self;
3356 3795
3357 $self->{buttonbar}->add (new CFPlus::UI::Button 3796 $self->{buttonbar}->add (new CFPlus::UI::Button
3358 markup => $title, 3797 markup => $title,
3359 tooltip => $tooltip, 3798 tooltip => $tooltip,
3360 on_activate => sub { $self->set_current_page ($widget) }, 3799 on_activate => sub { $self->set_current_page ($widget) },
… …
3444 my $self = $class->SUPER::new ( 3883 my $self = $class->SUPER::new (
3445 fontsize => 0.8, 3884 fontsize => 0.8,
3446 @_, 3885 @_,
3447 ); 3886 );
3448 3887
3449 Scalar::Util::weaken (my $this = $self); 3888 CFPlus::weaken (my $this = $self);
3450 3889
3451 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3890 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3452 3891
3453 $self 3892 $self
3454} 3893}
… …
3577 $self->SUPER::destroy; 4016 $self->SUPER::destroy;
3578} 4017}
3579 4018
3580############################################################################# 4019#############################################################################
3581 4020
3582package CFPlus::UI::Inventory;
3583
3584our @ISA = CFPlus::UI::Table::;
3585
3586sub new {
3587 my $class = shift;
3588
3589 my $self = $class->SUPER::new (
3590 col_expand => [0, 1, 0],
3591 items => [],
3592 @_,
3593 );
3594
3595 $self->set_sort_order (undef);
3596
3597 $self
3598}
3599
3600sub update_items {
3601 my ($self) = @_;
3602
3603 $self->clear;
3604
3605 my @item = $self->{sort}->(@{ $self->{items} });
3606
3607 my @adds;
3608 my $row = 0;
3609 for my $item ($self->{sort}->(@{ $self->{items} })) {
3610 CFPlus::Item::update_widgets $item;
3611
3612 push @adds, 0, $row, $item->{face_widget};
3613 push @adds, 1, $row, $item->{desc_widget};
3614 push @adds, 2, $row, $item->{weight_widget};
3615
3616 $row++;
3617 }
3618
3619 $self->add (@adds);
3620}
3621
3622sub set_sort_order {
3623 my ($self, $order) = @_;
3624
3625 $self->{sort} = $order ||= sub {
3626 sort {
3627 $a->{type} <=> $b->{type}
3628 or $a->{name} cmp $b->{name}
3629 } @_
3630 };
3631
3632 $self->update_items;
3633}
3634
3635sub set_items {
3636 my ($self, $items) = @_;
3637
3638 $self->{items} = [$items ? values %$items : ()];
3639 $self->update_items;
3640}
3641
3642#############################################################################
3643
3644package CFPlus::UI::SpellList;
3645
3646our @ISA = CFPlus::UI::Table::;
3647
3648sub new {
3649 my $class = shift;
3650
3651 my $self = $class->SUPER::new (
3652 binding => [],
3653 commands => [],
3654 @_,
3655 )
3656}
3657
3658my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3659
3660my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3661 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3662my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3663 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3664my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3665 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3666my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3667 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3668my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3669 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3670
3671sub rebuild_spell_list {
3672 my ($self) = @_;
3673
3674 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3675 $self->clear;
3676
3677 return unless $::CONN;
3678
3679 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3680 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3681 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3682 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3683 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3684
3685 my $row = 0;
3686
3687 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3688 my $spell = $self->{spell}{$_};
3689
3690 $row++;
3691
3692 my $spell_cb = sub {
3693 my ($widget, $ev) = @_;
3694
3695 if ($ev->{button} == 1) {
3696 $::CONN->user_send ("cast $spell->{name}");
3697 } elsif ($ev->{button} == 2) {
3698 $::CONN->user_send ("invoke $spell->{name}");
3699 } elsif ($ev->{button} == 3) {
3700 (new CFPlus::UI::Menu
3701 items => [
3702 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3703 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3704 ],
3705 )->popup ($ev);
3706 } else {
3707 return 0;
3708 }
3709
3710 1
3711 };
3712
3713 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3714
3715 #TODO: add path info to tooltip
3716 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3717
3718 $self->add (0, $row, new CFPlus::UI::Face
3719 face => $spell->{face},
3720 can_hover => 1,
3721 can_events => 1,
3722 tooltip => $tooltip,
3723 on_button_down => $spell_cb,
3724 );
3725
3726 $self->add (1, $row, new CFPlus::UI::Label
3727 expand => 1,
3728 text => $spell->{name},
3729 can_hover => 1,
3730 can_events => 1,
3731 tooltip => $tooltip,
3732 on_button_down => $spell_cb,
3733 );
3734
3735 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3736 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3737 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3738 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3739 }
3740 });
3741}
3742
3743sub add_spell {
3744 my ($self, $spell) = @_;
3745
3746 $self->{spell}->{$spell->{name}} = $spell;
3747 $self->rebuild_spell_list;
3748}
3749
3750sub remove_spell {
3751 my ($self, $spell) = @_;
3752
3753 delete $self->{spell}->{$spell->{name}};
3754 $self->rebuild_spell_list;
3755}
3756
3757sub clear_spells {
3758 my ($self) = @_;
3759
3760 $self->{spell} = {};
3761 $self->rebuild_spell_list;
3762}
3763
3764#############################################################################
3765
3766package CFPlus::UI::Root; 4021package CFPlus::UI::Root;
3767 4022
3768our @ISA = CFPlus::UI::Container::; 4023our @ISA = CFPlus::UI::Container::;
3769 4024
3770use List::Util qw(min max); 4025use List::Util qw(min max);
… …
3777 my $self = $class->SUPER::new ( 4032 my $self = $class->SUPER::new (
3778 visible => 1, 4033 visible => 1,
3779 @_, 4034 @_,
3780 ); 4035 );
3781 4036
3782 Scalar::Util::weaken ($self->{root} = $self); 4037 CFPlus::weaken ($self->{root} = $self);
3783 4038
3784 $self 4039 $self
3785} 4040}
3786 4041
3787sub size_request { 4042sub size_request {
… …
3982 while ($self->{post_alloc_hook}) { 4237 while ($self->{post_alloc_hook}) {
3983 $_->() 4238 $_->()
3984 for values %{delete $self->{post_alloc_hook}}; 4239 for values %{delete $self->{post_alloc_hook}};
3985 } 4240 }
3986 4241
3987
3988 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4242 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3989 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4243 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3990 glClear GL_COLOR_BUFFER_BIT; 4244 glClear GL_COLOR_BUFFER_BIT;
3991 4245
3992 glMatrixMode GL_PROJECTION; 4246 glMatrixMode GL_PROJECTION;
… …
3996 glLoadIdentity; 4250 glLoadIdentity;
3997 4251
3998 { 4252 {
3999 package CFPlus::UI::Base; 4253 package CFPlus::UI::Base;
4000 4254
4001 ($draw_x, $draw_y, $draw_w, $draw_h) = 4255 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4002 (0, 0, $self->{w}, $self->{h}); 4256 (0, 0, $self->{w}, $self->{h});
4003 }
4004 4257
4005 $self->_draw; 4258 $self->_draw;
4259 }
4006} 4260}
4007 4261
4008############################################################################# 4262#############################################################################
4009 4263
4010package CFPlus::UI; 4264package CFPlus::UI;

Diff Legend

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