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.329 by root, Sun Jul 23 02:44:06 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 { 0 }
452sub button_up { 0 } 458sub invoke_button_up { 0 }
453sub key_down { 0 } 459sub invoke_key_down { 0 }
454sub key_up { 0 } 460sub invoke_key_up { 0 }
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 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
462} 485}
463 486
464sub find_widget { 487sub find_widget {
465 my ($self, $x, $y) = @_; 488 my ($self, $x, $y) = @_;
466 489
… …
476sub set_parent { 499sub set_parent {
477 my ($self, $parent) = @_; 500 my ($self, $parent) = @_;
478 501
479 Scalar::Util::weaken ($self->{parent} = $parent); 502 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible}; 503 $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} 504}
505 505
506sub realloc { 506sub realloc {
507 my ($self) = @_; 507 my ($self) = @_;
508 508
… …
541 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
542 542
543 # update screen rectangle 543 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x}; 544 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y}; 545 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548 546
549 # skip widgets that are entirely outside the drawing area 547 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
552 550
… …
591} 589}
592 590
593sub DESTROY { 591sub DESTROY {
594 my ($self) = @_; 592 my ($self) = @_;
595 593
594 return if CFClient::in_destruct;
595
596 delete $WIDGET{$self+0}; 596 delete $WIDGET{$self+0};
597 #$self->deactivate; 597
598 eval { $self->destroy };
599 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598} 600}
599 601
600############################################################################# 602#############################################################################
601 603
602package CFClient::UI::DrawBG; 604package CFClient::UI::DrawBG;
… …
767} 769}
768 770
769sub add { 771sub add {
770 my ($self, $child) = @_; 772 my ($self, $child) = @_;
771 773
772 $self->{children} = []; 774 $self->SUPER::remove ($_) for @{ $self->{children} };
773
774 $self->SUPER::add ($child); 775 $self->SUPER::add ($child);
775} 776}
776 777
777sub remove { 778sub remove {
778 my ($self, $widget) = @_; 779 my ($self, $widget) = @_;
… …
787 788
788sub size_request { 789sub size_request {
789 $_[0]{children}[0]->size_request 790 $_[0]{children}[0]->size_request
790} 791}
791 792
792sub size_allocate { 793sub invoke_size_allocate {
793 my ($self, $w, $h) = @_; 794 my ($self, $w, $h) = @_;
794 795
795 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
797
798 1
796} 799}
797 800
798############################################################################# 801#############################################################################
799 802
800# back-buffered drawing area 803# back-buffered drawing area
… …
816 819
817 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 820 $ROOT->on_post_alloc ($self => sub { $self->render_child });
818 $self->SUPER::update; 821 $self->SUPER::update;
819} 822}
820 823
821sub size_allocate { 824sub invoke_size_allocate {
822 my ($self, $w, $h) = @_; 825 my ($self, $w, $h) = @_;
823 826
824 $self->SUPER::size_allocate ($w, $h);
825 $self->update; 827 $self->update;
828
829 $self->SUPER::invoke_size_allocate ($w, $h)
826} 830}
827 831
828sub _render { 832sub _render {
829 my ($self) = @_; 833 my ($self) = @_;
830 834
… …
891 $h = 10 if $self->{scroll_y}; 895 $h = 10 if $self->{scroll_y};
892 896
893 ($w, $h) 897 ($w, $h)
894} 898}
895 899
896sub size_allocate { 900sub invoke_size_allocate {
897 my ($self, $w, $h) = @_; 901 my ($self, $w, $h) = @_;
898 902
899 my $child = $self->child; 903 my $child = $self->child;
900 904
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 905 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 906 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903 907
904 $self->child->configure (0, 0, $w, $h); 908 $self->child->configure (0, 0, $w, $h);
905 $self->update; 909 $self->update;
910
911 1
906} 912}
907 913
908sub set_offset { 914sub set_offset {
909 my ($self, $x, $y) = @_; 915 my ($self, $x, $y) = @_;
910 916
… …
984 $self->add ($child) if $child; 990 $self->add ($child) if $child;
985 991
986 $self 992 $self
987} 993}
988 994
995#TODO# update range on size_allocate depending on child
996
989sub add { 997sub add {
990 my ($self, $widget) = @_; 998 my ($self, $widget) = @_;
991 999
992 $self->{vp}->add ($self->{child} = $widget); 1000 $self->{vp}->add ($self->{child} = $widget);
993} 1001}
994 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
995sub update { 1017sub update {
996 my ($self) = @_; 1018 my ($self) = @_;
997 1019
998 $self->SUPER::update; 1020 $self->SUPER::update;
999 1021
1000 # todo: overwrite size_allocate of child 1022 $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} 1023}
1004 1024
1005sub size_allocate { 1025sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1026 my ($self, $w, $h) = @_;
1007 1027
1028 $self->update_slider;
1029
1008 $self->SUPER::size_allocate ($w, $h); 1030 $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} 1031}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1032
1017############################################################################# 1033#############################################################################
1018 1034
1019package CFClient::UI::Frame; 1035package CFClient::UI::Frame;
1020 1036
… …
1071 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);
1072 1088
1073sub new { 1089sub new {
1074 my ($class, %arg) = @_; 1090 my ($class, %arg) = @_;
1075 1091
1076 my $title = delete $arg{title};
1077
1078 my $self = $class->SUPER::new ( 1092 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1093 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1094 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1095 border => 0.6,
1082 can_events => 1, 1096 can_events => 1,
1083 min_w => 16, 1097 min_w => 64,
1084 min_h => 16, 1098 min_h => 32,
1085 %arg, 1099 %arg,
1086 ); 1100 );
1087 1101
1088 $self->{title} = new CFClient::UI::Label 1102 $self->{title_widget} = new CFClient::UI::Label
1089 align => 0, 1103 align => 0,
1090 valign => 1, 1104 valign => 1,
1091 text => $title, 1105 text => $self->{title},
1092 fontsize => $self->{border} 1106 fontsize => $self->{border},
1093 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 }
1094 1117
1095 $self 1118 $self
1096} 1119}
1097 1120
1098sub add { 1121sub add {
1099 my ($self, @widgets) = @_; 1122 my ($self, @widgets) = @_;
1100 1123
1101 $self->SUPER::add (@widgets); 1124 $self->SUPER::add (@widgets);
1125 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1126 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1127}
1104 1128
1105sub border { 1129sub border {
1106 int $_[0]{border} * $::FONTSIZE 1130 int $_[0]{border} * $::FONTSIZE
1107} 1131}
1108 1132
1109sub size_request { 1133sub size_request {
1110 my ($self) = @_; 1134 my ($self) = @_;
1111 1135
1112 $self->{title}->size_request 1136 $self->{title_widget}->size_request
1113 if $self->{title}; 1137 if $self->{title_widget};
1138
1139 $self->{close_button}->size_request
1140 if $self->{close_button};
1114 1141
1115 my ($w, $h) = $self->SUPER::size_request; 1142 my ($w, $h) = $self->SUPER::size_request;
1116 1143
1117 ( 1144 (
1118 $w + $self->border * 2, 1145 $w + $self->border * 2,
1119 $h + $self->border * 2, 1146 $h + $self->border * 2,
1120 ) 1147 )
1121} 1148}
1122 1149
1123sub size_allocate { 1150sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1151 my ($self, $w, $h) = @_;
1125 1152
1126 if ($self->{title}) { 1153 if ($self->{title_widget}) {
1127 $self->{title}{w} = $w; 1154 $self->{title_widget}{w} = $w;
1128 $self->{title}{h} = $h; 1155 $self->{title_widget}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h); 1156 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1157 }
1131 1158
1132 my $border = $self->border; 1159 my $border = $self->border;
1133 1160
1134 $h -= List::Util::max 0, $border * 2; 1161 $h -= List::Util::max 0, $border * 2;
1135 $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;
1136 1176
1137 $self->child->configure ($border, $border, $w, $h); 1177 1
1138} 1178}
1139 1179
1140sub button_down { 1180sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1181 my ($self, $ev, $x, $y) = @_;
1142 1182
1143 my ($w, $h) = @$self{qw(w h)}; 1183 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1184 my $border = $self->border;
1145 1185
… …
1176 1216
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1217 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1218
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1219 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1220 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1221 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1222 };
1183 } else { 1223 } else {
1184 return 0; 1224 return 0;
1185 } 1225 }
1186 1226
1187 1 1227 1
1188} 1228}
1189 1229
1190sub button_up { 1230sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1231 my ($self, $ev, $x, $y) = @_;
1192 1232
1193 !!delete $self->{motion} 1233 ! ! delete $self->{motion}
1194} 1234}
1195 1235
1196sub mouse_motion { 1236sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1237 my ($self, $ev, $x, $y) = @_;
1198 1238
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1239 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1240
1201 !!$self->{motion} 1241 ! ! $self->{motion}
1202} 1242}
1203 1243
1204sub _draw { 1244sub _draw {
1205 my ($self) = @_; 1245 my ($self) = @_;
1206 1246
… …
1232 1272
1233 glDisable GL_TEXTURE_2D; 1273 glDisable GL_TEXTURE_2D;
1234 1274
1235 $child->draw; 1275 $child->draw;
1236 1276
1237 if ($self->{title}) { 1277 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1278 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1279 $self->{title_widget}->_draw;
1280
1281 glTranslate 0, - ($border - $self->{h});
1240 } 1282 }
1283
1284 $self->{close_button}->draw
1285 if $self->{close_button};
1241} 1286}
1242 1287
1243############################################################################# 1288#############################################################################
1244 1289
1245package CFClient::UI::Table; 1290package CFClient::UI::Table;
… …
1268 1313
1269 $child->set_parent ($self); 1314 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1315 $self->{children}[$y][$x] = $child;
1271 1316
1272 $self->realloc; 1317 $self->realloc;
1318}
1319
1320sub remove {
1321 my ($self, $child) = @_;
1322
1323 # TODO: not yet implemented
1273} 1324}
1274 1325
1275# 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?
1276sub clear { 1327sub clear {
1277 my ($self) = @_; 1328 my ($self) = @_;
… …
1318 (sum @$ws), 1369 (sum @$ws),
1319 (sum @$hs), 1370 (sum @$hs),
1320 ) 1371 )
1321} 1372}
1322 1373
1323sub size_allocate { 1374sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1375 my ($self, $w, $h) = @_;
1325 1376
1326 my ($ws, $hs) = $self->get_wh; 1377 my ($ws, $hs) = $self->get_wh;
1327 1378
1328 my $req_w = (sum @$ws) || 1; 1379 my $req_w = (sum @$ws) || 1;
… …
1360 } 1411 }
1361 1412
1362 $y += $row_h; 1413 $y += $row_h;
1363 } 1414 }
1364 1415
1416 1
1365} 1417}
1366 1418
1367sub find_widget { 1419sub find_widget {
1368 my ($self, $x, $y) = @_; 1420 my ($self, $x, $y) = @_;
1369 1421
… …
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1458 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1459 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 ) 1460 )
1409} 1461}
1410 1462
1411sub size_allocate { 1463sub invoke_size_allocate {
1412 my ($self, $w, $h) = @_; 1464 my ($self, $w, $h) = @_;
1413 1465
1414 my $space = $self->{vertical} ? $h : $w; 1466 my $space = $self->{vertical} ? $h : $w;
1415 my $children = $self->{children}; 1467 my @children = $self->visible_children;
1416 1468
1417 my @req; 1469 my @req;
1418 1470
1419 if ($self->{homogeneous}) { 1471 if ($self->{homogeneous}) {
1420 @req = ($space / (@$children || 1)) x @$children; 1472 @req = ($space / (@children || 1)) x @children;
1421 } else { 1473 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1474 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423 my $req = List::Util::sum @req; 1475 my $req = List::Util::sum @req;
1424 1476
1425 if ($req > $space) { 1477 if ($req > $space) {
1426 # ah well, not enough space 1478 # ah well, not enough space
1427 $_ *= $space / $req for @req; 1479 $_ *= $space / $req for @req;
1428 } else { 1480 } else {
1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1481 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430 1482
1431 $space = ($space - $req) / $expand; # remaining space to give away 1483 $space = ($space - $req) / $expand; # remaining space to give away
1432 1484
1433 $req[$_] += $space * $children->[$_]{expand} 1485 $req[$_] += $space * $children[$_]{expand}
1434 for 0 .. $#$children; 1486 for 0 .. $#children;
1435 } 1487 }
1436 } 1488 }
1437 1489
1438 CFClient::UI::harmonize \@req; 1490 CFClient::UI::harmonize \@req;
1439 1491
1440 my $pos = 0; 1492 my $pos = 0;
1441 for (0 .. $#$children) { 1493 for (0 .. $#children) {
1442 my $alloc = $req[$_]; 1494 my $alloc = $req[$_];
1443 $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));
1444 1496
1445 $pos += $alloc; 1497 $pos += $alloc;
1446 } 1498 }
1447 1499
1448 1 1500 1
… …
1538 1590
1539 delete $self->{texture}; 1591 delete $self->{texture};
1540 $self->SUPER::update; 1592 $self->SUPER::update;
1541} 1593}
1542 1594
1595sub realloc {
1596 my ($self) = @_;
1597
1598 delete $self->{ox};
1599 $self->SUPER::realloc;
1600}
1601
1543sub set_text { 1602sub set_text {
1544 my ($self, $text) = @_; 1603 my ($self, $text) = @_;
1545 1604
1546 return if $self->{text} eq "T$text"; 1605 return if $self->{text} eq "T$text";
1547 $self->{text} = "T$text"; 1606 $self->{text} = "T$text";
1548 1607
1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1550 $self->{layout}->set_text ($text); 1608 $self->{layout}->set_text ($text);
1551 1609
1610 delete $self->{size_req};
1552 $self->realloc; 1611 $self->realloc;
1553 $self->update; 1612 $self->update;
1554} 1613}
1555 1614
1556sub set_markup { 1615sub set_markup {
… …
1559 return if $self->{text} eq "M$markup"; 1618 return if $self->{text} eq "M$markup";
1560 $self->{text} = "M$markup"; 1619 $self->{text} = "M$markup";
1561 1620
1562 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1621 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1563 1622
1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1565 $self->{layout}->set_markup ($markup); 1623 $self->{layout}->set_markup ($markup);
1566 1624
1625 delete $self->{size_req};
1567 $self->realloc; 1626 $self->realloc;
1568 $self->update; 1627 $self->update;
1569} 1628}
1570 1629
1571sub size_request { 1630sub size_request {
1572 my ($self) = @_; 1631 my ($self) = @_;
1573 1632
1633 $self->{size_req} ||= do {
1574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1634 $self->{layout}->set_font ($self->{font}) if $self->{font};
1575 $self->{layout}->set_width ($self->{max_w} || -1); 1635 $self->{layout}->set_width ($self->{max_w} || -1);
1576 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1577 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1578 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1579 1639
1580 my ($w, $h) = $self->{layout}->size; 1640 my ($w, $h) = $self->{layout}->size;
1581 1641
1582 if (exists $self->{template}) { 1642 if (exists $self->{template}) {
1583 $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);
1584 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1645 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1585 1646
1586 my ($w2, $h2) = $self->{template}->size; 1647 my ($w2, $h2) = $self->{template}->size;
1587 1648
1588 $w = List::Util::max $w, $w2; 1649 $w = List::Util::max $w, $w2;
1589 $h = List::Util::max $h, $h2; 1650 $h = List::Util::max $h, $h2;
1651 }
1652
1653 [$w, $h]
1590 } 1654 };
1591 1655
1592 ($w, $h) 1656 @{ $self->{size_req} }
1593} 1657}
1594 1658
1659sub baseline_shift {
1660 $_[0]{layout}->descent
1661}
1662
1595sub size_allocate { 1663sub invoke_size_allocate {
1596 my ($self, $w, $h) = @_; 1664 my ($self, $w, $h) = @_;
1597 1665
1598 delete $self->{ox}; 1666 delete $self->{ox};
1599 1667
1600 delete $self->{texture} 1668 delete $self->{texture}
1601 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
1602} 1672}
1603 1673
1604sub set_fontsize { 1674sub set_fontsize {
1605 my ($self, $fontsize) = @_; 1675 my ($self, $fontsize) = @_;
1606 1676
1607 $self->{fontsize} = $fontsize; 1677 $self->{fontsize} = $fontsize;
1678 delete $self->{size_req};
1608 delete $self->{texture}; 1679 delete $self->{texture};
1609 1680
1610 $self->realloc; 1681 $self->realloc;
1611} 1682}
1612 1683
1684sub reconfigure {
1685 my ($self) = @_;
1686
1687 delete $self->{size_req};
1688 delete $self->{texture};
1689
1690 $self->SUPER::reconfigure;
1691}
1692
1613sub _draw { 1693sub _draw {
1614 my ($self) = @_; 1694 my ($self) = @_;
1615 1695
1616 $self->SUPER::_draw; # draw background, if applicable 1696 $self->SUPER::_draw; # draw background, if applicable
1617 1697
1618 my $tex = $self->{texture} ||= do { 1698 my $size = $self->{texture} ||= do {
1619 $self->{layout}->set_foreground (@{$self->{fg}}); 1699 $self->{layout}->set_foreground (@{$self->{fg}});
1620 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1700 $self->{layout}->set_font ($self->{font}) if $self->{font};
1621 $self->{layout}->set_width ($self->{w}); 1701 $self->{layout}->set_width ($self->{w});
1622 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1702 $self->{layout}->set_ellipsise ($self->{ellipsise});
1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1703 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1704 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1705
1626 new_from_layout CFClient::Texture $self->{layout} 1706 [$self->{layout}->size]
1627 }; 1707 };
1628 1708
1629 unless (exists $self->{ox}) { 1709 unless (exists $self->{ox}) {
1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1710 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1711 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1632 : ($self->{w} - $tex->{w}) * 0.5); 1712 : ($self->{w} - $size->[0]) * 0.5);
1633 1713
1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1714 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1715 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1636 : ($self->{h} - $tex->{h}) * 0.5); 1716 : ($self->{h} - $size->[1]) * 0.5);
1637 }; 1717 };
1638 1718
1639 glEnable GL_TEXTURE_2D; 1719 my $w = List::Util::min $self->{w} + 4, $size->[0];
1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1720 my $h = List::Util::min $self->{h} + 2, $size->[1];
1641 1721
1642 glColor_premultiply @{$self->{fg}} 1722 $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} 1723}
1649 1724
1650############################################################################# 1725#############################################################################
1651 1726
1652package CFClient::UI::EntryBase; 1727package CFClient::UI::EntryBase;
… …
1666 can_hover => 1, 1741 can_hover => 1,
1667 can_focus => 1, 1742 can_focus => 1,
1668 valign => 0, 1743 valign => 0,
1669 can_events => 1, 1744 can_events => 1,
1670 #text => ... 1745 #text => ...
1746 #hidden => "*",
1671 @_ 1747 @_
1672 ) 1748 )
1673} 1749}
1674 1750
1675sub _set_text { 1751sub _set_text {
… …
1682 $self->{last_activity} = $::NOW; 1758 $self->{last_activity} = $::NOW;
1683 $self->{text} = $text; 1759 $self->{text} = $text;
1684 1760
1685 $text =~ s/./*/g if $self->{hidden}; 1761 $text =~ s/./*/g if $self->{hidden};
1686 $self->{layout}->set_text ("$text "); 1762 $self->{layout}->set_text ("$text ");
1763 delete $self->{size_req};
1687 1764
1688 $self->_emit (changed => $self->{text}); 1765 $self->emit (changed => $self->{text});
1766
1767 $self->realloc;
1689 $self->update; 1768 $self->update;
1690} 1769}
1691 1770
1692sub set_text { 1771sub set_text {
1693 my ($self, $text) = @_; 1772 my ($self, $text) = @_;
1694 1773
1695 $self->{cursor} = length $text; 1774 $self->{cursor} = length $text;
1696 $self->_set_text ($text); 1775 $self->_set_text ($text);
1697
1698 $self->realloc;
1699} 1776}
1700 1777
1701sub get_text { 1778sub get_text {
1702 $_[0]{text} 1779 $_[0]{text}
1703} 1780}
… …
1708 my ($w, $h) = $self->SUPER::size_request; 1785 my ($w, $h) = $self->SUPER::size_request;
1709 1786
1710 ($w + 1, $h) # add 1 for cursor 1787 ($w + 1, $h) # add 1 for cursor
1711} 1788}
1712 1789
1713sub key_down { 1790sub invoke_key_down {
1714 my ($self, $ev) = @_; 1791 my ($self, $ev) = @_;
1715 1792
1716 my $mod = $ev->{mod}; 1793 my $mod = $ev->{mod};
1717 my $sym = $ev->{sym}; 1794 my $sym = $ev->{sym};
1718 my $uni = $ev->{unicode}; 1795 my $uni = $ev->{unicode};
… …
1730 } elsif ($sym == CFClient::SDLK_HOME) { 1807 } elsif ($sym == CFClient::SDLK_HOME) {
1731 $self->{cursor} = 0; 1808 $self->{cursor} = 0;
1732 } elsif ($sym == CFClient::SDLK_END) { 1809 } elsif ($sym == CFClient::SDLK_END) {
1733 $self->{cursor} = length $text; 1810 $self->{cursor} = length $text;
1734 } elsif ($uni == 27) { 1811 } elsif ($uni == 27) {
1735 $self->_emit ('escape'); 1812 $self->emit ('escape');
1736 } elsif ($uni) { 1813 } elsif ($uni) {
1737 substr $text, $self->{cursor}++, 0, chr $uni; 1814 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else { 1815 } else {
1739 return 0; 1816 return 0;
1740 } 1817 }
… …
1744 $self->realloc; 1821 $self->realloc;
1745 1822
1746 1 1823 1
1747} 1824}
1748 1825
1749sub focus_in { 1826sub invoke_focus_in {
1750 my ($self) = @_; 1827 my ($self) = @_;
1751 1828
1752 $self->{last_activity} = $::NOW; 1829 $self->{last_activity} = $::NOW;
1753 1830
1754 $self->SUPER::focus_in; 1831 $self->SUPER::invoke_focus_in
1755} 1832}
1756 1833
1757sub button_down { 1834sub invoke_button_down {
1758 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1759 1836
1760 $self->SUPER::button_down ($ev, $x, $y); 1837 $self->SUPER::invoke_button_down ($ev, $x, $y);
1761 1838
1762 my $idx = $self->{layout}->xy_to_index ($x, $y); 1839 my $idx = $self->{layout}->xy_to_index ($x, $y);
1763 1840
1764 # byte-index to char-index 1841 # byte-index to char-index
1765 my $text = $self->{text}; 1842 my $text = $self->{text};
1766 utf8::encode $text; 1843 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1767 $self->{cursor} = length substr $text, 0, $idx; 1844 $self->{cursor} = length $text;
1768 1845
1769 $self->_set_text ($self->{text}); 1846 $self->_set_text ($self->{text});
1770 $self->update; 1847 $self->update;
1771 1848
1772 1 1849 1
1773} 1850}
1774 1851
1775sub mouse_motion { 1852sub invoke_mouse_motion {
1776 my ($self, $ev, $x, $y) = @_; 1853 my ($self, $ev, $x, $y) = @_;
1777# 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#
1778 1855
1779 0 1856 1
1780} 1857}
1781 1858
1782sub _draw { 1859sub _draw {
1783 my ($self) = @_; 1860 my ($self) = @_;
1784 1861
… …
1825 1902
1826our @ISA = CFClient::UI::EntryBase::; 1903our @ISA = CFClient::UI::EntryBase::;
1827 1904
1828use CFClient::OpenGL; 1905use CFClient::OpenGL;
1829 1906
1830sub key_down { 1907sub invoke_key_down {
1831 my ($self, $ev) = @_; 1908 my ($self, $ev) = @_;
1832 1909
1833 my $sym = $ev->{sym}; 1910 my $sym = $ev->{sym};
1834 1911
1835 if ($sym == 13) { 1912 if ($sym == 13) {
1836 unshift @{$self->{history}}, 1913 unshift @{$self->{history}},
1837 my $txt = $self->get_text; 1914 my $txt = $self->get_text;
1915
1838 $self->{history_pointer} = -1; 1916 $self->{history_pointer} = -1;
1839 $self->{history_saveback} = ''; 1917 $self->{history_saveback} = '';
1840 $self->_emit (activate => $txt); 1918 $self->emit (activate => $txt);
1841 $self->update; 1919 $self->update;
1842 1920
1843 } elsif ($sym == CFClient::SDLK_UP) { 1921 } elsif ($sym == CFClient::SDLK_UP) {
1844 if ($self->{history_pointer} < 0) { 1922 if ($self->{history_pointer} < 0) {
1845 $self->{history_saveback} = $self->get_text; 1923 $self->{history_saveback} = $self->get_text;
… …
1861 } else { 1939 } else {
1862 $self->set_text ($self->{history_saveback}); 1940 $self->set_text ($self->{history_saveback});
1863 } 1941 }
1864 1942
1865 } else { 1943 } else {
1866 return $self->SUPER::key_down ($ev) 1944 return $self->SUPER::invoke_key_down ($ev)
1867 } 1945 }
1868 1946
1869 1 1947 1
1870} 1948}
1871 1949
… …
1895 can_events => 1, 1973 can_events => 1,
1896 @_ 1974 @_
1897 ) 1975 )
1898} 1976}
1899 1977
1900sub activate { }
1901
1902sub button_up { 1978sub invoke_button_up {
1903 my ($self, $ev, $x, $y) = @_; 1979 my ($self, $ev, $x, $y) = @_;
1904 1980
1905 $self->emit ("activate") 1981 $self->emit ("activate")
1906 if $x >= 0 && $x < $self->{w} 1982 if $x >= 0 && $x < $self->{w}
1907 && $y >= 0 && $y < $self->{h}; 1983 && $y >= 0 && $y < $self->{h};
… …
1921 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1997 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1922 1998
1923 glDisable GL_TEXTURE_2D; 1999 glDisable GL_TEXTURE_2D;
1924 2000
1925 $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
1926} 2038}
1927 2039
1928############################################################################# 2040#############################################################################
1929 2041
1930package CFClient::UI::CheckBox; 2042package CFClient::UI::CheckBox;
… …
1957 my ($self) = @_; 2069 my ($self) = @_;
1958 2070
1959 (6) x 2 2071 (6) x 2
1960} 2072}
1961 2073
2074sub toggle {
2075 my ($self) = @_;
2076
2077 $self->{state} = !$self->{state};
2078 $self->emit (changed => $self->{state});
2079 $self->update;
2080}
2081
1962sub button_down { 2082sub invoke_button_down {
1963 my ($self, $ev, $x, $y) = @_; 2083 my ($self, $ev, $x, $y) = @_;
1964 2084
1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2085 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2086 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1967 $self->{state} = !$self->{state}; 2087 $self->toggle;
1968 $self->_emit (changed => $self->{state});
1969 } else { 2088 } else {
1970 return 0 2089 return 0
1971 } 2090 }
1972 2091
1973 1 2092 1
… …
1998package CFClient::UI::Image; 2117package CFClient::UI::Image;
1999 2118
2000our @ISA = CFClient::UI::Base::; 2119our @ISA = CFClient::UI::Base::;
2001 2120
2002use CFClient::OpenGL; 2121use CFClient::OpenGL;
2003use Carp qw/confess/;
2004 2122
2005our %loaded_images; 2123our %texture_cache;
2006 2124
2007sub new { 2125sub new {
2008 my $class = shift; 2126 my $class = shift;
2009 2127
2010 my $self = $class->SUPER::new (can_events => 0, @_); 2128 my $self = $class->SUPER::new (
2129 can_events => 0,
2130 @_,
2131 );
2011 2132
2012 $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";
2013 2135
2014 $loaded_images{$self->{image}} ||= 2136 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2015 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;
2016 2138
2017 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2139 Scalar::Util::weaken $texture_cache{$self->{path}};
2018 2140
2019 Scalar::Util::weaken $loaded_images{$self->{image}}; 2141 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2020
2021 $self->{aspect} = $tex->{w} / $tex->{h};
2022 2142
2023 $self 2143 $self
2024} 2144}
2025 2145
2026sub size_request { 2146sub size_request {
2027 my ($self) = @_; 2147 my ($self) = @_;
2028 2148
2029 ($self->{tex}->{w}, $self->{tex}->{h}) 2149 ($self->{tex}{w}, $self->{tex}{h})
2030} 2150}
2031 2151
2032sub _draw { 2152sub _draw {
2033 my ($self) = @_; 2153 my ($self) = @_;
2034 2154
… …
2143 my $ycut1 = max 0, min 1, $ycut; 2263 my $ycut1 = max 0, min 1, $ycut;
2144 my $ycut2 = max 0, min 1, $ycut - 1; 2264 my $ycut2 = max 0, min 1, $ycut - 1;
2145 2265
2146 my $h1 = $self->{h} * (1 - $ycut1); 2266 my $h1 = $self->{h} * (1 - $ycut1);
2147 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);
2148 2271
2149 glEnable GL_BLEND; 2272 glEnable GL_BLEND;
2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2273 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2274 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2152 glEnable GL_TEXTURE_2D; 2275 glEnable GL_TEXTURE_2D;
… …
2171 2294
2172 if ($t3) { 2295 if ($t3) {
2173 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2296 glBindTexture GL_TEXTURE_2D, $t3->{name};
2174 glBegin GL_QUADS; 2297 glBegin GL_QUADS;
2175 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2298 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2176 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2299 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2177 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2300 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2178 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2301 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2179 glEnd; 2302 glEnd;
2180 } 2303 }
2181 2304
2182 glDisable GL_BLEND; 2305 glDisable GL_BLEND;
… …
2270 $self->update; 2393 $self->update;
2271 2394
2272 $self 2395 $self
2273} 2396}
2274 2397
2275sub changed { }
2276
2277sub set_range { 2398sub set_range {
2278 my ($self, $range) = @_; 2399 my ($self, $range) = @_;
2279 2400
2280 ($range, $self->{range}) = ($self->{range}, $range); 2401 ($range, $self->{range}) = ($self->{range}, $range);
2281 2402
2282 $self->update
2283 if "@$range" ne "@{$self->{range}}"; 2403 if ("@$range" ne "@{$self->{range}}") {
2404 $self->update;
2405 $self->set_value ($self->{range}[0]);
2406 }
2284} 2407}
2285 2408
2286sub set_value { 2409sub set_value {
2287 my ($self, $value) = @_; 2410 my ($self, $value) = @_;
2288 2411
… …
2299 if $unit; 2422 if $unit;
2300 2423
2301 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2424 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2302 2425
2303 if ($value != $old_value) { 2426 if ($value != $old_value) {
2304 $self->_emit (changed => $value); 2427 $self->emit (changed => $value);
2305 $self->update; 2428 $self->update;
2306 } 2429 }
2307} 2430}
2308 2431
2309sub size_request { 2432sub size_request {
2310 my ($self) = @_; 2433 my ($self) = @_;
2311 2434
2312 ($self->{req_w}, $self->{req_h}) 2435 ($self->{req_w}, $self->{req_h})
2313} 2436}
2314 2437
2315sub button_down { 2438sub invoke_button_down {
2316 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2317 2440
2318 $self->SUPER::button_down ($ev, $x, $y); 2441 $self->SUPER::invoke_button_down ($ev, $x, $y);
2319 2442
2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2443 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2321 2444
2322 $self->mouse_motion ($ev, $x, $y) 2445 $self->invoke_mouse_motion ($ev, $x, $y)
2323} 2446}
2324 2447
2325sub mouse_motion { 2448sub invoke_mouse_motion {
2326 my ($self, $ev, $x, $y) = @_; 2449 my ($self, $ev, $x, $y) = @_;
2327 2450
2328 if ($GRAB == $self) { 2451 if ($GRAB == $self) {
2329 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2452 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2330 2453
… …
2435sub set_range { shift->{slider}->set_range (@_) } 2558sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 2559sub set_value { shift->{slider}->set_value (@_) }
2437 2560
2438############################################################################# 2561#############################################################################
2439 2562
2440package CFClient::UI::TextView; 2563package CFClient::UI::TextScroller;
2441 2564
2442our @ISA = CFClient::UI::HBox::; 2565our @ISA = CFClient::UI::HBox::;
2443 2566
2444use CFClient::OpenGL; 2567use CFClient::OpenGL;
2445 2568
… …
2447 my $class = shift; 2570 my $class = shift;
2448 2571
2449 my $self = $class->SUPER::new ( 2572 my $self = $class->SUPER::new (
2450 fontsize => 1, 2573 fontsize => 1,
2451 can_events => 0, 2574 can_events => 0,
2575 indent => 0,
2452 #font => default_font 2576 #font => default_font
2453 @_, 2577 @_,
2454 2578
2455 layout => (new CFClient::Layout 1), 2579 layout => (new CFClient::Layout),
2456 par => [], 2580 par => [],
2457 height => 0, 2581 height => 0,
2458 children => [ 2582 children => [
2459 (new CFClient::UI::Empty expand => 1), 2583 (new CFClient::UI::Empty expand => 1),
2460 (new CFClient::UI::Slider vertical => 1), 2584 (new CFClient::UI::Slider vertical => 1),
… …
2471 2595
2472 $self->{fontsize} = $fontsize; 2596 $self->{fontsize} = $fontsize;
2473 $self->reflow; 2597 $self->reflow;
2474} 2598}
2475 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
2476sub size_allocate { 2609sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 2610 my ($self, $w, $h) = @_;
2478 2611
2479 $self->SUPER::size_allocate ($w, $h); 2612 my ($empty, $slider, @other) = @{ $self->{children} };
2613 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2480 2614
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2615 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $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});
2484 2619
2485 $self->reflow; 2620 $self->reflow;
2486}
2487 2621
2488sub text_size { 2622 local $self->{children} = [$empty, $slider];
2489 my ($self, $text, $indent) = @_; 2623 $self->SUPER::invoke_size_allocate ($w, $h)
2624}
2625
2626sub get_layout {
2627 my ($self, $para) = @_;
2490 2628
2491 my $layout = $self->{layout}; 2629 my $layout = $self->{layout};
2492 2630
2631 $layout->set_font ($self->{font}) if $self->{font};
2632 $layout->set_foreground (@{$para->{fg}});
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2633 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $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});
2495 $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}}
2496 2642 );
2643
2497 $layout->size 2644 $layout
2498} 2645}
2499 2646
2500sub reflow { 2647sub reflow {
2501 my ($self) = @_; 2648 my ($self) = @_;
2502 2649
… …
2511 $self->{children}[1]->set_value ($offset); 2658 $self->{children}[1]->set_value ($offset);
2512} 2659}
2513 2660
2514sub clear { 2661sub clear {
2515 my ($self) = @_; 2662 my ($self) = @_;
2663
2664 my (undef, undef, @other) = @{ $self->{children} };
2665 $self->remove ($_) for @other;
2516 2666
2517 $self->{par} = []; 2667 $self->{par} = [];
2518 $self->{height} = 0; 2668 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2669 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520} 2670}
2521 2671
2522sub add_paragraph { 2672sub add_paragraph {
2523 my ($self, $color, $text, $indent) = @_; 2673 my ($self, $color, $para, $indent) = @_;
2524 2674
2525 for my $line (split /\n/, $text) { 2675 my ($text, @w) = ref $para ? @$para : $para;
2526 my ($w, $h) = $self->text_size ($line); 2676
2527 $self->{height} += $h; 2677 $para = {
2528 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,
2529 } 2684 };
2530 2685
2531 $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;
2532} 2698}
2533 2699
2534sub update { 2700sub update {
2535 my ($self) = @_; 2701 my ($self) = @_;
2536 2702
… …
2538 2704
2539 return unless $self->{h} > 0; 2705 return unless $self->{h} > 0;
2540 2706
2541 delete $self->{texture}; 2707 delete $self->{texture};
2542 2708
2543 $ROOT->on_post_alloc ($self, sub { 2709 $ROOT->on_post_alloc ($self => sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2710 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 2711
2546 if (delete $self->{need_reflow}) { 2712 if (delete $self->{need_reflow}) {
2547 my $height = 0; 2713 my $height = 0;
2548 2714
2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2553 for (@{$self->{par}}) { 2715 for my $para (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2716 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2555 $layout->set_width ($W - $_->[3]); 2717 my $layout = $self->get_layout ($para);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size; 2718 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3]; 2719
2559 $_->[1] = $h; 2720 $para->{w} = $w + $para->{indent};
2721 $para->{h} = $h;
2722 $para->{wrapped} = $layout->has_wrapped;
2560 } 2723 }
2561 2724
2562 $height += $_->[1]; 2725 $height += $para->{h};
2563 } 2726 }
2564 2727
2565 $self->{height} = $height; 2728 $self->{height} = $height;
2566 2729
2567 $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]);
2568 2731
2569 delete $self->{texture}; 2732 delete $self->{texture};
2733 }
2734
2735 if (delete $self->{scroll_to_bottom}) {
2736 $self->{children}[1]->set_value (1e10);
2570 } 2737 }
2571 2738
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2739 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2573 glClearColor 0, 0, 0, 0; 2740 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 2741 glClear GL_COLOR_BUFFER_BIT;
… …
2578 my $y0 = $top; 2745 my $y0 = $top;
2579 my $y1 = $top + $H; 2746 my $y1 = $top + $H;
2580 2747
2581 my $y = 0; 2748 my $y = 0;
2582 2749
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}}) { 2750 for my $para (@{$self->{par}}) {
2592 my $h = $par->[1]; 2751 my $h = $para->{h};
2593 2752
2594 if ($y0 < $y + $h && $y < $y1) { 2753 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 2754
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2755 my $layout = $self->get_layout ($para);
2600 2756
2601 glRasterPos $par->[3], $y - $y0; 2757 $layout->render ($para->{indent}, $y - $y0);
2602 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 }
2603 } 2771 }
2604 2772
2605 $y += $h; 2773 $y += $h;
2606 } 2774 }
2607
2608 glDisable GL_BLEND;
2609 }; 2775 };
2610 }); 2776 });
2777}
2778
2779sub reconfigure {
2780 my ($self) = @_;
2781
2782 $self->SUPER::reconfigure;
2783
2784 $_->{w} = 1e10 for @{ $self->{par} };
2785 $self->reflow;
2611} 2786}
2612 2787
2613sub _draw { 2788sub _draw {
2614 my ($self) = @_; 2789 my ($self) = @_;
2615 2790
… …
2618 glColor 0, 0, 0, 1; 2793 glColor 0, 0, 0, 1;
2619 $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});
2620 glDisable GL_TEXTURE_2D; 2795 glDisable GL_TEXTURE_2D;
2621 2796
2622 $self->{children}[1]->draw; 2797 $self->{children}[1]->draw;
2623
2624} 2798}
2625 2799
2626############################################################################# 2800#############################################################################
2627 2801
2628package CFClient::UI::Animator; 2802package CFClient::UI::Animator;
… …
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 2889 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2890 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 2891 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 2892 . "visible $widget->{visible}";
2719 } 2893 }
2894
2895 $tooltip =~ s/^\n+//;
2896 $tooltip =~ s/\n+$//;
2720 2897
2721 $self->add (new CFClient::UI::Label 2898 $self->add (new CFClient::UI::Label
2722 markup => $tooltip, 2899 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2900 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 2901 fontsize => 0.8,
… …
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2911 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735 2912
2736 ($w + 4, $h + 4) 2913 ($w + 4, $h + 4)
2737} 2914}
2738 2915
2739sub size_allocate { 2916sub invoke_size_allocate {
2740 my ($self, $w, $h) = @_; 2917 my ($self, $w, $h) = @_;
2741 2918
2742 $self->SUPER::size_allocate ($w - 4, $h - 4); 2919 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743} 2920}
2744 2921
2745sub visibility_change { 2922sub invoke_visibility_change {
2746 my ($self, $visible) = @_; 2923 my ($self, $visible) = @_;
2747 2924
2748 return unless $visible; 2925 return unless $visible;
2749 2926
2750 $self->{root}->on_post_alloc ("move_$self" => sub { 2927 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2752 or return; 2929 or return;
2753 2930
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2931 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 2932
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2933 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 2934 if $x + $self->{w} > $self->{root}{w};
2758 2935
2759 $self->move_abs ($x, $y); 2936 $self->move_abs ($x, $y);
2760 }); 2937 });
2761} 2938}
2762 2939
… …
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3034 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 3035 glDisable GL_TEXTURE_2D;
2859 } 3036 }
2860} 3037}
2861 3038
2862sub DESTROY { 3039sub destroy {
2863 my ($self) = @_; 3040 my ($self) = @_;
2864 3041
2865 $self->{timer}->cancel 3042 $self->{timer}->cancel
2866 if $self->{timer}; 3043 if $self->{timer};
2867 3044
2868 $self->SUPER::DESTROY; 3045 $self->SUPER::destroy;
2869} 3046}
2870 3047
2871############################################################################# 3048#############################################################################
2872 3049
2873package CFClient::UI::Buttonbar; 3050package CFClient::UI::Buttonbar;
… …
2894 ); 3071 );
2895 3072
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3073 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2897 3074
2898 for my $item (@{ $self->{items} }) { 3075 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 3076 my ($widget, $cb, $tooltip) = @$item;
2900 3077
2901 # handle various types of items, only text for now 3078 # handle various types of items, only text for now
2902 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 {
2903 $widget = new CFClient::UI::Label 3094 $widget = new CFClient::UI::Label
2904 can_hover => 1, 3095 can_hover => 1,
2905 can_events => 1, 3096 can_events => 1,
2906 text => $widget; 3097 markup => $widget,
3098 tooltip => $tooltip;
3099 }
2907 } 3100 }
2908 3101
2909 $self->{item}{$widget} = $item; 3102 $self->{item}{$widget} = $item;
2910 3103
2911 $self->{vbox}->add ($widget); 3104 $self->{vbox}->add ($widget);
… …
2916 3109
2917# 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)
2918sub popup { 3111sub popup {
2919 my ($self, $ev) = @_; 3112 my ($self, $ev) = @_;
2920 3113
2921 $self->_emit ("popdown"); 3114 $self->emit ("popdown");
2922 3115
2923 # maybe save $GRAB? must be careful about events... 3116 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self; 3117 $GRAB = $self;
2925 $self->{button} = $ev->{button}; 3118 $self->{button} = $ev->{button};
2926 3119
2927 $self->show; 3120 $self->show;
2928 $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);
2929} 3122}
2930 3123
2931sub mouse_motion { 3124sub invoke_mouse_motion {
2932 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
2933 3126
2934 # TODO: should use vbox->find_widget or so 3127 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3128 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER}; 3129 $self->{hover} = $self->{item}{$HOVER};
2937 3130
2938 0 3131 0
2939} 3132}
2940 3133
2941sub button_up { 3134sub invoke_button_up {
2942 my ($self, $ev, $x, $y) = @_; 3135 my ($self, $ev, $x, $y) = @_;
2943 3136
2944 if ($ev->{button} == $self->{button}) { 3137 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB; 3138 undef $GRAB;
2946 $self->hide; 3139 $self->hide;
2947 3140
2948 $self->_emit ("popdown"); 3141 $self->emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover}; 3142 $self->{hover}[1]->() if $self->{hover};
2950 } else { 3143 } else {
2951 return 0 3144 return 0
2952 } 3145 }
2953 3146
… …
2980 3173
2981 $self->{current} = $self->{children}[0] 3174 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} }; 3175 if @{ $self->{children} };
2983} 3176}
2984 3177
3178sub get_current_page {
3179 my ($self) = @_;
3180
3181 $self->{current}
3182}
3183
2985sub set_current_page { 3184sub set_current_page {
2986 my ($self, $page_or_widget) = @_; 3185 my ($self, $page_or_widget) = @_;
2987 3186
2988 my $widget = ref $page_or_widget 3187 my $widget = ref $page_or_widget
2989 ? $page_or_widget 3188 ? $page_or_widget
2990 : $self->{children}[$page_or_widget]; 3189 : $self->{children}[$page_or_widget];
2991 3190
2992 $self->{current} = $widget; 3191 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3192 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994 3193
2995 $self->_emit (page_changed => $self->{current}); 3194 $self->emit (page_changed => $self->{current});
2996 3195
2997 $self->realloc; 3196 $self->realloc;
2998} 3197}
2999 3198
3000sub visible_children { 3199sub visible_children {
… …
3005 my ($self) = @_; 3204 my ($self) = @_;
3006 3205
3007 $self->{current}->size_request 3206 $self->{current}->size_request
3008} 3207}
3009 3208
3010sub size_allocate { 3209sub invoke_size_allocate {
3011 my ($self, $w, $h) = @_; 3210 my ($self, $w, $h) = @_;
3012 3211
3013 $self->{current}->configure (0, 0, $w, $h); 3212 $self->{current}->configure (0, 0, $w, $h);
3213
3214 1
3014} 3215}
3015 3216
3016sub _draw { 3217sub _draw {
3017 my ($self) = @_; 3218 my ($self) = @_;
3018 3219
… …
3053 ); 3254 );
3054 3255
3055 $self->{multiplexer}->add ($widget); 3256 $self->{multiplexer}->add ($widget);
3056} 3257}
3057 3258
3259sub get_current_page {
3260 my ($self) = @_;
3261
3262 $self->{multiplexer}->get_current_page
3263}
3264
3058sub set_current_page { 3265sub set_current_page {
3059 my ($self, $page) = @_; 3266 my ($self, $page) = @_;
3060 3267
3061 $self->{multiplexer}->set_current_page ($page); 3268 $self->{multiplexer}->set_current_page ($page);
3062 $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);
3063} 3326}
3064 3327
3065############################################################################# 3328#############################################################################
3066 3329
3067package CFClient::UI::Statusbox; 3330package CFClient::UI::Statusbox;
… …
3076 @_, 3339 @_,
3077 ); 3340 );
3078 3341
3079 Scalar::Util::weaken (my $this = $self); 3342 Scalar::Util::weaken (my $this = $self);
3080 3343
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { 3344 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3082 $this->reorder;
3083 $this->update;
3084 });
3085 3345
3086 $self 3346 $self
3087} 3347}
3088 3348
3089sub reorder { 3349sub reorder {
3090 my ($self) = @_; 3350 my ($self) = @_;
3091 my $NOW = Time::HiRes::time; 3351 my $NOW = Time::HiRes::time;
3352
3353 # freeze display when hovering over any label
3354 return if $CFClient::UI::TOOLTIP->{owner}
3355 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3356 values %{ $self->{item} };
3092 3357
3093 while (my ($k, $v) = each %{ $self->{item} }) { 3358 while (my ($k, $v) = each %{ $self->{item} }) {
3094 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3359 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3095 } 3360 }
3096 3361
… …
3105 3370
3106 my $count = 10 + 1; 3371 my $count = 10 + 1;
3107 for my $item (@items) { 3372 for my $item (@items) {
3108 last unless --$count; 3373 last unless --$count;
3109 3374
3110 push @widgets, $item->{label} ||= do { 3375 my $label = $item->{label} ||= do {
3111 # TODO: doesn't handle markup well (read as: at all) 3376 # TODO: doesn't handle markup well (read as: at all)
3112 my $short = $item->{count} > 1 3377 my $short = $item->{count} > 1
3113 ? "<b>$item->{count} ×</b> $item->{text}" 3378 ? "<b>$item->{count} ×</b> $item->{text}"
3114 : $item->{text}; 3379 : $item->{text};
3115 3380
… …
3123 tooltip => $item->{tooltip}, 3388 tooltip => $item->{tooltip},
3124 tooltip_font => $::FONT_PROP, 3389 tooltip_font => $::FONT_PROP,
3125 tooltip_width => 0.67, 3390 tooltip_width => 0.67,
3126 fontsize => $item->{fontsize} || $self->{fontsize}, 3391 fontsize => $item->{fontsize} || $self->{fontsize},
3127 max_w => $::WIDTH * 0.44, 3392 max_w => $::WIDTH * 0.44,
3128 fg => $item->{fg}, 3393 fg => [@{ $item->{fg} }],
3129 orig_alpha => $item->{fg}[3] || 1,
3130 can_events => 1, 3394 can_events => 1,
3131 can_hover => 1 3395 can_hover => 1
3132 }; 3396 };
3133 3397
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) { 3398 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2; 3399 $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; 3400 $label->update;
3401 $label->set_max_size (undef, $label->{req_h} * $diff)
3402 if $diff < 1;
3141 $self->{timer}->interval (1/30); 3403 $self->{timer}->interval (1/30);
3404 } else {
3405 $label->{fg}[3] = $item->{fg}[3] || 1;
3142 } 3406 }
3407
3408 push @widgets, $label;
3143 } 3409 }
3144 3410
3145 $self->clear; 3411 $self->clear;
3146 $self->SUPER::add (reverse @widgets); 3412 $self->SUPER::add (reverse @widgets);
3147} 3413}
… …
3163 $item->{count}++; 3429 $item->{count}++;
3164 } else { 3430 } else {
3165 $item->{count} = 1; 3431 $item->{count} = 1;
3166 $item->{text} = $item->{tooltip} = $text; 3432 $item->{text} = $item->{tooltip} = $text;
3167 } 3433 }
3168 $item->{id} = ++$self->{id}; 3434 $item->{id} += 0.2;#d#
3169 $item->{timeout} = $timeout; 3435 $item->{timeout} = $timeout;
3170 delete $item->{label}; 3436 delete $item->{label};
3171 } else { 3437 } else {
3172 $self->{item}{$group} = { 3438 $self->{item}{$group} = {
3173 id => ++$self->{id}, 3439 id => ++$self->{id},
… …
3179 count => 1, 3445 count => 1,
3180 %arg, 3446 %arg,
3181 }; 3447 };
3182 } 3448 }
3183 3449
3450 $ROOT->on_refresh (reorder => sub {
3184 $self->reorder; 3451 $self->reorder;
3452 });
3185} 3453}
3186 3454
3187sub reconfigure { 3455sub reconfigure {
3188 my ($self) = @_; 3456 my ($self) = @_;
3189 3457
… …
3192 3460
3193 $self->reorder; 3461 $self->reorder;
3194 $self->SUPER::reconfigure; 3462 $self->SUPER::reconfigure;
3195} 3463}
3196 3464
3197sub DESTROY { 3465sub destroy {
3198 my ($self) = @_; 3466 my ($self) = @_;
3199 3467
3200 $self->{timer}->cancel; 3468 $self->{timer}->cancel;
3201 3469
3202 $self->SUPER::DESTROY; 3470 $self->SUPER::destroy;
3203} 3471}
3204 3472
3205############################################################################# 3473#############################################################################
3206 3474
3207package CFClient::UI::Inventory; 3475package CFClient::UI::Inventory;
3208 3476
3209our @ISA = CFClient::UI::ScrolledWindow::; 3477our @ISA = CFClient::UI::Table::;
3210 3478
3211sub new { 3479sub new {
3212 my $class = shift; 3480 my $class = shift;
3213 3481
3214 my $self = $class->SUPER::new ( 3482 my $self = $class->SUPER::new (
3215 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3483 col_expand => [0, 1, 0],
3216 @_, 3484 @_,
3217 ); 3485 );
3218 3486
3219 $self 3487 $self
3220} 3488}
3221 3489
3222sub set_items { 3490sub set_items {
3223 my ($self, $items) = @_; 3491 my ($self, $items) = @_;
3224 3492
3225 $self->{child}->clear; 3493 $self->clear;
3226 return unless $items; 3494 return unless $items;
3227 3495
3228 my @items = sort { 3496 my @items = sort {
3229 ($a->{type} <=> $b->{type}) 3497 ($a->{type} <=> $b->{type})
3230 or ($a->{name} cmp $b->{name}) 3498 or ($a->{name} cmp $b->{name})
3231 } @$items; 3499 } values %$items;
3232 3500
3233 $self->{real_items} = \@items; 3501 $self->{real_items} = \@items;
3234 3502
3235 my $row = 0; 3503 my $row = 0;
3236 for my $item (@items) { 3504 for my $item (@items) {
3237 CFClient::Item::update_widgets $item; 3505 CFClient::Item::update_widgets $item;
3238 3506
3239 $self->{child}->add (0, $row, $item->{face_widget}); 3507 $self->add (0, $row, $item->{face_widget});
3240 $self->{child}->add (1, $row, $item->{desc_widget}); 3508 $self->add (1, $row, $item->{desc_widget});
3241 $self->{child}->add (2, $row, $item->{weight_widget}); 3509 $self->add (2, $row, $item->{weight_widget});
3242 3510
3243 $row++; 3511 $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 } 3512 }
3442} 3513}
3443 3514
3444############################################################################# 3515#############################################################################
3445 3516
… …
3455 commands => [], 3526 commands => [],
3456 @_, 3527 @_,
3457 ) 3528 )
3458} 3529}
3459 3530
3460# 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
3461sub add_spell { 3616sub add_spell {
3462 my ($self, $spell) = @_; 3617 my ($self, $spell) = @_;
3618
3463 $self->{spells}->{$spell->{name}} = $spell; 3619 $self->{spell}->{$spell->{name}} = $spell;
3464 3620 $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} 3621}
3493 3622
3494sub remove_spell { 3623sub remove_spell {
3495 my ($self, $spell) = @_; 3624 my ($self, $spell) = @_;
3625
3496 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} = {};
3497 $self->rebuild_spell_list; 3634 $self->rebuild_spell_list;
3498} 3635}
3499 3636
3500############################################################################# 3637#############################################################################
3501 3638
… …
3538 $coord = $max - $size if $coord > $max - $size; 3675 $coord = $max - $size if $coord > $max - $size;
3539 3676
3540 int $coord + 0.5 3677 int $coord + 0.5
3541} 3678}
3542 3679
3543sub size_allocate { 3680sub invoke_size_allocate {
3544 my ($self, $w, $h) = @_; 3681 my ($self, $w, $h) = @_;
3545 3682
3546 for my $child ($self->children) { 3683 for my $child ($self->children) {
3547 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)};
3548 3685
… …
3552 $X = _to_pixel $X, $W, $self->{w}; 3689 $X = _to_pixel $X, $W, $self->{w};
3553 $Y = _to_pixel $Y, $H, $self->{h}; 3690 $Y = _to_pixel $Y, $H, $self->{h};
3554 3691
3555 $child->configure ($X, $Y, $W, $H); 3692 $child->configure ($X, $Y, $W, $H);
3556 } 3693 }
3694
3695 1
3557} 3696}
3558 3697
3559sub coord2local { 3698sub coord2local {
3560 my ($self, $x, $y) = @_; 3699 my ($self, $x, $y) = @_;
3561 3700
… …
3687 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3826 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3688 3827
3689 $w = 0 if $w < 0; 3828 $w = 0 if $w < 0;
3690 $h = 0 if $h < 0; 3829 $h = 0 if $h < 0;
3691 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
3692 $w = int $w + 0.5; 3837 $w = int $w + 0.5;
3693 $h = int $h + 0.5; 3838 $h = int $h + 0.5;
3694 3839
3695 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}) {
3696 $widget->{old_w} = $widget->{w}; 3841 $widget->{old_w} = $widget->{w};

Diff Legend

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