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.342 by root, Sun Aug 13 14:38:35 2006 UTC vs.
Revision 1.392 by root, Sat Jul 21 13:37:09 2007 UTC

1package CFPlus::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFPlus; 9use CFPlus;
11use CFPlus::Pod; 10use CFPlus::Pod;
… …
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24 if (!$GRAB) { 23 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 28 $TOOLTIP->hide;
29 29
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 32
32 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
33 34
34 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
35 36
… …
43 } 44 }
44 } 45 }
45 } 46 }
46 47
47 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
49}); 51});
50 52
51sub get_layout { 53sub get_layout {
52 my $layout; 54 my $layout;
… …
111 } 113 }
112 114
113 if ($GRAB) { 115 if ($GRAB) {
114 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
115 # mousewheel 117 # mousewheel
116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9; 118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
118 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
119 } else { 125 } else {
120 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
121 } 127 }
122 } 128 }
… …
235 h => undef, 241 h => undef,
236 can_events => 1, 242 can_events => 1,
237 @_ 243 @_
238 }, $class; 244 }, $class;
239 245
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 247
242 for (keys %$self) { 248 for (keys %$self) {
243 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
245 } 251 }
… …
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) = @_;
… …
633 my ($self) = @_; 646 my ($self) = @_;
634 647
635 warn "no draw defined for $self\n"; 648 warn "no draw defined for $self\n";
636} 649}
637 650
651my $cntx;#d#
638sub DESTROY { 652sub DESTROY {
639 my ($self) = @_; 653 my ($self) = @_;
640 654
641 return if CFPlus::in_destruct; 655 return if CFPlus::in_destruct;
642
643 delete $WIDGET{$self+0};
644 656
645 eval { $self->destroy }; 657 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659
660 delete $WIDGET{$self+0};
647} 661}
648 662
649############################################################################# 663#############################################################################
650 664
651package CFPlus::UI::DrawBG; 665package CFPlus::UI::DrawBG;
… …
727 can_events => 0, 741 can_events => 0,
728 %arg, 742 %arg,
729 ); 743 );
730 744
731 $self->add (@$children) 745 $self->add (@$children)
732 if $children; 746 if $children && @$children;
733 747
734 $self 748 $self
735} 749}
736 750
737sub realloc { 751sub realloc {
… …
746 my ($self, @widgets) = @_; 760 my ($self, @widgets) = @_;
747 761
748 $_->set_parent ($self) 762 $_->set_parent ($self)
749 for @widgets; 763 for @widgets;
750 764
765 # TODO: only do this in widgets that need it, e.g. root, fixed
751 use sort 'stable'; 766 use sort 'stable';
752 767
753 $self->{children} = [ 768 $self->{children} = [
754 sort { $a->{z} <=> $b->{z} } 769 sort { $a->{z} <=> $b->{z} }
755 @{$self->{children}}, @widgets 770 @{$self->{children}}, @widgets
… …
898 glClear GL_COLOR_BUFFER_BIT; 913 glClear GL_COLOR_BUFFER_BIT;
899 914
900 { 915 {
901 package CFPlus::UI::Base; 916 package CFPlus::UI::Base;
902 917
903 ($draw_x, $draw_y, $draw_w, $draw_h) = 918 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 919 (0, 0, $self->{w}, $self->{h});
920
921 $self->_render;
905 } 922 }
906
907 $self->_render;
908 }; 923 };
909} 924}
910 925
911sub _draw { 926sub _draw {
912 my ($self) = @_; 927 my ($self) = @_;
913
914 my ($w, $h) = @$self{qw(w h)};
915 928
916 my $tex = $self->{texture} 929 my $tex = $self->{texture}
917 or return; 930 or return;
918 931
919 glEnable GL_TEXTURE_2D; 932 glEnable GL_TEXTURE_2D;
920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 933 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
921 glColor 0, 0, 0, 1; 934 glColor 0, 0, 0, 1;
922 935
923 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 936 $tex->draw_quad_alpha_premultiplied (0, 0);
924 937
925 glDisable GL_TEXTURE_2D; 938 glDisable GL_TEXTURE_2D;
926} 939}
927 940
928############################################################################# 941#############################################################################
929 942
930package CFPlus::UI::ViewPort; 943package CFPlus::UI::ViewPort;
944
945use List::Util qw(min max);
931 946
932our @ISA = CFPlus::UI::Window::; 947our @ISA = CFPlus::UI::Window::;
933 948
934sub new { 949sub new {
935 my $class = shift; 950 my $class = shift;
… …
944sub size_request { 959sub size_request {
945 my ($self) = @_; 960 my ($self) = @_;
946 961
947 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
948 963
949 $w = 10 if $self->{scroll_x}; 964 $w = 1 if $self->{scroll_x};
950 $h = 10 if $self->{scroll_y}; 965 $h = 1 if $self->{scroll_y};
951 966
952 ($w, $h) 967 ($w, $h)
953} 968}
954 969
955sub invoke_size_allocate { 970sub invoke_size_allocate {
… …
967} 982}
968 983
969sub set_offset { 984sub set_offset {
970 my ($self, $x, $y) = @_; 985 my ($self, $x, $y) = @_;
971 986
987 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
988 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
989
990 if ($x != $self->{view_x} or $y != $self->{view_y}) {
972 $self->{view_x} = int $x; 991 $self->{view_x} = $x;
973 $self->{view_y} = int $y; 992 $self->{view_y} = $y;
974 993
994 $self->emit (changed => $x, $y);
975 $self->update; 995 $self->update;
996 }
976} 997}
977 998
978# hmm, this does not work for topleft of $self... but we should not ask for that 999# hmm, this does not work for topleft of $self... but we should not ask for that
979sub coord2local { 1000sub coord2local {
980 my ($self, $x, $y) = @_; 1001 my ($self, $x, $y) = @_;
… …
995 my ($self, $x, $y) = @_; 1016 my ($self, $x, $y) = @_;
996 1017
997 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1018 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
998 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1019 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
999 ) { 1020 ) {
1000 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1021 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1001 } else { 1022 } else {
1002 $self->CFPlus::UI::Base::find_widget ($x, $y) 1023 $self->CFPlus::UI::Base::find_widget ($x, $y)
1003 } 1024 }
1004} 1025}
1005 1026
… …
1016 1037
1017############################################################################# 1038#############################################################################
1018 1039
1019package CFPlus::UI::ScrolledWindow; 1040package CFPlus::UI::ScrolledWindow;
1020 1041
1021our @ISA = CFPlus::UI::HBox::; 1042our @ISA = CFPlus::UI::Table::;
1022 1043
1023sub new { 1044sub new {
1024 my ($class, %arg) = @_; 1045 my ($class, %arg) = @_;
1025 1046
1026 my $child = delete $arg{child}; 1047 my $child = delete $arg{child};
1027 1048
1028 my $self; 1049 my $self;
1029 1050
1030 my $slider = new CFPlus::UI::Slider 1051 my $hslider = new CFPlus::UI::Slider
1052 col => 0,
1053 row => 1,
1054 vertical => 0,
1055 range => [0, 0, 1, 0.01], # HACK fix
1056 on_changed => sub {
1057 $self->{hpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059 },
1060 ;
1061
1062 my $vslider = new CFPlus::UI::Slider
1063 col => 1,
1064 row => 0,
1031 vertical => 1, 1065 vertical => 1,
1032 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1033 on_changed => sub { 1067 on_changed => sub {
1034 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1035 }, 1070 },
1036 ; 1071 ;
1037 1072
1038 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1039 vp => (new CFPlus::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1040 can_events => 1, 1076 can_events => 1,
1041 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1042 %arg, 1081 %arg,
1043 ); 1082 );
1044 1083
1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0,
1086 row => 0,
1087 expand => 1,
1088 scroll_x => $self->{scroll_x},
1089 scroll_y => $self->{scroll_y},
1090 on_changed => sub {
1091 my ($vp, $x, $y) = @_;
1092
1093 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y);
1095
1096 0
1097 },
1098 ;
1099
1045 $self->SUPER::add ($self->{vp}, $self->{slider}); 1100 $self->SUPER::add ($self->{vp});
1101
1046 $self->add ($child) if $child; 1102 $self->add ($child) if $child;
1047 1103
1048 $self 1104 $self
1049} 1105}
1050 1106
1051#TODO# update range on size_allocate depending on child 1107#TODO# update range on size_allocate depending on child?
1052 1108
1053sub add { 1109sub add {
1054 my ($self, $widget) = @_; 1110 my ($self, $widget) = @_;
1055 1111
1056 $self->{vp}->add ($self->{child} = $widget); 1112 $self->{vp}->add ($self->{child} = $widget);
1057} 1113}
1058 1114
1115sub update_slider {
1116 my ($self) = @_;
1117
1118 my $child = ($self->{vp} or return)->child;
1119
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122
1123 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider}{visible}) {
1125 $visible ? $self->SUPER::add ($self->{hslider})
1126 : $self->SUPER::remove ($self->{hslider});
1127 }
1128
1129 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131
1132 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider}{visible}) {
1134 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider});
1136 }
1137}
1138
1139sub update {
1140 my ($self) = @_;
1141
1142 $self->update_slider;
1143 $self->SUPER::update;
1144}
1145
1059sub invoke_mouse_wheel { 1146sub invoke_mouse_wheel {
1060 my ($self, $ev) = @_; 1147 my ($self, $ev) = @_;
1061 1148
1062 return 0 unless $ev->{dy}; # only vertical movements
1063
1064 $self->{slider}->emit (mouse_wheel => $ev); 1149 $self->{vslider}->emit (mouse_wheel => $ev)
1150 if $ev->{dy};
1151
1152 $self->{hslider}->emit (mouse_wheel => $ev)
1153 if $ev->{dx};
1065 1154
1066 1 1155 1
1067} 1156}
1068 1157
1069sub update_slider { 1158sub invoke_button_down {
1070 my ($self) = @_; 1159 my ($self, $ev, $x, $y) = @_;
1071 1160
1072 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1161 if ($ev->{button} == 2) {
1073} 1162 $self->grab_focus;
1074 1163
1075sub update { 1164 my $ox = $self->{vp}{view_x} + $ev->{x};
1076 my ($self) = @_; 1165 my $oy = $self->{vp}{view_y} + $ev->{y};
1166
1167 $self->{motion} = sub {
1168 my ($ev, $x, $y) = @_;
1077 1169
1078 $self->SUPER::update; 1170 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1171 $self->update;
1172 };
1079 1173
1080 $self->update_slider; 1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_button_up {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if (delete $self->{motion}) {
1184 return 1;
1185 }
1186
1187 0
1188}
1189
1190sub invoke_mouse_motion {
1191 my ($self, $ev, $x, $y) = @_;
1192
1193 if ($self->{motion}) {
1194 $self->{motion}->($ev, $x, $y);
1195 return 1;
1196 }
1197
1198 0
1081} 1199}
1082 1200
1083sub invoke_size_allocate { 1201sub invoke_size_allocate {
1084 my ($self, $w, $h) = @_; 1202 my ($self, $w, $h) = @_;
1085 1203
1086 $self->update_slider; 1204 $self->update_slider;
1087
1088 $self->SUPER::invoke_size_allocate ($w, $h) 1205 $self->SUPER::invoke_size_allocate ($w, $h)
1089} 1206}
1090 1207
1091############################################################################# 1208#############################################################################
1092 1209
… …
1134 1251
1135our @ISA = CFPlus::UI::Bin::; 1252our @ISA = CFPlus::UI::Bin::;
1136 1253
1137use CFPlus::OpenGL; 1254use CFPlus::OpenGL;
1138 1255
1256sub new {
1257 my ($class, %arg) = @_;
1258
1259 if ((exists $arg{label}) && !ref $arg{label}) {
1260 $arg{label} = new CFPlus::UI::Label
1261 align => 1,
1262 valign => 0,
1263 text => $arg{label},
1264 fontsize => ($arg{border} || 0.8) * 0.75;
1265 }
1266
1267 my $self = $class->SUPER::new (
1268 # label => "",
1269 fg => [0.6, 0.3, 0.1],
1270 border => 0.8,
1271 style => 'single',
1272 %arg,
1273 );
1274
1275 $self
1276}
1277
1278sub add {
1279 my ($self, @widgets) = @_;
1280
1281 $self->SUPER::add (@widgets);
1282 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1283}
1284
1285sub border {
1286 int $_[0]{border} * $::FONTSIZE
1287}
1288
1289sub size_request {
1290 my ($self) = @_;
1291
1292 ($self->{label_w}, undef) = $self->{label}->size_request
1293 if $self->{label};
1294
1295 my ($w, $h) = $self->SUPER::size_request;
1296
1297 (
1298 $w + $self->border * 2,
1299 $h + $self->border * 2,
1300 )
1301}
1302
1303sub invoke_size_allocate {
1304 my ($self, $w, $h) = @_;
1305
1306 my $border = $self->border;
1307
1308 $w -= List::Util::max 0, $border * 2;
1309 $h -= List::Util::max 0, $border * 2;
1310
1311 if (my $label = $self->{label}) {
1312 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1313 $label->{h} = List::Util::min $h, $border;
1314 $label->invoke_size_allocate ($label->{w}, $label->{h});
1315 }
1316
1317 $self->child->configure ($border, $border, $w, $h);
1318
1319 1
1320}
1321
1322sub _draw {
1323 my ($self) = @_;
1324
1325 my $child = $self->{children}[0];
1326
1327 my $border = $self->border;
1328 my ($w, $h) = ($self->{w}, $self->{h});
1329
1330 $child->draw;
1331
1332 glColor @{$self->{fg}};
1333 glBegin GL_LINE_STRIP;
1334 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1335 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1336 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1337 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1338 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1339 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1340 glEnd;
1341
1342 if ($self->{label}) {
1343 glTranslate $border * 2, 0;
1344 $self->{label}->_draw;
1345 }
1346}
1347
1348#############################################################################
1349
1350package CFPlus::UI::Toplevel;
1351
1352our @ISA = CFPlus::UI::Bin::;
1353
1354use CFPlus::OpenGL;
1355
1139my $bg = 1356my $bg =
1140 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1357 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1141 mipmap => 1, wrap => 1; 1358 mipmap => 1, wrap => 1;
1142 1359
1143my @border = 1360my @border =
1144 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1361 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); 1362 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1363
1364my @icon =
1365 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1366 qw(x1_move.png x1_resize.png);
1146 1367
1147sub new { 1368sub new {
1148 my ($class, %arg) = @_; 1369 my ($class, %arg) = @_;
1149 1370
1150 my $self = $class->SUPER::new ( 1371 my $self = $class->SUPER::new (
… …
1319 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1540 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1320 1541
1321 my $border = $self->border; 1542 my $border = $self->border;
1322 1543
1323 glColor @{ $self->{border_bg} }; 1544 glColor @{ $self->{border_bg} };
1324 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1545 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1325 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1546 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1326 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1547 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1327 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1548 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1549
1550 # move
1551 my $w2 = ($w - $border) * .5;
1552 my $h2 = ($h - $border) * .5;
1553 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1554 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1555 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1556
1557 # resize
1558 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1559 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1560 unless $self->{has_close_button};
1561 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1562 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1328 1563
1329 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1564 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1330 glColor @{ $self->{bg} }; 1565 glColor @{ $self->{bg} };
1331 1566
1332 # TODO: repeat texture not scale 1567 # TODO: repeat texture not scale
… …
1353 1588
1354############################################################################# 1589#############################################################################
1355 1590
1356package CFPlus::UI::Table; 1591package CFPlus::UI::Table;
1357 1592
1358our @ISA = CFPlus::UI::Base::; 1593our @ISA = CFPlus::UI::Container::;
1359 1594
1360use List::Util qw(max sum); 1595use List::Util qw(max sum);
1361 1596
1362use CFPlus::OpenGL; 1597use CFPlus::OpenGL;
1363 1598
1364sub new { 1599sub new {
1365 my $class = shift; 1600 my $class = shift;
1366 1601
1367 $class->SUPER::new ( 1602 $class->SUPER::new (
1368 col_expand => [], 1603 col_expand => [],
1604 row_expand => [],
1369 @_, 1605 @_,
1370 ) 1606 )
1371} 1607}
1372 1608
1373sub children {
1374 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1375}
1376
1377sub add { 1609sub add {
1610 my ($self, @widgets) = @_;
1611
1612 for my $child (@widgets) {
1613 $child->{rowspan} ||= 1;
1614 $child->{colspan} ||= 1;
1615 }
1616
1617 $self->SUPER::add (@widgets);
1618}
1619
1620sub add_at {
1378 my ($self) = shift; 1621 my $self = shift;
1622
1623 my @widgets;
1379 1624
1380 while (@_) { 1625 while (@_) {
1381 my ($x, $y, $child) = splice @_, 0, 3, (); 1626 my ($col, $row, $child) = splice @_, 0, 3, ();
1382 $child->set_parent ($self);
1383 $self->{children}[$y][$x] = $child;
1384 }
1385 1627
1386 $self->{force_realloc} = 1; 1628 $child->{row} = $row;
1387 $self->{force_size_alloc} = 1; 1629 $child->{col} = $col;
1388 $self->realloc;
1389}
1390 1630
1391sub remove { 1631 push @widgets, $child;
1632 }
1633
1634 $self->add (@widgets);
1635}
1636
1637sub get_wh {
1392 my ($self, $child) = @_; 1638 my ($self) = @_;
1393 1639
1394 # TODO: not yet implemented 1640 my (@w, @h);
1395}
1396
1397# TODO: move to container class maybe? send children a signal on removal?
1398sub clear {
1399 my ($self) = @_;
1400 1641
1401 my @children = $self->children; 1642 my @children = $self->children;
1402 delete $self->{children}; 1643
1644 # first pass, columns
1645 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1646 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1647
1648 my $sw = sum @w[$c .. $c + $cs - 1];
1649
1650 if ($w > $sw) {
1651 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
1652 }
1403 1653 }
1404 for (@children) {
1405 delete $_->{parent};
1406 $_->hide;
1407 }
1408 1654
1409 $self->realloc; 1655 # second pass, rows
1410} 1656 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)}; 1657 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1425 1658
1426 $w[$x] = max $w[$x], $w; 1659 my $sh = sum @h[$r .. $r + $rs - 1];
1427 $h[$y] = max $h[$y], $h; 1660
1661 if ($h > $sh) {
1662 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1428 } 1663 }
1429 } 1664 }
1430 1665
1431 (\@w, \@h) 1666 (\@w, \@h)
1432} 1667}
… …
1448 my ($ws, $hs) = $self->get_wh; 1683 my ($ws, $hs) = $self->get_wh;
1449 1684
1450 my $req_w = (sum @$ws) || 1; 1685 my $req_w = (sum @$ws) || 1;
1451 my $req_h = (sum @$hs) || 1; 1686 my $req_h = (sum @$hs) || 1;
1452 1687
1453 # TODO: nicer code && do row_expand 1688 # now linearly scale the rows/columns to the allocated size
1454 my @col_expand = @{$self->{col_expand}}; 1689 my @col_expand = @{$self->{col_expand}};
1455 @col_expand = (1) x @$ws unless @col_expand; 1690 @col_expand = (1) x @$ws unless @col_expand;
1456 my $col_expand = (sum @col_expand) || 1; 1691 my $col_expand = (sum @col_expand) || 1;
1457 1692
1458 # linearly scale sizes
1459 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1693 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1460 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1461 1694
1462 CFPlus::UI::harmonize $ws; 1695 CFPlus::UI::harmonize $ws;
1696
1697 my @row_expand = @{$self->{row_expand}};
1698 @row_expand = (1) x @$ws unless @row_expand;
1699 my $row_expand = (sum @row_expand) || 1;
1700
1701 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1702
1463 CFPlus::UI::harmonize $hs; 1703 CFPlus::UI::harmonize $hs;
1464 1704
1465 my $y; 1705 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1706 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1466 1707
1467 for my $r (0 .. $#{$self->{children}}) { 1708 for my $widget ($self->children) {
1468 my $row = $self->{children}[$r] 1709 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1469 or next;
1470 1710
1471 my $x = 0; 1711 $widget->configure (
1472 my $row_h = $hs->[$r]; 1712 $x[$c], $y[$r],
1713 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1473 1714 );
1474 for my $c (0 .. $#$row) { 1715 }
1475 my $col_w = $ws->[$c];
1476 1716
1477 if (my $widget = $row->[$c]) { 1717 1
1478 $widget->configure ($x, $y, $col_w, $row_h); 1718}
1479 }
1480 1719
1481 $x += $col_w; 1720#############################################################################
1721
1722package CFPlus::UI::Fixed;
1723
1724use List::Util qw(min max);
1725
1726our @ISA = CFPlus::UI::Container::;
1727
1728sub add {
1729 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1730
1731 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1732 $self->SUPER::add ($child);
1733}
1734
1735sub _scale($$$) {
1736 my ($mode, $val, $max) = @_;
1737
1738 $mode eq "abs" ? $val
1739 : $mode eq "rel" ? $val * $max
1740 : 0
1741}
1742
1743sub size_request {
1744 my ($self) = @_;
1745
1746 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1747
1748 # determine overall size by querying abs widgets
1749 for my $child ($self->visible_children) {
1750 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1751
1752 if ($pos eq "abs") {
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1757 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1482 } 1758 }
1759 }
1483 1760
1484 $y += $row_h; 1761 my $W = $x2 - $x1;
1762 my $H = $y2 - $y1;
1763
1764 # now layout remaining widgets
1765 for my $child ($self->visible_children) {
1766 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1767
1768 if ($pos ne "abs") {
1769 $x = _scale $pos, $x, $W;
1770 $y = _scale $pos, $x, $H;
1771 $w = _scale $size, $w, $child->{req_w};
1772 $h = _scale $size, $h, $child->{req_h};
1773
1774 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1775 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1776 }
1777 }
1778
1779 my $W = $x2 - $x1;
1780 my $H = $y2 - $y1;
1781
1782 ($W, $H)
1783}
1784
1785sub invoke_size_allocate {
1786 my ($self, $W, $H) = @_;
1787
1788 for my $child ($self->visible_children) {
1789 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1790
1791 $x = _scale $pos, $x, $W;
1792 $y = _scale $pos, $x, $H;
1793 $w = _scale $size, $w, $child->{req_w};
1794 $h = _scale $size, $h, $child->{req_h};
1795
1796 $child->configure ($x, $y, $w, $h);
1485 } 1797 }
1486 1798
1487 1 1799 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} 1800}
1513 1801
1514############################################################################# 1802#############################################################################
1515 1803
1516package CFPlus::UI::Box; 1804package CFPlus::UI::Box;
… …
1618 #active_bg => none 1906 #active_bg => none
1619 #font => default_font 1907 #font => default_font
1620 #text => initial text 1908 #text => initial text
1621 #markup => initial narkup 1909 #markup => initial narkup
1622 #max_w => maximum pixel width 1910 #max_w => maximum pixel width
1911 #style => 0, # render flags
1623 ellipsise => 3, # end 1912 ellipsise => 3, # end
1624 layout => (new CFPlus::Layout), 1913 layout => (new CFPlus::Layout),
1625 fontsize => 1, 1914 fontsize => 1,
1626 align => -1, 1915 align => -1,
1627 valign => -1, 1916 valign => -1,
… …
1778 }; 2067 };
1779 2068
1780 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2069 my $w = List::Util::min $self->{w} + 4, $size->[0];
1781 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2070 my $h = List::Util::min $self->{h} + 2, $size->[1];
1782 2071
1783 $self->{layout}->render ($self->{ox}, $self->{oy}); 2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1784} 2073}
1785 2074
1786############################################################################# 2075#############################################################################
1787 2076
1788package CFPlus::UI::EntryBase; 2077package CFPlus::UI::EntryBase;
… …
1801 active_fg => [0, 0, 0], 2090 active_fg => [0, 0, 0],
1802 can_hover => 1, 2091 can_hover => 1,
1803 can_focus => 1, 2092 can_focus => 1,
1804 valign => 0, 2093 valign => 0,
1805 can_events => 1, 2094 can_events => 1,
2095 ellipsise => 0,
1806 #text => ... 2096 #text => ...
1807 #hidden => "*", 2097 #hidden => "*",
1808 @_ 2098 @_
1809 ) 2099 )
1810} 2100}
… …
1854 my $mod = $ev->{mod}; 2144 my $mod = $ev->{mod};
1855 my $sym = $ev->{sym}; 2145 my $sym = $ev->{sym};
1856 my $uni = $ev->{unicode}; 2146 my $uni = $ev->{unicode};
1857 2147
1858 my $text = $self->get_text; 2148 my $text = $self->get_text;
2149
2150 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1859 2151
1860 if ($uni == 8) { 2152 if ($uni == 8) {
1861 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2153 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1862 } elsif ($uni == 127) { 2154 } elsif ($uni == 127) {
1863 substr $text, $self->{cursor}, 1, ""; 2155 substr $text, $self->{cursor}, 1, "";
1864 } elsif ($sym == CFPlus::SDLK_LEFT) { 2156 } elsif ($sym == CFPlus::SDLK_LEFT) {
1865 --$self->{cursor} if $self->{cursor}; 2157 --$self->{cursor} if $self->{cursor};
1866 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2158 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1867 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2159 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1868 } elsif ($sym == CFPlus::SDLK_HOME) { 2160 } elsif ($sym == CFPlus::SDLK_HOME) {
2161 # what a hack
2162 $self->{cursor} =
2163 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2164 ? length $1
2165 : 0;
2166 } elsif ($sym == CFPlus::SDLK_END) {
2167 # uh, again
2168 $self->{cursor} =
2169 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2170 ? $self->{cursor} + length $1
2171 : length $self->{text};
2172 } elsif ($uni == 21) { # ctrl-u
2173 $text = "";
1869 $self->{cursor} = 0; 2174 $self->{cursor} = 0;
1870 } elsif ($sym == CFPlus::SDLK_END) {
1871 $self->{cursor} = length $text;
1872 } elsif ($uni == 27) { 2175 } elsif ($uni == 27) {
1873 $self->emit ('escape'); 2176 $self->emit ('escape');
1874 } elsif ($uni) { 2177 } elsif ($uni == 0x0d) {
2178 substr $text, $self->{cursor}++, 0, "\012";
2179 } elsif ($uni >= 0x20) {
1875 substr $text, $self->{cursor}++, 0, chr $uni; 2180 substr $text, $self->{cursor}++, 0, chr $uni;
1876 } else { 2181 } else {
1877 return 0; 2182 return 0;
1878 } 2183 }
1879 2184
1880 $self->_set_text ($text); 2185 $self->_set_text ($text);
1881 2186
1882 $self->realloc; 2187 $self->realloc;
2188 $self->update;
1883 2189
1884 1 2190 1
1885} 2191}
1886 2192
1887sub invoke_focus_in { 2193sub invoke_focus_in {
… …
1949 utf8::encode $text; 2255 utf8::encode $text;
1950 2256
1951 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1952 } 2258 }
1953 2259
1954 glColor @{$self->{fg}};
1955 glBegin GL_LINES; 2260 glBegin GL_LINES;
1956 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2261 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1957 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2262 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1958 glEnd; 2263 glEnd;
1959 } 2264 }
1960} 2265}
2266
2267#############################################################################
1961 2268
1962package CFPlus::UI::Entry; 2269package CFPlus::UI::Entry;
1963 2270
1964our @ISA = CFPlus::UI::EntryBase::; 2271our @ISA = CFPlus::UI::EntryBase::;
1965 2272
… …
1968sub invoke_key_down { 2275sub invoke_key_down {
1969 my ($self, $ev) = @_; 2276 my ($self, $ev) = @_;
1970 2277
1971 my $sym = $ev->{sym}; 2278 my $sym = $ev->{sym};
1972 2279
1973 if ($sym == 13) { 2280 if ($ev->{uni} == 0x0d || $sym == 13) {
1974 unshift @{$self->{history}}, 2281 unshift @{$self->{history}},
1975 my $txt = $self->get_text; 2282 my $txt = $self->get_text;
1976 2283
1977 $self->{history_pointer} = -1; 2284 $self->{history_pointer} = -1;
1978 $self->{history_saveback} = ''; 2285 $self->{history_saveback} = '';
… …
2008 1 2315 1
2009} 2316}
2010 2317
2011############################################################################# 2318#############################################################################
2012 2319
2320package CFPlus::UI::TextEdit;
2321
2322our @ISA = CFPlus::UI::EntryBase::;
2323
2324use CFPlus::OpenGL;
2325
2326sub move_cursor_ver {
2327 my ($self, $dy) = @_;
2328
2329 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2330
2331 $y += $dy;
2332
2333 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2334 $self->{cursor} = $index;
2335 delete $self->{cur_h};
2336 $self->update;
2337 return;
2338 }
2339}
2340
2341sub invoke_key_down {
2342 my ($self, $ev) = @_;
2343
2344 my $sym = $ev->{sym};
2345
2346 if ($sym == CFPlus::SDLK_UP) {
2347 $self->move_cursor_ver (-1);
2348 } elsif ($sym == CFPlus::SDLK_DOWN) {
2349 $self->move_cursor_ver (+1);
2350 } else {
2351 return $self->SUPER::invoke_key_down ($ev)
2352 }
2353
2354 1
2355}
2356
2357#############################################################################
2358
2013package CFPlus::UI::Button; 2359package CFPlus::UI::Button;
2014 2360
2015our @ISA = CFPlus::UI::Label::; 2361our @ISA = CFPlus::UI::Label::;
2016 2362
2017use CFPlus::OpenGL; 2363use CFPlus::OpenGL;
2018 2364
2019my @tex = 2365my @tex =
2020 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2366 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2021 qw(b1_button_active.png); 2367 qw(b1_button_inactive.png b1_button_active.png);
2022 2368
2023sub new { 2369sub new {
2024 my $class = shift; 2370 my $class = shift;
2025 2371
2026 $class->SUPER::new ( 2372 $class->SUPER::new (
2027 padding_x => 4, 2373 padding_x => 4,
2028 padding_y => 4, 2374 padding_y => 4,
2029 fg => [1, 1, 1], 2375 fg => [1.0, 1.0, 1.0],
2030 active_fg => [0, 0, 1], 2376 active_fg => [0.8, 0.8, 0.8],
2031 can_hover => 1, 2377 can_hover => 1,
2032 align => 0, 2378 align => 0,
2033 valign => 0, 2379 valign => 0,
2034 can_events => 1, 2380 can_events => 1,
2035 @_ 2381 @_
… …
2053 2399
2054 glEnable GL_TEXTURE_2D; 2400 glEnable GL_TEXTURE_2D;
2055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2056 glColor 0, 0, 0, 1; 2402 glColor 0, 0, 0, 1;
2057 2403
2404 my $tex = $tex[$GRAB == $self];
2058 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2405 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2059 2406
2060 glDisable GL_TEXTURE_2D; 2407 glDisable GL_TEXTURE_2D;
2061 2408
2062 $self->SUPER::_draw; 2409 $self->SUPER::_draw;
2063} 2410}
… …
2159 or Carp::croak "'path' or 'tex' attributes required"; 2506 or Carp::croak "'path' or 'tex' attributes required";
2160 2507
2161 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2508 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2162 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2509 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2163 2510
2164 Scalar::Util::weaken $texture_cache{$self->{path}}; 2511 CFPlus::weaken $texture_cache{$self->{path}};
2165 2512
2166 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2513 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2167 2514
2168 $self 2515 $self
2169} 2516}
… …
2542sub invoke_mouse_wheel { 2889sub invoke_mouse_wheel {
2543 my ($self, $ev) = @_; 2890 my ($self, $ev) = @_;
2544 2891
2545 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2892 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2546 2893
2894 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2895
2547 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2896 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2548 2897
2549 ! ! $delta 2898 ! ! $delta
2550} 2899}
2551 2900
2552sub update { 2901sub update {
… …
2662 #font => default_font 3011 #font => default_font
2663 @_, 3012 @_,
2664 3013
2665 layout => (new CFPlus::Layout), 3014 layout => (new CFPlus::Layout),
2666 par => [], 3015 par => [],
3016 max_par => 0,
2667 height => 0, 3017 height => 0,
2668 children => [ 3018 children => [
2669 (new CFPlus::UI::Empty expand => 1), 3019 (new CFPlus::UI::Empty expand => 1),
2670 (new CFPlus::UI::Slider vertical => 1), 3020 (new CFPlus::UI::Slider vertical => 1),
2671 ], 3021 ],
… …
2750sub set_offset { 3100sub set_offset {
2751 my ($self, $offset) = @_; 3101 my ($self, $offset) = @_;
2752 3102
2753 # todo: base offset on lines or so, not on pixels 3103 # todo: base offset on lines or so, not on pixels
2754 $self->{children}[1]->set_value ($offset); 3104 $self->{children}[1]->set_value ($offset);
3105}
3106
3107sub current_paragraph {
3108 my ($self) = @_;
3109
3110 $self->{top_paragraph} - 1
3111}
3112
3113sub scroll_to {
3114 my ($self, $para) = @_;
3115
3116 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3117
3118 $self->{scroll_to} = $para;
3119 $self->update;
2755} 3120}
2756 3121
2757sub clear { 3122sub clear {
2758 my ($self) = @_; 3123 my ($self) = @_;
2759 3124
… …
2781 3146
2782 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3147 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2783 push @{$self->{par}}, $para; 3148 push @{$self->{par}}, $para;
2784 } 3149 }
2785 3150
3151 if (my $max = $self->{max_par}) {
3152 shift @{$self->{par}} while @{$self->{par}} > $max;
3153 }
3154
2786 $self->{need_reflow}++; 3155 $self->{need_reflow}++;
2787 $self->update; 3156 $self->update;
2788} 3157}
2789 3158
2790sub scroll_to_bottom { 3159sub scroll_to_bottom {
2791 my ($self) = @_; 3160 my ($self) = @_;
2792 3161
2793 $self->{scroll_to_bottom} = 1; 3162 $self->{scroll_to} = $#{$self->{par}};
2794 $self->update; 3163 $self->update;
2795} 3164}
2796 3165
3166sub force_uptodate {
3167 my ($self) = @_;
3168
3169 if (delete $self->{need_reflow}) {
3170 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3171
3172 my $height = 0;
3173
3174 for my $para (@{$self->{par}}) {
3175 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3176 my $layout = $self->get_layout ($para);
3177 my ($w, $h) = $layout->size;
3178
3179 $para->{w} = $w + $para->{indent};
3180 $para->{h} = $h;
3181 $para->{wrapped} = $layout->has_wrapped;
3182 }
3183
3184 $para->{y} = $height;
3185 $height += $para->{h};
3186 }
3187
3188 $self->{height} = $height;
3189 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3190
3191 delete $self->{texture};
3192 }
3193
3194 if (my $paridx = delete $self->{scroll_to}) {
3195 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3196 }
3197}
3198
2797sub update { 3199sub update {
2798 my ($self) = @_; 3200 my ($self) = @_;
2799 3201
2800 $self->SUPER::update; 3202 $self->SUPER::update;
2801 3203
2802 return unless $self->{h} > 0; 3204 return unless $self->{h} > 0;
2803 3205
2804 delete $self->{texture}; 3206 delete $self->{texture};
2805 3207
2806 $ROOT->on_post_alloc ($self => sub { 3208 $ROOT->on_post_alloc ($self => sub {
3209 $self->force_uptodate;
3210
2807 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3211 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2808
2809 if (delete $self->{need_reflow}) {
2810 my $height = 0;
2811
2812 for my $para (@{$self->{par}}) {
2813 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2814 my $layout = $self->get_layout ($para);
2815 my ($w, $h) = $layout->size;
2816
2817 $para->{w} = $w + $para->{indent};
2818 $para->{h} = $h;
2819 $para->{wrapped} = $layout->has_wrapped;
2820 }
2821
2822 $height += $para->{h};
2823 }
2824
2825 $self->{height} = $height;
2826
2827 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2828
2829 delete $self->{texture};
2830 }
2831
2832 if (delete $self->{scroll_to_bottom}) {
2833 $self->{children}[1]->set_value (1e10);
2834 }
2835 3212
2836 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3213 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2837 glClearColor 0, 0, 0, 0; 3214 glClearColor 0, 0, 0, 0;
2838 glClear GL_COLOR_BUFFER_BIT; 3215 glClear GL_COLOR_BUFFER_BIT;
2839 3216
3217 package CFPlus::UI::Base;
3218 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3219 (0, 0, $self->{w}, $self->{h});
3220
3221 my $top = int $self->{children}[1]{range}[0];
3222
3223 my $paridx = 0;
3224 my $top_paragraph;
2840 my $top = int $self->{children}[1]{range}[0]; 3225 my $top = int $self->{children}[1]{range}[0];
2841 3226
2842 my $y0 = $top; 3227 my $y0 = $top;
2843 my $y1 = $top + $H; 3228 my $y1 = $top + $H;
2844 3229
2845 my $y = 0;
2846
2847 for my $para (@{$self->{par}}) { 3230 for my $para (@{$self->{par}}) {
2848 my $h = $para->{h}; 3231 my $h = $para->{h};
3232 my $y = $para->{y};
2849 3233
2850 if ($y0 < $y + $h && $y < $y1) { 3234 if ($y0 < $y + $h && $y < $y1) {
2851
2852 my $layout = $self->get_layout ($para); 3235 my $layout = $self->get_layout ($para);
2853 3236
2854 $layout->render ($para->{indent}, $y - $y0); 3237 $layout->render ($para->{indent}, $y - $y0);
2855 3238
2856 if (my @w = @{ $para->{widget} }) { 3239 if (my @w = @{ $para->{widget} }) {
… …
2865 $_->draw; 3248 $_->draw;
2866 } 3249 }
2867 } 3250 }
2868 } 3251 }
2869 3252
2870 $y += $h; 3253 $paridx++;
3254 $top_paragraph ||= $paridx if $y >= $top;
2871 } 3255 }
3256
3257 $self->{top_paragraph} = $top_paragraph;
2872 }; 3258 };
2873 }); 3259 });
2874} 3260}
2875 3261
2876sub reconfigure { 3262sub reconfigure {
… …
2997 3383
2998 $self->add (new CFPlus::UI::Label 3384 $self->add (new CFPlus::UI::Label
2999 markup => $tooltip, 3385 markup => $tooltip,
3000 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3386 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3001 fontsize => 0.8, 3387 fontsize => 0.8,
3002 fg => [0, 0, 0, 1], 3388 style => 1, # FLAG_INVERSE
3003 ellipsise => 0, 3389 ellipsise => 0,
3004 font => ($widget->{tooltip_font} || $::FONT_PROP), 3390 font => ($widget->{tooltip_font} || $::FONT_PROP),
3005 ); 3391 );
3006} 3392}
3007 3393
… …
3079 3465
3080sub new { 3466sub new {
3081 my $class = shift; 3467 my $class = shift;
3082 3468
3083 my $self = $class->SUPER::new ( 3469 my $self = $class->SUPER::new (
3470 size_w => 32,
3471 size_h => 8,
3084 aspect => 1, 3472 aspect => 1,
3085 can_events => 0, 3473 can_events => 0,
3086 @_, 3474 @_,
3087 ); 3475 );
3088 3476
3089 if ($self->{anim} && $self->{animspeed}) { 3477 if ($self->{anim} && $self->{animspeed}) {
3090 Scalar::Util::weaken (my $widget = $self); 3478 CFPlus::weaken (my $widget = $self);
3091 3479
3480 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3481 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3092 $self->{timer} = Event->timer ( 3482 $self->{timer} = Event->timer (
3093 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3094 hard => 1, 3483 parked => 1,
3095 interval => $self->{animspeed},
3096 cb => sub { 3484 cb => sub {
3485 return unless $::CONN && $widget;
3486
3097 ++$widget->{frame}; 3487 ++$widget->{frame};
3488 $widget->update_face;
3098 $widget->update; 3489 $widget->update;
3490
3491 $widget->update_timer;
3099 }, 3492 },
3100 ); 3493 );
3494
3495 $self->update_face;
3496 $self->update_timer;
3101 } 3497 }
3102 3498
3103 $self 3499 $self
3104} 3500}
3105 3501
3502sub update_timer {
3503 my ($self) = @_;
3504
3505 return unless $self->{timer};
3506
3507 if ($self->{visible}) {
3508 $self->{timer}->at (
3509 $self->{anim_start}
3510 + $self->{animspeed}
3511 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3512 );
3513 $self->{timer}->start;
3514 } else {
3515 $self->{timer}->stop;
3516 }
3517}
3518
3519sub update_face {
3520 my ($self) = @_;
3521
3522 return unless $::CONN;
3523
3524 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3525 if ($anim && @$anim) {
3526 delete $self->{wait_face};
3527 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3528 }
3529 }
3530}
3531
3106sub size_request { 3532sub size_request {
3107 (32, 8) 3533 my ($self) = @_;
3534
3535 if ($::CONN) {
3536 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3537 if (my $tex = $::CONN->{texture}[$faceid]) {
3538 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3539 } else {
3540 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3541 $self->realloc;
3542 });
3543 }
3544 }
3545 }
3546
3547 ($self->{size_w} || 8, $self->{size_h} || 8)
3108} 3548}
3109 3549
3110sub update { 3550sub update {
3111 my ($self) = @_; 3551 my ($self) = @_;
3112 3552
3113 return unless $self->{visible}; 3553 return unless $self->{visible};
3114 3554
3115 $self->SUPER::update; 3555 $self->SUPER::update;
3116} 3556}
3117 3557
3558sub invoke_visibility_change {
3559 my ($self) = @_;
3560
3561 $self->update_timer;
3562
3563 0
3564}
3565
3118sub _draw { 3566sub _draw {
3119 my ($self) = @_; 3567 my ($self) = @_;
3120 3568
3121 return unless $::CONN; 3569 return unless $::CONN;
3122 3570
3123 $self->SUPER::_draw; 3571 $self->SUPER::_draw;
3124 3572
3125 my $face;
3126
3127 if ($self->{frame}) {
3128 my $anim = $::CONN->{anim}[$self->{anim}]; 3573 my $faceid = $::CONN->{faceid}[$self->{face}]
3129 3574 or return;
3130 $face = $anim->[ $self->{frame} % @$anim ]
3131 if $anim && @$anim;
3132 }
3133 3575
3134 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3576 my $tex = $::CONN->{texture}[$faceid];
3135 3577
3136 if ($tex) { 3578 if ($tex) {
3137 glEnable GL_TEXTURE_2D; 3579 glEnable GL_TEXTURE_2D;
3138 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3580 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3139 glColor 0, 0, 0, 1; 3581 glColor 0, 0, 0, 1;
… …
3143} 3585}
3144 3586
3145sub destroy { 3587sub destroy {
3146 my ($self) = @_; 3588 my ($self) = @_;
3147 3589
3148 $self->{timer}->cancel 3590 (delete $self->{timer})->cancel
3149 if $self->{timer}; 3591 if $self->{timer};
3150 3592
3151 $self->SUPER::destroy; 3593 $self->SUPER::destroy;
3152} 3594}
3153 3595
… …
3155 3597
3156package CFPlus::UI::Buttonbar; 3598package CFPlus::UI::Buttonbar;
3157 3599
3158our @ISA = CFPlus::UI::HBox::; 3600our @ISA = CFPlus::UI::HBox::;
3159 3601
3160# TODO: should actualyl wrap buttons and other goodies. 3602# TODO: should actually wrap buttons and other goodies.
3161 3603
3162############################################################################# 3604#############################################################################
3163 3605
3164package CFPlus::UI::Menu; 3606package CFPlus::UI::Menu;
3165 3607
3166our @ISA = CFPlus::UI::FancyFrame::; 3608our @ISA = CFPlus::UI::Toplevel::;
3167 3609
3168use CFPlus::OpenGL; 3610use CFPlus::OpenGL;
3169 3611
3170sub new { 3612sub new {
3171 my $class = shift; 3613 my $class = shift;
… …
3349} 3791}
3350 3792
3351sub add { 3793sub add {
3352 my ($self, $title, $widget, $tooltip) = @_; 3794 my ($self, $title, $widget, $tooltip) = @_;
3353 3795
3354 Scalar::Util::weaken $self; 3796 CFPlus::weaken $self;
3355 3797
3356 $self->{buttonbar}->add (new CFPlus::UI::Button 3798 $self->{buttonbar}->add (new CFPlus::UI::Button
3357 markup => $title, 3799 markup => $title,
3358 tooltip => $tooltip, 3800 tooltip => $tooltip,
3359 on_activate => sub { $self->set_current_page ($widget) }, 3801 on_activate => sub { $self->set_current_page ($widget) },
… …
3443 my $self = $class->SUPER::new ( 3885 my $self = $class->SUPER::new (
3444 fontsize => 0.8, 3886 fontsize => 0.8,
3445 @_, 3887 @_,
3446 ); 3888 );
3447 3889
3448 Scalar::Util::weaken (my $this = $self); 3890 CFPlus::weaken (my $this = $self);
3449 3891
3450 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3892 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3451 3893
3452 $self 3894 $self
3453} 3895}
… …
3576 $self->SUPER::destroy; 4018 $self->SUPER::destroy;
3577} 4019}
3578 4020
3579############################################################################# 4021#############################################################################
3580 4022
3581package CFPlus::UI::Inventory;
3582
3583our @ISA = CFPlus::UI::Table::;
3584
3585sub new {
3586 my $class = shift;
3587
3588 my $self = $class->SUPER::new (
3589 col_expand => [0, 1, 0],
3590 items => [],
3591 @_,
3592 );
3593
3594 $self->set_sort_order (undef);
3595
3596 $self
3597}
3598
3599sub update_items {
3600 my ($self) = @_;
3601
3602 $self->clear;
3603
3604 my @item = $self->{sort}->(@{ $self->{items} });
3605
3606 my @adds;
3607 my $row = 0;
3608 for my $item ($self->{sort}->(@{ $self->{items} })) {
3609 CFPlus::Item::update_widgets $item;
3610
3611 push @adds, 0, $row, $item->{face_widget};
3612 push @adds, 1, $row, $item->{desc_widget};
3613 push @adds, 2, $row, $item->{weight_widget};
3614
3615 $row++;
3616 }
3617
3618 $self->add (@adds);
3619}
3620
3621sub set_sort_order {
3622 my ($self, $order) = @_;
3623
3624 $self->{sort} = $order ||= sub {
3625 sort {
3626 $a->{type} <=> $b->{type}
3627 or $a->{name} cmp $b->{name}
3628 } @_
3629 };
3630
3631 $self->update_items;
3632}
3633
3634sub set_items {
3635 my ($self, $items) = @_;
3636
3637 $self->{items} = [$items ? values %$items : ()];
3638 $self->update_items;
3639}
3640
3641#############################################################################
3642
3643package CFPlus::UI::SpellList;
3644
3645our @ISA = CFPlus::UI::Table::;
3646
3647sub new {
3648 my $class = shift;
3649
3650 my $self = $class->SUPER::new (
3651 binding => [],
3652 commands => [],
3653 @_,
3654 )
3655}
3656
3657my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3658
3659my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3663my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3665my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3666 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3667my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3668 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3669
3670sub rebuild_spell_list {
3671 my ($self) = @_;
3672
3673 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3674 $self->clear;
3675
3676 return unless $::CONN;
3677
3678 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3679 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3680 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3681 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3682 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3683
3684 my $row = 0;
3685
3686 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3687 my $spell = $self->{spell}{$_};
3688
3689 $row++;
3690
3691 my $spell_cb = sub {
3692 my ($widget, $ev) = @_;
3693
3694 if ($ev->{button} == 1) {
3695 $::CONN->user_send ("cast $spell->{name}");
3696 } elsif ($ev->{button} == 2) {
3697 $::CONN->user_send ("invoke $spell->{name}");
3698 } elsif ($ev->{button} == 3) {
3699 (new CFPlus::UI::Menu
3700 items => [
3701 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3702 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3703 ],
3704 )->popup ($ev);
3705 } else {
3706 return 0;
3707 }
3708
3709 1
3710 };
3711
3712 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3713
3714 #TODO: add path info to tooltip
3715 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3716
3717 $self->add (0, $row, new CFPlus::UI::Face
3718 face => $spell->{face},
3719 can_hover => 1,
3720 can_events => 1,
3721 tooltip => $tooltip,
3722 on_button_down => $spell_cb,
3723 );
3724
3725 $self->add (1, $row, new CFPlus::UI::Label
3726 expand => 1,
3727 text => $spell->{name},
3728 can_hover => 1,
3729 can_events => 1,
3730 tooltip => $tooltip,
3731 on_button_down => $spell_cb,
3732 );
3733
3734 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3735 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3736 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3737 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3738 }
3739 });
3740}
3741
3742sub add_spell {
3743 my ($self, $spell) = @_;
3744
3745 $self->{spell}->{$spell->{name}} = $spell;
3746 $self->rebuild_spell_list;
3747}
3748
3749sub remove_spell {
3750 my ($self, $spell) = @_;
3751
3752 delete $self->{spell}->{$spell->{name}};
3753 $self->rebuild_spell_list;
3754}
3755
3756sub clear_spells {
3757 my ($self) = @_;
3758
3759 $self->{spell} = {};
3760 $self->rebuild_spell_list;
3761}
3762
3763#############################################################################
3764
3765package CFPlus::UI::Root; 4023package CFPlus::UI::Root;
3766 4024
3767our @ISA = CFPlus::UI::Container::; 4025our @ISA = CFPlus::UI::Container::;
3768 4026
3769use List::Util qw(min max); 4027use List::Util qw(min max);
… …
3776 my $self = $class->SUPER::new ( 4034 my $self = $class->SUPER::new (
3777 visible => 1, 4035 visible => 1,
3778 @_, 4036 @_,
3779 ); 4037 );
3780 4038
3781 Scalar::Util::weaken ($self->{root} = $self); 4039 CFPlus::weaken ($self->{root} = $self);
3782 4040
3783 $self 4041 $self
3784} 4042}
3785 4043
3786sub size_request { 4044sub size_request {
… …
3981 while ($self->{post_alloc_hook}) { 4239 while ($self->{post_alloc_hook}) {
3982 $_->() 4240 $_->()
3983 for values %{delete $self->{post_alloc_hook}}; 4241 for values %{delete $self->{post_alloc_hook}};
3984 } 4242 }
3985 4243
3986
3987 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4244 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3988 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4245 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3989 glClear GL_COLOR_BUFFER_BIT; 4246 glClear GL_COLOR_BUFFER_BIT;
3990 4247
3991 glMatrixMode GL_PROJECTION; 4248 glMatrixMode GL_PROJECTION;
… …
3995 glLoadIdentity; 4252 glLoadIdentity;
3996 4253
3997 { 4254 {
3998 package CFPlus::UI::Base; 4255 package CFPlus::UI::Base;
3999 4256
4000 ($draw_x, $draw_y, $draw_w, $draw_h) = 4257 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4001 (0, 0, $self->{w}, $self->{h}); 4258 (0, 0, $self->{w}, $self->{h});
4002 }
4003 4259
4004 $self->_draw; 4260 $self->_draw;
4261 }
4005} 4262}
4006 4263
4007############################################################################# 4264#############################################################################
4008 4265
4009package CFPlus::UI; 4266package CFPlus::UI;

Diff Legend

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