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.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) = @_;
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 on_size_allocate => sub {
1100 my ($vp, $w, $h) = @_;
1101 $vp->{parent}->update_slider;
1102 0
1103 },
1104 ;
1105
1045 $self->SUPER::add ($self->{vp}, $self->{slider}); 1106 $self->SUPER::add ($self->{vp});
1107
1046 $self->add ($child) if $child; 1108 $self->add ($child) if $child;
1047 1109
1048 $self 1110 $self
1049} 1111}
1050
1051#TODO# update range on size_allocate depending on child
1052 1112
1053sub add { 1113sub add {
1054 my ($self, $widget) = @_; 1114 my ($self, $widget) = @_;
1055 1115
1056 $self->{vp}->add ($self->{child} = $widget); 1116 $self->{vp}->add ($self->{child} = $widget);
1057} 1117}
1058 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
1059sub invoke_mouse_wheel { 1167sub invoke_mouse_wheel {
1060 my ($self, $ev) = @_; 1168 my ($self, $ev) = @_;
1061 1169
1062 return 0 unless $ev->{dy}; # only vertical movements
1063
1064 $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};
1065 1172
1066 1 1173 1
1067} 1174}
1068 1175
1069sub update_slider { 1176sub invoke_button_down {
1070 my ($self) = @_; 1177 my ($self, $ev, $x, $y) = @_;
1071 1178
1072 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1179 if ($ev->{button} == 2) {
1073} 1180 $self->start_dragging ($ev);
1181 return 1;
1182 }
1074 1183
1075sub update { 1184 0
1076 my ($self) = @_; 1185}
1077 1186
1078 $self->SUPER::update; 1187sub invoke_button_up {
1188 my ($self, $ev, $x, $y) = @_;
1079 1189
1080 $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
1081} 1206}
1082 1207
1083sub invoke_size_allocate { 1208sub invoke_size_allocate {
1084 my ($self, $w, $h) = @_; 1209 my ($self, $w, $h) = @_;
1085 1210
1086 $self->update_slider; 1211 $self->update_slider;
1087
1088 $self->SUPER::invoke_size_allocate ($w, $h) 1212 $self->SUPER::invoke_size_allocate ($w, $h)
1089} 1213}
1090 1214
1091############################################################################# 1215#############################################################################
1092 1216
… …
1134 1258
1135our @ISA = CFPlus::UI::Bin::; 1259our @ISA = CFPlus::UI::Bin::;
1136 1260
1137use CFPlus::OpenGL; 1261use CFPlus::OpenGL;
1138 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
1139my $bg = 1363my $bg =
1140 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1364 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1141 mipmap => 1, wrap => 1; 1365 mipmap => 1, wrap => 1;
1142 1366
1143my @border = 1367my @border =
1144 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1368 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); 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);
1146 1374
1147sub new { 1375sub new {
1148 my ($class, %arg) = @_; 1376 my ($class, %arg) = @_;
1149 1377
1150 my $self = $class->SUPER::new ( 1378 my $self = $class->SUPER::new (
… …
1319 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1320 1548
1321 my $border = $self->border; 1549 my $border = $self->border;
1322 1550
1323 glColor @{ $self->{border_bg} }; 1551 glColor @{ $self->{border_bg} };
1324 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1325 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1326 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1327 $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);
1328 1570
1329 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1571 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1330 glColor @{ $self->{bg} }; 1572 glColor @{ $self->{bg} };
1331 1573
1332 # TODO: repeat texture not scale 1574 # TODO: repeat texture not scale
… …
1353 1595
1354############################################################################# 1596#############################################################################
1355 1597
1356package CFPlus::UI::Table; 1598package CFPlus::UI::Table;
1357 1599
1358our @ISA = CFPlus::UI::Base::; 1600our @ISA = CFPlus::UI::Container::;
1359 1601
1360use List::Util qw(max sum); 1602use List::Util qw(max sum);
1361 1603
1362use CFPlus::OpenGL; 1604use CFPlus::OpenGL;
1363 1605
1364sub new { 1606sub new {
1365 my $class = shift; 1607 my $class = shift;
1366 1608
1367 $class->SUPER::new ( 1609 $class->SUPER::new (
1368 col_expand => [], 1610 col_expand => [],
1611 row_expand => [],
1369 @_, 1612 @_,
1370 ) 1613 )
1371} 1614}
1372 1615
1373sub children {
1374 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1375}
1376
1377sub 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 {
1378 my ($self) = shift; 1628 my $self = shift;
1629
1630 my @widgets;
1379 1631
1380 while (@_) { 1632 while (@_) {
1381 my ($x, $y, $child) = splice @_, 0, 3, (); 1633 my ($col, $row, $child) = splice @_, 0, 3, ();
1382 $child->set_parent ($self);
1383 $self->{children}[$y][$x] = $child;
1384 }
1385 1634
1386 $self->{force_realloc} = 1; 1635 $child->{row} = $row;
1387 $self->{force_size_alloc} = 1; 1636 $child->{col} = $col;
1388 $self->realloc;
1389}
1390 1637
1391sub remove { 1638 push @widgets, $child;
1639 }
1640
1641 $self->add (@widgets);
1642}
1643
1644sub get_wh {
1392 my ($self, $child) = @_; 1645 my ($self) = @_;
1393 1646
1394 # TODO: not yet implemented 1647 my (@w, @h);
1395}
1396
1397# TODO: move to container class maybe? send children a signal on removal?
1398sub clear {
1399 my ($self) = @_;
1400 1648
1401 my @children = $self->children; 1649 my @children = $self->children;
1402 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 }
1403 1660 }
1404 for (@children) {
1405 delete $_->{parent};
1406 $_->hide;
1407 }
1408 1661
1409 $self->realloc; 1662 # second pass, rows
1410} 1663 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)}; 1664 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1425 1665
1426 $w[$x] = max $w[$x], $w; 1666 my $sh = sum @h[$r .. $r + $rs - 1];
1427 $h[$y] = max $h[$y], $h; 1667
1668 if ($h > $sh) {
1669 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1428 } 1670 }
1429 } 1671 }
1430 1672
1431 (\@w, \@h) 1673 (\@w, \@h)
1432} 1674}
… …
1448 my ($ws, $hs) = $self->get_wh; 1690 my ($ws, $hs) = $self->get_wh;
1449 1691
1450 my $req_w = (sum @$ws) || 1; 1692 my $req_w = (sum @$ws) || 1;
1451 my $req_h = (sum @$hs) || 1; 1693 my $req_h = (sum @$hs) || 1;
1452 1694
1453 # TODO: nicer code && do row_expand 1695 # now linearly scale the rows/columns to the allocated size
1454 my @col_expand = @{$self->{col_expand}}; 1696 my @col_expand = @{$self->{col_expand}};
1455 @col_expand = (1) x @$ws unless @col_expand; 1697 @col_expand = (1) x @$ws unless @col_expand;
1456 my $col_expand = (sum @col_expand) || 1; 1698 my $col_expand = (sum @col_expand) || 1;
1457 1699
1458 # linearly scale sizes
1459 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1700 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1460 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1461 1701
1462 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
1463 CFPlus::UI::harmonize $hs; 1710 CFPlus::UI::harmonize $hs;
1464 1711
1465 my $y; 1712 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1713 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1466 1714
1467 for my $r (0 .. $#{$self->{children}}) { 1715 for my $widget ($self->children) {
1468 my $row = $self->{children}[$r] 1716 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1469 or next;
1470 1717
1471 my $x = 0; 1718 $widget->configure (
1472 my $row_h = $hs->[$r]; 1719 $x[$c], $y[$r],
1720 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1473 1721 );
1474 for my $c (0 .. $#$row) { 1722 }
1475 my $col_w = $ws->[$c];
1476 1723
1477 if (my $widget = $row->[$c]) { 1724 1
1478 $widget->configure ($x, $y, $col_w, $row_h); 1725}
1479 }
1480 1726
1481 $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;
1482 } 1765 }
1766 }
1483 1767
1484 $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);
1485 } 1804 }
1486 1805
1487 1 1806 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} 1807}
1513 1808
1514############################################################################# 1809#############################################################################
1515 1810
1516package CFPlus::UI::Box; 1811package CFPlus::UI::Box;
… …
1802 active_fg => [0, 0, 0], 2097 active_fg => [0, 0, 0],
1803 can_hover => 1, 2098 can_hover => 1,
1804 can_focus => 1, 2099 can_focus => 1,
1805 valign => 0, 2100 valign => 0,
1806 can_events => 1, 2101 can_events => 1,
2102 ellipsise => 0,
1807 #text => ... 2103 #text => ...
1808 #hidden => "*", 2104 #hidden => "*",
1809 @_ 2105 @_
1810 ) 2106 )
1811} 2107}
… …
1855 my $mod = $ev->{mod}; 2151 my $mod = $ev->{mod};
1856 my $sym = $ev->{sym}; 2152 my $sym = $ev->{sym};
1857 my $uni = $ev->{unicode}; 2153 my $uni = $ev->{unicode};
1858 2154
1859 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;
1860 2158
1861 if ($uni == 8) { 2159 if ($uni == 8) {
1862 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2160 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1863 } elsif ($uni == 127) { 2161 } elsif ($uni == 127) {
1864 substr $text, $self->{cursor}, 1, ""; 2162 substr $text, $self->{cursor}, 1, "";
1865 } elsif ($sym == CFPlus::SDLK_LEFT) { 2163 } elsif ($sym == CFPlus::SDLK_LEFT) {
1866 --$self->{cursor} if $self->{cursor}; 2164 --$self->{cursor} if $self->{cursor};
1867 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2165 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1868 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2166 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1869 } 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 = "";
1870 $self->{cursor} = 0; 2181 $self->{cursor} = 0;
1871 } elsif ($sym == CFPlus::SDLK_END) {
1872 $self->{cursor} = length $text;
1873 } elsif ($uni == 27) { 2182 } elsif ($uni == 27) {
1874 $self->emit ('escape'); 2183 $self->emit ('escape');
1875 } elsif ($uni) { 2184 } elsif ($uni == 0x0d) {
2185 substr $text, $self->{cursor}++, 0, "\012";
2186 } elsif ($uni >= 0x20) {
1876 substr $text, $self->{cursor}++, 0, chr $uni; 2187 substr $text, $self->{cursor}++, 0, chr $uni;
1877 } else { 2188 } else {
1878 return 0; 2189 return 0;
1879 } 2190 }
1880 2191
1881 $self->_set_text ($text); 2192 $self->_set_text ($text);
1882 2193
1883 $self->realloc; 2194 $self->realloc;
2195 $self->update;
1884 2196
1885 1 2197 1
1886} 2198}
1887 2199
1888sub invoke_focus_in { 2200sub invoke_focus_in {
… …
1950 utf8::encode $text; 2262 utf8::encode $text;
1951 2263
1952 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2264 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1953 } 2265 }
1954 2266
1955 glColor @{$self->{fg}};
1956 glBegin GL_LINES; 2267 glBegin GL_LINES;
1957 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2268 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}; 2269 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1959 glEnd; 2270 glEnd;
1960 } 2271 }
1961} 2272}
2273
2274#############################################################################
1962 2275
1963package CFPlus::UI::Entry; 2276package CFPlus::UI::Entry;
1964 2277
1965our @ISA = CFPlus::UI::EntryBase::; 2278our @ISA = CFPlus::UI::EntryBase::;
1966 2279
… …
1969sub invoke_key_down { 2282sub invoke_key_down {
1970 my ($self, $ev) = @_; 2283 my ($self, $ev) = @_;
1971 2284
1972 my $sym = $ev->{sym}; 2285 my $sym = $ev->{sym};
1973 2286
1974 if ($sym == 13) { 2287 if ($ev->{uni} == 0x0d || $sym == 13) {
1975 unshift @{$self->{history}}, 2288 unshift @{$self->{history}},
1976 my $txt = $self->get_text; 2289 my $txt = $self->get_text;
1977 2290
1978 $self->{history_pointer} = -1; 2291 $self->{history_pointer} = -1;
1979 $self->{history_saveback} = ''; 2292 $self->{history_saveback} = '';
… …
2009 1 2322 1
2010} 2323}
2011 2324
2012############################################################################# 2325#############################################################################
2013 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
2014package CFPlus::UI::Button; 2366package CFPlus::UI::Button;
2015 2367
2016our @ISA = CFPlus::UI::Label::; 2368our @ISA = CFPlus::UI::Label::;
2017 2369
2018use CFPlus::OpenGL; 2370use CFPlus::OpenGL;
2019 2371
2020my @tex = 2372my @tex =
2021 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2373 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2022 qw(b1_button_active.png); 2374 qw(b1_button_inactive.png b1_button_active.png);
2023 2375
2024sub new { 2376sub new {
2025 my $class = shift; 2377 my $class = shift;
2026 2378
2027 $class->SUPER::new ( 2379 $class->SUPER::new (
2028 padding_x => 4, 2380 padding_x => 4,
2029 padding_y => 4, 2381 padding_y => 4,
2030 fg => [1, 1, 1], 2382 fg => [1.0, 1.0, 1.0],
2031 active_fg => [0, 0, 1], 2383 active_fg => [0.8, 0.8, 0.8],
2032 can_hover => 1, 2384 can_hover => 1,
2033 align => 0, 2385 align => 0,
2034 valign => 0, 2386 valign => 0,
2035 can_events => 1, 2387 can_events => 1,
2036 @_ 2388 @_
… …
2054 2406
2055 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057 glColor 0, 0, 0, 1; 2409 glColor 0, 0, 0, 1;
2058 2410
2411 my $tex = $tex[$GRAB == $self];
2059 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2412 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2060 2413
2061 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
2062 2415
2063 $self->SUPER::_draw; 2416 $self->SUPER::_draw;
2064} 2417}
… …
2160 or Carp::croak "'path' or 'tex' attributes required"; 2513 or Carp::croak "'path' or 'tex' attributes required";
2161 2514
2162 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2515 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2163 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;
2164 2517
2165 Scalar::Util::weaken $texture_cache{$self->{path}}; 2518 CFPlus::weaken $texture_cache{$self->{path}};
2166 2519
2167 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2520 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2168 2521
2169 $self 2522 $self
2170} 2523}
… …
2543sub invoke_mouse_wheel { 2896sub invoke_mouse_wheel {
2544 my ($self, $ev) = @_; 2897 my ($self, $ev) = @_;
2545 2898
2546 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2899 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2547 2900
2901 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2902
2548 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2903 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2549 2904
2550 ! ! $delta 2905 ! ! $delta
2551} 2906}
2552 2907
2553sub update { 2908sub update {
… …
2663 #font => default_font 3018 #font => default_font
2664 @_, 3019 @_,
2665 3020
2666 layout => (new CFPlus::Layout), 3021 layout => (new CFPlus::Layout),
2667 par => [], 3022 par => [],
3023 max_par => 0,
2668 height => 0, 3024 height => 0,
2669 children => [ 3025 children => [
2670 (new CFPlus::UI::Empty expand => 1), 3026 (new CFPlus::UI::Empty expand => 1),
2671 (new CFPlus::UI::Slider vertical => 1), 3027 (new CFPlus::UI::Slider vertical => 1),
2672 ], 3028 ],
… …
2751sub set_offset { 3107sub set_offset {
2752 my ($self, $offset) = @_; 3108 my ($self, $offset) = @_;
2753 3109
2754 # todo: base offset on lines or so, not on pixels 3110 # todo: base offset on lines or so, not on pixels
2755 $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;
2756} 3127}
2757 3128
2758sub clear { 3129sub clear {
2759 my ($self) = @_; 3130 my ($self) = @_;
2760 3131
… …
2782 3153
2783 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3154 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2784 push @{$self->{par}}, $para; 3155 push @{$self->{par}}, $para;
2785 } 3156 }
2786 3157
3158 if (my $max = $self->{max_par}) {
3159 shift @{$self->{par}} while @{$self->{par}} > $max;
3160 }
3161
2787 $self->{need_reflow}++; 3162 $self->{need_reflow}++;
2788 $self->update; 3163 $self->update;
2789} 3164}
2790 3165
2791sub scroll_to_bottom { 3166sub scroll_to_bottom {
2792 my ($self) = @_; 3167 my ($self) = @_;
2793 3168
2794 $self->{scroll_to_bottom} = 1; 3169 $self->{scroll_to} = $#{$self->{par}};
2795 $self->update; 3170 $self->update;
2796} 3171}
2797 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
2798sub update { 3206sub update {
2799 my ($self) = @_; 3207 my ($self) = @_;
2800 3208
2801 $self->SUPER::update; 3209 $self->SUPER::update;
2802 3210
2803 return unless $self->{h} > 0; 3211 return unless $self->{h} > 0;
2804 3212
2805 delete $self->{texture}; 3213 delete $self->{texture};
2806 3214
2807 $ROOT->on_post_alloc ($self => sub { 3215 $ROOT->on_post_alloc ($self => sub {
3216 $self->force_uptodate;
3217
2808 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3218 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 3219
2837 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3220 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2838 glClearColor 0, 0, 0, 0; 3221 glClearColor 0, 0, 0, 0;
2839 glClear GL_COLOR_BUFFER_BIT; 3222 glClear GL_COLOR_BUFFER_BIT;
2840 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;
2841 my $top = int $self->{children}[1]{range}[0]; 3232 my $top = int $self->{children}[1]{range}[0];
2842 3233
2843 my $y0 = $top; 3234 my $y0 = $top;
2844 my $y1 = $top + $H; 3235 my $y1 = $top + $H;
2845 3236
2846 my $y = 0;
2847
2848 for my $para (@{$self->{par}}) { 3237 for my $para (@{$self->{par}}) {
2849 my $h = $para->{h}; 3238 my $h = $para->{h};
3239 my $y = $para->{y};
2850 3240
2851 if ($y0 < $y + $h && $y < $y1) { 3241 if ($y0 < $y + $h && $y < $y1) {
2852
2853 my $layout = $self->get_layout ($para); 3242 my $layout = $self->get_layout ($para);
2854 3243
2855 $layout->render ($para->{indent}, $y - $y0); 3244 $layout->render ($para->{indent}, $y - $y0);
2856 3245
2857 if (my @w = @{ $para->{widget} }) { 3246 if (my @w = @{ $para->{widget} }) {
… …
2866 $_->draw; 3255 $_->draw;
2867 } 3256 }
2868 } 3257 }
2869 } 3258 }
2870 3259
2871 $y += $h; 3260 $paridx++;
3261 $top_paragraph ||= $paridx if $y >= $top;
2872 } 3262 }
3263
3264 $self->{top_paragraph} = $top_paragraph;
2873 }; 3265 };
2874 }); 3266 });
2875} 3267}
2876 3268
2877sub reconfigure { 3269sub reconfigure {
… …
3080 3472
3081sub new { 3473sub new {
3082 my $class = shift; 3474 my $class = shift;
3083 3475
3084 my $self = $class->SUPER::new ( 3476 my $self = $class->SUPER::new (
3477 size_w => 32,
3478 size_h => 8,
3085 aspect => 1, 3479 aspect => 1,
3086 can_events => 0, 3480 can_events => 0,
3087 @_, 3481 @_,
3088 ); 3482 );
3089 3483
3090 if ($self->{anim} && $self->{animspeed}) { 3484 if ($self->{anim} && $self->{animspeed}) {
3091 Scalar::Util::weaken (my $widget = $self); 3485 CFPlus::weaken (my $widget = $self);
3092 3486
3487 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3488 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3093 $self->{timer} = Event->timer ( 3489 $self->{timer} = Event->timer (
3094 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3095 hard => 1, 3490 parked => 1,
3096 interval => $self->{animspeed},
3097 cb => sub { 3491 cb => sub {
3492 return unless $::CONN && $widget;
3493
3098 ++$widget->{frame}; 3494 ++$widget->{frame};
3495 $widget->update_face;
3099 $widget->update; 3496 $widget->update;
3497
3498 $widget->update_timer;
3100 }, 3499 },
3101 ); 3500 );
3501
3502 $self->update_face;
3503 $self->update_timer;
3102 } 3504 }
3103 3505
3104 $self 3506 $self
3105} 3507}
3106 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
3107sub size_request { 3539sub size_request {
3108 (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)
3109} 3556}
3110 3557
3111sub update { 3558sub update {
3112 my ($self) = @_; 3559 my ($self) = @_;
3113 3560
3114 return unless $self->{visible}; 3561 return unless $self->{visible};
3115 3562
3116 $self->SUPER::update; 3563 $self->SUPER::update;
3117} 3564}
3118 3565
3566sub invoke_visibility_change {
3567 my ($self) = @_;
3568
3569 $self->update_timer;
3570
3571 0
3572}
3573
3119sub _draw { 3574sub _draw {
3120 my ($self) = @_; 3575 my ($self) = @_;
3121 3576
3122 return unless $::CONN;
3123
3124 $self->SUPER::_draw; 3577 $self->SUPER::_draw;
3125 3578
3126 my $face; 3579 if (my $tex = $self->{tex}) {
3127
3128 if ($self->{frame}) {
3129 my $anim = $::CONN->{anim}[$self->{anim}];
3130
3131 $face = $anim->[ $self->{frame} % @$anim ]
3132 if $anim && @$anim;
3133 }
3134
3135 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3136
3137 if ($tex) {
3138 glEnable GL_TEXTURE_2D; 3580 glEnable GL_TEXTURE_2D;
3139 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3140 glColor 0, 0, 0, 1; 3582 glColor 0, 0, 0, 1;
3141 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3583 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3142 glDisable GL_TEXTURE_2D; 3584 glDisable GL_TEXTURE_2D;
… …
3144} 3586}
3145 3587
3146sub destroy { 3588sub destroy {
3147 my ($self) = @_; 3589 my ($self) = @_;
3148 3590
3149 $self->{timer}->cancel 3591 (delete $self->{timer})->cancel
3150 if $self->{timer}; 3592 if $self->{timer};
3151 3593
3152 $self->SUPER::destroy; 3594 $self->SUPER::destroy;
3153} 3595}
3154 3596
… …
3156 3598
3157package CFPlus::UI::Buttonbar; 3599package CFPlus::UI::Buttonbar;
3158 3600
3159our @ISA = CFPlus::UI::HBox::; 3601our @ISA = CFPlus::UI::HBox::;
3160 3602
3161# TODO: should actualyl wrap buttons and other goodies. 3603# TODO: should actually wrap buttons and other goodies.
3162 3604
3163############################################################################# 3605#############################################################################
3164 3606
3165package CFPlus::UI::Menu; 3607package CFPlus::UI::Menu;
3166 3608
3167our @ISA = CFPlus::UI::FancyFrame::; 3609our @ISA = CFPlus::UI::Toplevel::;
3168 3610
3169use CFPlus::OpenGL; 3611use CFPlus::OpenGL;
3170 3612
3171sub new { 3613sub new {
3172 my $class = shift; 3614 my $class = shift;
… …
3350} 3792}
3351 3793
3352sub add { 3794sub add {
3353 my ($self, $title, $widget, $tooltip) = @_; 3795 my ($self, $title, $widget, $tooltip) = @_;
3354 3796
3355 Scalar::Util::weaken $self; 3797 CFPlus::weaken $self;
3356 3798
3357 $self->{buttonbar}->add (new CFPlus::UI::Button 3799 $self->{buttonbar}->add (new CFPlus::UI::Button
3358 markup => $title, 3800 markup => $title,
3359 tooltip => $tooltip, 3801 tooltip => $tooltip,
3360 on_activate => sub { $self->set_current_page ($widget) }, 3802 on_activate => sub { $self->set_current_page ($widget) },
… …
3444 my $self = $class->SUPER::new ( 3886 my $self = $class->SUPER::new (
3445 fontsize => 0.8, 3887 fontsize => 0.8,
3446 @_, 3888 @_,
3447 ); 3889 );
3448 3890
3449 Scalar::Util::weaken (my $this = $self); 3891 CFPlus::weaken (my $this = $self);
3450 3892
3451 $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 });
3452 3894
3453 $self 3895 $self
3454} 3896}
… …
3577 $self->SUPER::destroy; 4019 $self->SUPER::destroy;
3578} 4020}
3579 4021
3580############################################################################# 4022#############################################################################
3581 4023
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; 4024package CFPlus::UI::Root;
3767 4025
3768our @ISA = CFPlus::UI::Container::; 4026our @ISA = CFPlus::UI::Container::;
3769 4027
3770use List::Util qw(min max); 4028use List::Util qw(min max);
… …
3777 my $self = $class->SUPER::new ( 4035 my $self = $class->SUPER::new (
3778 visible => 1, 4036 visible => 1,
3779 @_, 4037 @_,
3780 ); 4038 );
3781 4039
3782 Scalar::Util::weaken ($self->{root} = $self); 4040 CFPlus::weaken ($self->{root} = $self);
3783 4041
3784 $self 4042 $self
3785} 4043}
3786 4044
3787sub size_request { 4045sub size_request {
… …
3882 while ($self->{refresh_hook}) { 4140 while ($self->{refresh_hook}) {
3883 $_->() 4141 $_->()
3884 for values %{delete $self->{refresh_hook}}; 4142 for values %{delete $self->{refresh_hook}};
3885 } 4143 }
3886 4144
3887 if ($self->{realloc}) { 4145 while ($self->{realloc}) {
3888 my %queue; 4146 my %queue;
3889 my @queue; 4147 my @queue;
3890 my $widget; 4148 my $widget;
3891 4149
3892 outer: 4150 outer:
… …
3939 } 4197 }
3940 } 4198 }
3941 4199
3942 delete $self->{realloc}{$widget+0}; 4200 delete $self->{realloc}{$widget+0};
3943 } 4201 }
3944 }
3945 4202
3946 while (my $size_alloc = delete $self->{size_alloc}) { 4203 while (my $size_alloc = delete $self->{size_alloc}) {
3947 my @queue = sort { $b->{visible} <=> $a->{visible} } 4204 my @queue = sort { $a->{visible} <=> $b->{visible} }
3948 values %$size_alloc; 4205 values %$size_alloc;
3949 4206
3950 while () { 4207 while () {
3951 my $widget = pop @queue || last; 4208 my $widget = pop @queue || last;
3952 4209
3953 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4210 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3954 4211
3955 $w = 0 if $w < 0;
3956 $h = 0 if $h < 0;
3957
3958 $w = max $widget->{min_w}, $w; 4212 $w = max $widget->{min_w}, $w;
3959 $h = max $widget->{min_h}, $h; 4213 $h = max $widget->{min_h}, $h;
3960 4214
3961# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4215# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3962# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4216# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3963 4217
3964 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4218 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3965 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4219 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3966 4220
3967 $w = int $w + 0.5; 4221 $w = int $w + 0.5;
3968 $h = int $h + 0.5; 4222 $h = int $h + 0.5;
3969 4223
3970 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}) {
3971 $widget->{old_w} = $widget->{w}; 4225 $widget->{old_w} = $widget->{w};
3972 $widget->{old_h} = $widget->{h}; 4226 $widget->{old_h} = $widget->{h};
3973 4227
3974 $widget->{w} = $w; 4228 $widget->{w} = $w;
3975 $widget->{h} = $h; 4229 $widget->{h} = $h;
3976 4230
3977 $widget->emit (size_allocate => $w, $h); 4231 $widget->emit (size_allocate => $w, $h);
4232 }
3978 } 4233 }
3979 } 4234 }
3980 } 4235 }
3981 4236
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
3987 4241
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
… …
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