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.323 by root, Wed Jul 5 03:01:01 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines