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.292 by root, Tue Jun 6 03:02:15 2006 UTC vs.
Revision 1.326 by root, Sun Jul 16 20:04:08 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
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 1081
1077 my $title = delete $arg{title};
1078
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,
1083 can_events => 1, 1086 can_events => 1,
1084 min_w => 16, 1087 min_w => 64,
1085 min_h => 16, 1088 min_h => 32,
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);
1559 1599
1560 delete $self->{size_req}; 1600 delete $self->{size_req};
1561 $self->realloc; 1601 $self->realloc;
1562 $self->update; 1602 $self->update;
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);
1575 1614
1576 delete $self->{size_req}; 1615 delete $self->{size_req};
1577 $self->realloc; 1616 $self->realloc;
1578 $self->update; 1617 $self->update;
1590 1629
1591 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1592 1631
1593 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1594 $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);
1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1635 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1636
1597 my ($w2, $h2) = $self->{template}->size; 1637 my ($w2, $h2) = $self->{template}->size;
1598 1638
1599 $w = List::Util::max $w, $w2; 1639 $w = List::Util::max $w, $w2;
1604 }; 1644 };
1605 1645
1606 @{ $self->{size_req} } 1646 @{ $self->{size_req} }
1607} 1647}
1608 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
1627sub reconfigure { 1674sub reconfigure {
1628 my ($self) = @_; 1675 my ($self) = @_;
1629 1676
1630 delete $self->{size_req}; 1677 delete $self->{size_req};
1678 delete $self->{texture};
1631 1679
1632 $self->SUPER::reconfigure; 1680 $self->SUPER::reconfigure;
1633} 1681}
1634 1682
1635sub _draw { 1683sub _draw {
1636 my ($self) = @_; 1684 my ($self) = @_;
1637 1685
1638 $self->SUPER::_draw; # draw background, if applicable 1686 $self->SUPER::_draw; # draw background, if applicable
1639 1687
1640 my $tex = $self->{texture} ||= do { 1688 my $size = $self->{texture} ||= do {
1641 $self->{layout}->set_foreground (@{$self->{fg}}); 1689 $self->{layout}->set_foreground (@{$self->{fg}});
1642 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1690 $self->{layout}->set_font ($self->{font}) if $self->{font};
1643 $self->{layout}->set_width ($self->{w}); 1691 $self->{layout}->set_width ($self->{w});
1644 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1692 $self->{layout}->set_ellipsise ($self->{ellipsise});
1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1693 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1694 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647 1695
1648 new_from_layout CFClient::Texture $self->{layout} 1696 [$self->{layout}->size]
1649 }; 1697 };
1650 1698
1651 unless (exists $self->{ox}) { 1699 unless (exists $self->{ox}) {
1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1700 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1701 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1654 : ($self->{w} - $tex->{w}) * 0.5); 1702 : ($self->{w} - $size->[0]) * 0.5);
1655 1703
1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1704 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1705 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1658 : ($self->{h} - $tex->{h}) * 0.5); 1706 : ($self->{h} - $size->[1]) * 0.5);
1659 }; 1707 };
1660 1708
1661 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];
1662 1711
1663 if ($tex->{format} == GL_ALPHA) { 1712 $self->{layout}->render ($self->{ox}, $self->{oy});
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665 glColor @{$self->{fg}};
1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1670 }
1671
1672 glDisable GL_TEXTURE_2D;
1673} 1713}
1674 1714
1675############################################################################# 1715#############################################################################
1676 1716
1677package CFClient::UI::EntryBase; 1717package CFClient::UI::EntryBase;
1710 1750
1711 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1712 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1713 delete $self->{size_req}; 1753 delete $self->{size_req};
1714 1754
1715 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1716 1756
1717 $self->realloc; 1757 $self->realloc;
1718 $self->update; 1758 $self->update;
1719} 1759}
1720 1760
1735 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1736 1776
1737 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1738} 1778}
1739 1779
1740sub key_down { 1780sub invoke_key_down {
1741 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1742 1782
1743 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1744 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1745 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
1757 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1758 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1759 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1760 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1761 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1762 $self->_emit ('escape'); 1802 $self->emit ('escape');
1763 } elsif ($uni) { 1803 } elsif ($uni) {
1764 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1765 } else { 1805 } else {
1766 return 0; 1806 return 0;
1767 } 1807 }
1771 $self->realloc; 1811 $self->realloc;
1772 1812
1773 1 1813 1
1774} 1814}
1775 1815
1776sub focus_in { 1816sub invoke_focus_in {
1777 my ($self) = @_; 1817 my ($self) = @_;
1778 1818
1779 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1780 1820
1781 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1782} 1822}
1783 1823
1784sub button_down { 1824sub invoke_button_down {
1785 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1786 1826
1787 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1788 1828
1789 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1790 1830
1791 # byte-index to char-index 1831 # byte-index to char-index
1792 my $text = $self->{text}; 1832 my $text = $self->{text};
1793 utf8::encode $text; 1833 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1794 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length $text;
1795 1835
1796 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1797 $self->update; 1837 $self->update;
1798 1838
1799 1 1839 1
1800} 1840}
1801 1841
1802sub mouse_motion { 1842sub invoke_mouse_motion {
1803 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1804# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1805 1845
1806 0 1846 1
1807} 1847}
1808 1848
1809sub _draw { 1849sub _draw {
1810 my ($self) = @_; 1850 my ($self) = @_;
1811 1851
1852 1892
1853our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1854 1894
1855use CFClient::OpenGL; 1895use CFClient::OpenGL;
1856 1896
1857sub key_down { 1897sub invoke_key_down {
1858 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1859 1899
1860 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1861 1901
1862 if ($sym == 13) { 1902 if ($sym == 13) {
1863 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1864 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1865 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1866 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1867 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1868 $self->update; 1909 $self->update;
1869 1910
1870 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1871 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1872 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
1888 } else { 1929 } else {
1889 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1890 } 1931 }
1891 1932
1892 } else { 1933 } else {
1893 return $self->SUPER::key_down ($ev) 1934 return $self->SUPER::invoke_key_down ($ev)
1894 } 1935 }
1895 1936
1896 1 1937 1
1897} 1938}
1898 1939
1922 can_events => 1, 1963 can_events => 1,
1923 @_ 1964 @_
1924 ) 1965 )
1925} 1966}
1926 1967
1927sub activate { }
1928
1929sub button_up { 1968sub invoke_button_up {
1930 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1931 1970
1932 $self->emit ("activate") 1971 $self->emit ("activate")
1933 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1934 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
1948 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1949 1988
1950 glDisable GL_TEXTURE_2D; 1989 glDisable GL_TEXTURE_2D;
1951 1990
1952 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1992}
1993
1994#############################################################################
1995
1996package CFClient::UI::ImageButton;
1997
1998our @ISA = CFClient::UI::Image::;
1999
2000use CFClient::OpenGL;
2001
2002my %textures;
2003
2004sub new {
2005 my $class = shift;
2006
2007 my $self = $class->SUPER::new (
2008 padding_x => 4,
2009 padding_y => 4,
2010 fg => [1, 1, 1],
2011 active_fg => [0, 0, 1],
2012 can_hover => 1,
2013 align => 0,
2014 valign => 0,
2015 can_events => 1,
2016 @_
2017 );
2018}
2019
2020sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_;
2022
2023 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h};
2026
2027 1
1953} 2028}
1954 2029
1955############################################################################# 2030#############################################################################
1956 2031
1957package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
1984 my ($self) = @_; 2059 my ($self) = @_;
1985 2060
1986 (6) x 2 2061 (6) x 2
1987} 2062}
1988 2063
2064sub toggle {
2065 my ($self) = @_;
2066
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 $self->update;
2070}
2071
1989sub button_down { 2072sub invoke_button_down {
1990 my ($self, $ev, $x, $y) = @_; 2073 my ($self, $ev, $x, $y) = @_;
1991 2074
1992 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2075 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1993 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2076 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1994 $self->{state} = !$self->{state}; 2077 $self->toggle;
1995 $self->_emit (changed => $self->{state});
1996 } else { 2078 } else {
1997 return 0 2079 return 0
1998 } 2080 }
1999 2081
2000 1 2082 1
2025package CFClient::UI::Image; 2107package CFClient::UI::Image;
2026 2108
2027our @ISA = CFClient::UI::Base::; 2109our @ISA = CFClient::UI::Base::;
2028 2110
2029use CFClient::OpenGL; 2111use CFClient::OpenGL;
2030use Carp qw/confess/;
2031 2112
2032our %loaded_images; 2113our %texture_cache;
2033 2114
2034sub new { 2115sub new {
2035 my $class = shift; 2116 my $class = shift;
2036 2117
2037 my $self = $class->SUPER::new (can_events => 0, @_); 2118 my $self = $class->SUPER::new (
2119 can_events => 0,
2120 @_,
2121 );
2038 2122
2039 $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";
2040 2125
2041 $loaded_images{$self->{image}} ||= 2126 $self->{tex} = $texture_cache{$self->{path}} ||=
2042 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;
2043 2128
2044 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2129 Scalar::Util::weaken $texture_cache{$self->{path}};
2045 2130
2046 Scalar::Util::weaken $loaded_images{$self->{image}}; 2131 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2047
2048 $self->{aspect} = $tex->{w} / $tex->{h};
2049 2132
2050 $self 2133 $self
2051} 2134}
2052 2135
2053sub size_request { 2136sub size_request {
2054 my ($self) = @_; 2137 my ($self) = @_;
2055 2138
2056 ($self->{tex}->{w}, $self->{tex}->{h}) 2139 ($self->{tex}{w}, $self->{tex}{h})
2057} 2140}
2058 2141
2059sub _draw { 2142sub _draw {
2060 my ($self) = @_; 2143 my ($self) = @_;
2061 2144
2170 my $ycut1 = max 0, min 1, $ycut; 2253 my $ycut1 = max 0, min 1, $ycut;
2171 my $ycut2 = max 0, min 1, $ycut - 1; 2254 my $ycut2 = max 0, min 1, $ycut - 1;
2172 2255
2173 my $h1 = $self->{h} * (1 - $ycut1); 2256 my $h1 = $self->{h} * (1 - $ycut1);
2174 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);
2175 2261
2176 glEnable GL_BLEND; 2262 glEnable GL_BLEND;
2177 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2263 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2178 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2179 glEnable GL_TEXTURE_2D; 2265 glEnable GL_TEXTURE_2D;
2198 2284
2199 if ($t3) { 2285 if ($t3) {
2200 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2286 glBindTexture GL_TEXTURE_2D, $t3->{name};
2201 glBegin GL_QUADS; 2287 glBegin GL_QUADS;
2202 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2288 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2203 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2289 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2204 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2290 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2205 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2291 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2206 glEnd; 2292 glEnd;
2207 } 2293 }
2208 2294
2209 glDisable GL_BLEND; 2295 glDisable GL_BLEND;
2297 $self->update; 2383 $self->update;
2298 2384
2299 $self 2385 $self
2300} 2386}
2301 2387
2302sub changed { }
2303
2304sub set_range { 2388sub set_range {
2305 my ($self, $range) = @_; 2389 my ($self, $range) = @_;
2306 2390
2307 ($range, $self->{range}) = ($self->{range}, $range); 2391 ($range, $self->{range}) = ($self->{range}, $range);
2308 2392
2309 $self->update
2310 if "@$range" ne "@{$self->{range}}"; 2393 if ("@$range" ne "@{$self->{range}}") {
2394 $self->update;
2395 $self->set_value ($self->{range}[0]);
2396 }
2311} 2397}
2312 2398
2313sub set_value { 2399sub set_value {
2314 my ($self, $value) = @_; 2400 my ($self, $value) = @_;
2315 2401
2326 if $unit; 2412 if $unit;
2327 2413
2328 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2414 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2329 2415
2330 if ($value != $old_value) { 2416 if ($value != $old_value) {
2331 $self->_emit (changed => $value); 2417 $self->emit (changed => $value);
2332 $self->update; 2418 $self->update;
2333 } 2419 }
2334} 2420}
2335 2421
2336sub size_request { 2422sub size_request {
2337 my ($self) = @_; 2423 my ($self) = @_;
2338 2424
2339 ($self->{req_w}, $self->{req_h}) 2425 ($self->{req_w}, $self->{req_h})
2340} 2426}
2341 2427
2342sub button_down { 2428sub invoke_button_down {
2343 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2344 2430
2345 $self->SUPER::button_down ($ev, $x, $y); 2431 $self->SUPER::invoke_button_down ($ev, $x, $y);
2346 2432
2347 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2433 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2348 2434
2349 $self->mouse_motion ($ev, $x, $y) 2435 $self->invoke_mouse_motion ($ev, $x, $y)
2350} 2436}
2351 2437
2352sub mouse_motion { 2438sub invoke_mouse_motion {
2353 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2354 2440
2355 if ($GRAB == $self) { 2441 if ($GRAB == $self) {
2356 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2442 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2357 2443
2462sub set_range { shift->{slider}->set_range (@_) } 2548sub set_range { shift->{slider}->set_range (@_) }
2463sub set_value { shift->{slider}->set_value (@_) } 2549sub set_value { shift->{slider}->set_value (@_) }
2464 2550
2465############################################################################# 2551#############################################################################
2466 2552
2467package CFClient::UI::TextView; 2553package CFClient::UI::TextScroller;
2468 2554
2469our @ISA = CFClient::UI::HBox::; 2555our @ISA = CFClient::UI::HBox::;
2470 2556
2471use CFClient::OpenGL; 2557use CFClient::OpenGL;
2472 2558
2474 my $class = shift; 2560 my $class = shift;
2475 2561
2476 my $self = $class->SUPER::new ( 2562 my $self = $class->SUPER::new (
2477 fontsize => 1, 2563 fontsize => 1,
2478 can_events => 0, 2564 can_events => 0,
2565 indent => 0,
2479 #font => default_font 2566 #font => default_font
2480 @_, 2567 @_,
2481 2568
2482 layout => (new CFClient::Layout 1), 2569 layout => (new CFClient::Layout),
2483 par => [], 2570 par => [],
2484 height => 0, 2571 height => 0,
2485 children => [ 2572 children => [
2486 (new CFClient::UI::Empty expand => 1), 2573 (new CFClient::UI::Empty expand => 1),
2487 (new CFClient::UI::Slider vertical => 1), 2574 (new CFClient::UI::Slider vertical => 1),
2498 2585
2499 $self->{fontsize} = $fontsize; 2586 $self->{fontsize} = $fontsize;
2500 $self->reflow; 2587 $self->reflow;
2501} 2588}
2502 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
2503sub size_allocate { 2599sub invoke_size_allocate {
2504 my ($self, $w, $h) = @_; 2600 my ($self, $w, $h) = @_;
2505 2601
2506 $self->SUPER::size_allocate ($w, $h); 2602 my ($empty, $slider, @other) = @{ $self->{children} };
2603 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2507 2604
2508 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2605 $self->{layout}->set_font ($self->{font}) if $self->{font};
2509 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2606 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2510 $self->{layout}->set_width ($self->{children}[0]{w}); 2607 $self->{layout}->set_width ($empty->{w});
2511 $self->{layout}->set_indent (-$self->{fontsize} * $::FONTSIZE * 4); 2608 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2512 2609
2513 $self->reflow; 2610 $self->reflow;
2514}
2515 2611
2516sub text_size { 2612 local $self->{children} = [$empty, $slider];
2517 my ($self, $text, $indent) = @_; 2613 $self->SUPER::invoke_size_allocate ($w, $h)
2614}
2615
2616sub get_layout {
2617 my ($self, $para) = @_;
2518 2618
2519 my $layout = $self->{layout}; 2619 my $layout = $self->{layout};
2520 2620
2621 $layout->set_font ($self->{font}) if $self->{font};
2622 $layout->set_foreground (@{$para->{fg}});
2521 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2623 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2522 $layout->set_width ($self->{children}[0]{w} - $indent); 2624 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2523 $layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4); 2625 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2524 $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}}
2525 2632 );
2633
2526 $layout->size 2634 $layout
2527} 2635}
2528 2636
2529sub reflow { 2637sub reflow {
2530 my ($self) = @_; 2638 my ($self) = @_;
2531 2639
2540 $self->{children}[1]->set_value ($offset); 2648 $self->{children}[1]->set_value ($offset);
2541} 2649}
2542 2650
2543sub clear { 2651sub clear {
2544 my ($self) = @_; 2652 my ($self) = @_;
2653
2654 my (undef, undef, @other) = @{ $self->{children} };
2655 $self->remove ($_) for @other;
2545 2656
2546 $self->{par} = []; 2657 $self->{par} = [];
2547 $self->{height} = 0; 2658 $self->{height} = 0;
2548 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2659 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2549} 2660}
2550 2661
2551sub add_paragraph { 2662sub add_paragraph {
2552 my ($self, $color, $text, $indent) = @_; 2663 my ($self, $color, $para, $indent) = @_;
2553 2664
2554 for my $line (split /\n/, $text) { 2665 my ($text, @w) = ref $para ? @$para : $para;
2555 my ($w, $h) = $self->text_size ($line); 2666
2556 $self->{height} += $h; 2667 $para = {
2557 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,
2558 } 2674 };
2559 2675
2560 $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;
2561} 2688}
2562 2689
2563sub update { 2690sub update {
2564 my ($self) = @_; 2691 my ($self) = @_;
2565 2692
2567 2694
2568 return unless $self->{h} > 0; 2695 return unless $self->{h} > 0;
2569 2696
2570 delete $self->{texture}; 2697 delete $self->{texture};
2571 2698
2572 $ROOT->on_post_alloc ($self, sub { 2699 $ROOT->on_post_alloc ($self => sub {
2573 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2700 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2574 2701
2575 if (delete $self->{need_reflow}) { 2702 if (delete $self->{need_reflow}) {
2576 my $height = 0; 2703 my $height = 0;
2577 2704
2578 my $layout = $self->{layout};
2579
2580 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2581
2582 for (@{$self->{par}}) { 2705 for my $para (@{$self->{par}}) {
2583 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2706 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2584 $layout->set_width ($W - $_->[3]); 2707 my $layout = $self->get_layout ($para);
2585 $layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2586 $layout->set_markup ($_->[4]);
2587 my ($w, $h) = $layout->size; 2708 my ($w, $h) = $layout->size;
2588 $_->[0] = $w + $_->[3]; 2709
2589 $_->[1] = $h; 2710 $para->{w} = $w + $para->{indent};
2711 $para->{h} = $h;
2712 $para->{wrapped} = $layout->has_wrapped;
2590 } 2713 }
2591 2714
2592 $height += $_->[1]; 2715 $height += $para->{h};
2593 } 2716 }
2594 2717
2595 $self->{height} = $height; 2718 $self->{height} = $height;
2596 2719
2597 $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]);
2598 2721
2599 delete $self->{texture}; 2722 delete $self->{texture};
2723 }
2724
2725 if (delete $self->{scroll_to_bottom}) {
2726 $self->{children}[1]->set_value (1e10);
2600 } 2727 }
2601 2728
2602 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2729 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2603 glClearColor 0, 0, 0, 0; 2730 glClearColor 0, 0, 0, 0;
2604 glClear GL_COLOR_BUFFER_BIT; 2731 glClear GL_COLOR_BUFFER_BIT;
2608 my $y0 = $top; 2735 my $y0 = $top;
2609 my $y1 = $top + $H; 2736 my $y1 = $top + $H;
2610 2737
2611 my $y = 0; 2738 my $y = 0;
2612 2739
2613 my $layout = $self->{layout};
2614
2615 $layout->set_font ($self->{font}) if $self->{font};
2616
2617 glEnable GL_BLEND;
2618 #TODO# not correct in windows where rgba is forced off
2619 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2620
2621 for my $par (@{$self->{par}}) { 2740 for my $para (@{$self->{par}}) {
2622 my $h = $par->[1]; 2741 my $h = $para->{h};
2623 2742
2624 if ($y0 < $y + $h && $y < $y1) { 2743 if ($y0 < $y + $h && $y < $y1) {
2625 $layout->set_foreground (@{ $par->[2] });
2626 $layout->set_width ($W - $par->[3]);
2627 $layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2628 $layout->set_markup ($par->[4]);
2629 2744
2630 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2745 my $layout = $self->get_layout ($para);
2631 2746
2632 glRasterPos $par->[3], $y - $y0; 2747 $layout->render ($para->{indent}, $y - $y0);
2633 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 }
2634 } 2761 }
2635 2762
2636 $y += $h; 2763 $y += $h;
2637 } 2764 }
2638
2639 glDisable GL_BLEND;
2640 }; 2765 };
2641 }); 2766 });
2767}
2768
2769sub reconfigure {
2770 my ($self) = @_;
2771
2772 $self->SUPER::reconfigure;
2773
2774 $_->{w} = 1e10 for @{ $self->{par} };
2775 $self->reflow;
2642} 2776}
2643 2777
2644sub _draw { 2778sub _draw {
2645 my ($self) = @_; 2779 my ($self) = @_;
2646 2780
2649 glColor 0, 0, 0, 1; 2783 glColor 0, 0, 0, 1;
2650 $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});
2651 glDisable GL_TEXTURE_2D; 2785 glDisable GL_TEXTURE_2D;
2652 2786
2653 $self->{children}[1]->draw; 2787 $self->{children}[1]->draw;
2654
2655} 2788}
2656 2789
2657############################################################################# 2790#############################################################################
2658 2791
2659package CFClient::UI::Animator; 2792package CFClient::UI::Animator;
2746 $tooltip .= "\n\n" . (ref $widget) . "\n" 2879 $tooltip .= "\n\n" . (ref $widget) . "\n"
2747 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2880 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2748 . "req $widget->{req_w} $widget->{req_h}\n" 2881 . "req $widget->{req_w} $widget->{req_h}\n"
2749 . "visible $widget->{visible}"; 2882 . "visible $widget->{visible}";
2750 } 2883 }
2884
2885 $tooltip =~ s/^\n+//;
2886 $tooltip =~ s/\n+$//;
2751 2887
2752 $self->add (new CFClient::UI::Label 2888 $self->add (new CFClient::UI::Label
2753 markup => $tooltip, 2889 markup => $tooltip,
2754 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2890 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2755 fontsize => 0.8, 2891 fontsize => 0.8,
2765 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2901 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2766 2902
2767 ($w + 4, $h + 4) 2903 ($w + 4, $h + 4)
2768} 2904}
2769 2905
2770sub size_allocate { 2906sub invoke_size_allocate {
2771 my ($self, $w, $h) = @_; 2907 my ($self, $w, $h) = @_;
2772 2908
2773 $self->SUPER::size_allocate ($w - 4, $h - 4); 2909 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2774} 2910}
2775 2911
2776sub visibility_change { 2912sub invoke_visibility_change {
2777 my ($self, $visible) = @_; 2913 my ($self, $visible) = @_;
2778 2914
2779 return unless $visible; 2915 return unless $visible;
2780 2916
2781 $self->{root}->on_post_alloc ("move_$self" => sub { 2917 $self->{root}->on_post_alloc ("move_$self" => sub {
2783 or return; 2919 or return;
2784 2920
2785 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2921 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2786 2922
2787 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2923 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2788 if $x + $self->{w} > $::WIDTH; 2924 if $x + $self->{w} > $self->{root}{w};
2789 2925
2790 $self->move_abs ($x, $y); 2926 $self->move_abs ($x, $y);
2791 }); 2927 });
2792} 2928}
2793 2929
2888 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3024 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2889 glDisable GL_TEXTURE_2D; 3025 glDisable GL_TEXTURE_2D;
2890 } 3026 }
2891} 3027}
2892 3028
2893sub DESTROY { 3029sub destroy {
2894 my ($self) = @_; 3030 my ($self) = @_;
2895 3031
2896 $self->{timer}->cancel 3032 $self->{timer}->cancel
2897 if $self->{timer}; 3033 if $self->{timer};
2898 3034
2899 $self->SUPER::DESTROY; 3035 $self->SUPER::destroy;
2900} 3036}
2901 3037
2902############################################################################# 3038#############################################################################
2903 3039
2904package CFClient::UI::Buttonbar; 3040package CFClient::UI::Buttonbar;
2929 for my $item (@{ $self->{items} }) { 3065 for my $item (@{ $self->{items} }) {
2930 my ($widget, $cb, $tooltip) = @$item; 3066 my ($widget, $cb, $tooltip) = @$item;
2931 3067
2932 # handle various types of items, only text for now 3068 # handle various types of items, only text for now
2933 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 {
2934 $widget = new CFClient::UI::Label 3084 $widget = new CFClient::UI::Label
2935 can_hover => 1, 3085 can_hover => 1,
2936 can_events => 1, 3086 can_events => 1,
2937 text => $widget, 3087 markup => $widget,
2938 tooltip => $tooltip 3088 tooltip => $tooltip;
3089 }
2939 } 3090 }
2940 3091
2941 $self->{item}{$widget} = $item; 3092 $self->{item}{$widget} = $item;
2942 3093
2943 $self->{vbox}->add ($widget); 3094 $self->{vbox}->add ($widget);
2948 3099
2949# 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)
2950sub popup { 3101sub popup {
2951 my ($self, $ev) = @_; 3102 my ($self, $ev) = @_;
2952 3103
2953 $self->_emit ("popdown"); 3104 $self->emit ("popdown");
2954 3105
2955 # maybe save $GRAB? must be careful about events... 3106 # maybe save $GRAB? must be careful about events...
2956 $GRAB = $self; 3107 $GRAB = $self;
2957 $self->{button} = $ev->{button}; 3108 $self->{button} = $ev->{button};
2958 3109
2959 $self->show; 3110 $self->show;
2960 $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);
2961} 3112}
2962 3113
2963sub mouse_motion { 3114sub invoke_mouse_motion {
2964 my ($self, $ev, $x, $y) = @_; 3115 my ($self, $ev, $x, $y) = @_;
2965 3116
2966 # TODO: should use vbox->find_widget or so 3117 # TODO: should use vbox->find_widget or so
2967 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3118 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2968 $self->{hover} = $self->{item}{$HOVER}; 3119 $self->{hover} = $self->{item}{$HOVER};
2969 3120
2970 0 3121 0
2971} 3122}
2972 3123
2973sub button_up { 3124sub invoke_button_up {
2974 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
2975 3126
2976 if ($ev->{button} == $self->{button}) { 3127 if ($ev->{button} == $self->{button}) {
2977 undef $GRAB; 3128 undef $GRAB;
2978 $self->hide; 3129 $self->hide;
2979 3130
2980 $self->_emit ("popdown"); 3131 $self->emit ("popdown");
2981 $self->{hover}[1]->() if $self->{hover}; 3132 $self->{hover}[1]->() if $self->{hover};
2982 } else { 3133 } else {
2983 return 0 3134 return 0
2984 } 3135 }
2985 3136
3012 3163
3013 $self->{current} = $self->{children}[0] 3164 $self->{current} = $self->{children}[0]
3014 if @{ $self->{children} }; 3165 if @{ $self->{children} };
3015} 3166}
3016 3167
3168sub get_current_page {
3169 my ($self) = @_;
3170
3171 $self->{current}
3172}
3173
3017sub set_current_page { 3174sub set_current_page {
3018 my ($self, $page_or_widget) = @_; 3175 my ($self, $page_or_widget) = @_;
3019 3176
3020 my $widget = ref $page_or_widget 3177 my $widget = ref $page_or_widget
3021 ? $page_or_widget 3178 ? $page_or_widget
3022 : $self->{children}[$page_or_widget]; 3179 : $self->{children}[$page_or_widget];
3023 3180
3024 $self->{current} = $widget; 3181 $self->{current} = $widget;
3025 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3182 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3026 3183
3027 $self->_emit (page_changed => $self->{current}); 3184 $self->emit (page_changed => $self->{current});
3028 3185
3029 $self->realloc; 3186 $self->realloc;
3030} 3187}
3031 3188
3032sub visible_children { 3189sub visible_children {
3037 my ($self) = @_; 3194 my ($self) = @_;
3038 3195
3039 $self->{current}->size_request 3196 $self->{current}->size_request
3040} 3197}
3041 3198
3042sub size_allocate { 3199sub invoke_size_allocate {
3043 my ($self, $w, $h) = @_; 3200 my ($self, $w, $h) = @_;
3044 3201
3045 $self->{current}->configure (0, 0, $w, $h); 3202 $self->{current}->configure (0, 0, $w, $h);
3203
3204 1
3046} 3205}
3047 3206
3048sub _draw { 3207sub _draw {
3049 my ($self) = @_; 3208 my ($self) = @_;
3050 3209
3085 ); 3244 );
3086 3245
3087 $self->{multiplexer}->add ($widget); 3246 $self->{multiplexer}->add ($widget);
3088} 3247}
3089 3248
3249sub get_current_page {
3250 my ($self) = @_;
3251
3252 $self->{multiplexer}->get_current_page
3253}
3254
3090sub set_current_page { 3255sub set_current_page {
3091 my ($self, $page) = @_; 3256 my ($self, $page) = @_;
3092 3257
3093 $self->{multiplexer}->set_current_page ($page); 3258 $self->{multiplexer}->set_current_page ($page);
3094 $self->_emit (page_changed => $self->{multiplexer}{current}); 3259 $self->emit (page_changed => $self->{multiplexer}{current});
3095} 3260}
3096 3261
3097############################################################################# 3262#############################################################################
3098 3263
3099package CFClient::UI::Combobox; 3264package CFClient::UI::Combobox;
3104 3269
3105sub new { 3270sub new {
3106 my $class = shift; 3271 my $class = shift;
3107 3272
3108 my $self = $class->SUPER::new ( 3273 my $self = $class->SUPER::new (
3109 options => [], # [title, value, tooltip], ... 3274 options => [], # [value, title, longdesc], ...
3110 value => undef, 3275 value => undef,
3111 @_, 3276 @_,
3112 ); 3277 );
3113 3278
3114 $self->_set_value ($self->{value}); 3279 $self->_set_value ($self->{value});
3115 3280
3116 $self 3281 $self
3117} 3282}
3118 3283
3119sub button_down { 3284sub invoke_button_down {
3120 my ($self, $ev) = @_; 3285 my ($self, $ev) = @_;
3121 3286
3122 my @menu_items; 3287 my @menu_items;
3123 3288
3124 for (@{ $self->{options} }) { 3289 for (@{ $self->{options} }) {
3125 my ($title, $value, $tooltip) = @$_; 3290 my ($value, $title, $tooltip) = @$_;
3126 3291
3127 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 3292 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3128 } 3293 }
3129 3294
3130 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3295 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3131} 3296}
3132 3297
3133sub _set_value { 3298sub _set_value {
3134 my ($self, $value) = @_; 3299 my ($self, $value) = @_;
3135 3300
3136 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 3301 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3137 or return; 3302 or return;
3138 3303
3139 $self->{value} = $item->[1]; 3304 $self->{value} = $item->[0];
3140 $self->set_markup ("$item->[0] ⇓"); 3305 $self->set_markup ("$item->[1] ⇓");
3141 $self->set_tooltip ($item->[2]); 3306 $self->set_tooltip ($item->[2]);
3142} 3307}
3143 3308
3144sub set_value { 3309sub set_value {
3145 my ($self, $value) = @_; 3310 my ($self, $value) = @_;
3146 3311
3147 return unless $self->{value} ne $value; 3312 return unless $self->{value} ne $value;
3148 3313
3149 $self->_set_value ($value); 3314 $self->_set_value ($value);
3150 $self->_emit (changed => $value); 3315 $self->emit (changed => $value);
3151} 3316}
3152 3317
3153############################################################################# 3318#############################################################################
3154 3319
3155package CFClient::UI::Statusbox; 3320package CFClient::UI::Statusbox;
3254 $item->{count}++; 3419 $item->{count}++;
3255 } else { 3420 } else {
3256 $item->{count} = 1; 3421 $item->{count} = 1;
3257 $item->{text} = $item->{tooltip} = $text; 3422 $item->{text} = $item->{tooltip} = $text;
3258 } 3423 }
3259 $item->{id} = ++$self->{id}; 3424 $item->{id} += 0.2;#d#
3260 $item->{timeout} = $timeout; 3425 $item->{timeout} = $timeout;
3261 delete $item->{label}; 3426 delete $item->{label};
3262 } else { 3427 } else {
3263 $self->{item}{$group} = { 3428 $self->{item}{$group} = {
3264 id => ++$self->{id}, 3429 id => ++$self->{id},
3270 count => 1, 3435 count => 1,
3271 %arg, 3436 %arg,
3272 }; 3437 };
3273 } 3438 }
3274 3439
3440 $ROOT->on_refresh (reorder => sub {
3275 $self->reorder; 3441 $self->reorder;
3442 });
3276} 3443}
3277 3444
3278sub reconfigure { 3445sub reconfigure {
3279 my ($self) = @_; 3446 my ($self) = @_;
3280 3447
3283 3450
3284 $self->reorder; 3451 $self->reorder;
3285 $self->SUPER::reconfigure; 3452 $self->SUPER::reconfigure;
3286} 3453}
3287 3454
3288sub DESTROY { 3455sub destroy {
3289 my ($self) = @_; 3456 my ($self) = @_;
3290 3457
3291 $self->{timer}->cancel; 3458 $self->{timer}->cancel;
3292 3459
3293 $self->SUPER::DESTROY; 3460 $self->SUPER::destroy;
3294} 3461}
3295 3462
3296############################################################################# 3463#############################################################################
3297 3464
3298package CFClient::UI::Inventory; 3465package CFClient::UI::Inventory;
3299 3466
3300our @ISA = CFClient::UI::ScrolledWindow::; 3467our @ISA = CFClient::UI::Table::;
3301 3468
3302sub new { 3469sub new {
3303 my $class = shift; 3470 my $class = shift;
3304 3471
3305 my $self = $class->SUPER::new ( 3472 my $self = $class->SUPER::new (
3306 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3473 col_expand => [0, 1, 0],
3307 @_, 3474 @_,
3308 ); 3475 );
3309 3476
3310 $self 3477 $self
3311} 3478}
3312 3479
3313sub set_items { 3480sub set_items {
3314 my ($self, $items) = @_; 3481 my ($self, $items) = @_;
3315 3482
3316 $self->{child}->clear; 3483 $self->clear;
3317 return unless $items; 3484 return unless $items;
3318 3485
3319 my @items = sort { 3486 my @items = sort {
3320 ($a->{type} <=> $b->{type}) 3487 ($a->{type} <=> $b->{type})
3321 or ($a->{name} cmp $b->{name}) 3488 or ($a->{name} cmp $b->{name})
3322 } @$items; 3489 } values %$items;
3323 3490
3324 $self->{real_items} = \@items; 3491 $self->{real_items} = \@items;
3325 3492
3326 my $row = 0; 3493 my $row = 0;
3327 for my $item (@items) { 3494 for my $item (@items) {
3328 CFClient::Item::update_widgets $item; 3495 CFClient::Item::update_widgets $item;
3329 3496
3330 $self->{child}->add (0, $row, $item->{face_widget}); 3497 $self->add (0, $row, $item->{face_widget});
3331 $self->{child}->add (1, $row, $item->{desc_widget}); 3498 $self->add (1, $row, $item->{desc_widget});
3332 $self->{child}->add (2, $row, $item->{weight_widget}); 3499 $self->add (2, $row, $item->{weight_widget});
3333 3500
3334 $row++; 3501 $row++;
3335 }
3336}
3337
3338#############################################################################
3339
3340package CFClient::UI::BindEditor;
3341
3342our @ISA = CFClient::UI::FancyFrame::;
3343
3344sub new {
3345 my $class = shift;
3346
3347 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3348
3349 $self->add (my $vb = new CFClient::UI::VBox);
3350
3351
3352 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3353 text => "start recording",
3354 tooltip => "Start/Stops recording of actions."
3355 ."All subsequent actions after the recording started will be captured."
3356 ."The actions are displayed after the record was stopped."
3357 ."To bind the action you have to click on the 'Bind' button",
3358 on_activate => sub {
3359 unless ($self->{recording}) {
3360 $self->start;
3361 } else {
3362 $self->stop;
3363 }
3364 });
3365
3366 $vb->add (new CFClient::UI::Label text => "Actions:");
3367 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3368
3369 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3370 $vb->add (my $hb = new CFClient::UI::HBox);
3371 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3372 $hb->add (new CFClient::UI::Button
3373 text => "bind",
3374 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3375 on_activate => sub {
3376 $self->ask_for_bind;
3377 });
3378
3379 $vb->add (my $hb = new CFClient::UI::HBox);
3380 $hb->add (new CFClient::UI::Button
3381 text => "ok",
3382 expand => 1,
3383 tooltip => "This closes the binding editor and saves the binding",
3384 on_activate => sub {
3385 $self->hide;
3386 $self->commit;
3387 });
3388
3389 $hb->add (new CFClient::UI::Button
3390 text => "cancel",
3391 expand => 1,
3392 tooltip => "This closes the binding editor without saving",
3393 on_activate => sub {
3394 $self->hide;
3395 $self->{binding_cancel}->()
3396 if $self->{binding_cancel};
3397 });
3398
3399 $self->update_binding_widgets;
3400
3401 $self
3402}
3403
3404sub commit {
3405 my ($self) = @_;
3406 my ($mod, $sym, $cmds) = $self->get_binding;
3407 if ($sym != 0 && @$cmds > 0) {
3408 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3409 ."'. Don't forget 'Save Config'!");
3410 $self->{binding_change}->($mod, $sym, $cmds)
3411 if $self->{binding_change};
3412 } else {
3413 $::STATUSBOX->add ("No action bound, no key or action specified!");
3414 $self->{binding_cancel}->()
3415 if $self->{binding_cancel};
3416 }
3417}
3418
3419sub start {
3420 my ($self) = @_;
3421
3422 $self->{rec_btn}->set_text ("stop recording");
3423 $self->{recording} = 1;
3424 $self->clear_command_list;
3425 $::CONN->start_record if $::CONN;
3426}
3427
3428sub stop {
3429 my ($self) = @_;
3430
3431 $self->{rec_btn}->set_text ("start recording");
3432 $self->{recording} = 0;
3433
3434 my $rec;
3435 $rec = $::CONN->stop_record if $::CONN;
3436 return unless ref $rec eq 'ARRAY';
3437 $self->set_command_list ($rec);
3438}
3439
3440
3441sub ask_for_bind_and_commit {
3442 my ($self) = @_;
3443 $self->ask_for_bind (1);
3444}
3445
3446sub ask_for_bind {
3447 my ($self, $commit) = @_;
3448
3449 CFClient::Binder::open_binding_dialog (sub {
3450 my ($mod, $sym) = @_;
3451 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3452 $self->update_binding_widgets;
3453 $self->commit if $commit;
3454 });
3455}
3456
3457# $mod and $sym are the modifiers and key symbol
3458# $cmds is a array ref of strings (the commands)
3459# $cb is the callback that is executed on OK
3460# $ccb is the callback that is executed on CANCEL and
3461# when the binding was unsuccessful on OK
3462sub set_binding {
3463 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3464
3465 $self->clear_command_list;
3466 $self->{recording} = 0;
3467 $self->{rec_btn}->set_text ("start recording");
3468
3469 $self->{binding} = [$mod, $sym];
3470 $self->{commands} = $cmds;
3471
3472 $self->{binding_change} = $cb;
3473 $self->{binding_cancel} = $ccb;
3474
3475 $self->update_binding_widgets;
3476}
3477
3478# this is a shortcut method that asks for a binding
3479# and then just binds it.
3480sub do_quick_binding {
3481 my ($self, $cmds) = @_;
3482 $self->set_binding (undef, undef, $cmds, sub {
3483 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3484 });
3485 $self->ask_for_bind (1);
3486}
3487
3488sub update_binding_widgets {
3489 my ($self) = @_;
3490 my ($mod, $sym, $cmds) = $self->get_binding;
3491 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3492 $self->set_command_list ($cmds);
3493}
3494
3495sub get_binding {
3496 my ($self) = @_;
3497 return (
3498 $self->{binding}->[0],
3499 $self->{binding}->[1],
3500 [ grep { defined $_ } @{$self->{commands}} ]
3501 );
3502}
3503
3504sub clear_command_list {
3505 my ($self) = @_;
3506 $self->{cmdbox}->clear ();
3507}
3508
3509sub set_command_list {
3510 my ($self, $cmds) = @_;
3511
3512 $self->{cmdbox}->clear ();
3513 $self->{commands} = $cmds;
3514
3515 my $idx = 0;
3516
3517 for (@$cmds) {
3518 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3519
3520 my $i = $idx;
3521 $hb->add (new CFClient::UI::Label text => $_);
3522 $hb->add (new CFClient::UI::Button
3523 text => "delete",
3524 tooltip => "Deletes the action from the record",
3525 on_activate => sub {
3526 $self->{cmdbox}->remove ($hb);
3527 $cmds->[$i] = undef;
3528 });
3529
3530
3531 $idx++
3532 } 3502 }
3533} 3503}
3534 3504
3535############################################################################# 3505#############################################################################
3536 3506
3546 commands => [], 3516 commands => [],
3547 @_, 3517 @_,
3548 ) 3518 )
3549} 3519}
3550 3520
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");
3551my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => 3527my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3552 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell."); 3528 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3553my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => 3529my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3554 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation."); 3530 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3555my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => 3531my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3556 "<b>Damage</b>. The amount of damage the spell deals when it hits."); 3532 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3557 3533
3558sub rebuild_spell_list { 3534sub rebuild_spell_list {
3559 my ($self) = @_; 3535 my ($self) = @_;
3560 3536
3561 $CFClient::UI::ROOT->on_refresh ($self => sub { 3537 $CFClient::UI::ROOT->on_refresh ($self => sub {
3562 $self->clear; 3538 $self->clear;
3563 3539
3540 return unless $::CONN;
3541
3564 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name"); 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);
3565 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3544 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3566 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3545 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3567 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3546 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3568 3547
3569 my $row = 0; 3548 my $row = 0;
3570 3549
3571 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3550 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3572 my $spell = $self->{spell}{$_}; 3551 my $spell = $self->{spell}{$_};
3573 3552
3574 $row++; 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});
3575 3580
3576 $self->add (0, $row, new CFClient::UI::Face 3581 $self->add (0, $row, new CFClient::UI::Face
3577 face => $spell->{face}, 3582 face => $spell->{face},
3578 can_hover => 1, 3583 can_hover => 1,
3579 can_events => 1, 3584 can_events => 1,
3580 tooltip => $spell->{message}, 3585 tooltip => $tooltip,
3586 on_button_down => $spell_cb,
3581 ); 3587 );
3582 3588
3583 $self->add (1, $row, new CFClient::UI::Label 3589 $self->add (1, $row, new CFClient::UI::Label
3584 expand => 1, 3590 expand => 1,
3585 text => $spell->{name}, 3591 text => $spell->{name},
3586 can_hover => 1, 3592 can_hover => 1,
3587 can_events => 1, 3593 can_events => 1,
3588 tooltip => $spell->{message}, 3594 tooltip => $tooltip,
3595 on_button_down => $spell_cb,
3589 ); 3596 );
3590 3597
3598 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3591 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3599 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3592 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3600 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3593 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3601 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3594
3595 # TODO: should be done via popup
3596 $self->add (5, $row, new CFClient::UI::Button
3597 text => "bind",
3598 tooltip => "bind spell readying (cast command) to key",
3599 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3600 );
3601 } 3602 }
3602 }); 3603 });
3603} 3604}
3604 3605
3605sub add_spell { 3606sub add_spell {
3611 3612
3612sub remove_spell { 3613sub remove_spell {
3613 my ($self, $spell) = @_; 3614 my ($self, $spell) = @_;
3614 3615
3615 delete $self->{spell}->{$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} = {};
3616 $self->rebuild_spell_list; 3624 $self->rebuild_spell_list;
3617} 3625}
3618 3626
3619############################################################################# 3627#############################################################################
3620 3628
3657 $coord = $max - $size if $coord > $max - $size; 3665 $coord = $max - $size if $coord > $max - $size;
3658 3666
3659 int $coord + 0.5 3667 int $coord + 0.5
3660} 3668}
3661 3669
3662sub size_allocate { 3670sub invoke_size_allocate {
3663 my ($self, $w, $h) = @_; 3671 my ($self, $w, $h) = @_;
3664 3672
3665 for my $child ($self->children) { 3673 for my $child ($self->children) {
3666 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)};
3667 3675
3671 $X = _to_pixel $X, $W, $self->{w}; 3679 $X = _to_pixel $X, $W, $self->{w};
3672 $Y = _to_pixel $Y, $H, $self->{h}; 3680 $Y = _to_pixel $Y, $H, $self->{h};
3673 3681
3674 $child->configure ($X, $Y, $W, $H); 3682 $child->configure ($X, $Y, $W, $H);
3675 } 3683 }
3684
3685 1
3676} 3686}
3677 3687
3678sub coord2local { 3688sub coord2local {
3679 my ($self, $x, $y) = @_; 3689 my ($self, $x, $y) = @_;
3680 3690
3806 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3816 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3807 3817
3808 $w = 0 if $w < 0; 3818 $w = 0 if $w < 0;
3809 $h = 0 if $h < 0; 3819 $h = 0 if $h < 0;
3810 3820
3821 $w = max $widget->{min_w}, $w;
3822 $h = max $widget->{min_h}, $h;
3823
3824 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3825 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3826
3811 $w = int $w + 0.5; 3827 $w = int $w + 0.5;
3812 $h = int $h + 0.5; 3828 $h = int $h + 0.5;
3813 3829
3814 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3830 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3815 $widget->{old_w} = $widget->{w}; 3831 $widget->{old_w} = $widget->{w};

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines