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.288 by root, Mon Jun 5 21:14:40 2006 UTC vs.
Revision 1.323 by root, Wed Jul 5 03:01:01 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
526} 523}
527 524
528sub reconfigure { 525sub reconfigure {
529 my ($self) = @_; 526 my ($self) = @_;
530 527
531 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534
535 $self->realloc; 528 $self->realloc;
536 $self->update; 529 $self->update;
537} 530}
538 531
539# using global variables seems a bit hacky, but passing through all drawing 532# using global variables seems a bit hacky, but passing through all drawing
546 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
547 540
548 # update screen rectangle 541 # update screen rectangle
549 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
550 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
551 local $draw_w = $draw_x + $self->{w};
552 local $draw_h = $draw_y + $self->{h};
553 544
554 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
555 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
556 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
557 548
597 588
598sub DESTROY { 589sub DESTROY {
599 my ($self) = @_; 590 my ($self) = @_;
600 591
601 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
602 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
603} 596}
604 597
605############################################################################# 598#############################################################################
606 599
607package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
772} 765}
773 766
774sub add { 767sub add {
775 my ($self, $child) = @_; 768 my ($self, $child) = @_;
776 769
777 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
778
779 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
780} 772}
781 773
782sub remove { 774sub remove {
783 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
792 784
793sub size_request { 785sub size_request {
794 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
795} 787}
796 788
797sub size_allocate { 789sub invoke_size_allocate {
798 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
799 791
800 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
801} 795}
802 796
803############################################################################# 797#############################################################################
804 798
805# back-buffered drawing area 799# back-buffered drawing area
821 815
822 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
823 $self->SUPER::update; 817 $self->SUPER::update;
824} 818}
825 819
826sub size_allocate { 820sub invoke_size_allocate {
827 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
828 822
829 $self->SUPER::size_allocate ($w, $h);
830 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
831} 826}
832 827
833sub _render { 828sub _render {
834 my ($self) = @_; 829 my ($self) = @_;
835 830
896 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
897 892
898 ($w, $h) 893 ($w, $h)
899} 894}
900 895
901sub size_allocate { 896sub invoke_size_allocate {
902 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
903 898
904 my $child = $self->child; 899 my $child = $self->child;
905 900
906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
908 903
909 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
910 $self->update; 905 $self->update;
906
907 1
911} 908}
912 909
913sub set_offset { 910sub set_offset {
914 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
915 912
989 $self->add ($child) if $child; 986 $self->add ($child) if $child;
990 987
991 $self 988 $self
992} 989}
993 990
991#TODO# update range on size_allocate depending on child
992
994sub add { 993sub add {
995 my ($self, $widget) = @_; 994 my ($self, $widget) = @_;
996 995
997 $self->{vp}->add ($self->{child} = $widget); 996 $self->{vp}->add ($self->{child} = $widget);
998} 997}
999 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
1000sub update { 1005sub update {
1001 my ($self) = @_; 1006 my ($self) = @_;
1002 1007
1003 $self->SUPER::update; 1008 $self->SUPER::update;
1004 1009
1005 # todo: overwrite size_allocate of child 1010 $self->update_slider;
1006 my $child = $self->{vp}->child;
1007 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1008} 1011}
1009 1012
1010sub size_allocate { 1013sub invoke_size_allocate {
1011 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
1012 1015
1016 $self->update_slider;
1017
1013 $self->SUPER::size_allocate ($w, $h); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
1014
1015 my $child = $self->{vp}->child;
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1017} 1019}
1018
1019#TODO# update range on size_allocate depending on child
1020# update viewport offset on scroll
1021 1020
1022############################################################################# 1021#############################################################################
1023 1022
1024package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
1025 1024
1075 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1076 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);
1077 1076
1078sub new { 1077sub new {
1079 my ($class, %arg) = @_; 1078 my ($class, %arg) = @_;
1080
1081 my $title = delete $arg{title};
1082 1079
1083 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1084 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1085 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1086 border => 0.6, 1083 border => 0.6,
1088 min_w => 16, 1085 min_w => 16,
1089 min_h => 16, 1086 min_h => 16,
1090 %arg, 1087 %arg,
1091 ); 1088 );
1092 1089
1093 $self->{title} = new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1094 align => 0, 1091 align => 0,
1095 valign => 1, 1092 valign => 1,
1096 text => $title, 1093 text => $self->{title},
1097 fontsize => $self->{border} 1094 fontsize => $self->{border},
1098 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 }
1099 1105
1100 $self 1106 $self
1101} 1107}
1102 1108
1103sub add { 1109sub add {
1104 my ($self, @widgets) = @_; 1110 my ($self, @widgets) = @_;
1105 1111
1106 $self->SUPER::add (@widgets); 1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1108} 1115}
1109 1116
1110sub border { 1117sub border {
1111 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1112} 1119}
1113 1120
1114sub size_request { 1121sub size_request {
1115 my ($self) = @_; 1122 my ($self) = @_;
1116 1123
1117 $self->{title}->size_request 1124 $self->{title_widget}->size_request
1118 if $self->{title}; 1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1119 1129
1120 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1121 1131
1122 ( 1132 (
1123 $w + $self->border * 2, 1133 $w + $self->border * 2,
1124 $h + $self->border * 2, 1134 $h + $self->border * 2,
1125 ) 1135 )
1126} 1136}
1127 1137
1128sub size_allocate { 1138sub invoke_size_allocate {
1129 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1130 1140
1131 if ($self->{title}) { 1141 if ($self->{title_widget}) {
1132 $self->{title}{w} = $w; 1142 $self->{title_widget}{w} = $w;
1133 $self->{title}{h} = $h; 1143 $self->{title_widget}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h); 1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1135 } 1145 }
1136 1146
1137 my $border = $self->border; 1147 my $border = $self->border;
1138 1148
1139 $h -= List::Util::max 0, $border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1140 $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;
1141 1164
1142 $self->child->configure ($border, $border, $w, $h); 1165 1
1143} 1166}
1144 1167
1145sub button_down { 1168sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1147 1170
1148 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
1149 my $border = $self->border; 1172 my $border = $self->border;
1150 1173
1181 1204
1182 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1183 1206
1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1185 # HACK: the next line is required to enforce placement 1208 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1187 }; 1210 };
1188 } else { 1211 } else {
1189 return 0; 1212 return 0;
1190 } 1213 }
1191 1214
1192 1 1215 1
1193} 1216}
1194 1217
1195sub button_up { 1218sub invoke_button_up {
1196 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1197 1220
1198 !!delete $self->{motion} 1221 ! ! delete $self->{motion}
1199} 1222}
1200 1223
1201sub mouse_motion { 1224sub invoke_mouse_motion {
1202 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1203 1226
1204 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205 1228
1206 !!$self->{motion} 1229 ! ! $self->{motion}
1207} 1230}
1208 1231
1209sub _draw { 1232sub _draw {
1210 my ($self) = @_; 1233 my ($self) = @_;
1211 1234
1237 1260
1238 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
1239 1262
1240 $child->draw; 1263 $child->draw;
1241 1264
1242 if ($self->{title}) { 1265 if ($self->{title_widget}) {
1243 glTranslate 0, $border - $self->{h}; 1266 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw; 1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1245 } 1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1246} 1274}
1247 1275
1248############################################################################# 1276#############################################################################
1249 1277
1250package CFClient::UI::Table; 1278package CFClient::UI::Table;
1273 1301
1274 $child->set_parent ($self); 1302 $child->set_parent ($self);
1275 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1276 1304
1277 $self->realloc; 1305 $self->realloc;
1306}
1307
1308sub remove {
1309 my ($self, $child) = @_;
1310
1311 # TODO: not yet implemented
1278} 1312}
1279 1313
1280# 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?
1281sub clear { 1315sub clear {
1282 my ($self) = @_; 1316 my ($self) = @_;
1323 (sum @$ws), 1357 (sum @$ws),
1324 (sum @$hs), 1358 (sum @$hs),
1325 ) 1359 )
1326} 1360}
1327 1361
1328sub size_allocate { 1362sub invoke_size_allocate {
1329 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1330 1364
1331 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1332 1366
1333 my $req_w = (sum @$ws) || 1; 1367 my $req_w = (sum @$ws) || 1;
1365 } 1399 }
1366 1400
1367 $y += $row_h; 1401 $y += $row_h;
1368 } 1402 }
1369 1403
1404 1
1370} 1405}
1371 1406
1372sub find_widget { 1407sub find_widget {
1373 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1374 1409
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 ) 1448 )
1414} 1449}
1415 1450
1416sub size_allocate { 1451sub invoke_size_allocate {
1417 my ($self, $w, $h) = @_; 1452 my ($self, $w, $h) = @_;
1418 1453
1419 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1420 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1421 1456
1422 my @req; 1457 my @req;
1423 1458
1424 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1425 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1426 } else { 1461 } else {
1427 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1428 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1429 1464
1430 if ($req > $space) { 1465 if ($req > $space) {
1431 # ah well, not enough space 1466 # ah well, not enough space
1432 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1433 } else { 1468 } else {
1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1435 1470
1436 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1437 1472
1438 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1439 for 0 .. $#$children; 1474 for 0 .. $#children;
1440 } 1475 }
1441 } 1476 }
1442 1477
1443 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1444 1479
1445 my $pos = 0; 1480 my $pos = 0;
1446 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1447 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1448 $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));
1449 1484
1450 $pos += $alloc; 1485 $pos += $alloc;
1451 } 1486 }
1452 1487
1453 1 1488 1
1556 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1557 1592
1558 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1559 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1560 1595
1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1562 $self->{layout}->set_text ($text); 1596 $self->{layout}->set_text ($text);
1563 1597
1564 delete $self->{req_h}; 1598 delete $self->{size_req};
1565 $self->realloc; 1599 $self->realloc;
1566 $self->update; 1600 $self->update;
1567} 1601}
1568 1602
1569sub set_markup { 1603sub set_markup {
1572 return if $self->{text} eq "M$markup"; 1606 return if $self->{text} eq "M$markup";
1573 $self->{text} = "M$markup"; 1607 $self->{text} = "M$markup";
1574 1608
1575 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1609 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1576 1610
1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1578 $self->{layout}->set_markup ($markup); 1611 $self->{layout}->set_markup ($markup);
1579 1612
1580 delete $self->{req_h}; 1613 delete $self->{size_req};
1581 $self->realloc; 1614 $self->realloc;
1582 $self->update; 1615 $self->update;
1583} 1616}
1584 1617
1585sub size_request { 1618sub size_request {
1586 my ($self) = @_; 1619 my ($self) = @_;
1587 1620
1588 if (exists $self->{req_h}) { 1621 $self->{size_req} ||= do {
1589 @$self{qw(req_w req_h)}
1590 } else {
1591 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1622 $self->{layout}->set_font ($self->{font}) if $self->{font};
1592 $self->{layout}->set_width ($self->{max_w} || -1); 1623 $self->{layout}->set_width ($self->{max_w} || -1);
1593 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1624 $self->{layout}->set_ellipsise ($self->{ellipsise});
1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1625 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1627
1597 my ($w, $h) = $self->{layout}->size; 1628 my ($w, $h) = $self->{layout}->size;
1598 1629
1599 if (exists $self->{template}) { 1630 if (exists $self->{template}) {
1600 $self->{template}->set_font ($self->{font}) if $self->{font}; 1631 $self->{template}->set_font ($self->{font}) if $self->{font};
1632 $self->{template}->set_width ($self->{max_w} || -1);
1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1633 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1602 1634
1603 my ($w2, $h2) = $self->{template}->size; 1635 my ($w2, $h2) = $self->{template}->size;
1604 1636
1605 $w = List::Util::max $w, $w2; 1637 $w = List::Util::max $w, $w2;
1606 $h = List::Util::max $h, $h2; 1638 $h = List::Util::max $h, $h2;
1607 } 1639 }
1608 1640
1609 ($w, $h) 1641 [$w, $h]
1610 } 1642 };
1611}
1612 1643
1644 @{ $self->{size_req} }
1645}
1646
1647sub baseline_shift {
1648 $_[0]{layout}->descent
1649}
1650
1613sub size_allocate { 1651sub invoke_size_allocate {
1614 my ($self, $w, $h) = @_; 1652 my ($self, $w, $h) = @_;
1615 1653
1616 delete $self->{ox}; 1654 delete $self->{ox};
1617 1655
1618 delete $self->{texture} 1656 delete $self->{texture}
1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1657 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1658
1659 1
1620} 1660}
1621 1661
1622sub set_fontsize { 1662sub set_fontsize {
1623 my ($self, $fontsize) = @_; 1663 my ($self, $fontsize) = @_;
1624 1664
1625 $self->{fontsize} = $fontsize; 1665 $self->{fontsize} = $fontsize;
1666 delete $self->{size_req};
1626 delete $self->{texture}; 1667 delete $self->{texture};
1627 1668
1628 $self->realloc; 1669 $self->realloc;
1629} 1670}
1630 1671
1672sub reconfigure {
1673 my ($self) = @_;
1674
1675 delete $self->{size_req};
1676 delete $self->{texture};
1677
1678 $self->SUPER::reconfigure;
1679}
1680
1631sub _draw { 1681sub _draw {
1632 my ($self) = @_; 1682 my ($self) = @_;
1633 1683
1634 $self->SUPER::_draw; # draw background, if applicable 1684 $self->SUPER::_draw; # draw background, if applicable
1635 1685
1636 my $tex = $self->{texture} ||= do { 1686 my $size = $self->{texture} ||= do {
1637 $self->{layout}->set_foreground (@{$self->{fg}}); 1687 $self->{layout}->set_foreground (@{$self->{fg}});
1638 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1688 $self->{layout}->set_font ($self->{font}) if $self->{font};
1639 $self->{layout}->set_width ($self->{w}); 1689 $self->{layout}->set_width ($self->{w});
1640 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1690 $self->{layout}->set_ellipsise ($self->{ellipsise});
1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1643 1693
1644 new_from_layout CFClient::Texture $self->{layout} 1694 [$self->{layout}->size]
1645 }; 1695 };
1646 1696
1647 unless (exists $self->{ox}) { 1697 unless (exists $self->{ox}) {
1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1699 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1650 : ($self->{w} - $tex->{w}) * 0.5); 1700 : ($self->{w} - $size->[0]) * 0.5);
1651 1701
1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1703 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1654 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $size->[1]) * 0.5);
1655 }; 1705 };
1656 1706
1657 glEnable GL_TEXTURE_2D; 1707 my $w = List::Util::min $self->{w} + 4, $size->[0];
1708 my $h = List::Util::min $self->{h} + 2, $size->[1];
1658 1709
1659 if ($tex->{format} == GL_ALPHA) { 1710 $self->{layout}->render ($self->{ox}, $self->{oy});
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1661 glColor @{$self->{fg}};
1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1666 }
1667
1668 glDisable GL_TEXTURE_2D;
1669} 1711}
1670 1712
1671############################################################################# 1713#############################################################################
1672 1714
1673package CFClient::UI::EntryBase; 1715package CFClient::UI::EntryBase;
1687 can_hover => 1, 1729 can_hover => 1,
1688 can_focus => 1, 1730 can_focus => 1,
1689 valign => 0, 1731 valign => 0,
1690 can_events => 1, 1732 can_events => 1,
1691 #text => ... 1733 #text => ...
1734 #hidden => "*",
1692 @_ 1735 @_
1693 ) 1736 )
1694} 1737}
1695 1738
1696sub _set_text { 1739sub _set_text {
1703 $self->{last_activity} = $::NOW; 1746 $self->{last_activity} = $::NOW;
1704 $self->{text} = $text; 1747 $self->{text} = $text;
1705 1748
1706 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1707 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h}; 1751 delete $self->{size_req};
1709 1752
1710 $self->_emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1711 1754
1712 $self->realloc; 1755 $self->realloc;
1713 $self->update; 1756 $self->update;
1714} 1757}
1715 1758
1730 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1731 1774
1732 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1733} 1776}
1734 1777
1735sub key_down { 1778sub invoke_key_down {
1736 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1737 1780
1738 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1739 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1740 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
1752 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1753 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1754 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1755 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1756 } elsif ($uni == 27) { 1799 } elsif ($uni == 27) {
1757 $self->_emit ('escape'); 1800 $self->emit ('escape');
1758 } elsif ($uni) { 1801 } elsif ($uni) {
1759 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else { 1803 } else {
1761 return 0; 1804 return 0;
1762 } 1805 }
1766 $self->realloc; 1809 $self->realloc;
1767 1810
1768 1 1811 1
1769} 1812}
1770 1813
1771sub focus_in { 1814sub invoke_focus_in {
1772 my ($self) = @_; 1815 my ($self) = @_;
1773 1816
1774 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1775 1818
1776 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1777} 1820}
1778 1821
1779sub button_down { 1822sub invoke_button_down {
1780 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1781 1824
1782 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1783 1826
1784 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1785 1828
1786 # byte-index to char-index 1829 # byte-index to char-index
1787 my $text = $self->{text}; 1830 my $text = $self->{text};
1792 $self->update; 1835 $self->update;
1793 1836
1794 1 1837 1
1795} 1838}
1796 1839
1797sub mouse_motion { 1840sub invoke_mouse_motion {
1798 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1799# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1842# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1800 1843
1801 0 1844 1
1802} 1845}
1803 1846
1804sub _draw { 1847sub _draw {
1805 my ($self) = @_; 1848 my ($self) = @_;
1806 1849
1847 1890
1848our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1849 1892
1850use CFClient::OpenGL; 1893use CFClient::OpenGL;
1851 1894
1852sub key_down { 1895sub invoke_key_down {
1853 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1854 1897
1855 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1856 1899
1857 if ($sym == 13) { 1900 if ($sym == 13) {
1858 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1859 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1860 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1861 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1862 $self->_emit (activate => $txt); 1906 $self->emit (activate => $txt);
1863 $self->update; 1907 $self->update;
1864 1908
1865 } elsif ($sym == CFClient::SDLK_UP) { 1909 } elsif ($sym == CFClient::SDLK_UP) {
1866 if ($self->{history_pointer} < 0) { 1910 if ($self->{history_pointer} < 0) {
1867 $self->{history_saveback} = $self->get_text; 1911 $self->{history_saveback} = $self->get_text;
1883 } else { 1927 } else {
1884 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1885 } 1929 }
1886 1930
1887 } else { 1931 } else {
1888 return $self->SUPER::key_down ($ev) 1932 return $self->SUPER::invoke_key_down ($ev)
1889 } 1933 }
1890 1934
1891 1 1935 1
1892} 1936}
1893 1937
1917 can_events => 1, 1961 can_events => 1,
1918 @_ 1962 @_
1919 ) 1963 )
1920} 1964}
1921 1965
1922sub activate { }
1923
1924sub button_up { 1966sub invoke_button_up {
1925 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1926 1968
1927 $self->emit ("activate") 1969 $self->emit ("activate")
1928 if $x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1929 && $y >= 0 && $y < $self->{h}; 1971 && $y >= 0 && $y < $self->{h};
1943 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1944 1986
1945 glDisable GL_TEXTURE_2D; 1987 glDisable GL_TEXTURE_2D;
1946 1988
1947 $self->SUPER::_draw; 1989 $self->SUPER::_draw;
1990}
1991
1992#############################################################################
1993
1994package CFClient::UI::ImageButton;
1995
1996our @ISA = CFClient::UI::Image::;
1997
1998use CFClient::OpenGL;
1999
2000my %textures;
2001
2002sub new {
2003 my $class = shift;
2004
2005 my $self = $class->SUPER::new (
2006 padding_x => 4,
2007 padding_y => 4,
2008 fg => [1, 1, 1],
2009 active_fg => [0, 0, 1],
2010 can_hover => 1,
2011 align => 0,
2012 valign => 0,
2013 can_events => 1,
2014 @_
2015 );
2016}
2017
2018sub invoke_button_up {
2019 my ($self, $ev, $x, $y) = @_;
2020
2021 $self->emit ("activate")
2022 if $x >= 0 && $x < $self->{w}
2023 && $y >= 0 && $y < $self->{h};
2024
2025 1
1948} 2026}
1949 2027
1950############################################################################# 2028#############################################################################
1951 2029
1952package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
1979 my ($self) = @_; 2057 my ($self) = @_;
1980 2058
1981 (6) x 2 2059 (6) x 2
1982} 2060}
1983 2061
2062sub toggle {
2063 my ($self) = @_;
2064
2065 $self->{state} = !$self->{state};
2066 $self->emit (changed => $self->{state});
2067 $self->update;
2068}
2069
1984sub button_down { 2070sub invoke_button_down {
1985 my ($self, $ev, $x, $y) = @_; 2071 my ($self, $ev, $x, $y) = @_;
1986 2072
1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2073 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2074 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1989 $self->{state} = !$self->{state}; 2075 $self->toggle;
1990 $self->_emit (changed => $self->{state});
1991 } else { 2076 } else {
1992 return 0 2077 return 0
1993 } 2078 }
1994 2079
1995 1 2080 1
2020package CFClient::UI::Image; 2105package CFClient::UI::Image;
2021 2106
2022our @ISA = CFClient::UI::Base::; 2107our @ISA = CFClient::UI::Base::;
2023 2108
2024use CFClient::OpenGL; 2109use CFClient::OpenGL;
2025use Carp qw/confess/;
2026 2110
2027our %loaded_images; 2111our %texture_cache;
2028 2112
2029sub new { 2113sub new {
2030 my $class = shift; 2114 my $class = shift;
2031 2115
2032 my $self = $class->SUPER::new (can_events => 0, @_); 2116 my $self = $class->SUPER::new (
2117 can_events => 0,
2118 @_,
2119 );
2033 2120
2034 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2121 $self->{path}
2122 or Carp::croak "required attribute 'path' not set";
2035 2123
2036 $loaded_images{$self->{image}} ||= 2124 $self->{tex} = $texture_cache{$self->{path}} ||=
2037 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2125 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2038 2126
2039 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2127 Scalar::Util::weaken $texture_cache{$self->{path}};
2040 2128
2041 Scalar::Util::weaken $loaded_images{$self->{image}}; 2129 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2042
2043 $self->{aspect} = $tex->{w} / $tex->{h};
2044 2130
2045 $self 2131 $self
2046} 2132}
2047 2133
2048sub size_request { 2134sub size_request {
2049 my ($self) = @_; 2135 my ($self) = @_;
2050 2136
2051 ($self->{tex}->{w}, $self->{tex}->{h}) 2137 ($self->{tex}{w}, $self->{tex}{h})
2052} 2138}
2053 2139
2054sub _draw { 2140sub _draw {
2055 my ($self) = @_; 2141 my ($self) = @_;
2056 2142
2165 my $ycut1 = max 0, min 1, $ycut; 2251 my $ycut1 = max 0, min 1, $ycut;
2166 my $ycut2 = max 0, min 1, $ycut - 1; 2252 my $ycut2 = max 0, min 1, $ycut - 1;
2167 2253
2168 my $h1 = $self->{h} * (1 - $ycut1); 2254 my $h1 = $self->{h} * (1 - $ycut1);
2169 my $h2 = $self->{h} * (1 - $ycut2); 2255 my $h2 = $self->{h} * (1 - $ycut2);
2256 my $h3 = $self->{h};
2257
2258 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2170 2259
2171 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2261 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2262 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2174 glEnable GL_TEXTURE_2D; 2263 glEnable GL_TEXTURE_2D;
2193 2282
2194 if ($t3) { 2283 if ($t3) {
2195 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2284 glBindTexture GL_TEXTURE_2D, $t3->{name};
2196 glBegin GL_QUADS; 2285 glBegin GL_QUADS;
2197 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2286 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2198 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2287 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2199 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2288 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2200 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2289 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2201 glEnd; 2290 glEnd;
2202 } 2291 }
2203 2292
2204 glDisable GL_BLEND; 2293 glDisable GL_BLEND;
2292 $self->update; 2381 $self->update;
2293 2382
2294 $self 2383 $self
2295} 2384}
2296 2385
2297sub changed { }
2298
2299sub set_range { 2386sub set_range {
2300 my ($self, $range) = @_; 2387 my ($self, $range) = @_;
2301 2388
2302 ($range, $self->{range}) = ($self->{range}, $range); 2389 ($range, $self->{range}) = ($self->{range}, $range);
2303 2390
2304 $self->update
2305 if "@$range" ne "@{$self->{range}}"; 2391 if ("@$range" ne "@{$self->{range}}") {
2392 $self->update;
2393 $self->set_value ($self->{range}[0]);
2394 }
2306} 2395}
2307 2396
2308sub set_value { 2397sub set_value {
2309 my ($self, $value) = @_; 2398 my ($self, $value) = @_;
2310 2399
2321 if $unit; 2410 if $unit;
2322 2411
2323 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2412 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2324 2413
2325 if ($value != $old_value) { 2414 if ($value != $old_value) {
2326 $self->_emit (changed => $value); 2415 $self->emit (changed => $value);
2327 $self->update; 2416 $self->update;
2328 } 2417 }
2329} 2418}
2330 2419
2331sub size_request { 2420sub size_request {
2332 my ($self) = @_; 2421 my ($self) = @_;
2333 2422
2334 ($self->{req_w}, $self->{req_h}) 2423 ($self->{req_w}, $self->{req_h})
2335} 2424}
2336 2425
2337sub button_down { 2426sub invoke_button_down {
2338 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2339 2428
2340 $self->SUPER::button_down ($ev, $x, $y); 2429 $self->SUPER::invoke_button_down ($ev, $x, $y);
2341 2430
2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2431 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2343 2432
2344 $self->mouse_motion ($ev, $x, $y) 2433 $self->invoke_mouse_motion ($ev, $x, $y)
2345} 2434}
2346 2435
2347sub mouse_motion { 2436sub invoke_mouse_motion {
2348 my ($self, $ev, $x, $y) = @_; 2437 my ($self, $ev, $x, $y) = @_;
2349 2438
2350 if ($GRAB == $self) { 2439 if ($GRAB == $self) {
2351 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2440 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2352 2441
2457sub set_range { shift->{slider}->set_range (@_) } 2546sub set_range { shift->{slider}->set_range (@_) }
2458sub set_value { shift->{slider}->set_value (@_) } 2547sub set_value { shift->{slider}->set_value (@_) }
2459 2548
2460############################################################################# 2549#############################################################################
2461 2550
2462package CFClient::UI::TextView; 2551package CFClient::UI::TextScroller;
2463 2552
2464our @ISA = CFClient::UI::HBox::; 2553our @ISA = CFClient::UI::HBox::;
2465 2554
2466use CFClient::OpenGL; 2555use CFClient::OpenGL;
2467 2556
2469 my $class = shift; 2558 my $class = shift;
2470 2559
2471 my $self = $class->SUPER::new ( 2560 my $self = $class->SUPER::new (
2472 fontsize => 1, 2561 fontsize => 1,
2473 can_events => 0, 2562 can_events => 0,
2563 indent => 0,
2474 #font => default_font 2564 #font => default_font
2475 @_, 2565 @_,
2476 2566
2477 layout => (new CFClient::Layout 1), 2567 layout => (new CFClient::Layout),
2478 par => [], 2568 par => [],
2479 height => 0, 2569 height => 0,
2480 children => [ 2570 children => [
2481 (new CFClient::UI::Empty expand => 1), 2571 (new CFClient::UI::Empty expand => 1),
2482 (new CFClient::UI::Slider vertical => 1), 2572 (new CFClient::UI::Slider vertical => 1),
2493 2583
2494 $self->{fontsize} = $fontsize; 2584 $self->{fontsize} = $fontsize;
2495 $self->reflow; 2585 $self->reflow;
2496} 2586}
2497 2587
2588sub size_request {
2589 my ($self) = @_;
2590
2591 my ($empty, $slider) = @{ $self->{children} };
2592
2593 local $self->{children} = [$empty, $slider];
2594 $self->SUPER::size_request
2595}
2596
2498sub size_allocate { 2597sub invoke_size_allocate {
2499 my ($self, $w, $h) = @_; 2598 my ($self, $w, $h) = @_;
2500 2599
2501 $self->SUPER::size_allocate ($w, $h); 2600 my ($empty, $slider, @other) = @{ $self->{children} };
2601 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2502 2602
2503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2603 $self->{layout}->set_font ($self->{font}) if $self->{font};
2504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2604 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2505 $self->{layout}->set_width ($self->{children}[0]{w}); 2605 $self->{layout}->set_width ($empty->{w});
2606 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2506 2607
2507 $self->reflow; 2608 $self->reflow;
2508}
2509 2609
2510sub text_size { 2610 local $self->{children} = [$empty, $slider];
2511 my ($self, $text, $indent) = @_; 2611 $self->SUPER::invoke_size_allocate ($w, $h)
2612}
2613
2614sub get_layout {
2615 my ($self, $para) = @_;
2512 2616
2513 my $layout = $self->{layout}; 2617 my $layout = $self->{layout};
2514 2618
2619 $layout->set_font ($self->{font}) if $self->{font};
2620 $layout->set_foreground (@{$para->{fg}});
2515 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2621 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $layout->set_width ($self->{children}[0]{w} - $indent); 2622 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2623 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2517 $layout->set_markup ($text); 2624 $layout->set_markup ($para->{markup});
2625
2626 $layout->set_shapes (
2627 map
2628 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2629 @{$para->{widget}}
2518 2630 );
2631
2519 $layout->size 2632 $layout
2520} 2633}
2521 2634
2522sub reflow { 2635sub reflow {
2523 my ($self) = @_; 2636 my ($self) = @_;
2524 2637
2533 $self->{children}[1]->set_value ($offset); 2646 $self->{children}[1]->set_value ($offset);
2534} 2647}
2535 2648
2536sub clear { 2649sub clear {
2537 my ($self) = @_; 2650 my ($self) = @_;
2651
2652 my (undef, undef, @other) = @{ $self->{children} };
2653 $self->remove ($_) for @other;
2538 2654
2539 $self->{par} = []; 2655 $self->{par} = [];
2540 $self->{height} = 0; 2656 $self->{height} = 0;
2541 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2657 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2542} 2658}
2543 2659
2544sub add_paragraph { 2660sub add_paragraph {
2545 my ($self, $color, $text, $indent) = @_; 2661 my ($self, $color, $para, $indent) = @_;
2546 2662
2547 for my $line (split /\n/, $text) { 2663 my ($text, @w) = ref $para ? @$para : $para;
2548 my ($w, $h) = $self->text_size ($line); 2664
2549 $self->{height} += $h; 2665 $para = {
2550 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2666 w => 1e10,
2667 wrapped => 1,
2668 fg => $color,
2669 indent => $indent,
2670 markup => $text,
2671 widget => \@w,
2551 } 2672 };
2552 2673
2553 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2674 $self->add (@w) if @w;
2675 push @{$self->{par}}, $para;
2676
2677 $self->{need_reflow}++;
2678 $self->update;
2679}
2680
2681sub scroll_to_bottom {
2682 my ($self) = @_;
2683
2684 $self->{scroll_to_bottom} = 1;
2685 $self->update;
2554} 2686}
2555 2687
2556sub update { 2688sub update {
2557 my ($self) = @_; 2689 my ($self) = @_;
2558 2690
2560 2692
2561 return unless $self->{h} > 0; 2693 return unless $self->{h} > 0;
2562 2694
2563 delete $self->{texture}; 2695 delete $self->{texture};
2564 2696
2565 $ROOT->on_post_alloc ($self, sub { 2697 $ROOT->on_post_alloc ($self => sub {
2566 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2698 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2567 2699
2568 if (delete $self->{need_reflow}) { 2700 if (delete $self->{need_reflow}) {
2569 my $height = 0; 2701 my $height = 0;
2570 2702
2571 my $layout = $self->{layout};
2572
2573 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2574
2575 for (@{$self->{par}}) { 2703 for my $para (@{$self->{par}}) {
2576 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2704 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2577 $layout->set_width ($W - $_->[3]); 2705 my $layout = $self->get_layout ($para);
2578 $layout->set_markup ($_->[4]);
2579 my ($w, $h) = $layout->size; 2706 my ($w, $h) = $layout->size;
2580 $_->[0] = $w + $_->[3]; 2707
2581 $_->[1] = $h; 2708 $para->{w} = $w + $para->{indent};
2709 $para->{h} = $h;
2710 $para->{wrapped} = $layout->has_wrapped;
2582 } 2711 }
2583 2712
2584 $height += $_->[1]; 2713 $height += $para->{h};
2585 } 2714 }
2586 2715
2587 $self->{height} = $height; 2716 $self->{height} = $height;
2588 2717
2589 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2718 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2590 2719
2591 delete $self->{texture}; 2720 delete $self->{texture};
2721 }
2722
2723 if (delete $self->{scroll_to_bottom}) {
2724 $self->{children}[1]->set_value (1e10);
2592 } 2725 }
2593 2726
2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2727 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2595 glClearColor 0, 0, 0, 0; 2728 glClearColor 0, 0, 0, 0;
2596 glClear GL_COLOR_BUFFER_BIT; 2729 glClear GL_COLOR_BUFFER_BIT;
2600 my $y0 = $top; 2733 my $y0 = $top;
2601 my $y1 = $top + $H; 2734 my $y1 = $top + $H;
2602 2735
2603 my $y = 0; 2736 my $y = 0;
2604 2737
2605 my $layout = $self->{layout};
2606
2607 $layout->set_font ($self->{font}) if $self->{font};
2608
2609 glEnable GL_BLEND;
2610 #TODO# not correct in windows where rgba is forced off
2611 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2612
2613 for my $par (@{$self->{par}}) { 2738 for my $para (@{$self->{par}}) {
2614 my $h = $par->[1]; 2739 my $h = $para->{h};
2615 2740
2616 if ($y0 < $y + $h && $y < $y1) { 2741 if ($y0 < $y + $h && $y < $y1) {
2617 $layout->set_foreground (@{ $par->[2] });
2618 $layout->set_width ($W - $par->[3]);
2619 $layout->set_markup ($par->[4]);
2620 2742
2621 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2743 my $layout = $self->get_layout ($para);
2622 2744
2623 glRasterPos $par->[3], $y - $y0; 2745 $layout->render ($para->{indent}, $y - $y0);
2624 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2746
2747 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes;
2749
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 }
2625 } 2759 }
2626 2760
2627 $y += $h; 2761 $y += $h;
2628 } 2762 }
2629
2630 glDisable GL_BLEND;
2631 }; 2763 };
2632 }); 2764 });
2765}
2766
2767sub reconfigure {
2768 my ($self) = @_;
2769
2770 $self->SUPER::reconfigure;
2771
2772 $_->{w} = 1e10 for @{ $self->{par} };
2773 $self->reflow;
2633} 2774}
2634 2775
2635sub _draw { 2776sub _draw {
2636 my ($self) = @_; 2777 my ($self) = @_;
2637 2778
2640 glColor 0, 0, 0, 1; 2781 glColor 0, 0, 0, 1;
2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2782 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2642 glDisable GL_TEXTURE_2D; 2783 glDisable GL_TEXTURE_2D;
2643 2784
2644 $self->{children}[1]->draw; 2785 $self->{children}[1]->draw;
2645
2646} 2786}
2647 2787
2648############################################################################# 2788#############################################################################
2649 2789
2650package CFClient::UI::Animator; 2790package CFClient::UI::Animator;
2737 $tooltip .= "\n\n" . (ref $widget) . "\n" 2877 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2878 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n" 2879 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}"; 2880 . "visible $widget->{visible}";
2741 } 2881 }
2882
2883 $tooltip =~ s/^\n+//;
2884 $tooltip =~ s/\n+$//;
2742 2885
2743 $self->add (new CFClient::UI::Label 2886 $self->add (new CFClient::UI::Label
2744 markup => $tooltip, 2887 markup => $tooltip,
2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2888 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2746 fontsize => 0.8, 2889 fontsize => 0.8,
2756 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2899 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2757 2900
2758 ($w + 4, $h + 4) 2901 ($w + 4, $h + 4)
2759} 2902}
2760 2903
2761sub size_allocate { 2904sub invoke_size_allocate {
2762 my ($self, $w, $h) = @_; 2905 my ($self, $w, $h) = @_;
2763 2906
2764 $self->SUPER::size_allocate ($w - 4, $h - 4); 2907 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2765} 2908}
2766 2909
2767sub visibility_change { 2910sub invoke_visibility_change {
2768 my ($self, $visible) = @_; 2911 my ($self, $visible) = @_;
2769 2912
2770 return unless $visible; 2913 return unless $visible;
2771 2914
2772 $self->{root}->on_post_alloc ("move_$self" => sub { 2915 $self->{root}->on_post_alloc ("move_$self" => sub {
2774 or return; 2917 or return;
2775 2918
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2919 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777 2920
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2921 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH; 2922 if $x + $self->{w} > $self->{root}{w};
2780 2923
2781 $self->move_abs ($x, $y); 2924 $self->move_abs ($x, $y);
2782 }); 2925 });
2783} 2926}
2784 2927
2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3022 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2880 glDisable GL_TEXTURE_2D; 3023 glDisable GL_TEXTURE_2D;
2881 } 3024 }
2882} 3025}
2883 3026
2884sub DESTROY { 3027sub destroy {
2885 my ($self) = @_; 3028 my ($self) = @_;
2886 3029
2887 $self->{timer}->cancel 3030 $self->{timer}->cancel
2888 if $self->{timer}; 3031 if $self->{timer};
2889 3032
2890 $self->SUPER::DESTROY; 3033 $self->SUPER::destroy;
2891} 3034}
2892 3035
2893############################################################################# 3036#############################################################################
2894 3037
2895package CFClient::UI::Buttonbar; 3038package CFClient::UI::Buttonbar;
2916 ); 3059 );
2917 3060
2918 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3061 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2919 3062
2920 for my $item (@{ $self->{items} }) { 3063 for my $item (@{ $self->{items} }) {
2921 my ($widget, $cb) = @$item; 3064 my ($widget, $cb, $tooltip) = @$item;
2922 3065
2923 # handle various types of items, only text for now 3066 # handle various types of items, only text for now
2924 if (!ref $widget) { 3067 if (!ref $widget) {
3068 if ($widget =~ /\t/) {
3069 my ($left, $right) = split /\t/, $widget, 2;
3070
3071 $widget = new CFClient::UI::HBox
3072 can_hover => 1,
3073 can_events => 1,
3074 tooltip => $tooltip,
3075 children => [
3076 (new CFClient::UI::Label markup => $left, expand => 1),
3077 (new CFClient::UI::Label markup => $right, align => +1),
3078 ],
3079 ;
3080
3081 } else {
2925 $widget = new CFClient::UI::Label 3082 $widget = new CFClient::UI::Label
2926 can_hover => 1, 3083 can_hover => 1,
2927 can_events => 1, 3084 can_events => 1,
2928 text => $widget; 3085 markup => $widget,
3086 tooltip => $tooltip;
3087 }
2929 } 3088 }
2930 3089
2931 $self->{item}{$widget} = $item; 3090 $self->{item}{$widget} = $item;
2932 3091
2933 $self->{vbox}->add ($widget); 3092 $self->{vbox}->add ($widget);
2938 3097
2939# popup given the event (must be a mouse button down event currently) 3098# popup given the event (must be a mouse button down event currently)
2940sub popup { 3099sub popup {
2941 my ($self, $ev) = @_; 3100 my ($self, $ev) = @_;
2942 3101
2943 $self->_emit ("popdown"); 3102 $self->emit ("popdown");
2944 3103
2945 # maybe save $GRAB? must be careful about events... 3104 # maybe save $GRAB? must be careful about events...
2946 $GRAB = $self; 3105 $GRAB = $self;
2947 $self->{button} = $ev->{button}; 3106 $self->{button} = $ev->{button};
2948 3107
2949 $self->show; 3108 $self->show;
2950 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3109 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2951} 3110}
2952 3111
2953sub mouse_motion { 3112sub invoke_mouse_motion {
2954 my ($self, $ev, $x, $y) = @_; 3113 my ($self, $ev, $x, $y) = @_;
2955 3114
2956 # TODO: should use vbox->find_widget or so 3115 # TODO: should use vbox->find_widget or so
2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3116 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2958 $self->{hover} = $self->{item}{$HOVER}; 3117 $self->{hover} = $self->{item}{$HOVER};
2959 3118
2960 0 3119 0
2961} 3120}
2962 3121
2963sub button_up { 3122sub invoke_button_up {
2964 my ($self, $ev, $x, $y) = @_; 3123 my ($self, $ev, $x, $y) = @_;
2965 3124
2966 if ($ev->{button} == $self->{button}) { 3125 if ($ev->{button} == $self->{button}) {
2967 undef $GRAB; 3126 undef $GRAB;
2968 $self->hide; 3127 $self->hide;
2969 3128
2970 $self->_emit ("popdown"); 3129 $self->emit ("popdown");
2971 $self->{hover}[1]->() if $self->{hover}; 3130 $self->{hover}[1]->() if $self->{hover};
2972 } else { 3131 } else {
2973 return 0 3132 return 0
2974 } 3133 }
2975 3134
3002 3161
3003 $self->{current} = $self->{children}[0] 3162 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} }; 3163 if @{ $self->{children} };
3005} 3164}
3006 3165
3166sub get_current_page {
3167 my ($self) = @_;
3168
3169 $self->{current}
3170}
3171
3007sub set_current_page { 3172sub set_current_page {
3008 my ($self, $page_or_widget) = @_; 3173 my ($self, $page_or_widget) = @_;
3009 3174
3010 my $widget = ref $page_or_widget 3175 my $widget = ref $page_or_widget
3011 ? $page_or_widget 3176 ? $page_or_widget
3012 : $self->{children}[$page_or_widget]; 3177 : $self->{children}[$page_or_widget];
3013 3178
3014 $self->{current} = $widget; 3179 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3180 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016 3181
3017 $self->_emit (page_changed => $self->{current}); 3182 $self->emit (page_changed => $self->{current});
3018 3183
3019 $self->realloc; 3184 $self->realloc;
3020} 3185}
3021 3186
3022sub visible_children { 3187sub visible_children {
3027 my ($self) = @_; 3192 my ($self) = @_;
3028 3193
3029 $self->{current}->size_request 3194 $self->{current}->size_request
3030} 3195}
3031 3196
3032sub size_allocate { 3197sub invoke_size_allocate {
3033 my ($self, $w, $h) = @_; 3198 my ($self, $w, $h) = @_;
3034 3199
3035 $self->{current}->configure (0, 0, $w, $h); 3200 $self->{current}->configure (0, 0, $w, $h);
3201
3202 1
3036} 3203}
3037 3204
3038sub _draw { 3205sub _draw {
3039 my ($self) = @_; 3206 my ($self) = @_;
3040 3207
3075 ); 3242 );
3076 3243
3077 $self->{multiplexer}->add ($widget); 3244 $self->{multiplexer}->add ($widget);
3078} 3245}
3079 3246
3247sub get_current_page {
3248 my ($self) = @_;
3249
3250 $self->{multiplexer}->get_current_page
3251}
3252
3080sub set_current_page { 3253sub set_current_page {
3081 my ($self, $page) = @_; 3254 my ($self, $page) = @_;
3082 3255
3083 $self->{multiplexer}->set_current_page ($page); 3256 $self->{multiplexer}->set_current_page ($page);
3084 $self->_emit (page_changed => $self->{multiplexer}{current}); 3257 $self->emit (page_changed => $self->{multiplexer}{current});
3258}
3259
3260#############################################################################
3261
3262package CFClient::UI::Combobox;
3263
3264use utf8;
3265
3266our @ISA = CFClient::UI::Button::;
3267
3268sub new {
3269 my $class = shift;
3270
3271 my $self = $class->SUPER::new (
3272 options => [], # [value, title, longdesc], ...
3273 value => undef,
3274 @_,
3275 );
3276
3277 $self->_set_value ($self->{value});
3278
3279 $self
3280}
3281
3282sub invoke_button_down {
3283 my ($self, $ev) = @_;
3284
3285 my @menu_items;
3286
3287 for (@{ $self->{options} }) {
3288 my ($value, $title, $tooltip) = @$_;
3289
3290 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3291 }
3292
3293 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3294}
3295
3296sub _set_value {
3297 my ($self, $value) = @_;
3298
3299 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3300 or return;
3301
3302 $self->{value} = $item->[0];
3303 $self->set_markup ("$item->[1] ⇓");
3304 $self->set_tooltip ($item->[2]);
3305}
3306
3307sub set_value {
3308 my ($self, $value) = @_;
3309
3310 return unless $self->{value} ne $value;
3311
3312 $self->_set_value ($value);
3313 $self->emit (changed => $value);
3085} 3314}
3086 3315
3087############################################################################# 3316#############################################################################
3088 3317
3089package CFClient::UI::Statusbox; 3318package CFClient::UI::Statusbox;
3188 $item->{count}++; 3417 $item->{count}++;
3189 } else { 3418 } else {
3190 $item->{count} = 1; 3419 $item->{count} = 1;
3191 $item->{text} = $item->{tooltip} = $text; 3420 $item->{text} = $item->{tooltip} = $text;
3192 } 3421 }
3193 $item->{id} = ++$self->{id}; 3422 $item->{id} += 0.2;#d#
3194 $item->{timeout} = $timeout; 3423 $item->{timeout} = $timeout;
3195 delete $item->{label}; 3424 delete $item->{label};
3196 } else { 3425 } else {
3197 $self->{item}{$group} = { 3426 $self->{item}{$group} = {
3198 id => ++$self->{id}, 3427 id => ++$self->{id},
3204 count => 1, 3433 count => 1,
3205 %arg, 3434 %arg,
3206 }; 3435 };
3207 } 3436 }
3208 3437
3438 $ROOT->on_refresh (reorder => sub {
3209 $self->reorder; 3439 $self->reorder;
3440 });
3210} 3441}
3211 3442
3212sub reconfigure { 3443sub reconfigure {
3213 my ($self) = @_; 3444 my ($self) = @_;
3214 3445
3217 3448
3218 $self->reorder; 3449 $self->reorder;
3219 $self->SUPER::reconfigure; 3450 $self->SUPER::reconfigure;
3220} 3451}
3221 3452
3222sub DESTROY { 3453sub destroy {
3223 my ($self) = @_; 3454 my ($self) = @_;
3224 3455
3225 $self->{timer}->cancel; 3456 $self->{timer}->cancel;
3226 3457
3227 $self->SUPER::DESTROY; 3458 $self->SUPER::destroy;
3228} 3459}
3229 3460
3230############################################################################# 3461#############################################################################
3231 3462
3232package CFClient::UI::Inventory; 3463package CFClient::UI::Inventory;
3233 3464
3234our @ISA = CFClient::UI::ScrolledWindow::; 3465our @ISA = CFClient::UI::Table::;
3235 3466
3236sub new { 3467sub new {
3237 my $class = shift; 3468 my $class = shift;
3238 3469
3239 my $self = $class->SUPER::new ( 3470 my $self = $class->SUPER::new (
3240 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3471 col_expand => [0, 1, 0],
3241 @_, 3472 @_,
3242 ); 3473 );
3243 3474
3244 $self 3475 $self
3245} 3476}
3246 3477
3247sub set_items { 3478sub set_items {
3248 my ($self, $items) = @_; 3479 my ($self, $items) = @_;
3249 3480
3250 $self->{child}->clear; 3481 $self->clear;
3251 return unless $items; 3482 return unless $items;
3252 3483
3253 my @items = sort { 3484 my @items = sort {
3254 ($a->{type} <=> $b->{type}) 3485 ($a->{type} <=> $b->{type})
3255 or ($a->{name} cmp $b->{name}) 3486 or ($a->{name} cmp $b->{name})
3256 } @$items; 3487 } values %$items;
3257 3488
3258 $self->{real_items} = \@items; 3489 $self->{real_items} = \@items;
3259 3490
3260 my $row = 0; 3491 my $row = 0;
3261 for my $item (@items) { 3492 for my $item (@items) {
3262 CFClient::Item::update_widgets $item; 3493 CFClient::Item::update_widgets $item;
3263 3494
3264 $self->{child}->add (0, $row, $item->{face_widget}); 3495 $self->add (0, $row, $item->{face_widget});
3265 $self->{child}->add (1, $row, $item->{desc_widget}); 3496 $self->add (1, $row, $item->{desc_widget});
3266 $self->{child}->add (2, $row, $item->{weight_widget}); 3497 $self->add (2, $row, $item->{weight_widget});
3267 3498
3268 $row++; 3499 $row++;
3269 }
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::BindEditor;
3275
3276our @ISA = CFClient::UI::FancyFrame::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3282
3283 $self->add (my $vb = new CFClient::UI::VBox);
3284
3285
3286 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3287 text => "start recording",
3288 tooltip => "Start/Stops recording of actions."
3289 ."All subsequent actions after the recording started will be captured."
3290 ."The actions are displayed after the record was stopped."
3291 ."To bind the action you have to click on the 'Bind' button",
3292 on_activate => sub {
3293 unless ($self->{recording}) {
3294 $self->start;
3295 } else {
3296 $self->stop;
3297 }
3298 });
3299
3300 $vb->add (new CFClient::UI::Label text => "Actions:");
3301 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3302
3303 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3304 $vb->add (my $hb = new CFClient::UI::HBox);
3305 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3306 $hb->add (new CFClient::UI::Button
3307 text => "bind",
3308 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3309 on_activate => sub {
3310 $self->ask_for_bind;
3311 });
3312
3313 $vb->add (my $hb = new CFClient::UI::HBox);
3314 $hb->add (new CFClient::UI::Button
3315 text => "ok",
3316 expand => 1,
3317 tooltip => "This closes the binding editor and saves the binding",
3318 on_activate => sub {
3319 $self->hide;
3320 $self->commit;
3321 });
3322
3323 $hb->add (new CFClient::UI::Button
3324 text => "cancel",
3325 expand => 1,
3326 tooltip => "This closes the binding editor without saving",
3327 on_activate => sub {
3328 $self->hide;
3329 $self->{binding_cancel}->()
3330 if $self->{binding_cancel};
3331 });
3332
3333 $self->update_binding_widgets;
3334
3335 $self
3336}
3337
3338sub commit {
3339 my ($self) = @_;
3340 my ($mod, $sym, $cmds) = $self->get_binding;
3341 if ($sym != 0 && @$cmds > 0) {
3342 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3343 ."'. Don't forget 'Save Config'!");
3344 $self->{binding_change}->($mod, $sym, $cmds)
3345 if $self->{binding_change};
3346 } else {
3347 $::STATUSBOX->add ("No action bound, no key or action specified!");
3348 $self->{binding_cancel}->()
3349 if $self->{binding_cancel};
3350 }
3351}
3352
3353sub start {
3354 my ($self) = @_;
3355
3356 $self->{rec_btn}->set_text ("stop recording");
3357 $self->{recording} = 1;
3358 $self->clear_command_list;
3359 $::CONN->start_record if $::CONN;
3360}
3361
3362sub stop {
3363 my ($self) = @_;
3364
3365 $self->{rec_btn}->set_text ("start recording");
3366 $self->{recording} = 0;
3367
3368 my $rec;
3369 $rec = $::CONN->stop_record if $::CONN;
3370 return unless ref $rec eq 'ARRAY';
3371 $self->set_command_list ($rec);
3372}
3373
3374
3375sub ask_for_bind_and_commit {
3376 my ($self) = @_;
3377 $self->ask_for_bind (1);
3378}
3379
3380sub ask_for_bind {
3381 my ($self, $commit) = @_;
3382
3383 CFClient::Binder::open_binding_dialog (sub {
3384 my ($mod, $sym) = @_;
3385 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3386 $self->update_binding_widgets;
3387 $self->commit if $commit;
3388 });
3389}
3390
3391# $mod and $sym are the modifiers and key symbol
3392# $cmds is a array ref of strings (the commands)
3393# $cb is the callback that is executed on OK
3394# $ccb is the callback that is executed on CANCEL and
3395# when the binding was unsuccessful on OK
3396sub set_binding {
3397 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3398
3399 $self->clear_command_list;
3400 $self->{recording} = 0;
3401 $self->{rec_btn}->set_text ("start recording");
3402
3403 $self->{binding} = [$mod, $sym];
3404 $self->{commands} = $cmds;
3405
3406 $self->{binding_change} = $cb;
3407 $self->{binding_cancel} = $ccb;
3408
3409 $self->update_binding_widgets;
3410}
3411
3412# this is a shortcut method that asks for a binding
3413# and then just binds it.
3414sub do_quick_binding {
3415 my ($self, $cmds) = @_;
3416 $self->set_binding (undef, undef, $cmds, sub {
3417 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3418 });
3419 $self->ask_for_bind (1);
3420}
3421
3422sub update_binding_widgets {
3423 my ($self) = @_;
3424 my ($mod, $sym, $cmds) = $self->get_binding;
3425 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3426 $self->set_command_list ($cmds);
3427}
3428
3429sub get_binding {
3430 my ($self) = @_;
3431 return (
3432 $self->{binding}->[0],
3433 $self->{binding}->[1],
3434 [ grep { defined $_ } @{$self->{commands}} ]
3435 );
3436}
3437
3438sub clear_command_list {
3439 my ($self) = @_;
3440 $self->{cmdbox}->clear ();
3441}
3442
3443sub set_command_list {
3444 my ($self, $cmds) = @_;
3445
3446 $self->{cmdbox}->clear ();
3447 $self->{commands} = $cmds;
3448
3449 my $idx = 0;
3450
3451 for (@$cmds) {
3452 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3453
3454 my $i = $idx;
3455 $hb->add (new CFClient::UI::Label text => $_);
3456 $hb->add (new CFClient::UI::Button
3457 text => "delete",
3458 tooltip => "Deletes the action from the record",
3459 on_activate => sub {
3460 $self->{cmdbox}->remove ($hb);
3461 $cmds->[$i] = undef;
3462 });
3463
3464
3465 $idx++
3466 } 3500 }
3467} 3501}
3468 3502
3469############################################################################# 3503#############################################################################
3470 3504
3480 commands => [], 3514 commands => [],
3481 @_, 3515 @_,
3482 ) 3516 )
3483} 3517}
3484 3518
3485# XXX: Do sorting? Argl... 3519my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3520
3521my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3522 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3523my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3524 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3525my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3526 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3527my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3528 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3529my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3531
3532sub rebuild_spell_list {
3533 my ($self) = @_;
3534
3535 $CFClient::UI::ROOT->on_refresh ($self => sub {
3536 $self->clear;
3537
3538 return unless $::CONN;
3539
3540 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3541 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3542 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3543 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3544 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3545
3546 my $row = 0;
3547
3548 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3549 my $spell = $self->{spell}{$_};
3550
3551 $row++;
3552
3553 my $spell_cb = sub {
3554 my ($widget, $ev) = @_;
3555
3556 if ($ev->{button} == 1) {
3557 $::CONN->user_send ("cast $spell->{name}");
3558 } elsif ($ev->{button} == 2) {
3559 $::CONN->user_send ("invoke $spell->{name}");
3560 } elsif ($ev->{button} == 3) {
3561 (new CFClient::UI::Menu
3562 items => [
3563 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3564 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3565 ],
3566 )->popup ($ev);
3567 } else {
3568 return 0;
3569 }
3570
3571 1
3572 };
3573
3574 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3575
3576 #TODO: add path info to tooltip
3577 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3578
3579 $self->add (0, $row, new CFClient::UI::Face
3580 face => $spell->{face},
3581 can_hover => 1,
3582 can_events => 1,
3583 tooltip => $tooltip,
3584 on_button_down => $spell_cb,
3585 );
3586
3587 $self->add (1, $row, new CFClient::UI::Label
3588 expand => 1,
3589 text => $spell->{name},
3590 can_hover => 1,
3591 can_events => 1,
3592 tooltip => $tooltip,
3593 on_button_down => $spell_cb,
3594 );
3595
3596 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3597 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600 }
3601 });
3602}
3603
3486sub add_spell { 3604sub add_spell {
3487 my ($self, $spell) = @_; 3605 my ($self, $spell) = @_;
3606
3488 $self->{spells}->{$spell->{name}} = $spell; 3607 $self->{spell}->{$spell->{name}} = $spell;
3489 3608 $self->rebuild_spell_list;
3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3491 face => $spell->{face},
3492 can_hover => 1,
3493 can_events => 1,
3494 tooltip => $spell->{message});
3495
3496 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => $spell->{name},
3498 can_hover => 1,
3499 can_events => 1,
3500 tooltip => $spell->{message},
3501 expand => 1);
3502
3503 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3504 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3505 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3506 expand => 1);
3507
3508 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3509 text => "bind to key",
3510 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3511}
3512
3513sub rebuild_spell_list {
3514 my ($self) = @_;
3515 $self->{tbl_idx} = 0;
3516 $self->add_spell ($_) for values %{$self->{spells}};
3517} 3609}
3518 3610
3519sub remove_spell { 3611sub remove_spell {
3520 my ($self, $spell) = @_; 3612 my ($self, $spell) = @_;
3613
3521 delete $self->{spells}->{$spell->{name}}; 3614 delete $self->{spell}->{$spell->{name}};
3615 $self->rebuild_spell_list;
3616}
3617
3618sub clear_spells {
3619 my ($self) = @_;
3620
3621 $self->{spell} = {};
3522 $self->rebuild_spell_list; 3622 $self->rebuild_spell_list;
3523} 3623}
3524 3624
3525############################################################################# 3625#############################################################################
3526 3626
3563 $coord = $max - $size if $coord > $max - $size; 3663 $coord = $max - $size if $coord > $max - $size;
3564 3664
3565 int $coord + 0.5 3665 int $coord + 0.5
3566} 3666}
3567 3667
3568sub size_allocate { 3668sub invoke_size_allocate {
3569 my ($self, $w, $h) = @_; 3669 my ($self, $w, $h) = @_;
3570 3670
3571 for my $child ($self->children) { 3671 for my $child ($self->children) {
3572 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3672 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3573 3673
3577 $X = _to_pixel $X, $W, $self->{w}; 3677 $X = _to_pixel $X, $W, $self->{w};
3578 $Y = _to_pixel $Y, $H, $self->{h}; 3678 $Y = _to_pixel $Y, $H, $self->{h};
3579 3679
3580 $child->configure ($X, $Y, $W, $H); 3680 $child->configure ($X, $Y, $W, $H);
3581 } 3681 }
3682
3683 1
3582} 3684}
3583 3685
3584sub coord2local { 3686sub coord2local {
3585 my ($self, $x, $y) = @_; 3687 my ($self, $x, $y) = @_;
3586 3688

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines