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.291 by root, Tue Jun 6 02:55:50 2006 UTC vs.
Revision 1.319 by root, Sun Jul 2 21:07:26 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
1658 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $tex->{h}) * 0.5);
1659 }; 1705 };
1660 1706
1661 glEnable GL_TEXTURE_2D; 1707 glEnable GL_TEXTURE_2D;
1662 1708
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1711
1663 if ($tex->{format} == GL_ALPHA) { 1712 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665 glColor @{$self->{fg}}; 1714 glColor @{$self->{fg}};
1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1667 } else { 1716 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1670 } 1719 }
1671 1720
1672 glDisable GL_TEXTURE_2D; 1721 glDisable GL_TEXTURE_2D;
1673} 1722}
1674 1723
1710 1759
1711 $text =~ s/./*/g if $self->{hidden}; 1760 $text =~ s/./*/g if $self->{hidden};
1712 $self->{layout}->set_text ("$text "); 1761 $self->{layout}->set_text ("$text ");
1713 delete $self->{size_req}; 1762 delete $self->{size_req};
1714 1763
1715 $self->_emit (changed => $self->{text}); 1764 $self->emit (changed => $self->{text});
1716 1765
1717 $self->realloc; 1766 $self->realloc;
1718 $self->update; 1767 $self->update;
1719} 1768}
1720 1769
1735 my ($w, $h) = $self->SUPER::size_request; 1784 my ($w, $h) = $self->SUPER::size_request;
1736 1785
1737 ($w + 1, $h) # add 1 for cursor 1786 ($w + 1, $h) # add 1 for cursor
1738} 1787}
1739 1788
1740sub key_down { 1789sub invoke_key_down {
1741 my ($self, $ev) = @_; 1790 my ($self, $ev) = @_;
1742 1791
1743 my $mod = $ev->{mod}; 1792 my $mod = $ev->{mod};
1744 my $sym = $ev->{sym}; 1793 my $sym = $ev->{sym};
1745 my $uni = $ev->{unicode}; 1794 my $uni = $ev->{unicode};
1757 } elsif ($sym == CFClient::SDLK_HOME) { 1806 } elsif ($sym == CFClient::SDLK_HOME) {
1758 $self->{cursor} = 0; 1807 $self->{cursor} = 0;
1759 } elsif ($sym == CFClient::SDLK_END) { 1808 } elsif ($sym == CFClient::SDLK_END) {
1760 $self->{cursor} = length $text; 1809 $self->{cursor} = length $text;
1761 } elsif ($uni == 27) { 1810 } elsif ($uni == 27) {
1762 $self->_emit ('escape'); 1811 $self->emit ('escape');
1763 } elsif ($uni) { 1812 } elsif ($uni) {
1764 substr $text, $self->{cursor}++, 0, chr $uni; 1813 substr $text, $self->{cursor}++, 0, chr $uni;
1765 } else { 1814 } else {
1766 return 0; 1815 return 0;
1767 } 1816 }
1771 $self->realloc; 1820 $self->realloc;
1772 1821
1773 1 1822 1
1774} 1823}
1775 1824
1776sub focus_in { 1825sub invoke_focus_in {
1777 my ($self) = @_; 1826 my ($self) = @_;
1778 1827
1779 $self->{last_activity} = $::NOW; 1828 $self->{last_activity} = $::NOW;
1780 1829
1781 $self->SUPER::focus_in; 1830 $self->SUPER::invoke_focus_in
1782} 1831}
1783 1832
1784sub button_down { 1833sub invoke_button_down {
1785 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1786 1835
1787 $self->SUPER::button_down ($ev, $x, $y); 1836 $self->SUPER::invoke_button_down ($ev, $x, $y);
1788 1837
1789 my $idx = $self->{layout}->xy_to_index ($x, $y); 1838 my $idx = $self->{layout}->xy_to_index ($x, $y);
1790 1839
1791 # byte-index to char-index 1840 # byte-index to char-index
1792 my $text = $self->{text}; 1841 my $text = $self->{text};
1797 $self->update; 1846 $self->update;
1798 1847
1799 1 1848 1
1800} 1849}
1801 1850
1802sub mouse_motion { 1851sub invoke_mouse_motion {
1803 my ($self, $ev, $x, $y) = @_; 1852 my ($self, $ev, $x, $y) = @_;
1804# 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#
1805 1854
1806 0 1855 1
1807} 1856}
1808 1857
1809sub _draw { 1858sub _draw {
1810 my ($self) = @_; 1859 my ($self) = @_;
1811 1860
1852 1901
1853our @ISA = CFClient::UI::EntryBase::; 1902our @ISA = CFClient::UI::EntryBase::;
1854 1903
1855use CFClient::OpenGL; 1904use CFClient::OpenGL;
1856 1905
1857sub key_down { 1906sub invoke_key_down {
1858 my ($self, $ev) = @_; 1907 my ($self, $ev) = @_;
1859 1908
1860 my $sym = $ev->{sym}; 1909 my $sym = $ev->{sym};
1861 1910
1862 if ($sym == 13) { 1911 if ($sym == 13) {
1863 unshift @{$self->{history}}, 1912 unshift @{$self->{history}},
1864 my $txt = $self->get_text; 1913 my $txt = $self->get_text;
1914
1865 $self->{history_pointer} = -1; 1915 $self->{history_pointer} = -1;
1866 $self->{history_saveback} = ''; 1916 $self->{history_saveback} = '';
1867 $self->_emit (activate => $txt); 1917 $self->emit (activate => $txt);
1868 $self->update; 1918 $self->update;
1869 1919
1870 } elsif ($sym == CFClient::SDLK_UP) { 1920 } elsif ($sym == CFClient::SDLK_UP) {
1871 if ($self->{history_pointer} < 0) { 1921 if ($self->{history_pointer} < 0) {
1872 $self->{history_saveback} = $self->get_text; 1922 $self->{history_saveback} = $self->get_text;
1888 } else { 1938 } else {
1889 $self->set_text ($self->{history_saveback}); 1939 $self->set_text ($self->{history_saveback});
1890 } 1940 }
1891 1941
1892 } else { 1942 } else {
1893 return $self->SUPER::key_down ($ev) 1943 return $self->SUPER::invoke_key_down ($ev)
1894 } 1944 }
1895 1945
1896 1 1946 1
1897} 1947}
1898 1948
1922 can_events => 1, 1972 can_events => 1,
1923 @_ 1973 @_
1924 ) 1974 )
1925} 1975}
1926 1976
1927sub activate { }
1928
1929sub button_up { 1977sub invoke_button_up {
1930 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1931 1979
1932 $self->emit ("activate") 1980 $self->emit ("activate")
1933 if $x >= 0 && $x < $self->{w} 1981 if $x >= 0 && $x < $self->{w}
1934 && $y >= 0 && $y < $self->{h}; 1982 && $y >= 0 && $y < $self->{h};
1948 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1996 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1949 1997
1950 glDisable GL_TEXTURE_2D; 1998 glDisable GL_TEXTURE_2D;
1951 1999
1952 $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
1953} 2037}
1954 2038
1955############################################################################# 2039#############################################################################
1956 2040
1957package CFClient::UI::CheckBox; 2041package CFClient::UI::CheckBox;
1984 my ($self) = @_; 2068 my ($self) = @_;
1985 2069
1986 (6) x 2 2070 (6) x 2
1987} 2071}
1988 2072
2073sub toggle {
2074 my ($self) = @_;
2075
2076 $self->{state} = !$self->{state};
2077 $self->emit (changed => $self->{state});
2078 $self->update;
2079}
2080
1989sub button_down { 2081sub invoke_button_down {
1990 my ($self, $ev, $x, $y) = @_; 2082 my ($self, $ev, $x, $y) = @_;
1991 2083
1992 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2084 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1993 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2085 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1994 $self->{state} = !$self->{state}; 2086 $self->toggle;
1995 $self->_emit (changed => $self->{state});
1996 } else { 2087 } else {
1997 return 0 2088 return 0
1998 } 2089 }
1999 2090
2000 1 2091 1
2025package CFClient::UI::Image; 2116package CFClient::UI::Image;
2026 2117
2027our @ISA = CFClient::UI::Base::; 2118our @ISA = CFClient::UI::Base::;
2028 2119
2029use CFClient::OpenGL; 2120use CFClient::OpenGL;
2030use Carp qw/confess/;
2031 2121
2032our %loaded_images; 2122our %texture_cache;
2033 2123
2034sub new { 2124sub new {
2035 my $class = shift; 2125 my $class = shift;
2036 2126
2037 my $self = $class->SUPER::new (can_events => 0, @_); 2127 my $self = $class->SUPER::new (
2128 can_events => 0,
2129 @_,
2130 );
2038 2131
2039 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2132 $self->{path}
2133 or Carp::croak "required attribute 'path' not set";
2040 2134
2041 $loaded_images{$self->{image}} ||= 2135 $self->{tex} = $texture_cache{$self->{path}} ||=
2042 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2136 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2043 2137
2044 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2138 Scalar::Util::weaken $texture_cache{$self->{path}};
2045 2139
2046 Scalar::Util::weaken $loaded_images{$self->{image}}; 2140 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2047
2048 $self->{aspect} = $tex->{w} / $tex->{h};
2049 2141
2050 $self 2142 $self
2051} 2143}
2052 2144
2053sub size_request { 2145sub size_request {
2054 my ($self) = @_; 2146 my ($self) = @_;
2055 2147
2056 ($self->{tex}->{w}, $self->{tex}->{h}) 2148 ($self->{tex}{w}, $self->{tex}{h})
2057} 2149}
2058 2150
2059sub _draw { 2151sub _draw {
2060 my ($self) = @_; 2152 my ($self) = @_;
2061 2153
2170 my $ycut1 = max 0, min 1, $ycut; 2262 my $ycut1 = max 0, min 1, $ycut;
2171 my $ycut2 = max 0, min 1, $ycut - 1; 2263 my $ycut2 = max 0, min 1, $ycut - 1;
2172 2264
2173 my $h1 = $self->{h} * (1 - $ycut1); 2265 my $h1 = $self->{h} * (1 - $ycut1);
2174 my $h2 = $self->{h} * (1 - $ycut2); 2266 my $h2 = $self->{h} * (1 - $ycut2);
2267 my $h3 = $self->{h};
2268
2269 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2175 2270
2176 glEnable GL_BLEND; 2271 glEnable GL_BLEND;
2177 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2272 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2178 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2273 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2179 glEnable GL_TEXTURE_2D; 2274 glEnable GL_TEXTURE_2D;
2198 2293
2199 if ($t3) { 2294 if ($t3) {
2200 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2295 glBindTexture GL_TEXTURE_2D, $t3->{name};
2201 glBegin GL_QUADS; 2296 glBegin GL_QUADS;
2202 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2297 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2203 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2298 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2204 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2299 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2205 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2300 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2206 glEnd; 2301 glEnd;
2207 } 2302 }
2208 2303
2209 glDisable GL_BLEND; 2304 glDisable GL_BLEND;
2297 $self->update; 2392 $self->update;
2298 2393
2299 $self 2394 $self
2300} 2395}
2301 2396
2302sub changed { }
2303
2304sub set_range { 2397sub set_range {
2305 my ($self, $range) = @_; 2398 my ($self, $range) = @_;
2306 2399
2307 ($range, $self->{range}) = ($self->{range}, $range); 2400 ($range, $self->{range}) = ($self->{range}, $range);
2308 2401
2309 $self->update
2310 if "@$range" ne "@{$self->{range}}"; 2402 if ("@$range" ne "@{$self->{range}}") {
2403 $self->update;
2404 $self->set_value ($self->{range}[0]);
2405 }
2311} 2406}
2312 2407
2313sub set_value { 2408sub set_value {
2314 my ($self, $value) = @_; 2409 my ($self, $value) = @_;
2315 2410
2326 if $unit; 2421 if $unit;
2327 2422
2328 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2423 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2329 2424
2330 if ($value != $old_value) { 2425 if ($value != $old_value) {
2331 $self->_emit (changed => $value); 2426 $self->emit (changed => $value);
2332 $self->update; 2427 $self->update;
2333 } 2428 }
2334} 2429}
2335 2430
2336sub size_request { 2431sub size_request {
2337 my ($self) = @_; 2432 my ($self) = @_;
2338 2433
2339 ($self->{req_w}, $self->{req_h}) 2434 ($self->{req_w}, $self->{req_h})
2340} 2435}
2341 2436
2342sub button_down { 2437sub invoke_button_down {
2343 my ($self, $ev, $x, $y) = @_; 2438 my ($self, $ev, $x, $y) = @_;
2344 2439
2345 $self->SUPER::button_down ($ev, $x, $y); 2440 $self->SUPER::invoke_button_down ($ev, $x, $y);
2346 2441
2347 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2442 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2348 2443
2349 $self->mouse_motion ($ev, $x, $y) 2444 $self->invoke_mouse_motion ($ev, $x, $y)
2350} 2445}
2351 2446
2352sub mouse_motion { 2447sub invoke_mouse_motion {
2353 my ($self, $ev, $x, $y) = @_; 2448 my ($self, $ev, $x, $y) = @_;
2354 2449
2355 if ($GRAB == $self) { 2450 if ($GRAB == $self) {
2356 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2451 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2357 2452
2462sub set_range { shift->{slider}->set_range (@_) } 2557sub set_range { shift->{slider}->set_range (@_) }
2463sub set_value { shift->{slider}->set_value (@_) } 2558sub set_value { shift->{slider}->set_value (@_) }
2464 2559
2465############################################################################# 2560#############################################################################
2466 2561
2467package CFClient::UI::TextView; 2562package CFClient::UI::TextScroller;
2468 2563
2469our @ISA = CFClient::UI::HBox::; 2564our @ISA = CFClient::UI::HBox::;
2470 2565
2471use CFClient::OpenGL; 2566use CFClient::OpenGL;
2472 2567
2474 my $class = shift; 2569 my $class = shift;
2475 2570
2476 my $self = $class->SUPER::new ( 2571 my $self = $class->SUPER::new (
2477 fontsize => 1, 2572 fontsize => 1,
2478 can_events => 0, 2573 can_events => 0,
2574 indent => 0,
2479 #font => default_font 2575 #font => default_font
2480 @_, 2576 @_,
2481 2577
2482 layout => (new CFClient::Layout 1), 2578 layout => (new CFClient::Layout 1),
2483 par => [], 2579 par => [],
2498 2594
2499 $self->{fontsize} = $fontsize; 2595 $self->{fontsize} = $fontsize;
2500 $self->reflow; 2596 $self->reflow;
2501} 2597}
2502 2598
2599sub size_request {
2600 my ($self) = @_;
2601
2602 my ($empty, $slider) = @{ $self->{children} };
2603
2604 local $self->{children} = [$empty, $slider];
2605 $self->SUPER::size_request
2606}
2607
2503sub size_allocate { 2608sub invoke_size_allocate {
2504 my ($self, $w, $h) = @_; 2609 my ($self, $w, $h) = @_;
2505 2610
2506 $self->SUPER::size_allocate ($w, $h); 2611 my ($empty, $slider, @other) = @{ $self->{children} };
2612 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2507 2613
2508 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2614 $self->{layout}->set_font ($self->{font}) if $self->{font};
2509 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2510 $self->{layout}->set_width ($self->{children}[0]{w}); 2616 $self->{layout}->set_width ($empty->{w});
2617 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2511 2618
2512 $self->reflow; 2619 $self->reflow;
2513}
2514 2620
2515sub text_size { 2621 local $self->{children} = [$empty, $slider];
2516 my ($self, $text, $indent) = @_; 2622 $self->SUPER::invoke_size_allocate ($w, $h)
2623}
2624
2625sub get_layout {
2626 my ($self, $para) = @_;
2517 2627
2518 my $layout = $self->{layout}; 2628 my $layout = $self->{layout};
2519 2629
2630 $layout->set_font ($self->{font}) if $self->{font};
2631 $layout->set_foreground (@{$para->{fg}});
2520 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2632 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $layout->set_width ($self->{children}[0]{w} - $indent); 2633 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2634 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2522 $layout->set_markup ($text); 2635 $layout->set_markup ($para->{markup});
2636
2637 $layout->set_shapes (
2638 map
2639 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2640 @{$para->{widget}}
2523 2641 );
2642
2524 $layout->size 2643 $layout
2525} 2644}
2526 2645
2527sub reflow { 2646sub reflow {
2528 my ($self) = @_; 2647 my ($self) = @_;
2529 2648
2538 $self->{children}[1]->set_value ($offset); 2657 $self->{children}[1]->set_value ($offset);
2539} 2658}
2540 2659
2541sub clear { 2660sub clear {
2542 my ($self) = @_; 2661 my ($self) = @_;
2662
2663 my (undef, undef, @other) = @{ $self->{children} };
2664 $self->remove ($_) for @other;
2543 2665
2544 $self->{par} = []; 2666 $self->{par} = [];
2545 $self->{height} = 0; 2667 $self->{height} = 0;
2546 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2668 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2547} 2669}
2548 2670
2549sub add_paragraph { 2671sub add_paragraph {
2550 my ($self, $color, $text, $indent) = @_; 2672 my ($self, $color, $para, $indent) = @_;
2551 2673
2552 for my $line (split /\n/, $text) { 2674 my ($text, @w) = ref $para ? @$para : $para;
2553 my ($w, $h) = $self->text_size ($line); 2675
2554 $self->{height} += $h; 2676 $para = {
2555 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2677 w => 1e10,
2678 wrapped => 1,
2679 fg => $color,
2680 indent => $indent,
2681 markup => $text,
2682 widget => \@w,
2556 } 2683 };
2557 2684
2558 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2685 $self->add (@w) if @w;
2686 push @{$self->{par}}, $para;
2687
2688 $self->{need_reflow}++;
2689 $self->update;
2690}
2691
2692sub scroll_to_bottom {
2693 my ($self) = @_;
2694
2695 $self->{scroll_to_bottom} = 1;
2696 $self->update;
2559} 2697}
2560 2698
2561sub update { 2699sub update {
2562 my ($self) = @_; 2700 my ($self) = @_;
2563 2701
2565 2703
2566 return unless $self->{h} > 0; 2704 return unless $self->{h} > 0;
2567 2705
2568 delete $self->{texture}; 2706 delete $self->{texture};
2569 2707
2570 $ROOT->on_post_alloc ($self, sub { 2708 $ROOT->on_post_alloc ($self => sub {
2571 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2709 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2572 2710
2573 if (delete $self->{need_reflow}) { 2711 if (delete $self->{need_reflow}) {
2574 my $height = 0; 2712 my $height = 0;
2575 2713
2576 my $layout = $self->{layout};
2577
2578 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2579
2580 for (@{$self->{par}}) { 2714 for my $para (@{$self->{par}}) {
2581 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2715 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2582 $layout->set_width ($W - $_->[3]); 2716 my $layout = $self->get_layout ($para);
2583 $layout->set_markup ($_->[4]);
2584 my ($w, $h) = $layout->size; 2717 my ($w, $h) = $layout->size;
2585 $_->[0] = $w + $_->[3]; 2718
2586 $_->[1] = $h; 2719 $para->{w} = $w + $para->{indent};
2720 $para->{h} = $h;
2721 $para->{wrapped} = $layout->has_wrapped;
2587 } 2722 }
2588 2723
2589 $height += $_->[1]; 2724 $height += $para->{h};
2590 } 2725 }
2591 2726
2592 $self->{height} = $height; 2727 $self->{height} = $height;
2593 2728
2594 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2729 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2595 2730
2596 delete $self->{texture}; 2731 delete $self->{texture};
2732 }
2733
2734 if (delete $self->{scroll_to_bottom}) {
2735 $self->{children}[1]->set_value (1e10);
2597 } 2736 }
2598 2737
2599 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2738 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2600 glClearColor 0, 0, 0, 0; 2739 glClearColor 0, 0, 0, 0;
2601 glClear GL_COLOR_BUFFER_BIT; 2740 glClear GL_COLOR_BUFFER_BIT;
2605 my $y0 = $top; 2744 my $y0 = $top;
2606 my $y1 = $top + $H; 2745 my $y1 = $top + $H;
2607 2746
2608 my $y = 0; 2747 my $y = 0;
2609 2748
2610 my $layout = $self->{layout};
2611
2612 $layout->set_font ($self->{font}) if $self->{font};
2613
2614 glEnable GL_BLEND; 2749 glEnable GL_BLEND;
2615 #TODO# not correct in windows where rgba is forced off 2750 #TODO# not correct in windows where rgba is forced off
2616 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2751 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2617 2752
2618 for my $par (@{$self->{par}}) { 2753 for my $para (@{$self->{par}}) {
2619 my $h = $par->[1]; 2754 my $h = $para->{h};
2620 2755
2621 if ($y0 < $y + $h && $y < $y1) { 2756 if ($y0 < $y + $h && $y < $y1) {
2622 $layout->set_foreground (@{ $par->[2] }); 2757
2623 $layout->set_width ($W - $par->[3]); 2758 my $layout = $self->get_layout ($para);
2624 $layout->set_markup ($par->[4]);
2625 2759
2626 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2760 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2627 2761
2628 glRasterPos $par->[3], $y - $y0; 2762 glRasterPos $para->{indent}, $y - $y0;
2629 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2763 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764
2765 if (my @w = @{ $para->{widget} }) {
2766 my @s = $layout->get_shapes;
2767
2768 glDisable GL_BLEND;
2769 for (@w) {
2770 my ($dx, $dy) = splice @s, 0, 2, ();
2771
2772 $_->{x} = $dx + $para->{indent};
2773 $_->{y} = $dy + $y - $y0;
2774
2775 $_->draw;
2776 }
2777 glEnable GL_BLEND;
2778 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779 }
2630 } 2780 }
2631 2781
2632 $y += $h; 2782 $y += $h;
2633 } 2783 }
2634 2784
2635 glDisable GL_BLEND; 2785 glDisable GL_BLEND;
2636 }; 2786 };
2637 }); 2787 });
2788}
2789
2790sub reconfigure {
2791 my ($self) = @_;
2792
2793 $self->SUPER::reconfigure;
2794
2795 $_->{w} = 1e10 for @{ $self->{par} };
2796 $self->reflow;
2638} 2797}
2639 2798
2640sub _draw { 2799sub _draw {
2641 my ($self) = @_; 2800 my ($self) = @_;
2642 2801
2645 glColor 0, 0, 0, 1; 2804 glColor 0, 0, 0, 1;
2646 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2805 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2647 glDisable GL_TEXTURE_2D; 2806 glDisable GL_TEXTURE_2D;
2648 2807
2649 $self->{children}[1]->draw; 2808 $self->{children}[1]->draw;
2650
2651} 2809}
2652 2810
2653############################################################################# 2811#############################################################################
2654 2812
2655package CFClient::UI::Animator; 2813package CFClient::UI::Animator;
2742 $tooltip .= "\n\n" . (ref $widget) . "\n" 2900 $tooltip .= "\n\n" . (ref $widget) . "\n"
2743 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2901 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2744 . "req $widget->{req_w} $widget->{req_h}\n" 2902 . "req $widget->{req_w} $widget->{req_h}\n"
2745 . "visible $widget->{visible}"; 2903 . "visible $widget->{visible}";
2746 } 2904 }
2905
2906 $tooltip =~ s/^\n+//;
2907 $tooltip =~ s/\n+$//;
2747 2908
2748 $self->add (new CFClient::UI::Label 2909 $self->add (new CFClient::UI::Label
2749 markup => $tooltip, 2910 markup => $tooltip,
2750 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2911 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2751 fontsize => 0.8, 2912 fontsize => 0.8,
2761 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2922 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2762 2923
2763 ($w + 4, $h + 4) 2924 ($w + 4, $h + 4)
2764} 2925}
2765 2926
2766sub size_allocate { 2927sub invoke_size_allocate {
2767 my ($self, $w, $h) = @_; 2928 my ($self, $w, $h) = @_;
2768 2929
2769 $self->SUPER::size_allocate ($w - 4, $h - 4); 2930 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2770} 2931}
2771 2932
2772sub visibility_change { 2933sub invoke_visibility_change {
2773 my ($self, $visible) = @_; 2934 my ($self, $visible) = @_;
2774 2935
2775 return unless $visible; 2936 return unless $visible;
2776 2937
2777 $self->{root}->on_post_alloc ("move_$self" => sub { 2938 $self->{root}->on_post_alloc ("move_$self" => sub {
2779 or return; 2940 or return;
2780 2941
2781 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2942 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2782 2943
2783 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2944 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2784 if $x + $self->{w} > $::WIDTH; 2945 if $x + $self->{w} > $self->{root}{w};
2785 2946
2786 $self->move_abs ($x, $y); 2947 $self->move_abs ($x, $y);
2787 }); 2948 });
2788} 2949}
2789 2950
2884 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3045 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2885 glDisable GL_TEXTURE_2D; 3046 glDisable GL_TEXTURE_2D;
2886 } 3047 }
2887} 3048}
2888 3049
2889sub DESTROY { 3050sub destroy {
2890 my ($self) = @_; 3051 my ($self) = @_;
2891 3052
2892 $self->{timer}->cancel 3053 $self->{timer}->cancel
2893 if $self->{timer}; 3054 if $self->{timer};
2894 3055
2895 $self->SUPER::DESTROY; 3056 $self->SUPER::destroy;
2896} 3057}
2897 3058
2898############################################################################# 3059#############################################################################
2899 3060
2900package CFClient::UI::Buttonbar; 3061package CFClient::UI::Buttonbar;
2928 # handle various types of items, only text for now 3089 # handle various types of items, only text for now
2929 if (!ref $widget) { 3090 if (!ref $widget) {
2930 $widget = new CFClient::UI::Label 3091 $widget = new CFClient::UI::Label
2931 can_hover => 1, 3092 can_hover => 1,
2932 can_events => 1, 3093 can_events => 1,
2933 text => $widget, 3094 markup => $widget,
2934 tooltip => $tooltip 3095 tooltip => $tooltip
2935 } 3096 }
2936 3097
2937 $self->{item}{$widget} = $item; 3098 $self->{item}{$widget} = $item;
2938 3099
2944 3105
2945# popup given the event (must be a mouse button down event currently) 3106# popup given the event (must be a mouse button down event currently)
2946sub popup { 3107sub popup {
2947 my ($self, $ev) = @_; 3108 my ($self, $ev) = @_;
2948 3109
2949 $self->_emit ("popdown"); 3110 $self->emit ("popdown");
2950 3111
2951 # maybe save $GRAB? must be careful about events... 3112 # maybe save $GRAB? must be careful about events...
2952 $GRAB = $self; 3113 $GRAB = $self;
2953 $self->{button} = $ev->{button}; 3114 $self->{button} = $ev->{button};
2954 3115
2955 $self->show; 3116 $self->show;
2956 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3117 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2957} 3118}
2958 3119
2959sub mouse_motion { 3120sub invoke_mouse_motion {
2960 my ($self, $ev, $x, $y) = @_; 3121 my ($self, $ev, $x, $y) = @_;
2961 3122
2962 # TODO: should use vbox->find_widget or so 3123 # TODO: should use vbox->find_widget or so
2963 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3124 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2964 $self->{hover} = $self->{item}{$HOVER}; 3125 $self->{hover} = $self->{item}{$HOVER};
2965 3126
2966 0 3127 0
2967} 3128}
2968 3129
2969sub button_up { 3130sub invoke_button_up {
2970 my ($self, $ev, $x, $y) = @_; 3131 my ($self, $ev, $x, $y) = @_;
2971 3132
2972 if ($ev->{button} == $self->{button}) { 3133 if ($ev->{button} == $self->{button}) {
2973 undef $GRAB; 3134 undef $GRAB;
2974 $self->hide; 3135 $self->hide;
2975 3136
2976 $self->_emit ("popdown"); 3137 $self->emit ("popdown");
2977 $self->{hover}[1]->() if $self->{hover}; 3138 $self->{hover}[1]->() if $self->{hover};
2978 } else { 3139 } else {
2979 return 0 3140 return 0
2980 } 3141 }
2981 3142
3008 3169
3009 $self->{current} = $self->{children}[0] 3170 $self->{current} = $self->{children}[0]
3010 if @{ $self->{children} }; 3171 if @{ $self->{children} };
3011} 3172}
3012 3173
3174sub get_current_page {
3175 my ($self) = @_;
3176
3177 $self->{current}
3178}
3179
3013sub set_current_page { 3180sub set_current_page {
3014 my ($self, $page_or_widget) = @_; 3181 my ($self, $page_or_widget) = @_;
3015 3182
3016 my $widget = ref $page_or_widget 3183 my $widget = ref $page_or_widget
3017 ? $page_or_widget 3184 ? $page_or_widget
3018 : $self->{children}[$page_or_widget]; 3185 : $self->{children}[$page_or_widget];
3019 3186
3020 $self->{current} = $widget; 3187 $self->{current} = $widget;
3021 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3188 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3022 3189
3023 $self->_emit (page_changed => $self->{current}); 3190 $self->emit (page_changed => $self->{current});
3024 3191
3025 $self->realloc; 3192 $self->realloc;
3026} 3193}
3027 3194
3028sub visible_children { 3195sub visible_children {
3033 my ($self) = @_; 3200 my ($self) = @_;
3034 3201
3035 $self->{current}->size_request 3202 $self->{current}->size_request
3036} 3203}
3037 3204
3038sub size_allocate { 3205sub invoke_size_allocate {
3039 my ($self, $w, $h) = @_; 3206 my ($self, $w, $h) = @_;
3040 3207
3041 $self->{current}->configure (0, 0, $w, $h); 3208 $self->{current}->configure (0, 0, $w, $h);
3209
3210 1
3042} 3211}
3043 3212
3044sub _draw { 3213sub _draw {
3045 my ($self) = @_; 3214 my ($self) = @_;
3046 3215
3081 ); 3250 );
3082 3251
3083 $self->{multiplexer}->add ($widget); 3252 $self->{multiplexer}->add ($widget);
3084} 3253}
3085 3254
3255sub get_current_page {
3256 my ($self) = @_;
3257
3258 $self->{multiplexer}->get_current_page
3259}
3260
3086sub set_current_page { 3261sub set_current_page {
3087 my ($self, $page) = @_; 3262 my ($self, $page) = @_;
3088 3263
3089 $self->{multiplexer}->set_current_page ($page); 3264 $self->{multiplexer}->set_current_page ($page);
3090 $self->_emit (page_changed => $self->{multiplexer}{current}); 3265 $self->emit (page_changed => $self->{multiplexer}{current});
3091} 3266}
3092 3267
3093############################################################################# 3268#############################################################################
3094 3269
3095package CFClient::UI::Combobox; 3270package CFClient::UI::Combobox;
3100 3275
3101sub new { 3276sub new {
3102 my $class = shift; 3277 my $class = shift;
3103 3278
3104 my $self = $class->SUPER::new ( 3279 my $self = $class->SUPER::new (
3105 options => [], # [title, value, tooltip], ... 3280 options => [], # [value, title, longdesc], ...
3106 value => undef, 3281 value => undef,
3107 @_, 3282 @_,
3108 ); 3283 );
3109 3284
3110 $self->_set_value ($self->{value}); 3285 $self->_set_value ($self->{value});
3111 3286
3112 $self 3287 $self
3113} 3288}
3114 3289
3115sub button_down { 3290sub invoke_button_down {
3116 my ($self, $ev) = @_; 3291 my ($self, $ev) = @_;
3117 3292
3118 my @menu_items; 3293 my @menu_items;
3119 3294
3120 for (@{ $self->{options} }) { 3295 for (@{ $self->{options} }) {
3121 my ($title, $value, $tooltip) = @$_; 3296 my ($value, $title, $tooltip) = @$_;
3122 3297
3123 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 3298 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3124 } 3299 }
3125 3300
3126 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3301 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3127} 3302}
3128 3303
3129sub _set_value { 3304sub _set_value {
3130 my ($self, $value) = @_; 3305 my ($self, $value) = @_;
3131 3306
3132 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 3307 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3133 or return; 3308 or return;
3134 3309
3135 $self->{value} = $item->[1]; 3310 $self->{value} = $item->[0];
3136 $self->set_markup ("$item->[0] ⇓"); 3311 $self->set_markup ("$item->[1] ⇓");
3137 $self->set_tooltip ($item->[2]); 3312 $self->set_tooltip ($item->[2]);
3138} 3313}
3139 3314
3140sub set_value { 3315sub set_value {
3141 my ($self, $value) = @_; 3316 my ($self, $value) = @_;
3142 3317
3143 return unless $self->{value} ne $value; 3318 return unless $self->{value} ne $value;
3144 3319
3145 $self->_set_value ($value); 3320 $self->_set_value ($value);
3146 $self->_emit (changed => $value); 3321 $self->emit (changed => $value);
3147} 3322}
3148 3323
3149############################################################################# 3324#############################################################################
3150 3325
3151package CFClient::UI::Statusbox; 3326package CFClient::UI::Statusbox;
3250 $item->{count}++; 3425 $item->{count}++;
3251 } else { 3426 } else {
3252 $item->{count} = 1; 3427 $item->{count} = 1;
3253 $item->{text} = $item->{tooltip} = $text; 3428 $item->{text} = $item->{tooltip} = $text;
3254 } 3429 }
3255 $item->{id} = ++$self->{id}; 3430 $item->{id} += 0.2;#d#
3256 $item->{timeout} = $timeout; 3431 $item->{timeout} = $timeout;
3257 delete $item->{label}; 3432 delete $item->{label};
3258 } else { 3433 } else {
3259 $self->{item}{$group} = { 3434 $self->{item}{$group} = {
3260 id => ++$self->{id}, 3435 id => ++$self->{id},
3266 count => 1, 3441 count => 1,
3267 %arg, 3442 %arg,
3268 }; 3443 };
3269 } 3444 }
3270 3445
3446 $ROOT->on_refresh (reorder => sub {
3271 $self->reorder; 3447 $self->reorder;
3448 });
3272} 3449}
3273 3450
3274sub reconfigure { 3451sub reconfigure {
3275 my ($self) = @_; 3452 my ($self) = @_;
3276 3453
3279 3456
3280 $self->reorder; 3457 $self->reorder;
3281 $self->SUPER::reconfigure; 3458 $self->SUPER::reconfigure;
3282} 3459}
3283 3460
3284sub DESTROY { 3461sub destroy {
3285 my ($self) = @_; 3462 my ($self) = @_;
3286 3463
3287 $self->{timer}->cancel; 3464 $self->{timer}->cancel;
3288 3465
3289 $self->SUPER::DESTROY; 3466 $self->SUPER::destroy;
3290} 3467}
3291 3468
3292############################################################################# 3469#############################################################################
3293 3470
3294package CFClient::UI::Inventory; 3471package CFClient::UI::Inventory;
3295 3472
3296our @ISA = CFClient::UI::ScrolledWindow::; 3473our @ISA = CFClient::UI::Table::;
3297 3474
3298sub new { 3475sub new {
3299 my $class = shift; 3476 my $class = shift;
3300 3477
3301 my $self = $class->SUPER::new ( 3478 my $self = $class->SUPER::new (
3302 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3479 col_expand => [0, 1, 0],
3303 @_, 3480 @_,
3304 ); 3481 );
3305 3482
3306 $self 3483 $self
3307} 3484}
3308 3485
3309sub set_items { 3486sub set_items {
3310 my ($self, $items) = @_; 3487 my ($self, $items) = @_;
3311 3488
3312 $self->{child}->clear; 3489 $self->clear;
3313 return unless $items; 3490 return unless $items;
3314 3491
3315 my @items = sort { 3492 my @items = sort {
3316 ($a->{type} <=> $b->{type}) 3493 ($a->{type} <=> $b->{type})
3317 or ($a->{name} cmp $b->{name}) 3494 or ($a->{name} cmp $b->{name})
3318 } @$items; 3495 } values %$items;
3319 3496
3320 $self->{real_items} = \@items; 3497 $self->{real_items} = \@items;
3321 3498
3322 my $row = 0; 3499 my $row = 0;
3323 for my $item (@items) { 3500 for my $item (@items) {
3324 CFClient::Item::update_widgets $item; 3501 CFClient::Item::update_widgets $item;
3325 3502
3326 $self->{child}->add (0, $row, $item->{face_widget}); 3503 $self->add (0, $row, $item->{face_widget});
3327 $self->{child}->add (1, $row, $item->{desc_widget}); 3504 $self->add (1, $row, $item->{desc_widget});
3328 $self->{child}->add (2, $row, $item->{weight_widget}); 3505 $self->add (2, $row, $item->{weight_widget});
3329 3506
3330 $row++; 3507 $row++;
3331 }
3332}
3333
3334#############################################################################
3335
3336package CFClient::UI::BindEditor;
3337
3338our @ISA = CFClient::UI::FancyFrame::;
3339
3340sub new {
3341 my $class = shift;
3342
3343 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3344
3345 $self->add (my $vb = new CFClient::UI::VBox);
3346
3347
3348 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3349 text => "start recording",
3350 tooltip => "Start/Stops recording of actions."
3351 ."All subsequent actions after the recording started will be captured."
3352 ."The actions are displayed after the record was stopped."
3353 ."To bind the action you have to click on the 'Bind' button",
3354 on_activate => sub {
3355 unless ($self->{recording}) {
3356 $self->start;
3357 } else {
3358 $self->stop;
3359 }
3360 });
3361
3362 $vb->add (new CFClient::UI::Label text => "Actions:");
3363 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3364
3365 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3366 $vb->add (my $hb = new CFClient::UI::HBox);
3367 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3368 $hb->add (new CFClient::UI::Button
3369 text => "bind",
3370 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3371 on_activate => sub {
3372 $self->ask_for_bind;
3373 });
3374
3375 $vb->add (my $hb = new CFClient::UI::HBox);
3376 $hb->add (new CFClient::UI::Button
3377 text => "ok",
3378 expand => 1,
3379 tooltip => "This closes the binding editor and saves the binding",
3380 on_activate => sub {
3381 $self->hide;
3382 $self->commit;
3383 });
3384
3385 $hb->add (new CFClient::UI::Button
3386 text => "cancel",
3387 expand => 1,
3388 tooltip => "This closes the binding editor without saving",
3389 on_activate => sub {
3390 $self->hide;
3391 $self->{binding_cancel}->()
3392 if $self->{binding_cancel};
3393 });
3394
3395 $self->update_binding_widgets;
3396
3397 $self
3398}
3399
3400sub commit {
3401 my ($self) = @_;
3402 my ($mod, $sym, $cmds) = $self->get_binding;
3403 if ($sym != 0 && @$cmds > 0) {
3404 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3405 ."'. Don't forget 'Save Config'!");
3406 $self->{binding_change}->($mod, $sym, $cmds)
3407 if $self->{binding_change};
3408 } else {
3409 $::STATUSBOX->add ("No action bound, no key or action specified!");
3410 $self->{binding_cancel}->()
3411 if $self->{binding_cancel};
3412 }
3413}
3414
3415sub start {
3416 my ($self) = @_;
3417
3418 $self->{rec_btn}->set_text ("stop recording");
3419 $self->{recording} = 1;
3420 $self->clear_command_list;
3421 $::CONN->start_record if $::CONN;
3422}
3423
3424sub stop {
3425 my ($self) = @_;
3426
3427 $self->{rec_btn}->set_text ("start recording");
3428 $self->{recording} = 0;
3429
3430 my $rec;
3431 $rec = $::CONN->stop_record if $::CONN;
3432 return unless ref $rec eq 'ARRAY';
3433 $self->set_command_list ($rec);
3434}
3435
3436
3437sub ask_for_bind_and_commit {
3438 my ($self) = @_;
3439 $self->ask_for_bind (1);
3440}
3441
3442sub ask_for_bind {
3443 my ($self, $commit) = @_;
3444
3445 CFClient::Binder::open_binding_dialog (sub {
3446 my ($mod, $sym) = @_;
3447 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3448 $self->update_binding_widgets;
3449 $self->commit if $commit;
3450 });
3451}
3452
3453# $mod and $sym are the modifiers and key symbol
3454# $cmds is a array ref of strings (the commands)
3455# $cb is the callback that is executed on OK
3456# $ccb is the callback that is executed on CANCEL and
3457# when the binding was unsuccessful on OK
3458sub set_binding {
3459 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3460
3461 $self->clear_command_list;
3462 $self->{recording} = 0;
3463 $self->{rec_btn}->set_text ("start recording");
3464
3465 $self->{binding} = [$mod, $sym];
3466 $self->{commands} = $cmds;
3467
3468 $self->{binding_change} = $cb;
3469 $self->{binding_cancel} = $ccb;
3470
3471 $self->update_binding_widgets;
3472}
3473
3474# this is a shortcut method that asks for a binding
3475# and then just binds it.
3476sub do_quick_binding {
3477 my ($self, $cmds) = @_;
3478 $self->set_binding (undef, undef, $cmds, sub {
3479 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3480 });
3481 $self->ask_for_bind (1);
3482}
3483
3484sub update_binding_widgets {
3485 my ($self) = @_;
3486 my ($mod, $sym, $cmds) = $self->get_binding;
3487 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3488 $self->set_command_list ($cmds);
3489}
3490
3491sub get_binding {
3492 my ($self) = @_;
3493 return (
3494 $self->{binding}->[0],
3495 $self->{binding}->[1],
3496 [ grep { defined $_ } @{$self->{commands}} ]
3497 );
3498}
3499
3500sub clear_command_list {
3501 my ($self) = @_;
3502 $self->{cmdbox}->clear ();
3503}
3504
3505sub set_command_list {
3506 my ($self, $cmds) = @_;
3507
3508 $self->{cmdbox}->clear ();
3509 $self->{commands} = $cmds;
3510
3511 my $idx = 0;
3512
3513 for (@$cmds) {
3514 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3515
3516 my $i = $idx;
3517 $hb->add (new CFClient::UI::Label text => $_);
3518 $hb->add (new CFClient::UI::Button
3519 text => "delete",
3520 tooltip => "Deletes the action from the record",
3521 on_activate => sub {
3522 $self->{cmdbox}->remove ($hb);
3523 $cmds->[$i] = undef;
3524 });
3525
3526
3527 $idx++
3528 } 3508 }
3529} 3509}
3530 3510
3531############################################################################# 3511#############################################################################
3532 3512
3542 commands => [], 3522 commands => [],
3543 @_, 3523 @_,
3544 ) 3524 )
3545} 3525}
3546 3526
3527my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3528
3529my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3531my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3547my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => 3533my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3548 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell."); 3534 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3549my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => 3535my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3550 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation."); 3536 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3551my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => 3537my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3552 "<b>Damage</b>. The amount of damage the spell deals when it hits."); 3538 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3553 3539
3554sub rebuild_spell_list { 3540sub rebuild_spell_list {
3555 my ($self) = @_; 3541 my ($self) = @_;
3556 3542
3557 $CFClient::UI::ROOT->on_refresh ($self => sub { 3543 $CFClient::UI::ROOT->on_refresh ($self => sub {
3558 $self->clear; 3544 $self->clear;
3559 3545
3546 return unless $::CONN;
3547
3560 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name"); 3548 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3549 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3561 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3550 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3562 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3551 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3563 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3552 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3564 3553
3565 my $row = 0; 3554 my $row = 0;
3566 3555
3567 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3556 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3568 my $spell = $self->{spell}{$_}; 3557 my $spell = $self->{spell}{$_};
3569 3558
3570 $row++; 3559 $row++;
3560
3561 my $spell_cb = sub {
3562 my ($widget, $ev) = @_;
3563
3564 if ($ev->{button} == 1) {
3565 $::CONN->user_send ("cast $spell->{name}");
3566 } elsif ($ev->{button} == 2) {
3567 $::CONN->user_send ("invoke $spell->{name}");
3568 } elsif ($ev->{button} == 3) {
3569 (new CFClient::UI::Menu
3570 items => [
3571 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3572 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3573 ],
3574 )->popup ($ev);
3575 } else {
3576 return 0;
3577 }
3578
3579 1
3580 };
3581
3582 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3583
3584 #TODO: add path info to tooltip
3585 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3571 3586
3572 $self->add (0, $row, new CFClient::UI::Face 3587 $self->add (0, $row, new CFClient::UI::Face
3573 face => $spell->{face}, 3588 face => $spell->{face},
3574 can_hover => 1, 3589 can_hover => 1,
3575 can_events => 1, 3590 can_events => 1,
3576 tooltip => $spell->{message}, 3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3577 ); 3593 );
3578 3594
3579 $self->add (1, $row, new CFClient::UI::Label 3595 $self->add (1, $row, new CFClient::UI::Label
3580 expand => 1, 3596 expand => 1,
3581 text => $spell->{name}, 3597 text => $spell->{name},
3582 can_hover => 1, 3598 can_hover => 1,
3583 can_events => 1, 3599 can_events => 1,
3584 tooltip => $spell->{message}, 3600 tooltip => $tooltip,
3601 on_button_down => $spell_cb,
3585 ); 3602 );
3586 3603
3604 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3587 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3605 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3588 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3606 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3589 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3607 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3590
3591 # TODO: should be done via popup
3592 $self->add (5, $row, new CFClient::UI::Button
3593 text => "bind",
3594 tooltip => "bind spell readying (cast command) to key",
3595 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3596 );
3597 } 3608 }
3598 }); 3609 });
3599} 3610}
3600 3611
3601sub add_spell { 3612sub add_spell {
3607 3618
3608sub remove_spell { 3619sub remove_spell {
3609 my ($self, $spell) = @_; 3620 my ($self, $spell) = @_;
3610 3621
3611 delete $self->{spell}->{$spell->{name}}; 3622 delete $self->{spell}->{$spell->{name}};
3623 $self->rebuild_spell_list;
3624}
3625
3626sub clear_spells {
3627 my ($self) = @_;
3628
3629 $self->{spell} = {};
3612 $self->rebuild_spell_list; 3630 $self->rebuild_spell_list;
3613} 3631}
3614 3632
3615############################################################################# 3633#############################################################################
3616 3634
3653 $coord = $max - $size if $coord > $max - $size; 3671 $coord = $max - $size if $coord > $max - $size;
3654 3672
3655 int $coord + 0.5 3673 int $coord + 0.5
3656} 3674}
3657 3675
3658sub size_allocate { 3676sub invoke_size_allocate {
3659 my ($self, $w, $h) = @_; 3677 my ($self, $w, $h) = @_;
3660 3678
3661 for my $child ($self->children) { 3679 for my $child ($self->children) {
3662 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3680 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3663 3681
3667 $X = _to_pixel $X, $W, $self->{w}; 3685 $X = _to_pixel $X, $W, $self->{w};
3668 $Y = _to_pixel $Y, $H, $self->{h}; 3686 $Y = _to_pixel $Y, $H, $self->{h};
3669 3687
3670 $child->configure ($X, $Y, $W, $H); 3688 $child->configure ($X, $Y, $W, $H);
3671 } 3689 }
3690
3691 1
3672} 3692}
3673 3693
3674sub coord2local { 3694sub coord2local {
3675 my ($self, $x, $y) = @_; 3695 my ($self, $x, $y) = @_;
3676 3696

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines