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.331 by root, Sun Jul 23 04:46:02 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 {
410 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
411 433
434 Carp::confess unless $self->{parent};#d#
435
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 437}
414 438
415# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
416sub coord2global { 440sub coord2global {
417 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
418 442
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 443 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 444}
421 445
422sub focus_in { 446sub invoke_focus_in {
423 my ($self) = @_; 447 my ($self) = @_;
424 448
425 return if $FOCUS == $self; 449 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 450 return unless $self->{can_focus};
427 451
428 my $focus = $FOCUS; $FOCUS = $self; 452 $FOCUS = $self;
429 453
430 $self->_emit (focus_in => $focus); 454 $self->update;
431 455
432 $focus->update if $focus; 456 0
433 $FOCUS->update;
434} 457}
435 458
436sub focus_out { 459sub invoke_focus_out {
437 my ($self) = @_; 460 my ($self) = @_;
438 461
439 return unless $FOCUS == $self; 462 return unless $FOCUS == $self;
440 463
441 my $focus = $FOCUS; undef $FOCUS; 464 undef $FOCUS;
442 465
443 $self->_emit (focus_out => $focus); 466 $self->update;
444 467
445 $focus->update if $focus; #?
446
447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 468 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
448 unless $FOCUS; 469 unless $FOCUS;
449}
450 470
471 0
472}
473
474sub grab_focus {
475 my ($self) = @_;
476
477 $FOCUS->emit ("focus_out") if $FOCUS;
478 $self->emit ("focus_in");
479}
480
451sub mouse_motion { 0 } 481sub invoke_mouse_motion { 0 }
452sub button_up { 0 } 482sub invoke_button_up { 0 }
453sub key_down { 0 } 483sub invoke_key_down { 0 }
454sub key_up { 0 } 484sub invoke_key_up { 0 }
485sub invoke_mouse_wheel { 0 }
455 486
456sub button_down { 487sub invoke_button_down {
457 my ($self, $ev, $x, $y) = @_; 488 my ($self, $ev, $x, $y) = @_;
458 489
459 $self->focus_in; 490 $self->grab_focus;
460 491
461 0 492 0
493}
494
495sub connect {
496 my ($self, $signal, $cb) = @_;
497
498 push @{ $self->{signal_cb}{$signal} }, $cb;
499}
500
501my %has_coords = (
502 button_down => 1,
503 button_up => 1,
504 mouse_motion => 1,
505 mouse_wheel => 1,
506);
507
508sub emit {
509 my ($self, $signal, @args) = @_;
510
511 my @append
512 = $has_coords{$signal}
513 ? $args[0]->xy ($self)
514 : ();
515
516 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
517
518 #d##TODO# stop propagating at first true, do not use sum
519 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
520 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
521 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
462} 522}
463 523
464sub find_widget { 524sub find_widget {
465 my ($self, $x, $y) = @_; 525 my ($self, $x, $y) = @_;
466 526
… …
476sub set_parent { 536sub set_parent {
477 my ($self, $parent) = @_; 537 my ($self, $parent) = @_;
478 538
479 Scalar::Util::weaken ($self->{parent} = $parent); 539 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible}; 540 $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} 541}
505 542
506sub realloc { 543sub realloc {
507 my ($self) = @_; 544 my ($self) = @_;
508 545
… …
541 return unless $self->{h} && $self->{w}; 578 return unless $self->{h} && $self->{w};
542 579
543 # update screen rectangle 580 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x}; 581 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y}; 582 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548 583
549 # skip widgets that are entirely outside the drawing area 584 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 585 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 586 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
552 587
… …
591} 626}
592 627
593sub DESTROY { 628sub DESTROY {
594 my ($self) = @_; 629 my ($self) = @_;
595 630
631 return if CFClient::in_destruct;
632
596 delete $WIDGET{$self+0}; 633 delete $WIDGET{$self+0};
597 #$self->deactivate; 634
635 eval { $self->destroy };
636 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598} 637}
599 638
600############################################################################# 639#############################################################################
601 640
602package CFClient::UI::DrawBG; 641package CFClient::UI::DrawBG;
… …
767} 806}
768 807
769sub add { 808sub add {
770 my ($self, $child) = @_; 809 my ($self, $child) = @_;
771 810
772 $self->{children} = []; 811 $self->SUPER::remove ($_) for @{ $self->{children} };
773
774 $self->SUPER::add ($child); 812 $self->SUPER::add ($child);
775} 813}
776 814
777sub remove { 815sub remove {
778 my ($self, $widget) = @_; 816 my ($self, $widget) = @_;
… …
787 825
788sub size_request { 826sub size_request {
789 $_[0]{children}[0]->size_request 827 $_[0]{children}[0]->size_request
790} 828}
791 829
792sub size_allocate { 830sub invoke_size_allocate {
793 my ($self, $w, $h) = @_; 831 my ($self, $w, $h) = @_;
794 832
795 $self->{children}[0]->configure (0, 0, $w, $h); 833 $self->{children}[0]->configure (0, 0, $w, $h);
834
835 1
796} 836}
797 837
798############################################################################# 838#############################################################################
799 839
800# back-buffered drawing area 840# back-buffered drawing area
… …
816 856
817 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 857 $ROOT->on_post_alloc ($self => sub { $self->render_child });
818 $self->SUPER::update; 858 $self->SUPER::update;
819} 859}
820 860
821sub size_allocate { 861sub invoke_size_allocate {
822 my ($self, $w, $h) = @_; 862 my ($self, $w, $h) = @_;
823 863
824 $self->SUPER::size_allocate ($w, $h);
825 $self->update; 864 $self->update;
865
866 $self->SUPER::invoke_size_allocate ($w, $h)
826} 867}
827 868
828sub _render { 869sub _render {
829 my ($self) = @_; 870 my ($self) = @_;
830 871
… …
891 $h = 10 if $self->{scroll_y}; 932 $h = 10 if $self->{scroll_y};
892 933
893 ($w, $h) 934 ($w, $h)
894} 935}
895 936
896sub size_allocate { 937sub invoke_size_allocate {
897 my ($self, $w, $h) = @_; 938 my ($self, $w, $h) = @_;
898 939
899 my $child = $self->child; 940 my $child = $self->child;
900 941
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 942 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 943 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903 944
904 $self->child->configure (0, 0, $w, $h); 945 $self->child->configure (0, 0, $w, $h);
905 $self->update; 946 $self->update;
947
948 1
906} 949}
907 950
908sub set_offset { 951sub set_offset {
909 my ($self, $x, $y) = @_; 952 my ($self, $x, $y) = @_;
910 953
… …
973 $self->{vp}->set_offset (0, $_[1]); 1016 $self->{vp}->set_offset (0, $_[1]);
974 }, 1017 },
975 ; 1018 ;
976 1019
977 $self = $class->SUPER::new ( 1020 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1021 vp => (new CFClient::UI::ViewPort expand => 1),
1022 can_events => 1,
979 slider => $slider, 1023 slider => $slider,
980 %arg, 1024 %arg,
981 ); 1025 );
982 1026
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1027 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child; 1028 $self->add ($child) if $child;
985 1029
986 $self 1030 $self
987} 1031}
988 1032
1033#TODO# update range on size_allocate depending on child
1034
989sub add { 1035sub add {
990 my ($self, $widget) = @_; 1036 my ($self, $widget) = @_;
991 1037
992 $self->{vp}->add ($self->{child} = $widget); 1038 $self->{vp}->add ($self->{child} = $widget);
993} 1039}
994 1040
1041sub invoke_mouse_wheel {
1042 my ($self, $ev) = @_;
1043
1044 return 0 unless $ev->{dy}; # only vertical movements
1045
1046 $self->{slider}->emit (mouse_wheel => $ev);
1047
1048 1
1049}
1050
1051sub update_slider {
1052 my ($self) = @_;
1053
1054 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1055}
1056
995sub update { 1057sub update {
996 my ($self) = @_; 1058 my ($self) = @_;
997 1059
998 $self->SUPER::update; 1060 $self->SUPER::update;
999 1061
1000 # todo: overwrite size_allocate of child 1062 $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} 1063}
1004 1064
1005sub size_allocate { 1065sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h) = @_;
1007 1067
1068 $self->update_slider;
1069
1008 $self->SUPER::size_allocate ($w, $h); 1070 $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} 1071}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1072
1017############################################################################# 1073#############################################################################
1018 1074
1019package CFClient::UI::Frame; 1075package CFClient::UI::Frame;
1020 1076
… …
1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1127 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072 1128
1073sub new { 1129sub new {
1074 my ($class, %arg) = @_; 1130 my ($class, %arg) = @_;
1075 1131
1076 my $title = delete $arg{title};
1077
1078 my $self = $class->SUPER::new ( 1132 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1133 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1134 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1135 border => 0.6,
1082 can_events => 1, 1136 can_events => 1,
1083 min_w => 16, 1137 min_w => 64,
1084 min_h => 16, 1138 min_h => 32,
1085 %arg, 1139 %arg,
1086 ); 1140 );
1087 1141
1088 $self->{title} = new CFClient::UI::Label 1142 $self->{title_widget} = new CFClient::UI::Label
1089 align => 0, 1143 align => 0,
1090 valign => 1, 1144 valign => 1,
1091 text => $title, 1145 text => $self->{title},
1092 fontsize => $self->{border} 1146 fontsize => $self->{border},
1093 if defined $title; 1147 if exists $self->{title};
1148
1149 if ($self->{has_close_button}) {
1150 $self->{close_button} =
1151 new CFClient::UI::ImageButton
1152 path => 'x1_close.png',
1153 on_activate => sub { $self->emit ("delete") };
1154
1155 $self->CFClient::UI::Container::add ($self->{close_button});
1156 }
1094 1157
1095 $self 1158 $self
1096} 1159}
1097 1160
1098sub add { 1161sub add {
1099 my ($self, @widgets) = @_; 1162 my ($self, @widgets) = @_;
1100 1163
1101 $self->SUPER::add (@widgets); 1164 $self->SUPER::add (@widgets);
1165 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1166 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1167}
1104 1168
1105sub border { 1169sub border {
1106 int $_[0]{border} * $::FONTSIZE 1170 int $_[0]{border} * $::FONTSIZE
1107} 1171}
1108 1172
1109sub size_request { 1173sub size_request {
1110 my ($self) = @_; 1174 my ($self) = @_;
1111 1175
1112 $self->{title}->size_request 1176 $self->{title_widget}->size_request
1113 if $self->{title}; 1177 if $self->{title_widget};
1178
1179 $self->{close_button}->size_request
1180 if $self->{close_button};
1114 1181
1115 my ($w, $h) = $self->SUPER::size_request; 1182 my ($w, $h) = $self->SUPER::size_request;
1116 1183
1117 ( 1184 (
1118 $w + $self->border * 2, 1185 $w + $self->border * 2,
1119 $h + $self->border * 2, 1186 $h + $self->border * 2,
1120 ) 1187 )
1121} 1188}
1122 1189
1123sub size_allocate { 1190sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1191 my ($self, $w, $h) = @_;
1125 1192
1126 if ($self->{title}) { 1193 if ($self->{title_widget}) {
1127 $self->{title}{w} = $w; 1194 $self->{title_widget}{w} = $w;
1128 $self->{title}{h} = $h; 1195 $self->{title_widget}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h); 1196 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1197 }
1131 1198
1132 my $border = $self->border; 1199 my $border = $self->border;
1133 1200
1134 $h -= List::Util::max 0, $border * 2; 1201 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1202 $w -= List::Util::max 0, $border * 2;
1203
1204 $self->child->configure ($border, $border, $w, $h);
1205
1206 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1207 if $self->{close_button};
1208
1209 1
1210}
1211
1212sub invoke_delete {
1213 my ($self) = @_;
1214
1215 $self->hide;
1136 1216
1137 $self->child->configure ($border, $border, $w, $h); 1217 1
1138} 1218}
1139 1219
1140sub button_down { 1220sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
1142 1222
1143 my ($w, $h) = @$self{qw(w h)}; 1223 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1224 my $border = $self->border;
1145 1225
… …
1176 1256
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1257 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1258
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1259 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1260 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1261 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1262 };
1183 } else { 1263 } else {
1184 return 0; 1264 return 0;
1185 } 1265 }
1186 1266
1187 1 1267 1
1188} 1268}
1189 1269
1190sub button_up { 1270sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1271 my ($self, $ev, $x, $y) = @_;
1192 1272
1193 !!delete $self->{motion} 1273 ! ! delete $self->{motion}
1194} 1274}
1195 1275
1196sub mouse_motion { 1276sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1277 my ($self, $ev, $x, $y) = @_;
1198 1278
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1279 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1280
1201 !!$self->{motion} 1281 ! ! $self->{motion}
1202} 1282}
1203 1283
1204sub _draw { 1284sub _draw {
1205 my ($self) = @_; 1285 my ($self) = @_;
1206 1286
… …
1232 1312
1233 glDisable GL_TEXTURE_2D; 1313 glDisable GL_TEXTURE_2D;
1234 1314
1235 $child->draw; 1315 $child->draw;
1236 1316
1237 if ($self->{title}) { 1317 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1318 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1319 $self->{title_widget}->_draw;
1320
1321 glTranslate 0, - ($border - $self->{h});
1240 } 1322 }
1323
1324 $self->{close_button}->draw
1325 if $self->{close_button};
1241} 1326}
1242 1327
1243############################################################################# 1328#############################################################################
1244 1329
1245package CFClient::UI::Table; 1330package CFClient::UI::Table;
… …
1268 1353
1269 $child->set_parent ($self); 1354 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1355 $self->{children}[$y][$x] = $child;
1271 1356
1272 $self->realloc; 1357 $self->realloc;
1358}
1359
1360sub remove {
1361 my ($self, $child) = @_;
1362
1363 # TODO: not yet implemented
1273} 1364}
1274 1365
1275# TODO: move to container class maybe? send children a signal on removal? 1366# TODO: move to container class maybe? send children a signal on removal?
1276sub clear { 1367sub clear {
1277 my ($self) = @_; 1368 my ($self) = @_;
… …
1318 (sum @$ws), 1409 (sum @$ws),
1319 (sum @$hs), 1410 (sum @$hs),
1320 ) 1411 )
1321} 1412}
1322 1413
1323sub size_allocate { 1414sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1415 my ($self, $w, $h) = @_;
1325 1416
1326 my ($ws, $hs) = $self->get_wh; 1417 my ($ws, $hs) = $self->get_wh;
1327 1418
1328 my $req_w = (sum @$ws) || 1; 1419 my $req_w = (sum @$ws) || 1;
… …
1360 } 1451 }
1361 1452
1362 $y += $row_h; 1453 $y += $row_h;
1363 } 1454 }
1364 1455
1456 1
1365} 1457}
1366 1458
1367sub find_widget { 1459sub find_widget {
1368 my ($self, $x, $y) = @_; 1460 my ($self, $x, $y) = @_;
1369 1461
… …
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1498 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1499 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 ) 1500 )
1409} 1501}
1410 1502
1411sub size_allocate { 1503sub invoke_size_allocate {
1412 my ($self, $w, $h) = @_; 1504 my ($self, $w, $h) = @_;
1413 1505
1414 my $space = $self->{vertical} ? $h : $w; 1506 my $space = $self->{vertical} ? $h : $w;
1415 my $children = $self->{children}; 1507 my @children = $self->visible_children;
1416 1508
1417 my @req; 1509 my @req;
1418 1510
1419 if ($self->{homogeneous}) { 1511 if ($self->{homogeneous}) {
1420 @req = ($space / (@$children || 1)) x @$children; 1512 @req = ($space / (@children || 1)) x @children;
1421 } else { 1513 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1514 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423 my $req = List::Util::sum @req; 1515 my $req = List::Util::sum @req;
1424 1516
1425 if ($req > $space) { 1517 if ($req > $space) {
1426 # ah well, not enough space 1518 # ah well, not enough space
1427 $_ *= $space / $req for @req; 1519 $_ *= $space / $req for @req;
1428 } else { 1520 } else {
1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1521 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430 1522
1431 $space = ($space - $req) / $expand; # remaining space to give away 1523 $space = ($space - $req) / $expand; # remaining space to give away
1432 1524
1433 $req[$_] += $space * $children->[$_]{expand} 1525 $req[$_] += $space * $children[$_]{expand}
1434 for 0 .. $#$children; 1526 for 0 .. $#children;
1435 } 1527 }
1436 } 1528 }
1437 1529
1438 CFClient::UI::harmonize \@req; 1530 CFClient::UI::harmonize \@req;
1439 1531
1440 my $pos = 0; 1532 my $pos = 0;
1441 for (0 .. $#$children) { 1533 for (0 .. $#children) {
1442 my $alloc = $req[$_]; 1534 my $alloc = $req[$_];
1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1535 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444 1536
1445 $pos += $alloc; 1537 $pos += $alloc;
1446 } 1538 }
1447 1539
1448 1 1540 1
… …
1538 1630
1539 delete $self->{texture}; 1631 delete $self->{texture};
1540 $self->SUPER::update; 1632 $self->SUPER::update;
1541} 1633}
1542 1634
1635sub realloc {
1636 my ($self) = @_;
1637
1638 delete $self->{ox};
1639 $self->SUPER::realloc;
1640}
1641
1543sub set_text { 1642sub set_text {
1544 my ($self, $text) = @_; 1643 my ($self, $text) = @_;
1545 1644
1546 return if $self->{text} eq "T$text"; 1645 return if $self->{text} eq "T$text";
1547 $self->{text} = "T$text"; 1646 $self->{text} = "T$text";
1548 1647
1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1550 $self->{layout}->set_text ($text); 1648 $self->{layout}->set_text ($text);
1551 1649
1650 delete $self->{size_req};
1552 $self->realloc; 1651 $self->realloc;
1553 $self->update; 1652 $self->update;
1554} 1653}
1555 1654
1556sub set_markup { 1655sub set_markup {
… …
1559 return if $self->{text} eq "M$markup"; 1658 return if $self->{text} eq "M$markup";
1560 $self->{text} = "M$markup"; 1659 $self->{text} = "M$markup";
1561 1660
1562 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1661 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1563 1662
1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1565 $self->{layout}->set_markup ($markup); 1663 $self->{layout}->set_markup ($markup);
1566 1664
1665 delete $self->{size_req};
1567 $self->realloc; 1666 $self->realloc;
1568 $self->update; 1667 $self->update;
1569} 1668}
1570 1669
1571sub size_request { 1670sub size_request {
1572 my ($self) = @_; 1671 my ($self) = @_;
1573 1672
1673 $self->{size_req} ||= do {
1574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1674 $self->{layout}->set_font ($self->{font}) if $self->{font};
1575 $self->{layout}->set_width ($self->{max_w} || -1); 1675 $self->{layout}->set_width ($self->{max_w} || -1);
1576 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1676 $self->{layout}->set_ellipsise ($self->{ellipsise});
1577 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1677 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1578 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1678 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1579 1679
1580 my ($w, $h) = $self->{layout}->size; 1680 my ($w, $h) = $self->{layout}->size;
1581 1681
1582 if (exists $self->{template}) { 1682 if (exists $self->{template}) {
1583 $self->{template}->set_font ($self->{font}) if $self->{font}; 1683 $self->{template}->set_font ($self->{font}) if $self->{font};
1684 $self->{template}->set_width ($self->{max_w} || -1);
1584 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1685 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1585 1686
1586 my ($w2, $h2) = $self->{template}->size; 1687 my ($w2, $h2) = $self->{template}->size;
1587 1688
1588 $w = List::Util::max $w, $w2; 1689 $w = List::Util::max $w, $w2;
1589 $h = List::Util::max $h, $h2; 1690 $h = List::Util::max $h, $h2;
1691 }
1692
1693 [$w, $h]
1590 } 1694 };
1591 1695
1592 ($w, $h) 1696 @{ $self->{size_req} }
1593} 1697}
1594 1698
1699sub baseline_shift {
1700 $_[0]{layout}->descent
1701}
1702
1595sub size_allocate { 1703sub invoke_size_allocate {
1596 my ($self, $w, $h) = @_; 1704 my ($self, $w, $h) = @_;
1597 1705
1598 delete $self->{ox}; 1706 delete $self->{ox};
1599 1707
1600 delete $self->{texture} 1708 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1709 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1710
1711 1
1602} 1712}
1603 1713
1604sub set_fontsize { 1714sub set_fontsize {
1605 my ($self, $fontsize) = @_; 1715 my ($self, $fontsize) = @_;
1606 1716
1607 $self->{fontsize} = $fontsize; 1717 $self->{fontsize} = $fontsize;
1718 delete $self->{size_req};
1608 delete $self->{texture}; 1719 delete $self->{texture};
1609 1720
1610 $self->realloc; 1721 $self->realloc;
1611} 1722}
1612 1723
1724sub reconfigure {
1725 my ($self) = @_;
1726
1727 delete $self->{size_req};
1728 delete $self->{texture};
1729
1730 $self->SUPER::reconfigure;
1731}
1732
1613sub _draw { 1733sub _draw {
1614 my ($self) = @_; 1734 my ($self) = @_;
1615 1735
1616 $self->SUPER::_draw; # draw background, if applicable 1736 $self->SUPER::_draw; # draw background, if applicable
1617 1737
1618 my $tex = $self->{texture} ||= do { 1738 my $size = $self->{texture} ||= do {
1619 $self->{layout}->set_foreground (@{$self->{fg}}); 1739 $self->{layout}->set_foreground (@{$self->{fg}});
1620 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1740 $self->{layout}->set_font ($self->{font}) if $self->{font};
1621 $self->{layout}->set_width ($self->{w}); 1741 $self->{layout}->set_width ($self->{w});
1622 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1742 $self->{layout}->set_ellipsise ($self->{ellipsise});
1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1743 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1744 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1745
1626 new_from_layout CFClient::Texture $self->{layout} 1746 [$self->{layout}->size]
1627 }; 1747 };
1628 1748
1629 unless (exists $self->{ox}) { 1749 unless (exists $self->{ox}) {
1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1750 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1751 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1632 : ($self->{w} - $tex->{w}) * 0.5); 1752 : ($self->{w} - $size->[0]) * 0.5);
1633 1753
1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1754 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1755 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1636 : ($self->{h} - $tex->{h}) * 0.5); 1756 : ($self->{h} - $size->[1]) * 0.5);
1637 }; 1757 };
1638 1758
1639 glEnable GL_TEXTURE_2D; 1759 my $w = List::Util::min $self->{w} + 4, $size->[0];
1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1760 my $h = List::Util::min $self->{h} + 2, $size->[1];
1641 1761
1642 glColor_premultiply @{$self->{fg}} 1762 $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} 1763}
1649 1764
1650############################################################################# 1765#############################################################################
1651 1766
1652package CFClient::UI::EntryBase; 1767package CFClient::UI::EntryBase;
… …
1666 can_hover => 1, 1781 can_hover => 1,
1667 can_focus => 1, 1782 can_focus => 1,
1668 valign => 0, 1783 valign => 0,
1669 can_events => 1, 1784 can_events => 1,
1670 #text => ... 1785 #text => ...
1786 #hidden => "*",
1671 @_ 1787 @_
1672 ) 1788 )
1673} 1789}
1674 1790
1675sub _set_text { 1791sub _set_text {
… …
1682 $self->{last_activity} = $::NOW; 1798 $self->{last_activity} = $::NOW;
1683 $self->{text} = $text; 1799 $self->{text} = $text;
1684 1800
1685 $text =~ s/./*/g if $self->{hidden}; 1801 $text =~ s/./*/g if $self->{hidden};
1686 $self->{layout}->set_text ("$text "); 1802 $self->{layout}->set_text ("$text ");
1803 delete $self->{size_req};
1687 1804
1688 $self->_emit (changed => $self->{text}); 1805 $self->emit (changed => $self->{text});
1806
1807 $self->realloc;
1689 $self->update; 1808 $self->update;
1690} 1809}
1691 1810
1692sub set_text { 1811sub set_text {
1693 my ($self, $text) = @_; 1812 my ($self, $text) = @_;
1694 1813
1695 $self->{cursor} = length $text; 1814 $self->{cursor} = length $text;
1696 $self->_set_text ($text); 1815 $self->_set_text ($text);
1697
1698 $self->realloc;
1699} 1816}
1700 1817
1701sub get_text { 1818sub get_text {
1702 $_[0]{text} 1819 $_[0]{text}
1703} 1820}
… …
1708 my ($w, $h) = $self->SUPER::size_request; 1825 my ($w, $h) = $self->SUPER::size_request;
1709 1826
1710 ($w + 1, $h) # add 1 for cursor 1827 ($w + 1, $h) # add 1 for cursor
1711} 1828}
1712 1829
1713sub key_down { 1830sub invoke_key_down {
1714 my ($self, $ev) = @_; 1831 my ($self, $ev) = @_;
1715 1832
1716 my $mod = $ev->{mod}; 1833 my $mod = $ev->{mod};
1717 my $sym = $ev->{sym}; 1834 my $sym = $ev->{sym};
1718 my $uni = $ev->{unicode}; 1835 my $uni = $ev->{unicode};
… …
1730 } elsif ($sym == CFClient::SDLK_HOME) { 1847 } elsif ($sym == CFClient::SDLK_HOME) {
1731 $self->{cursor} = 0; 1848 $self->{cursor} = 0;
1732 } elsif ($sym == CFClient::SDLK_END) { 1849 } elsif ($sym == CFClient::SDLK_END) {
1733 $self->{cursor} = length $text; 1850 $self->{cursor} = length $text;
1734 } elsif ($uni == 27) { 1851 } elsif ($uni == 27) {
1735 $self->_emit ('escape'); 1852 $self->emit ('escape');
1736 } elsif ($uni) { 1853 } elsif ($uni) {
1737 substr $text, $self->{cursor}++, 0, chr $uni; 1854 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else { 1855 } else {
1739 return 0; 1856 return 0;
1740 } 1857 }
… …
1744 $self->realloc; 1861 $self->realloc;
1745 1862
1746 1 1863 1
1747} 1864}
1748 1865
1749sub focus_in { 1866sub invoke_focus_in {
1750 my ($self) = @_; 1867 my ($self) = @_;
1751 1868
1752 $self->{last_activity} = $::NOW; 1869 $self->{last_activity} = $::NOW;
1753 1870
1754 $self->SUPER::focus_in; 1871 $self->SUPER::invoke_focus_in
1755} 1872}
1756 1873
1757sub button_down { 1874sub invoke_button_down {
1758 my ($self, $ev, $x, $y) = @_; 1875 my ($self, $ev, $x, $y) = @_;
1759 1876
1760 $self->SUPER::button_down ($ev, $x, $y); 1877 $self->SUPER::invoke_button_down ($ev, $x, $y);
1761 1878
1762 my $idx = $self->{layout}->xy_to_index ($x, $y); 1879 my $idx = $self->{layout}->xy_to_index ($x, $y);
1763 1880
1764 # byte-index to char-index 1881 # byte-index to char-index
1765 my $text = $self->{text}; 1882 my $text = $self->{text};
1766 utf8::encode $text; 1883 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1767 $self->{cursor} = length substr $text, 0, $idx; 1884 $self->{cursor} = length $text;
1768 1885
1769 $self->_set_text ($self->{text}); 1886 $self->_set_text ($self->{text});
1770 $self->update; 1887 $self->update;
1771 1888
1772 1 1889 1
1773} 1890}
1774 1891
1775sub mouse_motion { 1892sub invoke_mouse_motion {
1776 my ($self, $ev, $x, $y) = @_; 1893 my ($self, $ev, $x, $y) = @_;
1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1894# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778 1895
1779 0 1896 1
1780} 1897}
1781 1898
1782sub _draw { 1899sub _draw {
1783 my ($self) = @_; 1900 my ($self) = @_;
1784 1901
… …
1825 1942
1826our @ISA = CFClient::UI::EntryBase::; 1943our @ISA = CFClient::UI::EntryBase::;
1827 1944
1828use CFClient::OpenGL; 1945use CFClient::OpenGL;
1829 1946
1830sub key_down { 1947sub invoke_key_down {
1831 my ($self, $ev) = @_; 1948 my ($self, $ev) = @_;
1832 1949
1833 my $sym = $ev->{sym}; 1950 my $sym = $ev->{sym};
1834 1951
1835 if ($sym == 13) { 1952 if ($sym == 13) {
1836 unshift @{$self->{history}}, 1953 unshift @{$self->{history}},
1837 my $txt = $self->get_text; 1954 my $txt = $self->get_text;
1955
1838 $self->{history_pointer} = -1; 1956 $self->{history_pointer} = -1;
1839 $self->{history_saveback} = ''; 1957 $self->{history_saveback} = '';
1840 $self->_emit (activate => $txt); 1958 $self->emit (activate => $txt);
1841 $self->update; 1959 $self->update;
1842 1960
1843 } elsif ($sym == CFClient::SDLK_UP) { 1961 } elsif ($sym == CFClient::SDLK_UP) {
1844 if ($self->{history_pointer} < 0) { 1962 if ($self->{history_pointer} < 0) {
1845 $self->{history_saveback} = $self->get_text; 1963 $self->{history_saveback} = $self->get_text;
… …
1861 } else { 1979 } else {
1862 $self->set_text ($self->{history_saveback}); 1980 $self->set_text ($self->{history_saveback});
1863 } 1981 }
1864 1982
1865 } else { 1983 } else {
1866 return $self->SUPER::key_down ($ev) 1984 return $self->SUPER::invoke_key_down ($ev)
1867 } 1985 }
1868 1986
1869 1 1987 1
1870} 1988}
1871 1989
… …
1895 can_events => 1, 2013 can_events => 1,
1896 @_ 2014 @_
1897 ) 2015 )
1898} 2016}
1899 2017
1900sub activate { }
1901
1902sub button_up { 2018sub invoke_button_up {
1903 my ($self, $ev, $x, $y) = @_; 2019 my ($self, $ev, $x, $y) = @_;
1904 2020
1905 $self->emit ("activate") 2021 $self->emit ("activate")
1906 if $x >= 0 && $x < $self->{w} 2022 if $x >= 0 && $x < $self->{w}
1907 && $y >= 0 && $y < $self->{h}; 2023 && $y >= 0 && $y < $self->{h};
… …
1921 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2037 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1922 2038
1923 glDisable GL_TEXTURE_2D; 2039 glDisable GL_TEXTURE_2D;
1924 2040
1925 $self->SUPER::_draw; 2041 $self->SUPER::_draw;
2042}
2043
2044#############################################################################
2045
2046package CFClient::UI::ImageButton;
2047
2048our @ISA = CFClient::UI::Image::;
2049
2050use CFClient::OpenGL;
2051
2052my %textures;
2053
2054sub new {
2055 my $class = shift;
2056
2057 my $self = $class->SUPER::new (
2058 padding_x => 4,
2059 padding_y => 4,
2060 fg => [1, 1, 1],
2061 active_fg => [0, 0, 1],
2062 can_hover => 1,
2063 align => 0,
2064 valign => 0,
2065 can_events => 1,
2066 @_
2067 );
2068}
2069
2070sub invoke_button_up {
2071 my ($self, $ev, $x, $y) = @_;
2072
2073 $self->emit ("activate")
2074 if $x >= 0 && $x < $self->{w}
2075 && $y >= 0 && $y < $self->{h};
2076
2077 1
1926} 2078}
1927 2079
1928############################################################################# 2080#############################################################################
1929 2081
1930package CFClient::UI::CheckBox; 2082package CFClient::UI::CheckBox;
… …
1957 my ($self) = @_; 2109 my ($self) = @_;
1958 2110
1959 (6) x 2 2111 (6) x 2
1960} 2112}
1961 2113
2114sub toggle {
2115 my ($self) = @_;
2116
2117 $self->{state} = !$self->{state};
2118 $self->emit (changed => $self->{state});
2119 $self->update;
2120}
2121
1962sub button_down { 2122sub invoke_button_down {
1963 my ($self, $ev, $x, $y) = @_; 2123 my ($self, $ev, $x, $y) = @_;
1964 2124
1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2125 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2126 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1967 $self->{state} = !$self->{state}; 2127 $self->toggle;
1968 $self->_emit (changed => $self->{state});
1969 } else { 2128 } else {
1970 return 0 2129 return 0
1971 } 2130 }
1972 2131
1973 1 2132 1
… …
1998package CFClient::UI::Image; 2157package CFClient::UI::Image;
1999 2158
2000our @ISA = CFClient::UI::Base::; 2159our @ISA = CFClient::UI::Base::;
2001 2160
2002use CFClient::OpenGL; 2161use CFClient::OpenGL;
2003use Carp qw/confess/;
2004 2162
2005our %loaded_images; 2163our %texture_cache;
2006 2164
2007sub new { 2165sub new {
2008 my $class = shift; 2166 my $class = shift;
2009 2167
2010 my $self = $class->SUPER::new (can_events => 0, @_); 2168 my $self = $class->SUPER::new (
2169 can_events => 0,
2170 @_,
2171 );
2011 2172
2012 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2173 $self->{path} || $self->{tex}
2174 or Carp::croak "'path' or 'tex' attributes required";
2013 2175
2014 $loaded_images{$self->{image}} ||= 2176 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2015 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2177 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2016 2178
2017 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2179 Scalar::Util::weaken $texture_cache{$self->{path}};
2018 2180
2019 Scalar::Util::weaken $loaded_images{$self->{image}}; 2181 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2020
2021 $self->{aspect} = $tex->{w} / $tex->{h};
2022 2182
2023 $self 2183 $self
2024} 2184}
2025 2185
2026sub size_request { 2186sub size_request {
2027 my ($self) = @_; 2187 my ($self) = @_;
2028 2188
2029 ($self->{tex}->{w}, $self->{tex}->{h}) 2189 ($self->{tex}{w}, $self->{tex}{h})
2030} 2190}
2031 2191
2032sub _draw { 2192sub _draw {
2033 my ($self) = @_; 2193 my ($self) = @_;
2034 2194
… …
2143 my $ycut1 = max 0, min 1, $ycut; 2303 my $ycut1 = max 0, min 1, $ycut;
2144 my $ycut2 = max 0, min 1, $ycut - 1; 2304 my $ycut2 = max 0, min 1, $ycut - 1;
2145 2305
2146 my $h1 = $self->{h} * (1 - $ycut1); 2306 my $h1 = $self->{h} * (1 - $ycut1);
2147 my $h2 = $self->{h} * (1 - $ycut2); 2307 my $h2 = $self->{h} * (1 - $ycut2);
2308 my $h3 = $self->{h};
2309
2310 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2148 2311
2149 glEnable GL_BLEND; 2312 glEnable GL_BLEND;
2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2313 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2314 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2152 glEnable GL_TEXTURE_2D; 2315 glEnable GL_TEXTURE_2D;
… …
2171 2334
2172 if ($t3) { 2335 if ($t3) {
2173 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2336 glBindTexture GL_TEXTURE_2D, $t3->{name};
2174 glBegin GL_QUADS; 2337 glBegin GL_QUADS;
2175 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2338 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2176 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2339 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2177 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2340 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2178 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2341 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2179 glEnd; 2342 glEnd;
2180 } 2343 }
2181 2344
2182 glDisable GL_BLEND; 2345 glDisable GL_BLEND;
… …
2270 $self->update; 2433 $self->update;
2271 2434
2272 $self 2435 $self
2273} 2436}
2274 2437
2275sub changed { }
2276
2277sub set_range { 2438sub set_range {
2278 my ($self, $range) = @_; 2439 my ($self, $range) = @_;
2279 2440
2280 ($range, $self->{range}) = ($self->{range}, $range); 2441 ($range, $self->{range}) = ($self->{range}, $range);
2281 2442
2282 $self->update
2283 if "@$range" ne "@{$self->{range}}"; 2443 if ("@$range" ne "@{$self->{range}}") {
2444 $self->update;
2445 $self->set_value ($self->{range}[0]);
2446 }
2284} 2447}
2285 2448
2286sub set_value { 2449sub set_value {
2287 my ($self, $value) = @_; 2450 my ($self, $value) = @_;
2288 2451
… …
2299 if $unit; 2462 if $unit;
2300 2463
2301 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2464 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2302 2465
2303 if ($value != $old_value) { 2466 if ($value != $old_value) {
2304 $self->_emit (changed => $value); 2467 $self->emit (changed => $value);
2305 $self->update; 2468 $self->update;
2306 } 2469 }
2307} 2470}
2308 2471
2309sub size_request { 2472sub size_request {
2310 my ($self) = @_; 2473 my ($self) = @_;
2311 2474
2312 ($self->{req_w}, $self->{req_h}) 2475 ($self->{req_w}, $self->{req_h})
2313} 2476}
2314 2477
2315sub button_down { 2478sub invoke_button_down {
2316 my ($self, $ev, $x, $y) = @_; 2479 my ($self, $ev, $x, $y) = @_;
2317 2480
2318 $self->SUPER::button_down ($ev, $x, $y); 2481 $self->SUPER::invoke_button_down ($ev, $x, $y);
2319 2482
2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2483 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2321 2484
2322 $self->mouse_motion ($ev, $x, $y) 2485 $self->invoke_mouse_motion ($ev, $x, $y)
2323} 2486}
2324 2487
2325sub mouse_motion { 2488sub invoke_mouse_motion {
2326 my ($self, $ev, $x, $y) = @_; 2489 my ($self, $ev, $x, $y) = @_;
2327 2490
2328 if ($GRAB == $self) { 2491 if ($GRAB == $self) {
2329 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2492 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2330 2493
… …
2336 } else { 2499 } else {
2337 return 0; 2500 return 0;
2338 } 2501 }
2339 2502
2340 1 2503 1
2504}
2505
2506sub invoke_mouse_wheel {
2507 my ($self, $ev) = @_;
2508
2509 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510
2511 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2512
2513 ! ! $delta
2341} 2514}
2342 2515
2343sub update { 2516sub update {
2344 my ($self) = @_; 2517 my ($self) = @_;
2345 2518
… …
2435sub set_range { shift->{slider}->set_range (@_) } 2608sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 2609sub set_value { shift->{slider}->set_value (@_) }
2437 2610
2438############################################################################# 2611#############################################################################
2439 2612
2440package CFClient::UI::TextView; 2613package CFClient::UI::TextScroller;
2441 2614
2442our @ISA = CFClient::UI::HBox::; 2615our @ISA = CFClient::UI::HBox::;
2443 2616
2444use CFClient::OpenGL; 2617use CFClient::OpenGL;
2445 2618
2446sub new { 2619sub new {
2447 my $class = shift; 2620 my $class = shift;
2448 2621
2449 my $self = $class->SUPER::new ( 2622 my $self = $class->SUPER::new (
2450 fontsize => 1, 2623 fontsize => 1,
2451 can_events => 0, 2624 can_events => 1,
2625 indent => 0,
2452 #font => default_font 2626 #font => default_font
2453 @_, 2627 @_,
2454 2628
2455 layout => (new CFClient::Layout 1), 2629 layout => (new CFClient::Layout),
2456 par => [], 2630 par => [],
2457 height => 0, 2631 height => 0,
2458 children => [ 2632 children => [
2459 (new CFClient::UI::Empty expand => 1), 2633 (new CFClient::UI::Empty expand => 1),
2460 (new CFClient::UI::Slider vertical => 1), 2634 (new CFClient::UI::Slider vertical => 1),
… …
2471 2645
2472 $self->{fontsize} = $fontsize; 2646 $self->{fontsize} = $fontsize;
2473 $self->reflow; 2647 $self->reflow;
2474} 2648}
2475 2649
2650sub size_request {
2651 my ($self) = @_;
2652
2653 my ($empty, $slider) = @{ $self->{children} };
2654
2655 local $self->{children} = [$empty, $slider];
2656 $self->SUPER::size_request
2657}
2658
2476sub size_allocate { 2659sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 2660 my ($self, $w, $h) = @_;
2478 2661
2479 $self->SUPER::size_allocate ($w, $h); 2662 my ($empty, $slider, @other) = @{ $self->{children} };
2663 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2480 2664
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2665 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2666 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $self->{layout}->set_width ($self->{children}[0]{w}); 2667 $self->{layout}->set_width ($empty->{w});
2668 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2484 2669
2485 $self->reflow; 2670 $self->reflow;
2486}
2487 2671
2488sub text_size { 2672 local $self->{children} = [$empty, $slider];
2673 $self->SUPER::invoke_size_allocate ($w, $h)
2674}
2675
2676sub invoke_mouse_wheel {
2489 my ($self, $text, $indent) = @_; 2677 my ($self, $ev) = @_;
2678
2679 return 0 unless $ev->{dy}; # only vertical movements
2680
2681 $self->{children}[1]->emit (mouse_wheel => $ev);
2682
2683 1
2684}
2685
2686sub get_layout {
2687 my ($self, $para) = @_;
2490 2688
2491 my $layout = $self->{layout}; 2689 my $layout = $self->{layout};
2492 2690
2691 $layout->set_font ($self->{font}) if $self->{font};
2692 $layout->set_foreground (@{$para->{fg}});
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent); 2694 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2495 $layout->set_markup ($text); 2696 $layout->set_markup ($para->{markup});
2697
2698 $layout->set_shapes (
2699 map
2700 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2701 @{$para->{widget}}
2496 2702 );
2703
2497 $layout->size 2704 $layout
2498} 2705}
2499 2706
2500sub reflow { 2707sub reflow {
2501 my ($self) = @_; 2708 my ($self) = @_;
2502 2709
… …
2511 $self->{children}[1]->set_value ($offset); 2718 $self->{children}[1]->set_value ($offset);
2512} 2719}
2513 2720
2514sub clear { 2721sub clear {
2515 my ($self) = @_; 2722 my ($self) = @_;
2723
2724 my (undef, undef, @other) = @{ $self->{children} };
2725 $self->remove ($_) for @other;
2516 2726
2517 $self->{par} = []; 2727 $self->{par} = [];
2518 $self->{height} = 0; 2728 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2729 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520} 2730}
2521 2731
2522sub add_paragraph { 2732sub add_paragraph {
2523 my ($self, $color, $text, $indent) = @_; 2733 my ($self, $color, $para, $indent) = @_;
2524 2734
2525 for my $line (split /\n/, $text) { 2735 my ($text, @w) = ref $para ? @$para : $para;
2526 my ($w, $h) = $self->text_size ($line); 2736
2527 $self->{height} += $h; 2737 $para = {
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2738 w => 1e10,
2739 wrapped => 1,
2740 fg => $color,
2741 indent => $indent,
2742 markup => $text,
2743 widget => \@w,
2529 } 2744 };
2530 2745
2531 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2746 $self->add (@w) if @w;
2747 push @{$self->{par}}, $para;
2748
2749 $self->{need_reflow}++;
2750 $self->update;
2751}
2752
2753sub scroll_to_bottom {
2754 my ($self) = @_;
2755
2756 $self->{scroll_to_bottom} = 1;
2757 $self->update;
2532} 2758}
2533 2759
2534sub update { 2760sub update {
2535 my ($self) = @_; 2761 my ($self) = @_;
2536 2762
… …
2538 2764
2539 return unless $self->{h} > 0; 2765 return unless $self->{h} > 0;
2540 2766
2541 delete $self->{texture}; 2767 delete $self->{texture};
2542 2768
2543 $ROOT->on_post_alloc ($self, sub { 2769 $ROOT->on_post_alloc ($self => sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2770 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 2771
2546 if (delete $self->{need_reflow}) { 2772 if (delete $self->{need_reflow}) {
2547 my $height = 0; 2773 my $height = 0;
2548 2774
2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2553 for (@{$self->{par}}) { 2775 for my $para (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2776 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2555 $layout->set_width ($W - $_->[3]); 2777 my $layout = $self->get_layout ($para);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size; 2778 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3]; 2779
2559 $_->[1] = $h; 2780 $para->{w} = $w + $para->{indent};
2781 $para->{h} = $h;
2782 $para->{wrapped} = $layout->has_wrapped;
2560 } 2783 }
2561 2784
2562 $height += $_->[1]; 2785 $height += $para->{h};
2563 } 2786 }
2564 2787
2565 $self->{height} = $height; 2788 $self->{height} = $height;
2566 2789
2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2790 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2568 2791
2569 delete $self->{texture}; 2792 delete $self->{texture};
2793 }
2794
2795 if (delete $self->{scroll_to_bottom}) {
2796 $self->{children}[1]->set_value (1e10);
2570 } 2797 }
2571 2798
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2799 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2573 glClearColor 0, 0, 0, 0; 2800 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 2801 glClear GL_COLOR_BUFFER_BIT;
… …
2578 my $y0 = $top; 2805 my $y0 = $top;
2579 my $y1 = $top + $H; 2806 my $y1 = $top + $H;
2580 2807
2581 my $y = 0; 2808 my $y = 0;
2582 2809
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}}) { 2810 for my $para (@{$self->{par}}) {
2592 my $h = $par->[1]; 2811 my $h = $para->{h};
2593 2812
2594 if ($y0 < $y + $h && $y < $y1) { 2813 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 2814
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2815 my $layout = $self->get_layout ($para);
2600 2816
2601 glRasterPos $par->[3], $y - $y0; 2817 $layout->render ($para->{indent}, $y - $y0);
2602 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2818
2819 if (my @w = @{ $para->{widget} }) {
2820 my @s = $layout->get_shapes;
2821
2822 for (@w) {
2823 my ($dx, $dy) = splice @s, 0, 2, ();
2824
2825 $_->{x} = $dx + $para->{indent};
2826 $_->{y} = $dy + $y - $y0;
2827
2828 $_->draw;
2829 }
2830 }
2603 } 2831 }
2604 2832
2605 $y += $h; 2833 $y += $h;
2606 } 2834 }
2607
2608 glDisable GL_BLEND;
2609 }; 2835 };
2610 }); 2836 });
2837}
2838
2839sub reconfigure {
2840 my ($self) = @_;
2841
2842 $self->SUPER::reconfigure;
2843
2844 $_->{w} = 1e10 for @{ $self->{par} };
2845 $self->reflow;
2611} 2846}
2612 2847
2613sub _draw { 2848sub _draw {
2614 my ($self) = @_; 2849 my ($self) = @_;
2615 2850
… …
2618 glColor 0, 0, 0, 1; 2853 glColor 0, 0, 0, 1;
2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2854 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2620 glDisable GL_TEXTURE_2D; 2855 glDisable GL_TEXTURE_2D;
2621 2856
2622 $self->{children}[1]->draw; 2857 $self->{children}[1]->draw;
2623
2624} 2858}
2625 2859
2626############################################################################# 2860#############################################################################
2627 2861
2628package CFClient::UI::Animator; 2862package CFClient::UI::Animator;
… …
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 2949 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2950 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 2951 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 2952 . "visible $widget->{visible}";
2719 } 2953 }
2954
2955 $tooltip =~ s/^\n+//;
2956 $tooltip =~ s/\n+$//;
2720 2957
2721 $self->add (new CFClient::UI::Label 2958 $self->add (new CFClient::UI::Label
2722 markup => $tooltip, 2959 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2960 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 2961 fontsize => 0.8,
… …
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2971 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735 2972
2736 ($w + 4, $h + 4) 2973 ($w + 4, $h + 4)
2737} 2974}
2738 2975
2739sub size_allocate { 2976sub invoke_size_allocate {
2740 my ($self, $w, $h) = @_; 2977 my ($self, $w, $h) = @_;
2741 2978
2742 $self->SUPER::size_allocate ($w - 4, $h - 4); 2979 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743} 2980}
2744 2981
2745sub visibility_change { 2982sub invoke_visibility_change {
2746 my ($self, $visible) = @_; 2983 my ($self, $visible) = @_;
2747 2984
2748 return unless $visible; 2985 return unless $visible;
2749 2986
2750 $self->{root}->on_post_alloc ("move_$self" => sub { 2987 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2752 or return; 2989 or return;
2753 2990
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2991 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 2992
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2993 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 2994 if $x + $self->{w} > $self->{root}{w};
2758 2995
2759 $self->move_abs ($x, $y); 2996 $self->move_abs ($x, $y);
2760 }); 2997 });
2761} 2998}
2762 2999
… …
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3094 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 3095 glDisable GL_TEXTURE_2D;
2859 } 3096 }
2860} 3097}
2861 3098
2862sub DESTROY { 3099sub destroy {
2863 my ($self) = @_; 3100 my ($self) = @_;
2864 3101
2865 $self->{timer}->cancel 3102 $self->{timer}->cancel
2866 if $self->{timer}; 3103 if $self->{timer};
2867 3104
2868 $self->SUPER::DESTROY; 3105 $self->SUPER::destroy;
2869} 3106}
2870 3107
2871############################################################################# 3108#############################################################################
2872 3109
2873package CFClient::UI::Buttonbar; 3110package CFClient::UI::Buttonbar;
… …
2894 ); 3131 );
2895 3132
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3133 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2897 3134
2898 for my $item (@{ $self->{items} }) { 3135 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 3136 my ($widget, $cb, $tooltip) = @$item;
2900 3137
2901 # handle various types of items, only text for now 3138 # handle various types of items, only text for now
2902 if (!ref $widget) { 3139 if (!ref $widget) {
3140 if ($widget =~ /\t/) {
3141 my ($left, $right) = split /\t/, $widget, 2;
3142
3143 $widget = new CFClient::UI::HBox
3144 can_hover => 1,
3145 can_events => 1,
3146 tooltip => $tooltip,
3147 children => [
3148 (new CFClient::UI::Label markup => $left, expand => 1),
3149 (new CFClient::UI::Label markup => $right, align => +1),
3150 ],
3151 ;
3152
3153 } else {
2903 $widget = new CFClient::UI::Label 3154 $widget = new CFClient::UI::Label
2904 can_hover => 1, 3155 can_hover => 1,
2905 can_events => 1, 3156 can_events => 1,
2906 text => $widget; 3157 markup => $widget,
3158 tooltip => $tooltip;
3159 }
2907 } 3160 }
2908 3161
2909 $self->{item}{$widget} = $item; 3162 $self->{item}{$widget} = $item;
2910 3163
2911 $self->{vbox}->add ($widget); 3164 $self->{vbox}->add ($widget);
… …
2916 3169
2917# popup given the event (must be a mouse button down event currently) 3170# popup given the event (must be a mouse button down event currently)
2918sub popup { 3171sub popup {
2919 my ($self, $ev) = @_; 3172 my ($self, $ev) = @_;
2920 3173
2921 $self->_emit ("popdown"); 3174 $self->emit ("popdown");
2922 3175
2923 # maybe save $GRAB? must be careful about events... 3176 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self; 3177 $GRAB = $self;
2925 $self->{button} = $ev->{button}; 3178 $self->{button} = $ev->{button};
2926 3179
2927 $self->show; 3180 $self->show;
2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3181 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2929} 3182}
2930 3183
2931sub mouse_motion { 3184sub invoke_mouse_motion {
2932 my ($self, $ev, $x, $y) = @_; 3185 my ($self, $ev, $x, $y) = @_;
2933 3186
2934 # TODO: should use vbox->find_widget or so 3187 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3188 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER}; 3189 $self->{hover} = $self->{item}{$HOVER};
2937 3190
2938 0 3191 0
2939} 3192}
2940 3193
2941sub button_up { 3194sub invoke_button_up {
2942 my ($self, $ev, $x, $y) = @_; 3195 my ($self, $ev, $x, $y) = @_;
2943 3196
2944 if ($ev->{button} == $self->{button}) { 3197 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB; 3198 undef $GRAB;
2946 $self->hide; 3199 $self->hide;
2947 3200
2948 $self->_emit ("popdown"); 3201 $self->emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover}; 3202 $self->{hover}[1]->() if $self->{hover};
2950 } else { 3203 } else {
2951 return 0 3204 return 0
2952 } 3205 }
2953 3206
… …
2980 3233
2981 $self->{current} = $self->{children}[0] 3234 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} }; 3235 if @{ $self->{children} };
2983} 3236}
2984 3237
3238sub get_current_page {
3239 my ($self) = @_;
3240
3241 $self->{current}
3242}
3243
2985sub set_current_page { 3244sub set_current_page {
2986 my ($self, $page_or_widget) = @_; 3245 my ($self, $page_or_widget) = @_;
2987 3246
2988 my $widget = ref $page_or_widget 3247 my $widget = ref $page_or_widget
2989 ? $page_or_widget 3248 ? $page_or_widget
2990 : $self->{children}[$page_or_widget]; 3249 : $self->{children}[$page_or_widget];
2991 3250
2992 $self->{current} = $widget; 3251 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3252 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994 3253
2995 $self->_emit (page_changed => $self->{current}); 3254 $self->emit (page_changed => $self->{current});
2996 3255
2997 $self->realloc; 3256 $self->realloc;
2998} 3257}
2999 3258
3000sub visible_children { 3259sub visible_children {
… …
3005 my ($self) = @_; 3264 my ($self) = @_;
3006 3265
3007 $self->{current}->size_request 3266 $self->{current}->size_request
3008} 3267}
3009 3268
3010sub size_allocate { 3269sub invoke_size_allocate {
3011 my ($self, $w, $h) = @_; 3270 my ($self, $w, $h) = @_;
3012 3271
3013 $self->{current}->configure (0, 0, $w, $h); 3272 $self->{current}->configure (0, 0, $w, $h);
3273
3274 1
3014} 3275}
3015 3276
3016sub _draw { 3277sub _draw {
3017 my ($self) = @_; 3278 my ($self) = @_;
3018 3279
… …
3053 ); 3314 );
3054 3315
3055 $self->{multiplexer}->add ($widget); 3316 $self->{multiplexer}->add ($widget);
3056} 3317}
3057 3318
3319sub get_current_page {
3320 my ($self) = @_;
3321
3322 $self->{multiplexer}->get_current_page
3323}
3324
3058sub set_current_page { 3325sub set_current_page {
3059 my ($self, $page) = @_; 3326 my ($self, $page) = @_;
3060 3327
3061 $self->{multiplexer}->set_current_page ($page); 3328 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current}); 3329 $self->emit (page_changed => $self->{multiplexer}{current});
3330}
3331
3332#############################################################################
3333
3334package CFClient::UI::Combobox;
3335
3336use utf8;
3337
3338our @ISA = CFClient::UI::Button::;
3339
3340sub new {
3341 my $class = shift;
3342
3343 my $self = $class->SUPER::new (
3344 options => [], # [value, title, longdesc], ...
3345 value => undef,
3346 @_,
3347 );
3348
3349 $self->_set_value ($self->{value});
3350
3351 $self
3352}
3353
3354sub invoke_button_down {
3355 my ($self, $ev) = @_;
3356
3357 my @menu_items;
3358
3359 for (@{ $self->{options} }) {
3360 my ($value, $title, $tooltip) = @$_;
3361
3362 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3363 }
3364
3365 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3366}
3367
3368sub _set_value {
3369 my ($self, $value) = @_;
3370
3371 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3372 or return;
3373
3374 $self->{value} = $item->[0];
3375 $self->set_markup ("$item->[1] ⇓");
3376 $self->set_tooltip ($item->[2]);
3377}
3378
3379sub set_value {
3380 my ($self, $value) = @_;
3381
3382 return unless $self->{value} ne $value;
3383
3384 $self->_set_value ($value);
3385 $self->emit (changed => $value);
3063} 3386}
3064 3387
3065############################################################################# 3388#############################################################################
3066 3389
3067package CFClient::UI::Statusbox; 3390package CFClient::UI::Statusbox;
… …
3076 @_, 3399 @_,
3077 ); 3400 );
3078 3401
3079 Scalar::Util::weaken (my $this = $self); 3402 Scalar::Util::weaken (my $this = $self);
3080 3403
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { 3404 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3082 $this->reorder;
3083 $this->update;
3084 });
3085 3405
3086 $self 3406 $self
3087} 3407}
3088 3408
3089sub reorder { 3409sub reorder {
3090 my ($self) = @_; 3410 my ($self) = @_;
3091 my $NOW = Time::HiRes::time; 3411 my $NOW = Time::HiRes::time;
3412
3413 # freeze display when hovering over any label
3414 return if $CFClient::UI::TOOLTIP->{owner}
3415 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3416 values %{ $self->{item} };
3092 3417
3093 while (my ($k, $v) = each %{ $self->{item} }) { 3418 while (my ($k, $v) = each %{ $self->{item} }) {
3094 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3419 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3095 } 3420 }
3096 3421
… …
3105 3430
3106 my $count = 10 + 1; 3431 my $count = 10 + 1;
3107 for my $item (@items) { 3432 for my $item (@items) {
3108 last unless --$count; 3433 last unless --$count;
3109 3434
3110 push @widgets, $item->{label} ||= do { 3435 my $label = $item->{label} ||= do {
3111 # TODO: doesn't handle markup well (read as: at all) 3436 # TODO: doesn't handle markup well (read as: at all)
3112 my $short = $item->{count} > 1 3437 my $short = $item->{count} > 1
3113 ? "<b>$item->{count} ×</b> $item->{text}" 3438 ? "<b>$item->{count} ×</b> $item->{text}"
3114 : $item->{text}; 3439 : $item->{text};
3115 3440
… …
3123 tooltip => $item->{tooltip}, 3448 tooltip => $item->{tooltip},
3124 tooltip_font => $::FONT_PROP, 3449 tooltip_font => $::FONT_PROP,
3125 tooltip_width => 0.67, 3450 tooltip_width => 0.67,
3126 fontsize => $item->{fontsize} || $self->{fontsize}, 3451 fontsize => $item->{fontsize} || $self->{fontsize},
3127 max_w => $::WIDTH * 0.44, 3452 max_w => $::WIDTH * 0.44,
3128 fg => $item->{fg}, 3453 fg => [@{ $item->{fg} }],
3129 orig_alpha => $item->{fg}[3] || 1,
3130 can_events => 1, 3454 can_events => 1,
3131 can_hover => 1 3455 can_hover => 1
3132 }; 3456 };
3133 3457
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) { 3458 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2; 3459 $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; 3460 $label->update;
3461 $label->set_max_size (undef, $label->{req_h} * $diff)
3462 if $diff < 1;
3141 $self->{timer}->interval (1/30); 3463 $self->{timer}->interval (1/30);
3464 } else {
3465 $label->{fg}[3] = $item->{fg}[3] || 1;
3142 } 3466 }
3467
3468 push @widgets, $label;
3143 } 3469 }
3144 3470
3145 $self->clear; 3471 $self->clear;
3146 $self->SUPER::add (reverse @widgets); 3472 $self->SUPER::add (reverse @widgets);
3147} 3473}
… …
3163 $item->{count}++; 3489 $item->{count}++;
3164 } else { 3490 } else {
3165 $item->{count} = 1; 3491 $item->{count} = 1;
3166 $item->{text} = $item->{tooltip} = $text; 3492 $item->{text} = $item->{tooltip} = $text;
3167 } 3493 }
3168 $item->{id} = ++$self->{id}; 3494 $item->{id} += 0.2;#d#
3169 $item->{timeout} = $timeout; 3495 $item->{timeout} = $timeout;
3170 delete $item->{label}; 3496 delete $item->{label};
3171 } else { 3497 } else {
3172 $self->{item}{$group} = { 3498 $self->{item}{$group} = {
3173 id => ++$self->{id}, 3499 id => ++$self->{id},
… …
3179 count => 1, 3505 count => 1,
3180 %arg, 3506 %arg,
3181 }; 3507 };
3182 } 3508 }
3183 3509
3510 $ROOT->on_refresh (reorder => sub {
3184 $self->reorder; 3511 $self->reorder;
3512 });
3185} 3513}
3186 3514
3187sub reconfigure { 3515sub reconfigure {
3188 my ($self) = @_; 3516 my ($self) = @_;
3189 3517
… …
3192 3520
3193 $self->reorder; 3521 $self->reorder;
3194 $self->SUPER::reconfigure; 3522 $self->SUPER::reconfigure;
3195} 3523}
3196 3524
3197sub DESTROY { 3525sub destroy {
3198 my ($self) = @_; 3526 my ($self) = @_;
3199 3527
3200 $self->{timer}->cancel; 3528 $self->{timer}->cancel;
3201 3529
3202 $self->SUPER::DESTROY; 3530 $self->SUPER::destroy;
3203} 3531}
3204 3532
3205############################################################################# 3533#############################################################################
3206 3534
3207package CFClient::UI::Inventory; 3535package CFClient::UI::Inventory;
3208 3536
3209our @ISA = CFClient::UI::ScrolledWindow::; 3537our @ISA = CFClient::UI::Table::;
3210 3538
3211sub new { 3539sub new {
3212 my $class = shift; 3540 my $class = shift;
3213 3541
3214 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
3215 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3543 col_expand => [0, 1, 0],
3216 @_, 3544 @_,
3217 ); 3545 );
3218 3546
3219 $self 3547 $self
3220} 3548}
3221 3549
3222sub set_items { 3550sub set_items {
3223 my ($self, $items) = @_; 3551 my ($self, $items) = @_;
3224 3552
3225 $self->{child}->clear; 3553 $self->clear;
3226 return unless $items; 3554 return unless $items;
3227 3555
3228 my @items = sort { 3556 my @items = sort {
3229 ($a->{type} <=> $b->{type}) 3557 ($a->{type} <=> $b->{type})
3230 or ($a->{name} cmp $b->{name}) 3558 or ($a->{name} cmp $b->{name})
3231 } @$items; 3559 } values %$items;
3232 3560
3233 $self->{real_items} = \@items; 3561 $self->{real_items} = \@items;
3234 3562
3235 my $row = 0; 3563 my $row = 0;
3236 for my $item (@items) { 3564 for my $item (@items) {
3237 CFClient::Item::update_widgets $item; 3565 CFClient::Item::update_widgets $item;
3238 3566
3239 $self->{child}->add (0, $row, $item->{face_widget}); 3567 $self->add (0, $row, $item->{face_widget});
3240 $self->{child}->add (1, $row, $item->{desc_widget}); 3568 $self->add (1, $row, $item->{desc_widget});
3241 $self->{child}->add (2, $row, $item->{weight_widget}); 3569 $self->add (2, $row, $item->{weight_widget});
3242 3570
3243 $row++; 3571 $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 } 3572 }
3442} 3573}
3443 3574
3444############################################################################# 3575#############################################################################
3445 3576
… …
3455 commands => [], 3586 commands => [],
3456 @_, 3587 @_,
3457 ) 3588 )
3458} 3589}
3459 3590
3460# XXX: Do sorting? Argl... 3591my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3592
3593my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3594 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3595my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3596 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3597my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3598 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3599my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3600 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3601my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3602 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3603
3604sub rebuild_spell_list {
3605 my ($self) = @_;
3606
3607 $CFClient::UI::ROOT->on_refresh ($self => sub {
3608 $self->clear;
3609
3610 return unless $::CONN;
3611
3612 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3613 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3614 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3615 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3616 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3617
3618 my $row = 0;
3619
3620 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3621 my $spell = $self->{spell}{$_};
3622
3623 $row++;
3624
3625 my $spell_cb = sub {
3626 my ($widget, $ev) = @_;
3627
3628 if ($ev->{button} == 1) {
3629 $::CONN->user_send ("cast $spell->{name}");
3630 } elsif ($ev->{button} == 2) {
3631 $::CONN->user_send ("invoke $spell->{name}");
3632 } elsif ($ev->{button} == 3) {
3633 (new CFClient::UI::Menu
3634 items => [
3635 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3636 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3637 ],
3638 )->popup ($ev);
3639 } else {
3640 return 0;
3641 }
3642
3643 1
3644 };
3645
3646 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3647
3648 #TODO: add path info to tooltip
3649 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3650
3651 $self->add (0, $row, new CFClient::UI::Face
3652 face => $spell->{face},
3653 can_hover => 1,
3654 can_events => 1,
3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3657 );
3658
3659 $self->add (1, $row, new CFClient::UI::Label
3660 expand => 1,
3661 text => $spell->{name},
3662 can_hover => 1,
3663 can_events => 1,
3664 tooltip => $tooltip,
3665 on_button_down => $spell_cb,
3666 );
3667
3668 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3669 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3670 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3671 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3672 }
3673 });
3674}
3675
3461sub add_spell { 3676sub add_spell {
3462 my ($self, $spell) = @_; 3677 my ($self, $spell) = @_;
3678
3463 $self->{spells}->{$spell->{name}} = $spell; 3679 $self->{spell}->{$spell->{name}} = $spell;
3464 3680 $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} 3681}
3493 3682
3494sub remove_spell { 3683sub remove_spell {
3495 my ($self, $spell) = @_; 3684 my ($self, $spell) = @_;
3685
3496 delete $self->{spells}->{$spell->{name}}; 3686 delete $self->{spell}->{$spell->{name}};
3687 $self->rebuild_spell_list;
3688}
3689
3690sub clear_spells {
3691 my ($self) = @_;
3692
3693 $self->{spell} = {};
3497 $self->rebuild_spell_list; 3694 $self->rebuild_spell_list;
3498} 3695}
3499 3696
3500############################################################################# 3697#############################################################################
3501 3698
… …
3538 $coord = $max - $size if $coord > $max - $size; 3735 $coord = $max - $size if $coord > $max - $size;
3539 3736
3540 int $coord + 0.5 3737 int $coord + 0.5
3541} 3738}
3542 3739
3543sub size_allocate { 3740sub invoke_size_allocate {
3544 my ($self, $w, $h) = @_; 3741 my ($self, $w, $h) = @_;
3545 3742
3546 for my $child ($self->children) { 3743 for my $child ($self->children) {
3547 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3744 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3548 3745
… …
3552 $X = _to_pixel $X, $W, $self->{w}; 3749 $X = _to_pixel $X, $W, $self->{w};
3553 $Y = _to_pixel $Y, $H, $self->{h}; 3750 $Y = _to_pixel $Y, $H, $self->{h};
3554 3751
3555 $child->configure ($X, $Y, $W, $H); 3752 $child->configure ($X, $Y, $W, $H);
3556 } 3753 }
3754
3755 1
3557} 3756}
3558 3757
3559sub coord2local { 3758sub coord2local {
3560 my ($self, $x, $y) = @_; 3759 my ($self, $x, $y) = @_;
3561 3760
… …
3687 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3886 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3688 3887
3689 $w = 0 if $w < 0; 3888 $w = 0 if $w < 0;
3690 $h = 0 if $h < 0; 3889 $h = 0 if $h < 0;
3691 3890
3891 $w = max $widget->{min_w}, $w;
3892 $h = max $widget->{min_h}, $h;
3893
3894 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3896
3692 $w = int $w + 0.5; 3897 $w = int $w + 0.5;
3693 $h = int $h + 0.5; 3898 $h = int $h + 0.5;
3694 3899
3695 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3900 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3696 $widget->{old_w} = $widget->{w}; 3901 $widget->{old_w} = $widget->{w};

Diff Legend

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