ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.344 by root, Sun Aug 13 16:29:36 2006 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 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;
… …
898 glClear GL_COLOR_BUFFER_BIT; 912 glClear GL_COLOR_BUFFER_BIT;
899 913
900 { 914 {
901 package CFPlus::UI::Base; 915 package CFPlus::UI::Base;
902 916
903 ($draw_x, $draw_y, $draw_w, $draw_h) = 917 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 918 (0, 0, $self->{w}, $self->{h});
919
920 $self->_render;
905 } 921 }
906
907 $self->_render;
908 }; 922 };
909} 923}
910 924
911sub _draw { 925sub _draw {
912 my ($self) = @_; 926 my ($self) = @_;
… …
924} 938}
925 939
926############################################################################# 940#############################################################################
927 941
928package CFPlus::UI::ViewPort; 942package CFPlus::UI::ViewPort;
943
944use List::Util qw(min max);
929 945
930our @ISA = CFPlus::UI::Window::; 946our @ISA = CFPlus::UI::Window::;
931 947
932sub new { 948sub new {
933 my $class = shift; 949 my $class = shift;
… …
942sub size_request { 958sub size_request {
943 my ($self) = @_; 959 my ($self) = @_;
944 960
945 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 961 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946 962
947 $w = 10 if $self->{scroll_x}; 963 $w = 1 if $self->{scroll_x};
948 $h = 10 if $self->{scroll_y}; 964 $h = 1 if $self->{scroll_y};
949 965
950 ($w, $h) 966 ($w, $h)
951} 967}
952 968
953sub invoke_size_allocate { 969sub invoke_size_allocate {
… …
965} 981}
966 982
967sub set_offset { 983sub set_offset {
968 my ($self, $x, $y) = @_; 984 my ($self, $x, $y) = @_;
969 985
986 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
987 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
988
989 if ($x != $self->{view_x} or $y != $self->{view_y}) {
970 $self->{view_x} = int $x; 990 $self->{view_x} = $x;
971 $self->{view_y} = int $y; 991 $self->{view_y} = $y;
972 992
993 $self->emit (changed => $x, $y);
973 $self->update; 994 $self->update;
995 }
974} 996}
975 997
976# hmm, this does not work for topleft of $self... but we should not ask for that 998# hmm, this does not work for topleft of $self... but we should not ask for that
977sub coord2local { 999sub coord2local {
978 my ($self, $x, $y) = @_; 1000 my ($self, $x, $y) = @_;
… …
993 my ($self, $x, $y) = @_; 1015 my ($self, $x, $y) = @_;
994 1016
995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
997 ) { 1019 ) {
998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1020 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
999 } else { 1021 } else {
1000 $self->CFPlus::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
1001 } 1023 }
1002} 1024}
1003 1025
… …
1014 1036
1015############################################################################# 1037#############################################################################
1016 1038
1017package CFPlus::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
1018 1040
1019our @ISA = CFPlus::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
1020 1042
1021sub new { 1043sub new {
1022 my ($class, %arg) = @_; 1044 my ($class, %arg) = @_;
1023 1045
1024 my $child = delete $arg{child}; 1046 my $child = delete $arg{child};
1025 1047
1026 my $self; 1048 my $self;
1027 1049
1028 my $slider = new CFPlus::UI::Slider 1050 my $hslider = new CFPlus::UI::Slider
1051 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub {
1054 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 },
1057 ;
1058
1059 my $vslider = new CFPlus::UI::Slider
1029 vertical => 1, 1060 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1061 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1062 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1065 },
1034 ; 1066 ;
1035 1067
1036 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1038 can_events => 1, 1071 can_events => 1,
1039 slider => $slider, 1072 hslider => $hslider,
1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
1040 %arg, 1076 %arg,
1041 ); 1077 );
1042 1078
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1079 $self->{vp} = new CFPlus::UI::ViewPort
1080 expand => 1,
1081 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y},
1083 on_changed => sub {
1084 my ($vp, $x, $y) = @_;
1085
1086 $vp->{parent}{hslider}->set_value ($x);
1087 $vp->{parent}{vslider}->set_value ($y);
1088
1089 0
1090 },
1091 ;
1092
1093 $self->SUPER::add_at (0, 0, $self->{vp});
1094
1044 $self->add ($child) if $child; 1095 $self->add ($child) if $child;
1045 1096
1046 $self 1097 $self
1047} 1098}
1048 1099
… …
1052 my ($self, $widget) = @_; 1103 my ($self, $widget) = @_;
1053 1104
1054 $self->{vp}->add ($self->{child} = $widget); 1105 $self->{vp}->add ($self->{child} = $widget);
1055} 1106}
1056 1107
1108sub update_slider {
1109 my ($self) = @_;
1110
1111 my $child = ($self->{vp} or return)->child;
1112
1113 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1114 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115
1116 my $visible = $w1 > $w2;
1117 if ($visible != $self->{hslider}{visible}) {
1118 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1119 : $self->{hslider}->hide;
1120 }
1121
1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1123 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124
1125 my $visible = $h1 > $h2;
1126 if ($visible != $self->{vslider}{visible}) {
1127 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1128 : $self->{vslider}->hide;
1129 }
1130}
1131
1132sub update {
1133 my ($self) = @_;
1134
1135 $self->update_slider;
1136 $self->SUPER::update;
1137}
1138
1057sub invoke_mouse_wheel { 1139sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1140 my ($self, $ev) = @_;
1059 1141
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev); 1142 $self->{vslider}->emit (mouse_wheel => $ev)
1143 if $ev->{dy};
1144
1145 $self->{hslider}->emit (mouse_wheel => $ev)
1146 if $ev->{dx};
1063 1147
1064 1 1148 1
1065} 1149}
1066 1150
1067sub update_slider { 1151sub invoke_button_down {
1068 my ($self) = @_; 1152 my ($self, $ev, $x, $y) = @_;
1069 1153
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1154 if ($ev->{button} == 2) {
1071} 1155 $self->grab_focus;
1072 1156
1073sub update { 1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1074 my ($self) = @_; 1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160 $self->{motion} = sub {
1161 my ($ev, $x, $y) = @_;
1075 1162
1076 $self->SUPER::update; 1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1164 $self->update;
1165 };
1077 1166
1078 $self->update_slider; 1167 return 1;
1168 }
1169
1170 0
1171}
1172
1173sub invoke_button_up {
1174 my ($self, $ev, $x, $y) = @_;
1175
1176 if (delete $self->{motion}) {
1177 return 1;
1178 }
1179
1180 0
1181}
1182
1183sub invoke_mouse_motion {
1184 my ($self, $ev, $x, $y) = @_;
1185
1186 if ($self->{motion}) {
1187 $self->{motion}->($ev, $x, $y);
1188 return 1;
1189 }
1190
1191 0
1079} 1192}
1080 1193
1081sub invoke_size_allocate { 1194sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1195 my ($self, $w, $h) = @_;
1083 1196
1084 $self->update_slider; 1197 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1198 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1199}
1088 1200
1089############################################################################# 1201#############################################################################
1090 1202
… …
1132 1244
1133our @ISA = CFPlus::UI::Bin::; 1245our @ISA = CFPlus::UI::Bin::;
1134 1246
1135use CFPlus::OpenGL; 1247use CFPlus::OpenGL;
1136 1248
1249sub new {
1250 my ($class, %arg) = @_;
1251
1252 if ((exists $arg{label}) && !ref $arg{label}) {
1253 $arg{label} = new CFPlus::UI::Label
1254 align => 1,
1255 valign => 0,
1256 text => $arg{label},
1257 fontsize => ($arg{border} || 0.8) * 0.75;
1258 }
1259
1260 my $self = $class->SUPER::new (
1261 # label => "",
1262 fg => [0.6, 0.3, 0.1],
1263 border => 0.8,
1264 style => 'single',
1265 %arg,
1266 );
1267
1268 $self
1269}
1270
1271sub add {
1272 my ($self, @widgets) = @_;
1273
1274 $self->SUPER::add (@widgets);
1275 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1276}
1277
1278sub border {
1279 int $_[0]{border} * $::FONTSIZE
1280}
1281
1282sub size_request {
1283 my ($self) = @_;
1284
1285 ($self->{label_w}, undef) = $self->{label}->size_request
1286 if $self->{label};
1287
1288 my ($w, $h) = $self->SUPER::size_request;
1289
1290 (
1291 $w + $self->border * 2,
1292 $h + $self->border * 2,
1293 )
1294}
1295
1296sub invoke_size_allocate {
1297 my ($self, $w, $h) = @_;
1298
1299 my $border = $self->border;
1300
1301 $w -= List::Util::max 0, $border * 2;
1302 $h -= List::Util::max 0, $border * 2;
1303
1304 if (my $label = $self->{label}) {
1305 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1306 $label->{h} = List::Util::min $h, $border;
1307 $label->invoke_size_allocate ($label->{w}, $label->{h});
1308 }
1309
1310 $self->child->configure ($border, $border, $w, $h);
1311
1312 1
1313}
1314
1315sub _draw {
1316 my ($self) = @_;
1317
1318 my $child = $self->{children}[0];
1319
1320 my $border = $self->border;
1321 my ($w, $h) = ($self->{w}, $self->{h});
1322
1323 $child->draw;
1324
1325 glColor @{$self->{fg}};
1326 glBegin GL_LINE_STRIP;
1327 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1328 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1330 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1331 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1332 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1333 glEnd;
1334
1335 if ($self->{label}) {
1336 glTranslate $border * 2, 0;
1337 $self->{label}->_draw;
1338 }
1339}
1340
1341#############################################################################
1342
1343package CFPlus::UI::Toplevel;
1344
1345our @ISA = CFPlus::UI::Bin::;
1346
1347use CFPlus::OpenGL;
1348
1137my $bg = 1349my $bg =
1138 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1350 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1139 mipmap => 1, wrap => 1; 1351 mipmap => 1, wrap => 1;
1140 1352
1141my @border = 1353my @border =
1142 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1354 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1143 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1355 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1356
1357my @icon =
1358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1359 qw(x1_move.png x1_resize.png);
1144 1360
1145sub new { 1361sub new {
1146 my ($class, %arg) = @_; 1362 my ($class, %arg) = @_;
1147 1363
1148 my $self = $class->SUPER::new ( 1364 my $self = $class->SUPER::new (
… …
1317 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1318 1534
1319 my $border = $self->border; 1535 my $border = $self->border;
1320 1536
1321 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1322 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1323 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1324 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1325 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1541 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1542
1543 # move
1544 my $w2 = ($w - $border) * .5;
1545 my $h2 = ($h - $border) * .5;
1546 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1547 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1548 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1549
1550 # resize
1551 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1553 unless $self->{has_close_button};
1554 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1326 1556
1327 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1328 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1329 1559
1330 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
… …
1361 1591
1362sub new { 1592sub new {
1363 my $class = shift; 1593 my $class = shift;
1364 1594
1365 $class->SUPER::new ( 1595 $class->SUPER::new (
1596 children => [],
1366 col_expand => [], 1597 col_expand => [],
1598 row_expand => [],
1367 @_, 1599 @_,
1368 ) 1600 )
1369} 1601}
1370 1602
1371sub children { 1603sub children {
1372 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1604 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1373} 1605}
1374 1606
1607# TODO: store row/col info in child widget and use standard add/del
1375sub add { 1608sub add {
1376 my ($self) = shift; 1609 my $self = shift;
1610
1611 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1612 $self->add_at (@_);
1613}
1614
1615sub add_at {
1616 my $self = shift;
1377 1617
1378 while (@_) { 1618 while (@_) {
1379 my ($x, $y, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1620
1621 $child->{row} = $row;
1622 $child->{col} = $col;
1623
1624 $child->{rowspan} ||= 1;
1625 $child->{colspan} ||= 1;
1626
1380 $child->set_parent ($self); 1627 $child->set_parent ($self);
1381 $self->{children}[$y][$x] = $child; 1628 $self->{children}[$row][$col] = $child;
1382 } 1629 }
1383 1630
1384 $self->{force_realloc} = 1; 1631 $self->{force_realloc} = 1;
1385 $self->{force_size_alloc} = 1; 1632 $self->{force_size_alloc} = 1;
1386 $self->realloc; 1633 $self->realloc;
1387} 1634}
1388 1635
1389sub remove { 1636sub remove {
1390 my ($self, $child) = @_; 1637 my ($self, $child) = @_;
1391 1638
1392 # TODO: not yet implemented 1639 for (@{ $self->{children} }) {
1640 for (@{ $_ || [] }) {
1641 $_ = undef if $_ == $child;
1642 }
1643 }
1393} 1644}
1394 1645
1395# TODO: move to container class maybe? send children a signal on removal? 1646# TODO: move to container class maybe? send children a signal on removal?
1396sub clear { 1647sub clear {
1397 my ($self) = @_; 1648 my ($self) = @_;
… …
1410sub get_wh { 1661sub get_wh {
1411 my ($self) = @_; 1662 my ($self) = @_;
1412 1663
1413 my (@w, @h); 1664 my (@w, @h);
1414 1665
1415 for my $y (0 .. $#{$self->{children}}) { 1666 my @children = $self->children;
1416 my $row = $self->{children}[$y]
1417 or next;
1418 1667
1419 for my $x (0 .. $#$row) { 1668 for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) {
1420 my $widget = $row->[$x] 1669 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1421 or next;
1422 my ($w, $h) = @$widget{qw(req_w req_h)};
1423 1670
1424 $w[$x] = max $w[$x], $w; 1671 my $sw = sum @w[$c .. $c + $cs - 1];
1425 $h[$y] = max $h[$y], $h; 1672 my $sh = sum @h[$r .. $r + $rs - 1];
1673
1674 if ($w > $sw) {
1675 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
1676 }
1677
1678 if ($h > $sh) {
1679 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1426 } 1680 }
1427 } 1681 }
1428 1682
1429 (\@w, \@h) 1683 (\@w, \@h)
1430} 1684}
… …
1446 my ($ws, $hs) = $self->get_wh; 1700 my ($ws, $hs) = $self->get_wh;
1447 1701
1448 my $req_w = (sum @$ws) || 1; 1702 my $req_w = (sum @$ws) || 1;
1449 my $req_h = (sum @$hs) || 1; 1703 my $req_h = (sum @$hs) || 1;
1450 1704
1451 # TODO: nicer code && do row_expand 1705 # now linearly scale the rows/columns to the allocated size
1452 my @col_expand = @{$self->{col_expand}}; 1706 my @col_expand = @{$self->{col_expand}};
1453 @col_expand = (1) x @$ws unless @col_expand; 1707 @col_expand = (1) x @$ws unless @col_expand;
1454 my $col_expand = (sum @col_expand) || 1; 1708 my $col_expand = (sum @col_expand) || 1;
1455 1709
1456 # linearly scale sizes
1457 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1710 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1458 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1459 1711
1460 CFPlus::UI::harmonize $ws; 1712 CFPlus::UI::harmonize $ws;
1713
1714 my @row_expand = @{$self->{row_expand}};
1715 @row_expand = (1) x @$ws unless @row_expand;
1716 my $row_expand = (sum @row_expand) || 1;
1717
1718 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1719
1461 CFPlus::UI::harmonize $hs; 1720 CFPlus::UI::harmonize $hs;
1462 1721
1463 my $y; 1722 my (@x, @y);
1464 1723
1724 for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1725 for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1726
1465 for my $r (0 .. $#{$self->{children}}) { 1727 for my $widget ($self->children) {
1466 my $row = $self->{children}[$r] 1728 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1467 or next;
1468 1729
1469 my $x = 0; 1730 $widget->configure (
1470 my $row_h = $hs->[$r]; 1731 $x[$c], $y[$r],
1732 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1471 1733 );
1472 for my $c (0 .. $#$row) {
1473 my $col_w = $ws->[$c];
1474
1475 if (my $widget = $row->[$c]) {
1476 $widget->configure ($x, $y, $col_w, $row_h);
1477 }
1478
1479 $x += $col_w;
1480 }
1481
1482 $y += $row_h;
1483 } 1734 }
1484 1735
1485 1 1736 1
1486} 1737}
1487 1738
… …
1505 my ($self) = @_; 1756 my ($self) = @_;
1506 1757
1507 for (grep $_, @{$self->{children}}) { 1758 for (grep $_, @{$self->{children}}) {
1508 $_->draw for grep $_, @$_; 1759 $_->draw for grep $_, @$_;
1509 } 1760 }
1761}
1762
1763#############################################################################
1764
1765package CFPlus::UI::Fixed;
1766
1767use List::Util qw(min max);
1768
1769our @ISA = CFPlus::UI::Container::;
1770
1771sub add {
1772 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1773
1774 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1775 $self->SUPER::add ($child);
1776}
1777
1778sub _scale($$$) {
1779 my ($mode, $val, $max) = @_;
1780
1781 $mode eq "abs" ? $val
1782 : $mode eq "rel" ? $val * $max
1783 : 0
1784}
1785
1786sub size_request {
1787 my ($self) = @_;
1788
1789 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1790
1791 # determine overall size by querying abs widgets
1792 for my $child ($self->visible_children) {
1793 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1794
1795 if ($pos eq "abs") {
1796 $w = _scale $size, $w, $child->{req_w};
1797 $h = _scale $size, $h, $child->{req_h};
1798
1799 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1800 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1801 }
1802 }
1803
1804 my $W = $x2 - $x1;
1805 my $H = $y2 - $y1;
1806
1807 # now layout remaining widgets
1808 for my $child ($self->visible_children) {
1809 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1810
1811 if ($pos ne "abs") {
1812 $x = _scale $pos, $x, $W;
1813 $y = _scale $pos, $x, $H;
1814 $w = _scale $size, $w, $child->{req_w};
1815 $h = _scale $size, $h, $child->{req_h};
1816
1817 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1818 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1819 }
1820 }
1821
1822 my $W = $x2 - $x1;
1823 my $H = $y2 - $y1;
1824
1825 ($W, $H)
1826}
1827
1828sub invoke_size_allocate {
1829 my ($self, $W, $H) = @_;
1830
1831 for my $child ($self->visible_children) {
1832 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1833
1834 $x = _scale $pos, $x, $W;
1835 $y = _scale $pos, $x, $H;
1836 $w = _scale $size, $w, $child->{req_w};
1837 $h = _scale $size, $h, $child->{req_h};
1838
1839 $child->configure ($x, $y, $w, $h);
1840 }
1841
1842 1
1510} 1843}
1511 1844
1512############################################################################# 1845#############################################################################
1513 1846
1514package CFPlus::UI::Box; 1847package CFPlus::UI::Box;
… …
1800 active_fg => [0, 0, 0], 2133 active_fg => [0, 0, 0],
1801 can_hover => 1, 2134 can_hover => 1,
1802 can_focus => 1, 2135 can_focus => 1,
1803 valign => 0, 2136 valign => 0,
1804 can_events => 1, 2137 can_events => 1,
2138 ellipsise => 0,
1805 #text => ... 2139 #text => ...
1806 #hidden => "*", 2140 #hidden => "*",
1807 @_ 2141 @_
1808 ) 2142 )
1809} 2143}
… …
1853 my $mod = $ev->{mod}; 2187 my $mod = $ev->{mod};
1854 my $sym = $ev->{sym}; 2188 my $sym = $ev->{sym};
1855 my $uni = $ev->{unicode}; 2189 my $uni = $ev->{unicode};
1856 2190
1857 my $text = $self->get_text; 2191 my $text = $self->get_text;
2192
2193 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1858 2194
1859 if ($uni == 8) { 2195 if ($uni == 8) {
1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2196 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861 } elsif ($uni == 127) { 2197 } elsif ($uni == 127) {
1862 substr $text, $self->{cursor}, 1, ""; 2198 substr $text, $self->{cursor}, 1, "";
1863 } elsif ($sym == CFPlus::SDLK_LEFT) { 2199 } elsif ($sym == CFPlus::SDLK_LEFT) {
1864 --$self->{cursor} if $self->{cursor}; 2200 --$self->{cursor} if $self->{cursor};
1865 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2201 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1866 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2202 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1867 } elsif ($sym == CFPlus::SDLK_HOME) { 2203 } elsif ($sym == CFPlus::SDLK_HOME) {
2204 # what a hack
2205 $self->{cursor} =
2206 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2207 ? length $1
2208 : 0;
2209 } elsif ($sym == CFPlus::SDLK_END) {
2210 # uh, again
2211 $self->{cursor} =
2212 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2213 ? $self->{cursor} + length $1
2214 : length $self->{text};
2215 } elsif ($uni == 21) { # ctrl-u
2216 $text = "";
1868 $self->{cursor} = 0; 2217 $self->{cursor} = 0;
1869 } elsif ($sym == CFPlus::SDLK_END) {
1870 $self->{cursor} = length $text;
1871 } elsif ($uni == 27) { 2218 } elsif ($uni == 27) {
1872 $self->emit ('escape'); 2219 $self->emit ('escape');
1873 } elsif ($uni) { 2220 } elsif ($uni == 0x0d) {
2221 substr $text, $self->{cursor}++, 0, "\012";
2222 } elsif ($uni >= 0x20) {
1874 substr $text, $self->{cursor}++, 0, chr $uni; 2223 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else { 2224 } else {
1876 return 0; 2225 return 0;
1877 } 2226 }
1878 2227
1879 $self->_set_text ($text); 2228 $self->_set_text ($text);
1880 2229
1881 $self->realloc; 2230 $self->realloc;
2231 $self->update;
1882 2232
1883 1 2233 1
1884} 2234}
1885 2235
1886sub invoke_focus_in { 2236sub invoke_focus_in {
… …
1955 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2305 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1956 glEnd; 2306 glEnd;
1957 } 2307 }
1958} 2308}
1959 2309
2310#############################################################################
2311
1960package CFPlus::UI::Entry; 2312package CFPlus::UI::Entry;
1961 2313
1962our @ISA = CFPlus::UI::EntryBase::; 2314our @ISA = CFPlus::UI::EntryBase::;
1963 2315
1964use CFPlus::OpenGL; 2316use CFPlus::OpenGL;
… …
1966sub invoke_key_down { 2318sub invoke_key_down {
1967 my ($self, $ev) = @_; 2319 my ($self, $ev) = @_;
1968 2320
1969 my $sym = $ev->{sym}; 2321 my $sym = $ev->{sym};
1970 2322
1971 if ($sym == 13) { 2323 if ($ev->{uni} == 0x0d || $sym == 13) {
1972 unshift @{$self->{history}}, 2324 unshift @{$self->{history}},
1973 my $txt = $self->get_text; 2325 my $txt = $self->get_text;
1974 2326
1975 $self->{history_pointer} = -1; 2327 $self->{history_pointer} = -1;
1976 $self->{history_saveback} = ''; 2328 $self->{history_saveback} = '';
… …
2006 1 2358 1
2007} 2359}
2008 2360
2009############################################################################# 2361#############################################################################
2010 2362
2363package CFPlus::UI::TextEdit;
2364
2365our @ISA = CFPlus::UI::EntryBase::;
2366
2367use CFPlus::OpenGL;
2368
2369sub move_cursor_ver {
2370 my ($self, $dy) = @_;
2371
2372 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2373
2374 $y += $dy;
2375
2376 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2377 $self->{cursor} = $index;
2378 delete $self->{cur_h};
2379 $self->update;
2380 return;
2381 }
2382}
2383
2384sub invoke_key_down {
2385 my ($self, $ev) = @_;
2386
2387 my $sym = $ev->{sym};
2388
2389 if ($sym == CFPlus::SDLK_UP) {
2390 $self->move_cursor_ver (-1);
2391 } elsif ($sym == CFPlus::SDLK_DOWN) {
2392 $self->move_cursor_ver (+1);
2393 } else {
2394 return $self->SUPER::invoke_key_down ($ev)
2395 }
2396
2397 1
2398}
2399
2400#############################################################################
2401
2011package CFPlus::UI::Button; 2402package CFPlus::UI::Button;
2012 2403
2013our @ISA = CFPlus::UI::Label::; 2404our @ISA = CFPlus::UI::Label::;
2014 2405
2015use CFPlus::OpenGL; 2406use CFPlus::OpenGL;
2016 2407
2017my @tex = 2408my @tex =
2018 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2409 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2019 qw(b1_button_active.png); 2410 qw(b1_button_inactive.png b1_button_active.png);
2020 2411
2021sub new { 2412sub new {
2022 my $class = shift; 2413 my $class = shift;
2023 2414
2024 $class->SUPER::new ( 2415 $class->SUPER::new (
2025 padding_x => 4, 2416 padding_x => 4,
2026 padding_y => 4, 2417 padding_y => 4,
2027 fg => [1, 1, 1], 2418 fg => [1.0, 1.0, 1.0],
2028 active_fg => [0, 0, 1], 2419 active_fg => [0.8, 0.8, 0.8],
2029 can_hover => 1, 2420 can_hover => 1,
2030 align => 0, 2421 align => 0,
2031 valign => 0, 2422 valign => 0,
2032 can_events => 1, 2423 can_events => 1,
2033 @_ 2424 @_
… …
2051 2442
2052 glEnable GL_TEXTURE_2D; 2443 glEnable GL_TEXTURE_2D;
2053 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2054 glColor 0, 0, 0, 1; 2445 glColor 0, 0, 0, 1;
2055 2446
2447 my $tex = $tex[$GRAB == $self];
2056 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2448 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2057 2449
2058 glDisable GL_TEXTURE_2D; 2450 glDisable GL_TEXTURE_2D;
2059 2451
2060 $self->SUPER::_draw; 2452 $self->SUPER::_draw;
2061} 2453}
… …
2157 or Carp::croak "'path' or 'tex' attributes required"; 2549 or Carp::croak "'path' or 'tex' attributes required";
2158 2550
2159 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2551 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2160 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2552 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2161 2553
2162 Scalar::Util::weaken $texture_cache{$self->{path}}; 2554 CFPlus::weaken $texture_cache{$self->{path}};
2163 2555
2164 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2556 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2165 2557
2166 $self 2558 $self
2167} 2559}
… …
2540sub invoke_mouse_wheel { 2932sub invoke_mouse_wheel {
2541 my ($self, $ev) = @_; 2933 my ($self, $ev) = @_;
2542 2934
2543 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2935 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2544 2936
2937 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2938
2545 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2939 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2546 2940
2547 ! ! $delta 2941 ! ! $delta
2548} 2942}
2549 2943
2550sub update { 2944sub update {
… …
2660 #font => default_font 3054 #font => default_font
2661 @_, 3055 @_,
2662 3056
2663 layout => (new CFPlus::Layout), 3057 layout => (new CFPlus::Layout),
2664 par => [], 3058 par => [],
3059 max_par => 0,
2665 height => 0, 3060 height => 0,
2666 children => [ 3061 children => [
2667 (new CFPlus::UI::Empty expand => 1), 3062 (new CFPlus::UI::Empty expand => 1),
2668 (new CFPlus::UI::Slider vertical => 1), 3063 (new CFPlus::UI::Slider vertical => 1),
2669 ], 3064 ],
… …
2748sub set_offset { 3143sub set_offset {
2749 my ($self, $offset) = @_; 3144 my ($self, $offset) = @_;
2750 3145
2751 # todo: base offset on lines or so, not on pixels 3146 # todo: base offset on lines or so, not on pixels
2752 $self->{children}[1]->set_value ($offset); 3147 $self->{children}[1]->set_value ($offset);
3148}
3149
3150sub current_paragraph {
3151 my ($self) = @_;
3152
3153 $self->{top_paragraph} - 1
3154}
3155
3156sub scroll_to {
3157 my ($self, $para) = @_;
3158
3159 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3160
3161 $self->{scroll_to} = $para;
3162 $self->update;
2753} 3163}
2754 3164
2755sub clear { 3165sub clear {
2756 my ($self) = @_; 3166 my ($self) = @_;
2757 3167
… …
2779 3189
2780 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3190 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2781 push @{$self->{par}}, $para; 3191 push @{$self->{par}}, $para;
2782 } 3192 }
2783 3193
3194 if (my $max = $self->{max_par}) {
3195 shift @{$self->{par}} while @{$self->{par}} > $max;
3196 }
3197
2784 $self->{need_reflow}++; 3198 $self->{need_reflow}++;
2785 $self->update; 3199 $self->update;
2786} 3200}
2787 3201
2788sub scroll_to_bottom { 3202sub scroll_to_bottom {
2789 my ($self) = @_; 3203 my ($self) = @_;
2790 3204
2791 $self->{scroll_to_bottom} = 1; 3205 $self->{scroll_to} = $#{$self->{par}};
2792 $self->update; 3206 $self->update;
2793} 3207}
2794 3208
3209sub force_uptodate {
3210 my ($self) = @_;
3211
3212 if (delete $self->{need_reflow}) {
3213 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3214
3215 my $height = 0;
3216
3217 for my $para (@{$self->{par}}) {
3218 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3219 my $layout = $self->get_layout ($para);
3220 my ($w, $h) = $layout->size;
3221
3222 $para->{w} = $w + $para->{indent};
3223 $para->{h} = $h;
3224 $para->{wrapped} = $layout->has_wrapped;
3225 }
3226
3227 $para->{y} = $height;
3228 $height += $para->{h};
3229 }
3230
3231 $self->{height} = $height;
3232 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3233
3234 delete $self->{texture};
3235 }
3236
3237 if (my $paridx = delete $self->{scroll_to}) {
3238 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3239 }
3240}
3241
2795sub update { 3242sub update {
2796 my ($self) = @_; 3243 my ($self) = @_;
2797 3244
2798 $self->SUPER::update; 3245 $self->SUPER::update;
2799 3246
2800 return unless $self->{h} > 0; 3247 return unless $self->{h} > 0;
2801 3248
2802 delete $self->{texture}; 3249 delete $self->{texture};
2803 3250
2804 $ROOT->on_post_alloc ($self => sub { 3251 $ROOT->on_post_alloc ($self => sub {
3252 $self->force_uptodate;
3253
2805 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3254 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2806
2807 if (delete $self->{need_reflow}) {
2808 my $height = 0;
2809
2810 for my $para (@{$self->{par}}) {
2811 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2812 my $layout = $self->get_layout ($para);
2813 my ($w, $h) = $layout->size;
2814
2815 $para->{w} = $w + $para->{indent};
2816 $para->{h} = $h;
2817 $para->{wrapped} = $layout->has_wrapped;
2818 }
2819
2820 $height += $para->{h};
2821 }
2822
2823 $self->{height} = $height;
2824
2825 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2826
2827 delete $self->{texture};
2828 }
2829
2830 if (delete $self->{scroll_to_bottom}) {
2831 $self->{children}[1]->set_value (1e10);
2832 }
2833 3255
2834 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3256 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2835 glClearColor 0, 0, 0, 0; 3257 glClearColor 0, 0, 0, 0;
2836 glClear GL_COLOR_BUFFER_BIT; 3258 glClear GL_COLOR_BUFFER_BIT;
2837 3259
3260 package CFPlus::UI::Base;
3261 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3262 (0, 0, $self->{w}, $self->{h});
3263
3264 my $top = int $self->{children}[1]{range}[0];
3265
3266 my $paridx = 0;
3267 my $top_paragraph;
2838 my $top = int $self->{children}[1]{range}[0]; 3268 my $top = int $self->{children}[1]{range}[0];
2839 3269
2840 my $y0 = $top; 3270 my $y0 = $top;
2841 my $y1 = $top + $H; 3271 my $y1 = $top + $H;
2842 3272
2843 my $y = 0;
2844
2845 for my $para (@{$self->{par}}) { 3273 for my $para (@{$self->{par}}) {
2846 my $h = $para->{h}; 3274 my $h = $para->{h};
3275 my $y = $para->{y};
2847 3276
2848 if ($y0 < $y + $h && $y < $y1) { 3277 if ($y0 < $y + $h && $y < $y1) {
2849
2850 my $layout = $self->get_layout ($para); 3278 my $layout = $self->get_layout ($para);
2851 3279
2852 $layout->render ($para->{indent}, $y - $y0); 3280 $layout->render ($para->{indent}, $y - $y0);
2853 3281
2854 if (my @w = @{ $para->{widget} }) { 3282 if (my @w = @{ $para->{widget} }) {
… …
2863 $_->draw; 3291 $_->draw;
2864 } 3292 }
2865 } 3293 }
2866 } 3294 }
2867 3295
2868 $y += $h; 3296 $paridx++;
3297 $top_paragraph ||= $paridx if $y >= $top;
2869 } 3298 }
3299
3300 $self->{top_paragraph} = $top_paragraph;
2870 }; 3301 };
2871 }); 3302 });
2872} 3303}
2873 3304
2874sub reconfigure { 3305sub reconfigure {
… …
3077 3508
3078sub new { 3509sub new {
3079 my $class = shift; 3510 my $class = shift;
3080 3511
3081 my $self = $class->SUPER::new ( 3512 my $self = $class->SUPER::new (
3513 size_w => 32,
3514 size_h => 8,
3082 aspect => 1, 3515 aspect => 1,
3083 can_events => 0, 3516 can_events => 0,
3084 @_, 3517 @_,
3085 ); 3518 );
3086 3519
3087 if ($self->{anim} && $self->{animspeed}) { 3520 if ($self->{anim} && $self->{animspeed}) {
3088 Scalar::Util::weaken (my $widget = $self); 3521 CFPlus::weaken (my $widget = $self);
3089 3522
3523 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3524 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3090 $self->{timer} = Event->timer ( 3525 $self->{timer} = Event->timer (
3091 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3092 hard => 1, 3526 parked => 1,
3093 interval => $self->{animspeed},
3094 cb => sub { 3527 cb => sub {
3528 return unless $::CONN && $widget;
3529
3095 ++$widget->{frame}; 3530 ++$widget->{frame};
3531 $widget->update_face;
3096 $widget->update; 3532 $widget->update;
3533
3534 $widget->update_timer;
3097 }, 3535 },
3098 ); 3536 );
3537
3538 $self->update_face;
3539 $self->update_timer;
3099 } 3540 }
3100 3541
3101 $self 3542 $self
3102} 3543}
3103 3544
3545sub update_timer {
3546 my ($self) = @_;
3547
3548 return unless $self->{timer};
3549
3550 if ($self->{visible}) {
3551 $self->{timer}->at (
3552 $self->{anim_start}
3553 + $self->{animspeed}
3554 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3555 );
3556 $self->{timer}->start;
3557 } else {
3558 $self->{timer}->stop;
3559 }
3560}
3561
3562sub update_face {
3563 my ($self) = @_;
3564
3565 return unless $::CONN;
3566
3567 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3568 if ($anim && @$anim) {
3569 delete $self->{wait_face};
3570 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3571 }
3572 }
3573}
3574
3104sub size_request { 3575sub size_request {
3105 (32, 8) 3576 my ($self) = @_;
3577
3578 if ($::CONN) {
3579 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3580 if (my $tex = $::CONN->{texture}[$faceid]) {
3581 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3582 } else {
3583 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3584 $self->realloc;
3585 });
3586 }
3587 }
3588 }
3589
3590 ($self->{size_w} || 8, $self->{size_h} || 8)
3106} 3591}
3107 3592
3108sub update { 3593sub update {
3109 my ($self) = @_; 3594 my ($self) = @_;
3110 3595
3111 return unless $self->{visible}; 3596 return unless $self->{visible};
3112 3597
3113 $self->SUPER::update; 3598 $self->SUPER::update;
3114} 3599}
3115 3600
3601sub invoke_visibility_change {
3602 my ($self) = @_;
3603
3604 $self->update_timer;
3605
3606 0
3607}
3608
3116sub _draw { 3609sub _draw {
3117 my ($self) = @_; 3610 my ($self) = @_;
3118 3611
3119 return unless $::CONN; 3612 return unless $::CONN;
3120 3613
3121 $self->SUPER::_draw; 3614 $self->SUPER::_draw;
3122 3615
3123 my $face;
3124
3125 if ($self->{frame}) {
3126 my $anim = $::CONN->{anim}[$self->{anim}]; 3616 my $faceid = $::CONN->{faceid}[$self->{face}]
3127 3617 or return;
3128 $face = $anim->[ $self->{frame} % @$anim ]
3129 if $anim && @$anim;
3130 }
3131 3618
3132 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3619 my $tex = $::CONN->{texture}[$faceid];
3133 3620
3134 if ($tex) { 3621 if ($tex) {
3135 glEnable GL_TEXTURE_2D; 3622 glEnable GL_TEXTURE_2D;
3136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3623 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3137 glColor 0, 0, 0, 1; 3624 glColor 0, 0, 0, 1;
… …
3141} 3628}
3142 3629
3143sub destroy { 3630sub destroy {
3144 my ($self) = @_; 3631 my ($self) = @_;
3145 3632
3146 $self->{timer}->cancel 3633 (delete $self->{timer})->cancel
3147 if $self->{timer}; 3634 if $self->{timer};
3148 3635
3149 $self->SUPER::destroy; 3636 $self->SUPER::destroy;
3150} 3637}
3151 3638
… …
3153 3640
3154package CFPlus::UI::Buttonbar; 3641package CFPlus::UI::Buttonbar;
3155 3642
3156our @ISA = CFPlus::UI::HBox::; 3643our @ISA = CFPlus::UI::HBox::;
3157 3644
3158# TODO: should actualyl wrap buttons and other goodies. 3645# TODO: should actually wrap buttons and other goodies.
3159 3646
3160############################################################################# 3647#############################################################################
3161 3648
3162package CFPlus::UI::Menu; 3649package CFPlus::UI::Menu;
3163 3650
3164our @ISA = CFPlus::UI::FancyFrame::; 3651our @ISA = CFPlus::UI::Toplevel::;
3165 3652
3166use CFPlus::OpenGL; 3653use CFPlus::OpenGL;
3167 3654
3168sub new { 3655sub new {
3169 my $class = shift; 3656 my $class = shift;
… …
3347} 3834}
3348 3835
3349sub add { 3836sub add {
3350 my ($self, $title, $widget, $tooltip) = @_; 3837 my ($self, $title, $widget, $tooltip) = @_;
3351 3838
3352 Scalar::Util::weaken $self; 3839 CFPlus::weaken $self;
3353 3840
3354 $self->{buttonbar}->add (new CFPlus::UI::Button 3841 $self->{buttonbar}->add (new CFPlus::UI::Button
3355 markup => $title, 3842 markup => $title,
3356 tooltip => $tooltip, 3843 tooltip => $tooltip,
3357 on_activate => sub { $self->set_current_page ($widget) }, 3844 on_activate => sub { $self->set_current_page ($widget) },
… …
3441 my $self = $class->SUPER::new ( 3928 my $self = $class->SUPER::new (
3442 fontsize => 0.8, 3929 fontsize => 0.8,
3443 @_, 3930 @_,
3444 ); 3931 );
3445 3932
3446 Scalar::Util::weaken (my $this = $self); 3933 CFPlus::weaken (my $this = $self);
3447 3934
3448 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3935 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3449 3936
3450 $self 3937 $self
3451} 3938}
… …
3574 $self->SUPER::destroy; 4061 $self->SUPER::destroy;
3575} 4062}
3576 4063
3577############################################################################# 4064#############################################################################
3578 4065
3579package CFPlus::UI::Inventory;
3580
3581our @ISA = CFPlus::UI::Table::;
3582
3583sub new {
3584 my $class = shift;
3585
3586 my $self = $class->SUPER::new (
3587 col_expand => [0, 1, 0],
3588 items => [],
3589 @_,
3590 );
3591
3592 $self->set_sort_order (undef);
3593
3594 $self
3595}
3596
3597sub update_items {
3598 my ($self) = @_;
3599
3600 $self->clear;
3601
3602 my @item = $self->{sort}->(@{ $self->{items} });
3603
3604 my @adds;
3605 my $row = 0;
3606 for my $item ($self->{sort}->(@{ $self->{items} })) {
3607 CFPlus::Item::update_widgets $item;
3608
3609 push @adds, 0, $row, $item->{face_widget};
3610 push @adds, 1, $row, $item->{desc_widget};
3611 push @adds, 2, $row, $item->{weight_widget};
3612
3613 $row++;
3614 }
3615
3616 $self->add (@adds);
3617}
3618
3619sub set_sort_order {
3620 my ($self, $order) = @_;
3621
3622 $self->{sort} = $order ||= sub {
3623 sort {
3624 $a->{type} <=> $b->{type}
3625 or $a->{name} cmp $b->{name}
3626 } @_
3627 };
3628
3629 $self->update_items;
3630}
3631
3632sub set_items {
3633 my ($self, $items) = @_;
3634
3635 $self->{items} = [$items ? values %$items : ()];
3636 $self->update_items;
3637}
3638
3639#############################################################################
3640
3641package CFPlus::UI::SpellList;
3642
3643our @ISA = CFPlus::UI::Table::;
3644
3645sub new {
3646 my $class = shift;
3647
3648 my $self = $class->SUPER::new (
3649 binding => [],
3650 commands => [],
3651 @_,
3652 )
3653}
3654
3655my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3656
3657my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3659my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3663my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3665my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3666 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3667
3668sub rebuild_spell_list {
3669 my ($self) = @_;
3670
3671 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3672 $self->clear;
3673
3674 return unless $::CONN;
3675
3676 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3677 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3678 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3679 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3680 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3681
3682 my $row = 0;
3683
3684 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3685 my $spell = $self->{spell}{$_};
3686
3687 $row++;
3688
3689 my $spell_cb = sub {
3690 my ($widget, $ev) = @_;
3691
3692 if ($ev->{button} == 1) {
3693 $::CONN->user_send ("cast $spell->{name}");
3694 } elsif ($ev->{button} == 2) {
3695 $::CONN->user_send ("invoke $spell->{name}");
3696 } elsif ($ev->{button} == 3) {
3697 (new CFPlus::UI::Menu
3698 items => [
3699 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3700 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3701 ],
3702 )->popup ($ev);
3703 } else {
3704 return 0;
3705 }
3706
3707 1
3708 };
3709
3710 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3711
3712 #TODO: add path info to tooltip
3713 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3714
3715 $self->add (0, $row, new CFPlus::UI::Face
3716 face => $spell->{face},
3717 can_hover => 1,
3718 can_events => 1,
3719 tooltip => $tooltip,
3720 on_button_down => $spell_cb,
3721 );
3722
3723 $self->add (1, $row, new CFPlus::UI::Label
3724 expand => 1,
3725 text => $spell->{name},
3726 can_hover => 1,
3727 can_events => 1,
3728 tooltip => $tooltip,
3729 on_button_down => $spell_cb,
3730 );
3731
3732 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3733 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3734 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3735 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3736 }
3737 });
3738}
3739
3740sub add_spell {
3741 my ($self, $spell) = @_;
3742
3743 $self->{spell}->{$spell->{name}} = $spell;
3744 $self->rebuild_spell_list;
3745}
3746
3747sub remove_spell {
3748 my ($self, $spell) = @_;
3749
3750 delete $self->{spell}->{$spell->{name}};
3751 $self->rebuild_spell_list;
3752}
3753
3754sub clear_spells {
3755 my ($self) = @_;
3756
3757 $self->{spell} = {};
3758 $self->rebuild_spell_list;
3759}
3760
3761#############################################################################
3762
3763package CFPlus::UI::Root; 4066package CFPlus::UI::Root;
3764 4067
3765our @ISA = CFPlus::UI::Container::; 4068our @ISA = CFPlus::UI::Container::;
3766 4069
3767use List::Util qw(min max); 4070use List::Util qw(min max);
… …
3774 my $self = $class->SUPER::new ( 4077 my $self = $class->SUPER::new (
3775 visible => 1, 4078 visible => 1,
3776 @_, 4079 @_,
3777 ); 4080 );
3778 4081
3779 Scalar::Util::weaken ($self->{root} = $self); 4082 CFPlus::weaken ($self->{root} = $self);
3780 4083
3781 $self 4084 $self
3782} 4085}
3783 4086
3784sub size_request { 4087sub size_request {
… …
3979 while ($self->{post_alloc_hook}) { 4282 while ($self->{post_alloc_hook}) {
3980 $_->() 4283 $_->()
3981 for values %{delete $self->{post_alloc_hook}}; 4284 for values %{delete $self->{post_alloc_hook}};
3982 } 4285 }
3983 4286
3984
3985 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4287 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3986 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4288 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3987 glClear GL_COLOR_BUFFER_BIT; 4289 glClear GL_COLOR_BUFFER_BIT;
3988 4290
3989 glMatrixMode GL_PROJECTION; 4291 glMatrixMode GL_PROJECTION;
… …
3993 glLoadIdentity; 4295 glLoadIdentity;
3994 4296
3995 { 4297 {
3996 package CFPlus::UI::Base; 4298 package CFPlus::UI::Base;
3997 4299
3998 ($draw_x, $draw_y, $draw_w, $draw_h) = 4300 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3999 (0, 0, $self->{w}, $self->{h}); 4301 (0, 0, $self->{w}, $self->{h});
4000 }
4001 4302
4002 $self->_draw; 4303 $self->_draw;
4304 }
4003} 4305}
4004 4306
4005############################################################################# 4307#############################################################################
4006 4308
4007package CFPlus::UI; 4309package CFPlus::UI;

Diff Legend

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