ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.280 by root, Mon Jun 5 01:22:08 2006 UTC vs.
Revision 1.330 by root, Sun Jul 23 04:37:51 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}
… …
78sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 81 if $FOCUS;
81} 82}
82 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
83sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
84 my ($ev) = @_; 98 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
86 100
87 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
88 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
89 103
90 $GRAB = $widget; 104 $GRAB = $widget;
91 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
92 106
93 check_tooltip; 107 $TOOLTIP_WATCHER->cb->();
94 } 108 }
95 109
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 111
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
99 if $GRAB; 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
100} 122}
101 123
102sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
103 my ($ev) = @_; 125 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 126
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 128
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 130
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
111 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 133
113 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 136 $grab->update if $grab;
116 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
117 138
118 check_tooltip; 139 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->();
119 } 141 }
120} 142}
121 143
122sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
123 my ($ev) = @_; 145 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
125 147
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 149
128 if ($widget != $HOVER) { 150 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 151
131 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 153 if $HOVER;
139} 154}
140 155
141# convert position array to integers 156# convert position array to integers
142sub harmonize { 157sub harmonize {
… …
188 203
189 } 204 }
190 } 205 }
191 206
192 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
193} 216}
194 217
195############################################################################# 218#############################################################################
196 219
197package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
271 294
272 return unless $self->{visible}; 295 return unless $self->{visible};
273 296
274 $_->set_invisible for $self->children; 297 $_->set_invisible for $self->children;
275 298
299 delete $self->{visible};
276 delete $self->{root}; 300 delete $self->{root};
277 delete $self->{visible};
278 301
279 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
281 304
282 CFClient::UI::check_tooltip 305 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 306 if $TOOLTIP->{owner} == $self;
284 307
285 $self->focus_out; 308 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 309 $self->emit (visibility_change => 0);
288} 310}
289 311
290sub set_visibility { 312sub set_visibility {
291 my ($self, $visible) = @_; 313 my ($self, $visible) = @_;
… …
314} 336}
315 337
316sub move_abs { 338sub move_abs {
317 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
318 340
319 $self->{x} = List::Util::max 0, int $x; 341 $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; 342 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
322 344
323 $self->update; 345 $self->update;
324} 346}
325 347
… …
333} 355}
334 356
335sub size_request { 357sub size_request {
336 require Carp; 358 require Carp;
337 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
360}
361
362sub baseline_shift {
363 0
338} 364}
339 365
340sub configure { 366sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
342 368
… …
366 392
367 $self->{root}{size_alloc}{$self+0} = $self; 393 $self->{root}{size_alloc}{$self+0} = $self;
368 } 394 }
369} 395}
370 396
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 397sub children {
376 # nop 398 # nop
377} 399}
378 400
379sub visible_children { 401sub visible_children {
… …
381} 403}
382 404
383sub set_max_size { 405sub set_max_size {
384 my ($self, $w, $h) = @_; 406 my ($self, $w, $h) = @_;
385 407
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 408 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 409 $self->{max_h} = int $h if defined $h;
388 410
389 $self->realloc; 411 $self->realloc;
390} 412}
391 413
392sub set_tooltip { 414sub set_tooltip {
… …
399 421
400 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
401 423
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFClient::UI::TOOLTIP->{owner};
404 CFClient::UI::check_tooltip; 426 $CFClient::UI::TOOLTIP_WATCHER->cb->();
405 } 427 }
406} 428}
407 429
408# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
409sub coord2local { 431sub coord2local {
… …
417 my ($self, $x, $y) = @_; 439 my ($self, $x, $y) = @_;
418 440
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 441 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 442}
421 443
422sub focus_in { 444sub invoke_focus_in {
423 my ($self) = @_; 445 my ($self) = @_;
424 446
425 return if $FOCUS == $self; 447 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 448 return unless $self->{can_focus};
427 449
428 my $focus = $FOCUS; $FOCUS = $self; 450 $FOCUS = $self;
429 451
430 $self->_emit (focus_in => $focus); 452 $self->update;
431 453
432 $focus->update if $focus; 454 0
433 $FOCUS->update;
434} 455}
435 456
436sub focus_out { 457sub invoke_focus_out {
437 my ($self) = @_; 458 my ($self) = @_;
438 459
439 return unless $FOCUS == $self; 460 return unless $FOCUS == $self;
440 461
441 my $focus = $FOCUS; undef $FOCUS; 462 undef $FOCUS;
442 463
443 $self->_emit (focus_out => $focus); 464 $self->update;
444 465
445 $focus->update if $focus; #?
446
447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 466 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
448 unless $FOCUS; 467 unless $FOCUS;
449}
450 468
469 0
470}
471
472sub grab_focus {
473 my ($self) = @_;
474
475 $FOCUS->emit ("focus_out") if $FOCUS;
476 $self->emit ("focus_in");
477}
478
451sub mouse_motion { 0 } 479sub invoke_mouse_motion { 0 }
452sub button_up { 0 } 480sub invoke_button_up { 0 }
453sub key_down { 0 } 481sub invoke_key_down { 0 }
454sub key_up { 0 } 482sub invoke_key_up { 0 }
483sub invoke_mouse_wheel { 0 }
455 484
456sub button_down { 485sub invoke_button_down {
457 my ($self, $ev, $x, $y) = @_; 486 my ($self, $ev, $x, $y) = @_;
458 487
459 $self->focus_in; 488 $self->grab_focus;
460 489
461 0 490 0
491}
492
493sub connect {
494 my ($self, $signal, $cb) = @_;
495
496 push @{ $self->{signal_cb}{$signal} }, $cb;
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 my @append
503 = ref $args[0] && $args[0]->isa ("CFClient::UI::Event")
504 ? $args[0]->xy ($self)
505 : ();
506
507 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
508
509 #d##TODO# stop propagating at first true, do not use sum
510 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
511 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
512 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
462} 513}
463 514
464sub find_widget { 515sub find_widget {
465 my ($self, $x, $y) = @_; 516 my ($self, $x, $y) = @_;
466 517
… …
476sub set_parent { 527sub set_parent {
477 my ($self, $parent) = @_; 528 my ($self, $parent) = @_;
478 529
479 Scalar::Util::weaken ($self->{parent} = $parent); 530 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible}; 531 $self->set_visible if $parent->{visible};
481}
482
483sub connect {
484 my ($self, $signal, $cb) = @_;
485
486 push @{ $self->{signal_cb}{$signal} }, $cb;
487}
488
489sub _emit {
490 my ($self, $signal, @args) = @_;
491
492 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493}
494
495sub emit {
496 my ($self, $signal, @args) = @_;
497
498 $self->_emit ($signal, @args)
499 || $self->$signal (@args);
500}
501
502sub visibility_change {
503 #my ($self, $visible) = @_;
504} 532}
505 533
506sub realloc { 534sub realloc {
507 my ($self) = @_; 535 my ($self) = @_;
508 536
… …
541 return unless $self->{h} && $self->{w}; 569 return unless $self->{h} && $self->{w};
542 570
543 # update screen rectangle 571 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x}; 572 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y}; 573 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548 574
549 # skip widgets that are entirely outside the drawing area 575 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 576 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 577 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
552 578
… …
591} 617}
592 618
593sub DESTROY { 619sub DESTROY {
594 my ($self) = @_; 620 my ($self) = @_;
595 621
622 return if CFClient::in_destruct;
623
596 delete $WIDGET{$self+0}; 624 delete $WIDGET{$self+0};
597 #$self->deactivate; 625
626 eval { $self->destroy };
627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598} 628}
599 629
600############################################################################# 630#############################################################################
601 631
602package CFClient::UI::DrawBG; 632package CFClient::UI::DrawBG;
… …
767} 797}
768 798
769sub add { 799sub add {
770 my ($self, $child) = @_; 800 my ($self, $child) = @_;
771 801
772 $self->{children} = []; 802 $self->SUPER::remove ($_) for @{ $self->{children} };
773
774 $self->SUPER::add ($child); 803 $self->SUPER::add ($child);
775} 804}
776 805
777sub remove { 806sub remove {
778 my ($self, $widget) = @_; 807 my ($self, $widget) = @_;
… …
787 816
788sub size_request { 817sub size_request {
789 $_[0]{children}[0]->size_request 818 $_[0]{children}[0]->size_request
790} 819}
791 820
792sub size_allocate { 821sub invoke_size_allocate {
793 my ($self, $w, $h) = @_; 822 my ($self, $w, $h) = @_;
794 823
795 $self->{children}[0]->configure (0, 0, $w, $h); 824 $self->{children}[0]->configure (0, 0, $w, $h);
825
826 1
796} 827}
797 828
798############################################################################# 829#############################################################################
799 830
800# back-buffered drawing area 831# back-buffered drawing area
… …
816 847
817 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 848 $ROOT->on_post_alloc ($self => sub { $self->render_child });
818 $self->SUPER::update; 849 $self->SUPER::update;
819} 850}
820 851
821sub size_allocate { 852sub invoke_size_allocate {
822 my ($self, $w, $h) = @_; 853 my ($self, $w, $h) = @_;
823 854
824 $self->SUPER::size_allocate ($w, $h);
825 $self->update; 855 $self->update;
856
857 $self->SUPER::invoke_size_allocate ($w, $h)
826} 858}
827 859
828sub _render { 860sub _render {
829 my ($self) = @_; 861 my ($self) = @_;
830 862
… …
891 $h = 10 if $self->{scroll_y}; 923 $h = 10 if $self->{scroll_y};
892 924
893 ($w, $h) 925 ($w, $h)
894} 926}
895 927
896sub size_allocate { 928sub invoke_size_allocate {
897 my ($self, $w, $h) = @_; 929 my ($self, $w, $h) = @_;
898 930
899 my $child = $self->child; 931 my $child = $self->child;
900 932
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 933 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 934 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903 935
904 $self->child->configure (0, 0, $w, $h); 936 $self->child->configure (0, 0, $w, $h);
905 $self->update; 937 $self->update;
938
939 1
906} 940}
907 941
908sub set_offset { 942sub set_offset {
909 my ($self, $x, $y) = @_; 943 my ($self, $x, $y) = @_;
910 944
… …
973 $self->{vp}->set_offset (0, $_[1]); 1007 $self->{vp}->set_offset (0, $_[1]);
974 }, 1008 },
975 ; 1009 ;
976 1010
977 $self = $class->SUPER::new ( 1011 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1012 vp => (new CFClient::UI::ViewPort expand => 1),
1013 can_events => 1,
979 slider => $slider, 1014 slider => $slider,
980 %arg, 1015 %arg,
981 ); 1016 );
982 1017
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1018 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child; 1019 $self->add ($child) if $child;
985 1020
986 $self 1021 $self
987} 1022}
988 1023
1024#TODO# update range on size_allocate depending on child
1025
989sub add { 1026sub add {
990 my ($self, $widget) = @_; 1027 my ($self, $widget) = @_;
991 1028
992 $self->{vp}->add ($self->{child} = $widget); 1029 $self->{vp}->add ($self->{child} = $widget);
993} 1030}
994 1031
1032sub invoke_mouse_wheel {
1033 my ($self, $ev) = @_;
1034
1035 return 0 unless $ev->{dy}; # only vertical movements
1036
1037 $self->{slider}->emit (mouse_wheel => $ev);
1038
1039 1
1040}
1041
1042sub update_slider {
1043 my ($self) = @_;
1044
1045 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1046}
1047
995sub update { 1048sub update {
996 my ($self) = @_; 1049 my ($self) = @_;
997 1050
998 $self->SUPER::update; 1051 $self->SUPER::update;
999 1052
1000 # todo: overwrite size_allocate of child 1053 $self->update_slider;
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003} 1054}
1004 1055
1005sub size_allocate { 1056sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1057 my ($self, $w, $h) = @_;
1007 1058
1059 $self->update_slider;
1060
1008 $self->SUPER::size_allocate ($w, $h); 1061 $self->SUPER::invoke_size_allocate ($w, $h)
1009
1010 my $child = $self->{vp}->child;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012} 1062}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1063
1017############################################################################# 1064#############################################################################
1018 1065
1019package CFClient::UI::Frame; 1066package CFClient::UI::Frame;
1020 1067
… …
1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1118 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072 1119
1073sub new { 1120sub new {
1074 my ($class, %arg) = @_; 1121 my ($class, %arg) = @_;
1075 1122
1076 my $title = delete $arg{title};
1077
1078 my $self = $class->SUPER::new ( 1123 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1124 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1125 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1126 border => 0.6,
1082 can_events => 1, 1127 can_events => 1,
1083 min_w => 16, 1128 min_w => 64,
1084 min_h => 16, 1129 min_h => 32,
1085 %arg, 1130 %arg,
1086 ); 1131 );
1087 1132
1088 $self->{title} = new CFClient::UI::Label 1133 $self->{title_widget} = new CFClient::UI::Label
1089 align => 0, 1134 align => 0,
1090 valign => 1, 1135 valign => 1,
1091 text => $title, 1136 text => $self->{title},
1092 fontsize => $self->{border} 1137 fontsize => $self->{border},
1093 if defined $title; 1138 if exists $self->{title};
1139
1140 if ($self->{has_close_button}) {
1141 $self->{close_button} =
1142 new CFClient::UI::ImageButton
1143 path => 'x1_close.png',
1144 on_activate => sub { $self->emit ("delete") };
1145
1146 $self->CFClient::UI::Container::add ($self->{close_button});
1147 }
1094 1148
1095 $self 1149 $self
1096} 1150}
1097 1151
1098sub add { 1152sub add {
1099 my ($self, @widgets) = @_; 1153 my ($self, @widgets) = @_;
1100 1154
1101 $self->SUPER::add (@widgets); 1155 $self->SUPER::add (@widgets);
1156 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1157 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1158}
1104 1159
1105sub border { 1160sub border {
1106 int $_[0]{border} * $::FONTSIZE 1161 int $_[0]{border} * $::FONTSIZE
1107} 1162}
1108 1163
1109sub size_request { 1164sub size_request {
1110 my ($self) = @_; 1165 my ($self) = @_;
1111 1166
1112 $self->{title}->size_request 1167 $self->{title_widget}->size_request
1113 if $self->{title}; 1168 if $self->{title_widget};
1169
1170 $self->{close_button}->size_request
1171 if $self->{close_button};
1114 1172
1115 my ($w, $h) = $self->SUPER::size_request; 1173 my ($w, $h) = $self->SUPER::size_request;
1116 1174
1117 ( 1175 (
1118 $w + $self->border * 2, 1176 $w + $self->border * 2,
1119 $h + $self->border * 2, 1177 $h + $self->border * 2,
1120 ) 1178 )
1121} 1179}
1122 1180
1123sub size_allocate { 1181sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
1125 1183
1126 if ($self->{title}) { 1184 if ($self->{title_widget}) {
1127 $self->{title}{w} = $w; 1185 $self->{title_widget}{w} = $w;
1128 $self->{title}{h} = $h; 1186 $self->{title_widget}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h); 1187 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1188 }
1131 1189
1132 my $border = $self->border; 1190 my $border = $self->border;
1133 1191
1134 $h -= List::Util::max 0, $border * 2; 1192 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1193 $w -= List::Util::max 0, $border * 2;
1194
1195 $self->child->configure ($border, $border, $w, $h);
1196
1197 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1198 if $self->{close_button};
1199
1200 1
1201}
1202
1203sub invoke_delete {
1204 my ($self) = @_;
1205
1206 $self->hide;
1136 1207
1137 $self->child->configure ($border, $border, $w, $h); 1208 1
1138} 1209}
1139 1210
1140sub button_down { 1211sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1142 1213
1143 my ($w, $h) = @$self{qw(w h)}; 1214 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1215 my $border = $self->border;
1145 1216
… …
1176 1247
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1248 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1249
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1250 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1251 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1252 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1253 };
1183 } else { 1254 } else {
1184 return 0; 1255 return 0;
1185 } 1256 }
1186 1257
1187 1 1258 1
1188} 1259}
1189 1260
1190sub button_up { 1261sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1262 my ($self, $ev, $x, $y) = @_;
1192 1263
1193 !!delete $self->{motion} 1264 ! ! delete $self->{motion}
1194} 1265}
1195 1266
1196sub mouse_motion { 1267sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1268 my ($self, $ev, $x, $y) = @_;
1198 1269
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1270 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1271
1201 !!$self->{motion} 1272 ! ! $self->{motion}
1202} 1273}
1203 1274
1204sub _draw { 1275sub _draw {
1205 my ($self) = @_; 1276 my ($self) = @_;
1206 1277
… …
1232 1303
1233 glDisable GL_TEXTURE_2D; 1304 glDisable GL_TEXTURE_2D;
1234 1305
1235 $child->draw; 1306 $child->draw;
1236 1307
1237 if ($self->{title}) { 1308 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1309 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1310 $self->{title_widget}->_draw;
1311
1312 glTranslate 0, - ($border - $self->{h});
1240 } 1313 }
1314
1315 $self->{close_button}->draw
1316 if $self->{close_button};
1241} 1317}
1242 1318
1243############################################################################# 1319#############################################################################
1244 1320
1245package CFClient::UI::Table; 1321package CFClient::UI::Table;
… …
1268 1344
1269 $child->set_parent ($self); 1345 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1346 $self->{children}[$y][$x] = $child;
1271 1347
1272 $self->realloc; 1348 $self->realloc;
1349}
1350
1351sub remove {
1352 my ($self, $child) = @_;
1353
1354 # TODO: not yet implemented
1273} 1355}
1274 1356
1275# TODO: move to container class maybe? send children a signal on removal? 1357# TODO: move to container class maybe? send children a signal on removal?
1276sub clear { 1358sub clear {
1277 my ($self) = @_; 1359 my ($self) = @_;
… …
1318 (sum @$ws), 1400 (sum @$ws),
1319 (sum @$hs), 1401 (sum @$hs),
1320 ) 1402 )
1321} 1403}
1322 1404
1323sub size_allocate { 1405sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1406 my ($self, $w, $h) = @_;
1325 1407
1326 my ($ws, $hs) = $self->get_wh; 1408 my ($ws, $hs) = $self->get_wh;
1327 1409
1328 my $req_w = (sum @$ws) || 1; 1410 my $req_w = (sum @$ws) || 1;
… …
1360 } 1442 }
1361 1443
1362 $y += $row_h; 1444 $y += $row_h;
1363 } 1445 }
1364 1446
1447 1
1365} 1448}
1366 1449
1367sub find_widget { 1450sub find_widget {
1368 my ($self, $x, $y) = @_; 1451 my ($self, $x, $y) = @_;
1369 1452
… …
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1489 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1490 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 ) 1491 )
1409} 1492}
1410 1493
1411sub size_allocate { 1494sub invoke_size_allocate {
1412 my ($self, $w, $h) = @_; 1495 my ($self, $w, $h) = @_;
1413 1496
1414 my $space = $self->{vertical} ? $h : $w; 1497 my $space = $self->{vertical} ? $h : $w;
1415 my $children = $self->{children}; 1498 my @children = $self->visible_children;
1416 1499
1417 my @req; 1500 my @req;
1418 1501
1419 if ($self->{homogeneous}) { 1502 if ($self->{homogeneous}) {
1420 @req = ($space / (@$children || 1)) x @$children; 1503 @req = ($space / (@children || 1)) x @children;
1421 } else { 1504 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1505 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423 my $req = List::Util::sum @req; 1506 my $req = List::Util::sum @req;
1424 1507
1425 if ($req > $space) { 1508 if ($req > $space) {
1426 # ah well, not enough space 1509 # ah well, not enough space
1427 $_ *= $space / $req for @req; 1510 $_ *= $space / $req for @req;
1428 } else { 1511 } else {
1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1512 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430 1513
1431 $space = ($space - $req) / $expand; # remaining space to give away 1514 $space = ($space - $req) / $expand; # remaining space to give away
1432 1515
1433 $req[$_] += $space * $children->[$_]{expand} 1516 $req[$_] += $space * $children[$_]{expand}
1434 for 0 .. $#$children; 1517 for 0 .. $#children;
1435 } 1518 }
1436 } 1519 }
1437 1520
1438 CFClient::UI::harmonize \@req; 1521 CFClient::UI::harmonize \@req;
1439 1522
1440 my $pos = 0; 1523 my $pos = 0;
1441 for (0 .. $#$children) { 1524 for (0 .. $#children) {
1442 my $alloc = $req[$_]; 1525 my $alloc = $req[$_];
1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1526 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444 1527
1445 $pos += $alloc; 1528 $pos += $alloc;
1446 } 1529 }
1447 1530
1448 1 1531 1
… …
1538 1621
1539 delete $self->{texture}; 1622 delete $self->{texture};
1540 $self->SUPER::update; 1623 $self->SUPER::update;
1541} 1624}
1542 1625
1626sub realloc {
1627 my ($self) = @_;
1628
1629 delete $self->{ox};
1630 $self->SUPER::realloc;
1631}
1632
1543sub set_text { 1633sub set_text {
1544 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1545 1635
1546 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1547 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1548 1638
1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1550 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1551 1640
1641 delete $self->{size_req};
1552 $self->realloc; 1642 $self->realloc;
1553 $self->update; 1643 $self->update;
1554} 1644}
1555 1645
1556sub set_markup { 1646sub set_markup {
… …
1559 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1560 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1561 1651
1562 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1563 1653
1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1565 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1566 1655
1656 delete $self->{size_req};
1567 $self->realloc; 1657 $self->realloc;
1568 $self->update; 1658 $self->update;
1569} 1659}
1570 1660
1571sub size_request { 1661sub size_request {
1572 my ($self) = @_; 1662 my ($self) = @_;
1573 1663
1664 $self->{size_req} ||= do {
1574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1665 $self->{layout}->set_font ($self->{font}) if $self->{font};
1575 $self->{layout}->set_width ($self->{max_w} || -1); 1666 $self->{layout}->set_width ($self->{max_w} || -1);
1576 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1667 $self->{layout}->set_ellipsise ($self->{ellipsise});
1577 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1668 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1578 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1669 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1579 1670
1580 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1581 1672
1582 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1583 $self->{template}->set_font ($self->{font}) if $self->{font}; 1674 $self->{template}->set_font ($self->{font}) if $self->{font};
1675 $self->{template}->set_width ($self->{max_w} || -1);
1584 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1585 1677
1586 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1587 1679
1588 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
1589 $h = List::Util::max $h, $h2; 1681 $h = List::Util::max $h, $h2;
1682 }
1683
1684 [$w, $h]
1590 } 1685 };
1591 1686
1592 ($w, $h) 1687 @{ $self->{size_req} }
1593} 1688}
1594 1689
1690sub baseline_shift {
1691 $_[0]{layout}->descent
1692}
1693
1595sub size_allocate { 1694sub invoke_size_allocate {
1596 my ($self, $w, $h) = @_; 1695 my ($self, $w, $h) = @_;
1597 1696
1598 delete $self->{ox}; 1697 delete $self->{ox};
1599 1698
1600 delete $self->{texture} 1699 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1700 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1701
1702 1
1602} 1703}
1603 1704
1604sub set_fontsize { 1705sub set_fontsize {
1605 my ($self, $fontsize) = @_; 1706 my ($self, $fontsize) = @_;
1606 1707
1607 $self->{fontsize} = $fontsize; 1708 $self->{fontsize} = $fontsize;
1709 delete $self->{size_req};
1608 delete $self->{texture}; 1710 delete $self->{texture};
1609 1711
1610 $self->realloc; 1712 $self->realloc;
1611} 1713}
1612 1714
1715sub reconfigure {
1716 my ($self) = @_;
1717
1718 delete $self->{size_req};
1719 delete $self->{texture};
1720
1721 $self->SUPER::reconfigure;
1722}
1723
1613sub _draw { 1724sub _draw {
1614 my ($self) = @_; 1725 my ($self) = @_;
1615 1726
1616 $self->SUPER::_draw; # draw background, if applicable 1727 $self->SUPER::_draw; # draw background, if applicable
1617 1728
1618 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1619 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1620 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1621 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1622 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1736
1626 new_from_layout CFClient::Texture $self->{layout} 1737 [$self->{layout}->size]
1627 }; 1738 };
1628 1739
1629 unless (exists $self->{ox}) { 1740 unless (exists $self->{ox}) {
1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1741 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1742 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1632 : ($self->{w} - $tex->{w}) * 0.5); 1743 : ($self->{w} - $size->[0]) * 0.5);
1633 1744
1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1636 : ($self->{h} - $tex->{h}) * 0.5); 1747 : ($self->{h} - $size->[1]) * 0.5);
1637 }; 1748 };
1638 1749
1639 glEnable GL_TEXTURE_2D; 1750 my $w = List::Util::min $self->{w} + 4, $size->[0];
1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1751 my $h = List::Util::min $self->{h} + 2, $size->[1];
1641 1752
1642 glColor_premultiply @{$self->{fg}} 1753 $self->{layout}->render ($self->{ox}, $self->{oy});
1643 if $tex->{format} == GL_ALPHA;
1644
1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1646
1647 glDisable GL_TEXTURE_2D;
1648} 1754}
1649 1755
1650############################################################################# 1756#############################################################################
1651 1757
1652package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1666 can_hover => 1, 1772 can_hover => 1,
1667 can_focus => 1, 1773 can_focus => 1,
1668 valign => 0, 1774 valign => 0,
1669 can_events => 1, 1775 can_events => 1,
1670 #text => ... 1776 #text => ...
1777 #hidden => "*",
1671 @_ 1778 @_
1672 ) 1779 )
1673} 1780}
1674 1781
1675sub _set_text { 1782sub _set_text {
… …
1682 $self->{last_activity} = $::NOW; 1789 $self->{last_activity} = $::NOW;
1683 $self->{text} = $text; 1790 $self->{text} = $text;
1684 1791
1685 $text =~ s/./*/g if $self->{hidden}; 1792 $text =~ s/./*/g if $self->{hidden};
1686 $self->{layout}->set_text ("$text "); 1793 $self->{layout}->set_text ("$text ");
1794 delete $self->{size_req};
1687 1795
1688 $self->_emit (changed => $self->{text}); 1796 $self->emit (changed => $self->{text});
1797
1798 $self->realloc;
1689 $self->update; 1799 $self->update;
1690} 1800}
1691 1801
1692sub set_text { 1802sub set_text {
1693 my ($self, $text) = @_; 1803 my ($self, $text) = @_;
1694 1804
1695 $self->{cursor} = length $text; 1805 $self->{cursor} = length $text;
1696 $self->_set_text ($text); 1806 $self->_set_text ($text);
1697
1698 $self->realloc;
1699} 1807}
1700 1808
1701sub get_text { 1809sub get_text {
1702 $_[0]{text} 1810 $_[0]{text}
1703} 1811}
… …
1708 my ($w, $h) = $self->SUPER::size_request; 1816 my ($w, $h) = $self->SUPER::size_request;
1709 1817
1710 ($w + 1, $h) # add 1 for cursor 1818 ($w + 1, $h) # add 1 for cursor
1711} 1819}
1712 1820
1713sub key_down { 1821sub invoke_key_down {
1714 my ($self, $ev) = @_; 1822 my ($self, $ev) = @_;
1715 1823
1716 my $mod = $ev->{mod}; 1824 my $mod = $ev->{mod};
1717 my $sym = $ev->{sym}; 1825 my $sym = $ev->{sym};
1718 my $uni = $ev->{unicode}; 1826 my $uni = $ev->{unicode};
… …
1730 } elsif ($sym == CFClient::SDLK_HOME) { 1838 } elsif ($sym == CFClient::SDLK_HOME) {
1731 $self->{cursor} = 0; 1839 $self->{cursor} = 0;
1732 } elsif ($sym == CFClient::SDLK_END) { 1840 } elsif ($sym == CFClient::SDLK_END) {
1733 $self->{cursor} = length $text; 1841 $self->{cursor} = length $text;
1734 } elsif ($uni == 27) { 1842 } elsif ($uni == 27) {
1735 $self->_emit ('escape'); 1843 $self->emit ('escape');
1736 } elsif ($uni) { 1844 } elsif ($uni) {
1737 substr $text, $self->{cursor}++, 0, chr $uni; 1845 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else { 1846 } else {
1739 return 0; 1847 return 0;
1740 } 1848 }
… …
1744 $self->realloc; 1852 $self->realloc;
1745 1853
1746 1 1854 1
1747} 1855}
1748 1856
1749sub focus_in { 1857sub invoke_focus_in {
1750 my ($self) = @_; 1858 my ($self) = @_;
1751 1859
1752 $self->{last_activity} = $::NOW; 1860 $self->{last_activity} = $::NOW;
1753 1861
1754 $self->SUPER::focus_in; 1862 $self->SUPER::invoke_focus_in
1755} 1863}
1756 1864
1757sub button_down { 1865sub invoke_button_down {
1758 my ($self, $ev, $x, $y) = @_; 1866 my ($self, $ev, $x, $y) = @_;
1759 1867
1760 $self->SUPER::button_down ($ev, $x, $y); 1868 $self->SUPER::invoke_button_down ($ev, $x, $y);
1761 1869
1762 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1763 1871
1764 # byte-index to char-index 1872 # byte-index to char-index
1765 my $text = $self->{text}; 1873 my $text = $self->{text};
1766 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1767 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1768 1876
1769 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1770 $self->update; 1878 $self->update;
1771 1879
1772 1 1880 1
1773} 1881}
1774 1882
1775sub mouse_motion { 1883sub invoke_mouse_motion {
1776 my ($self, $ev, $x, $y) = @_; 1884 my ($self, $ev, $x, $y) = @_;
1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1885# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778 1886
1779 0 1887 1
1780} 1888}
1781 1889
1782sub _draw { 1890sub _draw {
1783 my ($self) = @_; 1891 my ($self) = @_;
1784 1892
… …
1825 1933
1826our @ISA = CFClient::UI::EntryBase::; 1934our @ISA = CFClient::UI::EntryBase::;
1827 1935
1828use CFClient::OpenGL; 1936use CFClient::OpenGL;
1829 1937
1830sub key_down { 1938sub invoke_key_down {
1831 my ($self, $ev) = @_; 1939 my ($self, $ev) = @_;
1832 1940
1833 my $sym = $ev->{sym}; 1941 my $sym = $ev->{sym};
1834 1942
1835 if ($sym == 13) { 1943 if ($sym == 13) {
1836 unshift @{$self->{history}}, 1944 unshift @{$self->{history}},
1837 my $txt = $self->get_text; 1945 my $txt = $self->get_text;
1946
1838 $self->{history_pointer} = -1; 1947 $self->{history_pointer} = -1;
1839 $self->{history_saveback} = ''; 1948 $self->{history_saveback} = '';
1840 $self->_emit (activate => $txt); 1949 $self->emit (activate => $txt);
1841 $self->update; 1950 $self->update;
1842 1951
1843 } elsif ($sym == CFClient::SDLK_UP) { 1952 } elsif ($sym == CFClient::SDLK_UP) {
1844 if ($self->{history_pointer} < 0) { 1953 if ($self->{history_pointer} < 0) {
1845 $self->{history_saveback} = $self->get_text; 1954 $self->{history_saveback} = $self->get_text;
… …
1861 } else { 1970 } else {
1862 $self->set_text ($self->{history_saveback}); 1971 $self->set_text ($self->{history_saveback});
1863 } 1972 }
1864 1973
1865 } else { 1974 } else {
1866 return $self->SUPER::key_down ($ev) 1975 return $self->SUPER::invoke_key_down ($ev)
1867 } 1976 }
1868 1977
1869 1 1978 1
1870} 1979}
1871 1980
… …
1895 can_events => 1, 2004 can_events => 1,
1896 @_ 2005 @_
1897 ) 2006 )
1898} 2007}
1899 2008
1900sub activate { }
1901
1902sub button_up { 2009sub invoke_button_up {
1903 my ($self, $ev, $x, $y) = @_; 2010 my ($self, $ev, $x, $y) = @_;
1904 2011
1905 $self->emit ("activate") 2012 $self->emit ("activate")
1906 if $x >= 0 && $x < $self->{w} 2013 if $x >= 0 && $x < $self->{w}
1907 && $y >= 0 && $y < $self->{h}; 2014 && $y >= 0 && $y < $self->{h};
… …
1921 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2028 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1922 2029
1923 glDisable GL_TEXTURE_2D; 2030 glDisable GL_TEXTURE_2D;
1924 2031
1925 $self->SUPER::_draw; 2032 $self->SUPER::_draw;
2033}
2034
2035#############################################################################
2036
2037package CFClient::UI::ImageButton;
2038
2039our @ISA = CFClient::UI::Image::;
2040
2041use CFClient::OpenGL;
2042
2043my %textures;
2044
2045sub new {
2046 my $class = shift;
2047
2048 my $self = $class->SUPER::new (
2049 padding_x => 4,
2050 padding_y => 4,
2051 fg => [1, 1, 1],
2052 active_fg => [0, 0, 1],
2053 can_hover => 1,
2054 align => 0,
2055 valign => 0,
2056 can_events => 1,
2057 @_
2058 );
2059}
2060
2061sub invoke_button_up {
2062 my ($self, $ev, $x, $y) = @_;
2063
2064 $self->emit ("activate")
2065 if $x >= 0 && $x < $self->{w}
2066 && $y >= 0 && $y < $self->{h};
2067
2068 1
1926} 2069}
1927 2070
1928############################################################################# 2071#############################################################################
1929 2072
1930package CFClient::UI::CheckBox; 2073package CFClient::UI::CheckBox;
… …
1957 my ($self) = @_; 2100 my ($self) = @_;
1958 2101
1959 (6) x 2 2102 (6) x 2
1960} 2103}
1961 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
1962sub button_down { 2113sub invoke_button_down {
1963 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
1964 2115
1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1967 $self->{state} = !$self->{state}; 2118 $self->toggle;
1968 $self->_emit (changed => $self->{state});
1969 } else { 2119 } else {
1970 return 0 2120 return 0
1971 } 2121 }
1972 2122
1973 1 2123 1
… …
1998package CFClient::UI::Image; 2148package CFClient::UI::Image;
1999 2149
2000our @ISA = CFClient::UI::Base::; 2150our @ISA = CFClient::UI::Base::;
2001 2151
2002use CFClient::OpenGL; 2152use CFClient::OpenGL;
2003use Carp qw/confess/;
2004 2153
2005our %loaded_images; 2154our %texture_cache;
2006 2155
2007sub new { 2156sub new {
2008 my $class = shift; 2157 my $class = shift;
2009 2158
2010 my $self = $class->SUPER::new (can_events => 0, @_); 2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
2011 2163
2012 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2164 $self->{path} || $self->{tex}
2165 or Carp::croak "'path' or 'tex' attributes required";
2013 2166
2014 $loaded_images{$self->{image}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2015 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2168 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2016 2169
2017 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
2018 2171
2019 Scalar::Util::weaken $loaded_images{$self->{image}}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2020
2021 $self->{aspect} = $tex->{w} / $tex->{h};
2022 2173
2023 $self 2174 $self
2024} 2175}
2025 2176
2026sub size_request { 2177sub size_request {
2027 my ($self) = @_; 2178 my ($self) = @_;
2028 2179
2029 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
2030} 2181}
2031 2182
2032sub _draw { 2183sub _draw {
2033 my ($self) = @_; 2184 my ($self) = @_;
2034 2185
… …
2143 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
2144 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
2145 2296
2146 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
2147 my $h2 = $self->{h} * (1 - $ycut2); 2298 my $h2 = $self->{h} * (1 - $ycut2);
2299 my $h3 = $self->{h};
2300
2301 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2148 2302
2149 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2304 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2305 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2152 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
… …
2171 2325
2172 if ($t3) { 2326 if ($t3) {
2173 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
2174 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
2175 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2176 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2177 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2178 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2179 glEnd; 2333 glEnd;
2180 } 2334 }
2181 2335
2182 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2270 $self->update; 2424 $self->update;
2271 2425
2272 $self 2426 $self
2273} 2427}
2274 2428
2275sub changed { }
2276
2277sub set_range { 2429sub set_range {
2278 my ($self, $range) = @_; 2430 my ($self, $range) = @_;
2279 2431
2280 ($range, $self->{range}) = ($self->{range}, $range); 2432 ($range, $self->{range}) = ($self->{range}, $range);
2281 2433
2282 $self->update
2283 if "@$range" ne "@{$self->{range}}"; 2434 if ("@$range" ne "@{$self->{range}}") {
2435 $self->update;
2436 $self->set_value ($self->{range}[0]);
2437 }
2284} 2438}
2285 2439
2286sub set_value { 2440sub set_value {
2287 my ($self, $value) = @_; 2441 my ($self, $value) = @_;
2288 2442
… …
2299 if $unit; 2453 if $unit;
2300 2454
2301 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2455 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2302 2456
2303 if ($value != $old_value) { 2457 if ($value != $old_value) {
2304 $self->_emit (changed => $value); 2458 $self->emit (changed => $value);
2305 $self->update; 2459 $self->update;
2306 } 2460 }
2307} 2461}
2308 2462
2309sub size_request { 2463sub size_request {
2310 my ($self) = @_; 2464 my ($self) = @_;
2311 2465
2312 ($self->{req_w}, $self->{req_h}) 2466 ($self->{req_w}, $self->{req_h})
2313} 2467}
2314 2468
2315sub button_down { 2469sub invoke_button_down {
2316 my ($self, $ev, $x, $y) = @_; 2470 my ($self, $ev, $x, $y) = @_;
2317 2471
2318 $self->SUPER::button_down ($ev, $x, $y); 2472 $self->SUPER::invoke_button_down ($ev, $x, $y);
2319 2473
2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2474 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2321 2475
2322 $self->mouse_motion ($ev, $x, $y) 2476 $self->invoke_mouse_motion ($ev, $x, $y)
2323} 2477}
2324 2478
2325sub mouse_motion { 2479sub invoke_mouse_motion {
2326 my ($self, $ev, $x, $y) = @_; 2480 my ($self, $ev, $x, $y) = @_;
2327 2481
2328 if ($GRAB == $self) { 2482 if ($GRAB == $self) {
2329 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2483 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2330 2484
… …
2336 } else { 2490 } else {
2337 return 0; 2491 return 0;
2338 } 2492 }
2339 2493
2340 1 2494 1
2495}
2496
2497sub invoke_mouse_wheel {
2498 my ($self, $ev) = @_;
2499
2500 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501
2502 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2503
2504 ! ! $delta
2341} 2505}
2342 2506
2343sub update { 2507sub update {
2344 my ($self) = @_; 2508 my ($self) = @_;
2345 2509
… …
2435sub set_range { shift->{slider}->set_range (@_) } 2599sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 2600sub set_value { shift->{slider}->set_value (@_) }
2437 2601
2438############################################################################# 2602#############################################################################
2439 2603
2440package CFClient::UI::TextView; 2604package CFClient::UI::TextScroller;
2441 2605
2442our @ISA = CFClient::UI::HBox::; 2606our @ISA = CFClient::UI::HBox::;
2443 2607
2444use CFClient::OpenGL; 2608use CFClient::OpenGL;
2445 2609
2446sub new { 2610sub new {
2447 my $class = shift; 2611 my $class = shift;
2448 2612
2449 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2450 fontsize => 1, 2614 fontsize => 1,
2451 can_events => 0, 2615 can_events => 1,
2616 indent => 0,
2452 #font => default_font 2617 #font => default_font
2453 @_, 2618 @_,
2454 2619
2455 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2456 par => [], 2621 par => [],
2457 height => 0, 2622 height => 0,
2458 children => [ 2623 children => [
2459 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2460 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2471 2636
2472 $self->{fontsize} = $fontsize; 2637 $self->{fontsize} = $fontsize;
2473 $self->reflow; 2638 $self->reflow;
2474} 2639}
2475 2640
2641sub size_request {
2642 my ($self) = @_;
2643
2644 my ($empty, $slider) = @{ $self->{children} };
2645
2646 local $self->{children} = [$empty, $slider];
2647 $self->SUPER::size_request
2648}
2649
2476sub size_allocate { 2650sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 2651 my ($self, $w, $h) = @_;
2478 2652
2479 $self->SUPER::size_allocate ($w, $h); 2653 my ($empty, $slider, @other) = @{ $self->{children} };
2654 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2480 2655
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2656 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2657 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $self->{layout}->set_width ($self->{children}[0]{w}); 2658 $self->{layout}->set_width ($empty->{w});
2659 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2484 2660
2485 $self->reflow; 2661 $self->reflow;
2486}
2487 2662
2488sub text_size { 2663 local $self->{children} = [$empty, $slider];
2664 $self->SUPER::invoke_size_allocate ($w, $h)
2665}
2666
2667sub invoke_mouse_wheel {
2489 my ($self, $text, $indent) = @_; 2668 my ($self, $ev) = @_;
2669
2670 return 0 unless $ev->{dy}; # only vertical movements
2671
2672 $self->{children}[1]->emit (mouse_wheel => $ev);
2673
2674 1
2675}
2676
2677sub get_layout {
2678 my ($self, $para) = @_;
2490 2679
2491 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2492 2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683 $layout->set_foreground (@{$para->{fg}});
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2684 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent); 2685 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2686 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2495 $layout->set_markup ($text); 2687 $layout->set_markup ($para->{markup});
2688
2689 $layout->set_shapes (
2690 map
2691 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2692 @{$para->{widget}}
2496 2693 );
2694
2497 $layout->size 2695 $layout
2498} 2696}
2499 2697
2500sub reflow { 2698sub reflow {
2501 my ($self) = @_; 2699 my ($self) = @_;
2502 2700
… …
2511 $self->{children}[1]->set_value ($offset); 2709 $self->{children}[1]->set_value ($offset);
2512} 2710}
2513 2711
2514sub clear { 2712sub clear {
2515 my ($self) = @_; 2713 my ($self) = @_;
2714
2715 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other;
2516 2717
2517 $self->{par} = []; 2718 $self->{par} = [];
2518 $self->{height} = 0; 2719 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520} 2721}
2521 2722
2522sub add_paragraph { 2723sub add_paragraph {
2523 my ($self, $color, $text, $indent) = @_; 2724 my ($self, $color, $para, $indent) = @_;
2524 2725
2525 for my $line (split /\n/, $text) { 2726 my ($text, @w) = ref $para ? @$para : $para;
2526 my ($w, $h) = $self->text_size ($line); 2727
2527 $self->{height} += $h; 2728 $para = {
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2729 w => 1e10,
2730 wrapped => 1,
2731 fg => $color,
2732 indent => $indent,
2733 markup => $text,
2734 widget => \@w,
2529 } 2735 };
2530 2736
2531 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2737 $self->add (@w) if @w;
2738 push @{$self->{par}}, $para;
2739
2740 $self->{need_reflow}++;
2741 $self->update;
2742}
2743
2744sub scroll_to_bottom {
2745 my ($self) = @_;
2746
2747 $self->{scroll_to_bottom} = 1;
2748 $self->update;
2532} 2749}
2533 2750
2534sub update { 2751sub update {
2535 my ($self) = @_; 2752 my ($self) = @_;
2536 2753
… …
2538 2755
2539 return unless $self->{h} > 0; 2756 return unless $self->{h} > 0;
2540 2757
2541 delete $self->{texture}; 2758 delete $self->{texture};
2542 2759
2543 $ROOT->on_post_alloc ($self, sub { 2760 $ROOT->on_post_alloc ($self => sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 2762
2546 if (delete $self->{need_reflow}) { 2763 if (delete $self->{need_reflow}) {
2547 my $height = 0; 2764 my $height = 0;
2548 2765
2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2553 for (@{$self->{par}}) { 2766 for my $para (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2555 $layout->set_width ($W - $_->[3]); 2768 my $layout = $self->get_layout ($para);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size; 2769 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3]; 2770
2559 $_->[1] = $h; 2771 $para->{w} = $w + $para->{indent};
2772 $para->{h} = $h;
2773 $para->{wrapped} = $layout->has_wrapped;
2560 } 2774 }
2561 2775
2562 $height += $_->[1]; 2776 $height += $para->{h};
2563 } 2777 }
2564 2778
2565 $self->{height} = $height; 2779 $self->{height} = $height;
2566 2780
2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2781 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2568 2782
2569 delete $self->{texture}; 2783 delete $self->{texture};
2784 }
2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2570 } 2788 }
2571 2789
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2790 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2573 glClearColor 0, 0, 0, 0; 2791 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 2792 glClear GL_COLOR_BUFFER_BIT;
… …
2578 my $y0 = $top; 2796 my $y0 = $top;
2579 my $y1 = $top + $H; 2797 my $y1 = $top + $H;
2580 2798
2581 my $y = 0; 2799 my $y = 0;
2582 2800
2583 my $layout = $self->{layout};
2584
2585 $layout->set_font ($self->{font}) if $self->{font};
2586
2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590
2591 for my $par (@{$self->{par}}) { 2801 for my $para (@{$self->{par}}) {
2592 my $h = $par->[1]; 2802 my $h = $para->{h};
2593 2803
2594 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] });
2596 $layout->set_width ($W - $par->[3]);
2597 $layout->set_markup ($par->[4]);
2598 2805
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2806 my $layout = $self->get_layout ($para);
2600 2807
2601 glRasterPos $par->[3], $y - $y0; 2808 $layout->render ($para->{indent}, $y - $y0);
2602 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2809
2810 if (my @w = @{ $para->{widget} }) {
2811 my @s = $layout->get_shapes;
2812
2813 for (@w) {
2814 my ($dx, $dy) = splice @s, 0, 2, ();
2815
2816 $_->{x} = $dx + $para->{indent};
2817 $_->{y} = $dy + $y - $y0;
2818
2819 $_->draw;
2820 }
2821 }
2603 } 2822 }
2604 2823
2605 $y += $h; 2824 $y += $h;
2606 } 2825 }
2607
2608 glDisable GL_BLEND;
2609 }; 2826 };
2610 }); 2827 });
2828}
2829
2830sub reconfigure {
2831 my ($self) = @_;
2832
2833 $self->SUPER::reconfigure;
2834
2835 $_->{w} = 1e10 for @{ $self->{par} };
2836 $self->reflow;
2611} 2837}
2612 2838
2613sub _draw { 2839sub _draw {
2614 my ($self) = @_; 2840 my ($self) = @_;
2615 2841
… …
2618 glColor 0, 0, 0, 1; 2844 glColor 0, 0, 0, 1;
2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2845 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2620 glDisable GL_TEXTURE_2D; 2846 glDisable GL_TEXTURE_2D;
2621 2847
2622 $self->{children}[1]->draw; 2848 $self->{children}[1]->draw;
2623
2624} 2849}
2625 2850
2626############################################################################# 2851#############################################################################
2627 2852
2628package CFClient::UI::Animator; 2853package CFClient::UI::Animator;
… …
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 2940 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2941 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 2942 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 2943 . "visible $widget->{visible}";
2719 } 2944 }
2945
2946 $tooltip =~ s/^\n+//;
2947 $tooltip =~ s/\n+$//;
2720 2948
2721 $self->add (new CFClient::UI::Label 2949 $self->add (new CFClient::UI::Label
2722 markup => $tooltip, 2950 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 2952 fontsize => 0.8,
… …
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735 2963
2736 ($w + 4, $h + 4) 2964 ($w + 4, $h + 4)
2737} 2965}
2738 2966
2739sub size_allocate { 2967sub invoke_size_allocate {
2740 my ($self, $w, $h) = @_; 2968 my ($self, $w, $h) = @_;
2741 2969
2742 $self->SUPER::size_allocate ($w - 4, $h - 4); 2970 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743} 2971}
2744 2972
2745sub visibility_change { 2973sub invoke_visibility_change {
2746 my ($self, $visible) = @_; 2974 my ($self, $visible) = @_;
2747 2975
2748 return unless $visible; 2976 return unless $visible;
2749 2977
2750 $self->{root}->on_post_alloc ("move_$self" => sub { 2978 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2752 or return; 2980 or return;
2753 2981
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2982 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 2983
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2984 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 2985 if $x + $self->{w} > $self->{root}{w};
2758 2986
2759 $self->move_abs ($x, $y); 2987 $self->move_abs ($x, $y);
2760 }); 2988 });
2761} 2989}
2762 2990
… …
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3085 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 3086 glDisable GL_TEXTURE_2D;
2859 } 3087 }
2860} 3088}
2861 3089
2862sub DESTROY { 3090sub destroy {
2863 my ($self) = @_; 3091 my ($self) = @_;
2864 3092
2865 $self->{timer}->cancel 3093 $self->{timer}->cancel
2866 if $self->{timer}; 3094 if $self->{timer};
2867 3095
2868 $self->SUPER::DESTROY; 3096 $self->SUPER::destroy;
2869} 3097}
2870 3098
2871############################################################################# 3099#############################################################################
2872 3100
2873package CFClient::UI::Buttonbar; 3101package CFClient::UI::Buttonbar;
… …
2894 ); 3122 );
2895 3123
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3124 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2897 3125
2898 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
2900 3128
2901 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
2902 if (!ref $widget) { 3130 if (!ref $widget) {
3131 if ($widget =~ /\t/) {
3132 my ($left, $right) = split /\t/, $widget, 2;
3133
3134 $widget = new CFClient::UI::HBox
3135 can_hover => 1,
3136 can_events => 1,
3137 tooltip => $tooltip,
3138 children => [
3139 (new CFClient::UI::Label markup => $left, expand => 1),
3140 (new CFClient::UI::Label markup => $right, align => +1),
3141 ],
3142 ;
3143
3144 } else {
2903 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
2904 can_hover => 1, 3146 can_hover => 1,
2905 can_events => 1, 3147 can_events => 1,
2906 text => $widget; 3148 markup => $widget,
3149 tooltip => $tooltip;
3150 }
2907 } 3151 }
2908 3152
2909 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
2910 3154
2911 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
2916 3160
2917# popup given the event (must be a mouse button down event currently) 3161# popup given the event (must be a mouse button down event currently)
2918sub popup { 3162sub popup {
2919 my ($self, $ev) = @_; 3163 my ($self, $ev) = @_;
2920 3164
2921 $self->_emit ("popdown"); 3165 $self->emit ("popdown");
2922 3166
2923 # maybe save $GRAB? must be careful about events... 3167 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self; 3168 $GRAB = $self;
2925 $self->{button} = $ev->{button}; 3169 $self->{button} = $ev->{button};
2926 3170
2927 $self->show; 3171 $self->show;
2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3172 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2929} 3173}
2930 3174
2931sub mouse_motion { 3175sub invoke_mouse_motion {
2932 my ($self, $ev, $x, $y) = @_; 3176 my ($self, $ev, $x, $y) = @_;
2933 3177
2934 # TODO: should use vbox->find_widget or so 3178 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3179 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER}; 3180 $self->{hover} = $self->{item}{$HOVER};
2937 3181
2938 0 3182 0
2939} 3183}
2940 3184
2941sub button_up { 3185sub invoke_button_up {
2942 my ($self, $ev, $x, $y) = @_; 3186 my ($self, $ev, $x, $y) = @_;
2943 3187
2944 if ($ev->{button} == $self->{button}) { 3188 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB; 3189 undef $GRAB;
2946 $self->hide; 3190 $self->hide;
2947 3191
2948 $self->_emit ("popdown"); 3192 $self->emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover}; 3193 $self->{hover}[1]->() if $self->{hover};
2950 } else { 3194 } else {
2951 return 0 3195 return 0
2952 } 3196 }
2953 3197
… …
2980 3224
2981 $self->{current} = $self->{children}[0] 3225 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} }; 3226 if @{ $self->{children} };
2983} 3227}
2984 3228
3229sub get_current_page {
3230 my ($self) = @_;
3231
3232 $self->{current}
3233}
3234
2985sub set_current_page { 3235sub set_current_page {
2986 my ($self, $page_or_widget) = @_; 3236 my ($self, $page_or_widget) = @_;
2987 3237
2988 my $widget = ref $page_or_widget 3238 my $widget = ref $page_or_widget
2989 ? $page_or_widget 3239 ? $page_or_widget
2990 : $self->{children}[$page_or_widget]; 3240 : $self->{children}[$page_or_widget];
2991 3241
2992 $self->{current} = $widget; 3242 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3243 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994 3244
2995 $self->_emit (page_changed => $self->{current}); 3245 $self->emit (page_changed => $self->{current});
2996 3246
2997 $self->realloc; 3247 $self->realloc;
2998} 3248}
2999 3249
3000sub visible_children { 3250sub visible_children {
… …
3005 my ($self) = @_; 3255 my ($self) = @_;
3006 3256
3007 $self->{current}->size_request 3257 $self->{current}->size_request
3008} 3258}
3009 3259
3010sub size_allocate { 3260sub invoke_size_allocate {
3011 my ($self, $w, $h) = @_; 3261 my ($self, $w, $h) = @_;
3012 3262
3013 $self->{current}->configure (0, 0, $w, $h); 3263 $self->{current}->configure (0, 0, $w, $h);
3264
3265 1
3014} 3266}
3015 3267
3016sub _draw { 3268sub _draw {
3017 my ($self) = @_; 3269 my ($self) = @_;
3018 3270
… …
3053 ); 3305 );
3054 3306
3055 $self->{multiplexer}->add ($widget); 3307 $self->{multiplexer}->add ($widget);
3056} 3308}
3057 3309
3310sub get_current_page {
3311 my ($self) = @_;
3312
3313 $self->{multiplexer}->get_current_page
3314}
3315
3058sub set_current_page { 3316sub set_current_page {
3059 my ($self, $page) = @_; 3317 my ($self, $page) = @_;
3060 3318
3061 $self->{multiplexer}->set_current_page ($page); 3319 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current}); 3320 $self->emit (page_changed => $self->{multiplexer}{current});
3321}
3322
3323#############################################################################
3324
3325package CFClient::UI::Combobox;
3326
3327use utf8;
3328
3329our @ISA = CFClient::UI::Button::;
3330
3331sub new {
3332 my $class = shift;
3333
3334 my $self = $class->SUPER::new (
3335 options => [], # [value, title, longdesc], ...
3336 value => undef,
3337 @_,
3338 );
3339
3340 $self->_set_value ($self->{value});
3341
3342 $self
3343}
3344
3345sub invoke_button_down {
3346 my ($self, $ev) = @_;
3347
3348 my @menu_items;
3349
3350 for (@{ $self->{options} }) {
3351 my ($value, $title, $tooltip) = @$_;
3352
3353 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354 }
3355
3356 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357}
3358
3359sub _set_value {
3360 my ($self, $value) = @_;
3361
3362 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3363 or return;
3364
3365 $self->{value} = $item->[0];
3366 $self->set_markup ("$item->[1] ⇓");
3367 $self->set_tooltip ($item->[2]);
3368}
3369
3370sub set_value {
3371 my ($self, $value) = @_;
3372
3373 return unless $self->{value} ne $value;
3374
3375 $self->_set_value ($value);
3376 $self->emit (changed => $value);
3063} 3377}
3064 3378
3065############################################################################# 3379#############################################################################
3066 3380
3067package CFClient::UI::Statusbox; 3381package CFClient::UI::Statusbox;
… …
3076 @_, 3390 @_,
3077 ); 3391 );
3078 3392
3079 Scalar::Util::weaken (my $this = $self); 3393 Scalar::Util::weaken (my $this = $self);
3080 3394
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { 3395 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3082 $this->reorder;
3083 $this->update;
3084 });
3085 3396
3086 $self 3397 $self
3087} 3398}
3088 3399
3089sub reorder { 3400sub reorder {
3090 my ($self) = @_; 3401 my ($self) = @_;
3091 my $NOW = Time::HiRes::time; 3402 my $NOW = Time::HiRes::time;
3403
3404 # freeze display when hovering over any label
3405 return if $CFClient::UI::TOOLTIP->{owner}
3406 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3407 values %{ $self->{item} };
3092 3408
3093 while (my ($k, $v) = each %{ $self->{item} }) { 3409 while (my ($k, $v) = each %{ $self->{item} }) {
3094 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3410 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3095 } 3411 }
3096 3412
… …
3105 3421
3106 my $count = 10 + 1; 3422 my $count = 10 + 1;
3107 for my $item (@items) { 3423 for my $item (@items) {
3108 last unless --$count; 3424 last unless --$count;
3109 3425
3110 push @widgets, $item->{label} ||= do { 3426 my $label = $item->{label} ||= do {
3111 # TODO: doesn't handle markup well (read as: at all) 3427 # TODO: doesn't handle markup well (read as: at all)
3112 my $short = $item->{count} > 1 3428 my $short = $item->{count} > 1
3113 ? "<b>$item->{count} ×</b> $item->{text}" 3429 ? "<b>$item->{count} ×</b> $item->{text}"
3114 : $item->{text}; 3430 : $item->{text};
3115 3431
… …
3123 tooltip => $item->{tooltip}, 3439 tooltip => $item->{tooltip},
3124 tooltip_font => $::FONT_PROP, 3440 tooltip_font => $::FONT_PROP,
3125 tooltip_width => 0.67, 3441 tooltip_width => 0.67,
3126 fontsize => $item->{fontsize} || $self->{fontsize}, 3442 fontsize => $item->{fontsize} || $self->{fontsize},
3127 max_w => $::WIDTH * 0.44, 3443 max_w => $::WIDTH * 0.44,
3128 fg => $item->{fg}, 3444 fg => [@{ $item->{fg} }],
3129 orig_alpha => $item->{fg}[3] || 1,
3130 can_events => 1, 3445 can_events => 1,
3131 can_hover => 1 3446 can_hover => 1
3132 }; 3447 };
3133 3448
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) { 3449 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2; 3450 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3136 if ($diff < 1) {
3137 $item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138 $item->{label}->realloc;
3139 }
3140 $item->{label}->update; 3451 $label->update;
3452 $label->set_max_size (undef, $label->{req_h} * $diff)
3453 if $diff < 1;
3141 $self->{timer}->interval (1/30); 3454 $self->{timer}->interval (1/30);
3455 } else {
3456 $label->{fg}[3] = $item->{fg}[3] || 1;
3142 } 3457 }
3458
3459 push @widgets, $label;
3143 } 3460 }
3144 3461
3145 $self->clear; 3462 $self->clear;
3146 $self->SUPER::add (reverse @widgets); 3463 $self->SUPER::add (reverse @widgets);
3147} 3464}
… …
3163 $item->{count}++; 3480 $item->{count}++;
3164 } else { 3481 } else {
3165 $item->{count} = 1; 3482 $item->{count} = 1;
3166 $item->{text} = $item->{tooltip} = $text; 3483 $item->{text} = $item->{tooltip} = $text;
3167 } 3484 }
3168 $item->{id} = ++$self->{id}; 3485 $item->{id} += 0.2;#d#
3169 $item->{timeout} = $timeout; 3486 $item->{timeout} = $timeout;
3170 delete $item->{label}; 3487 delete $item->{label};
3171 } else { 3488 } else {
3172 $self->{item}{$group} = { 3489 $self->{item}{$group} = {
3173 id => ++$self->{id}, 3490 id => ++$self->{id},
… …
3179 count => 1, 3496 count => 1,
3180 %arg, 3497 %arg,
3181 }; 3498 };
3182 } 3499 }
3183 3500
3501 $ROOT->on_refresh (reorder => sub {
3184 $self->reorder; 3502 $self->reorder;
3503 });
3185} 3504}
3186 3505
3187sub reconfigure { 3506sub reconfigure {
3188 my ($self) = @_; 3507 my ($self) = @_;
3189 3508
… …
3192 3511
3193 $self->reorder; 3512 $self->reorder;
3194 $self->SUPER::reconfigure; 3513 $self->SUPER::reconfigure;
3195} 3514}
3196 3515
3197sub DESTROY { 3516sub destroy {
3198 my ($self) = @_; 3517 my ($self) = @_;
3199 3518
3200 $self->{timer}->cancel; 3519 $self->{timer}->cancel;
3201 3520
3202 $self->SUPER::DESTROY; 3521 $self->SUPER::destroy;
3203} 3522}
3204 3523
3205############################################################################# 3524#############################################################################
3206 3525
3207package CFClient::UI::Inventory; 3526package CFClient::UI::Inventory;
3208 3527
3209our @ISA = CFClient::UI::ScrolledWindow::; 3528our @ISA = CFClient::UI::Table::;
3210 3529
3211sub new { 3530sub new {
3212 my $class = shift; 3531 my $class = shift;
3213 3532
3214 my $self = $class->SUPER::new ( 3533 my $self = $class->SUPER::new (
3215 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3534 col_expand => [0, 1, 0],
3216 @_, 3535 @_,
3217 ); 3536 );
3218 3537
3219 $self 3538 $self
3220} 3539}
3221 3540
3222sub set_items { 3541sub set_items {
3223 my ($self, $items) = @_; 3542 my ($self, $items) = @_;
3224 3543
3225 $self->{child}->clear; 3544 $self->clear;
3226 return unless $items; 3545 return unless $items;
3227 3546
3228 my @items = sort { 3547 my @items = sort {
3229 ($a->{type} <=> $b->{type}) 3548 ($a->{type} <=> $b->{type})
3230 or ($a->{name} cmp $b->{name}) 3549 or ($a->{name} cmp $b->{name})
3231 } @$items; 3550 } values %$items;
3232 3551
3233 $self->{real_items} = \@items; 3552 $self->{real_items} = \@items;
3234 3553
3235 my $row = 0; 3554 my $row = 0;
3236 for my $item (@items) { 3555 for my $item (@items) {
3237 CFClient::Item::update_widgets $item; 3556 CFClient::Item::update_widgets $item;
3238 3557
3239 $self->{child}->add (0, $row, $item->{face_widget}); 3558 $self->add (0, $row, $item->{face_widget});
3240 $self->{child}->add (1, $row, $item->{desc_widget}); 3559 $self->add (1, $row, $item->{desc_widget});
3241 $self->{child}->add (2, $row, $item->{weight_widget}); 3560 $self->add (2, $row, $item->{weight_widget});
3242 3561
3243 $row++; 3562 $row++;
3244 }
3245}
3246
3247#############################################################################
3248
3249package CFClient::UI::BindEditor;
3250
3251our @ISA = CFClient::UI::FancyFrame::;
3252
3253sub new {
3254 my $class = shift;
3255
3256 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3257
3258 $self->add (my $vb = new CFClient::UI::VBox);
3259
3260
3261 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3262 text => "start recording",
3263 tooltip => "Start/Stops recording of actions."
3264 ."All subsequent actions after the recording started will be captured."
3265 ."The actions are displayed after the record was stopped."
3266 ."To bind the action you have to click on the 'Bind' button",
3267 on_activate => sub {
3268 unless ($self->{recording}) {
3269 $self->start;
3270 } else {
3271 $self->stop;
3272 }
3273 });
3274
3275 $vb->add (new CFClient::UI::Label text => "Actions:");
3276 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3277
3278 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3279 $vb->add (my $hb = new CFClient::UI::HBox);
3280 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3281 $hb->add (new CFClient::UI::Button
3282 text => "bind",
3283 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3284 on_activate => sub {
3285 $self->ask_for_bind;
3286 });
3287
3288 $vb->add (my $hb = new CFClient::UI::HBox);
3289 $hb->add (new CFClient::UI::Button
3290 text => "ok",
3291 expand => 1,
3292 tooltip => "This closes the binding editor and saves the binding",
3293 on_activate => sub {
3294 $self->hide;
3295 $self->commit;
3296 });
3297
3298 $hb->add (new CFClient::UI::Button
3299 text => "cancel",
3300 expand => 1,
3301 tooltip => "This closes the binding editor without saving",
3302 on_activate => sub {
3303 $self->hide;
3304 $self->{binding_cancel}->()
3305 if $self->{binding_cancel};
3306 });
3307
3308 $self->update_binding_widgets;
3309
3310 $self
3311}
3312
3313sub commit {
3314 my ($self) = @_;
3315 my ($mod, $sym, $cmds) = $self->get_binding;
3316 if ($sym != 0 && @$cmds > 0) {
3317 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3318 ."'. Don't forget 'Save Config'!");
3319 $self->{binding_change}->($mod, $sym, $cmds)
3320 if $self->{binding_change};
3321 } else {
3322 $::STATUSBOX->add ("No action bound, no key or action specified!");
3323 $self->{binding_cancel}->()
3324 if $self->{binding_cancel};
3325 }
3326}
3327
3328sub start {
3329 my ($self) = @_;
3330
3331 $self->{rec_btn}->set_text ("stop recording");
3332 $self->{recording} = 1;
3333 $self->clear_command_list;
3334 $::CONN->start_record if $::CONN;
3335}
3336
3337sub stop {
3338 my ($self) = @_;
3339
3340 $self->{rec_btn}->set_text ("start recording");
3341 $self->{recording} = 0;
3342
3343 my $rec;
3344 $rec = $::CONN->stop_record if $::CONN;
3345 return unless ref $rec eq 'ARRAY';
3346 $self->set_command_list ($rec);
3347}
3348
3349
3350sub ask_for_bind_and_commit {
3351 my ($self) = @_;
3352 $self->ask_for_bind (1);
3353}
3354
3355sub ask_for_bind {
3356 my ($self, $commit) = @_;
3357
3358 CFClient::Binder::open_binding_dialog (sub {
3359 my ($mod, $sym) = @_;
3360 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3361 $self->update_binding_widgets;
3362 $self->commit if $commit;
3363 });
3364}
3365
3366# $mod and $sym are the modifiers and key symbol
3367# $cmds is a array ref of strings (the commands)
3368# $cb is the callback that is executed on OK
3369# $ccb is the callback that is executed on CANCEL and
3370# when the binding was unsuccessful on OK
3371sub set_binding {
3372 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3373
3374 $self->clear_command_list;
3375 $self->{recording} = 0;
3376 $self->{rec_btn}->set_text ("start recording");
3377
3378 $self->{binding} = [$mod, $sym];
3379 $self->{commands} = $cmds;
3380
3381 $self->{binding_change} = $cb;
3382 $self->{binding_cancel} = $ccb;
3383
3384 $self->update_binding_widgets;
3385}
3386
3387# this is a shortcut method that asks for a binding
3388# and then just binds it.
3389sub do_quick_binding {
3390 my ($self, $cmds) = @_;
3391 $self->set_binding (undef, undef, $cmds, sub {
3392 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3393 });
3394 $self->ask_for_bind (1);
3395}
3396
3397sub update_binding_widgets {
3398 my ($self) = @_;
3399 my ($mod, $sym, $cmds) = $self->get_binding;
3400 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3401 $self->set_command_list ($cmds);
3402}
3403
3404sub get_binding {
3405 my ($self) = @_;
3406 return (
3407 $self->{binding}->[0],
3408 $self->{binding}->[1],
3409 [ grep { defined $_ } @{$self->{commands}} ]
3410 );
3411}
3412
3413sub clear_command_list {
3414 my ($self) = @_;
3415 $self->{cmdbox}->clear ();
3416}
3417
3418sub set_command_list {
3419 my ($self, $cmds) = @_;
3420
3421 $self->{cmdbox}->clear ();
3422 $self->{commands} = $cmds;
3423
3424 my $idx = 0;
3425
3426 for (@$cmds) {
3427 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3428
3429 my $i = $idx;
3430 $hb->add (new CFClient::UI::Label text => $_);
3431 $hb->add (new CFClient::UI::Button
3432 text => "delete",
3433 tooltip => "Deletes the action from the record",
3434 on_activate => sub {
3435 $self->{cmdbox}->remove ($hb);
3436 $cmds->[$i] = undef;
3437 });
3438
3439
3440 $idx++
3441 } 3563 }
3442} 3564}
3443 3565
3444############################################################################# 3566#############################################################################
3445 3567
… …
3455 commands => [], 3577 commands => [],
3456 @_, 3578 @_,
3457 ) 3579 )
3458} 3580}
3459 3581
3460# XXX: Do sorting? Argl... 3582my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3583
3584my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3585 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3586my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3587 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3588my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3589 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3590my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3591 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3592my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3593 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3594
3595sub rebuild_spell_list {
3596 my ($self) = @_;
3597
3598 $CFClient::UI::ROOT->on_refresh ($self => sub {
3599 $self->clear;
3600
3601 return unless $::CONN;
3602
3603 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3604 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3605 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3606 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3607 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3608
3609 my $row = 0;
3610
3611 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3612 my $spell = $self->{spell}{$_};
3613
3614 $row++;
3615
3616 my $spell_cb = sub {
3617 my ($widget, $ev) = @_;
3618
3619 if ($ev->{button} == 1) {
3620 $::CONN->user_send ("cast $spell->{name}");
3621 } elsif ($ev->{button} == 2) {
3622 $::CONN->user_send ("invoke $spell->{name}");
3623 } elsif ($ev->{button} == 3) {
3624 (new CFClient::UI::Menu
3625 items => [
3626 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3627 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3628 ],
3629 )->popup ($ev);
3630 } else {
3631 return 0;
3632 }
3633
3634 1
3635 };
3636
3637 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3638
3639 #TODO: add path info to tooltip
3640 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3641
3642 $self->add (0, $row, new CFClient::UI::Face
3643 face => $spell->{face},
3644 can_hover => 1,
3645 can_events => 1,
3646 tooltip => $tooltip,
3647 on_button_down => $spell_cb,
3648 );
3649
3650 $self->add (1, $row, new CFClient::UI::Label
3651 expand => 1,
3652 text => $spell->{name},
3653 can_hover => 1,
3654 can_events => 1,
3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3657 );
3658
3659 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3660 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3661 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3662 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3663 }
3664 });
3665}
3666
3461sub add_spell { 3667sub add_spell {
3462 my ($self, $spell) = @_; 3668 my ($self, $spell) = @_;
3669
3463 $self->{spells}->{$spell->{name}} = $spell; 3670 $self->{spell}->{$spell->{name}} = $spell;
3464 3671 $self->rebuild_spell_list;
3465 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3466 face => $spell->{face},
3467 can_hover => 1,
3468 can_events => 1,
3469 tooltip => $spell->{message});
3470
3471 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3472 text => $spell->{name},
3473 can_hover => 1,
3474 can_events => 1,
3475 tooltip => $spell->{message},
3476 expand => 1);
3477
3478 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3479 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3480 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3481 expand => 1);
3482
3483 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3484 text => "bind to key",
3485 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3486}
3487
3488sub rebuild_spell_list {
3489 my ($self) = @_;
3490 $self->{tbl_idx} = 0;
3491 $self->add_spell ($_) for values %{$self->{spells}};
3492} 3672}
3493 3673
3494sub remove_spell { 3674sub remove_spell {
3495 my ($self, $spell) = @_; 3675 my ($self, $spell) = @_;
3676
3496 delete $self->{spells}->{$spell->{name}}; 3677 delete $self->{spell}->{$spell->{name}};
3678 $self->rebuild_spell_list;
3679}
3680
3681sub clear_spells {
3682 my ($self) = @_;
3683
3684 $self->{spell} = {};
3497 $self->rebuild_spell_list; 3685 $self->rebuild_spell_list;
3498} 3686}
3499 3687
3500############################################################################# 3688#############################################################################
3501 3689
… …
3538 $coord = $max - $size if $coord > $max - $size; 3726 $coord = $max - $size if $coord > $max - $size;
3539 3727
3540 int $coord + 0.5 3728 int $coord + 0.5
3541} 3729}
3542 3730
3543sub size_allocate { 3731sub invoke_size_allocate {
3544 my ($self, $w, $h) = @_; 3732 my ($self, $w, $h) = @_;
3545 3733
3546 for my $child ($self->children) { 3734 for my $child ($self->children) {
3547 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3735 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3548 3736
… …
3552 $X = _to_pixel $X, $W, $self->{w}; 3740 $X = _to_pixel $X, $W, $self->{w};
3553 $Y = _to_pixel $Y, $H, $self->{h}; 3741 $Y = _to_pixel $Y, $H, $self->{h};
3554 3742
3555 $child->configure ($X, $Y, $W, $H); 3743 $child->configure ($X, $Y, $W, $H);
3556 } 3744 }
3745
3746 1
3557} 3747}
3558 3748
3559sub coord2local { 3749sub coord2local {
3560 my ($self, $x, $y) = @_; 3750 my ($self, $x, $y) = @_;
3561 3751
… …
3687 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3688 3878
3689 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3690 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
3691 3881
3882 $w = max $widget->{min_w}, $w;
3883 $h = max $widget->{min_h}, $h;
3884
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887
3692 $w = int $w + 0.5; 3888 $w = int $w + 0.5;
3693 $h = int $h + 0.5; 3889 $h = int $h + 0.5;
3694 3890
3695 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3891 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3696 $widget->{old_w} = $widget->{w}; 3892 $widget->{old_w} = $widget->{w};

Diff Legend

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