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.294 by root, Tue Jun 6 03:19:26 2006 UTC vs.
Revision 1.318 by elmex, Sun Jul 2 19:32:55 2006 UTC

272 272
273 return unless $self->{visible}; 273 return unless $self->{visible};
274 274
275 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
276 276
277 delete $self->{visible};
277 delete $self->{root}; 278 delete $self->{root};
278 delete $self->{visible};
279 279
280 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
282 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
285 285
286 $self->focus_out; 286 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
289} 288}
290 289
291sub set_visibility { 290sub set_visibility {
292 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
315} 314}
316 315
317sub move_abs { 316sub move_abs {
318 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
319 318
320 $self->{x} = List::Util::max 0, int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321 $self->{y} = List::Util::max 0, int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
323 322
324 $self->update; 323 $self->update;
325} 324}
326 325
334} 333}
335 334
336sub size_request { 335sub size_request {
337 require Carp; 336 require Carp;
338 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
339} 342}
340 343
341sub configure { 344sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
343 346
367 370
368 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
369 } 372 }
370} 373}
371 374
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 375sub children {
377 # nop 376 # nop
378} 377}
379 378
380sub visible_children { 379sub visible_children {
418 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
419 418
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 420}
422 421
423sub focus_in { 422sub invoke_focus_in {
424 my ($self) = @_; 423 my ($self) = @_;
425 424
426 return if $FOCUS == $self; 425 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
428 427
429 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
430 429
431 $self->_emit (focus_in => $focus); 430 $self->update;
432 431
433 $focus->update if $focus; 432 0
434 $FOCUS->update;
435} 433}
436 434
437sub focus_out { 435sub invoke_focus_out {
438 my ($self) = @_; 436 my ($self) = @_;
439 437
440 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
441 439
442 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
443 441
444 $self->_emit (focus_out => $focus); 442 $self->update;
445 443
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 445 unless $FOCUS;
450}
451 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
452sub mouse_motion { 0 } 457sub invoke_mouse_motion { 1 }
453sub button_up { 0 } 458sub invoke_button_up { 1 }
454sub key_down { 0 } 459sub invoke_key_down { 1 }
455sub key_up { 0 } 460sub invoke_key_up { 1 }
456 461
457sub button_down { 462sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
459 464
460 $self->focus_in; 465 $self->grab_focus;
461 466
462 0 467 1
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 483}
464 484
465sub find_widget { 485sub find_widget {
466 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
467 487
477sub set_parent { 497sub set_parent {
478 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
479 499
480 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 502}
506 503
507sub realloc { 504sub realloc {
508 my ($self) = @_; 505 my ($self) = @_;
509 506
542 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
543 540
544 # update screen rectangle 541 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 544
550 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 548
593 588
594sub DESTROY { 589sub DESTROY {
595 my ($self) = @_; 590 my ($self) = @_;
596 591
597 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
598 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599} 596}
600 597
601############################################################################# 598#############################################################################
602 599
603package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
768} 765}
769 766
770sub add { 767sub add {
771 my ($self, $child) = @_; 768 my ($self, $child) = @_;
772 769
773 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
776} 772}
777 773
778sub remove { 774sub remove {
779 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
788 784
789sub size_request { 785sub size_request {
790 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
791} 787}
792 788
793sub size_allocate { 789sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
795 791
796 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
797} 795}
798 796
799############################################################################# 797#############################################################################
800 798
801# back-buffered drawing area 799# back-buffered drawing area
817 815
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 817 $self->SUPER::update;
820} 818}
821 819
822sub size_allocate { 820sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
824 822
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
827} 826}
828 827
829sub _render { 828sub _render {
830 my ($self) = @_; 829 my ($self) = @_;
831 830
892 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
893 892
894 ($w, $h) 893 ($w, $h)
895} 894}
896 895
897sub size_allocate { 896sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
899 898
900 my $child = $self->child; 899 my $child = $self->child;
901 900
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 903
905 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
906 $self->update; 905 $self->update;
906
907 1
907} 908}
908 909
909sub set_offset { 910sub set_offset {
910 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
911 912
985 $self->add ($child) if $child; 986 $self->add ($child) if $child;
986 987
987 $self 988 $self
988} 989}
989 990
991#TODO# update range on size_allocate depending on child
992
990sub add { 993sub add {
991 my ($self, $widget) = @_; 994 my ($self, $widget) = @_;
992 995
993 $self->{vp}->add ($self->{child} = $widget); 996 $self->{vp}->add ($self->{child} = $widget);
994} 997}
995 998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
996sub update { 1005sub update {
997 my ($self) = @_; 1006 my ($self) = @_;
998 1007
999 $self->SUPER::update; 1008 $self->SUPER::update;
1000 1009
1001 # todo: overwrite size_allocate of child 1010 $self->update_slider;
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1011}
1005 1012
1006sub size_allocate { 1013sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
1008 1015
1016 $self->update_slider;
1017
1009 $self->SUPER::size_allocate ($w, $h); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013} 1019}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1020
1018############################################################################# 1021#############################################################################
1019 1022
1020package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
1021 1024
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1076
1074sub new { 1077sub new {
1075 my ($class, %arg) = @_; 1078 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1078 1079
1079 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1083 border => 0.6,
1084 min_w => 16, 1085 min_w => 16,
1085 min_h => 16, 1086 min_h => 16,
1086 %arg, 1087 %arg,
1087 ); 1088 );
1088 1089
1089 $self->{title} = new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1090 align => 0, 1091 align => 0,
1091 valign => 1, 1092 valign => 1,
1092 text => $title, 1093 text => $self->{title},
1093 fontsize => $self->{border} 1094 fontsize => $self->{border},
1094 if defined $title; 1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1095 1105
1096 $self 1106 $self
1097} 1107}
1098 1108
1099sub add { 1109sub add {
1100 my ($self, @widgets) = @_; 1110 my ($self, @widgets) = @_;
1101 1111
1102 $self->SUPER::add (@widgets); 1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1115}
1105 1116
1106sub border { 1117sub border {
1107 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1108} 1119}
1109 1120
1110sub size_request { 1121sub size_request {
1111 my ($self) = @_; 1122 my ($self) = @_;
1112 1123
1113 $self->{title}->size_request 1124 $self->{title_widget}->size_request
1114 if $self->{title}; 1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1115 1129
1116 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1117 1131
1118 ( 1132 (
1119 $w + $self->border * 2, 1133 $w + $self->border * 2,
1120 $h + $self->border * 2, 1134 $h + $self->border * 2,
1121 ) 1135 )
1122} 1136}
1123 1137
1124sub size_allocate { 1138sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1126 1140
1127 if ($self->{title}) { 1141 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1142 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1143 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1145 }
1132 1146
1133 my $border = $self->border; 1147 my $border = $self->border;
1134 1148
1135 $h -= List::Util::max 0, $border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1151
1152 $self->child->configure ($border, $border, $w, $h);
1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1137 1164
1138 $self->child->configure ($border, $border, $w, $h); 1165 1
1139} 1166}
1140 1167
1141sub button_down { 1168sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1143 1170
1144 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1172 my $border = $self->border;
1146 1173
1177 1204
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1206
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1208 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1210 };
1184 } else { 1211 } else {
1185 return 0; 1212 return 0;
1186 } 1213 }
1187 1214
1188 1 1215 1
1189} 1216}
1190 1217
1191sub button_up { 1218sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1193 1220
1194 !!delete $self->{motion} 1221 ! ! delete $self->{motion}
1195} 1222}
1196 1223
1197sub mouse_motion { 1224sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1199 1226
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1228
1202 !!$self->{motion} 1229 ! ! $self->{motion}
1203} 1230}
1204 1231
1205sub _draw { 1232sub _draw {
1206 my ($self) = @_; 1233 my ($self) = @_;
1207 1234
1233 1260
1234 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
1235 1262
1236 $child->draw; 1263 $child->draw;
1237 1264
1238 if ($self->{title}) { 1265 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1266 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1241 } 1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1242} 1274}
1243 1275
1244############################################################################# 1276#############################################################################
1245 1277
1246package CFClient::UI::Table; 1278package CFClient::UI::Table;
1269 1301
1270 $child->set_parent ($self); 1302 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1272 1304
1273 $self->realloc; 1305 $self->realloc;
1306}
1307
1308sub remove {
1309 my ($self, $child) = @_;
1310
1311 # TODO: not yet implemented
1274} 1312}
1275 1313
1276# TODO: move to container class maybe? send children a signal on removal? 1314# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1315sub clear {
1278 my ($self) = @_; 1316 my ($self) = @_;
1319 (sum @$ws), 1357 (sum @$ws),
1320 (sum @$hs), 1358 (sum @$hs),
1321 ) 1359 )
1322} 1360}
1323 1361
1324sub size_allocate { 1362sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1326 1364
1327 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1328 1366
1329 my $req_w = (sum @$ws) || 1; 1367 my $req_w = (sum @$ws) || 1;
1361 } 1399 }
1362 1400
1363 $y += $row_h; 1401 $y += $row_h;
1364 } 1402 }
1365 1403
1404 1
1366} 1405}
1367 1406
1368sub find_widget { 1407sub find_widget {
1369 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1370 1409
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1448 )
1410} 1449}
1411 1450
1412sub size_allocate { 1451sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1452 my ($self, $w, $h) = @_;
1414 1453
1415 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1417 1456
1418 my @req; 1457 my @req;
1419 1458
1420 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1422 } else { 1461 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1425 1464
1426 if ($req > $space) { 1465 if ($req > $space) {
1427 # ah well, not enough space 1466 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1429 } else { 1468 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1470
1432 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1433 1472
1434 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1474 for 0 .. $#children;
1436 } 1475 }
1437 } 1476 }
1438 1477
1439 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1440 1479
1441 my $pos = 0; 1480 my $pos = 0;
1442 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1484
1446 $pos += $alloc; 1485 $pos += $alloc;
1447 } 1486 }
1448 1487
1449 1 1488 1
1604 }; 1643 };
1605 1644
1606 @{ $self->{size_req} } 1645 @{ $self->{size_req} }
1607} 1646}
1608 1647
1648sub baseline_shift {
1649 $_[0]{layout}->descent
1650}
1651
1609sub size_allocate { 1652sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1653 my ($self, $w, $h) = @_;
1611 1654
1612 delete $self->{ox}; 1655 delete $self->{ox};
1613 1656
1614 delete $self->{texture} 1657 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1658 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1659
1660 1
1616} 1661}
1617 1662
1618sub set_fontsize { 1663sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1664 my ($self, $fontsize) = @_;
1620 1665
1621 $self->{fontsize} = $fontsize; 1666 $self->{fontsize} = $fontsize;
1667 delete $self->{size_req};
1622 delete $self->{texture}; 1668 delete $self->{texture};
1623 1669
1624 $self->realloc; 1670 $self->realloc;
1625} 1671}
1626 1672
1713 1759
1714 $text =~ s/./*/g if $self->{hidden}; 1760 $text =~ s/./*/g if $self->{hidden};
1715 $self->{layout}->set_text ("$text "); 1761 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req}; 1762 delete $self->{size_req};
1717 1763
1718 $self->_emit (changed => $self->{text}); 1764 $self->emit (changed => $self->{text});
1719 1765
1720 $self->realloc; 1766 $self->realloc;
1721 $self->update; 1767 $self->update;
1722} 1768}
1723 1769
1738 my ($w, $h) = $self->SUPER::size_request; 1784 my ($w, $h) = $self->SUPER::size_request;
1739 1785
1740 ($w + 1, $h) # add 1 for cursor 1786 ($w + 1, $h) # add 1 for cursor
1741} 1787}
1742 1788
1743sub key_down { 1789sub invoke_key_down {
1744 my ($self, $ev) = @_; 1790 my ($self, $ev) = @_;
1745 1791
1746 my $mod = $ev->{mod}; 1792 my $mod = $ev->{mod};
1747 my $sym = $ev->{sym}; 1793 my $sym = $ev->{sym};
1748 my $uni = $ev->{unicode}; 1794 my $uni = $ev->{unicode};
1760 } elsif ($sym == CFClient::SDLK_HOME) { 1806 } elsif ($sym == CFClient::SDLK_HOME) {
1761 $self->{cursor} = 0; 1807 $self->{cursor} = 0;
1762 } elsif ($sym == CFClient::SDLK_END) { 1808 } elsif ($sym == CFClient::SDLK_END) {
1763 $self->{cursor} = length $text; 1809 $self->{cursor} = length $text;
1764 } elsif ($uni == 27) { 1810 } elsif ($uni == 27) {
1765 $self->_emit ('escape'); 1811 $self->emit ('escape');
1766 } elsif ($uni) { 1812 } elsif ($uni) {
1767 substr $text, $self->{cursor}++, 0, chr $uni; 1813 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else { 1814 } else {
1769 return 0; 1815 return 0;
1770 } 1816 }
1774 $self->realloc; 1820 $self->realloc;
1775 1821
1776 1 1822 1
1777} 1823}
1778 1824
1779sub focus_in { 1825sub invoke_focus_in {
1780 my ($self) = @_; 1826 my ($self) = @_;
1781 1827
1782 $self->{last_activity} = $::NOW; 1828 $self->{last_activity} = $::NOW;
1783 1829
1784 $self->SUPER::focus_in; 1830 $self->SUPER::invoke_focus_in
1785} 1831}
1786 1832
1787sub button_down { 1833sub invoke_button_down {
1788 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1789 1835
1790 $self->SUPER::button_down ($ev, $x, $y); 1836 $self->SUPER::invoke_button_down ($ev, $x, $y);
1791 1837
1792 my $idx = $self->{layout}->xy_to_index ($x, $y); 1838 my $idx = $self->{layout}->xy_to_index ($x, $y);
1793 1839
1794 # byte-index to char-index 1840 # byte-index to char-index
1795 my $text = $self->{text}; 1841 my $text = $self->{text};
1800 $self->update; 1846 $self->update;
1801 1847
1802 1 1848 1
1803} 1849}
1804 1850
1805sub mouse_motion { 1851sub invoke_mouse_motion {
1806 my ($self, $ev, $x, $y) = @_; 1852 my ($self, $ev, $x, $y) = @_;
1807# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1853# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808 1854
1809 0 1855 1
1810} 1856}
1811 1857
1812sub _draw { 1858sub _draw {
1813 my ($self) = @_; 1859 my ($self) = @_;
1814 1860
1855 1901
1856our @ISA = CFClient::UI::EntryBase::; 1902our @ISA = CFClient::UI::EntryBase::;
1857 1903
1858use CFClient::OpenGL; 1904use CFClient::OpenGL;
1859 1905
1860sub key_down { 1906sub invoke_key_down {
1861 my ($self, $ev) = @_; 1907 my ($self, $ev) = @_;
1862 1908
1863 my $sym = $ev->{sym}; 1909 my $sym = $ev->{sym};
1864 1910
1865 if ($sym == 13) { 1911 if ($sym == 13) {
1866 unshift @{$self->{history}}, 1912 unshift @{$self->{history}},
1867 my $txt = $self->get_text; 1913 my $txt = $self->get_text;
1914
1868 $self->{history_pointer} = -1; 1915 $self->{history_pointer} = -1;
1869 $self->{history_saveback} = ''; 1916 $self->{history_saveback} = '';
1870 $self->_emit (activate => $txt); 1917 $self->emit (activate => $txt);
1871 $self->update; 1918 $self->update;
1872 1919
1873 } elsif ($sym == CFClient::SDLK_UP) { 1920 } elsif ($sym == CFClient::SDLK_UP) {
1874 if ($self->{history_pointer} < 0) { 1921 if ($self->{history_pointer} < 0) {
1875 $self->{history_saveback} = $self->get_text; 1922 $self->{history_saveback} = $self->get_text;
1891 } else { 1938 } else {
1892 $self->set_text ($self->{history_saveback}); 1939 $self->set_text ($self->{history_saveback});
1893 } 1940 }
1894 1941
1895 } else { 1942 } else {
1896 return $self->SUPER::key_down ($ev) 1943 return $self->SUPER::invoke_key_down ($ev)
1897 } 1944 }
1898 1945
1899 1 1946 1
1900} 1947}
1901 1948
1925 can_events => 1, 1972 can_events => 1,
1926 @_ 1973 @_
1927 ) 1974 )
1928} 1975}
1929 1976
1930sub activate { }
1931
1932sub button_up { 1977sub invoke_button_up {
1933 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1934 1979
1935 $self->emit ("activate") 1980 $self->emit ("activate")
1936 if $x >= 0 && $x < $self->{w} 1981 if $x >= 0 && $x < $self->{w}
1937 && $y >= 0 && $y < $self->{h}; 1982 && $y >= 0 && $y < $self->{h};
1951 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1996 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1952 1997
1953 glDisable GL_TEXTURE_2D; 1998 glDisable GL_TEXTURE_2D;
1954 1999
1955 $self->SUPER::_draw; 2000 $self->SUPER::_draw;
2001}
2002
2003#############################################################################
2004
2005package CFClient::UI::ImageButton;
2006
2007our @ISA = CFClient::UI::Image::;
2008
2009use CFClient::OpenGL;
2010
2011my %textures;
2012
2013sub new {
2014 my $class = shift;
2015
2016 my $self = $class->SUPER::new (
2017 padding_x => 4,
2018 padding_y => 4,
2019 fg => [1, 1, 1],
2020 active_fg => [0, 0, 1],
2021 can_hover => 1,
2022 align => 0,
2023 valign => 0,
2024 can_events => 1,
2025 @_
2026 );
2027}
2028
2029sub invoke_button_up {
2030 my ($self, $ev, $x, $y) = @_;
2031
2032 $self->emit ("activate")
2033 if $x >= 0 && $x < $self->{w}
2034 && $y >= 0 && $y < $self->{h};
2035
2036 1
1956} 2037}
1957 2038
1958############################################################################# 2039#############################################################################
1959 2040
1960package CFClient::UI::CheckBox; 2041package CFClient::UI::CheckBox;
1987 my ($self) = @_; 2068 my ($self) = @_;
1988 2069
1989 (6) x 2 2070 (6) x 2
1990} 2071}
1991 2072
1992sub button_down { 2073sub invoke_button_down {
1993 my ($self, $ev, $x, $y) = @_; 2074 my ($self, $ev, $x, $y) = @_;
1994 2075
1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2076 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2077 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1997 $self->{state} = !$self->{state}; 2078 $self->{state} = !$self->{state};
1998 $self->_emit (changed => $self->{state}); 2079 $self->emit (changed => $self->{state});
1999 } else { 2080 } else {
2000 return 0 2081 return 0
2001 } 2082 }
2002 2083
2003 1 2084 1
2028package CFClient::UI::Image; 2109package CFClient::UI::Image;
2029 2110
2030our @ISA = CFClient::UI::Base::; 2111our @ISA = CFClient::UI::Base::;
2031 2112
2032use CFClient::OpenGL; 2113use CFClient::OpenGL;
2033use Carp qw/confess/;
2034 2114
2035our %loaded_images; 2115our %texture_cache;
2036 2116
2037sub new { 2117sub new {
2038 my $class = shift; 2118 my $class = shift;
2039 2119
2040 my $self = $class->SUPER::new (can_events => 0, @_); 2120 my $self = $class->SUPER::new (
2121 can_events => 0,
2122 @_,
2123 );
2041 2124
2042 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2125 $self->{path}
2126 or Carp::croak "required attribute 'path' not set";
2043 2127
2044 $loaded_images{$self->{image}} ||= 2128 $self->{tex} = $texture_cache{$self->{path}} ||=
2045 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2129 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2046 2130
2047 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2131 Scalar::Util::weaken $texture_cache{$self->{path}};
2048 2132
2049 Scalar::Util::weaken $loaded_images{$self->{image}}; 2133 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2050
2051 $self->{aspect} = $tex->{w} / $tex->{h};
2052 2134
2053 $self 2135 $self
2054} 2136}
2055 2137
2056sub size_request { 2138sub size_request {
2057 my ($self) = @_; 2139 my ($self) = @_;
2058 2140
2059 ($self->{tex}->{w}, $self->{tex}->{h}) 2141 ($self->{tex}{w}, $self->{tex}{h})
2060} 2142}
2061 2143
2062sub _draw { 2144sub _draw {
2063 my ($self) = @_; 2145 my ($self) = @_;
2064 2146
2173 my $ycut1 = max 0, min 1, $ycut; 2255 my $ycut1 = max 0, min 1, $ycut;
2174 my $ycut2 = max 0, min 1, $ycut - 1; 2256 my $ycut2 = max 0, min 1, $ycut - 1;
2175 2257
2176 my $h1 = $self->{h} * (1 - $ycut1); 2258 my $h1 = $self->{h} * (1 - $ycut1);
2177 my $h2 = $self->{h} * (1 - $ycut2); 2259 my $h2 = $self->{h} * (1 - $ycut2);
2260 my $h3 = $self->{h};
2261
2262 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2178 2263
2179 glEnable GL_BLEND; 2264 glEnable GL_BLEND;
2180 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2265 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2266 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2182 glEnable GL_TEXTURE_2D; 2267 glEnable GL_TEXTURE_2D;
2201 2286
2202 if ($t3) { 2287 if ($t3) {
2203 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2288 glBindTexture GL_TEXTURE_2D, $t3->{name};
2204 glBegin GL_QUADS; 2289 glBegin GL_QUADS;
2205 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2290 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2206 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2291 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2207 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2292 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2208 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2293 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2209 glEnd; 2294 glEnd;
2210 } 2295 }
2211 2296
2212 glDisable GL_BLEND; 2297 glDisable GL_BLEND;
2300 $self->update; 2385 $self->update;
2301 2386
2302 $self 2387 $self
2303} 2388}
2304 2389
2305sub changed { }
2306
2307sub set_range { 2390sub set_range {
2308 my ($self, $range) = @_; 2391 my ($self, $range) = @_;
2309 2392
2310 ($range, $self->{range}) = ($self->{range}, $range); 2393 ($range, $self->{range}) = ($self->{range}, $range);
2311 2394
2312 $self->update
2313 if "@$range" ne "@{$self->{range}}"; 2395 if ("@$range" ne "@{$self->{range}}") {
2396 $self->update;
2397 $self->set_value ($self->{range}[0]);
2398 }
2314} 2399}
2315 2400
2316sub set_value { 2401sub set_value {
2317 my ($self, $value) = @_; 2402 my ($self, $value) = @_;
2318 2403
2329 if $unit; 2414 if $unit;
2330 2415
2331 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2416 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2332 2417
2333 if ($value != $old_value) { 2418 if ($value != $old_value) {
2334 $self->_emit (changed => $value); 2419 $self->emit (changed => $value);
2335 $self->update; 2420 $self->update;
2336 } 2421 }
2337} 2422}
2338 2423
2339sub size_request { 2424sub size_request {
2340 my ($self) = @_; 2425 my ($self) = @_;
2341 2426
2342 ($self->{req_w}, $self->{req_h}) 2427 ($self->{req_w}, $self->{req_h})
2343} 2428}
2344 2429
2345sub button_down { 2430sub invoke_button_down {
2346 my ($self, $ev, $x, $y) = @_; 2431 my ($self, $ev, $x, $y) = @_;
2347 2432
2348 $self->SUPER::button_down ($ev, $x, $y); 2433 $self->SUPER::invoke_button_down ($ev, $x, $y);
2349 2434
2350 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2435 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2351 2436
2352 $self->mouse_motion ($ev, $x, $y) 2437 $self->invoke_mouse_motion ($ev, $x, $y)
2353} 2438}
2354 2439
2355sub mouse_motion { 2440sub invoke_mouse_motion {
2356 my ($self, $ev, $x, $y) = @_; 2441 my ($self, $ev, $x, $y) = @_;
2357 2442
2358 if ($GRAB == $self) { 2443 if ($GRAB == $self) {
2359 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2444 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2360 2445
2465sub set_range { shift->{slider}->set_range (@_) } 2550sub set_range { shift->{slider}->set_range (@_) }
2466sub set_value { shift->{slider}->set_value (@_) } 2551sub set_value { shift->{slider}->set_value (@_) }
2467 2552
2468############################################################################# 2553#############################################################################
2469 2554
2470package CFClient::UI::TextView; 2555package CFClient::UI::TextScroller;
2471 2556
2472our @ISA = CFClient::UI::HBox::; 2557our @ISA = CFClient::UI::HBox::;
2473 2558
2474use CFClient::OpenGL; 2559use CFClient::OpenGL;
2475 2560
2502 2587
2503 $self->{fontsize} = $fontsize; 2588 $self->{fontsize} = $fontsize;
2504 $self->reflow; 2589 $self->reflow;
2505} 2590}
2506 2591
2592sub size_request {
2593 my ($self) = @_;
2594
2595 my ($empty, $slider) = @{ $self->{children} };
2596
2597 local $self->{children} = [$empty, $slider];
2598 $self->SUPER::size_request
2599}
2600
2507sub size_allocate { 2601sub invoke_size_allocate {
2508 my ($self, $w, $h) = @_; 2602 my ($self, $w, $h) = @_;
2509 2603
2510 $self->SUPER::size_allocate ($w, $h); 2604 my ($empty, $slider, @other) = @{ $self->{children} };
2605 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2511 2606
2512 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2607 $self->{layout}->set_font ($self->{font}) if $self->{font};
2513 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2608 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2514 $self->{layout}->set_width ($self->{children}[0]{w}); 2609 $self->{layout}->set_width ($empty->{w});
2515 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2610 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2516 2611
2517 $self->reflow; 2612 $self->reflow;
2518}
2519 2613
2520sub text_size { 2614 local $self->{children} = [$empty, $slider];
2521 my ($self, $text, $indent) = @_; 2615 $self->SUPER::invoke_size_allocate ($w, $h)
2616}
2617
2618sub get_layout {
2619 my ($self, $para) = @_;
2522 2620
2523 my $layout = $self->{layout}; 2621 my $layout = $self->{layout};
2524 2622
2623 $layout->set_font ($self->{font}) if $self->{font};
2624 $layout->set_foreground (@{$para->{fg}});
2525 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2625 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2526 $layout->set_width ($self->{children}[0]{w} - $indent); 2626 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2527 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2627 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2528 $layout->set_markup ($text); 2628 $layout->set_markup ($para->{markup});
2629
2630 $layout->set_shapes (
2631 map
2632 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2633 @{$para->{widget}}
2529 2634 );
2635
2530 $layout->size 2636 $layout
2531} 2637}
2532 2638
2533sub reflow { 2639sub reflow {
2534 my ($self) = @_; 2640 my ($self) = @_;
2535 2641
2544 $self->{children}[1]->set_value ($offset); 2650 $self->{children}[1]->set_value ($offset);
2545} 2651}
2546 2652
2547sub clear { 2653sub clear {
2548 my ($self) = @_; 2654 my ($self) = @_;
2655
2656 my (undef, undef, @other) = @{ $self->{children} };
2657 $self->remove ($_) for @other;
2549 2658
2550 $self->{par} = []; 2659 $self->{par} = [];
2551 $self->{height} = 0; 2660 $self->{height} = 0;
2552 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2661 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2553} 2662}
2554 2663
2555sub add_paragraph { 2664sub add_paragraph {
2556 my ($self, $color, $text, $indent) = @_; 2665 my ($self, $color, $para, $indent) = @_;
2557 2666
2558 for my $line (split /\n/, $text) { 2667 my ($text, @w) = ref $para ? @$para : $para;
2559 my ($w, $h) = $self->text_size ($line); 2668
2560 $self->{height} += $h; 2669 $para = {
2561 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2670 w => 1e10,
2671 wrapped => 1,
2672 fg => $color,
2673 indent => $indent,
2674 markup => $text,
2675 widget => \@w,
2562 } 2676 };
2563 2677
2564 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2678 $self->add (@w) if @w;
2679 push @{$self->{par}}, $para;
2680
2681 $self->{need_reflow}++;
2682 $self->update;
2683}
2684
2685sub scroll_to_bottom {
2686 my ($self) = @_;
2687
2688 $self->{scroll_to_bottom} = 1;
2689 $self->update;
2565} 2690}
2566 2691
2567sub update { 2692sub update {
2568 my ($self) = @_; 2693 my ($self) = @_;
2569 2694
2571 2696
2572 return unless $self->{h} > 0; 2697 return unless $self->{h} > 0;
2573 2698
2574 delete $self->{texture}; 2699 delete $self->{texture};
2575 2700
2576 $ROOT->on_post_alloc ($self, sub { 2701 $ROOT->on_post_alloc ($self => sub {
2577 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2702 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2578 2703
2579 if (delete $self->{need_reflow}) { 2704 if (delete $self->{need_reflow}) {
2580 my $height = 0; 2705 my $height = 0;
2581 2706
2582 my $layout = $self->{layout};
2583
2584 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2585
2586 for (@{$self->{par}}) { 2707 for my $para (@{$self->{par}}) {
2587 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2708 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2588 $layout->set_width ($W - $_->[3]); 2709 my $layout = $self->get_layout ($para);
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590 $layout->set_markup ($_->[4]);
2591 my ($w, $h) = $layout->size; 2710 my ($w, $h) = $layout->size;
2592 $_->[0] = $w + $_->[3]; 2711
2593 $_->[1] = $h; 2712 $para->{w} = $w + $para->{indent};
2713 $para->{h} = $h;
2714 $para->{wrapped} = $layout->has_wrapped;
2594 } 2715 }
2595 2716
2596 $height += $_->[1]; 2717 $height += $para->{h};
2597 } 2718 }
2598 2719
2599 $self->{height} = $height; 2720 $self->{height} = $height;
2600 2721
2601 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2722 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2602 2723
2603 delete $self->{texture}; 2724 delete $self->{texture};
2725 }
2726
2727 if (delete $self->{scroll_to_bottom}) {
2728 $self->{children}[1]->set_value (1e10);
2604 } 2729 }
2605 2730
2606 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2731 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2607 glClearColor 0, 0, 0, 0; 2732 glClearColor 0, 0, 0, 0;
2608 glClear GL_COLOR_BUFFER_BIT; 2733 glClear GL_COLOR_BUFFER_BIT;
2612 my $y0 = $top; 2737 my $y0 = $top;
2613 my $y1 = $top + $H; 2738 my $y1 = $top + $H;
2614 2739
2615 my $y = 0; 2740 my $y = 0;
2616 2741
2617 my $layout = $self->{layout};
2618
2619 $layout->set_font ($self->{font}) if $self->{font};
2620
2621 glEnable GL_BLEND; 2742 glEnable GL_BLEND;
2622 #TODO# not correct in windows where rgba is forced off 2743 #TODO# not correct in windows where rgba is forced off
2623 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2744 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2624 2745
2625 for my $par (@{$self->{par}}) { 2746 for my $para (@{$self->{par}}) {
2626 my $h = $par->[1]; 2747 my $h = $para->{h};
2627 2748
2628 if ($y0 < $y + $h && $y < $y1) { 2749 if ($y0 < $y + $h && $y < $y1) {
2629 $layout->set_foreground (@{ $par->[2] }); 2750
2630 $layout->set_width ($W - $par->[3]); 2751 my $layout = $self->get_layout ($para);
2631 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2632 $layout->set_markup ($par->[4]);
2633 2752
2634 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2753 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2635 2754
2636 glRasterPos $par->[3], $y - $y0; 2755 glRasterPos $para->{indent}, $y - $y0;
2637 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2756 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2757
2758 if (my @w = @{ $para->{widget} }) {
2759 my @s = $layout->get_shapes;
2760
2761 glDisable GL_BLEND;
2762 for (@w) {
2763 my ($dx, $dy) = splice @s, 0, 2, ();
2764
2765 $_->{x} = $dx + $para->{indent};
2766 $_->{y} = $dy + $y - $y0;
2767
2768 $_->draw;
2769 }
2770 glEnable GL_BLEND;
2771 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2772 }
2638 } 2773 }
2639 2774
2640 $y += $h; 2775 $y += $h;
2641 } 2776 }
2642 2777
2643 glDisable GL_BLEND; 2778 glDisable GL_BLEND;
2644 }; 2779 };
2645 }); 2780 });
2781}
2782
2783sub reconfigure {
2784 my ($self) = @_;
2785
2786 $self->SUPER::reconfigure;
2787
2788 $_->{w} = 1e10 for @{ $self->{par} };
2789 $self->reflow;
2646} 2790}
2647 2791
2648sub _draw { 2792sub _draw {
2649 my ($self) = @_; 2793 my ($self) = @_;
2650 2794
2653 glColor 0, 0, 0, 1; 2797 glColor 0, 0, 0, 1;
2654 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2798 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2655 glDisable GL_TEXTURE_2D; 2799 glDisable GL_TEXTURE_2D;
2656 2800
2657 $self->{children}[1]->draw; 2801 $self->{children}[1]->draw;
2658
2659} 2802}
2660 2803
2661############################################################################# 2804#############################################################################
2662 2805
2663package CFClient::UI::Animator; 2806package CFClient::UI::Animator;
2750 $tooltip .= "\n\n" . (ref $widget) . "\n" 2893 $tooltip .= "\n\n" . (ref $widget) . "\n"
2751 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2894 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2752 . "req $widget->{req_w} $widget->{req_h}\n" 2895 . "req $widget->{req_w} $widget->{req_h}\n"
2753 . "visible $widget->{visible}"; 2896 . "visible $widget->{visible}";
2754 } 2897 }
2898
2899 $tooltip =~ s/^\n+//;
2900 $tooltip =~ s/\n+$//;
2755 2901
2756 $self->add (new CFClient::UI::Label 2902 $self->add (new CFClient::UI::Label
2757 markup => $tooltip, 2903 markup => $tooltip,
2758 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2904 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2759 fontsize => 0.8, 2905 fontsize => 0.8,
2769 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2915 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2770 2916
2771 ($w + 4, $h + 4) 2917 ($w + 4, $h + 4)
2772} 2918}
2773 2919
2774sub size_allocate { 2920sub invoke_size_allocate {
2775 my ($self, $w, $h) = @_; 2921 my ($self, $w, $h) = @_;
2776 2922
2777 $self->SUPER::size_allocate ($w - 4, $h - 4); 2923 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2778} 2924}
2779 2925
2780sub visibility_change { 2926sub invoke_visibility_change {
2781 my ($self, $visible) = @_; 2927 my ($self, $visible) = @_;
2782 2928
2783 return unless $visible; 2929 return unless $visible;
2784 2930
2785 $self->{root}->on_post_alloc ("move_$self" => sub { 2931 $self->{root}->on_post_alloc ("move_$self" => sub {
2787 or return; 2933 or return;
2788 2934
2789 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2935 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2790 2936
2791 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2937 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2792 if $x + $self->{w} > $::WIDTH; 2938 if $x + $self->{w} > $self->{root}{w};
2793 2939
2794 $self->move_abs ($x, $y); 2940 $self->move_abs ($x, $y);
2795 }); 2941 });
2796} 2942}
2797 2943
2892 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3038 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2893 glDisable GL_TEXTURE_2D; 3039 glDisable GL_TEXTURE_2D;
2894 } 3040 }
2895} 3041}
2896 3042
2897sub DESTROY { 3043sub destroy {
2898 my ($self) = @_; 3044 my ($self) = @_;
2899 3045
2900 $self->{timer}->cancel 3046 $self->{timer}->cancel
2901 if $self->{timer}; 3047 if $self->{timer};
2902 3048
2903 $self->SUPER::DESTROY; 3049 $self->SUPER::destroy;
2904} 3050}
2905 3051
2906############################################################################# 3052#############################################################################
2907 3053
2908package CFClient::UI::Buttonbar; 3054package CFClient::UI::Buttonbar;
2936 # handle various types of items, only text for now 3082 # handle various types of items, only text for now
2937 if (!ref $widget) { 3083 if (!ref $widget) {
2938 $widget = new CFClient::UI::Label 3084 $widget = new CFClient::UI::Label
2939 can_hover => 1, 3085 can_hover => 1,
2940 can_events => 1, 3086 can_events => 1,
2941 text => $widget, 3087 markup => $widget,
2942 tooltip => $tooltip 3088 tooltip => $tooltip
2943 } 3089 }
2944 3090
2945 $self->{item}{$widget} = $item; 3091 $self->{item}{$widget} = $item;
2946 3092
2952 3098
2953# popup given the event (must be a mouse button down event currently) 3099# popup given the event (must be a mouse button down event currently)
2954sub popup { 3100sub popup {
2955 my ($self, $ev) = @_; 3101 my ($self, $ev) = @_;
2956 3102
2957 $self->_emit ("popdown"); 3103 $self->emit ("popdown");
2958 3104
2959 # maybe save $GRAB? must be careful about events... 3105 # maybe save $GRAB? must be careful about events...
2960 $GRAB = $self; 3106 $GRAB = $self;
2961 $self->{button} = $ev->{button}; 3107 $self->{button} = $ev->{button};
2962 3108
2963 $self->show; 3109 $self->show;
2964 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3110 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2965} 3111}
2966 3112
2967sub mouse_motion { 3113sub invoke_mouse_motion {
2968 my ($self, $ev, $x, $y) = @_; 3114 my ($self, $ev, $x, $y) = @_;
2969 3115
2970 # TODO: should use vbox->find_widget or so 3116 # TODO: should use vbox->find_widget or so
2971 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3117 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2972 $self->{hover} = $self->{item}{$HOVER}; 3118 $self->{hover} = $self->{item}{$HOVER};
2973 3119
2974 0 3120 0
2975} 3121}
2976 3122
2977sub button_up { 3123sub invoke_button_up {
2978 my ($self, $ev, $x, $y) = @_; 3124 my ($self, $ev, $x, $y) = @_;
2979 3125
2980 if ($ev->{button} == $self->{button}) { 3126 if ($ev->{button} == $self->{button}) {
2981 undef $GRAB; 3127 undef $GRAB;
2982 $self->hide; 3128 $self->hide;
2983 3129
2984 $self->_emit ("popdown"); 3130 $self->emit ("popdown");
2985 $self->{hover}[1]->() if $self->{hover}; 3131 $self->{hover}[1]->() if $self->{hover};
2986 } else { 3132 } else {
2987 return 0 3133 return 0
2988 } 3134 }
2989 3135
3026 : $self->{children}[$page_or_widget]; 3172 : $self->{children}[$page_or_widget];
3027 3173
3028 $self->{current} = $widget; 3174 $self->{current} = $widget;
3029 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3175 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3030 3176
3031 $self->_emit (page_changed => $self->{current}); 3177 $self->emit (page_changed => $self->{current});
3032 3178
3033 $self->realloc; 3179 $self->realloc;
3034} 3180}
3035 3181
3036sub visible_children { 3182sub visible_children {
3041 my ($self) = @_; 3187 my ($self) = @_;
3042 3188
3043 $self->{current}->size_request 3189 $self->{current}->size_request
3044} 3190}
3045 3191
3046sub size_allocate { 3192sub invoke_size_allocate {
3047 my ($self, $w, $h) = @_; 3193 my ($self, $w, $h) = @_;
3048 3194
3049 $self->{current}->configure (0, 0, $w, $h); 3195 $self->{current}->configure (0, 0, $w, $h);
3196
3197 1
3050} 3198}
3051 3199
3052sub _draw { 3200sub _draw {
3053 my ($self) = @_; 3201 my ($self) = @_;
3054 3202
3093 3241
3094sub set_current_page { 3242sub set_current_page {
3095 my ($self, $page) = @_; 3243 my ($self, $page) = @_;
3096 3244
3097 $self->{multiplexer}->set_current_page ($page); 3245 $self->{multiplexer}->set_current_page ($page);
3098 $self->_emit (page_changed => $self->{multiplexer}{current}); 3246 $self->emit (page_changed => $self->{multiplexer}{current});
3099} 3247}
3100 3248
3101############################################################################# 3249#############################################################################
3102 3250
3103package CFClient::UI::Combobox; 3251package CFClient::UI::Combobox;
3108 3256
3109sub new { 3257sub new {
3110 my $class = shift; 3258 my $class = shift;
3111 3259
3112 my $self = $class->SUPER::new ( 3260 my $self = $class->SUPER::new (
3113 options => [], # [title, value, tooltip], ... 3261 options => [], # [value, title, longdesc], ...
3114 value => undef, 3262 value => undef,
3115 @_, 3263 @_,
3116 ); 3264 );
3117 3265
3118 $self->_set_value ($self->{value}); 3266 $self->_set_value ($self->{value});
3119 3267
3120 $self 3268 $self
3121} 3269}
3122 3270
3123sub button_down { 3271sub invoke_button_down {
3124 my ($self, $ev) = @_; 3272 my ($self, $ev) = @_;
3125 3273
3126 my @menu_items; 3274 my @menu_items;
3127 3275
3128 for (@{ $self->{options} }) { 3276 for (@{ $self->{options} }) {
3129 my ($title, $value, $tooltip) = @$_; 3277 my ($value, $title, $tooltip) = @$_;
3130 3278
3131 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 3279 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3132 } 3280 }
3133 3281
3134 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3282 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3135} 3283}
3136 3284
3137sub _set_value { 3285sub _set_value {
3138 my ($self, $value) = @_; 3286 my ($self, $value) = @_;
3139 3287
3140 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 3288 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3141 or return; 3289 or return;
3142 3290
3143 $self->{value} = $item->[1]; 3291 $self->{value} = $item->[0];
3144 $self->set_markup ("$item->[0] ⇓"); 3292 $self->set_markup ("$item->[1] ⇓");
3145 $self->set_tooltip ($item->[2]); 3293 $self->set_tooltip ($item->[2]);
3146} 3294}
3147 3295
3148sub set_value { 3296sub set_value {
3149 my ($self, $value) = @_; 3297 my ($self, $value) = @_;
3150 3298
3151 return unless $self->{value} ne $value; 3299 return unless $self->{value} ne $value;
3152 3300
3153 $self->_set_value ($value); 3301 $self->_set_value ($value);
3154 $self->_emit (changed => $value); 3302 $self->emit (changed => $value);
3155} 3303}
3156 3304
3157############################################################################# 3305#############################################################################
3158 3306
3159package CFClient::UI::Statusbox; 3307package CFClient::UI::Statusbox;
3258 $item->{count}++; 3406 $item->{count}++;
3259 } else { 3407 } else {
3260 $item->{count} = 1; 3408 $item->{count} = 1;
3261 $item->{text} = $item->{tooltip} = $text; 3409 $item->{text} = $item->{tooltip} = $text;
3262 } 3410 }
3263 $item->{id} = ++$self->{id}; 3411 $item->{id} += 0.2;#d#
3264 $item->{timeout} = $timeout; 3412 $item->{timeout} = $timeout;
3265 delete $item->{label}; 3413 delete $item->{label};
3266 } else { 3414 } else {
3267 $self->{item}{$group} = { 3415 $self->{item}{$group} = {
3268 id => ++$self->{id}, 3416 id => ++$self->{id},
3274 count => 1, 3422 count => 1,
3275 %arg, 3423 %arg,
3276 }; 3424 };
3277 } 3425 }
3278 3426
3427 $ROOT->on_refresh (reorder => sub {
3279 $self->reorder; 3428 $self->reorder;
3429 });
3280} 3430}
3281 3431
3282sub reconfigure { 3432sub reconfigure {
3283 my ($self) = @_; 3433 my ($self) = @_;
3284 3434
3287 3437
3288 $self->reorder; 3438 $self->reorder;
3289 $self->SUPER::reconfigure; 3439 $self->SUPER::reconfigure;
3290} 3440}
3291 3441
3292sub DESTROY { 3442sub destroy {
3293 my ($self) = @_; 3443 my ($self) = @_;
3294 3444
3295 $self->{timer}->cancel; 3445 $self->{timer}->cancel;
3296 3446
3297 $self->SUPER::DESTROY; 3447 $self->SUPER::destroy;
3298} 3448}
3299 3449
3300############################################################################# 3450#############################################################################
3301 3451
3302package CFClient::UI::Inventory; 3452package CFClient::UI::Inventory;
3303 3453
3304our @ISA = CFClient::UI::ScrolledWindow::; 3454our @ISA = CFClient::UI::Table::;
3305 3455
3306sub new { 3456sub new {
3307 my $class = shift; 3457 my $class = shift;
3308 3458
3309 my $self = $class->SUPER::new ( 3459 my $self = $class->SUPER::new (
3310 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3460 col_expand => [0, 1, 0],
3311 @_, 3461 @_,
3312 ); 3462 );
3313 3463
3314 $self 3464 $self
3315} 3465}
3316 3466
3317sub set_items { 3467sub set_items {
3318 my ($self, $items) = @_; 3468 my ($self, $items) = @_;
3319 3469
3320 $self->{child}->clear; 3470 $self->clear;
3321 return unless $items; 3471 return unless $items;
3322 3472
3323 my @items = sort { 3473 my @items = sort {
3324 ($a->{type} <=> $b->{type}) 3474 ($a->{type} <=> $b->{type})
3325 or ($a->{name} cmp $b->{name}) 3475 or ($a->{name} cmp $b->{name})
3326 } @$items; 3476 } values %$items;
3327 3477
3328 $self->{real_items} = \@items; 3478 $self->{real_items} = \@items;
3329 3479
3330 my $row = 0; 3480 my $row = 0;
3331 for my $item (@items) { 3481 for my $item (@items) {
3332 CFClient::Item::update_widgets $item; 3482 CFClient::Item::update_widgets $item;
3333 3483
3334 $self->{child}->add (0, $row, $item->{face_widget}); 3484 $self->add (0, $row, $item->{face_widget});
3335 $self->{child}->add (1, $row, $item->{desc_widget}); 3485 $self->add (1, $row, $item->{desc_widget});
3336 $self->{child}->add (2, $row, $item->{weight_widget}); 3486 $self->add (2, $row, $item->{weight_widget});
3337 3487
3338 $row++; 3488 $row++;
3339 }
3340}
3341
3342#############################################################################
3343
3344package CFClient::UI::BindEditor;
3345
3346our @ISA = CFClient::UI::FancyFrame::;
3347
3348sub new {
3349 my $class = shift;
3350
3351 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3352
3353 $self->add (my $vb = new CFClient::UI::VBox);
3354
3355
3356 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3357 text => "start recording",
3358 tooltip => "Start/Stops recording of actions."
3359 ."All subsequent actions after the recording started will be captured."
3360 ."The actions are displayed after the record was stopped."
3361 ."To bind the action you have to click on the 'Bind' button",
3362 on_activate => sub {
3363 unless ($self->{recording}) {
3364 $self->start;
3365 } else {
3366 $self->stop;
3367 }
3368 });
3369
3370 $vb->add (new CFClient::UI::Label text => "Actions:");
3371 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3372
3373 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3374 $vb->add (my $hb = new CFClient::UI::HBox);
3375 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3376 $hb->add (new CFClient::UI::Button
3377 text => "bind",
3378 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3379 on_activate => sub {
3380 $self->ask_for_bind;
3381 });
3382
3383 $vb->add (my $hb = new CFClient::UI::HBox);
3384 $hb->add (new CFClient::UI::Button
3385 text => "ok",
3386 expand => 1,
3387 tooltip => "This closes the binding editor and saves the binding",
3388 on_activate => sub {
3389 $self->hide;
3390 $self->commit;
3391 });
3392
3393 $hb->add (new CFClient::UI::Button
3394 text => "cancel",
3395 expand => 1,
3396 tooltip => "This closes the binding editor without saving",
3397 on_activate => sub {
3398 $self->hide;
3399 $self->{binding_cancel}->()
3400 if $self->{binding_cancel};
3401 });
3402
3403 $self->update_binding_widgets;
3404
3405 $self
3406}
3407
3408sub commit {
3409 my ($self) = @_;
3410 my ($mod, $sym, $cmds) = $self->get_binding;
3411 if ($sym != 0 && @$cmds > 0) {
3412 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3413 ."'. Don't forget 'Save Config'!");
3414 $self->{binding_change}->($mod, $sym, $cmds)
3415 if $self->{binding_change};
3416 } else {
3417 $::STATUSBOX->add ("No action bound, no key or action specified!");
3418 $self->{binding_cancel}->()
3419 if $self->{binding_cancel};
3420 }
3421}
3422
3423sub start {
3424 my ($self) = @_;
3425
3426 $self->{rec_btn}->set_text ("stop recording");
3427 $self->{recording} = 1;
3428 $self->clear_command_list;
3429 $::CONN->start_record if $::CONN;
3430}
3431
3432sub stop {
3433 my ($self) = @_;
3434
3435 $self->{rec_btn}->set_text ("start recording");
3436 $self->{recording} = 0;
3437
3438 my $rec;
3439 $rec = $::CONN->stop_record if $::CONN;
3440 return unless ref $rec eq 'ARRAY';
3441 $self->set_command_list ($rec);
3442}
3443
3444
3445sub ask_for_bind_and_commit {
3446 my ($self) = @_;
3447 $self->ask_for_bind (1);
3448}
3449
3450sub ask_for_bind {
3451 my ($self, $commit) = @_;
3452
3453 CFClient::Binder::open_binding_dialog (sub {
3454 my ($mod, $sym) = @_;
3455 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3456 $self->update_binding_widgets;
3457 $self->commit if $commit;
3458 });
3459}
3460
3461# $mod and $sym are the modifiers and key symbol
3462# $cmds is a array ref of strings (the commands)
3463# $cb is the callback that is executed on OK
3464# $ccb is the callback that is executed on CANCEL and
3465# when the binding was unsuccessful on OK
3466sub set_binding {
3467 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3468
3469 $self->clear_command_list;
3470 $self->{recording} = 0;
3471 $self->{rec_btn}->set_text ("start recording");
3472
3473 $self->{binding} = [$mod, $sym];
3474 $self->{commands} = $cmds;
3475
3476 $self->{binding_change} = $cb;
3477 $self->{binding_cancel} = $ccb;
3478
3479 $self->update_binding_widgets;
3480}
3481
3482# this is a shortcut method that asks for a binding
3483# and then just binds it.
3484sub do_quick_binding {
3485 my ($self, $cmds) = @_;
3486 $self->set_binding (undef, undef, $cmds, sub {
3487 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3488 });
3489 $self->ask_for_bind (1);
3490}
3491
3492sub update_binding_widgets {
3493 my ($self) = @_;
3494 my ($mod, $sym, $cmds) = $self->get_binding;
3495 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3496 $self->set_command_list ($cmds);
3497}
3498
3499sub get_binding {
3500 my ($self) = @_;
3501 return (
3502 $self->{binding}->[0],
3503 $self->{binding}->[1],
3504 [ grep { defined $_ } @{$self->{commands}} ]
3505 );
3506}
3507
3508sub clear_command_list {
3509 my ($self) = @_;
3510 $self->{cmdbox}->clear ();
3511}
3512
3513sub set_command_list {
3514 my ($self, $cmds) = @_;
3515
3516 $self->{cmdbox}->clear ();
3517 $self->{commands} = $cmds;
3518
3519 my $idx = 0;
3520
3521 for (@$cmds) {
3522 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3523
3524 my $i = $idx;
3525 $hb->add (new CFClient::UI::Label text => $_);
3526 $hb->add (new CFClient::UI::Button
3527 text => "delete",
3528 tooltip => "Deletes the action from the record",
3529 on_activate => sub {
3530 $self->{cmdbox}->remove ($hb);
3531 $cmds->[$i] = undef;
3532 });
3533
3534
3535 $idx++
3536 } 3489 }
3537} 3490}
3538 3491
3539############################################################################# 3492#############################################################################
3540 3493
3550 commands => [], 3503 commands => [],
3551 @_, 3504 @_,
3552 ) 3505 )
3553} 3506}
3554 3507
3508my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3509
3510my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3511 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3512my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3513 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3555my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => 3514my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3556 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell."); 3515 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3557my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => 3516my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation."); 3517 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3559my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => 3518my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<b>Damage</b>. The amount of damage the spell deals when it hits."); 3519 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3561 3520
3562sub rebuild_spell_list { 3521sub rebuild_spell_list {
3563 my ($self) = @_; 3522 my ($self) = @_;
3564 3523
3565 $CFClient::UI::ROOT->on_refresh ($self => sub { 3524 $CFClient::UI::ROOT->on_refresh ($self => sub {
3566 $self->clear; 3525 $self->clear;
3567 3526
3527 return unless $::CONN;
3528
3568 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name"); 3529 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3530 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3569 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3531 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3570 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3532 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3571 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3533 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3572 3534
3573 my $row = 0; 3535 my $row = 0;
3574 3536
3575 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3537 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3576 my $spell = $self->{spell}{$_}; 3538 my $spell = $self->{spell}{$_};
3577 3539
3578 $row++; 3540 $row++;
3541
3542 my $spell_cb = sub {
3543 my ($widget, $ev) = @_;
3544
3545 if ($ev->{button} == 1) {
3546 $::CONN->user_send ("cast $spell->{name}");
3547 } elsif ($ev->{button} == 2) {
3548 $::CONN->user_send ("invoke $spell->{name}");
3549 } elsif ($ev->{button} == 3) {
3550 (new CFClient::UI::Menu
3551 items => [
3552 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3553 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3554 ],
3555 )->popup ($ev);
3556 } else {
3557 return 0;
3558 }
3559
3560 1
3561 };
3562
3563 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3564
3565 #TODO: add path info to tooltip
3566 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3579 3567
3580 $self->add (0, $row, new CFClient::UI::Face 3568 $self->add (0, $row, new CFClient::UI::Face
3581 face => $spell->{face}, 3569 face => $spell->{face},
3582 can_hover => 1, 3570 can_hover => 1,
3583 can_events => 1, 3571 can_events => 1,
3584 tooltip => $spell->{message}, 3572 tooltip => $tooltip,
3573 on_button_down => $spell_cb,
3585 ); 3574 );
3586 3575
3587 $self->add (1, $row, new CFClient::UI::Label 3576 $self->add (1, $row, new CFClient::UI::Label
3588 expand => 1, 3577 expand => 1,
3589 text => $spell->{name}, 3578 text => $spell->{name},
3590 can_hover => 1, 3579 can_hover => 1,
3591 can_events => 1, 3580 can_events => 1,
3592 tooltip => $spell->{message}, 3581 tooltip => $tooltip,
3582 on_button_down => $spell_cb,
3593 ); 3583 );
3594 3584
3585 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3595 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3586 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3596 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3587 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3597 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3588 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3598
3599 # TODO: should be done via popup
3600 $self->add (5, $row, new CFClient::UI::Button
3601 text => "bind",
3602 tooltip => "bind spell readying (cast command) to key",
3603 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3604 );
3605 } 3589 }
3606 }); 3590 });
3607} 3591}
3608 3592
3609sub add_spell { 3593sub add_spell {
3615 3599
3616sub remove_spell { 3600sub remove_spell {
3617 my ($self, $spell) = @_; 3601 my ($self, $spell) = @_;
3618 3602
3619 delete $self->{spell}->{$spell->{name}}; 3603 delete $self->{spell}->{$spell->{name}};
3604 $self->rebuild_spell_list;
3605}
3606
3607sub clear_spells {
3608 my ($self) = @_;
3609
3610 $self->{spell} = {};
3620 $self->rebuild_spell_list; 3611 $self->rebuild_spell_list;
3621} 3612}
3622 3613
3623############################################################################# 3614#############################################################################
3624 3615
3661 $coord = $max - $size if $coord > $max - $size; 3652 $coord = $max - $size if $coord > $max - $size;
3662 3653
3663 int $coord + 0.5 3654 int $coord + 0.5
3664} 3655}
3665 3656
3666sub size_allocate { 3657sub invoke_size_allocate {
3667 my ($self, $w, $h) = @_; 3658 my ($self, $w, $h) = @_;
3668 3659
3669 for my $child ($self->children) { 3660 for my $child ($self->children) {
3670 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3661 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3671 3662
3675 $X = _to_pixel $X, $W, $self->{w}; 3666 $X = _to_pixel $X, $W, $self->{w};
3676 $Y = _to_pixel $Y, $H, $self->{h}; 3667 $Y = _to_pixel $Y, $H, $self->{h};
3677 3668
3678 $child->configure ($X, $Y, $W, $H); 3669 $child->configure ($X, $Y, $W, $H);
3679 } 3670 }
3671
3672 1
3680} 3673}
3681 3674
3682sub coord2local { 3675sub coord2local {
3683 my ($self, $x, $y) = @_; 3676 my ($self, $x, $y) = @_;
3684 3677

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines