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.339 by root, Sun Jul 30 12:15:19 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 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
88 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
89 105
90 $GRAB = $widget; 106 $GRAB = $widget;
91 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
92 108
93 check_tooltip; 109 $TOOLTIP_WATCHER->cb->();
94 } 110 }
95 111
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 112 if ($GRAB) {
97 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 114 # mousewheel
99 if $GRAB; 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
… …
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";
338} 360}
339 361
362sub baseline_shift {
363 0
364}
365
340sub configure { 366sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
342 368
343 if ($self->{aspect}) { 369 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 370 my ($ow, $oh) = ($w, $h);
345 371
346 $w = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};
348 374
349 # use alignment to adjust x, y 375 # use alignment to adjust x, y
350 376
351 $x += int 0.5 * ($ow - $w); 377 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 378 $y += int 0.5 * ($oh - $h);
… …
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
443 Carp::confess unless $self->{parent};#d#
444
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 446}
419 447
420sub focus_in { 448sub invoke_focus_in {
421 my ($self) = @_; 449 my ($self) = @_;
422 450
423 return if $FOCUS == $self; 451 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
425 453
426 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
427 455
428 $self->_emit (focus_in => $focus); 456 $self->update;
429 457
430 $focus->update if $focus; 458 0
431 $FOCUS->update;
432} 459}
433 460
434sub focus_out { 461sub invoke_focus_out {
435 my ($self) = @_; 462 my ($self) = @_;
436 463
437 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
438 465
439 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
440 467
441 $self->_emit (focus_out => $focus); 468 $self->update;
442 469
443 $focus->update if $focus; #?
444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 470 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 471 unless $FOCUS;
447}
448 472
473 0
474}
475
476sub grab_focus {
477 my ($self) = @_;
478
479 $FOCUS->emit ("focus_out") if $FOCUS;
480 $self->emit ("focus_in");
481}
482
449sub mouse_motion { 0 } 483sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 484sub invoke_button_up { 0 }
451sub key_down { 0 } 485sub invoke_key_down { 0 }
452sub key_up { 0 } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
453 488
454sub button_down { 489sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
456 491
457 $self->focus_in; 492 $self->grab_focus;
458 493
459 0 494 0
495}
496
497sub connect {
498 my ($self, $signal, $cb) = @_;
499
500 push @{ $self->{signal_cb}{$signal} }, $cb;
501
502 defined wantarray and CFClient::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} };
505 }
506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
514
515sub emit {
516 my ($self, $signal, @args) = @_;
517
518 # I do not really like this solution, but I dislike duplication
519 # and needlessly verbose code, too.
520 my @append
521 = $has_coords{$signal}
522 ? $args[0]->xy ($self)
523 : ();
524
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526
527 #d##TODO# stop propagating at first true, do not use sum
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460} 531}
461 532
462sub find_widget { 533sub find_widget {
463 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
464 535
… …
474sub set_parent { 545sub set_parent {
475 my ($self, $parent) = @_; 546 my ($self, $parent) = @_;
476 547
477 Scalar::Util::weaken ($self->{parent} = $parent); 548 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 549 $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} 550}
503 551
504sub realloc { 552sub realloc {
505 my ($self) = @_; 553 my ($self) = @_;
506 554
… …
539 return unless $self->{h} && $self->{w}; 587 return unless $self->{h} && $self->{w};
540 588
541 # update screen rectangle 589 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 590 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 591 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 592
547 # skip widgets that are entirely outside the drawing area 593 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 596
… …
589} 635}
590 636
591sub DESTROY { 637sub DESTROY {
592 my ($self) = @_; 638 my ($self) = @_;
593 639
640 return if CFClient::in_destruct;
641
594 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
595 #$self->deactivate; 643
644 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 646}
597 647
598############################################################################# 648#############################################################################
599 649
600package CFClient::UI::DrawBG; 650package CFClient::UI::DrawBG;
… …
681 if $children; 731 if $children;
682 732
683 $self 733 $self
684} 734}
685 735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
742}
743
686sub add { 744sub add {
687 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
688 746
689 $_->set_parent ($self) 747 $_->set_parent ($self)
690 for @widgets; 748 for @widgets;
… …
765} 823}
766 824
767sub add { 825sub add {
768 my ($self, $child) = @_; 826 my ($self, $child) = @_;
769 827
770 $self->{children} = []; 828 $self->SUPER::remove ($_) for @{ $self->{children} };
771
772 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
773} 830}
774 831
775sub remove { 832sub remove {
776 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
… …
785 842
786sub size_request { 843sub size_request {
787 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
788} 845}
789 846
790sub size_allocate { 847sub invoke_size_allocate {
791 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
792 849
793 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
794} 853}
795 854
796############################################################################# 855#############################################################################
797 856
798# back-buffered drawing area 857# back-buffered drawing area
… …
814 873
815 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 874 $ROOT->on_post_alloc ($self => sub { $self->render_child });
816 $self->SUPER::update; 875 $self->SUPER::update;
817} 876}
818 877
819sub size_allocate { 878sub invoke_size_allocate {
820 my ($self, $w, $h) = @_; 879 my ($self, $w, $h) = @_;
821 880
822 $self->SUPER::size_allocate ($w, $h);
823 $self->update; 881 $self->update;
882
883 $self->SUPER::invoke_size_allocate ($w, $h)
824} 884}
825 885
826sub _render { 886sub _render {
827 my ($self) = @_; 887 my ($self) = @_;
828 888
… …
889 $h = 10 if $self->{scroll_y}; 949 $h = 10 if $self->{scroll_y};
890 950
891 ($w, $h) 951 ($w, $h)
892} 952}
893 953
894sub size_allocate { 954sub invoke_size_allocate {
895 my ($self, $w, $h) = @_; 955 my ($self, $w, $h) = @_;
896 956
897 my $child = $self->child; 957 my $child = $self->child;
898 958
899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 959 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 960 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
901 961
902 $self->child->configure (0, 0, $w, $h); 962 $self->child->configure (0, 0, $w, $h);
903 $self->update; 963 $self->update;
964
965 1
904} 966}
905 967
906sub set_offset { 968sub set_offset {
907 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
908 970
… …
971 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
972 }, 1034 },
973 ; 1035 ;
974 1036
975 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
976 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
977 slider => $slider, 1040 slider => $slider,
978 %arg, 1041 %arg,
979 ); 1042 );
980 1043
981 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
982 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
983 1046
984 $self 1047 $self
985} 1048}
986 1049
1050#TODO# update range on size_allocate depending on child
1051
987sub add { 1052sub add {
988 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
989 1054
990 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
991} 1056}
992 1057
1058sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_;
1060
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev);
1064
1065 1
1066}
1067
1068sub update_slider {
1069 my ($self) = @_;
1070
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1072}
1073
993sub update { 1074sub update {
994 my ($self) = @_; 1075 my ($self) = @_;
995 1076
996 $self->SUPER::update; 1077 $self->SUPER::update;
997 1078
998 # todo: overwrite size_allocate of child 1079 $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} 1080}
1002 1081
1003sub size_allocate { 1082sub invoke_size_allocate {
1004 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
1005 1084
1085 $self->update_slider;
1086
1006 $self->SUPER::size_allocate ($w, $h); 1087 $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} 1088}
1011
1012#TODO# update range on size_allocate depending on child
1013# update viewport offset on scroll
1014 1089
1015############################################################################# 1090#############################################################################
1016 1091
1017package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
1018 1093
… …
1069 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1070 1145
1071sub new { 1146sub new {
1072 my ($class, %arg) = @_; 1147 my ($class, %arg) = @_;
1073 1148
1074 my $title = delete $arg{title};
1075
1076 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1152 border => 0.6,
1080 can_events => 1, 1153 can_events => 1,
1081 min_w => 16, 1154 min_w => 64,
1082 min_h => 16, 1155 min_h => 32,
1083 %arg, 1156 %arg,
1084 ); 1157 );
1085 1158
1086 $self->{title} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1087 align => 0, 1160 align => 0,
1088 valign => 1, 1161 valign => 1,
1089 text => $title, 1162 text => $self->{title},
1090 fontsize => $self->{border} 1163 fontsize => $self->{border},
1091 if defined $title; 1164 if exists $self->{title};
1165
1166 if ($self->{has_close_button}) {
1167 $self->{close_button} =
1168 new CFClient::UI::ImageButton
1169 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") };
1171
1172 $self->CFClient::UI::Container::add ($self->{close_button});
1173 }
1092 1174
1093 $self 1175 $self
1094} 1176}
1095 1177
1096sub add { 1178sub add {
1097 my ($self, @widgets) = @_; 1179 my ($self, @widgets) = @_;
1098 1180
1099 $self->SUPER::add (@widgets); 1181 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1100 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1183 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1101} 1184}
1102 1185
1103sub border { 1186sub border {
1104 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1105} 1188}
1106 1189
1107sub size_request { 1190sub size_request {
1108 my ($self) = @_; 1191 my ($self) = @_;
1109 1192
1110 $self->{title}->size_request 1193 $self->{title_widget}->size_request
1111 if $self->{title}; 1194 if $self->{title_widget};
1195
1196 $self->{close_button}->size_request
1197 if $self->{close_button};
1112 1198
1113 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1114 1200
1115 ( 1201 (
1116 $w + $self->border * 2, 1202 $w + $self->border * 2,
1117 $h + $self->border * 2, 1203 $h + $self->border * 2,
1118 ) 1204 )
1119} 1205}
1120 1206
1121sub size_allocate { 1207sub invoke_size_allocate {
1122 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1123 1209
1124 if ($self->{title}) { 1210 if ($self->{title_widget}) {
1125 $self->{title}{w} = $w; 1211 $self->{title_widget}{w} = $w;
1126 $self->{title}{h} = $h; 1212 $self->{title_widget}{h} = $h;
1127 $self->{title}->size_allocate ($w, $h); 1213 $self->{title_widget}->invoke_size_allocate ($w, $h);
1128 } 1214 }
1129 1215
1130 my $border = $self->border; 1216 my $border = $self->border;
1131 1217
1132 $h -= List::Util::max 0, $border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1133 $w -= List::Util::max 0, $border * 2; 1219 $w -= List::Util::max 0, $border * 2;
1220
1221 $self->child->configure ($border, $border, $w, $h);
1222
1223 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1224 if $self->{close_button};
1225
1226 1
1227}
1228
1229sub invoke_delete {
1230 my ($self) = @_;
1231
1232 $self->hide;
1134 1233
1135 $self->child->configure ($border, $border, $w, $h); 1234 1
1136} 1235}
1137 1236
1138sub button_down { 1237sub invoke_button_down {
1139 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1140 1239
1141 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1142 my $border = $self->border; 1241 my $border = $self->border;
1143 1242
… …
1174 1273
1175 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1176 1275
1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1276 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1178 # HACK: the next line is required to enforce placement 1277 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1278 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1180 }; 1279 };
1181 } else { 1280 } else {
1182 return 0; 1281 return 0;
1183 } 1282 }
1184 1283
1185 1 1284 1
1186} 1285}
1187 1286
1188sub button_up { 1287sub invoke_button_up {
1189 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1190 1289
1191 !!delete $self->{motion} 1290 ! ! delete $self->{motion}
1192} 1291}
1193 1292
1194sub mouse_motion { 1293sub invoke_mouse_motion {
1195 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1196 1295
1197 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198 1297
1199 !!$self->{motion} 1298 ! ! $self->{motion}
1299}
1300
1301sub invoke_visibility_change {
1302 my ($self, $visible) = @_;
1303
1304 delete $self->{motion} unless $visible;
1305
1306 0
1200} 1307}
1201 1308
1202sub _draw { 1309sub _draw {
1203 my ($self) = @_; 1310 my ($self) = @_;
1204 1311
… …
1230 1337
1231 glDisable GL_TEXTURE_2D; 1338 glDisable GL_TEXTURE_2D;
1232 1339
1233 $child->draw; 1340 $child->draw;
1234 1341
1235 if ($self->{title}) { 1342 if ($self->{title_widget}) {
1236 glTranslate 0, $border - $self->{h}; 1343 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw; 1344 $self->{title_widget}->_draw;
1345
1346 glTranslate 0, - ($border - $self->{h});
1238 } 1347 }
1348
1349 $self->{close_button}->draw
1350 if $self->{close_button};
1239} 1351}
1240 1352
1241############################################################################# 1353#############################################################################
1242 1354
1243package CFClient::UI::Table; 1355package CFClient::UI::Table;
… …
1260sub children { 1372sub children {
1261 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1373 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1262} 1374}
1263 1375
1264sub add { 1376sub add {
1265 my ($self, $x, $y, $child) = @_; 1377 my ($self) = shift;
1266 1378
1379 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, ();
1267 $child->set_parent ($self); 1381 $child->set_parent ($self);
1268 $self->{children}[$y][$x] = $child; 1382 $self->{children}[$y][$x] = $child;
1383 }
1269 1384
1385 $self->{force_realloc} = 1;
1386 $self->{force_size_alloc} = 1;
1270 $self->realloc; 1387 $self->realloc;
1388}
1389
1390sub remove {
1391 my ($self, $child) = @_;
1392
1393 # TODO: not yet implemented
1271} 1394}
1272 1395
1273# TODO: move to container class maybe? send children a signal on removal? 1396# TODO: move to container class maybe? send children a signal on removal?
1274sub clear { 1397sub clear {
1275 my ($self) = @_; 1398 my ($self) = @_;
… …
1316 (sum @$ws), 1439 (sum @$ws),
1317 (sum @$hs), 1440 (sum @$hs),
1318 ) 1441 )
1319} 1442}
1320 1443
1321sub size_allocate { 1444sub invoke_size_allocate {
1322 my ($self, $w, $h) = @_; 1445 my ($self, $w, $h) = @_;
1323 1446
1324 my ($ws, $hs) = $self->get_wh; 1447 my ($ws, $hs) = $self->get_wh;
1325 1448
1326 my $req_w = (sum @$ws) || 1; 1449 my $req_w = (sum @$ws) || 1;
… …
1358 } 1481 }
1359 1482
1360 $y += $row_h; 1483 $y += $row_h;
1361 } 1484 }
1362 1485
1486 1
1363} 1487}
1364 1488
1365sub find_widget { 1489sub find_widget {
1366 my ($self, $x, $y) = @_; 1490 my ($self, $x, $y) = @_;
1367 1491
… …
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1528 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1529 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 ) 1530 )
1407} 1531}
1408 1532
1409sub size_allocate { 1533sub invoke_size_allocate {
1410 my ($self, $w, $h) = @_; 1534 my ($self, $w, $h) = @_;
1411 1535
1412 my $space = $self->{vertical} ? $h : $w; 1536 my $space = $self->{vertical} ? $h : $w;
1413 my $children = $self->{children}; 1537 my @children = $self->visible_children;
1414 1538
1415 my @req; 1539 my @req;
1416 1540
1417 if ($self->{homogeneous}) { 1541 if ($self->{homogeneous}) {
1418 @req = ($space / (@$children || 1)) x @$children; 1542 @req = ($space / (@children || 1)) x @children;
1419 } else { 1543 } else {
1420 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1544 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1421 my $req = List::Util::sum @req; 1545 my $req = List::Util::sum @req;
1422 1546
1423 if ($req > $space) { 1547 if ($req > $space) {
1424 # ah well, not enough space 1548 # ah well, not enough space
1425 $_ *= $space / $req for @req; 1549 $_ *= $space / $req for @req;
1426 } else { 1550 } else {
1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1551 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1428 1552
1429 $space = ($space - $req) / $expand; # remaining space to give away 1553 $space = ($space - $req) / $expand; # remaining space to give away
1430 1554
1431 $req[$_] += $space * $children->[$_]{expand} 1555 $req[$_] += $space * $children[$_]{expand}
1432 for 0 .. $#$children; 1556 for 0 .. $#children;
1433 } 1557 }
1434 } 1558 }
1435 1559
1436 CFClient::UI::harmonize \@req; 1560 CFClient::UI::harmonize \@req;
1437 1561
1438 my $pos = 0; 1562 my $pos = 0;
1439 for (0 .. $#$children) { 1563 for (0 .. $#children) {
1440 my $alloc = $req[$_]; 1564 my $alloc = $req[$_];
1441 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1565 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1442 1566
1443 $pos += $alloc; 1567 $pos += $alloc;
1444 } 1568 }
1445 1569
1446 1 1570 1
… …
1519 } 1643 }
1520 1644
1521 $self 1645 $self
1522} 1646}
1523 1647
1524sub escape($) {
1525 local $_ = $_[0];
1526
1527 s/&/&amp;/g;
1528 s/>/&gt;/g;
1529 s/</&lt;/g;
1530
1531 $_
1532}
1533
1534sub update { 1648sub update {
1535 my ($self) = @_; 1649 my ($self) = @_;
1536 1650
1537 delete $self->{texture}; 1651 delete $self->{texture};
1538 $self->SUPER::update; 1652 $self->SUPER::update;
1539} 1653}
1540 1654
1655sub realloc {
1656 my ($self) = @_;
1657
1658 delete $self->{ox};
1659 $self->SUPER::realloc;
1660}
1661
1541sub set_text { 1662sub set_text {
1542 my ($self, $text) = @_; 1663 my ($self, $text) = @_;
1543 1664
1544 return if $self->{text} eq "T$text"; 1665 return if $self->{text} eq "T$text";
1545 $self->{text} = "T$text"; 1666 $self->{text} = "T$text";
1546 1667
1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1548 $self->{layout}->set_text ($text); 1668 $self->{layout}->set_text ($text);
1549 1669
1670 delete $self->{size_req};
1550 $self->realloc; 1671 $self->realloc;
1551 $self->update; 1672 $self->update;
1552} 1673}
1553 1674
1554sub set_markup { 1675sub set_markup {
… …
1557 return if $self->{text} eq "M$markup"; 1678 return if $self->{text} eq "M$markup";
1558 $self->{text} = "M$markup"; 1679 $self->{text} = "M$markup";
1559 1680
1560 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1681 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1561 1682
1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1563 $self->{layout}->set_markup ($markup); 1683 $self->{layout}->set_markup ($markup);
1564 1684
1685 delete $self->{size_req};
1565 $self->realloc; 1686 $self->realloc;
1566 $self->update; 1687 $self->update;
1567} 1688}
1568 1689
1569sub size_request { 1690sub size_request {
1570 my ($self) = @_; 1691 my ($self) = @_;
1571 1692
1693 $self->{size_req} ||= do {
1572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1694 $self->{layout}->set_font ($self->{font}) if $self->{font};
1573 $self->{layout}->set_width ($self->{max_w} || -1); 1695 $self->{layout}->set_width ($self->{max_w} || -1);
1574 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1696 $self->{layout}->set_ellipsise ($self->{ellipsise});
1575 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1697 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1698 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1577 1699
1578 my ($w, $h) = $self->{layout}->size; 1700 my ($w, $h) = $self->{layout}->size;
1579 1701
1580 if (exists $self->{template}) { 1702 if (exists $self->{template}) {
1581 $self->{template}->set_font ($self->{font}) if $self->{font}; 1703 $self->{template}->set_font ($self->{font}) if $self->{font};
1704 $self->{template}->set_width ($self->{max_w} || -1);
1582 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1705 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1583 1706
1584 my ($w2, $h2) = $self->{template}->size; 1707 my ($w2, $h2) = $self->{template}->size;
1585 1708
1586 $w = List::Util::max $w, $w2; 1709 $w = List::Util::max $w, $w2;
1587 $h = List::Util::max $h, $h2; 1710 $h = List::Util::max $h, $h2;
1711 }
1712
1713 [$w, $h]
1588 } 1714 };
1589 1715
1590 ($w, $h) 1716 @{ $self->{size_req} }
1591} 1717}
1592 1718
1719sub baseline_shift {
1720 $_[0]{layout}->descent
1721}
1722
1593sub size_allocate { 1723sub invoke_size_allocate {
1594 my ($self, $w, $h) = @_; 1724 my ($self, $w, $h) = @_;
1595 1725
1596 delete $self->{ox}; 1726 delete $self->{ox};
1597 1727
1598 delete $self->{texture} 1728 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1729 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1730
1731 1
1600} 1732}
1601 1733
1602sub set_fontsize { 1734sub set_fontsize {
1603 my ($self, $fontsize) = @_; 1735 my ($self, $fontsize) = @_;
1604 1736
1605 $self->{fontsize} = $fontsize; 1737 $self->{fontsize} = $fontsize;
1738 delete $self->{size_req};
1606 delete $self->{texture}; 1739 delete $self->{texture};
1607 1740
1608 $self->realloc; 1741 $self->realloc;
1609} 1742}
1610 1743
1744sub reconfigure {
1745 my ($self) = @_;
1746
1747 delete $self->{size_req};
1748 delete $self->{texture};
1749
1750 $self->SUPER::reconfigure;
1751}
1752
1611sub _draw { 1753sub _draw {
1612 my ($self) = @_; 1754 my ($self) = @_;
1613 1755
1614 $self->SUPER::_draw; # draw background, if applicable 1756 $self->SUPER::_draw; # draw background, if applicable
1615 1757
1616 my $tex = $self->{texture} ||= do { 1758 my $size = $self->{texture} ||= do {
1617 $self->{layout}->set_foreground (@{$self->{fg}}); 1759 $self->{layout}->set_foreground (@{$self->{fg}});
1618 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1760 $self->{layout}->set_font ($self->{font}) if $self->{font};
1619 $self->{layout}->set_width ($self->{w}); 1761 $self->{layout}->set_width ($self->{w});
1620 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1762 $self->{layout}->set_ellipsise ($self->{ellipsise});
1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1763 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1764 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1765
1624 new_from_layout CFClient::Texture $self->{layout} 1766 [$self->{layout}->size]
1625 }; 1767 };
1626 1768
1627 unless (exists $self->{ox}) { 1769 unless (exists $self->{ox}) {
1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1770 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1771 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1630 : ($self->{w} - $tex->{w}) * 0.5); 1772 : ($self->{w} - $size->[0]) * 0.5);
1631 1773
1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1634 : ($self->{h} - $tex->{h}) * 0.5); 1776 : ($self->{h} - $size->[1]) * 0.5);
1635 }; 1777 };
1636 1778
1637 glEnable GL_TEXTURE_2D; 1779 my $w = List::Util::min $self->{w} + 4, $size->[0];
1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1780 my $h = List::Util::min $self->{h} + 2, $size->[1];
1639 1781
1640 glColor_premultiply @{$self->{fg}} 1782 $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} 1783}
1647 1784
1648############################################################################# 1785#############################################################################
1649 1786
1650package CFClient::UI::EntryBase; 1787package CFClient::UI::EntryBase;
… …
1664 can_hover => 1, 1801 can_hover => 1,
1665 can_focus => 1, 1802 can_focus => 1,
1666 valign => 0, 1803 valign => 0,
1667 can_events => 1, 1804 can_events => 1,
1668 #text => ... 1805 #text => ...
1806 #hidden => "*",
1669 @_ 1807 @_
1670 ) 1808 )
1671} 1809}
1672 1810
1673sub _set_text { 1811sub _set_text {
… …
1680 $self->{last_activity} = $::NOW; 1818 $self->{last_activity} = $::NOW;
1681 $self->{text} = $text; 1819 $self->{text} = $text;
1682 1820
1683 $text =~ s/./*/g if $self->{hidden}; 1821 $text =~ s/./*/g if $self->{hidden};
1684 $self->{layout}->set_text ("$text "); 1822 $self->{layout}->set_text ("$text ");
1823 delete $self->{size_req};
1685 1824
1686 $self->_emit (changed => $self->{text}); 1825 $self->emit (changed => $self->{text});
1826
1827 $self->realloc;
1687 $self->update; 1828 $self->update;
1688} 1829}
1689 1830
1690sub set_text { 1831sub set_text {
1691 my ($self, $text) = @_; 1832 my ($self, $text) = @_;
1692 1833
1693 $self->{cursor} = length $text; 1834 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1835 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1836}
1698 1837
1699sub get_text { 1838sub get_text {
1700 $_[0]{text} 1839 $_[0]{text}
1701} 1840}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 1845 my ($w, $h) = $self->SUPER::size_request;
1707 1846
1708 ($w + 1, $h) # add 1 for cursor 1847 ($w + 1, $h) # add 1 for cursor
1709} 1848}
1710 1849
1711sub key_down { 1850sub invoke_key_down {
1712 my ($self, $ev) = @_; 1851 my ($self, $ev) = @_;
1713 1852
1714 my $mod = $ev->{mod}; 1853 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 1854 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 1855 my $uni = $ev->{unicode};
… …
1728 } elsif ($sym == CFClient::SDLK_HOME) { 1867 } elsif ($sym == CFClient::SDLK_HOME) {
1729 $self->{cursor} = 0; 1868 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) { 1869 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text; 1870 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 1871 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 1872 $self->emit ('escape');
1734 } elsif ($uni) { 1873 } elsif ($uni) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 1874 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 1875 } else {
1737 return 0; 1876 return 0;
1738 } 1877 }
… …
1742 $self->realloc; 1881 $self->realloc;
1743 1882
1744 1 1883 1
1745} 1884}
1746 1885
1747sub focus_in { 1886sub invoke_focus_in {
1748 my ($self) = @_; 1887 my ($self) = @_;
1749 1888
1750 $self->{last_activity} = $::NOW; 1889 $self->{last_activity} = $::NOW;
1751 1890
1752 $self->SUPER::focus_in; 1891 $self->SUPER::invoke_focus_in
1753} 1892}
1754 1893
1755sub button_down { 1894sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 1895 my ($self, $ev, $x, $y) = @_;
1757 1896
1758 $self->SUPER::button_down ($ev, $x, $y); 1897 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 1898
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 1899 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 1900
1762 # byte-index to char-index 1901 # byte-index to char-index
1763 my $text = $self->{text}; 1902 my $text = $self->{text};
1764 utf8::encode $text; 1903 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1765 $self->{cursor} = length substr $text, 0, $idx; 1904 $self->{cursor} = length $text;
1766 1905
1767 $self->_set_text ($self->{text}); 1906 $self->_set_text ($self->{text});
1768 $self->update; 1907 $self->update;
1769 1908
1770 1 1909 1
1771} 1910}
1772 1911
1773sub mouse_motion { 1912sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 1913 my ($self, $ev, $x, $y) = @_;
1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1914# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776 1915
1777 0 1916 1
1778} 1917}
1779 1918
1780sub _draw { 1919sub _draw {
1781 my ($self) = @_; 1920 my ($self) = @_;
1782 1921
… …
1823 1962
1824our @ISA = CFClient::UI::EntryBase::; 1963our @ISA = CFClient::UI::EntryBase::;
1825 1964
1826use CFClient::OpenGL; 1965use CFClient::OpenGL;
1827 1966
1828sub key_down { 1967sub invoke_key_down {
1829 my ($self, $ev) = @_; 1968 my ($self, $ev) = @_;
1830 1969
1831 my $sym = $ev->{sym}; 1970 my $sym = $ev->{sym};
1832 1971
1833 if ($sym == 13) { 1972 if ($sym == 13) {
1834 unshift @{$self->{history}}, 1973 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 1974 my $txt = $self->get_text;
1975
1836 $self->{history_pointer} = -1; 1976 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 1977 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 1978 $self->emit (activate => $txt);
1839 $self->update; 1979 $self->update;
1840 1980
1841 } elsif ($sym == CFClient::SDLK_UP) { 1981 } elsif ($sym == CFClient::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 1982 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 1983 $self->{history_saveback} = $self->get_text;
… …
1859 } else { 1999 } else {
1860 $self->set_text ($self->{history_saveback}); 2000 $self->set_text ($self->{history_saveback});
1861 } 2001 }
1862 2002
1863 } else { 2003 } else {
1864 return $self->SUPER::key_down ($ev) 2004 return $self->SUPER::invoke_key_down ($ev)
1865 } 2005 }
1866 2006
1867 1 2007 1
1868} 2008}
1869 2009
… …
1893 can_events => 1, 2033 can_events => 1,
1894 @_ 2034 @_
1895 ) 2035 )
1896} 2036}
1897 2037
1898sub activate { }
1899
1900sub button_up { 2038sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 2039 my ($self, $ev, $x, $y) = @_;
1902 2040
1903 $self->emit ("activate") 2041 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 2042 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 2043 && $y >= 0 && $y < $self->{h};
… …
1955 my ($self) = @_; 2093 my ($self) = @_;
1956 2094
1957 (6) x 2 2095 (6) x 2
1958} 2096}
1959 2097
2098sub toggle {
2099 my ($self) = @_;
2100
2101 $self->{state} = !$self->{state};
2102 $self->emit (changed => $self->{state});
2103 $self->update;
2104}
2105
1960sub button_down { 2106sub invoke_button_down {
1961 my ($self, $ev, $x, $y) = @_; 2107 my ($self, $ev, $x, $y) = @_;
1962 2108
1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2109 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2110 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1965 $self->{state} = !$self->{state}; 2111 $self->toggle;
1966 $self->_emit (changed => $self->{state});
1967 } else { 2112 } else {
1968 return 0 2113 return 0
1969 } 2114 }
1970 2115
1971 1 2116 1
… …
1996package CFClient::UI::Image; 2141package CFClient::UI::Image;
1997 2142
1998our @ISA = CFClient::UI::Base::; 2143our @ISA = CFClient::UI::Base::;
1999 2144
2000use CFClient::OpenGL; 2145use CFClient::OpenGL;
2001use Carp qw/confess/;
2002 2146
2003our %loaded_images; 2147our %texture_cache;
2004 2148
2005sub new { 2149sub new {
2006 my $class = shift; 2150 my $class = shift;
2007 2151
2008 my $self = $class->SUPER::new (can_events => 0, @_); 2152 my $self = $class->SUPER::new (
2153 can_events => 0,
2154 @_,
2155 );
2009 2156
2010 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2157 $self->{path} || $self->{tex}
2158 or Carp::croak "'path' or 'tex' attributes required";
2011 2159
2012 $loaded_images{$self->{image}} ||= 2160 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2013 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2161 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2014 2162
2015 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2163 Scalar::Util::weaken $texture_cache{$self->{path}};
2016 2164
2017 Scalar::Util::weaken $loaded_images{$self->{image}}; 2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2018
2019 $self->{aspect} = $tex->{w} / $tex->{h};
2020 2166
2021 $self 2167 $self
2022} 2168}
2023 2169
2170sub STORABLE_freeze {
2171 my ($self, $cloning) = @_;
2172
2173 $self->{path}
2174 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2175
2176 $self->{path}
2177}
2178
2179sub STORABLE_attach {
2180 my ($self, $cloning, $path) = @_;
2181
2182 $self->new (path => $path)
2183}
2184
2024sub size_request { 2185sub size_request {
2025 my ($self) = @_; 2186 my ($self) = @_;
2026 2187
2027 ($self->{tex}->{w}, $self->{tex}->{h}) 2188 ($self->{tex}{w}, $self->{tex}{h})
2028} 2189}
2029 2190
2030sub _draw { 2191sub _draw {
2031 my ($self) = @_; 2192 my ($self) = @_;
2032 2193
… …
2042 } 2203 }
2043 2204
2044 glEnable GL_TEXTURE_2D; 2205 glEnable GL_TEXTURE_2D;
2045 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2046 2207
2047 $tex->draw_quad_alpha (0, 0, $w, $h); 2208 $tex->draw_quad (0, 0, $w, $h);
2048 2209
2049 glDisable GL_TEXTURE_2D; 2210 glDisable GL_TEXTURE_2D;
2211}
2212
2213#############################################################################
2214
2215package CFClient::UI::ImageButton;
2216
2217our @ISA = CFClient::UI::Image::;
2218
2219use CFClient::OpenGL;
2220
2221my %textures;
2222
2223sub new {
2224 my $class = shift;
2225
2226 my $self = $class->SUPER::new (
2227 padding_x => 4,
2228 padding_y => 4,
2229 fg => [1, 1, 1],
2230 active_fg => [0, 0, 1],
2231 can_hover => 1,
2232 align => 0,
2233 valign => 0,
2234 can_events => 1,
2235 @_
2236 );
2237}
2238
2239sub invoke_button_up {
2240 my ($self, $ev, $x, $y) = @_;
2241
2242 $self->emit ("activate")
2243 if $x >= 0 && $x < $self->{w}
2244 && $y >= 0 && $y < $self->{h};
2245
2246 1
2050} 2247}
2051 2248
2052############################################################################# 2249#############################################################################
2053 2250
2054package CFClient::UI::VGauge; 2251package CFClient::UI::VGauge;
… …
2141 my $ycut1 = max 0, min 1, $ycut; 2338 my $ycut1 = max 0, min 1, $ycut;
2142 my $ycut2 = max 0, min 1, $ycut - 1; 2339 my $ycut2 = max 0, min 1, $ycut - 1;
2143 2340
2144 my $h1 = $self->{h} * (1 - $ycut1); 2341 my $h1 = $self->{h} * (1 - $ycut1);
2145 my $h2 = $self->{h} * (1 - $ycut2); 2342 my $h2 = $self->{h} * (1 - $ycut2);
2343 my $h3 = $self->{h};
2344
2345 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2146 2346
2147 glEnable GL_BLEND; 2347 glEnable GL_BLEND;
2148 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2348 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2349 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2150 glEnable GL_TEXTURE_2D; 2350 glEnable GL_TEXTURE_2D;
… …
2169 2369
2170 if ($t3) { 2370 if ($t3) {
2171 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2371 glBindTexture GL_TEXTURE_2D, $t3->{name};
2172 glBegin GL_QUADS; 2372 glBegin GL_QUADS;
2173 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2373 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2174 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2374 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2175 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2375 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2176 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2376 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2177 glEnd; 2377 glEnd;
2178 } 2378 }
2179 2379
2180 glDisable GL_BLEND; 2380 glDisable GL_BLEND;
… …
2268 $self->update; 2468 $self->update;
2269 2469
2270 $self 2470 $self
2271} 2471}
2272 2472
2273sub changed { }
2274
2275sub set_range { 2473sub set_range {
2276 my ($self, $range) = @_; 2474 my ($self, $range) = @_;
2277 2475
2278 ($range, $self->{range}) = ($self->{range}, $range); 2476 ($range, $self->{range}) = ($self->{range}, $range);
2279 2477
2280 $self->update
2281 if "@$range" ne "@{$self->{range}}"; 2478 if ("@$range" ne "@{$self->{range}}") {
2479 $self->update;
2480 $self->set_value ($self->{range}[0]);
2481 }
2282} 2482}
2283 2483
2284sub set_value { 2484sub set_value {
2285 my ($self, $value) = @_; 2485 my ($self, $value) = @_;
2286 2486
… …
2297 if $unit; 2497 if $unit;
2298 2498
2299 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2499 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2300 2500
2301 if ($value != $old_value) { 2501 if ($value != $old_value) {
2302 $self->_emit (changed => $value); 2502 $self->emit (changed => $value);
2303 $self->update; 2503 $self->update;
2304 } 2504 }
2305} 2505}
2306 2506
2307sub size_request { 2507sub size_request {
2308 my ($self) = @_; 2508 my ($self) = @_;
2309 2509
2310 ($self->{req_w}, $self->{req_h}) 2510 ($self->{req_w}, $self->{req_h})
2311} 2511}
2312 2512
2313sub button_down { 2513sub invoke_button_down {
2314 my ($self, $ev, $x, $y) = @_; 2514 my ($self, $ev, $x, $y) = @_;
2315 2515
2316 $self->SUPER::button_down ($ev, $x, $y); 2516 $self->SUPER::invoke_button_down ($ev, $x, $y);
2317 2517
2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2518 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2319 2519
2320 $self->mouse_motion ($ev, $x, $y) 2520 $self->invoke_mouse_motion ($ev, $x, $y)
2321} 2521}
2322 2522
2323sub mouse_motion { 2523sub invoke_mouse_motion {
2324 my ($self, $ev, $x, $y) = @_; 2524 my ($self, $ev, $x, $y) = @_;
2325 2525
2326 if ($GRAB == $self) { 2526 if ($GRAB == $self) {
2327 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2527 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2328 2528
… …
2334 } else { 2534 } else {
2335 return 0; 2535 return 0;
2336 } 2536 }
2337 2537
2338 1 2538 1
2539}
2540
2541sub invoke_mouse_wheel {
2542 my ($self, $ev) = @_;
2543
2544 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545
2546 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2547
2548 ! ! $delta
2339} 2549}
2340 2550
2341sub update { 2551sub update {
2342 my ($self) = @_; 2552 my ($self) = @_;
2343 2553
… …
2433sub set_range { shift->{slider}->set_range (@_) } 2643sub set_range { shift->{slider}->set_range (@_) }
2434sub set_value { shift->{slider}->set_value (@_) } 2644sub set_value { shift->{slider}->set_value (@_) }
2435 2645
2436############################################################################# 2646#############################################################################
2437 2647
2438package CFClient::UI::TextView; 2648package CFClient::UI::TextScroller;
2439 2649
2440our @ISA = CFClient::UI::HBox::; 2650our @ISA = CFClient::UI::HBox::;
2441 2651
2442use CFClient::OpenGL; 2652use CFClient::OpenGL;
2443 2653
2444sub new { 2654sub new {
2445 my $class = shift; 2655 my $class = shift;
2446 2656
2447 my $self = $class->SUPER::new ( 2657 my $self = $class->SUPER::new (
2448 fontsize => 1, 2658 fontsize => 1,
2449 can_events => 0, 2659 can_events => 1,
2660 indent => 0,
2450 #font => default_font 2661 #font => default_font
2451 @_, 2662 @_,
2452 2663
2453 layout => (new CFClient::Layout 1), 2664 layout => (new CFClient::Layout),
2454 par => [], 2665 par => [],
2455 height => 0, 2666 height => 0,
2456 children => [ 2667 children => [
2457 (new CFClient::UI::Empty expand => 1), 2668 (new CFClient::UI::Empty expand => 1),
2458 (new CFClient::UI::Slider vertical => 1), 2669 (new CFClient::UI::Slider vertical => 1),
… …
2469 2680
2470 $self->{fontsize} = $fontsize; 2681 $self->{fontsize} = $fontsize;
2471 $self->reflow; 2682 $self->reflow;
2472} 2683}
2473 2684
2685sub size_request {
2686 my ($self) = @_;
2687
2688 my ($empty, $slider) = @{ $self->{children} };
2689
2690 local $self->{children} = [$empty, $slider];
2691 $self->SUPER::size_request
2692}
2693
2474sub size_allocate { 2694sub invoke_size_allocate {
2475 my ($self, $w, $h) = @_; 2695 my ($self, $w, $h) = @_;
2476 2696
2477 $self->SUPER::size_allocate ($w, $h); 2697 my ($empty, $slider, @other) = @{ $self->{children} };
2698 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2478 2699
2479 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2700 $self->{layout}->set_font ($self->{font}) if $self->{font};
2480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2701 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2481 $self->{layout}->set_width ($self->{children}[0]{w}); 2702 $self->{layout}->set_width ($empty->{w});
2703 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2482 2704
2483 $self->reflow; 2705 $self->reflow;
2484}
2485 2706
2486sub text_size { 2707 local $self->{children} = [$empty, $slider];
2708 $self->SUPER::invoke_size_allocate ($w, $h)
2709}
2710
2711sub invoke_mouse_wheel {
2487 my ($self, $text, $indent) = @_; 2712 my ($self, $ev) = @_;
2713
2714 return 0 unless $ev->{dy}; # only vertical movements
2715
2716 $self->{children}[1]->emit (mouse_wheel => $ev);
2717
2718 1
2719}
2720
2721sub get_layout {
2722 my ($self, $para) = @_;
2488 2723
2489 my $layout = $self->{layout}; 2724 my $layout = $self->{layout};
2490 2725
2726 $layout->set_font ($self->{font}) if $self->{font};
2727 $layout->set_foreground (@{$para->{fg}});
2491 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2728 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2492 $layout->set_width ($self->{children}[0]{w} - $indent); 2729 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2730 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2493 $layout->set_markup ($text); 2731 $layout->set_markup ($para->{markup});
2732
2733 $layout->set_shapes (
2734 map
2735 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2736 @{$para->{widget}}
2494 2737 );
2738
2495 $layout->size 2739 $layout
2496} 2740}
2497 2741
2498sub reflow { 2742sub reflow {
2499 my ($self) = @_; 2743 my ($self) = @_;
2500 2744
… …
2509 $self->{children}[1]->set_value ($offset); 2753 $self->{children}[1]->set_value ($offset);
2510} 2754}
2511 2755
2512sub clear { 2756sub clear {
2513 my ($self) = @_; 2757 my ($self) = @_;
2758
2759 my (undef, undef, @other) = @{ $self->{children} };
2760 $self->remove ($_) for @other;
2514 2761
2515 $self->{par} = []; 2762 $self->{par} = [];
2516 $self->{height} = 0; 2763 $self->{height} = 0;
2517 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2764 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2518} 2765}
2519 2766
2520sub add_paragraph { 2767sub add_paragraph {
2521 my ($self, $color, $text, $indent) = @_; 2768 my $self = shift;
2522 2769
2523 for my $line (split /\n/, $text) { 2770 for my $para (@_) {
2524 my ($w, $h) = $self->text_size ($line); 2771 $para = {
2525 $self->{height} += $h; 2772 fg => [1, 1, 1, 1],
2526 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2773 indent => 0,
2527 } 2774 markup => "",
2775 widget => [],
2776 ref $para ? %$para : (markup => $para),
2777 w => 1e10,
2778 wrapped => 1,
2779 };
2528 2780
2529 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2781 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782 push @{$self->{par}}, $para;
2783 }
2784
2785 $self->{need_reflow}++;
2786 $self->update;
2787}
2788
2789sub scroll_to_bottom {
2790 my ($self) = @_;
2791
2792 $self->{scroll_to_bottom} = 1;
2793 $self->update;
2530} 2794}
2531 2795
2532sub update { 2796sub update {
2533 my ($self) = @_; 2797 my ($self) = @_;
2534 2798
… …
2536 2800
2537 return unless $self->{h} > 0; 2801 return unless $self->{h} > 0;
2538 2802
2539 delete $self->{texture}; 2803 delete $self->{texture};
2540 2804
2541 $ROOT->on_post_alloc ($self, sub { 2805 $ROOT->on_post_alloc ($self => sub {
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543 2807
2544 if (delete $self->{need_reflow}) { 2808 if (delete $self->{need_reflow}) {
2545 my $height = 0; 2809 my $height = 0;
2546 2810
2547 my $layout = $self->{layout};
2548
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
2551 for (@{$self->{par}}) { 2811 for my $para (@{$self->{par}}) {
2552 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2812 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2553 $layout->set_width ($W - $_->[3]); 2813 my $layout = $self->get_layout ($para);
2554 $layout->set_markup ($_->[4]);
2555 my ($w, $h) = $layout->size; 2814 my ($w, $h) = $layout->size;
2556 $_->[0] = $w + $_->[3]; 2815
2557 $_->[1] = $h; 2816 $para->{w} = $w + $para->{indent};
2817 $para->{h} = $h;
2818 $para->{wrapped} = $layout->has_wrapped;
2558 } 2819 }
2559 2820
2560 $height += $_->[1]; 2821 $height += $para->{h};
2561 } 2822 }
2562 2823
2563 $self->{height} = $height; 2824 $self->{height} = $height;
2564 2825
2565 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2826 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2566 2827
2567 delete $self->{texture}; 2828 delete $self->{texture};
2829 }
2830
2831 if (delete $self->{scroll_to_bottom}) {
2832 $self->{children}[1]->set_value (1e10);
2568 } 2833 }
2569 2834
2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2835 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2571 glClearColor 0, 0, 0, 0; 2836 glClearColor 0, 0, 0, 0;
2572 glClear GL_COLOR_BUFFER_BIT; 2837 glClear GL_COLOR_BUFFER_BIT;
… …
2576 my $y0 = $top; 2841 my $y0 = $top;
2577 my $y1 = $top + $H; 2842 my $y1 = $top + $H;
2578 2843
2579 my $y = 0; 2844 my $y = 0;
2580 2845
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}}) { 2846 for my $para (@{$self->{par}}) {
2590 my $h = $par->[1]; 2847 my $h = $para->{h};
2591 2848
2592 if ($y0 < $y + $h && $y < $y1) { 2849 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 2850
2597 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2851 my $layout = $self->get_layout ($para);
2598 2852
2599 glRasterPos $par->[3], $y - $y0; 2853 $layout->render ($para->{indent}, $y - $y0);
2600 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2854
2855 if (my @w = @{ $para->{widget} }) {
2856 my @s = $layout->get_shapes;
2857
2858 for (@w) {
2859 my ($dx, $dy) = splice @s, 0, 2, ();
2860
2861 $_->{x} = $dx + $para->{indent};
2862 $_->{y} = $dy + $y - $y0;
2863
2864 $_->draw;
2865 }
2866 }
2601 } 2867 }
2602 2868
2603 $y += $h; 2869 $y += $h;
2604 } 2870 }
2605
2606 glDisable GL_BLEND;
2607 }; 2871 };
2608 }); 2872 });
2873}
2874
2875sub reconfigure {
2876 my ($self) = @_;
2877
2878 $self->SUPER::reconfigure;
2879
2880 $_->{w} = 1e10 for @{ $self->{par} };
2881 $self->reflow;
2609} 2882}
2610 2883
2611sub _draw { 2884sub _draw {
2612 my ($self) = @_; 2885 my ($self) = @_;
2613 2886
… …
2616 glColor 0, 0, 0, 1; 2889 glColor 0, 0, 0, 1;
2617 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2890 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2618 glDisable GL_TEXTURE_2D; 2891 glDisable GL_TEXTURE_2D;
2619 2892
2620 $self->{children}[1]->draw; 2893 $self->{children}[1]->draw;
2621
2622} 2894}
2623 2895
2624############################################################################# 2896#############################################################################
2625 2897
2626package CFClient::UI::Animator; 2898package CFClient::UI::Animator;
… …
2713 $tooltip .= "\n\n" . (ref $widget) . "\n" 2985 $tooltip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2986 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n" 2987 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}"; 2988 . "visible $widget->{visible}";
2717 } 2989 }
2990
2991 $tooltip =~ s/^\n+//;
2992 $tooltip =~ s/\n+$//;
2718 2993
2719 $self->add (new CFClient::UI::Label 2994 $self->add (new CFClient::UI::Label
2720 markup => $tooltip, 2995 markup => $tooltip,
2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2722 fontsize => 0.8, 2997 fontsize => 0.8,
… …
2732 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3007 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2733 3008
2734 ($w + 4, $h + 4) 3009 ($w + 4, $h + 4)
2735} 3010}
2736 3011
2737sub size_allocate { 3012sub invoke_size_allocate {
2738 my ($self, $w, $h) = @_; 3013 my ($self, $w, $h) = @_;
2739 3014
2740 $self->SUPER::size_allocate ($w - 4, $h - 4); 3015 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2741} 3016}
2742 3017
2743sub visibility_change { 3018sub invoke_visibility_change {
2744 my ($self, $visible) = @_; 3019 my ($self, $visible) = @_;
2745 3020
2746 return unless $visible; 3021 return unless $visible;
2747 3022
2748 $self->{root}->on_post_alloc ("move_$self" => sub { 3023 $self->{root}->on_post_alloc ("move_$self" => sub {
2749 my $widget = $self->{owner} 3024 my $widget = $self->{owner}
2750 or return; 3025 or return;
2751 3026
3027 if ($widget->{visible}) {
2752 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3028 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753 3029
2754 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3030 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755 if $x + $self->{w} > $::WIDTH; 3031 if $x + $self->{w} > $self->{root}{w};
2756 3032
2757 $self->move_abs ($x, $y); 3033 $self->move_abs ($x, $y);
3034 } else {
3035 $self->hide;
3036 }
2758 }); 3037 });
2759} 3038}
2760 3039
2761sub _draw { 3040sub _draw {
2762 my ($self) = @_; 3041 my ($self) = @_;
… …
2788 3067
2789############################################################################# 3068#############################################################################
2790 3069
2791package CFClient::UI::Face; 3070package CFClient::UI::Face;
2792 3071
2793our @ISA = CFClient::UI::Base::; 3072our @ISA = CFClient::UI::DrawBG::;
2794 3073
2795use CFClient::OpenGL; 3074use CFClient::OpenGL;
2796 3075
2797sub new { 3076sub new {
2798 my $class = shift; 3077 my $class = shift;
… …
2835sub _draw { 3114sub _draw {
2836 my ($self) = @_; 3115 my ($self) = @_;
2837 3116
2838 return unless $::CONN; 3117 return unless $::CONN;
2839 3118
3119 $self->SUPER::_draw;
3120
2840 my $face; 3121 my $face;
2841 3122
2842 if ($self->{frame}) { 3123 if ($self->{frame}) {
2843 my $anim = $::CONN->{anim}[$self->{anim}]; 3124 my $anim = $::CONN->{anim}[$self->{anim}];
2844 3125
… …
2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3136 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2856 glDisable GL_TEXTURE_2D; 3137 glDisable GL_TEXTURE_2D;
2857 } 3138 }
2858} 3139}
2859 3140
2860sub DESTROY { 3141sub destroy {
2861 my ($self) = @_; 3142 my ($self) = @_;
2862 3143
2863 $self->{timer}->cancel 3144 $self->{timer}->cancel
2864 if $self->{timer}; 3145 if $self->{timer};
2865 3146
2866 $self->SUPER::DESTROY; 3147 $self->SUPER::destroy;
2867} 3148}
2868 3149
2869############################################################################# 3150#############################################################################
2870 3151
2871package CFClient::UI::Buttonbar; 3152package CFClient::UI::Buttonbar;
… …
2892 ); 3173 );
2893 3174
2894 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3175 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2895 3176
2896 for my $item (@{ $self->{items} }) { 3177 for my $item (@{ $self->{items} }) {
2897 my ($widget, $cb) = @$item; 3178 my ($widget, $cb, $tooltip) = @$item;
2898 3179
2899 # handle various types of items, only text for now 3180 # handle various types of items, only text for now
2900 if (!ref $widget) { 3181 if (!ref $widget) {
3182 if ($widget =~ /\t/) {
3183 my ($left, $right) = split /\t/, $widget, 2;
3184
3185 $widget = new CFClient::UI::HBox
3186 can_hover => 1,
3187 can_events => 1,
3188 tooltip => $tooltip,
3189 children => [
3190 (new CFClient::UI::Label markup => $left, expand => 1),
3191 (new CFClient::UI::Label markup => $right, align => +1),
3192 ],
3193 ;
3194
3195 } else {
2901 $widget = new CFClient::UI::Label 3196 $widget = new CFClient::UI::Label
2902 can_hover => 1, 3197 can_hover => 1,
2903 can_events => 1, 3198 can_events => 1,
2904 text => $widget; 3199 markup => $widget,
3200 tooltip => $tooltip;
3201 }
2905 } 3202 }
2906 3203
2907 $self->{item}{$widget} = $item; 3204 $self->{item}{$widget} = $item;
2908 3205
2909 $self->{vbox}->add ($widget); 3206 $self->{vbox}->add ($widget);
… …
2914 3211
2915# popup given the event (must be a mouse button down event currently) 3212# popup given the event (must be a mouse button down event currently)
2916sub popup { 3213sub popup {
2917 my ($self, $ev) = @_; 3214 my ($self, $ev) = @_;
2918 3215
2919 $self->_emit ("popdown"); 3216 $self->emit ("popdown");
2920 3217
2921 # maybe save $GRAB? must be careful about events... 3218 # maybe save $GRAB? must be careful about events...
2922 $GRAB = $self; 3219 $GRAB = $self;
2923 $self->{button} = $ev->{button}; 3220 $self->{button} = $ev->{button};
2924 3221
2925 $self->show; 3222 $self->show;
2926 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3223 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2927} 3224}
2928 3225
2929sub mouse_motion { 3226sub invoke_mouse_motion {
2930 my ($self, $ev, $x, $y) = @_; 3227 my ($self, $ev, $x, $y) = @_;
2931 3228
2932 # TODO: should use vbox->find_widget or so 3229 # TODO: should use vbox->find_widget or so
2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3230 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2934 $self->{hover} = $self->{item}{$HOVER}; 3231 $self->{hover} = $self->{item}{$HOVER};
2935 3232
2936 0 3233 0
2937} 3234}
2938 3235
2939sub button_up { 3236sub invoke_button_up {
2940 my ($self, $ev, $x, $y) = @_; 3237 my ($self, $ev, $x, $y) = @_;
2941 3238
2942 if ($ev->{button} == $self->{button}) { 3239 if ($ev->{button} == $self->{button}) {
2943 undef $GRAB; 3240 undef $GRAB;
2944 $self->hide; 3241 $self->hide;
2945 3242
2946 $self->_emit ("popdown"); 3243 $self->emit ("popdown");
2947 $self->{hover}[1]->() if $self->{hover}; 3244 $self->{hover}[1]->() if $self->{hover};
2948 } else { 3245 } else {
2949 return 0 3246 return 0
2950 } 3247 }
2951 3248
… …
2978 3275
2979 $self->{current} = $self->{children}[0] 3276 $self->{current} = $self->{children}[0]
2980 if @{ $self->{children} }; 3277 if @{ $self->{children} };
2981} 3278}
2982 3279
3280sub get_current_page {
3281 my ($self) = @_;
3282
3283 $self->{current}
3284}
3285
2983sub set_current_page { 3286sub set_current_page {
2984 my ($self, $page_or_widget) = @_; 3287 my ($self, $page_or_widget) = @_;
2985 3288
2986 my $widget = ref $page_or_widget 3289 my $widget = ref $page_or_widget
2987 ? $page_or_widget 3290 ? $page_or_widget
2988 : $self->{children}[$page_or_widget]; 3291 : $self->{children}[$page_or_widget];
2989 3292
2990 $self->{current} = $widget; 3293 $self->{current} = $widget;
2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3294 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992 3295
2993 $self->_emit (page_changed => $self->{current}); 3296 $self->emit (page_changed => $self->{current});
2994 3297
2995 $self->realloc; 3298 $self->realloc;
2996} 3299}
2997 3300
2998sub visible_children { 3301sub visible_children {
… …
3003 my ($self) = @_; 3306 my ($self) = @_;
3004 3307
3005 $self->{current}->size_request 3308 $self->{current}->size_request
3006} 3309}
3007 3310
3008sub size_allocate { 3311sub invoke_size_allocate {
3009 my ($self, $w, $h) = @_; 3312 my ($self, $w, $h) = @_;
3010 3313
3011 $self->{current}->configure (0, 0, $w, $h); 3314 $self->{current}->configure (0, 0, $w, $h);
3315
3316 1
3012} 3317}
3013 3318
3014sub _draw { 3319sub _draw {
3015 my ($self) = @_; 3320 my ($self) = @_;
3016 3321
… …
3051 ); 3356 );
3052 3357
3053 $self->{multiplexer}->add ($widget); 3358 $self->{multiplexer}->add ($widget);
3054} 3359}
3055 3360
3361sub get_current_page {
3362 my ($self) = @_;
3363
3364 $self->{multiplexer}->get_current_page
3365}
3366
3056sub set_current_page { 3367sub set_current_page {
3057 my ($self, $page) = @_; 3368 my ($self, $page) = @_;
3058 3369
3059 $self->{multiplexer}->set_current_page ($page); 3370 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current}); 3371 $self->emit (page_changed => $self->{multiplexer}{current});
3061} 3372}
3062 3373
3063############################################################################# 3374#############################################################################
3064 3375
3065package CFClient::UI::Statusbox; 3376package CFClient::UI::Selector;
3066 3377
3378use utf8;
3379
3067our @ISA = CFClient::UI::VBox::; 3380our @ISA = CFClient::UI::Button::;
3068 3381
3069sub new { 3382sub new {
3070 my $class = shift; 3383 my $class = shift;
3071 3384
3072 $class->SUPER::new ( 3385 my $self = $class->SUPER::new (
3386 options => [], # [value, title, longdesc], ...
3387 value => undef,
3388 @_,
3389 );
3390
3391 $self->_set_value ($self->{value});
3392
3393 $self
3394}
3395
3396sub invoke_button_down {
3397 my ($self, $ev) = @_;
3398
3399 my @menu_items;
3400
3401 for (@{ $self->{options} }) {
3402 my ($value, $title, $tooltip) = @$_;
3403
3404 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405 }
3406
3407 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408}
3409
3410sub _set_value {
3411 my ($self, $value) = @_;
3412
3413 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3414 or return;
3415
3416 $self->{value} = $item->[0];
3417 $self->set_markup ("$item->[1] ⇓");
3418 $self->set_tooltip ($item->[2]);
3419}
3420
3421sub set_value {
3422 my ($self, $value) = @_;
3423
3424 return unless $self->{value} ne $value;
3425
3426 $self->_set_value ($value);
3427 $self->emit (changed => $value);
3428}
3429
3430#############################################################################
3431
3432package CFClient::UI::Statusbox;
3433
3434our @ISA = CFClient::UI::VBox::;
3435
3436sub new {
3437 my $class = shift;
3438
3439 my $self = $class->SUPER::new (
3073 fontsize => 0.8, 3440 fontsize => 0.8,
3074 @_, 3441 @_,
3075 ) 3442 );
3443
3444 Scalar::Util::weaken (my $this = $self);
3445
3446 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3447
3448 $self
3076} 3449}
3077 3450
3078sub reorder { 3451sub reorder {
3079 my ($self) = @_; 3452 my ($self) = @_;
3080 my $NOW = time; 3453 my $NOW = Time::HiRes::time;
3454
3455 # freeze display when hovering over any label
3456 return if $CFClient::UI::TOOLTIP->{owner}
3457 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3458 values %{ $self->{item} };
3081 3459
3082 while (my ($k, $v) = each %{ $self->{item} }) { 3460 while (my ($k, $v) = each %{ $self->{item} }) {
3083 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3461 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3084 } 3462 }
3085 3463
… …
3088 my @items = sort { 3466 my @items = sort {
3089 $a->{pri} <=> $b->{pri} 3467 $a->{pri} <=> $b->{pri}
3090 or $b->{id} <=> $a->{id} 3468 or $b->{id} <=> $a->{id}
3091 } values %{ $self->{item} }; 3469 } values %{ $self->{item} };
3092 3470
3471 $self->{timer}->interval (1);
3472
3093 my $count = 10 + 1; 3473 my $count = 10 + 1;
3094 for my $item (@items) { 3474 for my $item (@items) {
3095 last unless --$count; 3475 last unless --$count;
3096 3476
3097 push @widgets, $item->{label} ||= do { 3477 my $label = $item->{label} ||= do {
3098 # TODO: doesn't handle markup well (read as: at all) 3478 # TODO: doesn't handle markup well (read as: at all)
3099 my $short = $item->{count} > 1 3479 my $short = $item->{count} > 1
3100 ? "<b>$item->{count} ×</b> $item->{text}" 3480 ? "<b>$item->{count} ×</b> $item->{text}"
3101 : $item->{text}; 3481 : $item->{text};
3102 3482
… …
3110 tooltip => $item->{tooltip}, 3490 tooltip => $item->{tooltip},
3111 tooltip_font => $::FONT_PROP, 3491 tooltip_font => $::FONT_PROP,
3112 tooltip_width => 0.67, 3492 tooltip_width => 0.67,
3113 fontsize => $item->{fontsize} || $self->{fontsize}, 3493 fontsize => $item->{fontsize} || $self->{fontsize},
3114 max_w => $::WIDTH * 0.44, 3494 max_w => $::WIDTH * 0.44,
3115 fg => $item->{fg}, 3495 fg => [@{ $item->{fg} }],
3116 can_events => 1, 3496 can_events => 1,
3117 can_hover => 1 3497 can_hover => 1
3118 }; 3498 };
3499
3500 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3501 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3502 $label->update;
3503 $label->set_max_size (undef, $label->{req_h} * $diff)
3504 if $diff < 1;
3505 $self->{timer}->interval (1/30);
3506 } else {
3507 $label->{fg}[3] = $item->{fg}[3] || 1;
3508 }
3509
3510 push @widgets, $label;
3119 } 3511 }
3120 3512
3121 $self->clear; 3513 $self->clear;
3122 $self->SUPER::add (reverse @widgets); 3514 $self->SUPER::add (reverse @widgets);
3123} 3515}
… …
3128 $text =~ s/^\s+//; 3520 $text =~ s/^\s+//;
3129 $text =~ s/\s+$//; 3521 $text =~ s/\s+$//;
3130 3522
3131 return unless $text; 3523 return unless $text;
3132 3524
3133 my $timeout = time + ((delete $arg{timeout}) || 60); 3525 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3134 3526
3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3527 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3136 3528
3137 if (my $item = $self->{item}{$group}) { 3529 if (my $item = $self->{item}{$group}) {
3138 if ($item->{text} eq $text) { 3530 if ($item->{text} eq $text) {
3139 $item->{count}++; 3531 $item->{count}++;
3140 } else { 3532 } else {
3141 $item->{count} = 1; 3533 $item->{count} = 1;
3142 $item->{text} = $item->{tooltip} = $text; 3534 $item->{text} = $item->{tooltip} = $text;
3143 } 3535 }
3144 $item->{id} = ++$self->{id}; 3536 $item->{id} += 0.2;#d#
3145 $item->{timeout} = $timeout; 3537 $item->{timeout} = $timeout;
3146 delete $item->{label}; 3538 delete $item->{label};
3147 } else { 3539 } else {
3148 $self->{item}{$group} = { 3540 $self->{item}{$group} = {
3149 id => ++$self->{id}, 3541 id => ++$self->{id},
… …
3155 count => 1, 3547 count => 1,
3156 %arg, 3548 %arg,
3157 }; 3549 };
3158 } 3550 }
3159 3551
3552 $ROOT->on_refresh (reorder => sub {
3160 $self->reorder; 3553 $self->reorder;
3554 });
3161} 3555}
3162 3556
3163sub reconfigure { 3557sub reconfigure {
3164 my ($self) = @_; 3558 my ($self) = @_;
3165 3559
… …
3168 3562
3169 $self->reorder; 3563 $self->reorder;
3170 $self->SUPER::reconfigure; 3564 $self->SUPER::reconfigure;
3171} 3565}
3172 3566
3567sub destroy {
3568 my ($self) = @_;
3569
3570 $self->{timer}->cancel;
3571
3572 $self->SUPER::destroy;
3573}
3574
3173############################################################################# 3575#############################################################################
3174 3576
3175package CFClient::UI::Inventory; 3577package CFClient::UI::Inventory;
3176 3578
3177our @ISA = CFClient::UI::ScrolledWindow::; 3579our @ISA = CFClient::UI::Table::;
3178 3580
3179sub new { 3581sub new {
3180 my $class = shift; 3582 my $class = shift;
3181 3583
3182 my $self = $class->SUPER::new ( 3584 my $self = $class->SUPER::new (
3183 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3585 col_expand => [0, 1, 0],
3586 items => [],
3184 @_, 3587 @_,
3185 ); 3588 );
3186 3589
3590 $self->set_sort_order (undef);
3591
3187 $self 3592 $self
3593}
3594
3595sub update_items {
3596 my ($self) = @_;
3597
3598 $self->clear;
3599
3600 my @item = $self->{sort}->(@{ $self->{items} });
3601
3602 my @adds;
3603 my $row = 0;
3604 for my $item ($self->{sort}->(@{ $self->{items} })) {
3605 CFClient::Item::update_widgets $item;
3606
3607 push @adds, 0, $row, $item->{face_widget};
3608 push @adds, 1, $row, $item->{desc_widget};
3609 push @adds, 2, $row, $item->{weight_widget};
3610
3611 $row++;
3612 }
3613
3614 $self->add (@adds);
3615}
3616
3617sub set_sort_order {
3618 my ($self, $order) = @_;
3619
3620 $self->{sort} = $order ||= sub {
3621 sort {
3622 $a->{type} <=> $b->{type}
3623 or $a->{name} cmp $b->{name}
3624 } @_
3625 };
3626
3627 $self->update_items;
3188} 3628}
3189 3629
3190sub set_items { 3630sub set_items {
3191 my ($self, $items) = @_; 3631 my ($self, $items) = @_;
3192 3632
3193 $self->{child}->clear; 3633 $self->{items} = [$items ? values %$items : ()];
3194 return unless $items;
3195
3196 my @items = sort {
3197 ($a->{type} <=> $b->{type})
3198 or ($a->{name} cmp $b->{name})
3199 } @$items;
3200
3201 $self->{real_items} = \@items;
3202
3203 my $row = 0;
3204 for my $item (@items) {
3205 CFClient::Item::update_widgets $item;
3206
3207 $self->{child}->add (0, $row, $item->{face_widget});
3208 $self->{child}->add (1, $row, $item->{desc_widget});
3209 $self->{child}->add (2, $row, $item->{weight_widget});
3210
3211 $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; 3634 $self->update_items;
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 }
3410} 3635}
3411 3636
3412############################################################################# 3637#############################################################################
3413 3638
3414package CFClient::UI::SpellList; 3639package CFClient::UI::SpellList;
… …
3423 commands => [], 3648 commands => [],
3424 @_, 3649 @_,
3425 ) 3650 )
3426} 3651}
3427 3652
3428# XXX: Do sorting? Argl... 3653my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3654
3655my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3657my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3659my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3663my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3665
3666sub rebuild_spell_list {
3667 my ($self) = @_;
3668
3669 $CFClient::UI::ROOT->on_refresh ($self => sub {
3670 $self->clear;
3671
3672 return unless $::CONN;
3673
3674 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3675 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3676 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3677 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3678 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3679
3680 my $row = 0;
3681
3682 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3683 my $spell = $self->{spell}{$_};
3684
3685 $row++;
3686
3687 my $spell_cb = sub {
3688 my ($widget, $ev) = @_;
3689
3690 if ($ev->{button} == 1) {
3691 $::CONN->user_send ("cast $spell->{name}");
3692 } elsif ($ev->{button} == 2) {
3693 $::CONN->user_send ("invoke $spell->{name}");
3694 } elsif ($ev->{button} == 3) {
3695 (new CFClient::UI::Menu
3696 items => [
3697 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3698 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3699 ],
3700 )->popup ($ev);
3701 } else {
3702 return 0;
3703 }
3704
3705 1
3706 };
3707
3708 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3709
3710 #TODO: add path info to tooltip
3711 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3712
3713 $self->add (0, $row, new CFClient::UI::Face
3714 face => $spell->{face},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (1, $row, new CFClient::UI::Label
3722 expand => 1,
3723 text => $spell->{name},
3724 can_hover => 1,
3725 can_events => 1,
3726 tooltip => $tooltip,
3727 on_button_down => $spell_cb,
3728 );
3729
3730 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3731 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3732 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3733 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3734 }
3735 });
3736}
3737
3429sub add_spell { 3738sub add_spell {
3430 my ($self, $spell) = @_; 3739 my ($self, $spell) = @_;
3740
3431 $self->{spells}->{$spell->{name}} = $spell; 3741 $self->{spell}->{$spell->{name}} = $spell;
3432 3742 $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} 3743}
3461 3744
3462sub remove_spell { 3745sub remove_spell {
3463 my ($self, $spell) = @_; 3746 my ($self, $spell) = @_;
3747
3464 delete $self->{spells}->{$spell->{name}}; 3748 delete $self->{spell}->{$spell->{name}};
3465 $self->rebuild_spell_list; 3749 $self->rebuild_spell_list;
3466} 3750}
3467 3751
3752sub clear_spells {
3753 my ($self) = @_;
3754
3755 $self->{spell} = {};
3756 $self->rebuild_spell_list;
3757}
3758
3468############################################################################# 3759#############################################################################
3469 3760
3470package CFClient::UI::Root; 3761package CFClient::UI::Root;
3471 3762
3472our @ISA = CFClient::UI::Container::; 3763our @ISA = CFClient::UI::Container::;
3764
3765use List::Util qw(min max);
3473 3766
3474use CFClient::OpenGL; 3767use CFClient::OpenGL;
3475 3768
3476sub new { 3769sub new {
3477 my $class = shift; 3770 my $class = shift;
… …
3504 $coord = $max - $size if $coord > $max - $size; 3797 $coord = $max - $size if $coord > $max - $size;
3505 3798
3506 int $coord + 0.5 3799 int $coord + 0.5
3507} 3800}
3508 3801
3509sub size_allocate { 3802sub invoke_size_allocate {
3510 my ($self, $w, $h) = @_; 3803 my ($self, $w, $h) = @_;
3511 3804
3512 for my $child ($self->children) { 3805 for my $child ($self->children) {
3513 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3806 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3514 3807
… …
3518 $X = _to_pixel $X, $W, $self->{w}; 3811 $X = _to_pixel $X, $W, $self->{w};
3519 $Y = _to_pixel $Y, $H, $self->{h}; 3812 $Y = _to_pixel $Y, $H, $self->{h};
3520 3813
3521 $child->configure ($X, $Y, $W, $H); 3814 $child->configure ($X, $Y, $W, $H);
3522 } 3815 }
3816
3817 1
3523} 3818}
3524 3819
3525sub coord2local { 3820sub coord2local {
3526 my ($self, $x, $y) = @_; 3821 my ($self, $x, $y) = @_;
3527 3822
… …
3612 3907
3613 delete $queue{$widget+0}; 3908 delete $queue{$widget+0};
3614 3909
3615 my ($w, $h) = $widget->size_request; 3910 my ($w, $h) = $widget->size_request;
3616 3911
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3912 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3913 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3914
3915 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3916 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3619 3917
3620 $w = $widget->{force_w} if exists $widget->{force_w}; 3918 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h}; 3919 $h = $widget->{force_h} if exists $widget->{force_h};
3622 3920
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3921 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3649 3947
3650 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3948 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3651 3949
3652 $w = 0 if $w < 0; 3950 $w = 0 if $w < 0;
3653 $h = 0 if $h < 0; 3951 $h = 0 if $h < 0;
3952
3953 $w = max $widget->{min_w}, $w;
3954 $h = max $widget->{min_h}, $h;
3955
3956# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3957# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3958
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3654 3961
3655 $w = int $w + 0.5; 3962 $w = int $w + 0.5;
3656 $h = int $h + 0.5; 3963 $h = int $h + 0.5;
3657 3964
3658 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3965 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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