ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.288 by root, Mon Jun 5 21:14:40 2006 UTC vs.
Revision 1.328 by root, Sat Jul 22 13:43:05 2006 UTC

82} 82}
83 83
84sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
85 my ($ev) = @_; 85 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
87
88 warn "button down $ev->{button}\n";#d#
87 89
88 if (!$BUTTON_STATE) { 90 if (!$BUTTON_STATE) {
89 my $widget = $ROOT->find_widget ($x, $y); 91 my $widget = $ROOT->find_widget ($x, $y);
90 92
91 $GRAB = $widget; 93 $GRAB = $widget;
272 274
273 return unless $self->{visible}; 275 return unless $self->{visible};
274 276
275 $_->set_invisible for $self->children; 277 $_->set_invisible for $self->children;
276 278
279 delete $self->{visible};
277 delete $self->{root}; 280 delete $self->{root};
278 delete $self->{visible};
279 281
280 undef $GRAB if $GRAB == $self; 282 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 283 undef $HOVER if $HOVER == $self;
282 284
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 285 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 286 if $TOOLTIP->{owner} == $self;
285 287
286 $self->focus_out; 288 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 289 $self->emit (visibility_change => 0);
289} 290}
290 291
291sub set_visibility { 292sub set_visibility {
292 my ($self, $visible) = @_; 293 my ($self, $visible) = @_;
315} 316}
316 317
317sub move_abs { 318sub move_abs {
318 my ($self, $x, $y, $z) = @_; 319 my ($self, $x, $y, $z) = @_;
319 320
320 $self->{x} = List::Util::max 0, int $x; 321 $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; 322 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322 $self->{z} = $z if defined $z; 323 $self->{z} = $z if defined $z;
323 324
324 $self->update; 325 $self->update;
325} 326}
326 327
334} 335}
335 336
336sub size_request { 337sub size_request {
337 require Carp; 338 require Carp;
338 Carp::confess "size_request is abstract"; 339 Carp::confess "size_request is abstract";
340}
341
342sub baseline_shift {
343 0
339} 344}
340 345
341sub configure { 346sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 347 my ($self, $x, $y, $w, $h) = @_;
343 348
367 372
368 $self->{root}{size_alloc}{$self+0} = $self; 373 $self->{root}{size_alloc}{$self+0} = $self;
369 } 374 }
370} 375}
371 376
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 377sub children {
377 # nop 378 # nop
378} 379}
379 380
380sub visible_children { 381sub visible_children {
418 my ($self, $x, $y) = @_; 419 my ($self, $x, $y) = @_;
419 420
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 421 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 422}
422 423
423sub focus_in { 424sub invoke_focus_in {
424 my ($self) = @_; 425 my ($self) = @_;
425 426
426 return if $FOCUS == $self; 427 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 428 return unless $self->{can_focus};
428 429
429 my $focus = $FOCUS; $FOCUS = $self; 430 $FOCUS = $self;
430 431
431 $self->_emit (focus_in => $focus); 432 $self->update;
432 433
433 $focus->update if $focus; 434 0
434 $FOCUS->update;
435} 435}
436 436
437sub focus_out { 437sub invoke_focus_out {
438 my ($self) = @_; 438 my ($self) = @_;
439 439
440 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
441 441
442 my $focus = $FOCUS; undef $FOCUS; 442 undef $FOCUS;
443 443
444 $self->_emit (focus_out => $focus); 444 $self->update;
445 445
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 446 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 447 unless $FOCUS;
450}
451 448
449 0
450}
451
452sub grab_focus {
453 my ($self) = @_;
454
455 $FOCUS->emit ("focus_out") if $FOCUS;
456 $self->emit ("focus_in");
457}
458
452sub mouse_motion { 0 } 459sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 460sub invoke_button_up { 0 }
454sub key_down { 0 } 461sub invoke_key_down { 0 }
455sub key_up { 0 } 462sub invoke_key_up { 0 }
456 463
457sub button_down { 464sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 465 my ($self, $ev, $x, $y) = @_;
459 466
460 $self->focus_in; 467 $self->grab_focus;
468
469 warn "button down $ev->{button} $x $y\n";#d#
461 470
462 0 471 0
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub emit {
481 my ($self, $signal, @args) = @_;
482
483 #d##TODO# stop propagating at first true, do not use sum
484 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
485 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
486 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 487}
464 488
465sub find_widget { 489sub find_widget {
466 my ($self, $x, $y) = @_; 490 my ($self, $x, $y) = @_;
467 491
477sub set_parent { 501sub set_parent {
478 my ($self, $parent) = @_; 502 my ($self, $parent) = @_;
479 503
480 Scalar::Util::weaken ($self->{parent} = $parent); 504 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 505 $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} 506}
506 507
507sub realloc { 508sub realloc {
508 my ($self) = @_; 509 my ($self) = @_;
509 510
526} 527}
527 528
528sub reconfigure { 529sub reconfigure {
529 my ($self) = @_; 530 my ($self) = @_;
530 531
531 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534
535 $self->realloc; 532 $self->realloc;
536 $self->update; 533 $self->update;
537} 534}
538 535
539# using global variables seems a bit hacky, but passing through all drawing 536# using global variables seems a bit hacky, but passing through all drawing
546 return unless $self->{h} && $self->{w}; 543 return unless $self->{h} && $self->{w};
547 544
548 # update screen rectangle 545 # update screen rectangle
549 local $draw_x = $draw_x + $self->{x}; 546 local $draw_x = $draw_x + $self->{x};
550 local $draw_y = $draw_y + $self->{y}; 547 local $draw_y = $draw_y + $self->{y};
551 local $draw_w = $draw_x + $self->{w};
552 local $draw_h = $draw_y + $self->{h};
553 548
554 # skip widgets that are entirely outside the drawing area 549 # skip widgets that are entirely outside the drawing area
555 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
556 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
557 552
596} 591}
597 592
598sub DESTROY { 593sub DESTROY {
599 my ($self) = @_; 594 my ($self) = @_;
600 595
596 return if CFClient::in_destruct;
597
601 delete $WIDGET{$self+0}; 598 delete $WIDGET{$self+0};
602 #$self->deactivate; 599
600 eval { $self->destroy };
601 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
603} 602}
604 603
605############################################################################# 604#############################################################################
606 605
607package CFClient::UI::DrawBG; 606package CFClient::UI::DrawBG;
772} 771}
773 772
774sub add { 773sub add {
775 my ($self, $child) = @_; 774 my ($self, $child) = @_;
776 775
777 $self->{children} = []; 776 $self->SUPER::remove ($_) for @{ $self->{children} };
778
779 $self->SUPER::add ($child); 777 $self->SUPER::add ($child);
780} 778}
781 779
782sub remove { 780sub remove {
783 my ($self, $widget) = @_; 781 my ($self, $widget) = @_;
792 790
793sub size_request { 791sub size_request {
794 $_[0]{children}[0]->size_request 792 $_[0]{children}[0]->size_request
795} 793}
796 794
797sub size_allocate { 795sub invoke_size_allocate {
798 my ($self, $w, $h) = @_; 796 my ($self, $w, $h) = @_;
799 797
800 $self->{children}[0]->configure (0, 0, $w, $h); 798 $self->{children}[0]->configure (0, 0, $w, $h);
799
800 1
801} 801}
802 802
803############################################################################# 803#############################################################################
804 804
805# back-buffered drawing area 805# back-buffered drawing area
821 821
822 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 822 $ROOT->on_post_alloc ($self => sub { $self->render_child });
823 $self->SUPER::update; 823 $self->SUPER::update;
824} 824}
825 825
826sub size_allocate { 826sub invoke_size_allocate {
827 my ($self, $w, $h) = @_; 827 my ($self, $w, $h) = @_;
828 828
829 $self->SUPER::size_allocate ($w, $h);
830 $self->update; 829 $self->update;
830
831 $self->SUPER::invoke_size_allocate ($w, $h)
831} 832}
832 833
833sub _render { 834sub _render {
834 my ($self) = @_; 835 my ($self) = @_;
835 836
896 $h = 10 if $self->{scroll_y}; 897 $h = 10 if $self->{scroll_y};
897 898
898 ($w, $h) 899 ($w, $h)
899} 900}
900 901
901sub size_allocate { 902sub invoke_size_allocate {
902 my ($self, $w, $h) = @_; 903 my ($self, $w, $h) = @_;
903 904
904 my $child = $self->child; 905 my $child = $self->child;
905 906
906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 907 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 908 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
908 909
909 $self->child->configure (0, 0, $w, $h); 910 $self->child->configure (0, 0, $w, $h);
910 $self->update; 911 $self->update;
912
913 1
911} 914}
912 915
913sub set_offset { 916sub set_offset {
914 my ($self, $x, $y) = @_; 917 my ($self, $x, $y) = @_;
915 918
989 $self->add ($child) if $child; 992 $self->add ($child) if $child;
990 993
991 $self 994 $self
992} 995}
993 996
997#TODO# update range on size_allocate depending on child
998
994sub add { 999sub add {
995 my ($self, $widget) = @_; 1000 my ($self, $widget) = @_;
996 1001
997 $self->{vp}->add ($self->{child} = $widget); 1002 $self->{vp}->add ($self->{child} = $widget);
998} 1003}
999 1004
1005sub invoke_button_down {
1006 my ($self, $ev) = @_;
1007
1008 warn "button down $ev->{button}\n";#d#
1009
1010 0
1011}
1012
1013sub update_slider {
1014 my ($self) = @_;
1015
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1017}
1018
1000sub update { 1019sub update {
1001 my ($self) = @_; 1020 my ($self) = @_;
1002 1021
1003 $self->SUPER::update; 1022 $self->SUPER::update;
1004 1023
1005 # todo: overwrite size_allocate of child 1024 $self->update_slider;
1006 my $child = $self->{vp}->child;
1007 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1008} 1025}
1009 1026
1010sub size_allocate { 1027sub invoke_size_allocate {
1011 my ($self, $w, $h) = @_; 1028 my ($self, $w, $h) = @_;
1012 1029
1030 $self->update_slider;
1031
1013 $self->SUPER::size_allocate ($w, $h); 1032 $self->SUPER::invoke_size_allocate ($w, $h)
1014
1015 my $child = $self->{vp}->child;
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1017} 1033}
1018
1019#TODO# update range on size_allocate depending on child
1020# update viewport offset on scroll
1021 1034
1022############################################################################# 1035#############################################################################
1023 1036
1024package CFClient::UI::Frame; 1037package CFClient::UI::Frame;
1025 1038
1076 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1089 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1077 1090
1078sub new { 1091sub new {
1079 my ($class, %arg) = @_; 1092 my ($class, %arg) = @_;
1080 1093
1081 my $title = delete $arg{title};
1082
1083 my $self = $class->SUPER::new ( 1094 my $self = $class->SUPER::new (
1084 bg => [1, 1, 1, 1], 1095 bg => [1, 1, 1, 1],
1085 border_bg => [1, 1, 1, 1], 1096 border_bg => [1, 1, 1, 1],
1086 border => 0.6, 1097 border => 0.6,
1087 can_events => 1, 1098 can_events => 1,
1088 min_w => 16, 1099 min_w => 64,
1089 min_h => 16, 1100 min_h => 32,
1090 %arg, 1101 %arg,
1091 ); 1102 );
1092 1103
1093 $self->{title} = new CFClient::UI::Label 1104 $self->{title_widget} = new CFClient::UI::Label
1094 align => 0, 1105 align => 0,
1095 valign => 1, 1106 valign => 1,
1096 text => $title, 1107 text => $self->{title},
1097 fontsize => $self->{border} 1108 fontsize => $self->{border},
1098 if defined $title; 1109 if exists $self->{title};
1110
1111 if ($self->{has_close_button}) {
1112 $self->{close_button} =
1113 new CFClient::UI::ImageButton
1114 path => 'x1_close.png',
1115 on_activate => sub { $self->emit ("delete") };
1116
1117 $self->CFClient::UI::Container::add ($self->{close_button});
1118 }
1099 1119
1100 $self 1120 $self
1101} 1121}
1102 1122
1103sub add { 1123sub add {
1104 my ($self, @widgets) = @_; 1124 my ($self, @widgets) = @_;
1105 1125
1106 $self->SUPER::add (@widgets); 1126 $self->SUPER::add (@widgets);
1127 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1128 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1108} 1129}
1109 1130
1110sub border { 1131sub border {
1111 int $_[0]{border} * $::FONTSIZE 1132 int $_[0]{border} * $::FONTSIZE
1112} 1133}
1113 1134
1114sub size_request { 1135sub size_request {
1115 my ($self) = @_; 1136 my ($self) = @_;
1116 1137
1117 $self->{title}->size_request 1138 $self->{title_widget}->size_request
1118 if $self->{title}; 1139 if $self->{title_widget};
1140
1141 $self->{close_button}->size_request
1142 if $self->{close_button};
1119 1143
1120 my ($w, $h) = $self->SUPER::size_request; 1144 my ($w, $h) = $self->SUPER::size_request;
1121 1145
1122 ( 1146 (
1123 $w + $self->border * 2, 1147 $w + $self->border * 2,
1124 $h + $self->border * 2, 1148 $h + $self->border * 2,
1125 ) 1149 )
1126} 1150}
1127 1151
1128sub size_allocate { 1152sub invoke_size_allocate {
1129 my ($self, $w, $h) = @_; 1153 my ($self, $w, $h) = @_;
1130 1154
1131 if ($self->{title}) { 1155 if ($self->{title_widget}) {
1132 $self->{title}{w} = $w; 1156 $self->{title_widget}{w} = $w;
1133 $self->{title}{h} = $h; 1157 $self->{title_widget}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h); 1158 $self->{title_widget}->invoke_size_allocate ($w, $h);
1135 } 1159 }
1136 1160
1137 my $border = $self->border; 1161 my $border = $self->border;
1138 1162
1139 $h -= List::Util::max 0, $border * 2; 1163 $h -= List::Util::max 0, $border * 2;
1140 $w -= List::Util::max 0, $border * 2; 1164 $w -= List::Util::max 0, $border * 2;
1165
1166 $self->child->configure ($border, $border, $w, $h);
1167
1168 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1169 if $self->{close_button};
1170
1171 1
1172}
1173
1174sub invoke_delete {
1175 my ($self) = @_;
1176
1177 $self->hide;
1141 1178
1142 $self->child->configure ($border, $border, $w, $h); 1179 1
1143} 1180}
1144 1181
1145sub button_down { 1182sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_; 1183 my ($self, $ev, $x, $y) = @_;
1147 1184
1148 my ($w, $h) = @$self{qw(w h)}; 1185 my ($w, $h) = @$self{qw(w h)};
1149 my $border = $self->border; 1186 my $border = $self->border;
1150 1187
1181 1218
1182 ($x, $y) = ($ev->{x}, $ev->{y}); 1219 ($x, $y) = ($ev->{x}, $ev->{y});
1183 1220
1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1221 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1185 # HACK: the next line is required to enforce placement 1222 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1223 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1187 }; 1224 };
1188 } else { 1225 } else {
1189 return 0; 1226 return 0;
1190 } 1227 }
1191 1228
1192 1 1229 1
1193} 1230}
1194 1231
1195sub button_up { 1232sub invoke_button_up {
1196 my ($self, $ev, $x, $y) = @_; 1233 my ($self, $ev, $x, $y) = @_;
1197 1234
1198 !!delete $self->{motion} 1235 ! ! delete $self->{motion}
1199} 1236}
1200 1237
1201sub mouse_motion { 1238sub invoke_mouse_motion {
1202 my ($self, $ev, $x, $y) = @_; 1239 my ($self, $ev, $x, $y) = @_;
1203 1240
1204 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1241 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205 1242
1206 !!$self->{motion} 1243 ! ! $self->{motion}
1207} 1244}
1208 1245
1209sub _draw { 1246sub _draw {
1210 my ($self) = @_; 1247 my ($self) = @_;
1211 1248
1237 1274
1238 glDisable GL_TEXTURE_2D; 1275 glDisable GL_TEXTURE_2D;
1239 1276
1240 $child->draw; 1277 $child->draw;
1241 1278
1242 if ($self->{title}) { 1279 if ($self->{title_widget}) {
1243 glTranslate 0, $border - $self->{h}; 1280 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw; 1281 $self->{title_widget}->_draw;
1282
1283 glTranslate 0, - ($border - $self->{h});
1245 } 1284 }
1285
1286 $self->{close_button}->draw
1287 if $self->{close_button};
1246} 1288}
1247 1289
1248############################################################################# 1290#############################################################################
1249 1291
1250package CFClient::UI::Table; 1292package CFClient::UI::Table;
1273 1315
1274 $child->set_parent ($self); 1316 $child->set_parent ($self);
1275 $self->{children}[$y][$x] = $child; 1317 $self->{children}[$y][$x] = $child;
1276 1318
1277 $self->realloc; 1319 $self->realloc;
1320}
1321
1322sub remove {
1323 my ($self, $child) = @_;
1324
1325 # TODO: not yet implemented
1278} 1326}
1279 1327
1280# TODO: move to container class maybe? send children a signal on removal? 1328# TODO: move to container class maybe? send children a signal on removal?
1281sub clear { 1329sub clear {
1282 my ($self) = @_; 1330 my ($self) = @_;
1323 (sum @$ws), 1371 (sum @$ws),
1324 (sum @$hs), 1372 (sum @$hs),
1325 ) 1373 )
1326} 1374}
1327 1375
1328sub size_allocate { 1376sub invoke_size_allocate {
1329 my ($self, $w, $h) = @_; 1377 my ($self, $w, $h) = @_;
1330 1378
1331 my ($ws, $hs) = $self->get_wh; 1379 my ($ws, $hs) = $self->get_wh;
1332 1380
1333 my $req_w = (sum @$ws) || 1; 1381 my $req_w = (sum @$ws) || 1;
1365 } 1413 }
1366 1414
1367 $y += $row_h; 1415 $y += $row_h;
1368 } 1416 }
1369 1417
1418 1
1370} 1419}
1371 1420
1372sub find_widget { 1421sub find_widget {
1373 my ($self, $x, $y) = @_; 1422 my ($self, $x, $y) = @_;
1374 1423
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1460 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1461 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 ) 1462 )
1414} 1463}
1415 1464
1416sub size_allocate { 1465sub invoke_size_allocate {
1417 my ($self, $w, $h) = @_; 1466 my ($self, $w, $h) = @_;
1418 1467
1419 my $space = $self->{vertical} ? $h : $w; 1468 my $space = $self->{vertical} ? $h : $w;
1420 my $children = $self->{children}; 1469 my @children = $self->visible_children;
1421 1470
1422 my @req; 1471 my @req;
1423 1472
1424 if ($self->{homogeneous}) { 1473 if ($self->{homogeneous}) {
1425 @req = ($space / (@$children || 1)) x @$children; 1474 @req = ($space / (@children || 1)) x @children;
1426 } else { 1475 } else {
1427 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1476 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1428 my $req = List::Util::sum @req; 1477 my $req = List::Util::sum @req;
1429 1478
1430 if ($req > $space) { 1479 if ($req > $space) {
1431 # ah well, not enough space 1480 # ah well, not enough space
1432 $_ *= $space / $req for @req; 1481 $_ *= $space / $req for @req;
1433 } else { 1482 } else {
1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1483 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1435 1484
1436 $space = ($space - $req) / $expand; # remaining space to give away 1485 $space = ($space - $req) / $expand; # remaining space to give away
1437 1486
1438 $req[$_] += $space * $children->[$_]{expand} 1487 $req[$_] += $space * $children[$_]{expand}
1439 for 0 .. $#$children; 1488 for 0 .. $#children;
1440 } 1489 }
1441 } 1490 }
1442 1491
1443 CFClient::UI::harmonize \@req; 1492 CFClient::UI::harmonize \@req;
1444 1493
1445 my $pos = 0; 1494 my $pos = 0;
1446 for (0 .. $#$children) { 1495 for (0 .. $#children) {
1447 my $alloc = $req[$_]; 1496 my $alloc = $req[$_];
1448 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1497 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1449 1498
1450 $pos += $alloc; 1499 $pos += $alloc;
1451 } 1500 }
1452 1501
1453 1 1502 1
1556 my ($self, $text) = @_; 1605 my ($self, $text) = @_;
1557 1606
1558 return if $self->{text} eq "T$text"; 1607 return if $self->{text} eq "T$text";
1559 $self->{text} = "T$text"; 1608 $self->{text} = "T$text";
1560 1609
1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1562 $self->{layout}->set_text ($text); 1610 $self->{layout}->set_text ($text);
1563 1611
1564 delete $self->{req_h}; 1612 delete $self->{size_req};
1565 $self->realloc; 1613 $self->realloc;
1566 $self->update; 1614 $self->update;
1567} 1615}
1568 1616
1569sub set_markup { 1617sub set_markup {
1572 return if $self->{text} eq "M$markup"; 1620 return if $self->{text} eq "M$markup";
1573 $self->{text} = "M$markup"; 1621 $self->{text} = "M$markup";
1574 1622
1575 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1623 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1576 1624
1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1578 $self->{layout}->set_markup ($markup); 1625 $self->{layout}->set_markup ($markup);
1579 1626
1580 delete $self->{req_h}; 1627 delete $self->{size_req};
1581 $self->realloc; 1628 $self->realloc;
1582 $self->update; 1629 $self->update;
1583} 1630}
1584 1631
1585sub size_request { 1632sub size_request {
1586 my ($self) = @_; 1633 my ($self) = @_;
1587 1634
1588 if (exists $self->{req_h}) { 1635 $self->{size_req} ||= do {
1589 @$self{qw(req_w req_h)}
1590 } else {
1591 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1636 $self->{layout}->set_font ($self->{font}) if $self->{font};
1592 $self->{layout}->set_width ($self->{max_w} || -1); 1637 $self->{layout}->set_width ($self->{max_w} || -1);
1593 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1638 $self->{layout}->set_ellipsise ($self->{ellipsise});
1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1639 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1640 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1641
1597 my ($w, $h) = $self->{layout}->size; 1642 my ($w, $h) = $self->{layout}->size;
1598 1643
1599 if (exists $self->{template}) { 1644 if (exists $self->{template}) {
1600 $self->{template}->set_font ($self->{font}) if $self->{font}; 1645 $self->{template}->set_font ($self->{font}) if $self->{font};
1646 $self->{template}->set_width ($self->{max_w} || -1);
1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1647 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1602 1648
1603 my ($w2, $h2) = $self->{template}->size; 1649 my ($w2, $h2) = $self->{template}->size;
1604 1650
1605 $w = List::Util::max $w, $w2; 1651 $w = List::Util::max $w, $w2;
1606 $h = List::Util::max $h, $h2; 1652 $h = List::Util::max $h, $h2;
1607 } 1653 }
1608 1654
1609 ($w, $h) 1655 [$w, $h]
1610 } 1656 };
1611}
1612 1657
1658 @{ $self->{size_req} }
1659}
1660
1661sub baseline_shift {
1662 $_[0]{layout}->descent
1663}
1664
1613sub size_allocate { 1665sub invoke_size_allocate {
1614 my ($self, $w, $h) = @_; 1666 my ($self, $w, $h) = @_;
1615 1667
1616 delete $self->{ox}; 1668 delete $self->{ox};
1617 1669
1618 delete $self->{texture} 1670 delete $self->{texture}
1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1671 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1672
1673 1
1620} 1674}
1621 1675
1622sub set_fontsize { 1676sub set_fontsize {
1623 my ($self, $fontsize) = @_; 1677 my ($self, $fontsize) = @_;
1624 1678
1625 $self->{fontsize} = $fontsize; 1679 $self->{fontsize} = $fontsize;
1680 delete $self->{size_req};
1626 delete $self->{texture}; 1681 delete $self->{texture};
1627 1682
1628 $self->realloc; 1683 $self->realloc;
1629} 1684}
1630 1685
1686sub reconfigure {
1687 my ($self) = @_;
1688
1689 delete $self->{size_req};
1690 delete $self->{texture};
1691
1692 $self->SUPER::reconfigure;
1693}
1694
1631sub _draw { 1695sub _draw {
1632 my ($self) = @_; 1696 my ($self) = @_;
1633 1697
1634 $self->SUPER::_draw; # draw background, if applicable 1698 $self->SUPER::_draw; # draw background, if applicable
1635 1699
1636 my $tex = $self->{texture} ||= do { 1700 my $size = $self->{texture} ||= do {
1637 $self->{layout}->set_foreground (@{$self->{fg}}); 1701 $self->{layout}->set_foreground (@{$self->{fg}});
1638 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1702 $self->{layout}->set_font ($self->{font}) if $self->{font};
1639 $self->{layout}->set_width ($self->{w}); 1703 $self->{layout}->set_width ($self->{w});
1640 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1704 $self->{layout}->set_ellipsise ($self->{ellipsise});
1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1705 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1706 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1643 1707
1644 new_from_layout CFClient::Texture $self->{layout} 1708 [$self->{layout}->size]
1645 }; 1709 };
1646 1710
1647 unless (exists $self->{ox}) { 1711 unless (exists $self->{ox}) {
1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1712 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1713 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1650 : ($self->{w} - $tex->{w}) * 0.5); 1714 : ($self->{w} - $size->[0]) * 0.5);
1651 1715
1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1716 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1717 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1654 : ($self->{h} - $tex->{h}) * 0.5); 1718 : ($self->{h} - $size->[1]) * 0.5);
1655 }; 1719 };
1656 1720
1657 glEnable GL_TEXTURE_2D; 1721 my $w = List::Util::min $self->{w} + 4, $size->[0];
1722 my $h = List::Util::min $self->{h} + 2, $size->[1];
1658 1723
1659 if ($tex->{format} == GL_ALPHA) { 1724 $self->{layout}->render ($self->{ox}, $self->{oy});
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1661 glColor @{$self->{fg}};
1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1666 }
1667
1668 glDisable GL_TEXTURE_2D;
1669} 1725}
1670 1726
1671############################################################################# 1727#############################################################################
1672 1728
1673package CFClient::UI::EntryBase; 1729package CFClient::UI::EntryBase;
1687 can_hover => 1, 1743 can_hover => 1,
1688 can_focus => 1, 1744 can_focus => 1,
1689 valign => 0, 1745 valign => 0,
1690 can_events => 1, 1746 can_events => 1,
1691 #text => ... 1747 #text => ...
1748 #hidden => "*",
1692 @_ 1749 @_
1693 ) 1750 )
1694} 1751}
1695 1752
1696sub _set_text { 1753sub _set_text {
1703 $self->{last_activity} = $::NOW; 1760 $self->{last_activity} = $::NOW;
1704 $self->{text} = $text; 1761 $self->{text} = $text;
1705 1762
1706 $text =~ s/./*/g if $self->{hidden}; 1763 $text =~ s/./*/g if $self->{hidden};
1707 $self->{layout}->set_text ("$text "); 1764 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h}; 1765 delete $self->{size_req};
1709 1766
1710 $self->_emit (changed => $self->{text}); 1767 $self->emit (changed => $self->{text});
1711 1768
1712 $self->realloc; 1769 $self->realloc;
1713 $self->update; 1770 $self->update;
1714} 1771}
1715 1772
1730 my ($w, $h) = $self->SUPER::size_request; 1787 my ($w, $h) = $self->SUPER::size_request;
1731 1788
1732 ($w + 1, $h) # add 1 for cursor 1789 ($w + 1, $h) # add 1 for cursor
1733} 1790}
1734 1791
1735sub key_down { 1792sub invoke_key_down {
1736 my ($self, $ev) = @_; 1793 my ($self, $ev) = @_;
1737 1794
1738 my $mod = $ev->{mod}; 1795 my $mod = $ev->{mod};
1739 my $sym = $ev->{sym}; 1796 my $sym = $ev->{sym};
1740 my $uni = $ev->{unicode}; 1797 my $uni = $ev->{unicode};
1752 } elsif ($sym == CFClient::SDLK_HOME) { 1809 } elsif ($sym == CFClient::SDLK_HOME) {
1753 $self->{cursor} = 0; 1810 $self->{cursor} = 0;
1754 } elsif ($sym == CFClient::SDLK_END) { 1811 } elsif ($sym == CFClient::SDLK_END) {
1755 $self->{cursor} = length $text; 1812 $self->{cursor} = length $text;
1756 } elsif ($uni == 27) { 1813 } elsif ($uni == 27) {
1757 $self->_emit ('escape'); 1814 $self->emit ('escape');
1758 } elsif ($uni) { 1815 } elsif ($uni) {
1759 substr $text, $self->{cursor}++, 0, chr $uni; 1816 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else { 1817 } else {
1761 return 0; 1818 return 0;
1762 } 1819 }
1766 $self->realloc; 1823 $self->realloc;
1767 1824
1768 1 1825 1
1769} 1826}
1770 1827
1771sub focus_in { 1828sub invoke_focus_in {
1772 my ($self) = @_; 1829 my ($self) = @_;
1773 1830
1774 $self->{last_activity} = $::NOW; 1831 $self->{last_activity} = $::NOW;
1775 1832
1776 $self->SUPER::focus_in; 1833 $self->SUPER::invoke_focus_in
1777} 1834}
1778 1835
1779sub button_down { 1836sub invoke_button_down {
1780 my ($self, $ev, $x, $y) = @_; 1837 my ($self, $ev, $x, $y) = @_;
1781 1838
1782 $self->SUPER::button_down ($ev, $x, $y); 1839 $self->SUPER::invoke_button_down ($ev, $x, $y);
1783 1840
1784 my $idx = $self->{layout}->xy_to_index ($x, $y); 1841 my $idx = $self->{layout}->xy_to_index ($x, $y);
1785 1842
1786 # byte-index to char-index 1843 # byte-index to char-index
1787 my $text = $self->{text}; 1844 my $text = $self->{text};
1788 utf8::encode $text; 1845 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1789 $self->{cursor} = length substr $text, 0, $idx; 1846 $self->{cursor} = length $text;
1790 1847
1791 $self->_set_text ($self->{text}); 1848 $self->_set_text ($self->{text});
1792 $self->update; 1849 $self->update;
1793 1850
1794 1 1851 1
1795} 1852}
1796 1853
1797sub mouse_motion { 1854sub invoke_mouse_motion {
1798 my ($self, $ev, $x, $y) = @_; 1855 my ($self, $ev, $x, $y) = @_;
1799# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1856# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1800 1857
1801 0 1858 1
1802} 1859}
1803 1860
1804sub _draw { 1861sub _draw {
1805 my ($self) = @_; 1862 my ($self) = @_;
1806 1863
1847 1904
1848our @ISA = CFClient::UI::EntryBase::; 1905our @ISA = CFClient::UI::EntryBase::;
1849 1906
1850use CFClient::OpenGL; 1907use CFClient::OpenGL;
1851 1908
1852sub key_down { 1909sub invoke_key_down {
1853 my ($self, $ev) = @_; 1910 my ($self, $ev) = @_;
1854 1911
1855 my $sym = $ev->{sym}; 1912 my $sym = $ev->{sym};
1856 1913
1857 if ($sym == 13) { 1914 if ($sym == 13) {
1858 unshift @{$self->{history}}, 1915 unshift @{$self->{history}},
1859 my $txt = $self->get_text; 1916 my $txt = $self->get_text;
1917
1860 $self->{history_pointer} = -1; 1918 $self->{history_pointer} = -1;
1861 $self->{history_saveback} = ''; 1919 $self->{history_saveback} = '';
1862 $self->_emit (activate => $txt); 1920 $self->emit (activate => $txt);
1863 $self->update; 1921 $self->update;
1864 1922
1865 } elsif ($sym == CFClient::SDLK_UP) { 1923 } elsif ($sym == CFClient::SDLK_UP) {
1866 if ($self->{history_pointer} < 0) { 1924 if ($self->{history_pointer} < 0) {
1867 $self->{history_saveback} = $self->get_text; 1925 $self->{history_saveback} = $self->get_text;
1883 } else { 1941 } else {
1884 $self->set_text ($self->{history_saveback}); 1942 $self->set_text ($self->{history_saveback});
1885 } 1943 }
1886 1944
1887 } else { 1945 } else {
1888 return $self->SUPER::key_down ($ev) 1946 return $self->SUPER::invoke_key_down ($ev)
1889 } 1947 }
1890 1948
1891 1 1949 1
1892} 1950}
1893 1951
1917 can_events => 1, 1975 can_events => 1,
1918 @_ 1976 @_
1919 ) 1977 )
1920} 1978}
1921 1979
1922sub activate { }
1923
1924sub button_up { 1980sub invoke_button_up {
1925 my ($self, $ev, $x, $y) = @_; 1981 my ($self, $ev, $x, $y) = @_;
1926 1982
1927 $self->emit ("activate") 1983 $self->emit ("activate")
1928 if $x >= 0 && $x < $self->{w} 1984 if $x >= 0 && $x < $self->{w}
1929 && $y >= 0 && $y < $self->{h}; 1985 && $y >= 0 && $y < $self->{h};
1943 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1999 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1944 2000
1945 glDisable GL_TEXTURE_2D; 2001 glDisable GL_TEXTURE_2D;
1946 2002
1947 $self->SUPER::_draw; 2003 $self->SUPER::_draw;
2004}
2005
2006#############################################################################
2007
2008package CFClient::UI::ImageButton;
2009
2010our @ISA = CFClient::UI::Image::;
2011
2012use CFClient::OpenGL;
2013
2014my %textures;
2015
2016sub new {
2017 my $class = shift;
2018
2019 my $self = $class->SUPER::new (
2020 padding_x => 4,
2021 padding_y => 4,
2022 fg => [1, 1, 1],
2023 active_fg => [0, 0, 1],
2024 can_hover => 1,
2025 align => 0,
2026 valign => 0,
2027 can_events => 1,
2028 @_
2029 );
2030}
2031
2032sub invoke_button_up {
2033 my ($self, $ev, $x, $y) = @_;
2034
2035 $self->emit ("activate")
2036 if $x >= 0 && $x < $self->{w}
2037 && $y >= 0 && $y < $self->{h};
2038
2039 1
1948} 2040}
1949 2041
1950############################################################################# 2042#############################################################################
1951 2043
1952package CFClient::UI::CheckBox; 2044package CFClient::UI::CheckBox;
1979 my ($self) = @_; 2071 my ($self) = @_;
1980 2072
1981 (6) x 2 2073 (6) x 2
1982} 2074}
1983 2075
2076sub toggle {
2077 my ($self) = @_;
2078
2079 $self->{state} = !$self->{state};
2080 $self->emit (changed => $self->{state});
2081 $self->update;
2082}
2083
1984sub button_down { 2084sub invoke_button_down {
1985 my ($self, $ev, $x, $y) = @_; 2085 my ($self, $ev, $x, $y) = @_;
1986 2086
1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2087 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2088 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1989 $self->{state} = !$self->{state}; 2089 $self->toggle;
1990 $self->_emit (changed => $self->{state});
1991 } else { 2090 } else {
1992 return 0 2091 return 0
1993 } 2092 }
1994 2093
1995 1 2094 1
2020package CFClient::UI::Image; 2119package CFClient::UI::Image;
2021 2120
2022our @ISA = CFClient::UI::Base::; 2121our @ISA = CFClient::UI::Base::;
2023 2122
2024use CFClient::OpenGL; 2123use CFClient::OpenGL;
2025use Carp qw/confess/;
2026 2124
2027our %loaded_images; 2125our %texture_cache;
2028 2126
2029sub new { 2127sub new {
2030 my $class = shift; 2128 my $class = shift;
2031 2129
2032 my $self = $class->SUPER::new (can_events => 0, @_); 2130 my $self = $class->SUPER::new (
2131 can_events => 0,
2132 @_,
2133 );
2033 2134
2034 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2135 $self->{path} || $self->{tex}
2136 or Carp::croak "'path' or 'tex' attributes required";
2035 2137
2036 $loaded_images{$self->{image}} ||= 2138 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2037 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2139 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2038 2140
2039 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2141 Scalar::Util::weaken $texture_cache{$self->{path}};
2040 2142
2041 Scalar::Util::weaken $loaded_images{$self->{image}}; 2143 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2042
2043 $self->{aspect} = $tex->{w} / $tex->{h};
2044 2144
2045 $self 2145 $self
2046} 2146}
2047 2147
2048sub size_request { 2148sub size_request {
2049 my ($self) = @_; 2149 my ($self) = @_;
2050 2150
2051 ($self->{tex}->{w}, $self->{tex}->{h}) 2151 ($self->{tex}{w}, $self->{tex}{h})
2052} 2152}
2053 2153
2054sub _draw { 2154sub _draw {
2055 my ($self) = @_; 2155 my ($self) = @_;
2056 2156
2165 my $ycut1 = max 0, min 1, $ycut; 2265 my $ycut1 = max 0, min 1, $ycut;
2166 my $ycut2 = max 0, min 1, $ycut - 1; 2266 my $ycut2 = max 0, min 1, $ycut - 1;
2167 2267
2168 my $h1 = $self->{h} * (1 - $ycut1); 2268 my $h1 = $self->{h} * (1 - $ycut1);
2169 my $h2 = $self->{h} * (1 - $ycut2); 2269 my $h2 = $self->{h} * (1 - $ycut2);
2270 my $h3 = $self->{h};
2271
2272 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2170 2273
2171 glEnable GL_BLEND; 2274 glEnable GL_BLEND;
2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2275 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2276 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2174 glEnable GL_TEXTURE_2D; 2277 glEnable GL_TEXTURE_2D;
2193 2296
2194 if ($t3) { 2297 if ($t3) {
2195 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2298 glBindTexture GL_TEXTURE_2D, $t3->{name};
2196 glBegin GL_QUADS; 2299 glBegin GL_QUADS;
2197 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2300 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2198 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2301 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2199 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2302 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2200 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2303 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2201 glEnd; 2304 glEnd;
2202 } 2305 }
2203 2306
2204 glDisable GL_BLEND; 2307 glDisable GL_BLEND;
2292 $self->update; 2395 $self->update;
2293 2396
2294 $self 2397 $self
2295} 2398}
2296 2399
2297sub changed { }
2298
2299sub set_range { 2400sub set_range {
2300 my ($self, $range) = @_; 2401 my ($self, $range) = @_;
2301 2402
2302 ($range, $self->{range}) = ($self->{range}, $range); 2403 ($range, $self->{range}) = ($self->{range}, $range);
2303 2404
2304 $self->update
2305 if "@$range" ne "@{$self->{range}}"; 2405 if ("@$range" ne "@{$self->{range}}") {
2406 $self->update;
2407 $self->set_value ($self->{range}[0]);
2408 }
2306} 2409}
2307 2410
2308sub set_value { 2411sub set_value {
2309 my ($self, $value) = @_; 2412 my ($self, $value) = @_;
2310 2413
2321 if $unit; 2424 if $unit;
2322 2425
2323 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2426 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2324 2427
2325 if ($value != $old_value) { 2428 if ($value != $old_value) {
2326 $self->_emit (changed => $value); 2429 $self->emit (changed => $value);
2327 $self->update; 2430 $self->update;
2328 } 2431 }
2329} 2432}
2330 2433
2331sub size_request { 2434sub size_request {
2332 my ($self) = @_; 2435 my ($self) = @_;
2333 2436
2334 ($self->{req_w}, $self->{req_h}) 2437 ($self->{req_w}, $self->{req_h})
2335} 2438}
2336 2439
2337sub button_down { 2440sub invoke_button_down {
2338 my ($self, $ev, $x, $y) = @_; 2441 my ($self, $ev, $x, $y) = @_;
2339 2442
2340 $self->SUPER::button_down ($ev, $x, $y); 2443 $self->SUPER::invoke_button_down ($ev, $x, $y);
2341 2444
2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2445 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2343 2446
2344 $self->mouse_motion ($ev, $x, $y) 2447 $self->invoke_mouse_motion ($ev, $x, $y)
2345} 2448}
2346 2449
2347sub mouse_motion { 2450sub invoke_mouse_motion {
2348 my ($self, $ev, $x, $y) = @_; 2451 my ($self, $ev, $x, $y) = @_;
2349 2452
2350 if ($GRAB == $self) { 2453 if ($GRAB == $self) {
2351 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2454 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2352 2455
2457sub set_range { shift->{slider}->set_range (@_) } 2560sub set_range { shift->{slider}->set_range (@_) }
2458sub set_value { shift->{slider}->set_value (@_) } 2561sub set_value { shift->{slider}->set_value (@_) }
2459 2562
2460############################################################################# 2563#############################################################################
2461 2564
2462package CFClient::UI::TextView; 2565package CFClient::UI::TextScroller;
2463 2566
2464our @ISA = CFClient::UI::HBox::; 2567our @ISA = CFClient::UI::HBox::;
2465 2568
2466use CFClient::OpenGL; 2569use CFClient::OpenGL;
2467 2570
2469 my $class = shift; 2572 my $class = shift;
2470 2573
2471 my $self = $class->SUPER::new ( 2574 my $self = $class->SUPER::new (
2472 fontsize => 1, 2575 fontsize => 1,
2473 can_events => 0, 2576 can_events => 0,
2577 indent => 0,
2474 #font => default_font 2578 #font => default_font
2475 @_, 2579 @_,
2476 2580
2477 layout => (new CFClient::Layout 1), 2581 layout => (new CFClient::Layout),
2478 par => [], 2582 par => [],
2479 height => 0, 2583 height => 0,
2480 children => [ 2584 children => [
2481 (new CFClient::UI::Empty expand => 1), 2585 (new CFClient::UI::Empty expand => 1),
2482 (new CFClient::UI::Slider vertical => 1), 2586 (new CFClient::UI::Slider vertical => 1),
2493 2597
2494 $self->{fontsize} = $fontsize; 2598 $self->{fontsize} = $fontsize;
2495 $self->reflow; 2599 $self->reflow;
2496} 2600}
2497 2601
2602sub size_request {
2603 my ($self) = @_;
2604
2605 my ($empty, $slider) = @{ $self->{children} };
2606
2607 local $self->{children} = [$empty, $slider];
2608 $self->SUPER::size_request
2609}
2610
2498sub size_allocate { 2611sub invoke_size_allocate {
2499 my ($self, $w, $h) = @_; 2612 my ($self, $w, $h) = @_;
2500 2613
2501 $self->SUPER::size_allocate ($w, $h); 2614 my ($empty, $slider, @other) = @{ $self->{children} };
2615 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2502 2616
2503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2617 $self->{layout}->set_font ($self->{font}) if $self->{font};
2504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2505 $self->{layout}->set_width ($self->{children}[0]{w}); 2619 $self->{layout}->set_width ($empty->{w});
2620 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2506 2621
2507 $self->reflow; 2622 $self->reflow;
2508}
2509 2623
2510sub text_size { 2624 local $self->{children} = [$empty, $slider];
2511 my ($self, $text, $indent) = @_; 2625 $self->SUPER::invoke_size_allocate ($w, $h)
2626}
2627
2628sub get_layout {
2629 my ($self, $para) = @_;
2512 2630
2513 my $layout = $self->{layout}; 2631 my $layout = $self->{layout};
2514 2632
2633 $layout->set_font ($self->{font}) if $self->{font};
2634 $layout->set_foreground (@{$para->{fg}});
2515 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2635 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $layout->set_width ($self->{children}[0]{w} - $indent); 2636 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2637 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2517 $layout->set_markup ($text); 2638 $layout->set_markup ($para->{markup});
2639
2640 $layout->set_shapes (
2641 map
2642 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2643 @{$para->{widget}}
2518 2644 );
2645
2519 $layout->size 2646 $layout
2520} 2647}
2521 2648
2522sub reflow { 2649sub reflow {
2523 my ($self) = @_; 2650 my ($self) = @_;
2524 2651
2533 $self->{children}[1]->set_value ($offset); 2660 $self->{children}[1]->set_value ($offset);
2534} 2661}
2535 2662
2536sub clear { 2663sub clear {
2537 my ($self) = @_; 2664 my ($self) = @_;
2665
2666 my (undef, undef, @other) = @{ $self->{children} };
2667 $self->remove ($_) for @other;
2538 2668
2539 $self->{par} = []; 2669 $self->{par} = [];
2540 $self->{height} = 0; 2670 $self->{height} = 0;
2541 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2671 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2542} 2672}
2543 2673
2544sub add_paragraph { 2674sub add_paragraph {
2545 my ($self, $color, $text, $indent) = @_; 2675 my ($self, $color, $para, $indent) = @_;
2546 2676
2547 for my $line (split /\n/, $text) { 2677 my ($text, @w) = ref $para ? @$para : $para;
2548 my ($w, $h) = $self->text_size ($line); 2678
2549 $self->{height} += $h; 2679 $para = {
2550 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2680 w => 1e10,
2681 wrapped => 1,
2682 fg => $color,
2683 indent => $indent,
2684 markup => $text,
2685 widget => \@w,
2551 } 2686 };
2552 2687
2553 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2688 $self->add (@w) if @w;
2689 push @{$self->{par}}, $para;
2690
2691 $self->{need_reflow}++;
2692 $self->update;
2693}
2694
2695sub scroll_to_bottom {
2696 my ($self) = @_;
2697
2698 $self->{scroll_to_bottom} = 1;
2699 $self->update;
2554} 2700}
2555 2701
2556sub update { 2702sub update {
2557 my ($self) = @_; 2703 my ($self) = @_;
2558 2704
2560 2706
2561 return unless $self->{h} > 0; 2707 return unless $self->{h} > 0;
2562 2708
2563 delete $self->{texture}; 2709 delete $self->{texture};
2564 2710
2565 $ROOT->on_post_alloc ($self, sub { 2711 $ROOT->on_post_alloc ($self => sub {
2566 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2712 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2567 2713
2568 if (delete $self->{need_reflow}) { 2714 if (delete $self->{need_reflow}) {
2569 my $height = 0; 2715 my $height = 0;
2570 2716
2571 my $layout = $self->{layout};
2572
2573 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2574
2575 for (@{$self->{par}}) { 2717 for my $para (@{$self->{par}}) {
2576 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2718 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2577 $layout->set_width ($W - $_->[3]); 2719 my $layout = $self->get_layout ($para);
2578 $layout->set_markup ($_->[4]);
2579 my ($w, $h) = $layout->size; 2720 my ($w, $h) = $layout->size;
2580 $_->[0] = $w + $_->[3]; 2721
2581 $_->[1] = $h; 2722 $para->{w} = $w + $para->{indent};
2723 $para->{h} = $h;
2724 $para->{wrapped} = $layout->has_wrapped;
2582 } 2725 }
2583 2726
2584 $height += $_->[1]; 2727 $height += $para->{h};
2585 } 2728 }
2586 2729
2587 $self->{height} = $height; 2730 $self->{height} = $height;
2588 2731
2589 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2732 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2590 2733
2591 delete $self->{texture}; 2734 delete $self->{texture};
2735 }
2736
2737 if (delete $self->{scroll_to_bottom}) {
2738 $self->{children}[1]->set_value (1e10);
2592 } 2739 }
2593 2740
2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2741 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2595 glClearColor 0, 0, 0, 0; 2742 glClearColor 0, 0, 0, 0;
2596 glClear GL_COLOR_BUFFER_BIT; 2743 glClear GL_COLOR_BUFFER_BIT;
2600 my $y0 = $top; 2747 my $y0 = $top;
2601 my $y1 = $top + $H; 2748 my $y1 = $top + $H;
2602 2749
2603 my $y = 0; 2750 my $y = 0;
2604 2751
2605 my $layout = $self->{layout};
2606
2607 $layout->set_font ($self->{font}) if $self->{font};
2608
2609 glEnable GL_BLEND;
2610 #TODO# not correct in windows where rgba is forced off
2611 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2612
2613 for my $par (@{$self->{par}}) { 2752 for my $para (@{$self->{par}}) {
2614 my $h = $par->[1]; 2753 my $h = $para->{h};
2615 2754
2616 if ($y0 < $y + $h && $y < $y1) { 2755 if ($y0 < $y + $h && $y < $y1) {
2617 $layout->set_foreground (@{ $par->[2] });
2618 $layout->set_width ($W - $par->[3]);
2619 $layout->set_markup ($par->[4]);
2620 2756
2621 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2757 my $layout = $self->get_layout ($para);
2622 2758
2623 glRasterPos $par->[3], $y - $y0; 2759 $layout->render ($para->{indent}, $y - $y0);
2624 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2760
2761 if (my @w = @{ $para->{widget} }) {
2762 my @s = $layout->get_shapes;
2763
2764 for (@w) {
2765 my ($dx, $dy) = splice @s, 0, 2, ();
2766
2767 $_->{x} = $dx + $para->{indent};
2768 $_->{y} = $dy + $y - $y0;
2769
2770 $_->draw;
2771 }
2772 }
2625 } 2773 }
2626 2774
2627 $y += $h; 2775 $y += $h;
2628 } 2776 }
2629
2630 glDisable GL_BLEND;
2631 }; 2777 };
2632 }); 2778 });
2779}
2780
2781sub reconfigure {
2782 my ($self) = @_;
2783
2784 $self->SUPER::reconfigure;
2785
2786 $_->{w} = 1e10 for @{ $self->{par} };
2787 $self->reflow;
2633} 2788}
2634 2789
2635sub _draw { 2790sub _draw {
2636 my ($self) = @_; 2791 my ($self) = @_;
2637 2792
2640 glColor 0, 0, 0, 1; 2795 glColor 0, 0, 0, 1;
2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2796 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2642 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
2643 2798
2644 $self->{children}[1]->draw; 2799 $self->{children}[1]->draw;
2645
2646} 2800}
2647 2801
2648############################################################################# 2802#############################################################################
2649 2803
2650package CFClient::UI::Animator; 2804package CFClient::UI::Animator;
2737 $tooltip .= "\n\n" . (ref $widget) . "\n" 2891 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2892 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n" 2893 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}"; 2894 . "visible $widget->{visible}";
2741 } 2895 }
2896
2897 $tooltip =~ s/^\n+//;
2898 $tooltip =~ s/\n+$//;
2742 2899
2743 $self->add (new CFClient::UI::Label 2900 $self->add (new CFClient::UI::Label
2744 markup => $tooltip, 2901 markup => $tooltip,
2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2902 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2746 fontsize => 0.8, 2903 fontsize => 0.8,
2756 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2913 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2757 2914
2758 ($w + 4, $h + 4) 2915 ($w + 4, $h + 4)
2759} 2916}
2760 2917
2761sub size_allocate { 2918sub invoke_size_allocate {
2762 my ($self, $w, $h) = @_; 2919 my ($self, $w, $h) = @_;
2763 2920
2764 $self->SUPER::size_allocate ($w - 4, $h - 4); 2921 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2765} 2922}
2766 2923
2767sub visibility_change { 2924sub invoke_visibility_change {
2768 my ($self, $visible) = @_; 2925 my ($self, $visible) = @_;
2769 2926
2770 return unless $visible; 2927 return unless $visible;
2771 2928
2772 $self->{root}->on_post_alloc ("move_$self" => sub { 2929 $self->{root}->on_post_alloc ("move_$self" => sub {
2774 or return; 2931 or return;
2775 2932
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2933 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777 2934
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2935 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH; 2936 if $x + $self->{w} > $self->{root}{w};
2780 2937
2781 $self->move_abs ($x, $y); 2938 $self->move_abs ($x, $y);
2782 }); 2939 });
2783} 2940}
2784 2941
2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3036 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2880 glDisable GL_TEXTURE_2D; 3037 glDisable GL_TEXTURE_2D;
2881 } 3038 }
2882} 3039}
2883 3040
2884sub DESTROY { 3041sub destroy {
2885 my ($self) = @_; 3042 my ($self) = @_;
2886 3043
2887 $self->{timer}->cancel 3044 $self->{timer}->cancel
2888 if $self->{timer}; 3045 if $self->{timer};
2889 3046
2890 $self->SUPER::DESTROY; 3047 $self->SUPER::destroy;
2891} 3048}
2892 3049
2893############################################################################# 3050#############################################################################
2894 3051
2895package CFClient::UI::Buttonbar; 3052package CFClient::UI::Buttonbar;
2916 ); 3073 );
2917 3074
2918 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3075 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2919 3076
2920 for my $item (@{ $self->{items} }) { 3077 for my $item (@{ $self->{items} }) {
2921 my ($widget, $cb) = @$item; 3078 my ($widget, $cb, $tooltip) = @$item;
2922 3079
2923 # handle various types of items, only text for now 3080 # handle various types of items, only text for now
2924 if (!ref $widget) { 3081 if (!ref $widget) {
3082 if ($widget =~ /\t/) {
3083 my ($left, $right) = split /\t/, $widget, 2;
3084
3085 $widget = new CFClient::UI::HBox
3086 can_hover => 1,
3087 can_events => 1,
3088 tooltip => $tooltip,
3089 children => [
3090 (new CFClient::UI::Label markup => $left, expand => 1),
3091 (new CFClient::UI::Label markup => $right, align => +1),
3092 ],
3093 ;
3094
3095 } else {
2925 $widget = new CFClient::UI::Label 3096 $widget = new CFClient::UI::Label
2926 can_hover => 1, 3097 can_hover => 1,
2927 can_events => 1, 3098 can_events => 1,
2928 text => $widget; 3099 markup => $widget,
3100 tooltip => $tooltip;
3101 }
2929 } 3102 }
2930 3103
2931 $self->{item}{$widget} = $item; 3104 $self->{item}{$widget} = $item;
2932 3105
2933 $self->{vbox}->add ($widget); 3106 $self->{vbox}->add ($widget);
2938 3111
2939# popup given the event (must be a mouse button down event currently) 3112# popup given the event (must be a mouse button down event currently)
2940sub popup { 3113sub popup {
2941 my ($self, $ev) = @_; 3114 my ($self, $ev) = @_;
2942 3115
2943 $self->_emit ("popdown"); 3116 $self->emit ("popdown");
2944 3117
2945 # maybe save $GRAB? must be careful about events... 3118 # maybe save $GRAB? must be careful about events...
2946 $GRAB = $self; 3119 $GRAB = $self;
2947 $self->{button} = $ev->{button}; 3120 $self->{button} = $ev->{button};
2948 3121
2949 $self->show; 3122 $self->show;
2950 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3123 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2951} 3124}
2952 3125
2953sub mouse_motion { 3126sub invoke_mouse_motion {
2954 my ($self, $ev, $x, $y) = @_; 3127 my ($self, $ev, $x, $y) = @_;
2955 3128
2956 # TODO: should use vbox->find_widget or so 3129 # TODO: should use vbox->find_widget or so
2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3130 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2958 $self->{hover} = $self->{item}{$HOVER}; 3131 $self->{hover} = $self->{item}{$HOVER};
2959 3132
2960 0 3133 0
2961} 3134}
2962 3135
2963sub button_up { 3136sub invoke_button_up {
2964 my ($self, $ev, $x, $y) = @_; 3137 my ($self, $ev, $x, $y) = @_;
2965 3138
2966 if ($ev->{button} == $self->{button}) { 3139 if ($ev->{button} == $self->{button}) {
2967 undef $GRAB; 3140 undef $GRAB;
2968 $self->hide; 3141 $self->hide;
2969 3142
2970 $self->_emit ("popdown"); 3143 $self->emit ("popdown");
2971 $self->{hover}[1]->() if $self->{hover}; 3144 $self->{hover}[1]->() if $self->{hover};
2972 } else { 3145 } else {
2973 return 0 3146 return 0
2974 } 3147 }
2975 3148
3002 3175
3003 $self->{current} = $self->{children}[0] 3176 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} }; 3177 if @{ $self->{children} };
3005} 3178}
3006 3179
3180sub get_current_page {
3181 my ($self) = @_;
3182
3183 $self->{current}
3184}
3185
3007sub set_current_page { 3186sub set_current_page {
3008 my ($self, $page_or_widget) = @_; 3187 my ($self, $page_or_widget) = @_;
3009 3188
3010 my $widget = ref $page_or_widget 3189 my $widget = ref $page_or_widget
3011 ? $page_or_widget 3190 ? $page_or_widget
3012 : $self->{children}[$page_or_widget]; 3191 : $self->{children}[$page_or_widget];
3013 3192
3014 $self->{current} = $widget; 3193 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3194 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016 3195
3017 $self->_emit (page_changed => $self->{current}); 3196 $self->emit (page_changed => $self->{current});
3018 3197
3019 $self->realloc; 3198 $self->realloc;
3020} 3199}
3021 3200
3022sub visible_children { 3201sub visible_children {
3027 my ($self) = @_; 3206 my ($self) = @_;
3028 3207
3029 $self->{current}->size_request 3208 $self->{current}->size_request
3030} 3209}
3031 3210
3032sub size_allocate { 3211sub invoke_size_allocate {
3033 my ($self, $w, $h) = @_; 3212 my ($self, $w, $h) = @_;
3034 3213
3035 $self->{current}->configure (0, 0, $w, $h); 3214 $self->{current}->configure (0, 0, $w, $h);
3215
3216 1
3036} 3217}
3037 3218
3038sub _draw { 3219sub _draw {
3039 my ($self) = @_; 3220 my ($self) = @_;
3040 3221
3075 ); 3256 );
3076 3257
3077 $self->{multiplexer}->add ($widget); 3258 $self->{multiplexer}->add ($widget);
3078} 3259}
3079 3260
3261sub get_current_page {
3262 my ($self) = @_;
3263
3264 $self->{multiplexer}->get_current_page
3265}
3266
3080sub set_current_page { 3267sub set_current_page {
3081 my ($self, $page) = @_; 3268 my ($self, $page) = @_;
3082 3269
3083 $self->{multiplexer}->set_current_page ($page); 3270 $self->{multiplexer}->set_current_page ($page);
3084 $self->_emit (page_changed => $self->{multiplexer}{current}); 3271 $self->emit (page_changed => $self->{multiplexer}{current});
3272}
3273
3274#############################################################################
3275
3276package CFClient::UI::Combobox;
3277
3278use utf8;
3279
3280our @ISA = CFClient::UI::Button::;
3281
3282sub new {
3283 my $class = shift;
3284
3285 my $self = $class->SUPER::new (
3286 options => [], # [value, title, longdesc], ...
3287 value => undef,
3288 @_,
3289 );
3290
3291 $self->_set_value ($self->{value});
3292
3293 $self
3294}
3295
3296sub invoke_button_down {
3297 my ($self, $ev) = @_;
3298
3299 my @menu_items;
3300
3301 for (@{ $self->{options} }) {
3302 my ($value, $title, $tooltip) = @$_;
3303
3304 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3305 }
3306
3307 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3308}
3309
3310sub _set_value {
3311 my ($self, $value) = @_;
3312
3313 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3314 or return;
3315
3316 $self->{value} = $item->[0];
3317 $self->set_markup ("$item->[1] ⇓");
3318 $self->set_tooltip ($item->[2]);
3319}
3320
3321sub set_value {
3322 my ($self, $value) = @_;
3323
3324 return unless $self->{value} ne $value;
3325
3326 $self->_set_value ($value);
3327 $self->emit (changed => $value);
3085} 3328}
3086 3329
3087############################################################################# 3330#############################################################################
3088 3331
3089package CFClient::UI::Statusbox; 3332package CFClient::UI::Statusbox;
3188 $item->{count}++; 3431 $item->{count}++;
3189 } else { 3432 } else {
3190 $item->{count} = 1; 3433 $item->{count} = 1;
3191 $item->{text} = $item->{tooltip} = $text; 3434 $item->{text} = $item->{tooltip} = $text;
3192 } 3435 }
3193 $item->{id} = ++$self->{id}; 3436 $item->{id} += 0.2;#d#
3194 $item->{timeout} = $timeout; 3437 $item->{timeout} = $timeout;
3195 delete $item->{label}; 3438 delete $item->{label};
3196 } else { 3439 } else {
3197 $self->{item}{$group} = { 3440 $self->{item}{$group} = {
3198 id => ++$self->{id}, 3441 id => ++$self->{id},
3204 count => 1, 3447 count => 1,
3205 %arg, 3448 %arg,
3206 }; 3449 };
3207 } 3450 }
3208 3451
3452 $ROOT->on_refresh (reorder => sub {
3209 $self->reorder; 3453 $self->reorder;
3454 });
3210} 3455}
3211 3456
3212sub reconfigure { 3457sub reconfigure {
3213 my ($self) = @_; 3458 my ($self) = @_;
3214 3459
3217 3462
3218 $self->reorder; 3463 $self->reorder;
3219 $self->SUPER::reconfigure; 3464 $self->SUPER::reconfigure;
3220} 3465}
3221 3466
3222sub DESTROY { 3467sub destroy {
3223 my ($self) = @_; 3468 my ($self) = @_;
3224 3469
3225 $self->{timer}->cancel; 3470 $self->{timer}->cancel;
3226 3471
3227 $self->SUPER::DESTROY; 3472 $self->SUPER::destroy;
3228} 3473}
3229 3474
3230############################################################################# 3475#############################################################################
3231 3476
3232package CFClient::UI::Inventory; 3477package CFClient::UI::Inventory;
3233 3478
3234our @ISA = CFClient::UI::ScrolledWindow::; 3479our @ISA = CFClient::UI::Table::;
3235 3480
3236sub new { 3481sub new {
3237 my $class = shift; 3482 my $class = shift;
3238 3483
3239 my $self = $class->SUPER::new ( 3484 my $self = $class->SUPER::new (
3240 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3485 col_expand => [0, 1, 0],
3241 @_, 3486 @_,
3242 ); 3487 );
3243 3488
3244 $self 3489 $self
3245} 3490}
3246 3491
3247sub set_items { 3492sub set_items {
3248 my ($self, $items) = @_; 3493 my ($self, $items) = @_;
3249 3494
3250 $self->{child}->clear; 3495 $self->clear;
3251 return unless $items; 3496 return unless $items;
3252 3497
3253 my @items = sort { 3498 my @items = sort {
3254 ($a->{type} <=> $b->{type}) 3499 ($a->{type} <=> $b->{type})
3255 or ($a->{name} cmp $b->{name}) 3500 or ($a->{name} cmp $b->{name})
3256 } @$items; 3501 } values %$items;
3257 3502
3258 $self->{real_items} = \@items; 3503 $self->{real_items} = \@items;
3259 3504
3260 my $row = 0; 3505 my $row = 0;
3261 for my $item (@items) { 3506 for my $item (@items) {
3262 CFClient::Item::update_widgets $item; 3507 CFClient::Item::update_widgets $item;
3263 3508
3264 $self->{child}->add (0, $row, $item->{face_widget}); 3509 $self->add (0, $row, $item->{face_widget});
3265 $self->{child}->add (1, $row, $item->{desc_widget}); 3510 $self->add (1, $row, $item->{desc_widget});
3266 $self->{child}->add (2, $row, $item->{weight_widget}); 3511 $self->add (2, $row, $item->{weight_widget});
3267 3512
3268 $row++; 3513 $row++;
3269 }
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::BindEditor;
3275
3276our @ISA = CFClient::UI::FancyFrame::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3282
3283 $self->add (my $vb = new CFClient::UI::VBox);
3284
3285
3286 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3287 text => "start recording",
3288 tooltip => "Start/Stops recording of actions."
3289 ."All subsequent actions after the recording started will be captured."
3290 ."The actions are displayed after the record was stopped."
3291 ."To bind the action you have to click on the 'Bind' button",
3292 on_activate => sub {
3293 unless ($self->{recording}) {
3294 $self->start;
3295 } else {
3296 $self->stop;
3297 }
3298 });
3299
3300 $vb->add (new CFClient::UI::Label text => "Actions:");
3301 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3302
3303 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3304 $vb->add (my $hb = new CFClient::UI::HBox);
3305 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3306 $hb->add (new CFClient::UI::Button
3307 text => "bind",
3308 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3309 on_activate => sub {
3310 $self->ask_for_bind;
3311 });
3312
3313 $vb->add (my $hb = new CFClient::UI::HBox);
3314 $hb->add (new CFClient::UI::Button
3315 text => "ok",
3316 expand => 1,
3317 tooltip => "This closes the binding editor and saves the binding",
3318 on_activate => sub {
3319 $self->hide;
3320 $self->commit;
3321 });
3322
3323 $hb->add (new CFClient::UI::Button
3324 text => "cancel",
3325 expand => 1,
3326 tooltip => "This closes the binding editor without saving",
3327 on_activate => sub {
3328 $self->hide;
3329 $self->{binding_cancel}->()
3330 if $self->{binding_cancel};
3331 });
3332
3333 $self->update_binding_widgets;
3334
3335 $self
3336}
3337
3338sub commit {
3339 my ($self) = @_;
3340 my ($mod, $sym, $cmds) = $self->get_binding;
3341 if ($sym != 0 && @$cmds > 0) {
3342 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3343 ."'. Don't forget 'Save Config'!");
3344 $self->{binding_change}->($mod, $sym, $cmds)
3345 if $self->{binding_change};
3346 } else {
3347 $::STATUSBOX->add ("No action bound, no key or action specified!");
3348 $self->{binding_cancel}->()
3349 if $self->{binding_cancel};
3350 }
3351}
3352
3353sub start {
3354 my ($self) = @_;
3355
3356 $self->{rec_btn}->set_text ("stop recording");
3357 $self->{recording} = 1;
3358 $self->clear_command_list;
3359 $::CONN->start_record if $::CONN;
3360}
3361
3362sub stop {
3363 my ($self) = @_;
3364
3365 $self->{rec_btn}->set_text ("start recording");
3366 $self->{recording} = 0;
3367
3368 my $rec;
3369 $rec = $::CONN->stop_record if $::CONN;
3370 return unless ref $rec eq 'ARRAY';
3371 $self->set_command_list ($rec);
3372}
3373
3374
3375sub ask_for_bind_and_commit {
3376 my ($self) = @_;
3377 $self->ask_for_bind (1);
3378}
3379
3380sub ask_for_bind {
3381 my ($self, $commit) = @_;
3382
3383 CFClient::Binder::open_binding_dialog (sub {
3384 my ($mod, $sym) = @_;
3385 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3386 $self->update_binding_widgets;
3387 $self->commit if $commit;
3388 });
3389}
3390
3391# $mod and $sym are the modifiers and key symbol
3392# $cmds is a array ref of strings (the commands)
3393# $cb is the callback that is executed on OK
3394# $ccb is the callback that is executed on CANCEL and
3395# when the binding was unsuccessful on OK
3396sub set_binding {
3397 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3398
3399 $self->clear_command_list;
3400 $self->{recording} = 0;
3401 $self->{rec_btn}->set_text ("start recording");
3402
3403 $self->{binding} = [$mod, $sym];
3404 $self->{commands} = $cmds;
3405
3406 $self->{binding_change} = $cb;
3407 $self->{binding_cancel} = $ccb;
3408
3409 $self->update_binding_widgets;
3410}
3411
3412# this is a shortcut method that asks for a binding
3413# and then just binds it.
3414sub do_quick_binding {
3415 my ($self, $cmds) = @_;
3416 $self->set_binding (undef, undef, $cmds, sub {
3417 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3418 });
3419 $self->ask_for_bind (1);
3420}
3421
3422sub update_binding_widgets {
3423 my ($self) = @_;
3424 my ($mod, $sym, $cmds) = $self->get_binding;
3425 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3426 $self->set_command_list ($cmds);
3427}
3428
3429sub get_binding {
3430 my ($self) = @_;
3431 return (
3432 $self->{binding}->[0],
3433 $self->{binding}->[1],
3434 [ grep { defined $_ } @{$self->{commands}} ]
3435 );
3436}
3437
3438sub clear_command_list {
3439 my ($self) = @_;
3440 $self->{cmdbox}->clear ();
3441}
3442
3443sub set_command_list {
3444 my ($self, $cmds) = @_;
3445
3446 $self->{cmdbox}->clear ();
3447 $self->{commands} = $cmds;
3448
3449 my $idx = 0;
3450
3451 for (@$cmds) {
3452 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3453
3454 my $i = $idx;
3455 $hb->add (new CFClient::UI::Label text => $_);
3456 $hb->add (new CFClient::UI::Button
3457 text => "delete",
3458 tooltip => "Deletes the action from the record",
3459 on_activate => sub {
3460 $self->{cmdbox}->remove ($hb);
3461 $cmds->[$i] = undef;
3462 });
3463
3464
3465 $idx++
3466 } 3514 }
3467} 3515}
3468 3516
3469############################################################################# 3517#############################################################################
3470 3518
3480 commands => [], 3528 commands => [],
3481 @_, 3529 @_,
3482 ) 3530 )
3483} 3531}
3484 3532
3485# XXX: Do sorting? Argl... 3533my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3534
3535my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3537my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3539my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3541my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3543my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3544 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3545
3546sub rebuild_spell_list {
3547 my ($self) = @_;
3548
3549 $CFClient::UI::ROOT->on_refresh ($self => sub {
3550 $self->clear;
3551
3552 return unless $::CONN;
3553
3554 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3555 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3556 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3557 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3558 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3559
3560 my $row = 0;
3561
3562 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3563 my $spell = $self->{spell}{$_};
3564
3565 $row++;
3566
3567 my $spell_cb = sub {
3568 my ($widget, $ev) = @_;
3569
3570 if ($ev->{button} == 1) {
3571 $::CONN->user_send ("cast $spell->{name}");
3572 } elsif ($ev->{button} == 2) {
3573 $::CONN->user_send ("invoke $spell->{name}");
3574 } elsif ($ev->{button} == 3) {
3575 (new CFClient::UI::Menu
3576 items => [
3577 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3578 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3579 ],
3580 )->popup ($ev);
3581 } else {
3582 return 0;
3583 }
3584
3585 1
3586 };
3587
3588 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3589
3590 #TODO: add path info to tooltip
3591 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3592
3593 $self->add (0, $row, new CFClient::UI::Face
3594 face => $spell->{face},
3595 can_hover => 1,
3596 can_events => 1,
3597 tooltip => $tooltip,
3598 on_button_down => $spell_cb,
3599 );
3600
3601 $self->add (1, $row, new CFClient::UI::Label
3602 expand => 1,
3603 text => $spell->{name},
3604 can_hover => 1,
3605 can_events => 1,
3606 tooltip => $tooltip,
3607 on_button_down => $spell_cb,
3608 );
3609
3610 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3611 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3612 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3613 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3614 }
3615 });
3616}
3617
3486sub add_spell { 3618sub add_spell {
3487 my ($self, $spell) = @_; 3619 my ($self, $spell) = @_;
3620
3488 $self->{spells}->{$spell->{name}} = $spell; 3621 $self->{spell}->{$spell->{name}} = $spell;
3489 3622 $self->rebuild_spell_list;
3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3491 face => $spell->{face},
3492 can_hover => 1,
3493 can_events => 1,
3494 tooltip => $spell->{message});
3495
3496 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => $spell->{name},
3498 can_hover => 1,
3499 can_events => 1,
3500 tooltip => $spell->{message},
3501 expand => 1);
3502
3503 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3504 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3505 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3506 expand => 1);
3507
3508 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3509 text => "bind to key",
3510 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3511}
3512
3513sub rebuild_spell_list {
3514 my ($self) = @_;
3515 $self->{tbl_idx} = 0;
3516 $self->add_spell ($_) for values %{$self->{spells}};
3517} 3623}
3518 3624
3519sub remove_spell { 3625sub remove_spell {
3520 my ($self, $spell) = @_; 3626 my ($self, $spell) = @_;
3627
3521 delete $self->{spells}->{$spell->{name}}; 3628 delete $self->{spell}->{$spell->{name}};
3629 $self->rebuild_spell_list;
3630}
3631
3632sub clear_spells {
3633 my ($self) = @_;
3634
3635 $self->{spell} = {};
3522 $self->rebuild_spell_list; 3636 $self->rebuild_spell_list;
3523} 3637}
3524 3638
3525############################################################################# 3639#############################################################################
3526 3640
3563 $coord = $max - $size if $coord > $max - $size; 3677 $coord = $max - $size if $coord > $max - $size;
3564 3678
3565 int $coord + 0.5 3679 int $coord + 0.5
3566} 3680}
3567 3681
3568sub size_allocate { 3682sub invoke_size_allocate {
3569 my ($self, $w, $h) = @_; 3683 my ($self, $w, $h) = @_;
3570 3684
3571 for my $child ($self->children) { 3685 for my $child ($self->children) {
3572 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3686 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3573 3687
3577 $X = _to_pixel $X, $W, $self->{w}; 3691 $X = _to_pixel $X, $W, $self->{w};
3578 $Y = _to_pixel $Y, $H, $self->{h}; 3692 $Y = _to_pixel $Y, $H, $self->{h};
3579 3693
3580 $child->configure ($X, $Y, $W, $H); 3694 $child->configure ($X, $Y, $W, $H);
3581 } 3695 }
3696
3697 1
3582} 3698}
3583 3699
3584sub coord2local { 3700sub coord2local {
3585 my ($self, $x, $y) = @_; 3701 my ($self, $x, $y) = @_;
3586 3702
3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3828 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3713 3829
3714 $w = 0 if $w < 0; 3830 $w = 0 if $w < 0;
3715 $h = 0 if $h < 0; 3831 $h = 0 if $h < 0;
3716 3832
3833 $w = max $widget->{min_w}, $w;
3834 $h = max $widget->{min_h}, $h;
3835
3836 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838
3717 $w = int $w + 0.5; 3839 $w = int $w + 0.5;
3718 $h = int $h + 0.5; 3840 $h = int $h + 0.5;
3719 3841
3720 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3842 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3721 $widget->{old_w} = $widget->{w}; 3843 $widget->{old_w} = $widget->{w};

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines