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.284 by root, Mon Jun 5 03:06:04 2006 UTC vs.
Revision 1.329 by root, Sun Jul 23 02:44:06 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines