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.305 by root, Sun Jun 18 17:13:12 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
… …
366 366
367 $self->{root}{size_alloc}{$self+0} = $self; 367 $self->{root}{size_alloc}{$self+0} = $self;
368 } 368 }
369} 369}
370 370
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 371sub children {
376 # nop 372 # nop
377} 373}
378 374
379sub visible_children { 375sub visible_children {
… …
381} 377}
382 378
383sub set_max_size { 379sub set_max_size {
384 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
385 381
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
388 384
389 $self->realloc; 385 $self->realloc;
390} 386}
391 387
392sub set_tooltip { 388sub set_tooltip {
… …
399 395
400 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
401 397
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
404 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
405 } 401 }
406} 402}
407 403
408# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
409sub coord2local { 405sub coord2local {
… …
417 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
418 414
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 416}
421 417
422sub focus_in { 418sub invoke_focus_in {
423 my ($self) = @_; 419 my ($self) = @_;
424 420
425 return if $FOCUS == $self; 421 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
427 423
428 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
429 425
430 $self->_emit (focus_in => $focus);
431
432 $focus->update if $focus; 426 $focus->update if $focus;
433 $FOCUS->update; 427 $FOCUS->update;
434}
435 428
429 0
430}
431
436sub focus_out { 432sub invoke_focus_out {
437 my ($self) = @_; 433 my ($self) = @_;
438 434
439 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
440 436
441 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
442 438
443 $self->_emit (focus_out => $focus);
444
445 $focus->update if $focus; #? 439 $focus->update if $focus; #?
446 440
447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
448 unless $FOCUS; 442 unless $FOCUS;
449}
450 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
451sub mouse_motion { 0 } 453sub invoke_mouse_motion { 1 }
452sub button_up { 0 } 454sub invoke_button_up { 1 }
453sub key_down { 0 } 455sub invoke_key_down { 1 }
454sub key_up { 0 } 456sub invoke_key_up { 1 }
455 457
456sub button_down { 458sub invoke_button_down {
457 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
458 460
459 $self->focus_in; 461 $self->grab_focus;
460 462
461 0 463 1
464}
465
466sub connect {
467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
462} 478}
463 479
464sub find_widget { 480sub find_widget {
465 my ($self, $x, $y) = @_; 481 my ($self, $x, $y) = @_;
466 482
… …
476sub set_parent { 492sub set_parent {
477 my ($self, $parent) = @_; 493 my ($self, $parent) = @_;
478 494
479 Scalar::Util::weaken ($self->{parent} = $parent); 495 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible}; 496 $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} 497}
505 498
506sub realloc { 499sub realloc {
507 my ($self) = @_; 500 my ($self) = @_;
508 501
… …
592 585
593sub DESTROY { 586sub DESTROY {
594 my ($self) = @_; 587 my ($self) = @_;
595 588
596 delete $WIDGET{$self+0}; 589 delete $WIDGET{$self+0};
597 #$self->deactivate; 590
591 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598} 593}
599 594
600############################################################################# 595#############################################################################
601 596
602package CFClient::UI::DrawBG; 597package CFClient::UI::DrawBG;
… …
767} 762}
768 763
769sub add { 764sub add {
770 my ($self, $child) = @_; 765 my ($self, $child) = @_;
771 766
772 $self->{children} = []; 767 $self->SUPER::remove ($_) for @{ $self->{children} };
773
774 $self->SUPER::add ($child); 768 $self->SUPER::add ($child);
775} 769}
776 770
777sub remove { 771sub remove {
778 my ($self, $widget) = @_; 772 my ($self, $widget) = @_;
… …
787 781
788sub size_request { 782sub size_request {
789 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
790} 784}
791 785
792sub size_allocate { 786sub invoke_size_allocate {
793 my ($self, $w, $h) = @_; 787 my ($self, $w, $h) = @_;
794 788
795 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
796} 792}
797 793
798############################################################################# 794#############################################################################
799 795
800# back-buffered drawing area 796# back-buffered drawing area
… …
816 812
817 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
818 $self->SUPER::update; 814 $self->SUPER::update;
819} 815}
820 816
821sub size_allocate { 817sub invoke_size_allocate {
822 my ($self, $w, $h) = @_; 818 my ($self, $w, $h) = @_;
823 819
824 $self->SUPER::size_allocate ($w, $h);
825 $self->update; 820 $self->update;
821
822 $self->SUPER::invoke_size_allocate ($w, $h)
826} 823}
827 824
828sub _render { 825sub _render {
829 my ($self) = @_; 826 my ($self) = @_;
830 827
… …
891 $h = 10 if $self->{scroll_y}; 888 $h = 10 if $self->{scroll_y};
892 889
893 ($w, $h) 890 ($w, $h)
894} 891}
895 892
896sub size_allocate { 893sub invoke_size_allocate {
897 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
898 895
899 my $child = $self->child; 896 my $child = $self->child;
900 897
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903 900
904 $self->child->configure (0, 0, $w, $h); 901 $self->child->configure (0, 0, $w, $h);
905 $self->update; 902 $self->update;
903
904 1
906} 905}
907 906
908sub set_offset { 907sub set_offset {
909 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
910 909
… …
1000 # todo: overwrite size_allocate of child 999 # todo: overwrite size_allocate of child
1001 my $child = $self->{vp}->child; 1000 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003} 1002}
1004 1003
1005sub size_allocate { 1004sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1005 my ($self, $w, $h) = @_;
1007
1008 $self->SUPER::size_allocate ($w, $h);
1009 1006
1010 my $child = $self->{vp}->child; 1007 my $child = $self->{vp}->child;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009
1010 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1011}
1013 1012
1014#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll 1014# update viewport offset on scroll
1016 1015
… …
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 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); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072 1071
1073sub new { 1072sub new {
1074 my ($class, %arg) = @_; 1073 my ($class, %arg) = @_;
1075
1076 my $title = delete $arg{title};
1077 1074
1078 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1078 border => 0.6,
… …
1083 min_w => 16, 1080 min_w => 16,
1084 min_h => 16, 1081 min_h => 16,
1085 %arg, 1082 %arg,
1086 ); 1083 );
1087 1084
1088 $self->{title} = new CFClient::UI::Label 1085 $self->{title_widget} = new CFClient::UI::Label
1089 align => 0, 1086 align => 0,
1090 valign => 1, 1087 valign => 1,
1091 text => $title, 1088 text => $self->{title},
1092 fontsize => $self->{border} 1089 fontsize => $self->{border},
1093 if defined $title; 1090 if exists $self->{title};
1091
1092 if ($self->{has_close_button}) {
1093 $self->{close_button} =
1094 new CFClient::UI::ImageButton
1095 image => 'x1_close.png',
1096 on_activate => sub { $self->hide };
1097
1098 $self->CFClient::UI::Container::add ($self->{close_button});
1099 }
1094 1100
1095 $self 1101 $self
1096} 1102}
1097 1103
1098sub add { 1104sub add {
1099 my ($self, @widgets) = @_; 1105 my ($self, @widgets) = @_;
1100 1106
1101 $self->SUPER::add (@widgets); 1107 $self->SUPER::add (@widgets);
1108 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1109 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1110}
1104 1111
1105sub border { 1112sub border {
1106 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
1107} 1114}
1108 1115
1109sub size_request { 1116sub size_request {
1110 my ($self) = @_; 1117 my ($self) = @_;
1111 1118
1112 $self->{title}->size_request 1119 $self->{title_widget}->size_request
1113 if $self->{title}; 1120 if $self->{title_widget};
1121
1122 $self->{close_button}->size_request
1123 if $self->{close_button};
1114 1124
1115 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
1116 1126
1117 ( 1127 (
1118 $w + $self->border * 2, 1128 $w + $self->border * 2,
1119 $h + $self->border * 2, 1129 $h + $self->border * 2,
1120 ) 1130 )
1121} 1131}
1122 1132
1123sub size_allocate { 1133sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1134 my ($self, $w, $h) = @_;
1125 1135
1126 if ($self->{title}) { 1136 if ($self->{title_widget}) {
1127 $self->{title}{w} = $w; 1137 $self->{title_widget}{w} = $w;
1128 $self->{title}{h} = $h; 1138 $self->{title_widget}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h); 1139 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1140 }
1131 1141
1132 my $border = $self->border; 1142 my $border = $self->border;
1133 1143
1134 $h -= List::Util::max 0, $border * 2; 1144 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1145 $w -= List::Util::max 0, $border * 2;
1136 1146
1137 $self->child->configure ($border, $border, $w, $h); 1147 $self->child->configure ($border, $border, $w, $h);
1138}
1139 1148
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button};
1151
1152 1
1153}
1154
1140sub button_down { 1155sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
1142 1157
1143 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1159 my $border = $self->border;
1145 1160
… …
1176 1191
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1193
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1194 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1195 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1196 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1197 };
1183 } else { 1198 } else {
1184 return 0; 1199 return 0;
1185 } 1200 }
1186 1201
1187 1 1202 1
1188} 1203}
1189 1204
1190sub button_up { 1205sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
1192 1207
1193 !!delete $self->{motion} 1208 ! ! delete $self->{motion}
1194} 1209}
1195 1210
1196sub mouse_motion { 1211sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1198 1213
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1215
1201 !!$self->{motion} 1216 ! ! $self->{motion}
1202} 1217}
1203 1218
1204sub _draw { 1219sub _draw {
1205 my ($self) = @_; 1220 my ($self) = @_;
1206 1221
… …
1232 1247
1233 glDisable GL_TEXTURE_2D; 1248 glDisable GL_TEXTURE_2D;
1234 1249
1235 $child->draw; 1250 $child->draw;
1236 1251
1237 if ($self->{title}) { 1252 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1253 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1254 $self->{title_widget}->_draw;
1255
1256 glTranslate 0, - ($border - $self->{h});
1240 } 1257 }
1258
1259 $self->{close_button}->draw
1260 if $self->{close_button};
1241} 1261}
1242 1262
1243############################################################################# 1263#############################################################################
1244 1264
1245package CFClient::UI::Table; 1265package CFClient::UI::Table;
… …
1268 1288
1269 $child->set_parent ($self); 1289 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1290 $self->{children}[$y][$x] = $child;
1271 1291
1272 $self->realloc; 1292 $self->realloc;
1293}
1294
1295sub remove {
1296 my ($self, $child) = @_;
1297
1298 # TODO: not yet implemented
1273} 1299}
1274 1300
1275# TODO: move to container class maybe? send children a signal on removal? 1301# TODO: move to container class maybe? send children a signal on removal?
1276sub clear { 1302sub clear {
1277 my ($self) = @_; 1303 my ($self) = @_;
… …
1318 (sum @$ws), 1344 (sum @$ws),
1319 (sum @$hs), 1345 (sum @$hs),
1320 ) 1346 )
1321} 1347}
1322 1348
1323sub size_allocate { 1349sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1350 my ($self, $w, $h) = @_;
1325 1351
1326 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1327 1353
1328 my $req_w = (sum @$ws) || 1; 1354 my $req_w = (sum @$ws) || 1;
… …
1360 } 1386 }
1361 1387
1362 $y += $row_h; 1388 $y += $row_h;
1363 } 1389 }
1364 1390
1391 1
1365} 1392}
1366 1393
1367sub find_widget { 1394sub find_widget {
1368 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1369 1396
… …
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1433 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1434 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 ) 1435 )
1409} 1436}
1410 1437
1411sub size_allocate { 1438sub invoke_size_allocate {
1412 my ($self, $w, $h) = @_; 1439 my ($self, $w, $h) = @_;
1413 1440
1414 my $space = $self->{vertical} ? $h : $w; 1441 my $space = $self->{vertical} ? $h : $w;
1415 my $children = $self->{children}; 1442 my $children = $self->{children};
1416 1443
… …
1538 1565
1539 delete $self->{texture}; 1566 delete $self->{texture};
1540 $self->SUPER::update; 1567 $self->SUPER::update;
1541} 1568}
1542 1569
1570sub realloc {
1571 my ($self) = @_;
1572
1573 delete $self->{ox};
1574 $self->SUPER::realloc;
1575}
1576
1543sub set_text { 1577sub set_text {
1544 my ($self, $text) = @_; 1578 my ($self, $text) = @_;
1545 1579
1546 return if $self->{text} eq "T$text"; 1580 return if $self->{text} eq "T$text";
1547 $self->{text} = "T$text"; 1581 $self->{text} = "T$text";
1548 1582
1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1550 $self->{layout}->set_text ($text); 1584 $self->{layout}->set_text ($text);
1551 1585
1586 delete $self->{size_req};
1552 $self->realloc; 1587 $self->realloc;
1553 $self->update; 1588 $self->update;
1554} 1589}
1555 1590
1556sub set_markup { 1591sub set_markup {
… …
1562 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1597 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1563 1598
1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1565 $self->{layout}->set_markup ($markup); 1600 $self->{layout}->set_markup ($markup);
1566 1601
1602 delete $self->{size_req};
1567 $self->realloc; 1603 $self->realloc;
1568 $self->update; 1604 $self->update;
1569} 1605}
1570 1606
1571sub size_request { 1607sub size_request {
1572 my ($self) = @_; 1608 my ($self) = @_;
1573 1609
1610 $self->{size_req} ||= do {
1574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1611 $self->{layout}->set_font ($self->{font}) if $self->{font};
1575 $self->{layout}->set_width ($self->{max_w} || -1); 1612 $self->{layout}->set_width ($self->{max_w} || -1);
1576 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1613 $self->{layout}->set_ellipsise ($self->{ellipsise});
1577 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1614 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1578 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1579 1616
1580 my ($w, $h) = $self->{layout}->size; 1617 my ($w, $h) = $self->{layout}->size;
1581 1618
1582 if (exists $self->{template}) { 1619 if (exists $self->{template}) {
1583 $self->{template}->set_font ($self->{font}) if $self->{font}; 1620 $self->{template}->set_font ($self->{font}) if $self->{font};
1584 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1585 1622
1586 my ($w2, $h2) = $self->{template}->size; 1623 my ($w2, $h2) = $self->{template}->size;
1587 1624
1588 $w = List::Util::max $w, $w2; 1625 $w = List::Util::max $w, $w2;
1589 $h = List::Util::max $h, $h2; 1626 $h = List::Util::max $h, $h2;
1627 }
1628
1629 [$w, $h]
1590 } 1630 };
1591 1631
1592 ($w, $h) 1632 @{ $self->{size_req} }
1593} 1633}
1594 1634
1595sub size_allocate { 1635sub invoke_size_allocate {
1596 my ($self, $w, $h) = @_; 1636 my ($self, $w, $h) = @_;
1597 1637
1598 delete $self->{ox}; 1638 delete $self->{ox};
1599 1639
1600 delete $self->{texture} 1640 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1641 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1642
1643 1
1602} 1644}
1603 1645
1604sub set_fontsize { 1646sub set_fontsize {
1605 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1606 1648
1607 $self->{fontsize} = $fontsize; 1649 $self->{fontsize} = $fontsize;
1608 delete $self->{texture}; 1650 delete $self->{texture};
1609 1651
1610 $self->realloc; 1652 $self->realloc;
1653}
1654
1655sub reconfigure {
1656 my ($self) = @_;
1657
1658 delete $self->{size_req};
1659
1660 $self->SUPER::reconfigure;
1611} 1661}
1612 1662
1613sub _draw { 1663sub _draw {
1614 my ($self) = @_; 1664 my ($self) = @_;
1615 1665
… …
1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1636 : ($self->{h} - $tex->{h}) * 0.5); 1686 : ($self->{h} - $tex->{h}) * 0.5);
1637 }; 1687 };
1638 1688
1639 glEnable GL_TEXTURE_2D; 1689 glEnable GL_TEXTURE_2D;
1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1693
1694 if ($tex->{format} == GL_ALPHA) {
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1696 glColor @{$self->{fg}};
1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1698 } else {
1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1641
1642 glColor_premultiply @{$self->{fg}}
1643 if $tex->{format} == GL_ALPHA;
1644
1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1701 }
1646 1702
1647 glDisable GL_TEXTURE_2D; 1703 glDisable GL_TEXTURE_2D;
1648} 1704}
1649 1705
1650############################################################################# 1706#############################################################################
… …
1666 can_hover => 1, 1722 can_hover => 1,
1667 can_focus => 1, 1723 can_focus => 1,
1668 valign => 0, 1724 valign => 0,
1669 can_events => 1, 1725 can_events => 1,
1670 #text => ... 1726 #text => ...
1727 #hidden => "*",
1671 @_ 1728 @_
1672 ) 1729 )
1673} 1730}
1674 1731
1675sub _set_text { 1732sub _set_text {
… …
1682 $self->{last_activity} = $::NOW; 1739 $self->{last_activity} = $::NOW;
1683 $self->{text} = $text; 1740 $self->{text} = $text;
1684 1741
1685 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1686 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1744 delete $self->{size_req};
1687 1745
1688 $self->_emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1747
1748 $self->realloc;
1689 $self->update; 1749 $self->update;
1690} 1750}
1691 1751
1692sub set_text { 1752sub set_text {
1693 my ($self, $text) = @_; 1753 my ($self, $text) = @_;
1694 1754
1695 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1696 $self->_set_text ($text); 1756 $self->_set_text ($text);
1697
1698 $self->realloc;
1699} 1757}
1700 1758
1701sub get_text { 1759sub get_text {
1702 $_[0]{text} 1760 $_[0]{text}
1703} 1761}
… …
1708 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1709 1767
1710 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1711} 1769}
1712 1770
1713sub key_down { 1771sub invoke_key_down {
1714 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1715 1773
1716 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1717 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1718 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
… …
1730 } elsif ($sym == CFClient::SDLK_HOME) { 1788 } elsif ($sym == CFClient::SDLK_HOME) {
1731 $self->{cursor} = 0; 1789 $self->{cursor} = 0;
1732 } elsif ($sym == CFClient::SDLK_END) { 1790 } elsif ($sym == CFClient::SDLK_END) {
1733 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1734 } elsif ($uni == 27) { 1792 } elsif ($uni == 27) {
1735 $self->_emit ('escape'); 1793 $self->emit ('escape');
1736 } elsif ($uni) { 1794 } elsif ($uni) {
1737 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else { 1796 } else {
1739 return 0; 1797 return 0;
1740 } 1798 }
… …
1744 $self->realloc; 1802 $self->realloc;
1745 1803
1746 1 1804 1
1747} 1805}
1748 1806
1749sub focus_in { 1807sub invoke_focus_in {
1750 my ($self) = @_; 1808 my ($self) = @_;
1751 1809
1752 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1753 1811
1754 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1755} 1813}
1756 1814
1757sub button_down { 1815sub invoke_button_down {
1758 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1759 1817
1760 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1761 1819
1762 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1763 1821
1764 # byte-index to char-index 1822 # byte-index to char-index
1765 my $text = $self->{text}; 1823 my $text = $self->{text};
… …
1770 $self->update; 1828 $self->update;
1771 1829
1772 1 1830 1
1773} 1831}
1774 1832
1775sub mouse_motion { 1833sub invoke_mouse_motion {
1776 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1835# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778 1836
1779 0 1837 1
1780} 1838}
1781 1839
1782sub _draw { 1840sub _draw {
1783 my ($self) = @_; 1841 my ($self) = @_;
1784 1842
… …
1825 1883
1826our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1827 1885
1828use CFClient::OpenGL; 1886use CFClient::OpenGL;
1829 1887
1830sub key_down { 1888sub invoke_key_down {
1831 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1832 1890
1833 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1834 1892
1835 if ($sym == 13) { 1893 if ($sym == 13) {
1836 unshift @{$self->{history}}, 1894 unshift @{$self->{history}},
1837 my $txt = $self->get_text; 1895 my $txt = $self->get_text;
1838 $self->{history_pointer} = -1; 1896 $self->{history_pointer} = -1;
1839 $self->{history_saveback} = ''; 1897 $self->{history_saveback} = '';
1840 $self->_emit (activate => $txt); 1898 $self->emit (activate => $txt);
1841 $self->update; 1899 $self->update;
1842 1900
1843 } elsif ($sym == CFClient::SDLK_UP) { 1901 } elsif ($sym == CFClient::SDLK_UP) {
1844 if ($self->{history_pointer} < 0) { 1902 if ($self->{history_pointer} < 0) {
1845 $self->{history_saveback} = $self->get_text; 1903 $self->{history_saveback} = $self->get_text;
… …
1861 } else { 1919 } else {
1862 $self->set_text ($self->{history_saveback}); 1920 $self->set_text ($self->{history_saveback});
1863 } 1921 }
1864 1922
1865 } else { 1923 } else {
1866 return $self->SUPER::key_down ($ev) 1924 return $self->SUPER::invoke_key_down ($ev)
1867 } 1925 }
1868 1926
1869 1 1927 1
1870} 1928}
1871 1929
… …
1895 can_events => 1, 1953 can_events => 1,
1896 @_ 1954 @_
1897 ) 1955 )
1898} 1956}
1899 1957
1900sub activate { }
1901
1902sub button_up { 1958sub invoke_button_up {
1903 my ($self, $ev, $x, $y) = @_; 1959 my ($self, $ev, $x, $y) = @_;
1904 1960
1905 $self->emit ("activate") 1961 $self->emit ("activate")
1906 if $x >= 0 && $x < $self->{w} 1962 if $x >= 0 && $x < $self->{w}
1907 && $y >= 0 && $y < $self->{h}; 1963 && $y >= 0 && $y < $self->{h};
… …
1921 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1977 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1922 1978
1923 glDisable GL_TEXTURE_2D; 1979 glDisable GL_TEXTURE_2D;
1924 1980
1925 $self->SUPER::_draw; 1981 $self->SUPER::_draw;
1982}
1983
1984#############################################################################
1985
1986package CFClient::UI::ImageButton;
1987
1988our @ISA = CFClient::UI::Image::;
1989
1990use CFClient::OpenGL;
1991
1992my %textures;
1993
1994sub new {
1995 my $class = shift;
1996
1997 my $self = $class->SUPER::new (
1998 padding_x => 4,
1999 padding_y => 4,
2000 fg => [1, 1, 1],
2001 active_fg => [0, 0, 1],
2002 can_hover => 1,
2003 align => 0,
2004 valign => 0,
2005 can_events => 1,
2006 @_
2007 );
2008}
2009
2010sub invoke_button_up {
2011 my ($self, $ev, $x, $y) = @_;
2012
2013 $self->emit ("activate")
2014 if $x >= 0 && $x < $self->{w}
2015 && $y >= 0 && $y < $self->{h};
2016
2017 1
1926} 2018}
1927 2019
1928############################################################################# 2020#############################################################################
1929 2021
1930package CFClient::UI::CheckBox; 2022package CFClient::UI::CheckBox;
… …
1957 my ($self) = @_; 2049 my ($self) = @_;
1958 2050
1959 (6) x 2 2051 (6) x 2
1960} 2052}
1961 2053
1962sub button_down { 2054sub invoke_button_down {
1963 my ($self, $ev, $x, $y) = @_; 2055 my ($self, $ev, $x, $y) = @_;
1964 2056
1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2057 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2058 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1967 $self->{state} = !$self->{state}; 2059 $self->{state} = !$self->{state};
1968 $self->_emit (changed => $self->{state}); 2060 $self->emit (changed => $self->{state});
1969 } else { 2061 } else {
1970 return 0 2062 return 0
1971 } 2063 }
1972 2064
1973 1 2065 1
… …
2270 $self->update; 2362 $self->update;
2271 2363
2272 $self 2364 $self
2273} 2365}
2274 2366
2275sub changed { }
2276
2277sub set_range { 2367sub set_range {
2278 my ($self, $range) = @_; 2368 my ($self, $range) = @_;
2279 2369
2280 ($range, $self->{range}) = ($self->{range}, $range); 2370 ($range, $self->{range}) = ($self->{range}, $range);
2281 2371
2282 $self->update
2283 if "@$range" ne "@{$self->{range}}"; 2372 if ("@$range" ne "@{$self->{range}}") {
2373 $self->update;
2374 $self->set_value ($self->{range}[0]);
2375 }
2284} 2376}
2285 2377
2286sub set_value { 2378sub set_value {
2287 my ($self, $value) = @_; 2379 my ($self, $value) = @_;
2288 2380
… …
2299 if $unit; 2391 if $unit;
2300 2392
2301 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2393 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2302 2394
2303 if ($value != $old_value) { 2395 if ($value != $old_value) {
2304 $self->_emit (changed => $value); 2396 $self->emit (changed => $value);
2305 $self->update; 2397 $self->update;
2306 } 2398 }
2307} 2399}
2308 2400
2309sub size_request { 2401sub size_request {
2310 my ($self) = @_; 2402 my ($self) = @_;
2311 2403
2312 ($self->{req_w}, $self->{req_h}) 2404 ($self->{req_w}, $self->{req_h})
2313} 2405}
2314 2406
2315sub button_down { 2407sub invoke_button_down {
2316 my ($self, $ev, $x, $y) = @_; 2408 my ($self, $ev, $x, $y) = @_;
2317 2409
2318 $self->SUPER::button_down ($ev, $x, $y); 2410 $self->SUPER::invoke_button_down ($ev, $x, $y);
2319 2411
2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2412 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2321 2413
2322 $self->mouse_motion ($ev, $x, $y) 2414 $self->mouse_motion ($ev, $x, $y)
2323} 2415}
2324 2416
2325sub mouse_motion { 2417sub invoke_mouse_motion {
2326 my ($self, $ev, $x, $y) = @_; 2418 my ($self, $ev, $x, $y) = @_;
2327 2419
2328 if ($GRAB == $self) { 2420 if ($GRAB == $self) {
2329 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2421 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2330 2422
… …
2435sub set_range { shift->{slider}->set_range (@_) } 2527sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 2528sub set_value { shift->{slider}->set_value (@_) }
2437 2529
2438############################################################################# 2530#############################################################################
2439 2531
2440package CFClient::UI::TextView; 2532package CFClient::UI::TextScroller;
2441 2533
2442our @ISA = CFClient::UI::HBox::; 2534our @ISA = CFClient::UI::HBox::;
2443 2535
2444use CFClient::OpenGL; 2536use CFClient::OpenGL;
2445 2537
… …
2447 my $class = shift; 2539 my $class = shift;
2448 2540
2449 my $self = $class->SUPER::new ( 2541 my $self = $class->SUPER::new (
2450 fontsize => 1, 2542 fontsize => 1,
2451 can_events => 0, 2543 can_events => 0,
2544 indent => 0,
2452 #font => default_font 2545 #font => default_font
2453 @_, 2546 @_,
2454 2547
2455 layout => (new CFClient::Layout 1), 2548 layout => (new CFClient::Layout 1),
2456 par => [], 2549 par => [],
… …
2471 2564
2472 $self->{fontsize} = $fontsize; 2565 $self->{fontsize} = $fontsize;
2473 $self->reflow; 2566 $self->reflow;
2474} 2567}
2475 2568
2476sub size_allocate { 2569sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 2570 my ($self, $w, $h) = @_;
2478
2479 $self->SUPER::size_allocate ($w, $h);
2480 2571
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2572 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $self->{layout}->set_width ($self->{children}[0]{w}); 2574 $self->{layout}->set_width ($self->{children}[0]{w});
2575 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2484 2576
2485 $self->reflow; 2577 $self->reflow;
2578
2579 $self->SUPER::invoke_size_allocate ($w, $h)
2486} 2580}
2487 2581
2488sub text_size { 2582sub text_size {
2489 my ($self, $text, $indent) = @_; 2583 my ($self, $text, $indent) = @_;
2490 2584
2491 my $layout = $self->{layout}; 2585 my $layout = $self->{layout};
2492 2586
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2587 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent); 2588 $layout->set_width ($self->{children}[0]{w} - $indent);
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2495 $layout->set_markup ($text); 2590 $layout->set_markup ($text);
2496 2591
2497 $layout->size 2592 $layout->size
2498} 2593}
2499 2594
… …
2538 2633
2539 return unless $self->{h} > 0; 2634 return unless $self->{h} > 0;
2540 2635
2541 delete $self->{texture}; 2636 delete $self->{texture};
2542 2637
2543 $ROOT->on_post_alloc ($self, sub { 2638 $ROOT->on_post_alloc ($self => sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2639 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 2640
2546 if (delete $self->{need_reflow}) { 2641 if (delete $self->{need_reflow}) {
2547 my $height = 0; 2642 my $height = 0;
2548 2643
… …
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2646 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552 2647
2553 for (@{$self->{par}}) { 2648 for (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2649 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2555 $layout->set_width ($W - $_->[3]); 2650 $layout->set_width ($W - $_->[3]);
2651 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2556 $layout->set_markup ($_->[4]); 2652 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size; 2653 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3]; 2654 $_->[0] = $w + $_->[3];
2559 $_->[1] = $h; 2655 $_->[1] = $h;
2560 } 2656 }
… …
2563 } 2659 }
2564 2660
2565 $self->{height} = $height; 2661 $self->{height} = $height;
2566 2662
2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2663 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2568 2664
2569 delete $self->{texture}; 2665 delete $self->{texture};
2570 } 2666 }
2571 2667
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2668 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2573 glClearColor 0, 0, 0, 0; 2669 glClearColor 0, 0, 0, 0;
… …
2592 my $h = $par->[1]; 2688 my $h = $par->[1];
2593 2689
2594 if ($y0 < $y + $h && $y < $y1) { 2690 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] }); 2691 $layout->set_foreground (@{ $par->[2] });
2596 $layout->set_width ($W - $par->[3]); 2692 $layout->set_width ($W - $par->[3]);
2693 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($par->[4]); 2694 $layout->set_markup ($par->[4]);
2598 2695
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2696 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2600 2697
2601 glRasterPos $par->[3], $y - $y0; 2698 glRasterPos $par->[3], $y - $y0;
… …
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 2812 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2813 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 2814 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 2815 . "visible $widget->{visible}";
2719 } 2816 }
2817
2818 $tooltip =~ s/^\n+//;
2819 $tooltip =~ s/\n+$//;
2720 2820
2721 $self->add (new CFClient::UI::Label 2821 $self->add (new CFClient::UI::Label
2722 markup => $tooltip, 2822 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2823 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 2824 fontsize => 0.8,
… …
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2834 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735 2835
2736 ($w + 4, $h + 4) 2836 ($w + 4, $h + 4)
2737} 2837}
2738 2838
2739sub size_allocate { 2839sub invoke_size_allocate {
2740 my ($self, $w, $h) = @_; 2840 my ($self, $w, $h) = @_;
2741 2841
2742 $self->SUPER::size_allocate ($w - 4, $h - 4); 2842 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743} 2843}
2744 2844
2745sub visibility_change { 2845sub invoke_visibility_change {
2746 my ($self, $visible) = @_; 2846 my ($self, $visible) = @_;
2747 2847
2748 return unless $visible; 2848 return unless $visible;
2749 2849
2750 $self->{root}->on_post_alloc ("move_$self" => sub { 2850 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2752 or return; 2852 or return;
2753 2853
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2854 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 2855
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2856 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 2857 if $x + $self->{w} > $self->{root}{w};
2758 2858
2759 $self->move_abs ($x, $y); 2859 $self->move_abs ($x, $y);
2760 }); 2860 });
2761} 2861}
2762 2862
… …
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2957 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 2958 glDisable GL_TEXTURE_2D;
2859 } 2959 }
2860} 2960}
2861 2961
2862sub DESTROY { 2962sub destroy {
2863 my ($self) = @_; 2963 my ($self) = @_;
2864 2964
2865 $self->{timer}->cancel 2965 $self->{timer}->cancel
2866 if $self->{timer}; 2966 if $self->{timer};
2867 2967
2868 $self->SUPER::DESTROY; 2968 $self->SUPER::destroy;
2869} 2969}
2870 2970
2871############################################################################# 2971#############################################################################
2872 2972
2873package CFClient::UI::Buttonbar; 2973package CFClient::UI::Buttonbar;
… …
2894 ); 2994 );
2895 2995
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2996 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2897 2997
2898 for my $item (@{ $self->{items} }) { 2998 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 2999 my ($widget, $cb, $tooltip) = @$item;
2900 3000
2901 # handle various types of items, only text for now 3001 # handle various types of items, only text for now
2902 if (!ref $widget) { 3002 if (!ref $widget) {
2903 $widget = new CFClient::UI::Label 3003 $widget = new CFClient::UI::Label
2904 can_hover => 1, 3004 can_hover => 1,
2905 can_events => 1, 3005 can_events => 1,
2906 text => $widget; 3006 markup => $widget,
3007 tooltip => $tooltip
2907 } 3008 }
2908 3009
2909 $self->{item}{$widget} = $item; 3010 $self->{item}{$widget} = $item;
2910 3011
2911 $self->{vbox}->add ($widget); 3012 $self->{vbox}->add ($widget);
… …
2916 3017
2917# popup given the event (must be a mouse button down event currently) 3018# popup given the event (must be a mouse button down event currently)
2918sub popup { 3019sub popup {
2919 my ($self, $ev) = @_; 3020 my ($self, $ev) = @_;
2920 3021
2921 $self->_emit ("popdown"); 3022 $self->emit ("popdown");
2922 3023
2923 # maybe save $GRAB? must be careful about events... 3024 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self; 3025 $GRAB = $self;
2925 $self->{button} = $ev->{button}; 3026 $self->{button} = $ev->{button};
2926 3027
2927 $self->show; 3028 $self->show;
2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3029 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2929} 3030}
2930 3031
2931sub mouse_motion { 3032sub invoke_mouse_motion {
2932 my ($self, $ev, $x, $y) = @_; 3033 my ($self, $ev, $x, $y) = @_;
2933 3034
2934 # TODO: should use vbox->find_widget or so 3035 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3036 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER}; 3037 $self->{hover} = $self->{item}{$HOVER};
2937 3038
2938 0 3039 0
2939} 3040}
2940 3041
2941sub button_up { 3042sub invoke_button_up {
2942 my ($self, $ev, $x, $y) = @_; 3043 my ($self, $ev, $x, $y) = @_;
2943 3044
2944 if ($ev->{button} == $self->{button}) { 3045 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB; 3046 undef $GRAB;
2946 $self->hide; 3047 $self->hide;
2947 3048
2948 $self->_emit ("popdown"); 3049 $self->emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover}; 3050 $self->{hover}[1]->() if $self->{hover};
2950 } else { 3051 } else {
2951 return 0 3052 return 0
2952 } 3053 }
2953 3054
… …
2990 : $self->{children}[$page_or_widget]; 3091 : $self->{children}[$page_or_widget];
2991 3092
2992 $self->{current} = $widget; 3093 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3094 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994 3095
2995 $self->_emit (page_changed => $self->{current}); 3096 $self->emit (page_changed => $self->{current});
2996 3097
2997 $self->realloc; 3098 $self->realloc;
2998} 3099}
2999 3100
3000sub visible_children { 3101sub visible_children {
… …
3005 my ($self) = @_; 3106 my ($self) = @_;
3006 3107
3007 $self->{current}->size_request 3108 $self->{current}->size_request
3008} 3109}
3009 3110
3010sub size_allocate { 3111sub invoke_size_allocate {
3011 my ($self, $w, $h) = @_; 3112 my ($self, $w, $h) = @_;
3012 3113
3013 $self->{current}->configure (0, 0, $w, $h); 3114 $self->{current}->configure (0, 0, $w, $h);
3115
3116 1
3014} 3117}
3015 3118
3016sub _draw { 3119sub _draw {
3017 my ($self) = @_; 3120 my ($self) = @_;
3018 3121
… …
3057 3160
3058sub set_current_page { 3161sub set_current_page {
3059 my ($self, $page) = @_; 3162 my ($self, $page) = @_;
3060 3163
3061 $self->{multiplexer}->set_current_page ($page); 3164 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current}); 3165 $self->emit (page_changed => $self->{multiplexer}{current});
3166}
3167
3168#############################################################################
3169
3170package CFClient::UI::Combobox;
3171
3172use utf8;
3173
3174our @ISA = CFClient::UI::Button::;
3175
3176sub new {
3177 my $class = shift;
3178
3179 my $self = $class->SUPER::new (
3180 options => [], # [value, title, longdesc], ...
3181 value => undef,
3182 @_,
3183 );
3184
3185 $self->_set_value ($self->{value});
3186
3187 $self
3188}
3189
3190sub invoke_button_down {
3191 my ($self, $ev) = @_;
3192
3193 my @menu_items;
3194
3195 for (@{ $self->{options} }) {
3196 my ($value, $title, $tooltip) = @$_;
3197
3198 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3199 }
3200
3201 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3202}
3203
3204sub _set_value {
3205 my ($self, $value) = @_;
3206
3207 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3208 or return;
3209
3210 $self->{value} = $item->[0];
3211 $self->set_markup ("$item->[1] ⇓");
3212 $self->set_tooltip ($item->[2]);
3213}
3214
3215sub set_value {
3216 my ($self, $value) = @_;
3217
3218 return unless $self->{value} ne $value;
3219
3220 $self->_set_value ($value);
3221 $self->emit (changed => $value);
3063} 3222}
3064 3223
3065############################################################################# 3224#############################################################################
3066 3225
3067package CFClient::UI::Statusbox; 3226package CFClient::UI::Statusbox;
… …
3076 @_, 3235 @_,
3077 ); 3236 );
3078 3237
3079 Scalar::Util::weaken (my $this = $self); 3238 Scalar::Util::weaken (my $this = $self);
3080 3239
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { 3240 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3082 $this->reorder;
3083 $this->update;
3084 });
3085 3241
3086 $self 3242 $self
3087} 3243}
3088 3244
3089sub reorder { 3245sub reorder {
3090 my ($self) = @_; 3246 my ($self) = @_;
3091 my $NOW = Time::HiRes::time; 3247 my $NOW = Time::HiRes::time;
3248
3249 # freeze display when hovering over any label
3250 return if $CFClient::UI::TOOLTIP->{owner}
3251 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3252 values %{ $self->{item} };
3092 3253
3093 while (my ($k, $v) = each %{ $self->{item} }) { 3254 while (my ($k, $v) = each %{ $self->{item} }) {
3094 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3255 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3095 } 3256 }
3096 3257
… …
3105 3266
3106 my $count = 10 + 1; 3267 my $count = 10 + 1;
3107 for my $item (@items) { 3268 for my $item (@items) {
3108 last unless --$count; 3269 last unless --$count;
3109 3270
3110 push @widgets, $item->{label} ||= do { 3271 my $label = $item->{label} ||= do {
3111 # TODO: doesn't handle markup well (read as: at all) 3272 # TODO: doesn't handle markup well (read as: at all)
3112 my $short = $item->{count} > 1 3273 my $short = $item->{count} > 1
3113 ? "<b>$item->{count} ×</b> $item->{text}" 3274 ? "<b>$item->{count} ×</b> $item->{text}"
3114 : $item->{text}; 3275 : $item->{text};
3115 3276
… …
3123 tooltip => $item->{tooltip}, 3284 tooltip => $item->{tooltip},
3124 tooltip_font => $::FONT_PROP, 3285 tooltip_font => $::FONT_PROP,
3125 tooltip_width => 0.67, 3286 tooltip_width => 0.67,
3126 fontsize => $item->{fontsize} || $self->{fontsize}, 3287 fontsize => $item->{fontsize} || $self->{fontsize},
3127 max_w => $::WIDTH * 0.44, 3288 max_w => $::WIDTH * 0.44,
3128 fg => $item->{fg}, 3289 fg => [@{ $item->{fg} }],
3129 orig_alpha => $item->{fg}[3] || 1,
3130 can_events => 1, 3290 can_events => 1,
3131 can_hover => 1 3291 can_hover => 1
3132 }; 3292 };
3133 3293
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) { 3294 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2; 3295 $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; 3296 $label->update;
3297 $label->set_max_size (undef, $label->{req_h} * $diff)
3298 if $diff < 1;
3141 $self->{timer}->interval (1/30); 3299 $self->{timer}->interval (1/30);
3300 } else {
3301 $label->{fg}[3] = $item->{fg}[3] || 1;
3142 } 3302 }
3303
3304 push @widgets, $label;
3143 } 3305 }
3144 3306
3145 $self->clear; 3307 $self->clear;
3146 $self->SUPER::add (reverse @widgets); 3308 $self->SUPER::add (reverse @widgets);
3147} 3309}
… …
3163 $item->{count}++; 3325 $item->{count}++;
3164 } else { 3326 } else {
3165 $item->{count} = 1; 3327 $item->{count} = 1;
3166 $item->{text} = $item->{tooltip} = $text; 3328 $item->{text} = $item->{tooltip} = $text;
3167 } 3329 }
3168 $item->{id} = ++$self->{id}; 3330 $item->{id} += 0.2;#d#
3169 $item->{timeout} = $timeout; 3331 $item->{timeout} = $timeout;
3170 delete $item->{label}; 3332 delete $item->{label};
3171 } else { 3333 } else {
3172 $self->{item}{$group} = { 3334 $self->{item}{$group} = {
3173 id => ++$self->{id}, 3335 id => ++$self->{id},
… …
3192 3354
3193 $self->reorder; 3355 $self->reorder;
3194 $self->SUPER::reconfigure; 3356 $self->SUPER::reconfigure;
3195} 3357}
3196 3358
3197sub DESTROY { 3359sub destroy {
3198 my ($self) = @_; 3360 my ($self) = @_;
3199 3361
3200 $self->{timer}->cancel; 3362 $self->{timer}->cancel;
3201 3363
3202 $self->SUPER::DESTROY; 3364 $self->SUPER::destroy;
3203} 3365}
3204 3366
3205############################################################################# 3367#############################################################################
3206 3368
3207package CFClient::UI::Inventory; 3369package CFClient::UI::Inventory;
… …
3351 my ($self) = @_; 3513 my ($self) = @_;
3352 $self->ask_for_bind (1); 3514 $self->ask_for_bind (1);
3353} 3515}
3354 3516
3355sub ask_for_bind { 3517sub ask_for_bind {
3356 my ($self, $commit) = @_; 3518 my ($self, $commit, $end_cb) = @_;
3357 3519
3358 CFClient::Binder::open_binding_dialog (sub { 3520 CFClient::Binder::open_binding_dialog (sub {
3359 my ($mod, $sym) = @_; 3521 my ($mod, $sym) = @_;
3360 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3522 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3361 $self->update_binding_widgets; 3523 $self->update_binding_widgets;
3362 $self->commit if $commit; 3524 $self->commit if $commit;
3525 $end_cb->() if $end_cb;
3363 }); 3526 });
3364} 3527}
3365 3528
3366# $mod and $sym are the modifiers and key symbol 3529# $mod and $sym are the modifiers and key symbol
3367# $cmds is a array ref of strings (the commands) 3530# $cmds is a array ref of strings (the commands)
… …
3385} 3548}
3386 3549
3387# this is a shortcut method that asks for a binding 3550# this is a shortcut method that asks for a binding
3388# and then just binds it. 3551# and then just binds it.
3389sub do_quick_binding { 3552sub do_quick_binding {
3390 my ($self, $cmds) = @_; 3553 my ($self, $cmds, $end_cb) = @_;
3391 $self->set_binding (undef, undef, $cmds, sub { 3554 $self->set_binding (undef, undef, $cmds, sub {
3392 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2]; 3555 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3393 }); 3556 });
3394 $self->ask_for_bind (1); 3557 $self->ask_for_bind (1, $end_cb);
3395} 3558}
3396 3559
3397sub update_binding_widgets { 3560sub update_binding_widgets {
3398 my ($self) = @_; 3561 my ($self) = @_;
3399 my ($mod, $sym, $cmds) = $self->get_binding; 3562 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3455 commands => [], 3618 commands => [],
3456 @_, 3619 @_,
3457 ) 3620 )
3458} 3621}
3459 3622
3460# XXX: Do sorting? Argl... 3623my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3624
3625my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3626 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3627my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3629my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3631my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3633my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3635
3636sub rebuild_spell_list {
3637 my ($self) = @_;
3638
3639 $CFClient::UI::ROOT->on_refresh ($self => sub {
3640 $self->clear;
3641
3642 return unless $::CONN;
3643
3644 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3645 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3646 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3647 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3648 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3649
3650 my $row = 0;
3651
3652 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3653 my $spell = $self->{spell}{$_};
3654
3655 $row++;
3656
3657 my $spell_cb = sub {
3658 my ($widget, $ev) = @_;
3659
3660 if ($ev->{button} == 1) {
3661 $::CONN->user_send ("cast $spell->{name}");
3662 } elsif ($ev->{button} == 2) {
3663 $::CONN->user_send ("invoke $spell->{name}");
3664 } elsif ($ev->{button} == 3) {
3665 (new CFClient::UI::Menu
3666 items => [
3667 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3668 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3669 ],
3670 )->popup ($ev);
3671 } else {
3672 return 0;
3673 }
3674
3675 1
3676 };
3677
3678 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3679
3680 #TODO: add path info to tooltip
3681 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3682
3683 $self->add (0, $row, new CFClient::UI::Face
3684 face => $spell->{face},
3685 can_hover => 1,
3686 can_events => 1,
3687 tooltip => $tooltip,
3688 on_button_down => $spell_cb,
3689 );
3690
3691 $self->add (1, $row, new CFClient::UI::Label
3692 expand => 1,
3693 text => $spell->{name},
3694 can_hover => 1,
3695 can_events => 1,
3696 tooltip => $tooltip,
3697 on_button_down => $spell_cb,
3698 );
3699
3700 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3701 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3702 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3703 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3704 }
3705 });
3706}
3707
3461sub add_spell { 3708sub add_spell {
3462 my ($self, $spell) = @_; 3709 my ($self, $spell) = @_;
3710
3463 $self->{spells}->{$spell->{name}} = $spell; 3711 $self->{spell}->{$spell->{name}} = $spell;
3464 3712 $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} 3713}
3493 3714
3494sub remove_spell { 3715sub remove_spell {
3495 my ($self, $spell) = @_; 3716 my ($self, $spell) = @_;
3717
3496 delete $self->{spells}->{$spell->{name}}; 3718 delete $self->{spell}->{$spell->{name}};
3719 $self->rebuild_spell_list;
3720}
3721
3722sub clear_spells {
3723 my ($self) = @_;
3724
3725 $self->{spell} = {};
3497 $self->rebuild_spell_list; 3726 $self->rebuild_spell_list;
3498} 3727}
3499 3728
3500############################################################################# 3729#############################################################################
3501 3730
… …
3538 $coord = $max - $size if $coord > $max - $size; 3767 $coord = $max - $size if $coord > $max - $size;
3539 3768
3540 int $coord + 0.5 3769 int $coord + 0.5
3541} 3770}
3542 3771
3543sub size_allocate { 3772sub invoke_size_allocate {
3544 my ($self, $w, $h) = @_; 3773 my ($self, $w, $h) = @_;
3545 3774
3546 for my $child ($self->children) { 3775 for my $child ($self->children) {
3547 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3776 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3548 3777
… …
3552 $X = _to_pixel $X, $W, $self->{w}; 3781 $X = _to_pixel $X, $W, $self->{w};
3553 $Y = _to_pixel $Y, $H, $self->{h}; 3782 $Y = _to_pixel $Y, $H, $self->{h};
3554 3783
3555 $child->configure ($X, $Y, $W, $H); 3784 $child->configure ($X, $Y, $W, $H);
3556 } 3785 }
3786
3787 1
3557} 3788}
3558 3789
3559sub coord2local { 3790sub coord2local {
3560 my ($self, $x, $y) = @_; 3791 my ($self, $x, $y) = @_;
3561 3792

Diff Legend

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