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

Diff Legend

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