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.314 by root, Mon Jun 26 21:59:04 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 my $focus = $FOCUS; $FOCUS = $self;
430 429
431 $self->_emit (focus_in => $focus);
432
433 $focus->update if $focus; 430 $focus->update if $focus;
434 $FOCUS->update; 431 $FOCUS->update;
435}
436 432
433 0
434}
435
437sub focus_out { 436sub invoke_focus_out {
438 my ($self) = @_; 437 my ($self) = @_;
439 438
440 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
441 440
442 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
443 442
444 $self->_emit (focus_out => $focus);
445
446 $focus->update if $focus; #? 443 $focus->update if $focus; #?
447 444
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 446 unless $FOCUS;
450}
451 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
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->hide };
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;
1137 1151
1138 $self->child->configure ($border, $border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1139}
1140 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1141sub button_down { 1160sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1143 1162
1144 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1164 my $border = $self->border;
1146 1165
1177 1196
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1198
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1200 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1202 };
1184 } else { 1203 } else {
1185 return 0; 1204 return 0;
1186 } 1205 }
1187 1206
1188 1 1207 1
1189} 1208}
1190 1209
1191sub button_up { 1210sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1193 1212
1194 !!delete $self->{motion} 1213 ! ! delete $self->{motion}
1195} 1214}
1196 1215
1197sub mouse_motion { 1216sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1199 1218
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1220
1202 !!$self->{motion} 1221 ! ! $self->{motion}
1203} 1222}
1204 1223
1205sub _draw { 1224sub _draw {
1206 my ($self) = @_; 1225 my ($self) = @_;
1207 1226
1233 1252
1234 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1235 1254
1236 $child->draw; 1255 $child->draw;
1237 1256
1238 if ($self->{title}) { 1257 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1258 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1241 } 1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1242} 1266}
1243 1267
1244############################################################################# 1268#############################################################################
1245 1269
1246package CFClient::UI::Table; 1270package CFClient::UI::Table;
1269 1293
1270 $child->set_parent ($self); 1294 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1272 1296
1273 $self->realloc; 1297 $self->realloc;
1298}
1299
1300sub remove {
1301 my ($self, $child) = @_;
1302
1303 # TODO: not yet implemented
1274} 1304}
1275 1305
1276# TODO: move to container class maybe? send children a signal on removal? 1306# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1307sub clear {
1278 my ($self) = @_; 1308 my ($self) = @_;
1319 (sum @$ws), 1349 (sum @$ws),
1320 (sum @$hs), 1350 (sum @$hs),
1321 ) 1351 )
1322} 1352}
1323 1353
1324sub size_allocate { 1354sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1326 1356
1327 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1328 1358
1329 my $req_w = (sum @$ws) || 1; 1359 my $req_w = (sum @$ws) || 1;
1361 } 1391 }
1362 1392
1363 $y += $row_h; 1393 $y += $row_h;
1364 } 1394 }
1365 1395
1396 1
1366} 1397}
1367 1398
1368sub find_widget { 1399sub find_widget {
1369 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1370 1401
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1440 )
1410} 1441}
1411 1442
1412sub size_allocate { 1443sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1444 my ($self, $w, $h) = @_;
1414 1445
1415 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1417 1448
1418 my @req; 1449 my @req;
1419 1450
1420 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1422 } else { 1453 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1425 1456
1426 if ($req > $space) { 1457 if ($req > $space) {
1427 # ah well, not enough space 1458 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1429 } else { 1460 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1462
1432 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1433 1464
1434 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1466 for 0 .. $#children;
1436 } 1467 }
1437 } 1468 }
1438 1469
1439 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1440 1471
1441 my $pos = 0; 1472 my $pos = 0;
1442 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1476
1446 $pos += $alloc; 1477 $pos += $alloc;
1447 } 1478 }
1448 1479
1449 1 1480 1
1604 }; 1635 };
1605 1636
1606 @{ $self->{size_req} } 1637 @{ $self->{size_req} }
1607} 1638}
1608 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1609sub size_allocate { 1644sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1611 1646
1612 delete $self->{ox}; 1647 delete $self->{ox};
1613 1648
1614 delete $self->{texture} 1649 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1616} 1653}
1617 1654
1618sub set_fontsize { 1655sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1620 1657
1658 : ($self->{h} - $tex->{h}) * 0.5); 1695 : ($self->{h} - $tex->{h}) * 0.5);
1659 }; 1696 };
1660 1697
1661 glEnable GL_TEXTURE_2D; 1698 glEnable GL_TEXTURE_2D;
1662 1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1702
1663 if ($tex->{format} == GL_ALPHA) { 1703 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665 glColor @{$self->{fg}}; 1705 glColor @{$self->{fg}};
1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1667 } else { 1707 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1670 } 1710 }
1671 1711
1672 glDisable GL_TEXTURE_2D; 1712 glDisable GL_TEXTURE_2D;
1673} 1713}
1674 1714
1710 1750
1711 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1712 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1713 delete $self->{size_req}; 1753 delete $self->{size_req};
1714 1754
1715 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1716 1756
1717 $self->realloc; 1757 $self->realloc;
1718 $self->update; 1758 $self->update;
1719} 1759}
1720 1760
1735 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1736 1776
1737 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1738} 1778}
1739 1779
1740sub key_down { 1780sub invoke_key_down {
1741 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1742 1782
1743 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1744 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1745 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
1757 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1758 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1759 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1760 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1761 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1762 $self->_emit ('escape'); 1802 $self->emit ('escape');
1763 } elsif ($uni) { 1803 } elsif ($uni) {
1764 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1765 } else { 1805 } else {
1766 return 0; 1806 return 0;
1767 } 1807 }
1771 $self->realloc; 1811 $self->realloc;
1772 1812
1773 1 1813 1
1774} 1814}
1775 1815
1776sub focus_in { 1816sub invoke_focus_in {
1777 my ($self) = @_; 1817 my ($self) = @_;
1778 1818
1779 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1780 1820
1781 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1782} 1822}
1783 1823
1784sub button_down { 1824sub invoke_button_down {
1785 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1786 1826
1787 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1788 1828
1789 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1790 1830
1791 # byte-index to char-index 1831 # byte-index to char-index
1792 my $text = $self->{text}; 1832 my $text = $self->{text};
1797 $self->update; 1837 $self->update;
1798 1838
1799 1 1839 1
1800} 1840}
1801 1841
1802sub mouse_motion { 1842sub invoke_mouse_motion {
1803 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1804# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1805 1845
1806 0 1846 1
1807} 1847}
1808 1848
1809sub _draw { 1849sub _draw {
1810 my ($self) = @_; 1850 my ($self) = @_;
1811 1851
1852 1892
1853our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1854 1894
1855use CFClient::OpenGL; 1895use CFClient::OpenGL;
1856 1896
1857sub key_down { 1897sub invoke_key_down {
1858 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1859 1899
1860 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1861 1901
1862 if ($sym == 13) { 1902 if ($sym == 13) {
1863 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1864 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1865 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1866 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1867 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1868 $self->update; 1909 $self->update;
1869 1910
1870 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1871 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1872 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
1888 } else { 1929 } else {
1889 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1890 } 1931 }
1891 1932
1892 } else { 1933 } else {
1893 return $self->SUPER::key_down ($ev) 1934 return $self->SUPER::invoke_key_down ($ev)
1894 } 1935 }
1895 1936
1896 1 1937 1
1897} 1938}
1898 1939
1922 can_events => 1, 1963 can_events => 1,
1923 @_ 1964 @_
1924 ) 1965 )
1925} 1966}
1926 1967
1927sub activate { }
1928
1929sub button_up { 1968sub invoke_button_up {
1930 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1931 1970
1932 $self->emit ("activate") 1971 $self->emit ("activate")
1933 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1934 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
1948 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1949 1988
1950 glDisable GL_TEXTURE_2D; 1989 glDisable GL_TEXTURE_2D;
1951 1990
1952 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1992}
1993
1994#############################################################################
1995
1996package CFClient::UI::ImageButton;
1997
1998our @ISA = CFClient::UI::Image::;
1999
2000use CFClient::OpenGL;
2001
2002my %textures;
2003
2004sub new {
2005 my $class = shift;
2006
2007 my $self = $class->SUPER::new (
2008 padding_x => 4,
2009 padding_y => 4,
2010 fg => [1, 1, 1],
2011 active_fg => [0, 0, 1],
2012 can_hover => 1,
2013 align => 0,
2014 valign => 0,
2015 can_events => 1,
2016 @_
2017 );
2018}
2019
2020sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_;
2022
2023 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h};
2026
2027 1
1953} 2028}
1954 2029
1955############################################################################# 2030#############################################################################
1956 2031
1957package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
1984 my ($self) = @_; 2059 my ($self) = @_;
1985 2060
1986 (6) x 2 2061 (6) x 2
1987} 2062}
1988 2063
1989sub button_down { 2064sub invoke_button_down {
1990 my ($self, $ev, $x, $y) = @_; 2065 my ($self, $ev, $x, $y) = @_;
1991 2066
1992 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1993 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1994 $self->{state} = !$self->{state}; 2069 $self->{state} = !$self->{state};
1995 $self->_emit (changed => $self->{state}); 2070 $self->emit (changed => $self->{state});
1996 } else { 2071 } else {
1997 return 0 2072 return 0
1998 } 2073 }
1999 2074
2000 1 2075 1
2025package CFClient::UI::Image; 2100package CFClient::UI::Image;
2026 2101
2027our @ISA = CFClient::UI::Base::; 2102our @ISA = CFClient::UI::Base::;
2028 2103
2029use CFClient::OpenGL; 2104use CFClient::OpenGL;
2030use Carp qw/confess/;
2031 2105
2032our %loaded_images; 2106our %texture_cache;
2033 2107
2034sub new { 2108sub new {
2035 my $class = shift; 2109 my $class = shift;
2036 2110
2037 my $self = $class->SUPER::new (can_events => 0, @_); 2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
2038 2115
2039 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
2040 2118
2041 $loaded_images{$self->{image}} ||= 2119 $self->{tex} = $texture_cache{$self->{path}} ||=
2042 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2043 2121
2044 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2122 Scalar::Util::weaken $texture_cache{$self->{path}};
2045 2123
2046 Scalar::Util::weaken $loaded_images{$self->{image}}; 2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2047
2048 $self->{aspect} = $tex->{w} / $tex->{h};
2049 2125
2050 $self 2126 $self
2051} 2127}
2052 2128
2053sub size_request { 2129sub size_request {
2054 my ($self) = @_; 2130 my ($self) = @_;
2055 2131
2056 ($self->{tex}->{w}, $self->{tex}->{h}) 2132 ($self->{tex}{w}, $self->{tex}{h})
2057} 2133}
2058 2134
2059sub _draw { 2135sub _draw {
2060 my ($self) = @_; 2136 my ($self) = @_;
2061 2137
2297 $self->update; 2373 $self->update;
2298 2374
2299 $self 2375 $self
2300} 2376}
2301 2377
2302sub changed { }
2303
2304sub set_range { 2378sub set_range {
2305 my ($self, $range) = @_; 2379 my ($self, $range) = @_;
2306 2380
2307 ($range, $self->{range}) = ($self->{range}, $range); 2381 ($range, $self->{range}) = ($self->{range}, $range);
2308 2382
2309 $self->update
2310 if "@$range" ne "@{$self->{range}}"; 2383 if ("@$range" ne "@{$self->{range}}") {
2384 $self->update;
2385 $self->set_value ($self->{range}[0]);
2386 }
2311} 2387}
2312 2388
2313sub set_value { 2389sub set_value {
2314 my ($self, $value) = @_; 2390 my ($self, $value) = @_;
2315 2391
2326 if $unit; 2402 if $unit;
2327 2403
2328 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2404 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2329 2405
2330 if ($value != $old_value) { 2406 if ($value != $old_value) {
2331 $self->_emit (changed => $value); 2407 $self->emit (changed => $value);
2332 $self->update; 2408 $self->update;
2333 } 2409 }
2334} 2410}
2335 2411
2336sub size_request { 2412sub size_request {
2337 my ($self) = @_; 2413 my ($self) = @_;
2338 2414
2339 ($self->{req_w}, $self->{req_h}) 2415 ($self->{req_w}, $self->{req_h})
2340} 2416}
2341 2417
2342sub button_down { 2418sub invoke_button_down {
2343 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2344 2420
2345 $self->SUPER::button_down ($ev, $x, $y); 2421 $self->SUPER::invoke_button_down ($ev, $x, $y);
2346 2422
2347 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2348 2424
2349 $self->mouse_motion ($ev, $x, $y) 2425 $self->invoke_mouse_motion ($ev, $x, $y)
2350} 2426}
2351 2427
2352sub mouse_motion { 2428sub invoke_mouse_motion {
2353 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2354 2430
2355 if ($GRAB == $self) { 2431 if ($GRAB == $self) {
2356 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2357 2433
2462sub set_range { shift->{slider}->set_range (@_) } 2538sub set_range { shift->{slider}->set_range (@_) }
2463sub set_value { shift->{slider}->set_value (@_) } 2539sub set_value { shift->{slider}->set_value (@_) }
2464 2540
2465############################################################################# 2541#############################################################################
2466 2542
2467package CFClient::UI::TextView; 2543package CFClient::UI::TextScroller;
2468 2544
2469our @ISA = CFClient::UI::HBox::; 2545our @ISA = CFClient::UI::HBox::;
2470 2546
2471use CFClient::OpenGL; 2547use CFClient::OpenGL;
2472 2548
2474 my $class = shift; 2550 my $class = shift;
2475 2551
2476 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2477 fontsize => 1, 2553 fontsize => 1,
2478 can_events => 0, 2554 can_events => 0,
2555 indent => 0,
2479 #font => default_font 2556 #font => default_font
2480 @_, 2557 @_,
2481 2558
2482 layout => (new CFClient::Layout 1), 2559 layout => (new CFClient::Layout 1),
2483 par => [], 2560 par => [],
2498 2575
2499 $self->{fontsize} = $fontsize; 2576 $self->{fontsize} = $fontsize;
2500 $self->reflow; 2577 $self->reflow;
2501} 2578}
2502 2579
2580sub size_request {
2581 my ($self) = @_;
2582
2583 my ($empty, $slider) = @{ $self->{children} };
2584
2585 local $self->{children} = [$empty, $slider];
2586 $self->SUPER::size_request
2587}
2588
2503sub size_allocate { 2589sub invoke_size_allocate {
2504 my ($self, $w, $h) = @_; 2590 my ($self, $w, $h) = @_;
2505 2591
2506 $self->SUPER::size_allocate ($w, $h); 2592 my ($empty, $slider, @other) = @{ $self->{children} };
2593 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2507 2594
2508 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2595 $self->{layout}->set_font ($self->{font}) if $self->{font};
2509 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2596 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2510 $self->{layout}->set_width ($self->{children}[0]{w}); 2597 $self->{layout}->set_width ($empty->{w});
2598 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2511 2599
2512 $self->reflow; 2600 $self->reflow;
2513}
2514 2601
2515sub text_size { 2602 local $self->{children} = [$empty, $slider];
2516 my ($self, $text, $indent) = @_; 2603 $self->SUPER::invoke_size_allocate ($w, $h)
2604}
2605
2606sub get_layout {
2607 my ($self, $para) = @_;
2517 2608
2518 my $layout = $self->{layout}; 2609 my $layout = $self->{layout};
2519 2610
2611 $layout->set_font ($self->{font}) if $self->{font};
2612 $layout->set_foreground (@{$para->{fg}});
2520 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2613 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $layout->set_width ($self->{children}[0]{w} - $indent); 2614 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2615 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2522 $layout->set_markup ($text); 2616 $layout->set_markup ($para->{markup});
2617
2618 $layout->set_shapes (
2619 map
2620 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2621 @{$para->{widget}}
2523 2622 );
2623
2524 $layout->size 2624 $layout
2525} 2625}
2526 2626
2527sub reflow { 2627sub reflow {
2528 my ($self) = @_; 2628 my ($self) = @_;
2529 2629
2538 $self->{children}[1]->set_value ($offset); 2638 $self->{children}[1]->set_value ($offset);
2539} 2639}
2540 2640
2541sub clear { 2641sub clear {
2542 my ($self) = @_; 2642 my ($self) = @_;
2643
2644 my (undef, undef, @other) = @{ $self->{children} };
2645 $self->remove ($_) for @other;
2543 2646
2544 $self->{par} = []; 2647 $self->{par} = [];
2545 $self->{height} = 0; 2648 $self->{height} = 0;
2546 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2649 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2547} 2650}
2548 2651
2549sub add_paragraph { 2652sub add_paragraph {
2550 my ($self, $color, $text, $indent) = @_; 2653 my ($self, $color, $para, $indent) = @_;
2551 2654
2552 for my $line (split /\n/, $text) { 2655 my ($text, @w) = ref $para ? @$para : $para;
2553 my ($w, $h) = $self->text_size ($line); 2656
2554 $self->{height} += $h; 2657 $para = {
2555 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2658 w => 1e10,
2659 wrapped => 1,
2660 fg => $color,
2661 indent => $indent,
2662 markup => $text,
2663 widget => \@w,
2556 } 2664 };
2557 2665
2558 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2666 $self->add (@w) if @w;
2667 push @{$self->{par}}, $para;
2668
2669 $self->{need_reflow}++;
2670 $self->update;
2671}
2672
2673sub scroll_to_bottom {
2674 my ($self) = @_;
2675
2676 $self->{scroll_to_bottom} = 1;
2677 $self->update;
2559} 2678}
2560 2679
2561sub update { 2680sub update {
2562 my ($self) = @_; 2681 my ($self) = @_;
2563 2682
2565 2684
2566 return unless $self->{h} > 0; 2685 return unless $self->{h} > 0;
2567 2686
2568 delete $self->{texture}; 2687 delete $self->{texture};
2569 2688
2570 $ROOT->on_post_alloc ($self, sub { 2689 $ROOT->on_post_alloc ($self => sub {
2571 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2690 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2572 2691
2573 if (delete $self->{need_reflow}) { 2692 if (delete $self->{need_reflow}) {
2574 my $height = 0; 2693 my $height = 0;
2575 2694
2576 my $layout = $self->{layout};
2577
2578 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2579
2580 for (@{$self->{par}}) { 2695 for my $para (@{$self->{par}}) {
2581 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2696 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2582 $layout->set_width ($W - $_->[3]); 2697 my $layout = $self->get_layout ($para);
2583 $layout->set_markup ($_->[4]);
2584 my ($w, $h) = $layout->size; 2698 my ($w, $h) = $layout->size;
2585 $_->[0] = $w + $_->[3]; 2699
2586 $_->[1] = $h; 2700 $para->{w} = $w + $para->{indent};
2701 $para->{h} = $h;
2702 $para->{wrapped} = $layout->has_wrapped;
2587 } 2703 }
2588 2704
2589 $height += $_->[1]; 2705 $height += $para->{h};
2590 } 2706 }
2591 2707
2592 $self->{height} = $height; 2708 $self->{height} = $height;
2593 2709
2594 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2710 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2595 2711
2596 delete $self->{texture}; 2712 delete $self->{texture};
2713 }
2714
2715 if (delete $self->{scroll_to_bottom}) {
2716 $self->{children}[1]->set_value (1e10);
2597 } 2717 }
2598 2718
2599 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2719 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2600 glClearColor 0, 0, 0, 0; 2720 glClearColor 0, 0, 0, 0;
2601 glClear GL_COLOR_BUFFER_BIT; 2721 glClear GL_COLOR_BUFFER_BIT;
2605 my $y0 = $top; 2725 my $y0 = $top;
2606 my $y1 = $top + $H; 2726 my $y1 = $top + $H;
2607 2727
2608 my $y = 0; 2728 my $y = 0;
2609 2729
2610 my $layout = $self->{layout};
2611
2612 $layout->set_font ($self->{font}) if $self->{font};
2613
2614 glEnable GL_BLEND; 2730 glEnable GL_BLEND;
2615 #TODO# not correct in windows where rgba is forced off 2731 #TODO# not correct in windows where rgba is forced off
2616 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2732 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2617 2733
2618 for my $par (@{$self->{par}}) { 2734 for my $para (@{$self->{par}}) {
2619 my $h = $par->[1]; 2735 my $h = $para->{h};
2620 2736
2621 if ($y0 < $y + $h && $y < $y1) { 2737 if ($y0 < $y + $h && $y < $y1) {
2622 $layout->set_foreground (@{ $par->[2] }); 2738
2623 $layout->set_width ($W - $par->[3]); 2739 my $layout = $self->get_layout ($para);
2624 $layout->set_markup ($par->[4]);
2625 2740
2626 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2741 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2627 2742
2628 glRasterPos $par->[3], $y - $y0; 2743 glRasterPos $para->{indent}, $y - $y0;
2629 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2744 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745
2746 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes;
2748
2749 glDisable GL_BLEND;
2750 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, ();
2752
2753 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0;
2755
2756 $_->draw;
2757 }
2758 glEnable GL_BLEND;
2759 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760 }
2630 } 2761 }
2631 2762
2632 $y += $h; 2763 $y += $h;
2633 } 2764 }
2634 2765
2635 glDisable GL_BLEND; 2766 glDisable GL_BLEND;
2636 }; 2767 };
2637 }); 2768 });
2769}
2770
2771sub reconfigure {
2772 my ($self) = @_;
2773
2774 $self->SUPER::reconfigure;
2775
2776 $_->{w} = 1e10 for @{ $self->{par} };
2777 $self->reflow;
2638} 2778}
2639 2779
2640sub _draw { 2780sub _draw {
2641 my ($self) = @_; 2781 my ($self) = @_;
2642 2782
2645 glColor 0, 0, 0, 1; 2785 glColor 0, 0, 0, 1;
2646 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2786 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2647 glDisable GL_TEXTURE_2D; 2787 glDisable GL_TEXTURE_2D;
2648 2788
2649 $self->{children}[1]->draw; 2789 $self->{children}[1]->draw;
2650
2651} 2790}
2652 2791
2653############################################################################# 2792#############################################################################
2654 2793
2655package CFClient::UI::Animator; 2794package CFClient::UI::Animator;
2742 $tooltip .= "\n\n" . (ref $widget) . "\n" 2881 $tooltip .= "\n\n" . (ref $widget) . "\n"
2743 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2882 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2744 . "req $widget->{req_w} $widget->{req_h}\n" 2883 . "req $widget->{req_w} $widget->{req_h}\n"
2745 . "visible $widget->{visible}"; 2884 . "visible $widget->{visible}";
2746 } 2885 }
2886
2887 $tooltip =~ s/^\n+//;
2888 $tooltip =~ s/\n+$//;
2747 2889
2748 $self->add (new CFClient::UI::Label 2890 $self->add (new CFClient::UI::Label
2749 markup => $tooltip, 2891 markup => $tooltip,
2750 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2892 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2751 fontsize => 0.8, 2893 fontsize => 0.8,
2761 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2903 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2762 2904
2763 ($w + 4, $h + 4) 2905 ($w + 4, $h + 4)
2764} 2906}
2765 2907
2766sub size_allocate { 2908sub invoke_size_allocate {
2767 my ($self, $w, $h) = @_; 2909 my ($self, $w, $h) = @_;
2768 2910
2769 $self->SUPER::size_allocate ($w - 4, $h - 4); 2911 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2770} 2912}
2771 2913
2772sub visibility_change { 2914sub invoke_visibility_change {
2773 my ($self, $visible) = @_; 2915 my ($self, $visible) = @_;
2774 2916
2775 return unless $visible; 2917 return unless $visible;
2776 2918
2777 $self->{root}->on_post_alloc ("move_$self" => sub { 2919 $self->{root}->on_post_alloc ("move_$self" => sub {
2779 or return; 2921 or return;
2780 2922
2781 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2923 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2782 2924
2783 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2925 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2784 if $x + $self->{w} > $::WIDTH; 2926 if $x + $self->{w} > $self->{root}{w};
2785 2927
2786 $self->move_abs ($x, $y); 2928 $self->move_abs ($x, $y);
2787 }); 2929 });
2788} 2930}
2789 2931
2884 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3026 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2885 glDisable GL_TEXTURE_2D; 3027 glDisable GL_TEXTURE_2D;
2886 } 3028 }
2887} 3029}
2888 3030
2889sub DESTROY { 3031sub destroy {
2890 my ($self) = @_; 3032 my ($self) = @_;
2891 3033
2892 $self->{timer}->cancel 3034 $self->{timer}->cancel
2893 if $self->{timer}; 3035 if $self->{timer};
2894 3036
2895 $self->SUPER::DESTROY; 3037 $self->SUPER::destroy;
2896} 3038}
2897 3039
2898############################################################################# 3040#############################################################################
2899 3041
2900package CFClient::UI::Buttonbar; 3042package CFClient::UI::Buttonbar;
2928 # handle various types of items, only text for now 3070 # handle various types of items, only text for now
2929 if (!ref $widget) { 3071 if (!ref $widget) {
2930 $widget = new CFClient::UI::Label 3072 $widget = new CFClient::UI::Label
2931 can_hover => 1, 3073 can_hover => 1,
2932 can_events => 1, 3074 can_events => 1,
2933 text => $widget, 3075 markup => $widget,
2934 tooltip => $tooltip 3076 tooltip => $tooltip
2935 } 3077 }
2936 3078
2937 $self->{item}{$widget} = $item; 3079 $self->{item}{$widget} = $item;
2938 3080
2944 3086
2945# popup given the event (must be a mouse button down event currently) 3087# popup given the event (must be a mouse button down event currently)
2946sub popup { 3088sub popup {
2947 my ($self, $ev) = @_; 3089 my ($self, $ev) = @_;
2948 3090
2949 $self->_emit ("popdown"); 3091 $self->emit ("popdown");
2950 3092
2951 # maybe save $GRAB? must be careful about events... 3093 # maybe save $GRAB? must be careful about events...
2952 $GRAB = $self; 3094 $GRAB = $self;
2953 $self->{button} = $ev->{button}; 3095 $self->{button} = $ev->{button};
2954 3096
2955 $self->show; 3097 $self->show;
2956 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3098 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2957} 3099}
2958 3100
2959sub mouse_motion { 3101sub invoke_mouse_motion {
2960 my ($self, $ev, $x, $y) = @_; 3102 my ($self, $ev, $x, $y) = @_;
2961 3103
2962 # TODO: should use vbox->find_widget or so 3104 # TODO: should use vbox->find_widget or so
2963 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3105 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2964 $self->{hover} = $self->{item}{$HOVER}; 3106 $self->{hover} = $self->{item}{$HOVER};
2965 3107
2966 0 3108 0
2967} 3109}
2968 3110
2969sub button_up { 3111sub invoke_button_up {
2970 my ($self, $ev, $x, $y) = @_; 3112 my ($self, $ev, $x, $y) = @_;
2971 3113
2972 if ($ev->{button} == $self->{button}) { 3114 if ($ev->{button} == $self->{button}) {
2973 undef $GRAB; 3115 undef $GRAB;
2974 $self->hide; 3116 $self->hide;
2975 3117
2976 $self->_emit ("popdown"); 3118 $self->emit ("popdown");
2977 $self->{hover}[1]->() if $self->{hover}; 3119 $self->{hover}[1]->() if $self->{hover};
2978 } else { 3120 } else {
2979 return 0 3121 return 0
2980 } 3122 }
2981 3123
3018 : $self->{children}[$page_or_widget]; 3160 : $self->{children}[$page_or_widget];
3019 3161
3020 $self->{current} = $widget; 3162 $self->{current} = $widget;
3021 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3163 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3022 3164
3023 $self->_emit (page_changed => $self->{current}); 3165 $self->emit (page_changed => $self->{current});
3024 3166
3025 $self->realloc; 3167 $self->realloc;
3026} 3168}
3027 3169
3028sub visible_children { 3170sub visible_children {
3033 my ($self) = @_; 3175 my ($self) = @_;
3034 3176
3035 $self->{current}->size_request 3177 $self->{current}->size_request
3036} 3178}
3037 3179
3038sub size_allocate { 3180sub invoke_size_allocate {
3039 my ($self, $w, $h) = @_; 3181 my ($self, $w, $h) = @_;
3040 3182
3041 $self->{current}->configure (0, 0, $w, $h); 3183 $self->{current}->configure (0, 0, $w, $h);
3184
3185 1
3042} 3186}
3043 3187
3044sub _draw { 3188sub _draw {
3045 my ($self) = @_; 3189 my ($self) = @_;
3046 3190
3085 3229
3086sub set_current_page { 3230sub set_current_page {
3087 my ($self, $page) = @_; 3231 my ($self, $page) = @_;
3088 3232
3089 $self->{multiplexer}->set_current_page ($page); 3233 $self->{multiplexer}->set_current_page ($page);
3090 $self->_emit (page_changed => $self->{multiplexer}{current}); 3234 $self->emit (page_changed => $self->{multiplexer}{current});
3091} 3235}
3092 3236
3093############################################################################# 3237#############################################################################
3094 3238
3095package CFClient::UI::Combobox; 3239package CFClient::UI::Combobox;
3100 3244
3101sub new { 3245sub new {
3102 my $class = shift; 3246 my $class = shift;
3103 3247
3104 my $self = $class->SUPER::new ( 3248 my $self = $class->SUPER::new (
3105 options => [], # [title, value, tooltip], ... 3249 options => [], # [value, title, longdesc], ...
3106 value => undef, 3250 value => undef,
3107 @_, 3251 @_,
3108 ); 3252 );
3109 3253
3110 $self->_set_value ($self->{value}); 3254 $self->_set_value ($self->{value});
3111 3255
3112 $self 3256 $self
3113} 3257}
3114 3258
3115sub button_down { 3259sub invoke_button_down {
3116 my ($self, $ev) = @_; 3260 my ($self, $ev) = @_;
3117 3261
3118 my @menu_items; 3262 my @menu_items;
3119 3263
3120 for (@{ $self->{options} }) { 3264 for (@{ $self->{options} }) {
3121 my ($title, $value, $tooltip) = @$_; 3265 my ($value, $title, $tooltip) = @$_;
3122 3266
3123 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 3267 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3124 } 3268 }
3125 3269
3126 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3270 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3127} 3271}
3128 3272
3129sub _set_value { 3273sub _set_value {
3130 my ($self, $value) = @_; 3274 my ($self, $value) = @_;
3131 3275
3132 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 3276 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3133 or return; 3277 or return;
3134 3278
3135 $self->{value} = $item->[1]; 3279 $self->{value} = $item->[0];
3136 $self->set_markup ("$item->[0] ⇓"); 3280 $self->set_markup ("$item->[1] ⇓");
3137 $self->set_tooltip ($item->[2]); 3281 $self->set_tooltip ($item->[2]);
3138} 3282}
3139 3283
3140sub set_value { 3284sub set_value {
3141 my ($self, $value) = @_; 3285 my ($self, $value) = @_;
3142 3286
3143 return unless $self->{value} ne $value; 3287 return unless $self->{value} ne $value;
3144 3288
3145 $self->_set_value ($value); 3289 $self->_set_value ($value);
3146 $self->_emit (changed => $value); 3290 $self->emit (changed => $value);
3147} 3291}
3148 3292
3149############################################################################# 3293#############################################################################
3150 3294
3151package CFClient::UI::Statusbox; 3295package CFClient::UI::Statusbox;
3250 $item->{count}++; 3394 $item->{count}++;
3251 } else { 3395 } else {
3252 $item->{count} = 1; 3396 $item->{count} = 1;
3253 $item->{text} = $item->{tooltip} = $text; 3397 $item->{text} = $item->{tooltip} = $text;
3254 } 3398 }
3255 $item->{id} = ++$self->{id}; 3399 $item->{id} += 0.2;#d#
3256 $item->{timeout} = $timeout; 3400 $item->{timeout} = $timeout;
3257 delete $item->{label}; 3401 delete $item->{label};
3258 } else { 3402 } else {
3259 $self->{item}{$group} = { 3403 $self->{item}{$group} = {
3260 id => ++$self->{id}, 3404 id => ++$self->{id},
3279 3423
3280 $self->reorder; 3424 $self->reorder;
3281 $self->SUPER::reconfigure; 3425 $self->SUPER::reconfigure;
3282} 3426}
3283 3427
3284sub DESTROY { 3428sub destroy {
3285 my ($self) = @_; 3429 my ($self) = @_;
3286 3430
3287 $self->{timer}->cancel; 3431 $self->{timer}->cancel;
3288 3432
3289 $self->SUPER::DESTROY; 3433 $self->SUPER::destroy;
3290} 3434}
3291 3435
3292############################################################################# 3436#############################################################################
3293 3437
3294package CFClient::UI::Inventory; 3438package CFClient::UI::Inventory;
3326 $self->{child}->add (0, $row, $item->{face_widget}); 3470 $self->{child}->add (0, $row, $item->{face_widget});
3327 $self->{child}->add (1, $row, $item->{desc_widget}); 3471 $self->{child}->add (1, $row, $item->{desc_widget});
3328 $self->{child}->add (2, $row, $item->{weight_widget}); 3472 $self->{child}->add (2, $row, $item->{weight_widget});
3329 3473
3330 $row++; 3474 $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 } 3475 }
3529} 3476}
3530 3477
3531############################################################################# 3478#############################################################################
3532 3479
3542 commands => [], 3489 commands => [],
3543 @_, 3490 @_,
3544 ) 3491 )
3545} 3492}
3546 3493
3494my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3495
3496my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3497 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3498my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3499 "<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 => 3500my @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."); 3501 "<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 => 3502my @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."); 3503 "<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 => 3504my @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."); 3505 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3553 3506
3554sub rebuild_spell_list { 3507sub rebuild_spell_list {
3555 my ($self) = @_; 3508 my ($self) = @_;
3556 3509
3557 $CFClient::UI::ROOT->on_refresh ($self => sub { 3510 $CFClient::UI::ROOT->on_refresh ($self => sub {
3558 $self->clear; 3511 $self->clear;
3559 3512
3513 return unless $::CONN;
3514
3560 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name"); 3515 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3516 $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); 3517 $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); 3518 $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); 3519 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3564 3520
3565 my $row = 0; 3521 my $row = 0;
3566 3522
3567 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3523 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3568 my $spell = $self->{spell}{$_}; 3524 my $spell = $self->{spell}{$_};
3569 3525
3570 $row++; 3526 $row++;
3527
3528 my $spell_cb = sub {
3529 my ($widget, $ev) = @_;
3530
3531 if ($ev->{button} == 1) {
3532 $::CONN->user_send ("cast $spell->{name}");
3533 } elsif ($ev->{button} == 2) {
3534 $::CONN->user_send ("invoke $spell->{name}");
3535 } elsif ($ev->{button} == 3) {
3536 (new CFClient::UI::Menu
3537 items => [
3538 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3539 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3540 ],
3541 )->popup ($ev);
3542 } else {
3543 return 0;
3544 }
3545
3546 1
3547 };
3548
3549 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3550
3551 #TODO: add path info to tooltip
3552 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3571 3553
3572 $self->add (0, $row, new CFClient::UI::Face 3554 $self->add (0, $row, new CFClient::UI::Face
3573 face => $spell->{face}, 3555 face => $spell->{face},
3574 can_hover => 1, 3556 can_hover => 1,
3575 can_events => 1, 3557 can_events => 1,
3576 tooltip => $spell->{message}, 3558 tooltip => $tooltip,
3559 on_button_down => $spell_cb,
3577 ); 3560 );
3578 3561
3579 $self->add (1, $row, new CFClient::UI::Label 3562 $self->add (1, $row, new CFClient::UI::Label
3580 expand => 1, 3563 expand => 1,
3581 text => $spell->{name}, 3564 text => $spell->{name},
3582 can_hover => 1, 3565 can_hover => 1,
3583 can_events => 1, 3566 can_events => 1,
3584 tooltip => $spell->{message}, 3567 tooltip => $tooltip,
3568 on_button_down => $spell_cb,
3585 ); 3569 );
3586 3570
3571 $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); 3572 $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); 3573 $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); 3574 $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 } 3575 }
3598 }); 3576 });
3599} 3577}
3600 3578
3601sub add_spell { 3579sub add_spell {
3607 3585
3608sub remove_spell { 3586sub remove_spell {
3609 my ($self, $spell) = @_; 3587 my ($self, $spell) = @_;
3610 3588
3611 delete $self->{spell}->{$spell->{name}}; 3589 delete $self->{spell}->{$spell->{name}};
3590 $self->rebuild_spell_list;
3591}
3592
3593sub clear_spells {
3594 my ($self) = @_;
3595
3596 $self->{spell} = {};
3612 $self->rebuild_spell_list; 3597 $self->rebuild_spell_list;
3613} 3598}
3614 3599
3615############################################################################# 3600#############################################################################
3616 3601
3653 $coord = $max - $size if $coord > $max - $size; 3638 $coord = $max - $size if $coord > $max - $size;
3654 3639
3655 int $coord + 0.5 3640 int $coord + 0.5
3656} 3641}
3657 3642
3658sub size_allocate { 3643sub invoke_size_allocate {
3659 my ($self, $w, $h) = @_; 3644 my ($self, $w, $h) = @_;
3660 3645
3661 for my $child ($self->children) { 3646 for my $child ($self->children) {
3662 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3647 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3663 3648
3667 $X = _to_pixel $X, $W, $self->{w}; 3652 $X = _to_pixel $X, $W, $self->{w};
3668 $Y = _to_pixel $Y, $H, $self->{h}; 3653 $Y = _to_pixel $Y, $H, $self->{h};
3669 3654
3670 $child->configure ($X, $Y, $W, $H); 3655 $child->configure ($X, $Y, $W, $H);
3671 } 3656 }
3657
3658 1
3672} 3659}
3673 3660
3674sub coord2local { 3661sub coord2local {
3675 my ($self, $x, $y) = @_; 3662 my ($self, $x, $y) = @_;
3676 3663

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines