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.323 by root, Wed Jul 5 03:01:01 2006 UTC

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

Diff Legend

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