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

Diff Legend

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