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.280 by root, Mon Jun 5 01:22:08 2006 UTC vs.
Revision 1.324 by root, Wed Jul 12 17:20:04 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
271 272
272 return unless $self->{visible}; 273 return unless $self->{visible};
273 274
274 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
275 276
277 delete $self->{visible};
276 delete $self->{root}; 278 delete $self->{root};
277 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288} 288}
289 289
290sub set_visibility { 290sub set_visibility {
291 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
314} 314}
315 315
316sub move_abs { 316sub move_abs {
317 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
318 318
319 $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;
320 $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;
321 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
322 322
323 $self->update; 323 $self->update;
324} 324}
325 325
… …
333} 333}
334 334
335sub size_request { 335sub size_request {
336 require Carp; 336 require Carp;
337 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
338} 342}
339 343
340sub configure { 344sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
342 346
… …
366 370
367 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
368 } 372 }
369} 373}
370 374
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 375sub children {
376 # nop 376 # nop
377} 377}
378 378
379sub visible_children { 379sub visible_children {
… …
381} 381}
382 382
383sub set_max_size { 383sub set_max_size {
384 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
385 385
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388 388
389 $self->realloc; 389 $self->realloc;
390} 390}
391 391
392sub set_tooltip { 392sub set_tooltip {
… …
399 399
400 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
401 401
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
404 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
405 } 405 }
406} 406}
407 407
408# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
409sub coord2local { 409sub coord2local {
… …
417 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
418 418
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 420}
421 421
422sub focus_in { 422sub invoke_focus_in {
423 my ($self) = @_; 423 my ($self) = @_;
424 424
425 return if $FOCUS == $self; 425 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
427 427
428 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
429 429
430 $self->_emit (focus_in => $focus); 430 $self->update;
431 431
432 $focus->update if $focus; 432 0
433 $FOCUS->update;
434} 433}
435 434
436sub focus_out { 435sub invoke_focus_out {
437 my ($self) = @_; 436 my ($self) = @_;
438 437
439 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
440 439
441 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
442 441
443 $self->_emit (focus_out => $focus); 442 $self->update;
444 443
445 $focus->update if $focus; #?
446
447 $::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
448 unless $FOCUS; 445 unless $FOCUS;
449}
450 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
451sub mouse_motion { 0 } 457sub invoke_mouse_motion { 1 }
452sub button_up { 0 } 458sub invoke_button_up { 1 }
453sub key_down { 0 } 459sub invoke_key_down { 1 }
454sub key_up { 0 } 460sub invoke_key_up { 1 }
455 461
456sub button_down { 462sub invoke_button_down {
457 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
458 464
459 $self->focus_in; 465 $self->grab_focus;
460 466
461 0 467 1
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
462} 483}
463 484
464sub find_widget { 485sub find_widget {
465 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
466 487
… …
476sub set_parent { 497sub set_parent {
477 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
478 499
479 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
481}
482
483sub connect {
484 my ($self, $signal, $cb) = @_;
485
486 push @{ $self->{signal_cb}{$signal} }, $cb;
487}
488
489sub _emit {
490 my ($self, $signal, @args) = @_;
491
492 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493}
494
495sub emit {
496 my ($self, $signal, @args) = @_;
497
498 $self->_emit ($signal, @args)
499 || $self->$signal (@args);
500}
501
502sub visibility_change {
503 #my ($self, $visible) = @_;
504} 502}
505 503
506sub realloc { 504sub realloc {
507 my ($self) = @_; 505 my ($self) = @_;
508 506
… …
541 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
542 540
543 # update screen rectangle 541 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548 544
549 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
552 548
… …
591} 587}
592 588
593sub DESTROY { 589sub DESTROY {
594 my ($self) = @_; 590 my ($self) = @_;
595 591
592 return if CFClient::in_destruct;
593
596 delete $WIDGET{$self+0}; 594 delete $WIDGET{$self+0};
597 #$self->deactivate; 595
596 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598} 598}
599 599
600############################################################################# 600#############################################################################
601 601
602package CFClient::UI::DrawBG; 602package CFClient::UI::DrawBG;
… …
767} 767}
768 768
769sub add { 769sub add {
770 my ($self, $child) = @_; 770 my ($self, $child) = @_;
771 771
772 $self->{children} = []; 772 $self->SUPER::remove ($_) for @{ $self->{children} };
773
774 $self->SUPER::add ($child); 773 $self->SUPER::add ($child);
775} 774}
776 775
777sub remove { 776sub remove {
778 my ($self, $widget) = @_; 777 my ($self, $widget) = @_;
… …
787 786
788sub size_request { 787sub size_request {
789 $_[0]{children}[0]->size_request 788 $_[0]{children}[0]->size_request
790} 789}
791 790
792sub size_allocate { 791sub invoke_size_allocate {
793 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
794 793
795 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
795
796 1
796} 797}
797 798
798############################################################################# 799#############################################################################
799 800
800# back-buffered drawing area 801# back-buffered drawing area
… …
816 817
817 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
818 $self->SUPER::update; 819 $self->SUPER::update;
819} 820}
820 821
821sub size_allocate { 822sub invoke_size_allocate {
822 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
823 824
824 $self->SUPER::size_allocate ($w, $h);
825 $self->update; 825 $self->update;
826
827 $self->SUPER::invoke_size_allocate ($w, $h)
826} 828}
827 829
828sub _render { 830sub _render {
829 my ($self) = @_; 831 my ($self) = @_;
830 832
… …
891 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
892 894
893 ($w, $h) 895 ($w, $h)
894} 896}
895 897
896sub size_allocate { 898sub invoke_size_allocate {
897 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
898 900
899 my $child = $self->child; 901 my $child = $self->child;
900 902
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903 905
904 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
905 $self->update; 907 $self->update;
908
909 1
906} 910}
907 911
908sub set_offset { 912sub set_offset {
909 my ($self, $x, $y) = @_; 913 my ($self, $x, $y) = @_;
910 914
… …
984 $self->add ($child) if $child; 988 $self->add ($child) if $child;
985 989
986 $self 990 $self
987} 991}
988 992
993#TODO# update range on size_allocate depending on child
994
989sub add { 995sub add {
990 my ($self, $widget) = @_; 996 my ($self, $widget) = @_;
991 997
992 $self->{vp}->add ($self->{child} = $widget); 998 $self->{vp}->add ($self->{child} = $widget);
993} 999}
994 1000
1001sub update_slider {
1002 my ($self) = @_;
1003
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1005}
1006
995sub update { 1007sub update {
996 my ($self) = @_; 1008 my ($self) = @_;
997 1009
998 $self->SUPER::update; 1010 $self->SUPER::update;
999 1011
1000 # todo: overwrite size_allocate of child 1012 $self->update_slider;
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003} 1013}
1004 1014
1005sub size_allocate { 1015sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1016 my ($self, $w, $h) = @_;
1007 1017
1018 $self->update_slider;
1019
1008 $self->SUPER::size_allocate ($w, $h); 1020 $self->SUPER::invoke_size_allocate ($w, $h)
1009
1010 my $child = $self->{vp}->child;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012} 1021}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1022
1017############################################################################# 1023#############################################################################
1018 1024
1019package CFClient::UI::Frame; 1025package CFClient::UI::Frame;
1020 1026
… …
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1077 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072 1078
1073sub new { 1079sub new {
1074 my ($class, %arg) = @_; 1080 my ($class, %arg) = @_;
1075
1076 my $title = delete $arg{title};
1077 1081
1078 my $self = $class->SUPER::new ( 1082 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1083 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1084 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1085 border => 0.6,
… …
1083 min_w => 16, 1087 min_w => 16,
1084 min_h => 16, 1088 min_h => 16,
1085 %arg, 1089 %arg,
1086 ); 1090 );
1087 1091
1088 $self->{title} = new CFClient::UI::Label 1092 $self->{title_widget} = new CFClient::UI::Label
1089 align => 0, 1093 align => 0,
1090 valign => 1, 1094 valign => 1,
1091 text => $title, 1095 text => $self->{title},
1092 fontsize => $self->{border} 1096 fontsize => $self->{border},
1093 if defined $title; 1097 if exists $self->{title};
1098
1099 if ($self->{has_close_button}) {
1100 $self->{close_button} =
1101 new CFClient::UI::ImageButton
1102 path => 'x1_close.png',
1103 on_activate => sub { $self->emit ("delete") };
1104
1105 $self->CFClient::UI::Container::add ($self->{close_button});
1106 }
1094 1107
1095 $self 1108 $self
1096} 1109}
1097 1110
1098sub add { 1111sub add {
1099 my ($self, @widgets) = @_; 1112 my ($self, @widgets) = @_;
1100 1113
1101 $self->SUPER::add (@widgets); 1114 $self->SUPER::add (@widgets);
1115 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1116 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1117}
1104 1118
1105sub border { 1119sub border {
1106 int $_[0]{border} * $::FONTSIZE 1120 int $_[0]{border} * $::FONTSIZE
1107} 1121}
1108 1122
1109sub size_request { 1123sub size_request {
1110 my ($self) = @_; 1124 my ($self) = @_;
1111 1125
1112 $self->{title}->size_request 1126 $self->{title_widget}->size_request
1113 if $self->{title}; 1127 if $self->{title_widget};
1128
1129 $self->{close_button}->size_request
1130 if $self->{close_button};
1114 1131
1115 my ($w, $h) = $self->SUPER::size_request; 1132 my ($w, $h) = $self->SUPER::size_request;
1116 1133
1117 ( 1134 (
1118 $w + $self->border * 2, 1135 $w + $self->border * 2,
1119 $h + $self->border * 2, 1136 $h + $self->border * 2,
1120 ) 1137 )
1121} 1138}
1122 1139
1123sub size_allocate { 1140sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1141 my ($self, $w, $h) = @_;
1125 1142
1126 if ($self->{title}) { 1143 if ($self->{title_widget}) {
1127 $self->{title}{w} = $w; 1144 $self->{title_widget}{w} = $w;
1128 $self->{title}{h} = $h; 1145 $self->{title_widget}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h); 1146 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1147 }
1131 1148
1132 my $border = $self->border; 1149 my $border = $self->border;
1133 1150
1134 $h -= List::Util::max 0, $border * 2; 1151 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1152 $w -= List::Util::max 0, $border * 2;
1153
1154 $self->child->configure ($border, $border, $w, $h);
1155
1156 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1157 if $self->{close_button};
1158
1159 1
1160}
1161
1162sub invoke_delete {
1163 my ($self) = @_;
1164
1165 $self->hide;
1136 1166
1137 $self->child->configure ($border, $border, $w, $h); 1167 1
1138} 1168}
1139 1169
1140sub button_down { 1170sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1171 my ($self, $ev, $x, $y) = @_;
1142 1172
1143 my ($w, $h) = @$self{qw(w h)}; 1173 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1174 my $border = $self->border;
1145 1175
… …
1176 1206
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1207 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1208
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1209 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1210 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1211 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1212 };
1183 } else { 1213 } else {
1184 return 0; 1214 return 0;
1185 } 1215 }
1186 1216
1187 1 1217 1
1188} 1218}
1189 1219
1190sub button_up { 1220sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
1192 1222
1193 !!delete $self->{motion} 1223 ! ! delete $self->{motion}
1194} 1224}
1195 1225
1196sub mouse_motion { 1226sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1227 my ($self, $ev, $x, $y) = @_;
1198 1228
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1229 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1230
1201 !!$self->{motion} 1231 ! ! $self->{motion}
1202} 1232}
1203 1233
1204sub _draw { 1234sub _draw {
1205 my ($self) = @_; 1235 my ($self) = @_;
1206 1236
… …
1232 1262
1233 glDisable GL_TEXTURE_2D; 1263 glDisable GL_TEXTURE_2D;
1234 1264
1235 $child->draw; 1265 $child->draw;
1236 1266
1237 if ($self->{title}) { 1267 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1268 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1269 $self->{title_widget}->_draw;
1270
1271 glTranslate 0, - ($border - $self->{h});
1240 } 1272 }
1273
1274 $self->{close_button}->draw
1275 if $self->{close_button};
1241} 1276}
1242 1277
1243############################################################################# 1278#############################################################################
1244 1279
1245package CFClient::UI::Table; 1280package CFClient::UI::Table;
… …
1268 1303
1269 $child->set_parent ($self); 1304 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1305 $self->{children}[$y][$x] = $child;
1271 1306
1272 $self->realloc; 1307 $self->realloc;
1308}
1309
1310sub remove {
1311 my ($self, $child) = @_;
1312
1313 # TODO: not yet implemented
1273} 1314}
1274 1315
1275# TODO: move to container class maybe? send children a signal on removal? 1316# TODO: move to container class maybe? send children a signal on removal?
1276sub clear { 1317sub clear {
1277 my ($self) = @_; 1318 my ($self) = @_;
… …
1318 (sum @$ws), 1359 (sum @$ws),
1319 (sum @$hs), 1360 (sum @$hs),
1320 ) 1361 )
1321} 1362}
1322 1363
1323sub size_allocate { 1364sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1365 my ($self, $w, $h) = @_;
1325 1366
1326 my ($ws, $hs) = $self->get_wh; 1367 my ($ws, $hs) = $self->get_wh;
1327 1368
1328 my $req_w = (sum @$ws) || 1; 1369 my $req_w = (sum @$ws) || 1;
… …
1360 } 1401 }
1361 1402
1362 $y += $row_h; 1403 $y += $row_h;
1363 } 1404 }
1364 1405
1406 1
1365} 1407}
1366 1408
1367sub find_widget { 1409sub find_widget {
1368 my ($self, $x, $y) = @_; 1410 my ($self, $x, $y) = @_;
1369 1411
… …
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1448 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1449 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 ) 1450 )
1409} 1451}
1410 1452
1411sub size_allocate { 1453sub invoke_size_allocate {
1412 my ($self, $w, $h) = @_; 1454 my ($self, $w, $h) = @_;
1413 1455
1414 my $space = $self->{vertical} ? $h : $w; 1456 my $space = $self->{vertical} ? $h : $w;
1415 my $children = $self->{children}; 1457 my @children = $self->visible_children;
1416 1458
1417 my @req; 1459 my @req;
1418 1460
1419 if ($self->{homogeneous}) { 1461 if ($self->{homogeneous}) {
1420 @req = ($space / (@$children || 1)) x @$children; 1462 @req = ($space / (@children || 1)) x @children;
1421 } else { 1463 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1464 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423 my $req = List::Util::sum @req; 1465 my $req = List::Util::sum @req;
1424 1466
1425 if ($req > $space) { 1467 if ($req > $space) {
1426 # ah well, not enough space 1468 # ah well, not enough space
1427 $_ *= $space / $req for @req; 1469 $_ *= $space / $req for @req;
1428 } else { 1470 } else {
1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1471 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430 1472
1431 $space = ($space - $req) / $expand; # remaining space to give away 1473 $space = ($space - $req) / $expand; # remaining space to give away
1432 1474
1433 $req[$_] += $space * $children->[$_]{expand} 1475 $req[$_] += $space * $children[$_]{expand}
1434 for 0 .. $#$children; 1476 for 0 .. $#children;
1435 } 1477 }
1436 } 1478 }
1437 1479
1438 CFClient::UI::harmonize \@req; 1480 CFClient::UI::harmonize \@req;
1439 1481
1440 my $pos = 0; 1482 my $pos = 0;
1441 for (0 .. $#$children) { 1483 for (0 .. $#children) {
1442 my $alloc = $req[$_]; 1484 my $alloc = $req[$_];
1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1485 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444 1486
1445 $pos += $alloc; 1487 $pos += $alloc;
1446 } 1488 }
1447 1489
1448 1 1490 1
… …
1538 1580
1539 delete $self->{texture}; 1581 delete $self->{texture};
1540 $self->SUPER::update; 1582 $self->SUPER::update;
1541} 1583}
1542 1584
1585sub realloc {
1586 my ($self) = @_;
1587
1588 delete $self->{ox};
1589 $self->SUPER::realloc;
1590}
1591
1543sub set_text { 1592sub set_text {
1544 my ($self, $text) = @_; 1593 my ($self, $text) = @_;
1545 1594
1546 return if $self->{text} eq "T$text"; 1595 return if $self->{text} eq "T$text";
1547 $self->{text} = "T$text"; 1596 $self->{text} = "T$text";
1548 1597
1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1550 $self->{layout}->set_text ($text); 1598 $self->{layout}->set_text ($text);
1551 1599
1600 delete $self->{size_req};
1552 $self->realloc; 1601 $self->realloc;
1553 $self->update; 1602 $self->update;
1554} 1603}
1555 1604
1556sub set_markup { 1605sub set_markup {
… …
1559 return if $self->{text} eq "M$markup"; 1608 return if $self->{text} eq "M$markup";
1560 $self->{text} = "M$markup"; 1609 $self->{text} = "M$markup";
1561 1610
1562 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1611 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1563 1612
1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1565 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1566 1614
1615 delete $self->{size_req};
1567 $self->realloc; 1616 $self->realloc;
1568 $self->update; 1617 $self->update;
1569} 1618}
1570 1619
1571sub size_request { 1620sub size_request {
1572 my ($self) = @_; 1621 my ($self) = @_;
1573 1622
1623 $self->{size_req} ||= do {
1574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1624 $self->{layout}->set_font ($self->{font}) if $self->{font};
1575 $self->{layout}->set_width ($self->{max_w} || -1); 1625 $self->{layout}->set_width ($self->{max_w} || -1);
1576 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1626 $self->{layout}->set_ellipsise ($self->{ellipsise});
1577 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1627 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1578 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1628 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1579 1629
1580 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1581 1631
1582 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1583 $self->{template}->set_font ($self->{font}) if $self->{font}; 1633 $self->{template}->set_font ($self->{font}) if $self->{font};
1634 $self->{template}->set_width ($self->{max_w} || -1);
1584 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1635 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1585 1636
1586 my ($w2, $h2) = $self->{template}->size; 1637 my ($w2, $h2) = $self->{template}->size;
1587 1638
1588 $w = List::Util::max $w, $w2; 1639 $w = List::Util::max $w, $w2;
1589 $h = List::Util::max $h, $h2; 1640 $h = List::Util::max $h, $h2;
1641 }
1642
1643 [$w, $h]
1590 } 1644 };
1591 1645
1592 ($w, $h) 1646 @{ $self->{size_req} }
1593} 1647}
1594 1648
1649sub baseline_shift {
1650 $_[0]{layout}->descent
1651}
1652
1595sub size_allocate { 1653sub invoke_size_allocate {
1596 my ($self, $w, $h) = @_; 1654 my ($self, $w, $h) = @_;
1597 1655
1598 delete $self->{ox}; 1656 delete $self->{ox};
1599 1657
1600 delete $self->{texture} 1658 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1659 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1660
1661 1
1602} 1662}
1603 1663
1604sub set_fontsize { 1664sub set_fontsize {
1605 my ($self, $fontsize) = @_; 1665 my ($self, $fontsize) = @_;
1606 1666
1607 $self->{fontsize} = $fontsize; 1667 $self->{fontsize} = $fontsize;
1668 delete $self->{size_req};
1608 delete $self->{texture}; 1669 delete $self->{texture};
1609 1670
1610 $self->realloc; 1671 $self->realloc;
1611} 1672}
1612 1673
1674sub reconfigure {
1675 my ($self) = @_;
1676
1677 delete $self->{size_req};
1678 delete $self->{texture};
1679
1680 $self->SUPER::reconfigure;
1681}
1682
1613sub _draw { 1683sub _draw {
1614 my ($self) = @_; 1684 my ($self) = @_;
1615 1685
1616 $self->SUPER::_draw; # draw background, if applicable 1686 $self->SUPER::_draw; # draw background, if applicable
1617 1687
1618 my $tex = $self->{texture} ||= do { 1688 my $size = $self->{texture} ||= do {
1619 $self->{layout}->set_foreground (@{$self->{fg}}); 1689 $self->{layout}->set_foreground (@{$self->{fg}});
1620 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1690 $self->{layout}->set_font ($self->{font}) if $self->{font};
1621 $self->{layout}->set_width ($self->{w}); 1691 $self->{layout}->set_width ($self->{w});
1622 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1692 $self->{layout}->set_ellipsise ($self->{ellipsise});
1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1693 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1694 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1695
1626 new_from_layout CFClient::Texture $self->{layout} 1696 [$self->{layout}->size]
1627 }; 1697 };
1628 1698
1629 unless (exists $self->{ox}) { 1699 unless (exists $self->{ox}) {
1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1700 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1701 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1632 : ($self->{w} - $tex->{w}) * 0.5); 1702 : ($self->{w} - $size->[0]) * 0.5);
1633 1703
1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1704 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1705 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1636 : ($self->{h} - $tex->{h}) * 0.5); 1706 : ($self->{h} - $size->[1]) * 0.5);
1637 }; 1707 };
1638 1708
1639 glEnable GL_TEXTURE_2D; 1709 my $w = List::Util::min $self->{w} + 4, $size->[0];
1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1710 my $h = List::Util::min $self->{h} + 2, $size->[1];
1641 1711
1642 glColor_premultiply @{$self->{fg}} 1712 $self->{layout}->render ($self->{ox}, $self->{oy});
1643 if $tex->{format} == GL_ALPHA;
1644
1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1646
1647 glDisable GL_TEXTURE_2D;
1648} 1713}
1649 1714
1650############################################################################# 1715#############################################################################
1651 1716
1652package CFClient::UI::EntryBase; 1717package CFClient::UI::EntryBase;
… …
1666 can_hover => 1, 1731 can_hover => 1,
1667 can_focus => 1, 1732 can_focus => 1,
1668 valign => 0, 1733 valign => 0,
1669 can_events => 1, 1734 can_events => 1,
1670 #text => ... 1735 #text => ...
1736 #hidden => "*",
1671 @_ 1737 @_
1672 ) 1738 )
1673} 1739}
1674 1740
1675sub _set_text { 1741sub _set_text {
… …
1682 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1683 $self->{text} = $text; 1749 $self->{text} = $text;
1684 1750
1685 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1686 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1687 1754
1688 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1689 $self->update; 1758 $self->update;
1690} 1759}
1691 1760
1692sub set_text { 1761sub set_text {
1693 my ($self, $text) = @_; 1762 my ($self, $text) = @_;
1694 1763
1695 $self->{cursor} = length $text; 1764 $self->{cursor} = length $text;
1696 $self->_set_text ($text); 1765 $self->_set_text ($text);
1697
1698 $self->realloc;
1699} 1766}
1700 1767
1701sub get_text { 1768sub get_text {
1702 $_[0]{text} 1769 $_[0]{text}
1703} 1770}
… …
1708 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1709 1776
1710 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1711} 1778}
1712 1779
1713sub key_down { 1780sub invoke_key_down {
1714 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1715 1782
1716 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1717 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1718 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1730 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1731 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1732 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1733 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1734 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1735 $self->_emit ('escape'); 1802 $self->emit ('escape');
1736 } elsif ($uni) { 1803 } elsif ($uni) {
1737 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else { 1805 } else {
1739 return 0; 1806 return 0;
1740 } 1807 }
… …
1744 $self->realloc; 1811 $self->realloc;
1745 1812
1746 1 1813 1
1747} 1814}
1748 1815
1749sub focus_in { 1816sub invoke_focus_in {
1750 my ($self) = @_; 1817 my ($self) = @_;
1751 1818
1752 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1753 1820
1754 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1755} 1822}
1756 1823
1757sub button_down { 1824sub invoke_button_down {
1758 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1759 1826
1760 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1761 1828
1762 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1763 1830
1764 # byte-index to char-index 1831 # byte-index to char-index
1765 my $text = $self->{text}; 1832 my $text = $self->{text};
… …
1770 $self->update; 1837 $self->update;
1771 1838
1772 1 1839 1
1773} 1840}
1774 1841
1775sub mouse_motion { 1842sub invoke_mouse_motion {
1776 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778 1845
1779 0 1846 1
1780} 1847}
1781 1848
1782sub _draw { 1849sub _draw {
1783 my ($self) = @_; 1850 my ($self) = @_;
1784 1851
… …
1825 1892
1826our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1827 1894
1828use CFClient::OpenGL; 1895use CFClient::OpenGL;
1829 1896
1830sub key_down { 1897sub invoke_key_down {
1831 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1832 1899
1833 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1834 1901
1835 if ($sym == 13) { 1902 if ($sym == 13) {
1836 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1837 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1838 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1839 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1840 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1841 $self->update; 1909 $self->update;
1842 1910
1843 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1844 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1845 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
… …
1861 } else { 1929 } else {
1862 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1863 } 1931 }
1864 1932
1865 } else { 1933 } else {
1866 return $self->SUPER::key_down ($ev) 1934 return $self->SUPER::invoke_key_down ($ev)
1867 } 1935 }
1868 1936
1869 1 1937 1
1870} 1938}
1871 1939
… …
1895 can_events => 1, 1963 can_events => 1,
1896 @_ 1964 @_
1897 ) 1965 )
1898} 1966}
1899 1967
1900sub activate { }
1901
1902sub button_up { 1968sub invoke_button_up {
1903 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1904 1970
1905 $self->emit ("activate") 1971 $self->emit ("activate")
1906 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1907 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
… …
1921 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1922 1988
1923 glDisable GL_TEXTURE_2D; 1989 glDisable GL_TEXTURE_2D;
1924 1990
1925 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1992}
1993
1994#############################################################################
1995
1996package CFClient::UI::ImageButton;
1997
1998our @ISA = CFClient::UI::Image::;
1999
2000use CFClient::OpenGL;
2001
2002my %textures;
2003
2004sub new {
2005 my $class = shift;
2006
2007 my $self = $class->SUPER::new (
2008 padding_x => 4,
2009 padding_y => 4,
2010 fg => [1, 1, 1],
2011 active_fg => [0, 0, 1],
2012 can_hover => 1,
2013 align => 0,
2014 valign => 0,
2015 can_events => 1,
2016 @_
2017 );
2018}
2019
2020sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_;
2022
2023 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h};
2026
2027 1
1926} 2028}
1927 2029
1928############################################################################# 2030#############################################################################
1929 2031
1930package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
… …
1957 my ($self) = @_; 2059 my ($self) = @_;
1958 2060
1959 (6) x 2 2061 (6) x 2
1960} 2062}
1961 2063
2064sub toggle {
2065 my ($self) = @_;
2066
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 $self->update;
2070}
2071
1962sub button_down { 2072sub invoke_button_down {
1963 my ($self, $ev, $x, $y) = @_; 2073 my ($self, $ev, $x, $y) = @_;
1964 2074
1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2075 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2076 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1967 $self->{state} = !$self->{state}; 2077 $self->toggle;
1968 $self->_emit (changed => $self->{state});
1969 } else { 2078 } else {
1970 return 0 2079 return 0
1971 } 2080 }
1972 2081
1973 1 2082 1
… …
1998package CFClient::UI::Image; 2107package CFClient::UI::Image;
1999 2108
2000our @ISA = CFClient::UI::Base::; 2109our @ISA = CFClient::UI::Base::;
2001 2110
2002use CFClient::OpenGL; 2111use CFClient::OpenGL;
2003use Carp qw/confess/;
2004 2112
2005our %loaded_images; 2113our %texture_cache;
2006 2114
2007sub new { 2115sub new {
2008 my $class = shift; 2116 my $class = shift;
2009 2117
2010 my $self = $class->SUPER::new (can_events => 0, @_); 2118 my $self = $class->SUPER::new (
2119 can_events => 0,
2120 @_,
2121 );
2011 2122
2012 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2123 $self->{path}
2124 or Carp::croak "required attribute 'path' not set";
2013 2125
2014 $loaded_images{$self->{image}} ||= 2126 $self->{tex} = $texture_cache{$self->{path}} ||=
2015 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2127 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2016 2128
2017 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2129 Scalar::Util::weaken $texture_cache{$self->{path}};
2018 2130
2019 Scalar::Util::weaken $loaded_images{$self->{image}}; 2131 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2020
2021 $self->{aspect} = $tex->{w} / $tex->{h};
2022 2132
2023 $self 2133 $self
2024} 2134}
2025 2135
2026sub size_request { 2136sub size_request {
2027 my ($self) = @_; 2137 my ($self) = @_;
2028 2138
2029 ($self->{tex}->{w}, $self->{tex}->{h}) 2139 ($self->{tex}{w}, $self->{tex}{h})
2030} 2140}
2031 2141
2032sub _draw { 2142sub _draw {
2033 my ($self) = @_; 2143 my ($self) = @_;
2034 2144
… …
2143 my $ycut1 = max 0, min 1, $ycut; 2253 my $ycut1 = max 0, min 1, $ycut;
2144 my $ycut2 = max 0, min 1, $ycut - 1; 2254 my $ycut2 = max 0, min 1, $ycut - 1;
2145 2255
2146 my $h1 = $self->{h} * (1 - $ycut1); 2256 my $h1 = $self->{h} * (1 - $ycut1);
2147 my $h2 = $self->{h} * (1 - $ycut2); 2257 my $h2 = $self->{h} * (1 - $ycut2);
2258 my $h3 = $self->{h};
2259
2260 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2148 2261
2149 glEnable GL_BLEND; 2262 glEnable GL_BLEND;
2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2263 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2152 glEnable GL_TEXTURE_2D; 2265 glEnable GL_TEXTURE_2D;
… …
2171 2284
2172 if ($t3) { 2285 if ($t3) {
2173 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2286 glBindTexture GL_TEXTURE_2D, $t3->{name};
2174 glBegin GL_QUADS; 2287 glBegin GL_QUADS;
2175 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2288 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2176 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2289 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2177 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2290 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2178 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2291 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2179 glEnd; 2292 glEnd;
2180 } 2293 }
2181 2294
2182 glDisable GL_BLEND; 2295 glDisable GL_BLEND;
… …
2270 $self->update; 2383 $self->update;
2271 2384
2272 $self 2385 $self
2273} 2386}
2274 2387
2275sub changed { }
2276
2277sub set_range { 2388sub set_range {
2278 my ($self, $range) = @_; 2389 my ($self, $range) = @_;
2279 2390
2280 ($range, $self->{range}) = ($self->{range}, $range); 2391 ($range, $self->{range}) = ($self->{range}, $range);
2281 2392
2282 $self->update
2283 if "@$range" ne "@{$self->{range}}"; 2393 if ("@$range" ne "@{$self->{range}}") {
2394 $self->update;
2395 $self->set_value ($self->{range}[0]);
2396 }
2284} 2397}
2285 2398
2286sub set_value { 2399sub set_value {
2287 my ($self, $value) = @_; 2400 my ($self, $value) = @_;
2288 2401
… …
2299 if $unit; 2412 if $unit;
2300 2413
2301 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2414 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2302 2415
2303 if ($value != $old_value) { 2416 if ($value != $old_value) {
2304 $self->_emit (changed => $value); 2417 $self->emit (changed => $value);
2305 $self->update; 2418 $self->update;
2306 } 2419 }
2307} 2420}
2308 2421
2309sub size_request { 2422sub size_request {
2310 my ($self) = @_; 2423 my ($self) = @_;
2311 2424
2312 ($self->{req_w}, $self->{req_h}) 2425 ($self->{req_w}, $self->{req_h})
2313} 2426}
2314 2427
2315sub button_down { 2428sub invoke_button_down {
2316 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2317 2430
2318 $self->SUPER::button_down ($ev, $x, $y); 2431 $self->SUPER::invoke_button_down ($ev, $x, $y);
2319 2432
2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2433 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2321 2434
2322 $self->mouse_motion ($ev, $x, $y) 2435 $self->invoke_mouse_motion ($ev, $x, $y)
2323} 2436}
2324 2437
2325sub mouse_motion { 2438sub invoke_mouse_motion {
2326 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2327 2440
2328 if ($GRAB == $self) { 2441 if ($GRAB == $self) {
2329 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2442 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2330 2443
… …
2435sub set_range { shift->{slider}->set_range (@_) } 2548sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 2549sub set_value { shift->{slider}->set_value (@_) }
2437 2550
2438############################################################################# 2551#############################################################################
2439 2552
2440package CFClient::UI::TextView; 2553package CFClient::UI::TextScroller;
2441 2554
2442our @ISA = CFClient::UI::HBox::; 2555our @ISA = CFClient::UI::HBox::;
2443 2556
2444use CFClient::OpenGL; 2557use CFClient::OpenGL;
2445 2558
… …
2447 my $class = shift; 2560 my $class = shift;
2448 2561
2449 my $self = $class->SUPER::new ( 2562 my $self = $class->SUPER::new (
2450 fontsize => 1, 2563 fontsize => 1,
2451 can_events => 0, 2564 can_events => 0,
2565 indent => 0,
2452 #font => default_font 2566 #font => default_font
2453 @_, 2567 @_,
2454 2568
2455 layout => (new CFClient::Layout 1), 2569 layout => (new CFClient::Layout),
2456 par => [], 2570 par => [],
2457 height => 0, 2571 height => 0,
2458 children => [ 2572 children => [
2459 (new CFClient::UI::Empty expand => 1), 2573 (new CFClient::UI::Empty expand => 1),
2460 (new CFClient::UI::Slider vertical => 1), 2574 (new CFClient::UI::Slider vertical => 1),
… …
2471 2585
2472 $self->{fontsize} = $fontsize; 2586 $self->{fontsize} = $fontsize;
2473 $self->reflow; 2587 $self->reflow;
2474} 2588}
2475 2589
2590sub size_request {
2591 my ($self) = @_;
2592
2593 my ($empty, $slider) = @{ $self->{children} };
2594
2595 local $self->{children} = [$empty, $slider];
2596 $self->SUPER::size_request
2597}
2598
2476sub size_allocate { 2599sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 2600 my ($self, $w, $h) = @_;
2478 2601
2479 $self->SUPER::size_allocate ($w, $h); 2602 my ($empty, $slider, @other) = @{ $self->{children} };
2603 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2480 2604
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2605 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2606 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $self->{layout}->set_width ($self->{children}[0]{w}); 2607 $self->{layout}->set_width ($empty->{w});
2608 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2484 2609
2485 $self->reflow; 2610 $self->reflow;
2486}
2487 2611
2488sub text_size { 2612 local $self->{children} = [$empty, $slider];
2489 my ($self, $text, $indent) = @_; 2613 $self->SUPER::invoke_size_allocate ($w, $h)
2614}
2615
2616sub get_layout {
2617 my ($self, $para) = @_;
2490 2618
2491 my $layout = $self->{layout}; 2619 my $layout = $self->{layout};
2492 2620
2621 $layout->set_font ($self->{font}) if $self->{font};
2622 $layout->set_foreground (@{$para->{fg}});
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2623 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent); 2624 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2625 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2495 $layout->set_markup ($text); 2626 $layout->set_markup ($para->{markup});
2627
2628 $layout->set_shapes (
2629 map
2630 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2631 @{$para->{widget}}
2496 2632 );
2633
2497 $layout->size 2634 $layout
2498} 2635}
2499 2636
2500sub reflow { 2637sub reflow {
2501 my ($self) = @_; 2638 my ($self) = @_;
2502 2639
… …
2511 $self->{children}[1]->set_value ($offset); 2648 $self->{children}[1]->set_value ($offset);
2512} 2649}
2513 2650
2514sub clear { 2651sub clear {
2515 my ($self) = @_; 2652 my ($self) = @_;
2653
2654 my (undef, undef, @other) = @{ $self->{children} };
2655 $self->remove ($_) for @other;
2516 2656
2517 $self->{par} = []; 2657 $self->{par} = [];
2518 $self->{height} = 0; 2658 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2659 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520} 2660}
2521 2661
2522sub add_paragraph { 2662sub add_paragraph {
2523 my ($self, $color, $text, $indent) = @_; 2663 my ($self, $color, $para, $indent) = @_;
2524 2664
2525 for my $line (split /\n/, $text) { 2665 my ($text, @w) = ref $para ? @$para : $para;
2526 my ($w, $h) = $self->text_size ($line); 2666
2527 $self->{height} += $h; 2667 $para = {
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2668 w => 1e10,
2669 wrapped => 1,
2670 fg => $color,
2671 indent => $indent,
2672 markup => $text,
2673 widget => \@w,
2529 } 2674 };
2530 2675
2531 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2676 $self->add (@w) if @w;
2677 push @{$self->{par}}, $para;
2678
2679 $self->{need_reflow}++;
2680 $self->update;
2681}
2682
2683sub scroll_to_bottom {
2684 my ($self) = @_;
2685
2686 $self->{scroll_to_bottom} = 1;
2687 $self->update;
2532} 2688}
2533 2689
2534sub update { 2690sub update {
2535 my ($self) = @_; 2691 my ($self) = @_;
2536 2692
… …
2538 2694
2539 return unless $self->{h} > 0; 2695 return unless $self->{h} > 0;
2540 2696
2541 delete $self->{texture}; 2697 delete $self->{texture};
2542 2698
2543 $ROOT->on_post_alloc ($self, sub { 2699 $ROOT->on_post_alloc ($self => sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2700 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 2701
2546 if (delete $self->{need_reflow}) { 2702 if (delete $self->{need_reflow}) {
2547 my $height = 0; 2703 my $height = 0;
2548 2704
2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2553 for (@{$self->{par}}) { 2705 for my $para (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2706 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2555 $layout->set_width ($W - $_->[3]); 2707 my $layout = $self->get_layout ($para);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size; 2708 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3]; 2709
2559 $_->[1] = $h; 2710 $para->{w} = $w + $para->{indent};
2711 $para->{h} = $h;
2712 $para->{wrapped} = $layout->has_wrapped;
2560 } 2713 }
2561 2714
2562 $height += $_->[1]; 2715 $height += $para->{h};
2563 } 2716 }
2564 2717
2565 $self->{height} = $height; 2718 $self->{height} = $height;
2566 2719
2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2720 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2568 2721
2569 delete $self->{texture}; 2722 delete $self->{texture};
2723 }
2724
2725 if (delete $self->{scroll_to_bottom}) {
2726 $self->{children}[1]->set_value (1e10);
2570 } 2727 }
2571 2728
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2729 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2573 glClearColor 0, 0, 0, 0; 2730 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 2731 glClear GL_COLOR_BUFFER_BIT;
… …
2578 my $y0 = $top; 2735 my $y0 = $top;
2579 my $y1 = $top + $H; 2736 my $y1 = $top + $H;
2580 2737
2581 my $y = 0; 2738 my $y = 0;
2582 2739
2583 my $layout = $self->{layout};
2584
2585 $layout->set_font ($self->{font}) if $self->{font};
2586
2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590
2591 for my $par (@{$self->{par}}) { 2740 for my $para (@{$self->{par}}) {
2592 my $h = $par->[1]; 2741 my $h = $para->{h};
2593 2742
2594 if ($y0 < $y + $h && $y < $y1) { 2743 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] });
2596 $layout->set_width ($W - $par->[3]);
2597 $layout->set_markup ($par->[4]);
2598 2744
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2745 my $layout = $self->get_layout ($para);
2600 2746
2601 glRasterPos $par->[3], $y - $y0; 2747 $layout->render ($para->{indent}, $y - $y0);
2602 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2748
2749 if (my @w = @{ $para->{widget} }) {
2750 my @s = $layout->get_shapes;
2751
2752 for (@w) {
2753 my ($dx, $dy) = splice @s, 0, 2, ();
2754
2755 $_->{x} = $dx + $para->{indent};
2756 $_->{y} = $dy + $y - $y0;
2757
2758 $_->draw;
2759 }
2760 }
2603 } 2761 }
2604 2762
2605 $y += $h; 2763 $y += $h;
2606 } 2764 }
2607
2608 glDisable GL_BLEND;
2609 }; 2765 };
2610 }); 2766 });
2767}
2768
2769sub reconfigure {
2770 my ($self) = @_;
2771
2772 $self->SUPER::reconfigure;
2773
2774 $_->{w} = 1e10 for @{ $self->{par} };
2775 $self->reflow;
2611} 2776}
2612 2777
2613sub _draw { 2778sub _draw {
2614 my ($self) = @_; 2779 my ($self) = @_;
2615 2780
… …
2618 glColor 0, 0, 0, 1; 2783 glColor 0, 0, 0, 1;
2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2784 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2620 glDisable GL_TEXTURE_2D; 2785 glDisable GL_TEXTURE_2D;
2621 2786
2622 $self->{children}[1]->draw; 2787 $self->{children}[1]->draw;
2623
2624} 2788}
2625 2789
2626############################################################################# 2790#############################################################################
2627 2791
2628package CFClient::UI::Animator; 2792package CFClient::UI::Animator;
… …
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 2879 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2880 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 2881 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 2882 . "visible $widget->{visible}";
2719 } 2883 }
2884
2885 $tooltip =~ s/^\n+//;
2886 $tooltip =~ s/\n+$//;
2720 2887
2721 $self->add (new CFClient::UI::Label 2888 $self->add (new CFClient::UI::Label
2722 markup => $tooltip, 2889 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2890 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 2891 fontsize => 0.8,
… …
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2901 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735 2902
2736 ($w + 4, $h + 4) 2903 ($w + 4, $h + 4)
2737} 2904}
2738 2905
2739sub size_allocate { 2906sub invoke_size_allocate {
2740 my ($self, $w, $h) = @_; 2907 my ($self, $w, $h) = @_;
2741 2908
2742 $self->SUPER::size_allocate ($w - 4, $h - 4); 2909 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743} 2910}
2744 2911
2745sub visibility_change { 2912sub invoke_visibility_change {
2746 my ($self, $visible) = @_; 2913 my ($self, $visible) = @_;
2747 2914
2748 return unless $visible; 2915 return unless $visible;
2749 2916
2750 $self->{root}->on_post_alloc ("move_$self" => sub { 2917 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2752 or return; 2919 or return;
2753 2920
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2921 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 2922
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2923 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 2924 if $x + $self->{w} > $self->{root}{w};
2758 2925
2759 $self->move_abs ($x, $y); 2926 $self->move_abs ($x, $y);
2760 }); 2927 });
2761} 2928}
2762 2929
… …
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3024 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 3025 glDisable GL_TEXTURE_2D;
2859 } 3026 }
2860} 3027}
2861 3028
2862sub DESTROY { 3029sub destroy {
2863 my ($self) = @_; 3030 my ($self) = @_;
2864 3031
2865 $self->{timer}->cancel 3032 $self->{timer}->cancel
2866 if $self->{timer}; 3033 if $self->{timer};
2867 3034
2868 $self->SUPER::DESTROY; 3035 $self->SUPER::destroy;
2869} 3036}
2870 3037
2871############################################################################# 3038#############################################################################
2872 3039
2873package CFClient::UI::Buttonbar; 3040package CFClient::UI::Buttonbar;
… …
2894 ); 3061 );
2895 3062
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3063 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2897 3064
2898 for my $item (@{ $self->{items} }) { 3065 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 3066 my ($widget, $cb, $tooltip) = @$item;
2900 3067
2901 # handle various types of items, only text for now 3068 # handle various types of items, only text for now
2902 if (!ref $widget) { 3069 if (!ref $widget) {
3070 if ($widget =~ /\t/) {
3071 my ($left, $right) = split /\t/, $widget, 2;
3072
3073 $widget = new CFClient::UI::HBox
3074 can_hover => 1,
3075 can_events => 1,
3076 tooltip => $tooltip,
3077 children => [
3078 (new CFClient::UI::Label markup => $left, expand => 1),
3079 (new CFClient::UI::Label markup => $right, align => +1),
3080 ],
3081 ;
3082
3083 } else {
2903 $widget = new CFClient::UI::Label 3084 $widget = new CFClient::UI::Label
2904 can_hover => 1, 3085 can_hover => 1,
2905 can_events => 1, 3086 can_events => 1,
2906 text => $widget; 3087 markup => $widget,
3088 tooltip => $tooltip;
3089 }
2907 } 3090 }
2908 3091
2909 $self->{item}{$widget} = $item; 3092 $self->{item}{$widget} = $item;
2910 3093
2911 $self->{vbox}->add ($widget); 3094 $self->{vbox}->add ($widget);
… …
2916 3099
2917# popup given the event (must be a mouse button down event currently) 3100# popup given the event (must be a mouse button down event currently)
2918sub popup { 3101sub popup {
2919 my ($self, $ev) = @_; 3102 my ($self, $ev) = @_;
2920 3103
2921 $self->_emit ("popdown"); 3104 $self->emit ("popdown");
2922 3105
2923 # maybe save $GRAB? must be careful about events... 3106 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self; 3107 $GRAB = $self;
2925 $self->{button} = $ev->{button}; 3108 $self->{button} = $ev->{button};
2926 3109
2927 $self->show; 3110 $self->show;
2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3111 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2929} 3112}
2930 3113
2931sub mouse_motion { 3114sub invoke_mouse_motion {
2932 my ($self, $ev, $x, $y) = @_; 3115 my ($self, $ev, $x, $y) = @_;
2933 3116
2934 # TODO: should use vbox->find_widget or so 3117 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3118 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER}; 3119 $self->{hover} = $self->{item}{$HOVER};
2937 3120
2938 0 3121 0
2939} 3122}
2940 3123
2941sub button_up { 3124sub invoke_button_up {
2942 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
2943 3126
2944 if ($ev->{button} == $self->{button}) { 3127 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB; 3128 undef $GRAB;
2946 $self->hide; 3129 $self->hide;
2947 3130
2948 $self->_emit ("popdown"); 3131 $self->emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover}; 3132 $self->{hover}[1]->() if $self->{hover};
2950 } else { 3133 } else {
2951 return 0 3134 return 0
2952 } 3135 }
2953 3136
… …
2980 3163
2981 $self->{current} = $self->{children}[0] 3164 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} }; 3165 if @{ $self->{children} };
2983} 3166}
2984 3167
3168sub get_current_page {
3169 my ($self) = @_;
3170
3171 $self->{current}
3172}
3173
2985sub set_current_page { 3174sub set_current_page {
2986 my ($self, $page_or_widget) = @_; 3175 my ($self, $page_or_widget) = @_;
2987 3176
2988 my $widget = ref $page_or_widget 3177 my $widget = ref $page_or_widget
2989 ? $page_or_widget 3178 ? $page_or_widget
2990 : $self->{children}[$page_or_widget]; 3179 : $self->{children}[$page_or_widget];
2991 3180
2992 $self->{current} = $widget; 3181 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3182 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994 3183
2995 $self->_emit (page_changed => $self->{current}); 3184 $self->emit (page_changed => $self->{current});
2996 3185
2997 $self->realloc; 3186 $self->realloc;
2998} 3187}
2999 3188
3000sub visible_children { 3189sub visible_children {
… …
3005 my ($self) = @_; 3194 my ($self) = @_;
3006 3195
3007 $self->{current}->size_request 3196 $self->{current}->size_request
3008} 3197}
3009 3198
3010sub size_allocate { 3199sub invoke_size_allocate {
3011 my ($self, $w, $h) = @_; 3200 my ($self, $w, $h) = @_;
3012 3201
3013 $self->{current}->configure (0, 0, $w, $h); 3202 $self->{current}->configure (0, 0, $w, $h);
3203
3204 1
3014} 3205}
3015 3206
3016sub _draw { 3207sub _draw {
3017 my ($self) = @_; 3208 my ($self) = @_;
3018 3209
… …
3053 ); 3244 );
3054 3245
3055 $self->{multiplexer}->add ($widget); 3246 $self->{multiplexer}->add ($widget);
3056} 3247}
3057 3248
3249sub get_current_page {
3250 my ($self) = @_;
3251
3252 $self->{multiplexer}->get_current_page
3253}
3254
3058sub set_current_page { 3255sub set_current_page {
3059 my ($self, $page) = @_; 3256 my ($self, $page) = @_;
3060 3257
3061 $self->{multiplexer}->set_current_page ($page); 3258 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current}); 3259 $self->emit (page_changed => $self->{multiplexer}{current});
3260}
3261
3262#############################################################################
3263
3264package CFClient::UI::Combobox;
3265
3266use utf8;
3267
3268our @ISA = CFClient::UI::Button::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (
3274 options => [], # [value, title, longdesc], ...
3275 value => undef,
3276 @_,
3277 );
3278
3279 $self->_set_value ($self->{value});
3280
3281 $self
3282}
3283
3284sub invoke_button_down {
3285 my ($self, $ev) = @_;
3286
3287 my @menu_items;
3288
3289 for (@{ $self->{options} }) {
3290 my ($value, $title, $tooltip) = @$_;
3291
3292 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3293 }
3294
3295 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3296}
3297
3298sub _set_value {
3299 my ($self, $value) = @_;
3300
3301 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3302 or return;
3303
3304 $self->{value} = $item->[0];
3305 $self->set_markup ("$item->[1] ⇓");
3306 $self->set_tooltip ($item->[2]);
3307}
3308
3309sub set_value {
3310 my ($self, $value) = @_;
3311
3312 return unless $self->{value} ne $value;
3313
3314 $self->_set_value ($value);
3315 $self->emit (changed => $value);
3063} 3316}
3064 3317
3065############################################################################# 3318#############################################################################
3066 3319
3067package CFClient::UI::Statusbox; 3320package CFClient::UI::Statusbox;
… …
3076 @_, 3329 @_,
3077 ); 3330 );
3078 3331
3079 Scalar::Util::weaken (my $this = $self); 3332 Scalar::Util::weaken (my $this = $self);
3080 3333
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { 3334 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3082 $this->reorder;
3083 $this->update;
3084 });
3085 3335
3086 $self 3336 $self
3087} 3337}
3088 3338
3089sub reorder { 3339sub reorder {
3090 my ($self) = @_; 3340 my ($self) = @_;
3091 my $NOW = Time::HiRes::time; 3341 my $NOW = Time::HiRes::time;
3342
3343 # freeze display when hovering over any label
3344 return if $CFClient::UI::TOOLTIP->{owner}
3345 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3346 values %{ $self->{item} };
3092 3347
3093 while (my ($k, $v) = each %{ $self->{item} }) { 3348 while (my ($k, $v) = each %{ $self->{item} }) {
3094 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3349 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3095 } 3350 }
3096 3351
… …
3105 3360
3106 my $count = 10 + 1; 3361 my $count = 10 + 1;
3107 for my $item (@items) { 3362 for my $item (@items) {
3108 last unless --$count; 3363 last unless --$count;
3109 3364
3110 push @widgets, $item->{label} ||= do { 3365 my $label = $item->{label} ||= do {
3111 # TODO: doesn't handle markup well (read as: at all) 3366 # TODO: doesn't handle markup well (read as: at all)
3112 my $short = $item->{count} > 1 3367 my $short = $item->{count} > 1
3113 ? "<b>$item->{count} ×</b> $item->{text}" 3368 ? "<b>$item->{count} ×</b> $item->{text}"
3114 : $item->{text}; 3369 : $item->{text};
3115 3370
… …
3123 tooltip => $item->{tooltip}, 3378 tooltip => $item->{tooltip},
3124 tooltip_font => $::FONT_PROP, 3379 tooltip_font => $::FONT_PROP,
3125 tooltip_width => 0.67, 3380 tooltip_width => 0.67,
3126 fontsize => $item->{fontsize} || $self->{fontsize}, 3381 fontsize => $item->{fontsize} || $self->{fontsize},
3127 max_w => $::WIDTH * 0.44, 3382 max_w => $::WIDTH * 0.44,
3128 fg => $item->{fg}, 3383 fg => [@{ $item->{fg} }],
3129 orig_alpha => $item->{fg}[3] || 1,
3130 can_events => 1, 3384 can_events => 1,
3131 can_hover => 1 3385 can_hover => 1
3132 }; 3386 };
3133 3387
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) { 3388 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2; 3389 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3136 if ($diff < 1) {
3137 $item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138 $item->{label}->realloc;
3139 }
3140 $item->{label}->update; 3390 $label->update;
3391 $label->set_max_size (undef, $label->{req_h} * $diff)
3392 if $diff < 1;
3141 $self->{timer}->interval (1/30); 3393 $self->{timer}->interval (1/30);
3394 } else {
3395 $label->{fg}[3] = $item->{fg}[3] || 1;
3142 } 3396 }
3397
3398 push @widgets, $label;
3143 } 3399 }
3144 3400
3145 $self->clear; 3401 $self->clear;
3146 $self->SUPER::add (reverse @widgets); 3402 $self->SUPER::add (reverse @widgets);
3147} 3403}
… …
3163 $item->{count}++; 3419 $item->{count}++;
3164 } else { 3420 } else {
3165 $item->{count} = 1; 3421 $item->{count} = 1;
3166 $item->{text} = $item->{tooltip} = $text; 3422 $item->{text} = $item->{tooltip} = $text;
3167 } 3423 }
3168 $item->{id} = ++$self->{id}; 3424 $item->{id} += 0.2;#d#
3169 $item->{timeout} = $timeout; 3425 $item->{timeout} = $timeout;
3170 delete $item->{label}; 3426 delete $item->{label};
3171 } else { 3427 } else {
3172 $self->{item}{$group} = { 3428 $self->{item}{$group} = {
3173 id => ++$self->{id}, 3429 id => ++$self->{id},
… …
3179 count => 1, 3435 count => 1,
3180 %arg, 3436 %arg,
3181 }; 3437 };
3182 } 3438 }
3183 3439
3440 $ROOT->on_refresh (reorder => sub {
3184 $self->reorder; 3441 $self->reorder;
3442 });
3185} 3443}
3186 3444
3187sub reconfigure { 3445sub reconfigure {
3188 my ($self) = @_; 3446 my ($self) = @_;
3189 3447
… …
3192 3450
3193 $self->reorder; 3451 $self->reorder;
3194 $self->SUPER::reconfigure; 3452 $self->SUPER::reconfigure;
3195} 3453}
3196 3454
3197sub DESTROY { 3455sub destroy {
3198 my ($self) = @_; 3456 my ($self) = @_;
3199 3457
3200 $self->{timer}->cancel; 3458 $self->{timer}->cancel;
3201 3459
3202 $self->SUPER::DESTROY; 3460 $self->SUPER::destroy;
3203} 3461}
3204 3462
3205############################################################################# 3463#############################################################################
3206 3464
3207package CFClient::UI::Inventory; 3465package CFClient::UI::Inventory;
3208 3466
3209our @ISA = CFClient::UI::ScrolledWindow::; 3467our @ISA = CFClient::UI::Table::;
3210 3468
3211sub new { 3469sub new {
3212 my $class = shift; 3470 my $class = shift;
3213 3471
3214 my $self = $class->SUPER::new ( 3472 my $self = $class->SUPER::new (
3215 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3473 col_expand => [0, 1, 0],
3216 @_, 3474 @_,
3217 ); 3475 );
3218 3476
3219 $self 3477 $self
3220} 3478}
3221 3479
3222sub set_items { 3480sub set_items {
3223 my ($self, $items) = @_; 3481 my ($self, $items) = @_;
3224 3482
3225 $self->{child}->clear; 3483 $self->clear;
3226 return unless $items; 3484 return unless $items;
3227 3485
3228 my @items = sort { 3486 my @items = sort {
3229 ($a->{type} <=> $b->{type}) 3487 ($a->{type} <=> $b->{type})
3230 or ($a->{name} cmp $b->{name}) 3488 or ($a->{name} cmp $b->{name})
3231 } @$items; 3489 } values %$items;
3232 3490
3233 $self->{real_items} = \@items; 3491 $self->{real_items} = \@items;
3234 3492
3235 my $row = 0; 3493 my $row = 0;
3236 for my $item (@items) { 3494 for my $item (@items) {
3237 CFClient::Item::update_widgets $item; 3495 CFClient::Item::update_widgets $item;
3238 3496
3239 $self->{child}->add (0, $row, $item->{face_widget}); 3497 $self->add (0, $row, $item->{face_widget});
3240 $self->{child}->add (1, $row, $item->{desc_widget}); 3498 $self->add (1, $row, $item->{desc_widget});
3241 $self->{child}->add (2, $row, $item->{weight_widget}); 3499 $self->add (2, $row, $item->{weight_widget});
3242 3500
3243 $row++; 3501 $row++;
3244 }
3245}
3246
3247#############################################################################
3248
3249package CFClient::UI::BindEditor;
3250
3251our @ISA = CFClient::UI::FancyFrame::;
3252
3253sub new {
3254 my $class = shift;
3255
3256 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3257
3258 $self->add (my $vb = new CFClient::UI::VBox);
3259
3260
3261 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3262 text => "start recording",
3263 tooltip => "Start/Stops recording of actions."
3264 ."All subsequent actions after the recording started will be captured."
3265 ."The actions are displayed after the record was stopped."
3266 ."To bind the action you have to click on the 'Bind' button",
3267 on_activate => sub {
3268 unless ($self->{recording}) {
3269 $self->start;
3270 } else {
3271 $self->stop;
3272 }
3273 });
3274
3275 $vb->add (new CFClient::UI::Label text => "Actions:");
3276 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3277
3278 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3279 $vb->add (my $hb = new CFClient::UI::HBox);
3280 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3281 $hb->add (new CFClient::UI::Button
3282 text => "bind",
3283 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3284 on_activate => sub {
3285 $self->ask_for_bind;
3286 });
3287
3288 $vb->add (my $hb = new CFClient::UI::HBox);
3289 $hb->add (new CFClient::UI::Button
3290 text => "ok",
3291 expand => 1,
3292 tooltip => "This closes the binding editor and saves the binding",
3293 on_activate => sub {
3294 $self->hide;
3295 $self->commit;
3296 });
3297
3298 $hb->add (new CFClient::UI::Button
3299 text => "cancel",
3300 expand => 1,
3301 tooltip => "This closes the binding editor without saving",
3302 on_activate => sub {
3303 $self->hide;
3304 $self->{binding_cancel}->()
3305 if $self->{binding_cancel};
3306 });
3307
3308 $self->update_binding_widgets;
3309
3310 $self
3311}
3312
3313sub commit {
3314 my ($self) = @_;
3315 my ($mod, $sym, $cmds) = $self->get_binding;
3316 if ($sym != 0 && @$cmds > 0) {
3317 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3318 ."'. Don't forget 'Save Config'!");
3319 $self->{binding_change}->($mod, $sym, $cmds)
3320 if $self->{binding_change};
3321 } else {
3322 $::STATUSBOX->add ("No action bound, no key or action specified!");
3323 $self->{binding_cancel}->()
3324 if $self->{binding_cancel};
3325 }
3326}
3327
3328sub start {
3329 my ($self) = @_;
3330
3331 $self->{rec_btn}->set_text ("stop recording");
3332 $self->{recording} = 1;
3333 $self->clear_command_list;
3334 $::CONN->start_record if $::CONN;
3335}
3336
3337sub stop {
3338 my ($self) = @_;
3339
3340 $self->{rec_btn}->set_text ("start recording");
3341 $self->{recording} = 0;
3342
3343 my $rec;
3344 $rec = $::CONN->stop_record if $::CONN;
3345 return unless ref $rec eq 'ARRAY';
3346 $self->set_command_list ($rec);
3347}
3348
3349
3350sub ask_for_bind_and_commit {
3351 my ($self) = @_;
3352 $self->ask_for_bind (1);
3353}
3354
3355sub ask_for_bind {
3356 my ($self, $commit) = @_;
3357
3358 CFClient::Binder::open_binding_dialog (sub {
3359 my ($mod, $sym) = @_;
3360 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3361 $self->update_binding_widgets;
3362 $self->commit if $commit;
3363 });
3364}
3365
3366# $mod and $sym are the modifiers and key symbol
3367# $cmds is a array ref of strings (the commands)
3368# $cb is the callback that is executed on OK
3369# $ccb is the callback that is executed on CANCEL and
3370# when the binding was unsuccessful on OK
3371sub set_binding {
3372 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3373
3374 $self->clear_command_list;
3375 $self->{recording} = 0;
3376 $self->{rec_btn}->set_text ("start recording");
3377
3378 $self->{binding} = [$mod, $sym];
3379 $self->{commands} = $cmds;
3380
3381 $self->{binding_change} = $cb;
3382 $self->{binding_cancel} = $ccb;
3383
3384 $self->update_binding_widgets;
3385}
3386
3387# this is a shortcut method that asks for a binding
3388# and then just binds it.
3389sub do_quick_binding {
3390 my ($self, $cmds) = @_;
3391 $self->set_binding (undef, undef, $cmds, sub {
3392 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3393 });
3394 $self->ask_for_bind (1);
3395}
3396
3397sub update_binding_widgets {
3398 my ($self) = @_;
3399 my ($mod, $sym, $cmds) = $self->get_binding;
3400 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3401 $self->set_command_list ($cmds);
3402}
3403
3404sub get_binding {
3405 my ($self) = @_;
3406 return (
3407 $self->{binding}->[0],
3408 $self->{binding}->[1],
3409 [ grep { defined $_ } @{$self->{commands}} ]
3410 );
3411}
3412
3413sub clear_command_list {
3414 my ($self) = @_;
3415 $self->{cmdbox}->clear ();
3416}
3417
3418sub set_command_list {
3419 my ($self, $cmds) = @_;
3420
3421 $self->{cmdbox}->clear ();
3422 $self->{commands} = $cmds;
3423
3424 my $idx = 0;
3425
3426 for (@$cmds) {
3427 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3428
3429 my $i = $idx;
3430 $hb->add (new CFClient::UI::Label text => $_);
3431 $hb->add (new CFClient::UI::Button
3432 text => "delete",
3433 tooltip => "Deletes the action from the record",
3434 on_activate => sub {
3435 $self->{cmdbox}->remove ($hb);
3436 $cmds->[$i] = undef;
3437 });
3438
3439
3440 $idx++
3441 } 3502 }
3442} 3503}
3443 3504
3444############################################################################# 3505#############################################################################
3445 3506
… …
3455 commands => [], 3516 commands => [],
3456 @_, 3517 @_,
3457 ) 3518 )
3458} 3519}
3459 3520
3460# XXX: Do sorting? Argl... 3521my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3522
3523my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3524 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3525my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3526 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3527my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3528 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3529my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3531my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3533
3534sub rebuild_spell_list {
3535 my ($self) = @_;
3536
3537 $CFClient::UI::ROOT->on_refresh ($self => sub {
3538 $self->clear;
3539
3540 return unless $::CONN;
3541
3542 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3543 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3544 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3545 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3546 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3547
3548 my $row = 0;
3549
3550 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3551 my $spell = $self->{spell}{$_};
3552
3553 $row++;
3554
3555 my $spell_cb = sub {
3556 my ($widget, $ev) = @_;
3557
3558 if ($ev->{button} == 1) {
3559 $::CONN->user_send ("cast $spell->{name}");
3560 } elsif ($ev->{button} == 2) {
3561 $::CONN->user_send ("invoke $spell->{name}");
3562 } elsif ($ev->{button} == 3) {
3563 (new CFClient::UI::Menu
3564 items => [
3565 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3566 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3567 ],
3568 )->popup ($ev);
3569 } else {
3570 return 0;
3571 }
3572
3573 1
3574 };
3575
3576 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3577
3578 #TODO: add path info to tooltip
3579 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3580
3581 $self->add (0, $row, new CFClient::UI::Face
3582 face => $spell->{face},
3583 can_hover => 1,
3584 can_events => 1,
3585 tooltip => $tooltip,
3586 on_button_down => $spell_cb,
3587 );
3588
3589 $self->add (1, $row, new CFClient::UI::Label
3590 expand => 1,
3591 text => $spell->{name},
3592 can_hover => 1,
3593 can_events => 1,
3594 tooltip => $tooltip,
3595 on_button_down => $spell_cb,
3596 );
3597
3598 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3599 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3600 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3601 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3602 }
3603 });
3604}
3605
3461sub add_spell { 3606sub add_spell {
3462 my ($self, $spell) = @_; 3607 my ($self, $spell) = @_;
3608
3463 $self->{spells}->{$spell->{name}} = $spell; 3609 $self->{spell}->{$spell->{name}} = $spell;
3464 3610 $self->rebuild_spell_list;
3465 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3466 face => $spell->{face},
3467 can_hover => 1,
3468 can_events => 1,
3469 tooltip => $spell->{message});
3470
3471 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3472 text => $spell->{name},
3473 can_hover => 1,
3474 can_events => 1,
3475 tooltip => $spell->{message},
3476 expand => 1);
3477
3478 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3479 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3480 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3481 expand => 1);
3482
3483 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3484 text => "bind to key",
3485 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3486}
3487
3488sub rebuild_spell_list {
3489 my ($self) = @_;
3490 $self->{tbl_idx} = 0;
3491 $self->add_spell ($_) for values %{$self->{spells}};
3492} 3611}
3493 3612
3494sub remove_spell { 3613sub remove_spell {
3495 my ($self, $spell) = @_; 3614 my ($self, $spell) = @_;
3615
3496 delete $self->{spells}->{$spell->{name}}; 3616 delete $self->{spell}->{$spell->{name}};
3617 $self->rebuild_spell_list;
3618}
3619
3620sub clear_spells {
3621 my ($self) = @_;
3622
3623 $self->{spell} = {};
3497 $self->rebuild_spell_list; 3624 $self->rebuild_spell_list;
3498} 3625}
3499 3626
3500############################################################################# 3627#############################################################################
3501 3628
… …
3538 $coord = $max - $size if $coord > $max - $size; 3665 $coord = $max - $size if $coord > $max - $size;
3539 3666
3540 int $coord + 0.5 3667 int $coord + 0.5
3541} 3668}
3542 3669
3543sub size_allocate { 3670sub invoke_size_allocate {
3544 my ($self, $w, $h) = @_; 3671 my ($self, $w, $h) = @_;
3545 3672
3546 for my $child ($self->children) { 3673 for my $child ($self->children) {
3547 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3674 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3548 3675
… …
3552 $X = _to_pixel $X, $W, $self->{w}; 3679 $X = _to_pixel $X, $W, $self->{w};
3553 $Y = _to_pixel $Y, $H, $self->{h}; 3680 $Y = _to_pixel $Y, $H, $self->{h};
3554 3681
3555 $child->configure ($X, $Y, $W, $H); 3682 $child->configure ($X, $Y, $W, $H);
3556 } 3683 }
3684
3685 1
3557} 3686}
3558 3687
3559sub coord2local { 3688sub coord2local {
3560 my ($self, $x, $y) = @_; 3689 my ($self, $x, $y) = @_;
3561 3690

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines