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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.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;
410
411 $self->realloc;
388} 412}
389 413
390sub set_tooltip { 414sub set_tooltip {
391 my ($self, $tooltip) = @_; 415 my ($self, $tooltip) = @_;
392 416
… …
397 421
398 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
399 423
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 426 $CFClient::UI::TOOLTIP_WATCHER->cb->();
403 } 427 }
404} 428}
405 429
406# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
407sub coord2local { 431sub coord2local {
408 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
409 433
434 Carp::confess unless $self->{parent};#d#
435
410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
411} 437}
412 438
413# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
414sub coord2global { 440sub coord2global {
415 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
416 442
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 443 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 444}
419 445
420sub focus_in { 446sub invoke_focus_in {
421 my ($self) = @_; 447 my ($self) = @_;
422 448
423 return if $FOCUS == $self; 449 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 450 return unless $self->{can_focus};
425 451
426 my $focus = $FOCUS; $FOCUS = $self; 452 $FOCUS = $self;
427 453
428 $self->_emit (focus_in => $focus); 454 $self->update;
429 455
430 $focus->update if $focus; 456 0
431 $FOCUS->update;
432} 457}
433 458
434sub focus_out { 459sub invoke_focus_out {
435 my ($self) = @_; 460 my ($self) = @_;
436 461
437 return unless $FOCUS == $self; 462 return unless $FOCUS == $self;
438 463
439 my $focus = $FOCUS; undef $FOCUS; 464 undef $FOCUS;
440 465
441 $self->_emit (focus_out => $focus); 466 $self->update;
442 467
443 $focus->update if $focus; #?
444
445 $::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
446 unless $FOCUS; 469 unless $FOCUS;
447}
448 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
449sub mouse_motion { 0 } 481sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 482sub invoke_button_up { 0 }
451sub key_down { 0 } 483sub invoke_key_down { 0 }
452sub key_up { 0 } 484sub invoke_key_up { 0 }
485sub invoke_mouse_wheel { 0 }
453 486
454sub button_down { 487sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 488 my ($self, $ev, $x, $y) = @_;
456 489
457 $self->focus_in; 490 $self->grab_focus;
458 491
459 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
460} 522}
461 523
462sub find_widget { 524sub find_widget {
463 my ($self, $x, $y) = @_; 525 my ($self, $x, $y) = @_;
464 526
… …
474sub set_parent { 536sub set_parent {
475 my ($self, $parent) = @_; 537 my ($self, $parent) = @_;
476 538
477 Scalar::Util::weaken ($self->{parent} = $parent); 539 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 540 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502} 541}
503 542
504sub realloc { 543sub realloc {
505 my ($self) = @_; 544 my ($self) = @_;
506 545
… …
539 return unless $self->{h} && $self->{w}; 578 return unless $self->{h} && $self->{w};
540 579
541 # update screen rectangle 580 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 581 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 582 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 583
547 # skip widgets that are entirely outside the drawing area 584 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 585 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 586 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 587
… …
589} 626}
590 627
591sub DESTROY { 628sub DESTROY {
592 my ($self) = @_; 629 my ($self) = @_;
593 630
631 return if CFClient::in_destruct;
632
594 delete $WIDGET{$self+0}; 633 delete $WIDGET{$self+0};
595 #$self->deactivate; 634
635 eval { $self->destroy };
636 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 637}
597 638
598############################################################################# 639#############################################################################
599 640
600package CFClient::UI::DrawBG; 641package CFClient::UI::DrawBG;
… …
765} 806}
766 807
767sub add { 808sub add {
768 my ($self, $child) = @_; 809 my ($self, $child) = @_;
769 810
770 $self->{children} = []; 811 $self->SUPER::remove ($_) for @{ $self->{children} };
771
772 $self->SUPER::add ($child); 812 $self->SUPER::add ($child);
773} 813}
774 814
775sub remove { 815sub remove {
776 my ($self, $widget) = @_; 816 my ($self, $widget) = @_;
… …
785 825
786sub size_request { 826sub size_request {
787 $_[0]{children}[0]->size_request 827 $_[0]{children}[0]->size_request
788} 828}
789 829
790sub size_allocate { 830sub invoke_size_allocate {
791 my ($self, $w, $h) = @_; 831 my ($self, $w, $h) = @_;
792 832
793 $self->{children}[0]->configure (0, 0, $w, $h); 833 $self->{children}[0]->configure (0, 0, $w, $h);
834
835 1
794} 836}
795 837
796############################################################################# 838#############################################################################
797 839
798# back-buffered drawing area 840# back-buffered drawing area
… …
814 856
815 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 857 $ROOT->on_post_alloc ($self => sub { $self->render_child });
816 $self->SUPER::update; 858 $self->SUPER::update;
817} 859}
818 860
819sub size_allocate { 861sub invoke_size_allocate {
820 my ($self, $w, $h) = @_; 862 my ($self, $w, $h) = @_;
821 863
822 $self->SUPER::size_allocate ($w, $h);
823 $self->update; 864 $self->update;
865
866 $self->SUPER::invoke_size_allocate ($w, $h)
824} 867}
825 868
826sub _render { 869sub _render {
827 my ($self) = @_; 870 my ($self) = @_;
828 871
… …
889 $h = 10 if $self->{scroll_y}; 932 $h = 10 if $self->{scroll_y};
890 933
891 ($w, $h) 934 ($w, $h)
892} 935}
893 936
894sub size_allocate { 937sub invoke_size_allocate {
895 my ($self, $w, $h) = @_; 938 my ($self, $w, $h) = @_;
896 939
897 my $child = $self->child; 940 my $child = $self->child;
898 941
899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 942 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 943 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
901 944
902 $self->child->configure (0, 0, $w, $h); 945 $self->child->configure (0, 0, $w, $h);
903 $self->update; 946 $self->update;
947
948 1
904} 949}
905 950
906sub set_offset { 951sub set_offset {
907 my ($self, $x, $y) = @_; 952 my ($self, $x, $y) = @_;
908 953
… …
971 $self->{vp}->set_offset (0, $_[1]); 1016 $self->{vp}->set_offset (0, $_[1]);
972 }, 1017 },
973 ; 1018 ;
974 1019
975 $self = $class->SUPER::new ( 1020 $self = $class->SUPER::new (
976 vp => (new CFClient::UI::ViewPort expand => 1), 1021 vp => (new CFClient::UI::ViewPort expand => 1),
1022 can_events => 1,
977 slider => $slider, 1023 slider => $slider,
978 %arg, 1024 %arg,
979 ); 1025 );
980 1026
981 $self->SUPER::add ($self->{vp}, $self->{slider}); 1027 $self->SUPER::add ($self->{vp}, $self->{slider});
982 $self->add ($child) if $child; 1028 $self->add ($child) if $child;
983 1029
984 $self 1030 $self
985} 1031}
986 1032
1033#TODO# update range on size_allocate depending on child
1034
987sub add { 1035sub add {
988 my ($self, $widget) = @_; 1036 my ($self, $widget) = @_;
989 1037
990 $self->{vp}->add ($self->{child} = $widget); 1038 $self->{vp}->add ($self->{child} = $widget);
991} 1039}
992 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
993sub update { 1057sub update {
994 my ($self) = @_; 1058 my ($self) = @_;
995 1059
996 $self->SUPER::update; 1060 $self->SUPER::update;
997 1061
998 # todo: overwrite size_allocate of child 1062 $self->update_slider;
999 my $child = $self->{vp}->child;
1000 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1001} 1063}
1002 1064
1003sub size_allocate { 1065sub invoke_size_allocate {
1004 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h) = @_;
1005 1067
1068 $self->update_slider;
1069
1006 $self->SUPER::size_allocate ($w, $h); 1070 $self->SUPER::invoke_size_allocate ($w, $h)
1007
1008 my $child = $self->{vp}->child;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010} 1071}
1011
1012#TODO# update range on size_allocate depending on child
1013# update viewport offset on scroll
1014 1072
1015############################################################################# 1073#############################################################################
1016 1074
1017package CFClient::UI::Frame; 1075package CFClient::UI::Frame;
1018 1076
… …
1069 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);
1070 1128
1071sub new { 1129sub new {
1072 my ($class, %arg) = @_; 1130 my ($class, %arg) = @_;
1073 1131
1074 my $title = delete $arg{title};
1075
1076 my $self = $class->SUPER::new ( 1132 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1133 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1134 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1135 border => 0.6,
1080 can_events => 1, 1136 can_events => 1,
1081 min_w => 16, 1137 min_w => 64,
1082 min_h => 16, 1138 min_h => 32,
1083 %arg, 1139 %arg,
1084 ); 1140 );
1085 1141
1086 $self->{title} = new CFClient::UI::Label 1142 $self->{title_widget} = new CFClient::UI::Label
1087 align => 0, 1143 align => 0,
1088 valign => 1, 1144 valign => 1,
1089 text => $title, 1145 text => $self->{title},
1090 fontsize => $self->{border} 1146 fontsize => $self->{border},
1091 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 }
1092 1157
1093 $self 1158 $self
1094} 1159}
1095 1160
1096sub add { 1161sub add {
1097 my ($self, @widgets) = @_; 1162 my ($self, @widgets) = @_;
1098 1163
1099 $self->SUPER::add (@widgets); 1164 $self->SUPER::add (@widgets);
1165 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1100 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1166 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1101} 1167}
1102 1168
1103sub border { 1169sub border {
1104 int $_[0]{border} * $::FONTSIZE 1170 int $_[0]{border} * $::FONTSIZE
1105} 1171}
1106 1172
1107sub size_request { 1173sub size_request {
1108 my ($self) = @_; 1174 my ($self) = @_;
1109 1175
1110 $self->{title}->size_request 1176 $self->{title_widget}->size_request
1111 if $self->{title}; 1177 if $self->{title_widget};
1178
1179 $self->{close_button}->size_request
1180 if $self->{close_button};
1112 1181
1113 my ($w, $h) = $self->SUPER::size_request; 1182 my ($w, $h) = $self->SUPER::size_request;
1114 1183
1115 ( 1184 (
1116 $w + $self->border * 2, 1185 $w + $self->border * 2,
1117 $h + $self->border * 2, 1186 $h + $self->border * 2,
1118 ) 1187 )
1119} 1188}
1120 1189
1121sub size_allocate { 1190sub invoke_size_allocate {
1122 my ($self, $w, $h) = @_; 1191 my ($self, $w, $h) = @_;
1123 1192
1124 if ($self->{title}) { 1193 if ($self->{title_widget}) {
1125 $self->{title}{w} = $w; 1194 $self->{title_widget}{w} = $w;
1126 $self->{title}{h} = $h; 1195 $self->{title_widget}{h} = $h;
1127 $self->{title}->size_allocate ($w, $h); 1196 $self->{title_widget}->invoke_size_allocate ($w, $h);
1128 } 1197 }
1129 1198
1130 my $border = $self->border; 1199 my $border = $self->border;
1131 1200
1132 $h -= List::Util::max 0, $border * 2; 1201 $h -= List::Util::max 0, $border * 2;
1133 $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;
1134 1216
1135 $self->child->configure ($border, $border, $w, $h); 1217 1
1136} 1218}
1137 1219
1138sub button_down { 1220sub invoke_button_down {
1139 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
1140 1222
1141 my ($w, $h) = @$self{qw(w h)}; 1223 my ($w, $h) = @$self{qw(w h)};
1142 my $border = $self->border; 1224 my $border = $self->border;
1143 1225
… …
1174 1256
1175 ($x, $y) = ($ev->{x}, $ev->{y}); 1257 ($x, $y) = ($ev->{x}, $ev->{y});
1176 1258
1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1259 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1178 # HACK: the next line is required to enforce placement 1260 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1261 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1180 }; 1262 };
1181 } else { 1263 } else {
1182 return 0; 1264 return 0;
1183 } 1265 }
1184 1266
1185 1 1267 1
1186} 1268}
1187 1269
1188sub button_up { 1270sub invoke_button_up {
1189 my ($self, $ev, $x, $y) = @_; 1271 my ($self, $ev, $x, $y) = @_;
1190 1272
1191 !!delete $self->{motion} 1273 ! ! delete $self->{motion}
1192} 1274}
1193 1275
1194sub mouse_motion { 1276sub invoke_mouse_motion {
1195 my ($self, $ev, $x, $y) = @_; 1277 my ($self, $ev, $x, $y) = @_;
1196 1278
1197 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1279 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198 1280
1199 !!$self->{motion} 1281 ! ! $self->{motion}
1200} 1282}
1201 1283
1202sub _draw { 1284sub _draw {
1203 my ($self) = @_; 1285 my ($self) = @_;
1204 1286
… …
1230 1312
1231 glDisable GL_TEXTURE_2D; 1313 glDisable GL_TEXTURE_2D;
1232 1314
1233 $child->draw; 1315 $child->draw;
1234 1316
1235 if ($self->{title}) { 1317 if ($self->{title_widget}) {
1236 glTranslate 0, $border - $self->{h}; 1318 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw; 1319 $self->{title_widget}->_draw;
1320
1321 glTranslate 0, - ($border - $self->{h});
1238 } 1322 }
1323
1324 $self->{close_button}->draw
1325 if $self->{close_button};
1239} 1326}
1240 1327
1241############################################################################# 1328#############################################################################
1242 1329
1243package CFClient::UI::Table; 1330package CFClient::UI::Table;
… …
1266 1353
1267 $child->set_parent ($self); 1354 $child->set_parent ($self);
1268 $self->{children}[$y][$x] = $child; 1355 $self->{children}[$y][$x] = $child;
1269 1356
1270 $self->realloc; 1357 $self->realloc;
1358}
1359
1360sub remove {
1361 my ($self, $child) = @_;
1362
1363 # TODO: not yet implemented
1271} 1364}
1272 1365
1273# 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?
1274sub clear { 1367sub clear {
1275 my ($self) = @_; 1368 my ($self) = @_;
… …
1316 (sum @$ws), 1409 (sum @$ws),
1317 (sum @$hs), 1410 (sum @$hs),
1318 ) 1411 )
1319} 1412}
1320 1413
1321sub size_allocate { 1414sub invoke_size_allocate {
1322 my ($self, $w, $h) = @_; 1415 my ($self, $w, $h) = @_;
1323 1416
1324 my ($ws, $hs) = $self->get_wh; 1417 my ($ws, $hs) = $self->get_wh;
1325 1418
1326 my $req_w = (sum @$ws) || 1; 1419 my $req_w = (sum @$ws) || 1;
… …
1358 } 1451 }
1359 1452
1360 $y += $row_h; 1453 $y += $row_h;
1361 } 1454 }
1362 1455
1456 1
1363} 1457}
1364 1458
1365sub find_widget { 1459sub find_widget {
1366 my ($self, $x, $y) = @_; 1460 my ($self, $x, $y) = @_;
1367 1461
… …
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1498 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1499 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 ) 1500 )
1407} 1501}
1408 1502
1409sub size_allocate { 1503sub invoke_size_allocate {
1410 my ($self, $w, $h) = @_; 1504 my ($self, $w, $h) = @_;
1411 1505
1412 my $space = $self->{vertical} ? $h : $w; 1506 my $space = $self->{vertical} ? $h : $w;
1413 my $children = $self->{children}; 1507 my @children = $self->visible_children;
1414 1508
1415 my @req; 1509 my @req;
1416 1510
1417 if ($self->{homogeneous}) { 1511 if ($self->{homogeneous}) {
1418 @req = ($space / (@$children || 1)) x @$children; 1512 @req = ($space / (@children || 1)) x @children;
1419 } else { 1513 } else {
1420 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1514 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1421 my $req = List::Util::sum @req; 1515 my $req = List::Util::sum @req;
1422 1516
1423 if ($req > $space) { 1517 if ($req > $space) {
1424 # ah well, not enough space 1518 # ah well, not enough space
1425 $_ *= $space / $req for @req; 1519 $_ *= $space / $req for @req;
1426 } else { 1520 } else {
1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1521 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1428 1522
1429 $space = ($space - $req) / $expand; # remaining space to give away 1523 $space = ($space - $req) / $expand; # remaining space to give away
1430 1524
1431 $req[$_] += $space * $children->[$_]{expand} 1525 $req[$_] += $space * $children[$_]{expand}
1432 for 0 .. $#$children; 1526 for 0 .. $#children;
1433 } 1527 }
1434 } 1528 }
1435 1529
1436 CFClient::UI::harmonize \@req; 1530 CFClient::UI::harmonize \@req;
1437 1531
1438 my $pos = 0; 1532 my $pos = 0;
1439 for (0 .. $#$children) { 1533 for (0 .. $#children) {
1440 my $alloc = $req[$_]; 1534 my $alloc = $req[$_];
1441 $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));
1442 1536
1443 $pos += $alloc; 1537 $pos += $alloc;
1444 } 1538 }
1445 1539
1446 1 1540 1
… …
1536 1630
1537 delete $self->{texture}; 1631 delete $self->{texture};
1538 $self->SUPER::update; 1632 $self->SUPER::update;
1539} 1633}
1540 1634
1635sub realloc {
1636 my ($self) = @_;
1637
1638 delete $self->{ox};
1639 $self->SUPER::realloc;
1640}
1641
1541sub set_text { 1642sub set_text {
1542 my ($self, $text) = @_; 1643 my ($self, $text) = @_;
1543 1644
1544 return if $self->{text} eq "T$text"; 1645 return if $self->{text} eq "T$text";
1545 $self->{text} = "T$text"; 1646 $self->{text} = "T$text";
1546 1647
1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1548 $self->{layout}->set_text ($text); 1648 $self->{layout}->set_text ($text);
1549 1649
1650 delete $self->{size_req};
1550 $self->realloc; 1651 $self->realloc;
1551 $self->update; 1652 $self->update;
1552} 1653}
1553 1654
1554sub set_markup { 1655sub set_markup {
… …
1557 return if $self->{text} eq "M$markup"; 1658 return if $self->{text} eq "M$markup";
1558 $self->{text} = "M$markup"; 1659 $self->{text} = "M$markup";
1559 1660
1560 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1661 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1561 1662
1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1563 $self->{layout}->set_markup ($markup); 1663 $self->{layout}->set_markup ($markup);
1564 1664
1665 delete $self->{size_req};
1565 $self->realloc; 1666 $self->realloc;
1566 $self->update; 1667 $self->update;
1567} 1668}
1568 1669
1569sub size_request { 1670sub size_request {
1570 my ($self) = @_; 1671 my ($self) = @_;
1571 1672
1673 $self->{size_req} ||= do {
1572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1674 $self->{layout}->set_font ($self->{font}) if $self->{font};
1573 $self->{layout}->set_width ($self->{max_w} || -1); 1675 $self->{layout}->set_width ($self->{max_w} || -1);
1574 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1676 $self->{layout}->set_ellipsise ($self->{ellipsise});
1575 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1677 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1678 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1577 1679
1578 my ($w, $h) = $self->{layout}->size; 1680 my ($w, $h) = $self->{layout}->size;
1579 1681
1580 if (exists $self->{template}) { 1682 if (exists $self->{template}) {
1581 $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);
1582 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1685 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1583 1686
1584 my ($w2, $h2) = $self->{template}->size; 1687 my ($w2, $h2) = $self->{template}->size;
1585 1688
1586 $w = List::Util::max $w, $w2; 1689 $w = List::Util::max $w, $w2;
1587 $h = List::Util::max $h, $h2; 1690 $h = List::Util::max $h, $h2;
1691 }
1692
1693 [$w, $h]
1588 } 1694 };
1589 1695
1590 ($w, $h) 1696 @{ $self->{size_req} }
1591} 1697}
1592 1698
1699sub baseline_shift {
1700 $_[0]{layout}->descent
1701}
1702
1593sub size_allocate { 1703sub invoke_size_allocate {
1594 my ($self, $w, $h) = @_; 1704 my ($self, $w, $h) = @_;
1595 1705
1596 delete $self->{ox}; 1706 delete $self->{ox};
1597 1707
1598 delete $self->{texture} 1708 delete $self->{texture}
1599 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
1600} 1712}
1601 1713
1602sub set_fontsize { 1714sub set_fontsize {
1603 my ($self, $fontsize) = @_; 1715 my ($self, $fontsize) = @_;
1604 1716
1605 $self->{fontsize} = $fontsize; 1717 $self->{fontsize} = $fontsize;
1718 delete $self->{size_req};
1606 delete $self->{texture}; 1719 delete $self->{texture};
1607 1720
1608 $self->realloc; 1721 $self->realloc;
1609} 1722}
1610 1723
1724sub reconfigure {
1725 my ($self) = @_;
1726
1727 delete $self->{size_req};
1728 delete $self->{texture};
1729
1730 $self->SUPER::reconfigure;
1731}
1732
1611sub _draw { 1733sub _draw {
1612 my ($self) = @_; 1734 my ($self) = @_;
1613 1735
1614 $self->SUPER::_draw; # draw background, if applicable 1736 $self->SUPER::_draw; # draw background, if applicable
1615 1737
1616 my $tex = $self->{texture} ||= do { 1738 my $size = $self->{texture} ||= do {
1617 $self->{layout}->set_foreground (@{$self->{fg}}); 1739 $self->{layout}->set_foreground (@{$self->{fg}});
1618 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1740 $self->{layout}->set_font ($self->{font}) if $self->{font};
1619 $self->{layout}->set_width ($self->{w}); 1741 $self->{layout}->set_width ($self->{w});
1620 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1742 $self->{layout}->set_ellipsise ($self->{ellipsise});
1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1743 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1744 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1745
1624 new_from_layout CFClient::Texture $self->{layout} 1746 [$self->{layout}->size]
1625 }; 1747 };
1626 1748
1627 unless (exists $self->{ox}) { 1749 unless (exists $self->{ox}) {
1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1750 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1751 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1630 : ($self->{w} - $tex->{w}) * 0.5); 1752 : ($self->{w} - $size->[0]) * 0.5);
1631 1753
1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1754 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1755 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1634 : ($self->{h} - $tex->{h}) * 0.5); 1756 : ($self->{h} - $size->[1]) * 0.5);
1635 }; 1757 };
1636 1758
1637 glEnable GL_TEXTURE_2D; 1759 my $w = List::Util::min $self->{w} + 4, $size->[0];
1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1760 my $h = List::Util::min $self->{h} + 2, $size->[1];
1639 1761
1640 glColor_premultiply @{$self->{fg}} 1762 $self->{layout}->render ($self->{ox}, $self->{oy});
1641 if $tex->{format} == GL_ALPHA;
1642
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644
1645 glDisable GL_TEXTURE_2D;
1646} 1763}
1647 1764
1648############################################################################# 1765#############################################################################
1649 1766
1650package CFClient::UI::EntryBase; 1767package CFClient::UI::EntryBase;
… …
1664 can_hover => 1, 1781 can_hover => 1,
1665 can_focus => 1, 1782 can_focus => 1,
1666 valign => 0, 1783 valign => 0,
1667 can_events => 1, 1784 can_events => 1,
1668 #text => ... 1785 #text => ...
1786 #hidden => "*",
1669 @_ 1787 @_
1670 ) 1788 )
1671} 1789}
1672 1790
1673sub _set_text { 1791sub _set_text {
… …
1680 $self->{last_activity} = $::NOW; 1798 $self->{last_activity} = $::NOW;
1681 $self->{text} = $text; 1799 $self->{text} = $text;
1682 1800
1683 $text =~ s/./*/g if $self->{hidden}; 1801 $text =~ s/./*/g if $self->{hidden};
1684 $self->{layout}->set_text ("$text "); 1802 $self->{layout}->set_text ("$text ");
1803 delete $self->{size_req};
1685 1804
1686 $self->_emit (changed => $self->{text}); 1805 $self->emit (changed => $self->{text});
1806
1807 $self->realloc;
1687 $self->update; 1808 $self->update;
1688} 1809}
1689 1810
1690sub set_text { 1811sub set_text {
1691 my ($self, $text) = @_; 1812 my ($self, $text) = @_;
1692 1813
1693 $self->{cursor} = length $text; 1814 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1815 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1816}
1698 1817
1699sub get_text { 1818sub get_text {
1700 $_[0]{text} 1819 $_[0]{text}
1701} 1820}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 1825 my ($w, $h) = $self->SUPER::size_request;
1707 1826
1708 ($w + 1, $h) # add 1 for cursor 1827 ($w + 1, $h) # add 1 for cursor
1709} 1828}
1710 1829
1711sub key_down { 1830sub invoke_key_down {
1712 my ($self, $ev) = @_; 1831 my ($self, $ev) = @_;
1713 1832
1714 my $mod = $ev->{mod}; 1833 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 1834 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 1835 my $uni = $ev->{unicode};
… …
1728 } elsif ($sym == CFClient::SDLK_HOME) { 1847 } elsif ($sym == CFClient::SDLK_HOME) {
1729 $self->{cursor} = 0; 1848 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) { 1849 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text; 1850 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 1851 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 1852 $self->emit ('escape');
1734 } elsif ($uni) { 1853 } elsif ($uni) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 1854 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 1855 } else {
1737 return 0; 1856 return 0;
1738 } 1857 }
… …
1742 $self->realloc; 1861 $self->realloc;
1743 1862
1744 1 1863 1
1745} 1864}
1746 1865
1747sub focus_in { 1866sub invoke_focus_in {
1748 my ($self) = @_; 1867 my ($self) = @_;
1749 1868
1750 $self->{last_activity} = $::NOW; 1869 $self->{last_activity} = $::NOW;
1751 1870
1752 $self->SUPER::focus_in; 1871 $self->SUPER::invoke_focus_in
1753} 1872}
1754 1873
1755sub button_down { 1874sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 1875 my ($self, $ev, $x, $y) = @_;
1757 1876
1758 $self->SUPER::button_down ($ev, $x, $y); 1877 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 1878
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 1879 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 1880
1762 # byte-index to char-index 1881 # byte-index to char-index
1763 my $text = $self->{text}; 1882 my $text = $self->{text};
1764 utf8::encode $text; 1883 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1765 $self->{cursor} = length substr $text, 0, $idx; 1884 $self->{cursor} = length $text;
1766 1885
1767 $self->_set_text ($self->{text}); 1886 $self->_set_text ($self->{text});
1768 $self->update; 1887 $self->update;
1769 1888
1770 1 1889 1
1771} 1890}
1772 1891
1773sub mouse_motion { 1892sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 1893 my ($self, $ev, $x, $y) = @_;
1775# 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#
1776 1895
1777 0 1896 1
1778} 1897}
1779 1898
1780sub _draw { 1899sub _draw {
1781 my ($self) = @_; 1900 my ($self) = @_;
1782 1901
… …
1823 1942
1824our @ISA = CFClient::UI::EntryBase::; 1943our @ISA = CFClient::UI::EntryBase::;
1825 1944
1826use CFClient::OpenGL; 1945use CFClient::OpenGL;
1827 1946
1828sub key_down { 1947sub invoke_key_down {
1829 my ($self, $ev) = @_; 1948 my ($self, $ev) = @_;
1830 1949
1831 my $sym = $ev->{sym}; 1950 my $sym = $ev->{sym};
1832 1951
1833 if ($sym == 13) { 1952 if ($sym == 13) {
1834 unshift @{$self->{history}}, 1953 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 1954 my $txt = $self->get_text;
1955
1836 $self->{history_pointer} = -1; 1956 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 1957 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 1958 $self->emit (activate => $txt);
1839 $self->update; 1959 $self->update;
1840 1960
1841 } elsif ($sym == CFClient::SDLK_UP) { 1961 } elsif ($sym == CFClient::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 1962 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 1963 $self->{history_saveback} = $self->get_text;
… …
1859 } else { 1979 } else {
1860 $self->set_text ($self->{history_saveback}); 1980 $self->set_text ($self->{history_saveback});
1861 } 1981 }
1862 1982
1863 } else { 1983 } else {
1864 return $self->SUPER::key_down ($ev) 1984 return $self->SUPER::invoke_key_down ($ev)
1865 } 1985 }
1866 1986
1867 1 1987 1
1868} 1988}
1869 1989
… …
1893 can_events => 1, 2013 can_events => 1,
1894 @_ 2014 @_
1895 ) 2015 )
1896} 2016}
1897 2017
1898sub activate { }
1899
1900sub button_up { 2018sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 2019 my ($self, $ev, $x, $y) = @_;
1902 2020
1903 $self->emit ("activate") 2021 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 2022 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 2023 && $y >= 0 && $y < $self->{h};
… …
1919 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2037 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1920 2038
1921 glDisable GL_TEXTURE_2D; 2039 glDisable GL_TEXTURE_2D;
1922 2040
1923 $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
1924} 2078}
1925 2079
1926############################################################################# 2080#############################################################################
1927 2081
1928package CFClient::UI::CheckBox; 2082package CFClient::UI::CheckBox;
… …
1955 my ($self) = @_; 2109 my ($self) = @_;
1956 2110
1957 (6) x 2 2111 (6) x 2
1958} 2112}
1959 2113
2114sub toggle {
2115 my ($self) = @_;
2116
2117 $self->{state} = !$self->{state};
2118 $self->emit (changed => $self->{state});
2119 $self->update;
2120}
2121
1960sub button_down { 2122sub invoke_button_down {
1961 my ($self, $ev, $x, $y) = @_; 2123 my ($self, $ev, $x, $y) = @_;
1962 2124
1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2125 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2126 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1965 $self->{state} = !$self->{state}; 2127 $self->toggle;
1966 $self->_emit (changed => $self->{state});
1967 } else { 2128 } else {
1968 return 0 2129 return 0
1969 } 2130 }
1970 2131
1971 1 2132 1
… …
1996package CFClient::UI::Image; 2157package CFClient::UI::Image;
1997 2158
1998our @ISA = CFClient::UI::Base::; 2159our @ISA = CFClient::UI::Base::;
1999 2160
2000use CFClient::OpenGL; 2161use CFClient::OpenGL;
2001use Carp qw/confess/;
2002 2162
2003our %loaded_images; 2163our %texture_cache;
2004 2164
2005sub new { 2165sub new {
2006 my $class = shift; 2166 my $class = shift;
2007 2167
2008 my $self = $class->SUPER::new (can_events => 0, @_); 2168 my $self = $class->SUPER::new (
2169 can_events => 0,
2170 @_,
2171 );
2009 2172
2010 $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";
2011 2175
2012 $loaded_images{$self->{image}} ||= 2176 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2013 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;
2014 2178
2015 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2179 Scalar::Util::weaken $texture_cache{$self->{path}};
2016 2180
2017 Scalar::Util::weaken $loaded_images{$self->{image}}; 2181 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2018
2019 $self->{aspect} = $tex->{w} / $tex->{h};
2020 2182
2021 $self 2183 $self
2022} 2184}
2023 2185
2024sub size_request { 2186sub size_request {
2025 my ($self) = @_; 2187 my ($self) = @_;
2026 2188
2027 ($self->{tex}->{w}, $self->{tex}->{h}) 2189 ($self->{tex}{w}, $self->{tex}{h})
2028} 2190}
2029 2191
2030sub _draw { 2192sub _draw {
2031 my ($self) = @_; 2193 my ($self) = @_;
2032 2194
… …
2141 my $ycut1 = max 0, min 1, $ycut; 2303 my $ycut1 = max 0, min 1, $ycut;
2142 my $ycut2 = max 0, min 1, $ycut - 1; 2304 my $ycut2 = max 0, min 1, $ycut - 1;
2143 2305
2144 my $h1 = $self->{h} * (1 - $ycut1); 2306 my $h1 = $self->{h} * (1 - $ycut1);
2145 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);
2146 2311
2147 glEnable GL_BLEND; 2312 glEnable GL_BLEND;
2148 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2313 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2314 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2150 glEnable GL_TEXTURE_2D; 2315 glEnable GL_TEXTURE_2D;
… …
2169 2334
2170 if ($t3) { 2335 if ($t3) {
2171 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2336 glBindTexture GL_TEXTURE_2D, $t3->{name};
2172 glBegin GL_QUADS; 2337 glBegin GL_QUADS;
2173 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2338 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2174 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2339 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2175 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2340 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2176 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2341 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2177 glEnd; 2342 glEnd;
2178 } 2343 }
2179 2344
2180 glDisable GL_BLEND; 2345 glDisable GL_BLEND;
… …
2268 $self->update; 2433 $self->update;
2269 2434
2270 $self 2435 $self
2271} 2436}
2272 2437
2273sub changed { }
2274
2275sub set_range { 2438sub set_range {
2276 my ($self, $range) = @_; 2439 my ($self, $range) = @_;
2277 2440
2278 ($range, $self->{range}) = ($self->{range}, $range); 2441 ($range, $self->{range}) = ($self->{range}, $range);
2279 2442
2280 $self->update
2281 if "@$range" ne "@{$self->{range}}"; 2443 if ("@$range" ne "@{$self->{range}}") {
2444 $self->update;
2445 $self->set_value ($self->{range}[0]);
2446 }
2282} 2447}
2283 2448
2284sub set_value { 2449sub set_value {
2285 my ($self, $value) = @_; 2450 my ($self, $value) = @_;
2286 2451
… …
2297 if $unit; 2462 if $unit;
2298 2463
2299 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2464 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2300 2465
2301 if ($value != $old_value) { 2466 if ($value != $old_value) {
2302 $self->_emit (changed => $value); 2467 $self->emit (changed => $value);
2303 $self->update; 2468 $self->update;
2304 } 2469 }
2305} 2470}
2306 2471
2307sub size_request { 2472sub size_request {
2308 my ($self) = @_; 2473 my ($self) = @_;
2309 2474
2310 ($self->{req_w}, $self->{req_h}) 2475 ($self->{req_w}, $self->{req_h})
2311} 2476}
2312 2477
2313sub button_down { 2478sub invoke_button_down {
2314 my ($self, $ev, $x, $y) = @_; 2479 my ($self, $ev, $x, $y) = @_;
2315 2480
2316 $self->SUPER::button_down ($ev, $x, $y); 2481 $self->SUPER::invoke_button_down ($ev, $x, $y);
2317 2482
2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2483 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2319 2484
2320 $self->mouse_motion ($ev, $x, $y) 2485 $self->invoke_mouse_motion ($ev, $x, $y)
2321} 2486}
2322 2487
2323sub mouse_motion { 2488sub invoke_mouse_motion {
2324 my ($self, $ev, $x, $y) = @_; 2489 my ($self, $ev, $x, $y) = @_;
2325 2490
2326 if ($GRAB == $self) { 2491 if ($GRAB == $self) {
2327 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2492 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2328 2493
… …
2334 } else { 2499 } else {
2335 return 0; 2500 return 0;
2336 } 2501 }
2337 2502
2338 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
2339} 2514}
2340 2515
2341sub update { 2516sub update {
2342 my ($self) = @_; 2517 my ($self) = @_;
2343 2518
… …
2433sub set_range { shift->{slider}->set_range (@_) } 2608sub set_range { shift->{slider}->set_range (@_) }
2434sub set_value { shift->{slider}->set_value (@_) } 2609sub set_value { shift->{slider}->set_value (@_) }
2435 2610
2436############################################################################# 2611#############################################################################
2437 2612
2438package CFClient::UI::TextView; 2613package CFClient::UI::TextScroller;
2439 2614
2440our @ISA = CFClient::UI::HBox::; 2615our @ISA = CFClient::UI::HBox::;
2441 2616
2442use CFClient::OpenGL; 2617use CFClient::OpenGL;
2443 2618
2444sub new { 2619sub new {
2445 my $class = shift; 2620 my $class = shift;
2446 2621
2447 my $self = $class->SUPER::new ( 2622 my $self = $class->SUPER::new (
2448 fontsize => 1, 2623 fontsize => 1,
2449 can_events => 0, 2624 can_events => 1,
2625 indent => 0,
2450 #font => default_font 2626 #font => default_font
2451 @_, 2627 @_,
2452 2628
2453 layout => (new CFClient::Layout 1), 2629 layout => (new CFClient::Layout),
2454 par => [], 2630 par => [],
2455 height => 0, 2631 height => 0,
2456 children => [ 2632 children => [
2457 (new CFClient::UI::Empty expand => 1), 2633 (new CFClient::UI::Empty expand => 1),
2458 (new CFClient::UI::Slider vertical => 1), 2634 (new CFClient::UI::Slider vertical => 1),
… …
2469 2645
2470 $self->{fontsize} = $fontsize; 2646 $self->{fontsize} = $fontsize;
2471 $self->reflow; 2647 $self->reflow;
2472} 2648}
2473 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
2474sub size_allocate { 2659sub invoke_size_allocate {
2475 my ($self, $w, $h) = @_; 2660 my ($self, $w, $h) = @_;
2476 2661
2477 $self->SUPER::size_allocate ($w, $h); 2662 my ($empty, $slider, @other) = @{ $self->{children} };
2663 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2478 2664
2479 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2665 $self->{layout}->set_font ($self->{font}) if $self->{font};
2480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2666 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2481 $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});
2482 2669
2483 $self->reflow; 2670 $self->reflow;
2484}
2485 2671
2486sub text_size { 2672 local $self->{children} = [$empty, $slider];
2673 $self->SUPER::invoke_size_allocate ($w, $h)
2674}
2675
2676sub invoke_mouse_wheel {
2487 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) = @_;
2488 2688
2489 my $layout = $self->{layout}; 2689 my $layout = $self->{layout};
2490 2690
2691 $layout->set_font ($self->{font}) if $self->{font};
2692 $layout->set_foreground (@{$para->{fg}});
2491 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2492 $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});
2493 $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}}
2494 2702 );
2703
2495 $layout->size 2704 $layout
2496} 2705}
2497 2706
2498sub reflow { 2707sub reflow {
2499 my ($self) = @_; 2708 my ($self) = @_;
2500 2709
… …
2509 $self->{children}[1]->set_value ($offset); 2718 $self->{children}[1]->set_value ($offset);
2510} 2719}
2511 2720
2512sub clear { 2721sub clear {
2513 my ($self) = @_; 2722 my ($self) = @_;
2723
2724 my (undef, undef, @other) = @{ $self->{children} };
2725 $self->remove ($_) for @other;
2514 2726
2515 $self->{par} = []; 2727 $self->{par} = [];
2516 $self->{height} = 0; 2728 $self->{height} = 0;
2517 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2729 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2518} 2730}
2519 2731
2520sub add_paragraph { 2732sub add_paragraph {
2521 my ($self, $color, $text, $indent) = @_; 2733 my ($self, $color, $para, $indent) = @_;
2522 2734
2523 for my $line (split /\n/, $text) { 2735 my ($text, @w) = ref $para ? @$para : $para;
2524 my ($w, $h) = $self->text_size ($line); 2736
2525 $self->{height} += $h; 2737 $para = {
2526 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,
2527 } 2744 };
2528 2745
2529 $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;
2530} 2758}
2531 2759
2532sub update { 2760sub update {
2533 my ($self) = @_; 2761 my ($self) = @_;
2534 2762
… …
2536 2764
2537 return unless $self->{h} > 0; 2765 return unless $self->{h} > 0;
2538 2766
2539 delete $self->{texture}; 2767 delete $self->{texture};
2540 2768
2541 $ROOT->on_post_alloc ($self, sub { 2769 $ROOT->on_post_alloc ($self => sub {
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2770 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543 2771
2544 if (delete $self->{need_reflow}) { 2772 if (delete $self->{need_reflow}) {
2545 my $height = 0; 2773 my $height = 0;
2546 2774
2547 my $layout = $self->{layout};
2548
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
2551 for (@{$self->{par}}) { 2775 for my $para (@{$self->{par}}) {
2552 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2776 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2553 $layout->set_width ($W - $_->[3]); 2777 my $layout = $self->get_layout ($para);
2554 $layout->set_markup ($_->[4]);
2555 my ($w, $h) = $layout->size; 2778 my ($w, $h) = $layout->size;
2556 $_->[0] = $w + $_->[3]; 2779
2557 $_->[1] = $h; 2780 $para->{w} = $w + $para->{indent};
2781 $para->{h} = $h;
2782 $para->{wrapped} = $layout->has_wrapped;
2558 } 2783 }
2559 2784
2560 $height += $_->[1]; 2785 $height += $para->{h};
2561 } 2786 }
2562 2787
2563 $self->{height} = $height; 2788 $self->{height} = $height;
2564 2789
2565 $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]);
2566 2791
2567 delete $self->{texture}; 2792 delete $self->{texture};
2793 }
2794
2795 if (delete $self->{scroll_to_bottom}) {
2796 $self->{children}[1]->set_value (1e10);
2568 } 2797 }
2569 2798
2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2799 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2571 glClearColor 0, 0, 0, 0; 2800 glClearColor 0, 0, 0, 0;
2572 glClear GL_COLOR_BUFFER_BIT; 2801 glClear GL_COLOR_BUFFER_BIT;
… …
2576 my $y0 = $top; 2805 my $y0 = $top;
2577 my $y1 = $top + $H; 2806 my $y1 = $top + $H;
2578 2807
2579 my $y = 0; 2808 my $y = 0;
2580 2809
2581 my $layout = $self->{layout};
2582
2583 $layout->set_font ($self->{font}) if $self->{font};
2584
2585 glEnable GL_BLEND;
2586 #TODO# not correct in windows where rgba is forced off
2587 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2588
2589 for my $par (@{$self->{par}}) { 2810 for my $para (@{$self->{par}}) {
2590 my $h = $par->[1]; 2811 my $h = $para->{h};
2591 2812
2592 if ($y0 < $y + $h && $y < $y1) { 2813 if ($y0 < $y + $h && $y < $y1) {
2593 $layout->set_foreground (@{ $par->[2] });
2594 $layout->set_width ($W - $par->[3]);
2595 $layout->set_markup ($par->[4]);
2596 2814
2597 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2815 my $layout = $self->get_layout ($para);
2598 2816
2599 glRasterPos $par->[3], $y - $y0; 2817 $layout->render ($para->{indent}, $y - $y0);
2600 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 }
2601 } 2831 }
2602 2832
2603 $y += $h; 2833 $y += $h;
2604 } 2834 }
2605
2606 glDisable GL_BLEND;
2607 }; 2835 };
2608 }); 2836 });
2837}
2838
2839sub reconfigure {
2840 my ($self) = @_;
2841
2842 $self->SUPER::reconfigure;
2843
2844 $_->{w} = 1e10 for @{ $self->{par} };
2845 $self->reflow;
2609} 2846}
2610 2847
2611sub _draw { 2848sub _draw {
2612 my ($self) = @_; 2849 my ($self) = @_;
2613 2850
… …
2616 glColor 0, 0, 0, 1; 2853 glColor 0, 0, 0, 1;
2617 $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});
2618 glDisable GL_TEXTURE_2D; 2855 glDisable GL_TEXTURE_2D;
2619 2856
2620 $self->{children}[1]->draw; 2857 $self->{children}[1]->draw;
2621
2622} 2858}
2623 2859
2624############################################################################# 2860#############################################################################
2625 2861
2626package CFClient::UI::Animator; 2862package CFClient::UI::Animator;
… …
2713 $tooltip .= "\n\n" . (ref $widget) . "\n" 2949 $tooltip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2950 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n" 2951 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}"; 2952 . "visible $widget->{visible}";
2717 } 2953 }
2954
2955 $tooltip =~ s/^\n+//;
2956 $tooltip =~ s/\n+$//;
2718 2957
2719 $self->add (new CFClient::UI::Label 2958 $self->add (new CFClient::UI::Label
2720 markup => $tooltip, 2959 markup => $tooltip,
2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2960 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2722 fontsize => 0.8, 2961 fontsize => 0.8,
… …
2732 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2971 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2733 2972
2734 ($w + 4, $h + 4) 2973 ($w + 4, $h + 4)
2735} 2974}
2736 2975
2737sub size_allocate { 2976sub invoke_size_allocate {
2738 my ($self, $w, $h) = @_; 2977 my ($self, $w, $h) = @_;
2739 2978
2740 $self->SUPER::size_allocate ($w - 4, $h - 4); 2979 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2741} 2980}
2742 2981
2743sub visibility_change { 2982sub invoke_visibility_change {
2744 my ($self, $visible) = @_; 2983 my ($self, $visible) = @_;
2745 2984
2746 return unless $visible; 2985 return unless $visible;
2747 2986
2748 $self->{root}->on_post_alloc ("move_$self" => sub { 2987 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2750 or return; 2989 or return;
2751 2990
2752 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2991 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753 2992
2754 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2993 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755 if $x + $self->{w} > $::WIDTH; 2994 if $x + $self->{w} > $self->{root}{w};
2756 2995
2757 $self->move_abs ($x, $y); 2996 $self->move_abs ($x, $y);
2758 }); 2997 });
2759} 2998}
2760 2999
… …
2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3094 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2856 glDisable GL_TEXTURE_2D; 3095 glDisable GL_TEXTURE_2D;
2857 } 3096 }
2858} 3097}
2859 3098
2860sub DESTROY { 3099sub destroy {
2861 my ($self) = @_; 3100 my ($self) = @_;
2862 3101
2863 $self->{timer}->cancel 3102 $self->{timer}->cancel
2864 if $self->{timer}; 3103 if $self->{timer};
2865 3104
2866 $self->SUPER::DESTROY; 3105 $self->SUPER::destroy;
2867} 3106}
2868 3107
2869############################################################################# 3108#############################################################################
2870 3109
2871package CFClient::UI::Buttonbar; 3110package CFClient::UI::Buttonbar;
… …
2892 ); 3131 );
2893 3132
2894 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3133 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2895 3134
2896 for my $item (@{ $self->{items} }) { 3135 for my $item (@{ $self->{items} }) {
2897 my ($widget, $cb) = @$item; 3136 my ($widget, $cb, $tooltip) = @$item;
2898 3137
2899 # handle various types of items, only text for now 3138 # handle various types of items, only text for now
2900 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 {
2901 $widget = new CFClient::UI::Label 3154 $widget = new CFClient::UI::Label
2902 can_hover => 1, 3155 can_hover => 1,
2903 can_events => 1, 3156 can_events => 1,
2904 text => $widget; 3157 markup => $widget,
3158 tooltip => $tooltip;
3159 }
2905 } 3160 }
2906 3161
2907 $self->{item}{$widget} = $item; 3162 $self->{item}{$widget} = $item;
2908 3163
2909 $self->{vbox}->add ($widget); 3164 $self->{vbox}->add ($widget);
… …
2914 3169
2915# 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)
2916sub popup { 3171sub popup {
2917 my ($self, $ev) = @_; 3172 my ($self, $ev) = @_;
2918 3173
2919 $self->_emit ("popdown"); 3174 $self->emit ("popdown");
2920 3175
2921 # maybe save $GRAB? must be careful about events... 3176 # maybe save $GRAB? must be careful about events...
2922 $GRAB = $self; 3177 $GRAB = $self;
2923 $self->{button} = $ev->{button}; 3178 $self->{button} = $ev->{button};
2924 3179
2925 $self->show; 3180 $self->show;
2926 $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);
2927} 3182}
2928 3183
2929sub mouse_motion { 3184sub invoke_mouse_motion {
2930 my ($self, $ev, $x, $y) = @_; 3185 my ($self, $ev, $x, $y) = @_;
2931 3186
2932 # TODO: should use vbox->find_widget or so 3187 # TODO: should use vbox->find_widget or so
2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3188 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2934 $self->{hover} = $self->{item}{$HOVER}; 3189 $self->{hover} = $self->{item}{$HOVER};
2935 3190
2936 0 3191 0
2937} 3192}
2938 3193
2939sub button_up { 3194sub invoke_button_up {
2940 my ($self, $ev, $x, $y) = @_; 3195 my ($self, $ev, $x, $y) = @_;
2941 3196
2942 if ($ev->{button} == $self->{button}) { 3197 if ($ev->{button} == $self->{button}) {
2943 undef $GRAB; 3198 undef $GRAB;
2944 $self->hide; 3199 $self->hide;
2945 3200
2946 $self->_emit ("popdown"); 3201 $self->emit ("popdown");
2947 $self->{hover}[1]->() if $self->{hover}; 3202 $self->{hover}[1]->() if $self->{hover};
2948 } else { 3203 } else {
2949 return 0 3204 return 0
2950 } 3205 }
2951 3206
… …
2978 3233
2979 $self->{current} = $self->{children}[0] 3234 $self->{current} = $self->{children}[0]
2980 if @{ $self->{children} }; 3235 if @{ $self->{children} };
2981} 3236}
2982 3237
3238sub get_current_page {
3239 my ($self) = @_;
3240
3241 $self->{current}
3242}
3243
2983sub set_current_page { 3244sub set_current_page {
2984 my ($self, $page_or_widget) = @_; 3245 my ($self, $page_or_widget) = @_;
2985 3246
2986 my $widget = ref $page_or_widget 3247 my $widget = ref $page_or_widget
2987 ? $page_or_widget 3248 ? $page_or_widget
2988 : $self->{children}[$page_or_widget]; 3249 : $self->{children}[$page_or_widget];
2989 3250
2990 $self->{current} = $widget; 3251 $self->{current} = $widget;
2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3252 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992 3253
2993 $self->_emit (page_changed => $self->{current}); 3254 $self->emit (page_changed => $self->{current});
2994 3255
2995 $self->realloc; 3256 $self->realloc;
2996} 3257}
2997 3258
2998sub visible_children { 3259sub visible_children {
… …
3003 my ($self) = @_; 3264 my ($self) = @_;
3004 3265
3005 $self->{current}->size_request 3266 $self->{current}->size_request
3006} 3267}
3007 3268
3008sub size_allocate { 3269sub invoke_size_allocate {
3009 my ($self, $w, $h) = @_; 3270 my ($self, $w, $h) = @_;
3010 3271
3011 $self->{current}->configure (0, 0, $w, $h); 3272 $self->{current}->configure (0, 0, $w, $h);
3273
3274 1
3012} 3275}
3013 3276
3014sub _draw { 3277sub _draw {
3015 my ($self) = @_; 3278 my ($self) = @_;
3016 3279
… …
3051 ); 3314 );
3052 3315
3053 $self->{multiplexer}->add ($widget); 3316 $self->{multiplexer}->add ($widget);
3054} 3317}
3055 3318
3319sub get_current_page {
3320 my ($self) = @_;
3321
3322 $self->{multiplexer}->get_current_page
3323}
3324
3056sub set_current_page { 3325sub set_current_page {
3057 my ($self, $page) = @_; 3326 my ($self, $page) = @_;
3058 3327
3059 $self->{multiplexer}->set_current_page ($page); 3328 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current}); 3329 $self->emit (page_changed => $self->{multiplexer}{current});
3061} 3330}
3062 3331
3063############################################################################# 3332#############################################################################
3064 3333
3065package CFClient::UI::Statusbox; 3334package CFClient::UI::Combobox;
3066 3335
3336use utf8;
3337
3067our @ISA = CFClient::UI::VBox::; 3338our @ISA = CFClient::UI::Button::;
3068 3339
3069sub new { 3340sub new {
3070 my $class = shift; 3341 my $class = shift;
3071 3342
3072 $class->SUPER::new ( 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);
3386}
3387
3388#############################################################################
3389
3390package CFClient::UI::Statusbox;
3391
3392our @ISA = CFClient::UI::VBox::;
3393
3394sub new {
3395 my $class = shift;
3396
3397 my $self = $class->SUPER::new (
3073 fontsize => 0.8, 3398 fontsize => 0.8,
3074 @_, 3399 @_,
3075 ) 3400 );
3401
3402 Scalar::Util::weaken (my $this = $self);
3403
3404 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3405
3406 $self
3076} 3407}
3077 3408
3078sub reorder { 3409sub reorder {
3079 my ($self) = @_; 3410 my ($self) = @_;
3080 my $NOW = 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} };
3081 3417
3082 while (my ($k, $v) = each %{ $self->{item} }) { 3418 while (my ($k, $v) = each %{ $self->{item} }) {
3083 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3419 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3084 } 3420 }
3085 3421
… …
3088 my @items = sort { 3424 my @items = sort {
3089 $a->{pri} <=> $b->{pri} 3425 $a->{pri} <=> $b->{pri}
3090 or $b->{id} <=> $a->{id} 3426 or $b->{id} <=> $a->{id}
3091 } values %{ $self->{item} }; 3427 } values %{ $self->{item} };
3092 3428
3429 $self->{timer}->interval (1);
3430
3093 my $count = 10 + 1; 3431 my $count = 10 + 1;
3094 for my $item (@items) { 3432 for my $item (@items) {
3095 last unless --$count; 3433 last unless --$count;
3096 3434
3097 push @widgets, $item->{label} ||= do { 3435 my $label = $item->{label} ||= do {
3098 # TODO: doesn't handle markup well (read as: at all) 3436 # TODO: doesn't handle markup well (read as: at all)
3099 my $short = $item->{count} > 1 3437 my $short = $item->{count} > 1
3100 ? "<b>$item->{count} ×</b> $item->{text}" 3438 ? "<b>$item->{count} ×</b> $item->{text}"
3101 : $item->{text}; 3439 : $item->{text};
3102 3440
… …
3110 tooltip => $item->{tooltip}, 3448 tooltip => $item->{tooltip},
3111 tooltip_font => $::FONT_PROP, 3449 tooltip_font => $::FONT_PROP,
3112 tooltip_width => 0.67, 3450 tooltip_width => 0.67,
3113 fontsize => $item->{fontsize} || $self->{fontsize}, 3451 fontsize => $item->{fontsize} || $self->{fontsize},
3114 max_w => $::WIDTH * 0.44, 3452 max_w => $::WIDTH * 0.44,
3115 fg => $item->{fg}, 3453 fg => [@{ $item->{fg} }],
3116 can_events => 1, 3454 can_events => 1,
3117 can_hover => 1 3455 can_hover => 1
3118 }; 3456 };
3457
3458 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3459 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3460 $label->update;
3461 $label->set_max_size (undef, $label->{req_h} * $diff)
3462 if $diff < 1;
3463 $self->{timer}->interval (1/30);
3464 } else {
3465 $label->{fg}[3] = $item->{fg}[3] || 1;
3466 }
3467
3468 push @widgets, $label;
3119 } 3469 }
3120 3470
3121 $self->clear; 3471 $self->clear;
3122 $self->SUPER::add (reverse @widgets); 3472 $self->SUPER::add (reverse @widgets);
3123} 3473}
… …
3128 $text =~ s/^\s+//; 3478 $text =~ s/^\s+//;
3129 $text =~ s/\s+$//; 3479 $text =~ s/\s+$//;
3130 3480
3131 return unless $text; 3481 return unless $text;
3132 3482
3133 my $timeout = time + ((delete $arg{timeout}) || 60); 3483 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3134 3484
3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3485 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3136 3486
3137 if (my $item = $self->{item}{$group}) { 3487 if (my $item = $self->{item}{$group}) {
3138 if ($item->{text} eq $text) { 3488 if ($item->{text} eq $text) {
3139 $item->{count}++; 3489 $item->{count}++;
3140 } else { 3490 } else {
3141 $item->{count} = 1; 3491 $item->{count} = 1;
3142 $item->{text} = $item->{tooltip} = $text; 3492 $item->{text} = $item->{tooltip} = $text;
3143 } 3493 }
3144 $item->{id} = ++$self->{id}; 3494 $item->{id} += 0.2;#d#
3145 $item->{timeout} = $timeout; 3495 $item->{timeout} = $timeout;
3146 delete $item->{label}; 3496 delete $item->{label};
3147 } else { 3497 } else {
3148 $self->{item}{$group} = { 3498 $self->{item}{$group} = {
3149 id => ++$self->{id}, 3499 id => ++$self->{id},
… …
3155 count => 1, 3505 count => 1,
3156 %arg, 3506 %arg,
3157 }; 3507 };
3158 } 3508 }
3159 3509
3510 $ROOT->on_refresh (reorder => sub {
3160 $self->reorder; 3511 $self->reorder;
3512 });
3161} 3513}
3162 3514
3163sub reconfigure { 3515sub reconfigure {
3164 my ($self) = @_; 3516 my ($self) = @_;
3165 3517
… …
3168 3520
3169 $self->reorder; 3521 $self->reorder;
3170 $self->SUPER::reconfigure; 3522 $self->SUPER::reconfigure;
3171} 3523}
3172 3524
3525sub destroy {
3526 my ($self) = @_;
3527
3528 $self->{timer}->cancel;
3529
3530 $self->SUPER::destroy;
3531}
3532
3173############################################################################# 3533#############################################################################
3174 3534
3175package CFClient::UI::Inventory; 3535package CFClient::UI::Inventory;
3176 3536
3177our @ISA = CFClient::UI::ScrolledWindow::; 3537our @ISA = CFClient::UI::Table::;
3178 3538
3179sub new { 3539sub new {
3180 my $class = shift; 3540 my $class = shift;
3181 3541
3182 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
3183 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3543 col_expand => [0, 1, 0],
3184 @_, 3544 @_,
3185 ); 3545 );
3186 3546
3187 $self 3547 $self
3188} 3548}
3189 3549
3190sub set_items { 3550sub set_items {
3191 my ($self, $items) = @_; 3551 my ($self, $items) = @_;
3192 3552
3193 $self->{child}->clear; 3553 $self->clear;
3194 return unless $items; 3554 return unless $items;
3195 3555
3196 my @items = sort { 3556 my @items = sort {
3197 ($a->{type} <=> $b->{type}) 3557 ($a->{type} <=> $b->{type})
3198 or ($a->{name} cmp $b->{name}) 3558 or ($a->{name} cmp $b->{name})
3199 } @$items; 3559 } values %$items;
3200 3560
3201 $self->{real_items} = \@items; 3561 $self->{real_items} = \@items;
3202 3562
3203 my $row = 0; 3563 my $row = 0;
3204 for my $item (@items) { 3564 for my $item (@items) {
3205 CFClient::Item::update_widgets $item; 3565 CFClient::Item::update_widgets $item;
3206 3566
3207 $self->{child}->add (0, $row, $item->{face_widget}); 3567 $self->add (0, $row, $item->{face_widget});
3208 $self->{child}->add (1, $row, $item->{desc_widget}); 3568 $self->add (1, $row, $item->{desc_widget});
3209 $self->{child}->add (2, $row, $item->{weight_widget}); 3569 $self->add (2, $row, $item->{weight_widget});
3210 3570
3211 $row++; 3571 $row++;
3212 }
3213}
3214
3215#############################################################################
3216
3217package CFClient::UI::BindEditor;
3218
3219our @ISA = CFClient::UI::FancyFrame::;
3220
3221sub new {
3222 my $class = shift;
3223
3224 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3225
3226 $self->add (my $vb = new CFClient::UI::VBox);
3227
3228
3229 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3230 text => "start recording",
3231 tooltip => "Start/Stops recording of actions."
3232 ."All subsequent actions after the recording started will be captured."
3233 ."The actions are displayed after the record was stopped."
3234 ."To bind the action you have to click on the 'Bind' button",
3235 on_activate => sub {
3236 unless ($self->{recording}) {
3237 $self->start;
3238 } else {
3239 $self->stop;
3240 }
3241 });
3242
3243 $vb->add (new CFClient::UI::Label text => "Actions:");
3244 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3245
3246 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3247 $vb->add (my $hb = new CFClient::UI::HBox);
3248 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3249 $hb->add (new CFClient::UI::Button
3250 text => "bind",
3251 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3252 on_activate => sub {
3253 $self->ask_for_bind;
3254 });
3255
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add (new CFClient::UI::Button
3258 text => "ok",
3259 expand => 1,
3260 tooltip => "This closes the binding editor and saves the binding",
3261 on_activate => sub {
3262 $self->hide;
3263 $self->commit;
3264 });
3265
3266 $hb->add (new CFClient::UI::Button
3267 text => "cancel",
3268 expand => 1,
3269 tooltip => "This closes the binding editor without saving",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->{binding_cancel}->()
3273 if $self->{binding_cancel};
3274 });
3275
3276 $self->update_binding_widgets;
3277
3278 $self
3279}
3280
3281sub commit {
3282 my ($self) = @_;
3283 my ($mod, $sym, $cmds) = $self->get_binding;
3284 if ($sym != 0 && @$cmds > 0) {
3285 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3286 ."'. Don't forget 'Save Config'!");
3287 $self->{binding_change}->($mod, $sym, $cmds)
3288 if $self->{binding_change};
3289 } else {
3290 $::STATUSBOX->add ("No action bound, no key or action specified!");
3291 $self->{binding_cancel}->()
3292 if $self->{binding_cancel};
3293 }
3294}
3295
3296sub start {
3297 my ($self) = @_;
3298
3299 $self->{rec_btn}->set_text ("stop recording");
3300 $self->{recording} = 1;
3301 $self->clear_command_list;
3302 $::CONN->start_record if $::CONN;
3303}
3304
3305sub stop {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("start recording");
3309 $self->{recording} = 0;
3310
3311 my $rec;
3312 $rec = $::CONN->stop_record if $::CONN;
3313 return unless ref $rec eq 'ARRAY';
3314 $self->set_command_list ($rec);
3315}
3316
3317
3318sub ask_for_bind_and_commit {
3319 my ($self) = @_;
3320 $self->ask_for_bind (1);
3321}
3322
3323sub ask_for_bind {
3324 my ($self, $commit) = @_;
3325
3326 CFClient::Binder::open_binding_dialog (sub {
3327 my ($mod, $sym) = @_;
3328 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3329 $self->update_binding_widgets;
3330 $self->commit if $commit;
3331 });
3332}
3333
3334# $mod and $sym are the modifiers and key symbol
3335# $cmds is a array ref of strings (the commands)
3336# $cb is the callback that is executed on OK
3337# $ccb is the callback that is executed on CANCEL and
3338# when the binding was unsuccessful on OK
3339sub set_binding {
3340 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3341
3342 $self->clear_command_list;
3343 $self->{recording} = 0;
3344 $self->{rec_btn}->set_text ("start recording");
3345
3346 $self->{binding} = [$mod, $sym];
3347 $self->{commands} = $cmds;
3348
3349 $self->{binding_change} = $cb;
3350 $self->{binding_cancel} = $ccb;
3351
3352 $self->update_binding_widgets;
3353}
3354
3355# this is a shortcut method that asks for a binding
3356# and then just binds it.
3357sub do_quick_binding {
3358 my ($self, $cmds) = @_;
3359 $self->set_binding (undef, undef, $cmds, sub {
3360 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3361 });
3362 $self->ask_for_bind (1);
3363}
3364
3365sub update_binding_widgets {
3366 my ($self) = @_;
3367 my ($mod, $sym, $cmds) = $self->get_binding;
3368 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3369 $self->set_command_list ($cmds);
3370}
3371
3372sub get_binding {
3373 my ($self) = @_;
3374 return (
3375 $self->{binding}->[0],
3376 $self->{binding}->[1],
3377 [ grep { defined $_ } @{$self->{commands}} ]
3378 );
3379}
3380
3381sub clear_command_list {
3382 my ($self) = @_;
3383 $self->{cmdbox}->clear ();
3384}
3385
3386sub set_command_list {
3387 my ($self, $cmds) = @_;
3388
3389 $self->{cmdbox}->clear ();
3390 $self->{commands} = $cmds;
3391
3392 my $idx = 0;
3393
3394 for (@$cmds) {
3395 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3396
3397 my $i = $idx;
3398 $hb->add (new CFClient::UI::Label text => $_);
3399 $hb->add (new CFClient::UI::Button
3400 text => "delete",
3401 tooltip => "Deletes the action from the record",
3402 on_activate => sub {
3403 $self->{cmdbox}->remove ($hb);
3404 $cmds->[$i] = undef;
3405 });
3406
3407
3408 $idx++
3409 } 3572 }
3410} 3573}
3411 3574
3412############################################################################# 3575#############################################################################
3413 3576
… …
3423 commands => [], 3586 commands => [],
3424 @_, 3587 @_,
3425 ) 3588 )
3426} 3589}
3427 3590
3428# 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
3429sub add_spell { 3676sub add_spell {
3430 my ($self, $spell) = @_; 3677 my ($self, $spell) = @_;
3678
3431 $self->{spells}->{$spell->{name}} = $spell; 3679 $self->{spell}->{$spell->{name}} = $spell;
3432 3680 $self->rebuild_spell_list;
3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3434 face => $spell->{face},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message});
3438
3439 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440 text => $spell->{name},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message},
3444 expand => 1);
3445
3446 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3449 expand => 1);
3450
3451 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452 text => "bind to key",
3453 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454}
3455
3456sub rebuild_spell_list {
3457 my ($self) = @_;
3458 $self->{tbl_idx} = 0;
3459 $self->add_spell ($_) for values %{$self->{spells}};
3460} 3681}
3461 3682
3462sub remove_spell { 3683sub remove_spell {
3463 my ($self, $spell) = @_; 3684 my ($self, $spell) = @_;
3685
3464 delete $self->{spells}->{$spell->{name}}; 3686 delete $self->{spell}->{$spell->{name}};
3465 $self->rebuild_spell_list; 3687 $self->rebuild_spell_list;
3466} 3688}
3467 3689
3690sub clear_spells {
3691 my ($self) = @_;
3692
3693 $self->{spell} = {};
3694 $self->rebuild_spell_list;
3695}
3696
3468############################################################################# 3697#############################################################################
3469 3698
3470package CFClient::UI::Root; 3699package CFClient::UI::Root;
3471 3700
3472our @ISA = CFClient::UI::Container::; 3701our @ISA = CFClient::UI::Container::;
3702
3703use List::Util qw(min max);
3473 3704
3474use CFClient::OpenGL; 3705use CFClient::OpenGL;
3475 3706
3476sub new { 3707sub new {
3477 my $class = shift; 3708 my $class = shift;
… …
3504 $coord = $max - $size if $coord > $max - $size; 3735 $coord = $max - $size if $coord > $max - $size;
3505 3736
3506 int $coord + 0.5 3737 int $coord + 0.5
3507} 3738}
3508 3739
3509sub size_allocate { 3740sub invoke_size_allocate {
3510 my ($self, $w, $h) = @_; 3741 my ($self, $w, $h) = @_;
3511 3742
3512 for my $child ($self->children) { 3743 for my $child ($self->children) {
3513 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)};
3514 3745
… …
3518 $X = _to_pixel $X, $W, $self->{w}; 3749 $X = _to_pixel $X, $W, $self->{w};
3519 $Y = _to_pixel $Y, $H, $self->{h}; 3750 $Y = _to_pixel $Y, $H, $self->{h};
3520 3751
3521 $child->configure ($X, $Y, $W, $H); 3752 $child->configure ($X, $Y, $W, $H);
3522 } 3753 }
3754
3755 1
3523} 3756}
3524 3757
3525sub coord2local { 3758sub coord2local {
3526 my ($self, $x, $y) = @_; 3759 my ($self, $x, $y) = @_;
3527 3760
… …
3612 3845
3613 delete $queue{$widget+0}; 3846 delete $queue{$widget+0};
3614 3847
3615 my ($w, $h) = $widget->size_request; 3848 my ($w, $h) = $widget->size_request;
3616 3849
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3850 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3851 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3852
3853 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3854 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3619 3855
3620 $w = $widget->{force_w} if exists $widget->{force_w}; 3856 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h}; 3857 $h = $widget->{force_h} if exists $widget->{force_h};
3622 3858
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3859 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3649 3885
3650 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3886 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3651 3887
3652 $w = 0 if $w < 0; 3888 $w = 0 if $w < 0;
3653 $h = 0 if $h < 0; 3889 $h = 0 if $h < 0;
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};
3654 3896
3655 $w = int $w + 0.5; 3897 $w = int $w + 0.5;
3656 $h = int $h + 0.5; 3898 $h = int $h + 0.5;
3657 3899
3658 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}) {

Diff Legend

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