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.321 by root, Tue Jul 4 23:44:23 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
… …
1494 #font => default_font 1536 #font => default_font
1495 #text => initial text 1537 #text => initial text
1496 #markup => initial narkup 1538 #markup => initial narkup
1497 #max_w => maximum pixel width 1539 #max_w => maximum pixel width
1498 ellipsise => 3, # end 1540 ellipsise => 3, # end
1499 layout => (new CFClient::Layout), 1541 layout => (new CFClient::Layout 2),
1500 fontsize => 1, 1542 fontsize => 1,
1501 align => -1, 1543 align => -1,
1502 valign => -1, 1544 valign => -1,
1503 padding_x => 2, 1545 padding_x => 2,
1504 padding_y => 2, 1546 padding_y => 2,
1505 can_events => 0, 1547 can_events => 0,
1506 %arg 1548 %arg
1507 ); 1549 );
1508 1550
1509 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
1510 my $layout = new CFClient::Layout; 1552 my $layout = new CFClient::Layout 2;
1511 $layout->set_text (delete $self->{template}); 1553 $layout->set_text (delete $self->{template});
1512 $self->{template} = $layout; 1554 $self->{template} = $layout;
1513 } 1555 }
1514 1556
1515 if (exists $self->{markup}) { 1557 if (exists $self->{markup}) {
… …
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;
1548 $self->{layout}->set_text ($text); 1596 $self->{layout}->set_text ($text);
1549 1597
1598 delete $self->{size_req};
1550 $self->realloc; 1599 $self->realloc;
1551 $self->update; 1600 $self->update;
1552} 1601}
1553 1602
1554sub set_markup { 1603sub set_markup {
… …
1557 return if $self->{text} eq "M$markup"; 1606 return if $self->{text} eq "M$markup";
1558 $self->{text} = "M$markup"; 1607 $self->{text} = "M$markup";
1559 1608
1560 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1609 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1561 1610
1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1563 $self->{layout}->set_markup ($markup); 1611 $self->{layout}->set_markup ($markup);
1564 1612
1613 delete $self->{size_req};
1565 $self->realloc; 1614 $self->realloc;
1566 $self->update; 1615 $self->update;
1567} 1616}
1568 1617
1569sub size_request { 1618sub size_request {
1570 my ($self) = @_; 1619 my ($self) = @_;
1571 1620
1621 $self->{size_req} ||= do {
1572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1622 $self->{layout}->set_font ($self->{font}) if $self->{font};
1573 $self->{layout}->set_width ($self->{max_w} || -1); 1623 $self->{layout}->set_width ($self->{max_w} || -1);
1574 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1624 $self->{layout}->set_ellipsise ($self->{ellipsise});
1575 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1625 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1577 1627
1578 my ($w, $h) = $self->{layout}->size; 1628 my ($w, $h) = $self->{layout}->size;
1579 1629
1580 if (exists $self->{template}) { 1630 if (exists $self->{template}) {
1581 $self->{template}->set_font ($self->{font}) if $self->{font}; 1631 $self->{template}->set_font ($self->{font}) if $self->{font};
1582 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1632 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1583 1633
1584 my ($w2, $h2) = $self->{template}->size; 1634 my ($w2, $h2) = $self->{template}->size;
1585 1635
1586 $w = List::Util::max $w, $w2; 1636 $w = List::Util::max $w, $w2;
1587 $h = List::Util::max $h, $h2; 1637 $h = List::Util::max $h, $h2;
1638 }
1639
1640 [$w, $h]
1588 } 1641 };
1589 1642
1590 ($w, $h) 1643 @{ $self->{size_req} }
1591} 1644}
1592 1645
1646sub baseline_shift {
1647 $_[0]{layout}->descent
1648}
1649
1593sub size_allocate { 1650sub invoke_size_allocate {
1594 my ($self, $w, $h) = @_; 1651 my ($self, $w, $h) = @_;
1595 1652
1596 delete $self->{ox}; 1653 delete $self->{ox};
1597 1654
1598 delete $self->{texture} 1655 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1656 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1657
1658 1
1600} 1659}
1601 1660
1602sub set_fontsize { 1661sub set_fontsize {
1603 my ($self, $fontsize) = @_; 1662 my ($self, $fontsize) = @_;
1604 1663
1605 $self->{fontsize} = $fontsize; 1664 $self->{fontsize} = $fontsize;
1665 delete $self->{size_req};
1606 delete $self->{texture}; 1666 delete $self->{texture};
1607 1667
1608 $self->realloc; 1668 $self->realloc;
1609} 1669}
1610 1670
1671sub reconfigure {
1672 my ($self) = @_;
1673
1674 delete $self->{size_req};
1675 delete $self->{texture};
1676
1677 $self->SUPER::reconfigure;
1678}
1679
1611sub _draw { 1680sub _draw {
1612 my ($self) = @_; 1681 my ($self) = @_;
1613 1682
1614 $self->SUPER::_draw; # draw background, if applicable 1683 $self->SUPER::_draw; # draw background, if applicable
1615 1684
1616 my $tex = $self->{texture} ||= do { 1685 my $size = $self->{texture} ||= do {
1617 $self->{layout}->set_foreground (@{$self->{fg}}); 1686 $self->{layout}->set_foreground (@{$self->{fg}});
1618 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1687 $self->{layout}->set_font ($self->{font}) if $self->{font};
1619 $self->{layout}->set_width ($self->{w}); 1688 $self->{layout}->set_width ($self->{w});
1620 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1689 $self->{layout}->set_ellipsise ($self->{ellipsise});
1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1690 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1691 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1692
1624 new_from_layout CFClient::Texture $self->{layout} 1693 $self->{size_req}
1625 }; 1694 };
1626 1695
1627 unless (exists $self->{ox}) { 1696 unless (exists $self->{ox}) {
1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1697 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1698 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1630 : ($self->{w} - $tex->{w}) * 0.5); 1699 : ($self->{w} - $size->[0]) * 0.5);
1631 1700
1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1701 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1702 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1634 : ($self->{h} - $tex->{h}) * 0.5); 1703 : ($self->{h} - $size->[1]) * 0.5);
1635 }; 1704 };
1636 1705
1637 glEnable GL_TEXTURE_2D; 1706 my $w = List::Util::min $self->{w} + 4, $size->[0];
1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1707 my $h = List::Util::min $self->{h} + 2, $size->[1];
1639 1708
1640 glColor_premultiply @{$self->{fg}} 1709 $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} 1710}
1647 1711
1648############################################################################# 1712#############################################################################
1649 1713
1650package CFClient::UI::EntryBase; 1714package CFClient::UI::EntryBase;
… …
1664 can_hover => 1, 1728 can_hover => 1,
1665 can_focus => 1, 1729 can_focus => 1,
1666 valign => 0, 1730 valign => 0,
1667 can_events => 1, 1731 can_events => 1,
1668 #text => ... 1732 #text => ...
1733 #hidden => "*",
1669 @_ 1734 @_
1670 ) 1735 )
1671} 1736}
1672 1737
1673sub _set_text { 1738sub _set_text {
… …
1680 $self->{last_activity} = $::NOW; 1745 $self->{last_activity} = $::NOW;
1681 $self->{text} = $text; 1746 $self->{text} = $text;
1682 1747
1683 $text =~ s/./*/g if $self->{hidden}; 1748 $text =~ s/./*/g if $self->{hidden};
1684 $self->{layout}->set_text ("$text "); 1749 $self->{layout}->set_text ("$text ");
1750 delete $self->{size_req};
1685 1751
1686 $self->_emit (changed => $self->{text}); 1752 $self->emit (changed => $self->{text});
1753
1754 $self->realloc;
1687 $self->update; 1755 $self->update;
1688} 1756}
1689 1757
1690sub set_text { 1758sub set_text {
1691 my ($self, $text) = @_; 1759 my ($self, $text) = @_;
1692 1760
1693 $self->{cursor} = length $text; 1761 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1762 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1763}
1698 1764
1699sub get_text { 1765sub get_text {
1700 $_[0]{text} 1766 $_[0]{text}
1701} 1767}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 1772 my ($w, $h) = $self->SUPER::size_request;
1707 1773
1708 ($w + 1, $h) # add 1 for cursor 1774 ($w + 1, $h) # add 1 for cursor
1709} 1775}
1710 1776
1711sub key_down { 1777sub invoke_key_down {
1712 my ($self, $ev) = @_; 1778 my ($self, $ev) = @_;
1713 1779
1714 my $mod = $ev->{mod}; 1780 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 1781 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 1782 my $uni = $ev->{unicode};
… …
1728 } elsif ($sym == CFClient::SDLK_HOME) { 1794 } elsif ($sym == CFClient::SDLK_HOME) {
1729 $self->{cursor} = 0; 1795 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) { 1796 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text; 1797 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 1798 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 1799 $self->emit ('escape');
1734 } elsif ($uni) { 1800 } elsif ($uni) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 1801 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 1802 } else {
1737 return 0; 1803 return 0;
1738 } 1804 }
… …
1742 $self->realloc; 1808 $self->realloc;
1743 1809
1744 1 1810 1
1745} 1811}
1746 1812
1747sub focus_in { 1813sub invoke_focus_in {
1748 my ($self) = @_; 1814 my ($self) = @_;
1749 1815
1750 $self->{last_activity} = $::NOW; 1816 $self->{last_activity} = $::NOW;
1751 1817
1752 $self->SUPER::focus_in; 1818 $self->SUPER::invoke_focus_in
1753} 1819}
1754 1820
1755sub button_down { 1821sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 1822 my ($self, $ev, $x, $y) = @_;
1757 1823
1758 $self->SUPER::button_down ($ev, $x, $y); 1824 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 1825
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 1826 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 1827
1762 # byte-index to char-index 1828 # byte-index to char-index
1763 my $text = $self->{text}; 1829 my $text = $self->{text};
… …
1768 $self->update; 1834 $self->update;
1769 1835
1770 1 1836 1
1771} 1837}
1772 1838
1773sub mouse_motion { 1839sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 1840 my ($self, $ev, $x, $y) = @_;
1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1841# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776 1842
1777 0 1843 1
1778} 1844}
1779 1845
1780sub _draw { 1846sub _draw {
1781 my ($self) = @_; 1847 my ($self) = @_;
1782 1848
… …
1823 1889
1824our @ISA = CFClient::UI::EntryBase::; 1890our @ISA = CFClient::UI::EntryBase::;
1825 1891
1826use CFClient::OpenGL; 1892use CFClient::OpenGL;
1827 1893
1828sub key_down { 1894sub invoke_key_down {
1829 my ($self, $ev) = @_; 1895 my ($self, $ev) = @_;
1830 1896
1831 my $sym = $ev->{sym}; 1897 my $sym = $ev->{sym};
1832 1898
1833 if ($sym == 13) { 1899 if ($sym == 13) {
1834 unshift @{$self->{history}}, 1900 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 1901 my $txt = $self->get_text;
1902
1836 $self->{history_pointer} = -1; 1903 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 1904 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 1905 $self->emit (activate => $txt);
1839 $self->update; 1906 $self->update;
1840 1907
1841 } elsif ($sym == CFClient::SDLK_UP) { 1908 } elsif ($sym == CFClient::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 1909 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 1910 $self->{history_saveback} = $self->get_text;
… …
1859 } else { 1926 } else {
1860 $self->set_text ($self->{history_saveback}); 1927 $self->set_text ($self->{history_saveback});
1861 } 1928 }
1862 1929
1863 } else { 1930 } else {
1864 return $self->SUPER::key_down ($ev) 1931 return $self->SUPER::invoke_key_down ($ev)
1865 } 1932 }
1866 1933
1867 1 1934 1
1868} 1935}
1869 1936
… …
1893 can_events => 1, 1960 can_events => 1,
1894 @_ 1961 @_
1895 ) 1962 )
1896} 1963}
1897 1964
1898sub activate { }
1899
1900sub button_up { 1965sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 1966 my ($self, $ev, $x, $y) = @_;
1902 1967
1903 $self->emit ("activate") 1968 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 1969 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 1970 && $y >= 0 && $y < $self->{h};
… …
1919 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1984 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1920 1985
1921 glDisable GL_TEXTURE_2D; 1986 glDisable GL_TEXTURE_2D;
1922 1987
1923 $self->SUPER::_draw; 1988 $self->SUPER::_draw;
1989}
1990
1991#############################################################################
1992
1993package CFClient::UI::ImageButton;
1994
1995our @ISA = CFClient::UI::Image::;
1996
1997use CFClient::OpenGL;
1998
1999my %textures;
2000
2001sub new {
2002 my $class = shift;
2003
2004 my $self = $class->SUPER::new (
2005 padding_x => 4,
2006 padding_y => 4,
2007 fg => [1, 1, 1],
2008 active_fg => [0, 0, 1],
2009 can_hover => 1,
2010 align => 0,
2011 valign => 0,
2012 can_events => 1,
2013 @_
2014 );
2015}
2016
2017sub invoke_button_up {
2018 my ($self, $ev, $x, $y) = @_;
2019
2020 $self->emit ("activate")
2021 if $x >= 0 && $x < $self->{w}
2022 && $y >= 0 && $y < $self->{h};
2023
2024 1
1924} 2025}
1925 2026
1926############################################################################# 2027#############################################################################
1927 2028
1928package CFClient::UI::CheckBox; 2029package CFClient::UI::CheckBox;
… …
1955 my ($self) = @_; 2056 my ($self) = @_;
1956 2057
1957 (6) x 2 2058 (6) x 2
1958} 2059}
1959 2060
2061sub toggle {
2062 my ($self) = @_;
2063
2064 $self->{state} = !$self->{state};
2065 $self->emit (changed => $self->{state});
2066 $self->update;
2067}
2068
1960sub button_down { 2069sub invoke_button_down {
1961 my ($self, $ev, $x, $y) = @_; 2070 my ($self, $ev, $x, $y) = @_;
1962 2071
1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2072 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2073 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1965 $self->{state} = !$self->{state}; 2074 $self->toggle;
1966 $self->_emit (changed => $self->{state});
1967 } else { 2075 } else {
1968 return 0 2076 return 0
1969 } 2077 }
1970 2078
1971 1 2079 1
… …
1996package CFClient::UI::Image; 2104package CFClient::UI::Image;
1997 2105
1998our @ISA = CFClient::UI::Base::; 2106our @ISA = CFClient::UI::Base::;
1999 2107
2000use CFClient::OpenGL; 2108use CFClient::OpenGL;
2001use Carp qw/confess/;
2002 2109
2003our %loaded_images; 2110our %texture_cache;
2004 2111
2005sub new { 2112sub new {
2006 my $class = shift; 2113 my $class = shift;
2007 2114
2008 my $self = $class->SUPER::new (can_events => 0, @_); 2115 my $self = $class->SUPER::new (
2116 can_events => 0,
2117 @_,
2118 );
2009 2119
2010 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2120 $self->{path}
2121 or Carp::croak "required attribute 'path' not set";
2011 2122
2012 $loaded_images{$self->{image}} ||= 2123 $self->{tex} = $texture_cache{$self->{path}} ||=
2013 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2124 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2014 2125
2015 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2126 Scalar::Util::weaken $texture_cache{$self->{path}};
2016 2127
2017 Scalar::Util::weaken $loaded_images{$self->{image}}; 2128 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2018
2019 $self->{aspect} = $tex->{w} / $tex->{h};
2020 2129
2021 $self 2130 $self
2022} 2131}
2023 2132
2024sub size_request { 2133sub size_request {
2025 my ($self) = @_; 2134 my ($self) = @_;
2026 2135
2027 ($self->{tex}->{w}, $self->{tex}->{h}) 2136 ($self->{tex}{w}, $self->{tex}{h})
2028} 2137}
2029 2138
2030sub _draw { 2139sub _draw {
2031 my ($self) = @_; 2140 my ($self) = @_;
2032 2141
… …
2141 my $ycut1 = max 0, min 1, $ycut; 2250 my $ycut1 = max 0, min 1, $ycut;
2142 my $ycut2 = max 0, min 1, $ycut - 1; 2251 my $ycut2 = max 0, min 1, $ycut - 1;
2143 2252
2144 my $h1 = $self->{h} * (1 - $ycut1); 2253 my $h1 = $self->{h} * (1 - $ycut1);
2145 my $h2 = $self->{h} * (1 - $ycut2); 2254 my $h2 = $self->{h} * (1 - $ycut2);
2255 my $h3 = $self->{h};
2256
2257 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2146 2258
2147 glEnable GL_BLEND; 2259 glEnable GL_BLEND;
2148 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2260 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2261 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2150 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
… …
2169 2281
2170 if ($t3) { 2282 if ($t3) {
2171 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2283 glBindTexture GL_TEXTURE_2D, $t3->{name};
2172 glBegin GL_QUADS; 2284 glBegin GL_QUADS;
2173 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2285 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2174 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2286 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2175 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2287 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2176 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2288 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2177 glEnd; 2289 glEnd;
2178 } 2290 }
2179 2291
2180 glDisable GL_BLEND; 2292 glDisable GL_BLEND;
… …
2268 $self->update; 2380 $self->update;
2269 2381
2270 $self 2382 $self
2271} 2383}
2272 2384
2273sub changed { }
2274
2275sub set_range { 2385sub set_range {
2276 my ($self, $range) = @_; 2386 my ($self, $range) = @_;
2277 2387
2278 ($range, $self->{range}) = ($self->{range}, $range); 2388 ($range, $self->{range}) = ($self->{range}, $range);
2279 2389
2280 $self->update
2281 if "@$range" ne "@{$self->{range}}"; 2390 if ("@$range" ne "@{$self->{range}}") {
2391 $self->update;
2392 $self->set_value ($self->{range}[0]);
2393 }
2282} 2394}
2283 2395
2284sub set_value { 2396sub set_value {
2285 my ($self, $value) = @_; 2397 my ($self, $value) = @_;
2286 2398
… …
2297 if $unit; 2409 if $unit;
2298 2410
2299 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2411 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2300 2412
2301 if ($value != $old_value) { 2413 if ($value != $old_value) {
2302 $self->_emit (changed => $value); 2414 $self->emit (changed => $value);
2303 $self->update; 2415 $self->update;
2304 } 2416 }
2305} 2417}
2306 2418
2307sub size_request { 2419sub size_request {
2308 my ($self) = @_; 2420 my ($self) = @_;
2309 2421
2310 ($self->{req_w}, $self->{req_h}) 2422 ($self->{req_w}, $self->{req_h})
2311} 2423}
2312 2424
2313sub button_down { 2425sub invoke_button_down {
2314 my ($self, $ev, $x, $y) = @_; 2426 my ($self, $ev, $x, $y) = @_;
2315 2427
2316 $self->SUPER::button_down ($ev, $x, $y); 2428 $self->SUPER::invoke_button_down ($ev, $x, $y);
2317 2429
2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2430 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2319 2431
2320 $self->mouse_motion ($ev, $x, $y) 2432 $self->invoke_mouse_motion ($ev, $x, $y)
2321} 2433}
2322 2434
2323sub mouse_motion { 2435sub invoke_mouse_motion {
2324 my ($self, $ev, $x, $y) = @_; 2436 my ($self, $ev, $x, $y) = @_;
2325 2437
2326 if ($GRAB == $self) { 2438 if ($GRAB == $self) {
2327 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2439 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2328 2440
… …
2433sub set_range { shift->{slider}->set_range (@_) } 2545sub set_range { shift->{slider}->set_range (@_) }
2434sub set_value { shift->{slider}->set_value (@_) } 2546sub set_value { shift->{slider}->set_value (@_) }
2435 2547
2436############################################################################# 2548#############################################################################
2437 2549
2438package CFClient::UI::TextView; 2550package CFClient::UI::TextScroller;
2439 2551
2440our @ISA = CFClient::UI::HBox::; 2552our @ISA = CFClient::UI::HBox::;
2441 2553
2442use CFClient::OpenGL; 2554use CFClient::OpenGL;
2443 2555
… …
2445 my $class = shift; 2557 my $class = shift;
2446 2558
2447 my $self = $class->SUPER::new ( 2559 my $self = $class->SUPER::new (
2448 fontsize => 1, 2560 fontsize => 1,
2449 can_events => 0, 2561 can_events => 0,
2562 indent => 0,
2450 #font => default_font 2563 #font => default_font
2451 @_, 2564 @_,
2452 2565
2453 layout => (new CFClient::Layout 1), 2566 layout => (new CFClient::Layout 2),
2454 par => [], 2567 par => [],
2455 height => 0, 2568 height => 0,
2456 children => [ 2569 children => [
2457 (new CFClient::UI::Empty expand => 1), 2570 (new CFClient::UI::Empty expand => 1),
2458 (new CFClient::UI::Slider vertical => 1), 2571 (new CFClient::UI::Slider vertical => 1),
… …
2469 2582
2470 $self->{fontsize} = $fontsize; 2583 $self->{fontsize} = $fontsize;
2471 $self->reflow; 2584 $self->reflow;
2472} 2585}
2473 2586
2587sub size_request {
2588 my ($self) = @_;
2589
2590 my ($empty, $slider) = @{ $self->{children} };
2591
2592 local $self->{children} = [$empty, $slider];
2593 $self->SUPER::size_request
2594}
2595
2474sub size_allocate { 2596sub invoke_size_allocate {
2475 my ($self, $w, $h) = @_; 2597 my ($self, $w, $h) = @_;
2476 2598
2477 $self->SUPER::size_allocate ($w, $h); 2599 my ($empty, $slider, @other) = @{ $self->{children} };
2600 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2478 2601
2479 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2602 $self->{layout}->set_font ($self->{font}) if $self->{font};
2480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2603 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2481 $self->{layout}->set_width ($self->{children}[0]{w}); 2604 $self->{layout}->set_width ($empty->{w});
2605 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2482 2606
2483 $self->reflow; 2607 $self->reflow;
2484}
2485 2608
2486sub text_size { 2609 local $self->{children} = [$empty, $slider];
2487 my ($self, $text, $indent) = @_; 2610 $self->SUPER::invoke_size_allocate ($w, $h)
2611}
2612
2613sub get_layout {
2614 my ($self, $para) = @_;
2488 2615
2489 my $layout = $self->{layout}; 2616 my $layout = $self->{layout};
2490 2617
2618 $layout->set_font ($self->{font}) if $self->{font};
2619 $layout->set_foreground (@{$para->{fg}});
2491 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2620 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2492 $layout->set_width ($self->{children}[0]{w} - $indent); 2621 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2622 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2493 $layout->set_markup ($text); 2623 $layout->set_markup ($para->{markup});
2624
2625 $layout->set_shapes (
2626 map
2627 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2628 @{$para->{widget}}
2494 2629 );
2630
2495 $layout->size 2631 $layout
2496} 2632}
2497 2633
2498sub reflow { 2634sub reflow {
2499 my ($self) = @_; 2635 my ($self) = @_;
2500 2636
… …
2509 $self->{children}[1]->set_value ($offset); 2645 $self->{children}[1]->set_value ($offset);
2510} 2646}
2511 2647
2512sub clear { 2648sub clear {
2513 my ($self) = @_; 2649 my ($self) = @_;
2650
2651 my (undef, undef, @other) = @{ $self->{children} };
2652 $self->remove ($_) for @other;
2514 2653
2515 $self->{par} = []; 2654 $self->{par} = [];
2516 $self->{height} = 0; 2655 $self->{height} = 0;
2517 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2656 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2518} 2657}
2519 2658
2520sub add_paragraph { 2659sub add_paragraph {
2521 my ($self, $color, $text, $indent) = @_; 2660 my ($self, $color, $para, $indent) = @_;
2522 2661
2523 for my $line (split /\n/, $text) { 2662 my ($text, @w) = ref $para ? @$para : $para;
2524 my ($w, $h) = $self->text_size ($line); 2663
2525 $self->{height} += $h; 2664 $para = {
2526 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2665 w => 1e10,
2666 wrapped => 1,
2667 fg => $color,
2668 indent => $indent,
2669 markup => $text,
2670 widget => \@w,
2527 } 2671 };
2528 2672
2529 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2673 $self->add (@w) if @w;
2674 push @{$self->{par}}, $para;
2675
2676 $self->{need_reflow}++;
2677 $self->update;
2678}
2679
2680sub scroll_to_bottom {
2681 my ($self) = @_;
2682
2683 $self->{scroll_to_bottom} = 1;
2684 $self->update;
2530} 2685}
2531 2686
2532sub update { 2687sub update {
2533 my ($self) = @_; 2688 my ($self) = @_;
2534 2689
… …
2536 2691
2537 return unless $self->{h} > 0; 2692 return unless $self->{h} > 0;
2538 2693
2539 delete $self->{texture}; 2694 delete $self->{texture};
2540 2695
2541 $ROOT->on_post_alloc ($self, sub { 2696 $ROOT->on_post_alloc ($self => sub {
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2697 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543 2698
2544 if (delete $self->{need_reflow}) { 2699 if (delete $self->{need_reflow}) {
2545 my $height = 0; 2700 my $height = 0;
2546 2701
2547 my $layout = $self->{layout};
2548
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
2551 for (@{$self->{par}}) { 2702 for my $para (@{$self->{par}}) {
2552 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2703 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2553 $layout->set_width ($W - $_->[3]); 2704 my $layout = $self->get_layout ($para);
2554 $layout->set_markup ($_->[4]);
2555 my ($w, $h) = $layout->size; 2705 my ($w, $h) = $layout->size;
2556 $_->[0] = $w + $_->[3]; 2706
2557 $_->[1] = $h; 2707 $para->{w} = $w + $para->{indent};
2708 $para->{h} = $h;
2709 $para->{wrapped} = $layout->has_wrapped;
2558 } 2710 }
2559 2711
2560 $height += $_->[1]; 2712 $height += $para->{h};
2561 } 2713 }
2562 2714
2563 $self->{height} = $height; 2715 $self->{height} = $height;
2564 2716
2565 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2717 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2566 2718
2567 delete $self->{texture}; 2719 delete $self->{texture};
2720 }
2721
2722 if (delete $self->{scroll_to_bottom}) {
2723 $self->{children}[1]->set_value (1e10);
2568 } 2724 }
2569 2725
2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2726 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2571 glClearColor 0, 0, 0, 0; 2727 glClearColor 0, 0, 0, 0;
2572 glClear GL_COLOR_BUFFER_BIT; 2728 glClear GL_COLOR_BUFFER_BIT;
… …
2576 my $y0 = $top; 2732 my $y0 = $top;
2577 my $y1 = $top + $H; 2733 my $y1 = $top + $H;
2578 2734
2579 my $y = 0; 2735 my $y = 0;
2580 2736
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}}) { 2737 for my $para (@{$self->{par}}) {
2590 my $h = $par->[1]; 2738 my $h = $para->{h};
2591 2739
2592 if ($y0 < $y + $h && $y < $y1) { 2740 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 2741
2597 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2742 my $layout = $self->get_layout ($para);
2598 2743
2599 glRasterPos $par->[3], $y - $y0; 2744 $layout->render ($para->{indent}, $y - $y0);
2600 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2745
2746 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes;
2748
2749 for (@w) {
2750 my ($dx, $dy) = splice @s, 0, 2, ();
2751
2752 $_->{x} = $dx + $para->{indent};
2753 $_->{y} = $dy + $y - $y0;
2754
2755 $_->draw;
2756 }
2757 }
2601 } 2758 }
2602 2759
2603 $y += $h; 2760 $y += $h;
2604 } 2761 }
2605
2606 glDisable GL_BLEND;
2607 }; 2762 };
2608 }); 2763 });
2764}
2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2609} 2773}
2610 2774
2611sub _draw { 2775sub _draw {
2612 my ($self) = @_; 2776 my ($self) = @_;
2613 2777
… …
2616 glColor 0, 0, 0, 1; 2780 glColor 0, 0, 0, 1;
2617 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2781 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2618 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2619 2783
2620 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2621
2622} 2785}
2623 2786
2624############################################################################# 2787#############################################################################
2625 2788
2626package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2713 $tooltip .= "\n\n" . (ref $widget) . "\n" 2876 $tooltip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2877 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n" 2878 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}"; 2879 . "visible $widget->{visible}";
2717 } 2880 }
2881
2882 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//;
2718 2884
2719 $self->add (new CFClient::UI::Label 2885 $self->add (new CFClient::UI::Label
2720 markup => $tooltip, 2886 markup => $tooltip,
2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2722 fontsize => 0.8, 2888 fontsize => 0.8,
… …
2732 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2733 2899
2734 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2735} 2901}
2736 2902
2737sub size_allocate { 2903sub invoke_size_allocate {
2738 my ($self, $w, $h) = @_; 2904 my ($self, $w, $h) = @_;
2739 2905
2740 $self->SUPER::size_allocate ($w - 4, $h - 4); 2906 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2741} 2907}
2742 2908
2743sub visibility_change { 2909sub invoke_visibility_change {
2744 my ($self, $visible) = @_; 2910 my ($self, $visible) = @_;
2745 2911
2746 return unless $visible; 2912 return unless $visible;
2747 2913
2748 $self->{root}->on_post_alloc ("move_$self" => sub { 2914 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2750 or return; 2916 or return;
2751 2917
2752 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753 2919
2754 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755 if $x + $self->{w} > $::WIDTH; 2921 if $x + $self->{w} > $self->{root}{w};
2756 2922
2757 $self->move_abs ($x, $y); 2923 $self->move_abs ($x, $y);
2758 }); 2924 });
2759} 2925}
2760 2926
… …
2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2856 glDisable GL_TEXTURE_2D; 3022 glDisable GL_TEXTURE_2D;
2857 } 3023 }
2858} 3024}
2859 3025
2860sub DESTROY { 3026sub destroy {
2861 my ($self) = @_; 3027 my ($self) = @_;
2862 3028
2863 $self->{timer}->cancel 3029 $self->{timer}->cancel
2864 if $self->{timer}; 3030 if $self->{timer};
2865 3031
2866 $self->SUPER::DESTROY; 3032 $self->SUPER::destroy;
2867} 3033}
2868 3034
2869############################################################################# 3035#############################################################################
2870 3036
2871package CFClient::UI::Buttonbar; 3037package CFClient::UI::Buttonbar;
… …
2892 ); 3058 );
2893 3059
2894 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3060 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2895 3061
2896 for my $item (@{ $self->{items} }) { 3062 for my $item (@{ $self->{items} }) {
2897 my ($widget, $cb) = @$item; 3063 my ($widget, $cb, $tooltip) = @$item;
2898 3064
2899 # handle various types of items, only text for now 3065 # handle various types of items, only text for now
2900 if (!ref $widget) { 3066 if (!ref $widget) {
2901 $widget = new CFClient::UI::Label 3067 $widget = new CFClient::UI::Label
2902 can_hover => 1, 3068 can_hover => 1,
2903 can_events => 1, 3069 can_events => 1,
2904 text => $widget; 3070 markup => $widget,
3071 tooltip => $tooltip
2905 } 3072 }
2906 3073
2907 $self->{item}{$widget} = $item; 3074 $self->{item}{$widget} = $item;
2908 3075
2909 $self->{vbox}->add ($widget); 3076 $self->{vbox}->add ($widget);
… …
2914 3081
2915# popup given the event (must be a mouse button down event currently) 3082# popup given the event (must be a mouse button down event currently)
2916sub popup { 3083sub popup {
2917 my ($self, $ev) = @_; 3084 my ($self, $ev) = @_;
2918 3085
2919 $self->_emit ("popdown"); 3086 $self->emit ("popdown");
2920 3087
2921 # maybe save $GRAB? must be careful about events... 3088 # maybe save $GRAB? must be careful about events...
2922 $GRAB = $self; 3089 $GRAB = $self;
2923 $self->{button} = $ev->{button}; 3090 $self->{button} = $ev->{button};
2924 3091
2925 $self->show; 3092 $self->show;
2926 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3093 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2927} 3094}
2928 3095
2929sub mouse_motion { 3096sub invoke_mouse_motion {
2930 my ($self, $ev, $x, $y) = @_; 3097 my ($self, $ev, $x, $y) = @_;
2931 3098
2932 # TODO: should use vbox->find_widget or so 3099 # TODO: should use vbox->find_widget or so
2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3100 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2934 $self->{hover} = $self->{item}{$HOVER}; 3101 $self->{hover} = $self->{item}{$HOVER};
2935 3102
2936 0 3103 0
2937} 3104}
2938 3105
2939sub button_up { 3106sub invoke_button_up {
2940 my ($self, $ev, $x, $y) = @_; 3107 my ($self, $ev, $x, $y) = @_;
2941 3108
2942 if ($ev->{button} == $self->{button}) { 3109 if ($ev->{button} == $self->{button}) {
2943 undef $GRAB; 3110 undef $GRAB;
2944 $self->hide; 3111 $self->hide;
2945 3112
2946 $self->_emit ("popdown"); 3113 $self->emit ("popdown");
2947 $self->{hover}[1]->() if $self->{hover}; 3114 $self->{hover}[1]->() if $self->{hover};
2948 } else { 3115 } else {
2949 return 0 3116 return 0
2950 } 3117 }
2951 3118
… …
2978 3145
2979 $self->{current} = $self->{children}[0] 3146 $self->{current} = $self->{children}[0]
2980 if @{ $self->{children} }; 3147 if @{ $self->{children} };
2981} 3148}
2982 3149
3150sub get_current_page {
3151 my ($self) = @_;
3152
3153 $self->{current}
3154}
3155
2983sub set_current_page { 3156sub set_current_page {
2984 my ($self, $page_or_widget) = @_; 3157 my ($self, $page_or_widget) = @_;
2985 3158
2986 my $widget = ref $page_or_widget 3159 my $widget = ref $page_or_widget
2987 ? $page_or_widget 3160 ? $page_or_widget
2988 : $self->{children}[$page_or_widget]; 3161 : $self->{children}[$page_or_widget];
2989 3162
2990 $self->{current} = $widget; 3163 $self->{current} = $widget;
2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3164 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992 3165
2993 $self->_emit (page_changed => $self->{current}); 3166 $self->emit (page_changed => $self->{current});
2994 3167
2995 $self->realloc; 3168 $self->realloc;
2996} 3169}
2997 3170
2998sub visible_children { 3171sub visible_children {
… …
3003 my ($self) = @_; 3176 my ($self) = @_;
3004 3177
3005 $self->{current}->size_request 3178 $self->{current}->size_request
3006} 3179}
3007 3180
3008sub size_allocate { 3181sub invoke_size_allocate {
3009 my ($self, $w, $h) = @_; 3182 my ($self, $w, $h) = @_;
3010 3183
3011 $self->{current}->configure (0, 0, $w, $h); 3184 $self->{current}->configure (0, 0, $w, $h);
3185
3186 1
3012} 3187}
3013 3188
3014sub _draw { 3189sub _draw {
3015 my ($self) = @_; 3190 my ($self) = @_;
3016 3191
… …
3051 ); 3226 );
3052 3227
3053 $self->{multiplexer}->add ($widget); 3228 $self->{multiplexer}->add ($widget);
3054} 3229}
3055 3230
3231sub get_current_page {
3232 my ($self) = @_;
3233
3234 $self->{multiplexer}->get_current_page
3235}
3236
3056sub set_current_page { 3237sub set_current_page {
3057 my ($self, $page) = @_; 3238 my ($self, $page) = @_;
3058 3239
3059 $self->{multiplexer}->set_current_page ($page); 3240 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current}); 3241 $self->emit (page_changed => $self->{multiplexer}{current});
3061} 3242}
3062 3243
3063############################################################################# 3244#############################################################################
3064 3245
3065package CFClient::UI::Statusbox; 3246package CFClient::UI::Combobox;
3066 3247
3248use utf8;
3249
3067our @ISA = CFClient::UI::VBox::; 3250our @ISA = CFClient::UI::Button::;
3068 3251
3069sub new { 3252sub new {
3070 my $class = shift; 3253 my $class = shift;
3071 3254
3072 $class->SUPER::new ( 3255 my $self = $class->SUPER::new (
3256 options => [], # [value, title, longdesc], ...
3257 value => undef,
3258 @_,
3259 );
3260
3261 $self->_set_value ($self->{value});
3262
3263 $self
3264}
3265
3266sub invoke_button_down {
3267 my ($self, $ev) = @_;
3268
3269 my @menu_items;
3270
3271 for (@{ $self->{options} }) {
3272 my ($value, $title, $tooltip) = @$_;
3273
3274 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3275 }
3276
3277 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3278}
3279
3280sub _set_value {
3281 my ($self, $value) = @_;
3282
3283 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3284 or return;
3285
3286 $self->{value} = $item->[0];
3287 $self->set_markup ("$item->[1] ⇓");
3288 $self->set_tooltip ($item->[2]);
3289}
3290
3291sub set_value {
3292 my ($self, $value) = @_;
3293
3294 return unless $self->{value} ne $value;
3295
3296 $self->_set_value ($value);
3297 $self->emit (changed => $value);
3298}
3299
3300#############################################################################
3301
3302package CFClient::UI::Statusbox;
3303
3304our @ISA = CFClient::UI::VBox::;
3305
3306sub new {
3307 my $class = shift;
3308
3309 my $self = $class->SUPER::new (
3073 fontsize => 0.8, 3310 fontsize => 0.8,
3074 @_, 3311 @_,
3075 ) 3312 );
3313
3314 Scalar::Util::weaken (my $this = $self);
3315
3316 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3317
3318 $self
3076} 3319}
3077 3320
3078sub reorder { 3321sub reorder {
3079 my ($self) = @_; 3322 my ($self) = @_;
3080 my $NOW = time; 3323 my $NOW = Time::HiRes::time;
3324
3325 # freeze display when hovering over any label
3326 return if $CFClient::UI::TOOLTIP->{owner}
3327 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3328 values %{ $self->{item} };
3081 3329
3082 while (my ($k, $v) = each %{ $self->{item} }) { 3330 while (my ($k, $v) = each %{ $self->{item} }) {
3083 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3331 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3084 } 3332 }
3085 3333
… …
3088 my @items = sort { 3336 my @items = sort {
3089 $a->{pri} <=> $b->{pri} 3337 $a->{pri} <=> $b->{pri}
3090 or $b->{id} <=> $a->{id} 3338 or $b->{id} <=> $a->{id}
3091 } values %{ $self->{item} }; 3339 } values %{ $self->{item} };
3092 3340
3341 $self->{timer}->interval (1);
3342
3093 my $count = 10 + 1; 3343 my $count = 10 + 1;
3094 for my $item (@items) { 3344 for my $item (@items) {
3095 last unless --$count; 3345 last unless --$count;
3096 3346
3097 push @widgets, $item->{label} ||= do { 3347 my $label = $item->{label} ||= do {
3098 # TODO: doesn't handle markup well (read as: at all) 3348 # TODO: doesn't handle markup well (read as: at all)
3099 my $short = $item->{count} > 1 3349 my $short = $item->{count} > 1
3100 ? "<b>$item->{count} ×</b> $item->{text}" 3350 ? "<b>$item->{count} ×</b> $item->{text}"
3101 : $item->{text}; 3351 : $item->{text};
3102 3352
… …
3110 tooltip => $item->{tooltip}, 3360 tooltip => $item->{tooltip},
3111 tooltip_font => $::FONT_PROP, 3361 tooltip_font => $::FONT_PROP,
3112 tooltip_width => 0.67, 3362 tooltip_width => 0.67,
3113 fontsize => $item->{fontsize} || $self->{fontsize}, 3363 fontsize => $item->{fontsize} || $self->{fontsize},
3114 max_w => $::WIDTH * 0.44, 3364 max_w => $::WIDTH * 0.44,
3115 fg => $item->{fg}, 3365 fg => [@{ $item->{fg} }],
3116 can_events => 1, 3366 can_events => 1,
3117 can_hover => 1 3367 can_hover => 1
3118 }; 3368 };
3369
3370 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3371 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3372 $label->update;
3373 $label->set_max_size (undef, $label->{req_h} * $diff)
3374 if $diff < 1;
3375 $self->{timer}->interval (1/30);
3376 } else {
3377 $label->{fg}[3] = $item->{fg}[3] || 1;
3378 }
3379
3380 push @widgets, $label;
3119 } 3381 }
3120 3382
3121 $self->clear; 3383 $self->clear;
3122 $self->SUPER::add (reverse @widgets); 3384 $self->SUPER::add (reverse @widgets);
3123} 3385}
… …
3128 $text =~ s/^\s+//; 3390 $text =~ s/^\s+//;
3129 $text =~ s/\s+$//; 3391 $text =~ s/\s+$//;
3130 3392
3131 return unless $text; 3393 return unless $text;
3132 3394
3133 my $timeout = time + ((delete $arg{timeout}) || 60); 3395 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3134 3396
3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3397 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3136 3398
3137 if (my $item = $self->{item}{$group}) { 3399 if (my $item = $self->{item}{$group}) {
3138 if ($item->{text} eq $text) { 3400 if ($item->{text} eq $text) {
3139 $item->{count}++; 3401 $item->{count}++;
3140 } else { 3402 } else {
3141 $item->{count} = 1; 3403 $item->{count} = 1;
3142 $item->{text} = $item->{tooltip} = $text; 3404 $item->{text} = $item->{tooltip} = $text;
3143 } 3405 }
3144 $item->{id} = ++$self->{id}; 3406 $item->{id} += 0.2;#d#
3145 $item->{timeout} = $timeout; 3407 $item->{timeout} = $timeout;
3146 delete $item->{label}; 3408 delete $item->{label};
3147 } else { 3409 } else {
3148 $self->{item}{$group} = { 3410 $self->{item}{$group} = {
3149 id => ++$self->{id}, 3411 id => ++$self->{id},
… …
3155 count => 1, 3417 count => 1,
3156 %arg, 3418 %arg,
3157 }; 3419 };
3158 } 3420 }
3159 3421
3422 $ROOT->on_refresh (reorder => sub {
3160 $self->reorder; 3423 $self->reorder;
3424 });
3161} 3425}
3162 3426
3163sub reconfigure { 3427sub reconfigure {
3164 my ($self) = @_; 3428 my ($self) = @_;
3165 3429
… …
3168 3432
3169 $self->reorder; 3433 $self->reorder;
3170 $self->SUPER::reconfigure; 3434 $self->SUPER::reconfigure;
3171} 3435}
3172 3436
3437sub destroy {
3438 my ($self) = @_;
3439
3440 $self->{timer}->cancel;
3441
3442 $self->SUPER::destroy;
3443}
3444
3173############################################################################# 3445#############################################################################
3174 3446
3175package CFClient::UI::Inventory; 3447package CFClient::UI::Inventory;
3176 3448
3177our @ISA = CFClient::UI::ScrolledWindow::; 3449our @ISA = CFClient::UI::Table::;
3178 3450
3179sub new { 3451sub new {
3180 my $class = shift; 3452 my $class = shift;
3181 3453
3182 my $self = $class->SUPER::new ( 3454 my $self = $class->SUPER::new (
3183 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3455 col_expand => [0, 1, 0],
3184 @_, 3456 @_,
3185 ); 3457 );
3186 3458
3187 $self 3459 $self
3188} 3460}
3189 3461
3190sub set_items { 3462sub set_items {
3191 my ($self, $items) = @_; 3463 my ($self, $items) = @_;
3192 3464
3193 $self->{child}->clear; 3465 $self->clear;
3194 return unless $items; 3466 return unless $items;
3195 3467
3196 my @items = sort { 3468 my @items = sort {
3197 ($a->{type} <=> $b->{type}) 3469 ($a->{type} <=> $b->{type})
3198 or ($a->{name} cmp $b->{name}) 3470 or ($a->{name} cmp $b->{name})
3199 } @$items; 3471 } values %$items;
3200 3472
3201 $self->{real_items} = \@items; 3473 $self->{real_items} = \@items;
3202 3474
3203 my $row = 0; 3475 my $row = 0;
3204 for my $item (@items) { 3476 for my $item (@items) {
3205 CFClient::Item::update_widgets $item; 3477 CFClient::Item::update_widgets $item;
3206 3478
3207 $self->{child}->add (0, $row, $item->{face_widget}); 3479 $self->add (0, $row, $item->{face_widget});
3208 $self->{child}->add (1, $row, $item->{desc_widget}); 3480 $self->add (1, $row, $item->{desc_widget});
3209 $self->{child}->add (2, $row, $item->{weight_widget}); 3481 $self->add (2, $row, $item->{weight_widget});
3210 3482
3211 $row++; 3483 $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 } 3484 }
3410} 3485}
3411 3486
3412############################################################################# 3487#############################################################################
3413 3488
… …
3423 commands => [], 3498 commands => [],
3424 @_, 3499 @_,
3425 ) 3500 )
3426} 3501}
3427 3502
3428# XXX: Do sorting? Argl... 3503my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3504
3505my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3506 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3507my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3508 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3509my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3510 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3511my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3512 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3513my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3514 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3515
3516sub rebuild_spell_list {
3517 my ($self) = @_;
3518
3519 $CFClient::UI::ROOT->on_refresh ($self => sub {
3520 $self->clear;
3521
3522 return unless $::CONN;
3523
3524 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3525 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3526 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3527 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3528 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3529
3530 my $row = 0;
3531
3532 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3533 my $spell = $self->{spell}{$_};
3534
3535 $row++;
3536
3537 my $spell_cb = sub {
3538 my ($widget, $ev) = @_;
3539
3540 if ($ev->{button} == 1) {
3541 $::CONN->user_send ("cast $spell->{name}");
3542 } elsif ($ev->{button} == 2) {
3543 $::CONN->user_send ("invoke $spell->{name}");
3544 } elsif ($ev->{button} == 3) {
3545 (new CFClient::UI::Menu
3546 items => [
3547 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3548 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3549 ],
3550 )->popup ($ev);
3551 } else {
3552 return 0;
3553 }
3554
3555 1
3556 };
3557
3558 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3559
3560 #TODO: add path info to tooltip
3561 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3562
3563 $self->add (0, $row, new CFClient::UI::Face
3564 face => $spell->{face},
3565 can_hover => 1,
3566 can_events => 1,
3567 tooltip => $tooltip,
3568 on_button_down => $spell_cb,
3569 );
3570
3571 $self->add (1, $row, new CFClient::UI::Label
3572 expand => 1,
3573 text => $spell->{name},
3574 can_hover => 1,
3575 can_events => 1,
3576 tooltip => $tooltip,
3577 on_button_down => $spell_cb,
3578 );
3579
3580 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3581 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3582 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3583 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3584 }
3585 });
3586}
3587
3429sub add_spell { 3588sub add_spell {
3430 my ($self, $spell) = @_; 3589 my ($self, $spell) = @_;
3590
3431 $self->{spells}->{$spell->{name}} = $spell; 3591 $self->{spell}->{$spell->{name}} = $spell;
3432 3592 $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} 3593}
3461 3594
3462sub remove_spell { 3595sub remove_spell {
3463 my ($self, $spell) = @_; 3596 my ($self, $spell) = @_;
3597
3464 delete $self->{spells}->{$spell->{name}}; 3598 delete $self->{spell}->{$spell->{name}};
3465 $self->rebuild_spell_list; 3599 $self->rebuild_spell_list;
3466} 3600}
3467 3601
3602sub clear_spells {
3603 my ($self) = @_;
3604
3605 $self->{spell} = {};
3606 $self->rebuild_spell_list;
3607}
3608
3468############################################################################# 3609#############################################################################
3469 3610
3470package CFClient::UI::Root; 3611package CFClient::UI::Root;
3471 3612
3472our @ISA = CFClient::UI::Container::; 3613our @ISA = CFClient::UI::Container::;
3614
3615use List::Util qw(min max);
3473 3616
3474use CFClient::OpenGL; 3617use CFClient::OpenGL;
3475 3618
3476sub new { 3619sub new {
3477 my $class = shift; 3620 my $class = shift;
… …
3504 $coord = $max - $size if $coord > $max - $size; 3647 $coord = $max - $size if $coord > $max - $size;
3505 3648
3506 int $coord + 0.5 3649 int $coord + 0.5
3507} 3650}
3508 3651
3509sub size_allocate { 3652sub invoke_size_allocate {
3510 my ($self, $w, $h) = @_; 3653 my ($self, $w, $h) = @_;
3511 3654
3512 for my $child ($self->children) { 3655 for my $child ($self->children) {
3513 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3656 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3514 3657
… …
3518 $X = _to_pixel $X, $W, $self->{w}; 3661 $X = _to_pixel $X, $W, $self->{w};
3519 $Y = _to_pixel $Y, $H, $self->{h}; 3662 $Y = _to_pixel $Y, $H, $self->{h};
3520 3663
3521 $child->configure ($X, $Y, $W, $H); 3664 $child->configure ($X, $Y, $W, $H);
3522 } 3665 }
3666
3667 1
3523} 3668}
3524 3669
3525sub coord2local { 3670sub coord2local {
3526 my ($self, $x, $y) = @_; 3671 my ($self, $x, $y) = @_;
3527 3672
… …
3612 3757
3613 delete $queue{$widget+0}; 3758 delete $queue{$widget+0};
3614 3759
3615 my ($w, $h) = $widget->size_request; 3760 my ($w, $h) = $widget->size_request;
3616 3761
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3762 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3763 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3764
3765 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3766 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3619 3767
3620 $w = $widget->{force_w} if exists $widget->{force_w}; 3768 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h}; 3769 $h = $widget->{force_h} if exists $widget->{force_h};
3622 3770
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3771 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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