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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines