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.344 by root, Sun Aug 13 16:29:36 2006 UTC vs.
Revision 1.402 by root, Sat Jul 21 20:49:44 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) = @_;
… …
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
… …
1132 1258
1133our @ISA = CFPlus::UI::Bin::; 1259our @ISA = CFPlus::UI::Bin::;
1134 1260
1135use CFPlus::OpenGL; 1261use CFPlus::OpenGL;
1136 1262
1263sub new {
1264 my ($class, %arg) = @_;
1265
1266 if ((exists $arg{label}) && !ref $arg{label}) {
1267 $arg{label} = new CFPlus::UI::Label
1268 align => 1,
1269 valign => 0,
1270 text => $arg{label},
1271 fontsize => ($arg{border} || 0.8) * 0.75;
1272 }
1273
1274 my $self = $class->SUPER::new (
1275 # label => "",
1276 fg => [0.6, 0.3, 0.1],
1277 border => 0.8,
1278 style => 'single',
1279 %arg,
1280 );
1281
1282 $self
1283}
1284
1285sub add {
1286 my ($self, @widgets) = @_;
1287
1288 $self->SUPER::add (@widgets);
1289 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1290}
1291
1292sub border {
1293 int $_[0]{border} * $::FONTSIZE
1294}
1295
1296sub size_request {
1297 my ($self) = @_;
1298
1299 ($self->{label_w}, undef) = $self->{label}->size_request
1300 if $self->{label};
1301
1302 my ($w, $h) = $self->SUPER::size_request;
1303
1304 (
1305 $w + $self->border * 2,
1306 $h + $self->border * 2,
1307 )
1308}
1309
1310sub invoke_size_allocate {
1311 my ($self, $w, $h) = @_;
1312
1313 my $border = $self->border;
1314
1315 $w -= List::Util::max 0, $border * 2;
1316 $h -= List::Util::max 0, $border * 2;
1317
1318 if (my $label = $self->{label}) {
1319 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1320 $label->{h} = List::Util::min $h, $border;
1321 $label->invoke_size_allocate ($label->{w}, $label->{h});
1322 }
1323
1324 $self->child->configure ($border, $border, $w, $h);
1325
1326 1
1327}
1328
1329sub _draw {
1330 my ($self) = @_;
1331
1332 my $child = $self->{children}[0];
1333
1334 my $border = $self->border;
1335 my ($w, $h) = ($self->{w}, $self->{h});
1336
1337 $child->draw;
1338
1339 glColor @{$self->{fg}};
1340 glBegin GL_LINE_STRIP;
1341 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1342 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1343 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1344 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1345 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1346 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1347 glEnd;
1348
1349 if ($self->{label}) {
1350 glTranslate $border * 2, 0;
1351 $self->{label}->_draw;
1352 }
1353}
1354
1355#############################################################################
1356
1357package CFPlus::UI::Toplevel;
1358
1359our @ISA = CFPlus::UI::Bin::;
1360
1361use CFPlus::OpenGL;
1362
1137my $bg = 1363my $bg =
1138 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1364 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1139 mipmap => 1, wrap => 1; 1365 mipmap => 1, wrap => 1;
1140 1366
1141my @border = 1367my @border =
1142 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1368 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1143 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);
1370
1371my @icon =
1372 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1373 qw(x1_move.png x1_resize.png);
1144 1374
1145sub new { 1375sub new {
1146 my ($class, %arg) = @_; 1376 my ($class, %arg) = @_;
1147 1377
1148 my $self = $class->SUPER::new ( 1378 my $self = $class->SUPER::new (
… …
1317 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1318 1548
1319 my $border = $self->border; 1549 my $border = $self->border;
1320 1550
1321 glColor @{ $self->{border_bg} }; 1551 glColor @{ $self->{border_bg} };
1322 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1323 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1324 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1325 $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);
1326 1570
1327 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1571 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1328 glColor @{ $self->{bg} }; 1572 glColor @{ $self->{bg} };
1329 1573
1330 # TODO: repeat texture not scale 1574 # TODO: repeat texture not scale
… …
1351 1595
1352############################################################################# 1596#############################################################################
1353 1597
1354package CFPlus::UI::Table; 1598package CFPlus::UI::Table;
1355 1599
1356our @ISA = CFPlus::UI::Base::; 1600our @ISA = CFPlus::UI::Container::;
1357 1601
1358use List::Util qw(max sum); 1602use List::Util qw(max sum);
1359 1603
1360use CFPlus::OpenGL; 1604use CFPlus::OpenGL;
1361 1605
1362sub new { 1606sub new {
1363 my $class = shift; 1607 my $class = shift;
1364 1608
1365 $class->SUPER::new ( 1609 $class->SUPER::new (
1366 col_expand => [], 1610 col_expand => [],
1611 row_expand => [],
1367 @_, 1612 @_,
1368 ) 1613 )
1369} 1614}
1370 1615
1371sub children {
1372 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1373}
1374
1375sub 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 {
1376 my ($self) = shift; 1628 my $self = shift;
1629
1630 my @widgets;
1377 1631
1378 while (@_) { 1632 while (@_) {
1379 my ($x, $y, $child) = splice @_, 0, 3, (); 1633 my ($col, $row, $child) = splice @_, 0, 3, ();
1380 $child->set_parent ($self);
1381 $self->{children}[$y][$x] = $child;
1382 }
1383 1634
1384 $self->{force_realloc} = 1; 1635 $child->{row} = $row;
1385 $self->{force_size_alloc} = 1; 1636 $child->{col} = $col;
1386 $self->realloc;
1387}
1388 1637
1389sub remove { 1638 push @widgets, $child;
1639 }
1640
1641 $self->add (@widgets);
1642}
1643
1644sub get_wh {
1390 my ($self, $child) = @_; 1645 my ($self) = @_;
1391 1646
1392 # TODO: not yet implemented 1647 my (@w, @h);
1393}
1394
1395# TODO: move to container class maybe? send children a signal on removal?
1396sub clear {
1397 my ($self) = @_;
1398 1648
1399 my @children = $self->children; 1649 my @children = $self->children;
1400 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 }
1401 1660 }
1402 for (@children) {
1403 delete $_->{parent};
1404 $_->hide;
1405 }
1406 1661
1407 $self->realloc; 1662 # second pass, rows
1408} 1663 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1409
1410sub get_wh {
1411 my ($self) = @_;
1412
1413 my (@w, @h);
1414
1415 for my $y (0 .. $#{$self->{children}}) {
1416 my $row = $self->{children}[$y]
1417 or next;
1418
1419 for my $x (0 .. $#$row) {
1420 my $widget = $row->[$x]
1421 or next;
1422 my ($w, $h) = @$widget{qw(req_w req_h)}; 1664 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1423 1665
1424 $w[$x] = max $w[$x], $w; 1666 my $sh = sum @h[$r .. $r + $rs - 1];
1425 $h[$y] = max $h[$y], $h; 1667
1668 if ($h > $sh) {
1669 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1426 } 1670 }
1427 } 1671 }
1428 1672
1429 (\@w, \@h) 1673 (\@w, \@h)
1430} 1674}
… …
1446 my ($ws, $hs) = $self->get_wh; 1690 my ($ws, $hs) = $self->get_wh;
1447 1691
1448 my $req_w = (sum @$ws) || 1; 1692 my $req_w = (sum @$ws) || 1;
1449 my $req_h = (sum @$hs) || 1; 1693 my $req_h = (sum @$hs) || 1;
1450 1694
1451 # TODO: nicer code && do row_expand 1695 # now linearly scale the rows/columns to the allocated size
1452 my @col_expand = @{$self->{col_expand}}; 1696 my @col_expand = @{$self->{col_expand}};
1453 @col_expand = (1) x @$ws unless @col_expand; 1697 @col_expand = (1) x @$ws unless @col_expand;
1454 my $col_expand = (sum @col_expand) || 1; 1698 my $col_expand = (sum @col_expand) || 1;
1455 1699
1456 # linearly scale sizes
1457 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1700 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1458 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1459 1701
1460 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
1461 CFPlus::UI::harmonize $hs; 1710 CFPlus::UI::harmonize $hs;
1462 1711
1463 my $y; 1712 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1713 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1464 1714
1465 for my $r (0 .. $#{$self->{children}}) { 1715 for my $widget ($self->children) {
1466 my $row = $self->{children}[$r] 1716 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1467 or next;
1468 1717
1469 my $x = 0; 1718 $widget->configure (
1470 my $row_h = $hs->[$r]; 1719 $x[$c], $y[$r],
1720 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1471 1721 );
1472 for my $c (0 .. $#$row) { 1722 }
1473 my $col_w = $ws->[$c];
1474 1723
1475 if (my $widget = $row->[$c]) { 1724 1
1476 $widget->configure ($x, $y, $col_w, $row_h); 1725}
1477 }
1478 1726
1479 $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;
1480 } 1765 }
1766 }
1481 1767
1482 $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, $W;
1801 $h = _scale $size, $h, $H;
1802
1803 $child->configure ($x, $y, $w, $h);
1483 } 1804 }
1484 1805
1485 1 1806 1
1486}
1487
1488sub find_widget {
1489 my ($self, $x, $y) = @_;
1490
1491 $x -= $self->{x};
1492 $y -= $self->{y};
1493
1494 my $res;
1495
1496 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1497 $res = $_->find_widget ($x, $y)
1498 and return $res;
1499 }
1500
1501 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1502}
1503
1504sub _draw {
1505 my ($self) = @_;
1506
1507 for (grep $_, @{$self->{children}}) {
1508 $_->draw for grep $_, @$_;
1509 }
1510} 1807}
1511 1808
1512############################################################################# 1809#############################################################################
1513 1810
1514package CFPlus::UI::Box; 1811package CFPlus::UI::Box;
… …
1800 active_fg => [0, 0, 0], 2097 active_fg => [0, 0, 0],
1801 can_hover => 1, 2098 can_hover => 1,
1802 can_focus => 1, 2099 can_focus => 1,
1803 valign => 0, 2100 valign => 0,
1804 can_events => 1, 2101 can_events => 1,
2102 ellipsise => 0,
1805 #text => ... 2103 #text => ...
1806 #hidden => "*", 2104 #hidden => "*",
1807 @_ 2105 @_
1808 ) 2106 )
1809} 2107}
… …
1853 my $mod = $ev->{mod}; 2151 my $mod = $ev->{mod};
1854 my $sym = $ev->{sym}; 2152 my $sym = $ev->{sym};
1855 my $uni = $ev->{unicode}; 2153 my $uni = $ev->{unicode};
1856 2154
1857 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;
1858 2158
1859 if ($uni == 8) { 2159 if ($uni == 8) {
1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2160 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861 } elsif ($uni == 127) { 2161 } elsif ($uni == 127) {
1862 substr $text, $self->{cursor}, 1, ""; 2162 substr $text, $self->{cursor}, 1, "";
1863 } elsif ($sym == CFPlus::SDLK_LEFT) { 2163 } elsif ($sym == CFPlus::SDLK_LEFT) {
1864 --$self->{cursor} if $self->{cursor}; 2164 --$self->{cursor} if $self->{cursor};
1865 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2165 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1866 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2166 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1867 } elsif ($sym == CFPlus::SDLK_HOME) { 2167 } elsif ($sym == CFPlus::SDLK_HOME) {
2168 # what a hack
2169 $self->{cursor} =
2170 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2171 ? length $1
2172 : 0;
2173 } elsif ($sym == CFPlus::SDLK_END) {
2174 # uh, again
2175 $self->{cursor} =
2176 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2177 ? $self->{cursor} + length $1
2178 : length $self->{text};
2179 } elsif ($uni == 21) { # ctrl-u
2180 $text = "";
1868 $self->{cursor} = 0; 2181 $self->{cursor} = 0;
1869 } elsif ($sym == CFPlus::SDLK_END) {
1870 $self->{cursor} = length $text;
1871 } elsif ($uni == 27) { 2182 } elsif ($uni == 27) {
1872 $self->emit ('escape'); 2183 $self->emit ('escape');
1873 } elsif ($uni) { 2184 } elsif ($uni == 0x0d) {
2185 substr $text, $self->{cursor}++, 0, "\012";
2186 } elsif ($uni >= 0x20) {
1874 substr $text, $self->{cursor}++, 0, chr $uni; 2187 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else { 2188 } else {
1876 return 0; 2189 return 0;
1877 } 2190 }
1878 2191
1879 $self->_set_text ($text); 2192 $self->_set_text ($text);
1880 2193
1881 $self->realloc; 2194 $self->realloc;
2195 $self->update;
1882 2196
1883 1 2197 1
1884} 2198}
1885 2199
1886sub invoke_focus_in { 2200sub invoke_focus_in {
… …
1955 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};
1956 glEnd; 2270 glEnd;
1957 } 2271 }
1958} 2272}
1959 2273
2274#############################################################################
2275
1960package CFPlus::UI::Entry; 2276package CFPlus::UI::Entry;
1961 2277
1962our @ISA = CFPlus::UI::EntryBase::; 2278our @ISA = CFPlus::UI::EntryBase::;
1963 2279
1964use CFPlus::OpenGL; 2280use CFPlus::OpenGL;
… …
1966sub invoke_key_down { 2282sub invoke_key_down {
1967 my ($self, $ev) = @_; 2283 my ($self, $ev) = @_;
1968 2284
1969 my $sym = $ev->{sym}; 2285 my $sym = $ev->{sym};
1970 2286
1971 if ($sym == 13) { 2287 if ($ev->{uni} == 0x0d || $sym == 13) {
1972 unshift @{$self->{history}}, 2288 unshift @{$self->{history}},
1973 my $txt = $self->get_text; 2289 my $txt = $self->get_text;
1974 2290
1975 $self->{history_pointer} = -1; 2291 $self->{history_pointer} = -1;
1976 $self->{history_saveback} = ''; 2292 $self->{history_saveback} = '';
… …
2006 1 2322 1
2007} 2323}
2008 2324
2009############################################################################# 2325#############################################################################
2010 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
2011package CFPlus::UI::Button; 2366package CFPlus::UI::Button;
2012 2367
2013our @ISA = CFPlus::UI::Label::; 2368our @ISA = CFPlus::UI::Label::;
2014 2369
2015use CFPlus::OpenGL; 2370use CFPlus::OpenGL;
2016 2371
2017my @tex = 2372my @tex =
2018 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2373 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2019 qw(b1_button_active.png); 2374 qw(b1_button_inactive.png b1_button_active.png);
2020 2375
2021sub new { 2376sub new {
2022 my $class = shift; 2377 my $class = shift;
2023 2378
2024 $class->SUPER::new ( 2379 $class->SUPER::new (
2025 padding_x => 4, 2380 padding_x => 4,
2026 padding_y => 4, 2381 padding_y => 4,
2027 fg => [1, 1, 1], 2382 fg => [1.0, 1.0, 1.0],
2028 active_fg => [0, 0, 1], 2383 active_fg => [0.8, 0.8, 0.8],
2029 can_hover => 1, 2384 can_hover => 1,
2030 align => 0, 2385 align => 0,
2031 valign => 0, 2386 valign => 0,
2032 can_events => 1, 2387 can_events => 1,
2033 @_ 2388 @_
… …
2051 2406
2052 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
2053 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2054 glColor 0, 0, 0, 1; 2409 glColor 0, 0, 0, 1;
2055 2410
2411 my $tex = $tex[$GRAB == $self];
2056 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2412 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2057 2413
2058 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
2059 2415
2060 $self->SUPER::_draw; 2416 $self->SUPER::_draw;
2061} 2417}
… …
2157 or Carp::croak "'path' or 'tex' attributes required"; 2513 or Carp::croak "'path' or 'tex' attributes required";
2158 2514
2159 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2515 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2160 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;
2161 2517
2162 Scalar::Util::weaken $texture_cache{$self->{path}}; 2518 CFPlus::weaken $texture_cache{$self->{path}};
2163 2519
2164 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2520 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2165 2521
2166 $self 2522 $self
2167} 2523}
… …
2540sub invoke_mouse_wheel { 2896sub invoke_mouse_wheel {
2541 my ($self, $ev) = @_; 2897 my ($self, $ev) = @_;
2542 2898
2543 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2899 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2544 2900
2901 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2902
2545 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2903 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2546 2904
2547 ! ! $delta 2905 ! ! $delta
2548} 2906}
2549 2907
2550sub update { 2908sub update {
… …
2660 #font => default_font 3018 #font => default_font
2661 @_, 3019 @_,
2662 3020
2663 layout => (new CFPlus::Layout), 3021 layout => (new CFPlus::Layout),
2664 par => [], 3022 par => [],
3023 max_par => 0,
2665 height => 0, 3024 height => 0,
2666 children => [ 3025 children => [
2667 (new CFPlus::UI::Empty expand => 1), 3026 (new CFPlus::UI::Empty expand => 1),
2668 (new CFPlus::UI::Slider vertical => 1), 3027 (new CFPlus::UI::Slider vertical => 1),
2669 ], 3028 ],
… …
2748sub set_offset { 3107sub set_offset {
2749 my ($self, $offset) = @_; 3108 my ($self, $offset) = @_;
2750 3109
2751 # todo: base offset on lines or so, not on pixels 3110 # todo: base offset on lines or so, not on pixels
2752 $self->{children}[1]->set_value ($offset); 3111 $self->{children}[1]->set_value ($offset);
3112}
3113
3114sub current_paragraph {
3115 my ($self) = @_;
3116
3117 $self->{top_paragraph} - 1
3118}
3119
3120sub scroll_to {
3121 my ($self, $para) = @_;
3122
3123 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3124
3125 $self->{scroll_to} = $para;
3126 $self->update;
2753} 3127}
2754 3128
2755sub clear { 3129sub clear {
2756 my ($self) = @_; 3130 my ($self) = @_;
2757 3131
… …
2779 3153
2780 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3154 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2781 push @{$self->{par}}, $para; 3155 push @{$self->{par}}, $para;
2782 } 3156 }
2783 3157
3158 if (my $max = $self->{max_par}) {
3159 shift @{$self->{par}} while @{$self->{par}} > $max;
3160 }
3161
2784 $self->{need_reflow}++; 3162 $self->{need_reflow}++;
2785 $self->update; 3163 $self->update;
2786} 3164}
2787 3165
2788sub scroll_to_bottom { 3166sub scroll_to_bottom {
2789 my ($self) = @_; 3167 my ($self) = @_;
2790 3168
2791 $self->{scroll_to_bottom} = 1; 3169 $self->{scroll_to} = $#{$self->{par}};
2792 $self->update; 3170 $self->update;
2793} 3171}
2794 3172
3173sub force_uptodate {
3174 my ($self) = @_;
3175
3176 if (delete $self->{need_reflow}) {
3177 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3178
3179 my $height = 0;
3180
3181 for my $para (@{$self->{par}}) {
3182 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3183 my $layout = $self->get_layout ($para);
3184 my ($w, $h) = $layout->size;
3185
3186 $para->{w} = $w + $para->{indent};
3187 $para->{h} = $h;
3188 $para->{wrapped} = $layout->has_wrapped;
3189 }
3190
3191 $para->{y} = $height;
3192 $height += $para->{h};
3193 }
3194
3195 $self->{height} = $height;
3196 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3197
3198 delete $self->{texture};
3199 }
3200
3201 if (my $paridx = delete $self->{scroll_to}) {
3202 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3203 }
3204}
3205
2795sub update { 3206sub update {
2796 my ($self) = @_; 3207 my ($self) = @_;
2797 3208
2798 $self->SUPER::update; 3209 $self->SUPER::update;
2799 3210
2800 return unless $self->{h} > 0; 3211 return unless $self->{h} > 0;
2801 3212
2802 delete $self->{texture}; 3213 delete $self->{texture};
2803 3214
2804 $ROOT->on_post_alloc ($self => sub { 3215 $ROOT->on_post_alloc ($self => sub {
3216 $self->force_uptodate;
3217
2805 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3218 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2806
2807 if (delete $self->{need_reflow}) {
2808 my $height = 0;
2809
2810 for my $para (@{$self->{par}}) {
2811 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2812 my $layout = $self->get_layout ($para);
2813 my ($w, $h) = $layout->size;
2814
2815 $para->{w} = $w + $para->{indent};
2816 $para->{h} = $h;
2817 $para->{wrapped} = $layout->has_wrapped;
2818 }
2819
2820 $height += $para->{h};
2821 }
2822
2823 $self->{height} = $height;
2824
2825 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2826
2827 delete $self->{texture};
2828 }
2829
2830 if (delete $self->{scroll_to_bottom}) {
2831 $self->{children}[1]->set_value (1e10);
2832 }
2833 3219
2834 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3220 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2835 glClearColor 0, 0, 0, 0; 3221 glClearColor 0, 0, 0, 0;
2836 glClear GL_COLOR_BUFFER_BIT; 3222 glClear GL_COLOR_BUFFER_BIT;
2837 3223
3224 package CFPlus::UI::Base;
3225 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3226 (0, 0, $self->{w}, $self->{h});
3227
3228 my $top = int $self->{children}[1]{range}[0];
3229
3230 my $paridx = 0;
3231 my $top_paragraph;
2838 my $top = int $self->{children}[1]{range}[0]; 3232 my $top = int $self->{children}[1]{range}[0];
2839 3233
2840 my $y0 = $top; 3234 my $y0 = $top;
2841 my $y1 = $top + $H; 3235 my $y1 = $top + $H;
2842 3236
2843 my $y = 0;
2844
2845 for my $para (@{$self->{par}}) { 3237 for my $para (@{$self->{par}}) {
2846 my $h = $para->{h}; 3238 my $h = $para->{h};
3239 my $y = $para->{y};
2847 3240
2848 if ($y0 < $y + $h && $y < $y1) { 3241 if ($y0 < $y + $h && $y < $y1) {
2849
2850 my $layout = $self->get_layout ($para); 3242 my $layout = $self->get_layout ($para);
2851 3243
2852 $layout->render ($para->{indent}, $y - $y0); 3244 $layout->render ($para->{indent}, $y - $y0);
2853 3245
2854 if (my @w = @{ $para->{widget} }) { 3246 if (my @w = @{ $para->{widget} }) {
… …
2863 $_->draw; 3255 $_->draw;
2864 } 3256 }
2865 } 3257 }
2866 } 3258 }
2867 3259
2868 $y += $h; 3260 $paridx++;
3261 $top_paragraph ||= $paridx if $y >= $top;
2869 } 3262 }
3263
3264 $self->{top_paragraph} = $top_paragraph;
2870 }; 3265 };
2871 }); 3266 });
2872} 3267}
2873 3268
2874sub reconfigure { 3269sub reconfigure {
… …
3077 3472
3078sub new { 3473sub new {
3079 my $class = shift; 3474 my $class = shift;
3080 3475
3081 my $self = $class->SUPER::new ( 3476 my $self = $class->SUPER::new (
3477 size_w => 32,
3478 size_h => 8,
3082 aspect => 1, 3479 aspect => 1,
3083 can_events => 0, 3480 can_events => 0,
3084 @_, 3481 @_,
3085 ); 3482 );
3086 3483
3087 if ($self->{anim} && $self->{animspeed}) { 3484 if ($self->{anim} && $self->{animspeed}) {
3088 Scalar::Util::weaken (my $widget = $self); 3485 CFPlus::weaken (my $widget = $self);
3089 3486
3487 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3488 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3090 $self->{timer} = Event->timer ( 3489 $self->{timer} = Event->timer (
3091 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3092 hard => 1, 3490 parked => 1,
3093 interval => $self->{animspeed},
3094 cb => sub { 3491 cb => sub {
3492 return unless $::CONN && $widget;
3493
3095 ++$widget->{frame}; 3494 ++$widget->{frame};
3495 $widget->update_face;
3096 $widget->update; 3496 $widget->update;
3497
3498 $widget->update_timer;
3097 }, 3499 },
3098 ); 3500 );
3501
3502 $self->update_face;
3503 $self->update_timer;
3099 } 3504 }
3100 3505
3101 $self 3506 $self
3102} 3507}
3103 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
3104sub size_request { 3539sub size_request {
3105 (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 $self->{tex} = $tex;
3546 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3547 } else {
3548 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3549 $self->realloc;
3550 });
3551 }
3552 }
3553 }
3554
3555 ($self->{size_w} || 8, $self->{size_h} || 8)
3106} 3556}
3107 3557
3108sub update { 3558sub update {
3109 my ($self) = @_; 3559 my ($self) = @_;
3110 3560
3111 return unless $self->{visible}; 3561 return unless $self->{visible};
3112 3562
3113 $self->SUPER::update; 3563 $self->SUPER::update;
3114} 3564}
3115 3565
3566sub invoke_visibility_change {
3567 my ($self) = @_;
3568
3569 $self->update_timer;
3570
3571 0
3572}
3573
3116sub _draw { 3574sub _draw {
3117 my ($self) = @_; 3575 my ($self) = @_;
3118 3576
3119 return unless $::CONN;
3120
3121 $self->SUPER::_draw; 3577 $self->SUPER::_draw;
3122 3578
3123 my $face; 3579 if (my $tex = $self->{tex}) {
3124
3125 if ($self->{frame}) {
3126 my $anim = $::CONN->{anim}[$self->{anim}];
3127
3128 $face = $anim->[ $self->{frame} % @$anim ]
3129 if $anim && @$anim;
3130 }
3131
3132 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3133
3134 if ($tex) {
3135 glEnable GL_TEXTURE_2D; 3580 glEnable GL_TEXTURE_2D;
3136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3137 glColor 0, 0, 0, 1; 3582 glColor 0, 0, 0, 1;
3138 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3583 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3139 glDisable GL_TEXTURE_2D; 3584 glDisable GL_TEXTURE_2D;
… …
3141} 3586}
3142 3587
3143sub destroy { 3588sub destroy {
3144 my ($self) = @_; 3589 my ($self) = @_;
3145 3590
3146 $self->{timer}->cancel 3591 (delete $self->{timer})->cancel
3147 if $self->{timer}; 3592 if $self->{timer};
3148 3593
3149 $self->SUPER::destroy; 3594 $self->SUPER::destroy;
3150} 3595}
3151 3596
… …
3153 3598
3154package CFPlus::UI::Buttonbar; 3599package CFPlus::UI::Buttonbar;
3155 3600
3156our @ISA = CFPlus::UI::HBox::; 3601our @ISA = CFPlus::UI::HBox::;
3157 3602
3158# TODO: should actualyl wrap buttons and other goodies. 3603# TODO: should actually wrap buttons and other goodies.
3159 3604
3160############################################################################# 3605#############################################################################
3161 3606
3162package CFPlus::UI::Menu; 3607package CFPlus::UI::Menu;
3163 3608
3164our @ISA = CFPlus::UI::FancyFrame::; 3609our @ISA = CFPlus::UI::Toplevel::;
3165 3610
3166use CFPlus::OpenGL; 3611use CFPlus::OpenGL;
3167 3612
3168sub new { 3613sub new {
3169 my $class = shift; 3614 my $class = shift;
… …
3347} 3792}
3348 3793
3349sub add { 3794sub add {
3350 my ($self, $title, $widget, $tooltip) = @_; 3795 my ($self, $title, $widget, $tooltip) = @_;
3351 3796
3352 Scalar::Util::weaken $self; 3797 CFPlus::weaken $self;
3353 3798
3354 $self->{buttonbar}->add (new CFPlus::UI::Button 3799 $self->{buttonbar}->add (new CFPlus::UI::Button
3355 markup => $title, 3800 markup => $title,
3356 tooltip => $tooltip, 3801 tooltip => $tooltip,
3357 on_activate => sub { $self->set_current_page ($widget) }, 3802 on_activate => sub { $self->set_current_page ($widget) },
… …
3441 my $self = $class->SUPER::new ( 3886 my $self = $class->SUPER::new (
3442 fontsize => 0.8, 3887 fontsize => 0.8,
3443 @_, 3888 @_,
3444 ); 3889 );
3445 3890
3446 Scalar::Util::weaken (my $this = $self); 3891 CFPlus::weaken (my $this = $self);
3447 3892
3448 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3893 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3449 3894
3450 $self 3895 $self
3451} 3896}
… …
3574 $self->SUPER::destroy; 4019 $self->SUPER::destroy;
3575} 4020}
3576 4021
3577############################################################################# 4022#############################################################################
3578 4023
3579package CFPlus::UI::Inventory;
3580
3581our @ISA = CFPlus::UI::Table::;
3582
3583sub new {
3584 my $class = shift;
3585
3586 my $self = $class->SUPER::new (
3587 col_expand => [0, 1, 0],
3588 items => [],
3589 @_,
3590 );
3591
3592 $self->set_sort_order (undef);
3593
3594 $self
3595}
3596
3597sub update_items {
3598 my ($self) = @_;
3599
3600 $self->clear;
3601
3602 my @item = $self->{sort}->(@{ $self->{items} });
3603
3604 my @adds;
3605 my $row = 0;
3606 for my $item ($self->{sort}->(@{ $self->{items} })) {
3607 CFPlus::Item::update_widgets $item;
3608
3609 push @adds, 0, $row, $item->{face_widget};
3610 push @adds, 1, $row, $item->{desc_widget};
3611 push @adds, 2, $row, $item->{weight_widget};
3612
3613 $row++;
3614 }
3615
3616 $self->add (@adds);
3617}
3618
3619sub set_sort_order {
3620 my ($self, $order) = @_;
3621
3622 $self->{sort} = $order ||= sub {
3623 sort {
3624 $a->{type} <=> $b->{type}
3625 or $a->{name} cmp $b->{name}
3626 } @_
3627 };
3628
3629 $self->update_items;
3630}
3631
3632sub set_items {
3633 my ($self, $items) = @_;
3634
3635 $self->{items} = [$items ? values %$items : ()];
3636 $self->update_items;
3637}
3638
3639#############################################################################
3640
3641package CFPlus::UI::SpellList;
3642
3643our @ISA = CFPlus::UI::Table::;
3644
3645sub new {
3646 my $class = shift;
3647
3648 my $self = $class->SUPER::new (
3649 binding => [],
3650 commands => [],
3651 @_,
3652 )
3653}
3654
3655my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3656
3657my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3659my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3663my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3665my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3666 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3667
3668sub rebuild_spell_list {
3669 my ($self) = @_;
3670
3671 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3672 $self->clear;
3673
3674 return unless $::CONN;
3675
3676 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3677 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3678 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3679 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3680 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3681
3682 my $row = 0;
3683
3684 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3685 my $spell = $self->{spell}{$_};
3686
3687 $row++;
3688
3689 my $spell_cb = sub {
3690 my ($widget, $ev) = @_;
3691
3692 if ($ev->{button} == 1) {
3693 $::CONN->user_send ("cast $spell->{name}");
3694 } elsif ($ev->{button} == 2) {
3695 $::CONN->user_send ("invoke $spell->{name}");
3696 } elsif ($ev->{button} == 3) {
3697 (new CFPlus::UI::Menu
3698 items => [
3699 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3700 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3701 ],
3702 )->popup ($ev);
3703 } else {
3704 return 0;
3705 }
3706
3707 1
3708 };
3709
3710 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3711
3712 #TODO: add path info to tooltip
3713 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3714
3715 $self->add (0, $row, new CFPlus::UI::Face
3716 face => $spell->{face},
3717 can_hover => 1,
3718 can_events => 1,
3719 tooltip => $tooltip,
3720 on_button_down => $spell_cb,
3721 );
3722
3723 $self->add (1, $row, new CFPlus::UI::Label
3724 expand => 1,
3725 text => $spell->{name},
3726 can_hover => 1,
3727 can_events => 1,
3728 tooltip => $tooltip,
3729 on_button_down => $spell_cb,
3730 );
3731
3732 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3733 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3734 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3735 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3736 }
3737 });
3738}
3739
3740sub add_spell {
3741 my ($self, $spell) = @_;
3742
3743 $self->{spell}->{$spell->{name}} = $spell;
3744 $self->rebuild_spell_list;
3745}
3746
3747sub remove_spell {
3748 my ($self, $spell) = @_;
3749
3750 delete $self->{spell}->{$spell->{name}};
3751 $self->rebuild_spell_list;
3752}
3753
3754sub clear_spells {
3755 my ($self) = @_;
3756
3757 $self->{spell} = {};
3758 $self->rebuild_spell_list;
3759}
3760
3761#############################################################################
3762
3763package CFPlus::UI::Root; 4024package CFPlus::UI::Root;
3764 4025
3765our @ISA = CFPlus::UI::Container::; 4026our @ISA = CFPlus::UI::Container::;
3766 4027
3767use List::Util qw(min max); 4028use List::Util qw(min max);
… …
3774 my $self = $class->SUPER::new ( 4035 my $self = $class->SUPER::new (
3775 visible => 1, 4036 visible => 1,
3776 @_, 4037 @_,
3777 ); 4038 );
3778 4039
3779 Scalar::Util::weaken ($self->{root} = $self); 4040 CFPlus::weaken ($self->{root} = $self);
3780 4041
3781 $self 4042 $self
3782} 4043}
3783 4044
3784sub size_request { 4045sub size_request {
… …
3879 while ($self->{refresh_hook}) { 4140 while ($self->{refresh_hook}) {
3880 $_->() 4141 $_->()
3881 for values %{delete $self->{refresh_hook}}; 4142 for values %{delete $self->{refresh_hook}};
3882 } 4143 }
3883 4144
3884 if ($self->{realloc}) { 4145 while ($self->{realloc}) {
3885 my %queue; 4146 my %queue;
3886 my @queue; 4147 my @queue;
3887 my $widget; 4148 my $widget;
3888 4149
3889 outer: 4150 outer:
… …
3936 } 4197 }
3937 } 4198 }
3938 4199
3939 delete $self->{realloc}{$widget+0}; 4200 delete $self->{realloc}{$widget+0};
3940 } 4201 }
3941 }
3942 4202
3943 while (my $size_alloc = delete $self->{size_alloc}) { 4203 while (my $size_alloc = delete $self->{size_alloc}) {
3944 my @queue = sort { $b->{visible} <=> $a->{visible} } 4204 my @queue = sort { $a->{visible} <=> $b->{visible} }
3945 values %$size_alloc; 4205 values %$size_alloc;
3946 4206
3947 while () { 4207 while () {
3948 my $widget = pop @queue || last; 4208 my $widget = pop @queue || last;
3949 4209
3950 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4210 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3951 4211
3952 $w = 0 if $w < 0;
3953 $h = 0 if $h < 0;
3954
3955 $w = max $widget->{min_w}, $w; 4212 $w = max $widget->{min_w}, $w;
3956 $h = max $widget->{min_h}, $h; 4213 $h = max $widget->{min_h}, $h;
3957 4214
3958# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4215# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3959# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4216# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3960 4217
3961 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4218 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3962 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4219 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3963 4220
3964 $w = int $w + 0.5; 4221 $w = int $w + 0.5;
3965 $h = int $h + 0.5; 4222 $h = int $h + 0.5;
3966 4223
3967 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4224 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3968 $widget->{old_w} = $widget->{w}; 4225 $widget->{old_w} = $widget->{w};
3969 $widget->{old_h} = $widget->{h}; 4226 $widget->{old_h} = $widget->{h};
3970 4227
3971 $widget->{w} = $w; 4228 $widget->{w} = $w;
3972 $widget->{h} = $h; 4229 $widget->{h} = $h;
3973 4230
3974 $widget->emit (size_allocate => $w, $h); 4231 $widget->emit (size_allocate => $w, $h);
4232 }
3975 } 4233 }
3976 } 4234 }
3977 } 4235 }
3978 4236
3979 while ($self->{post_alloc_hook}) { 4237 while ($self->{post_alloc_hook}) {
3980 $_->() 4238 $_->()
3981 for values %{delete $self->{post_alloc_hook}}; 4239 for values %{delete $self->{post_alloc_hook}};
3982 } 4240 }
3983
3984 4241
3985 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4242 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3986 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4243 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3987 glClear GL_COLOR_BUFFER_BIT; 4244 glClear GL_COLOR_BUFFER_BIT;
3988 4245
… …
3993 glLoadIdentity; 4250 glLoadIdentity;
3994 4251
3995 { 4252 {
3996 package CFPlus::UI::Base; 4253 package CFPlus::UI::Base;
3997 4254
3998 ($draw_x, $draw_y, $draw_w, $draw_h) = 4255 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3999 (0, 0, $self->{w}, $self->{h}); 4256 (0, 0, $self->{w}, $self->{h});
4000 }
4001 4257
4002 $self->_draw; 4258 $self->_draw;
4259 }
4003} 4260}
4004 4261
4005############################################################################# 4262#############################################################################
4006 4263
4007package CFPlus::UI; 4264package CFPlus::UI;

Diff Legend

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