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.278 by root, Sun Jun 4 23:05:06 2006 UTC vs.
Revision 1.337 by root, Mon Jul 24 04:24:43 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
78sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 81 if $FOCUS;
81} 82}
82 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
83sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
84 my ($ev) = @_; 98 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
86 100
87 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
88 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
89 103
90 $GRAB = $widget; 104 $GRAB = $widget;
91 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
92 106
93 check_tooltip; 107 $TOOLTIP_WATCHER->cb->();
94 } 108 }
95 109
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 111
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
99 if $GRAB; 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
100} 122}
101 123
102sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
103 my ($ev) = @_; 125 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 126
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 128
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 130
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
111 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 133
113 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 136 $grab->update if $grab;
116 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
117 138
118 check_tooltip; 139 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->();
119 } 141 }
120} 142}
121 143
122sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
123 my ($ev) = @_; 145 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
125 147
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 149
128 if ($widget != $HOVER) { 150 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 151
131 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 153 if $HOVER;
139} 154}
140 155
141# convert position array to integers 156# convert position array to integers
142sub harmonize { 157sub harmonize {
… …
188 203
189 } 204 }
190 } 205 }
191 206
192 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
193} 216}
194 217
195############################################################################# 218#############################################################################
196 219
197package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
271 294
272 return unless $self->{visible}; 295 return unless $self->{visible};
273 296
274 $_->set_invisible for $self->children; 297 $_->set_invisible for $self->children;
275 298
299 delete $self->{visible};
276 delete $self->{root}; 300 delete $self->{root};
277 delete $self->{visible};
278 301
279 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
281 304
282 CFClient::UI::check_tooltip 305 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 306 if $TOOLTIP->{owner} == $self;
284 307
285 $self->focus_out; 308 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 309 $self->emit (visibility_change => 0);
288} 310}
289 311
290sub set_visibility { 312sub set_visibility {
291 my ($self, $visible) = @_; 313 my ($self, $visible) = @_;
… …
314} 336}
315 337
316sub move_abs { 338sub move_abs {
317 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
318 340
319 $self->{x} = List::Util::max 0, int $x; 341 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 342 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
322 344
323 $self->update; 345 $self->update;
324} 346}
325 347
… …
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
… …
855 my $tex = $self->{texture} 915 my $tex = $self->{texture}
856 or return; 916 or return;
857 917
858 glEnable GL_TEXTURE_2D; 918 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glEnable GL_BLEND;
861 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
862 glColor 0, 0, 0, 1; 920 glColor 0, 0, 0, 1;
863 921
864 $tex->draw_quad (0, 0, $w, $h); 922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
865 923
866 glDisable GL_BLEND;
867 glDisable GL_TEXTURE_2D; 924 glDisable GL_TEXTURE_2D;
868} 925}
869 926
870############################################################################# 927#############################################################################
871 928
… …
892 $h = 10 if $self->{scroll_y}; 949 $h = 10 if $self->{scroll_y};
893 950
894 ($w, $h) 951 ($w, $h)
895} 952}
896 953
897sub size_allocate { 954sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 955 my ($self, $w, $h) = @_;
899 956
900 my $child = $self->child; 957 my $child = $self->child;
901 958
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 959 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 960 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 961
905 $self->child->configure (0, 0, $w, $h); 962 $self->child->configure (0, 0, $w, $h);
906 $self->update; 963 $self->update;
964
965 1
907} 966}
908 967
909sub set_offset { 968sub set_offset {
910 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
911 970
… …
974 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
975 }, 1034 },
976 ; 1035 ;
977 1036
978 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
980 slider => $slider, 1040 slider => $slider,
981 %arg, 1041 %arg,
982 ); 1042 );
983 1043
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
986 1046
987 $self 1047 $self
988} 1048}
989 1049
1050#TODO# update range on size_allocate depending on child
1051
990sub add { 1052sub add {
991 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
992 1054
993 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
994} 1056}
995 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
996sub update { 1074sub update {
997 my ($self) = @_; 1075 my ($self) = @_;
998 1076
999 $self->SUPER::update; 1077 $self->SUPER::update;
1000 1078
1001 # todo: overwrite size_allocate of child 1079 $self->update_slider;
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1080}
1005 1081
1006sub size_allocate { 1082sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
1008 1084
1085 $self->update_slider;
1086
1009 $self->SUPER::size_allocate ($w, $h); 1087 $self->SUPER::invoke_size_allocate ($w, $h)
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013} 1088}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1089
1018############################################################################# 1090#############################################################################
1019 1091
1020package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
1021 1093
… …
1072 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);
1073 1145
1074sub new { 1146sub new {
1075 my ($class, %arg) = @_; 1147 my ($class, %arg) = @_;
1076 1148
1077 my $title = delete $arg{title};
1078
1079 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1152 border => 0.6,
1083 can_events => 1, 1153 can_events => 1,
1084 min_w => 16, 1154 min_w => 64,
1085 min_h => 16, 1155 min_h => 32,
1086 %arg, 1156 %arg,
1087 ); 1157 );
1088 1158
1089 $self->{title} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1090 align => 0, 1160 align => 0,
1091 valign => 1, 1161 valign => 1,
1092 text => $title, 1162 text => $self->{title},
1093 fontsize => $self->{border} 1163 fontsize => $self->{border},
1094 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 }
1095 1174
1096 $self 1175 $self
1097} 1176}
1098 1177
1099sub add { 1178sub add {
1100 my ($self, @widgets) = @_; 1179 my ($self, @widgets) = @_;
1101 1180
1102 $self->SUPER::add (@widgets); 1181 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1183 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1184}
1105 1185
1106sub border { 1186sub border {
1107 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1108} 1188}
1109 1189
1110sub size_request { 1190sub size_request {
1111 my ($self) = @_; 1191 my ($self) = @_;
1112 1192
1113 $self->{title}->size_request 1193 $self->{title_widget}->size_request
1114 if $self->{title}; 1194 if $self->{title_widget};
1195
1196 $self->{close_button}->size_request
1197 if $self->{close_button};
1115 1198
1116 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1117 1200
1118 ( 1201 (
1119 $w + $self->border * 2, 1202 $w + $self->border * 2,
1120 $h + $self->border * 2, 1203 $h + $self->border * 2,
1121 ) 1204 )
1122} 1205}
1123 1206
1124sub size_allocate { 1207sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1126 1209
1127 if ($self->{title}) { 1210 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1211 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1212 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1213 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1214 }
1132 1215
1133 my $border = $self->border; 1216 my $border = $self->border;
1134 1217
1135 $h -= List::Util::max 0, $border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1136 $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;
1137 1233
1138 $self->child->configure ($border, $border, $w, $h); 1234 1
1139} 1235}
1140 1236
1141sub button_down { 1237sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1143 1239
1144 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1241 my $border = $self->border;
1146 1242
… …
1177 1273
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1275
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1276 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1277 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1278 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1279 };
1184 } else { 1280 } else {
1185 return 0; 1281 return 0;
1186 } 1282 }
1187 1283
1188 1 1284 1
1189} 1285}
1190 1286
1191sub button_up { 1287sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1193 1289
1194 !!delete $self->{motion} 1290 ! ! delete $self->{motion}
1195} 1291}
1196 1292
1197sub mouse_motion { 1293sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1199 1295
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1297
1202 !!$self->{motion} 1298 ! ! $self->{motion}
1203} 1299}
1204 1300
1205sub _draw { 1301sub _draw {
1206 my ($self) = @_; 1302 my ($self) = @_;
1207 1303
… …
1233 1329
1234 glDisable GL_TEXTURE_2D; 1330 glDisable GL_TEXTURE_2D;
1235 1331
1236 $child->draw; 1332 $child->draw;
1237 1333
1238 if ($self->{title}) { 1334 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1335 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1336 $self->{title_widget}->_draw;
1337
1338 glTranslate 0, - ($border - $self->{h});
1241 } 1339 }
1340
1341 $self->{close_button}->draw
1342 if $self->{close_button};
1242} 1343}
1243 1344
1244############################################################################# 1345#############################################################################
1245 1346
1246package CFClient::UI::Table; 1347package CFClient::UI::Table;
… …
1263sub children { 1364sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265} 1366}
1266 1367
1267sub add { 1368sub add {
1268 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1269 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1270 $child->set_parent ($self); 1373 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1272 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1273 $self->realloc; 1379 $self->realloc;
1380}
1381
1382sub remove {
1383 my ($self, $child) = @_;
1384
1385 # TODO: not yet implemented
1274} 1386}
1275 1387
1276# TODO: move to container class maybe? send children a signal on removal? 1388# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1389sub clear {
1278 my ($self) = @_; 1390 my ($self) = @_;
… …
1319 (sum @$ws), 1431 (sum @$ws),
1320 (sum @$hs), 1432 (sum @$hs),
1321 ) 1433 )
1322} 1434}
1323 1435
1324sub size_allocate { 1436sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1437 my ($self, $w, $h) = @_;
1326 1438
1327 my ($ws, $hs) = $self->get_wh; 1439 my ($ws, $hs) = $self->get_wh;
1328 1440
1329 my $req_w = (sum @$ws) || 1; 1441 my $req_w = (sum @$ws) || 1;
… …
1361 } 1473 }
1362 1474
1363 $y += $row_h; 1475 $y += $row_h;
1364 } 1476 }
1365 1477
1478 1
1366} 1479}
1367 1480
1368sub find_widget { 1481sub find_widget {
1369 my ($self, $x, $y) = @_; 1482 my ($self, $x, $y) = @_;
1370 1483
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1520 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1521 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1522 )
1410} 1523}
1411 1524
1412sub size_allocate { 1525sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1414 1527
1415 my $space = $self->{vertical} ? $h : $w; 1528 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1529 my @children = $self->visible_children;
1417 1530
1418 my @req; 1531 my @req;
1419 1532
1420 if ($self->{homogeneous}) { 1533 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1534 @req = ($space / (@children || 1)) x @children;
1422 } else { 1535 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1536 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1537 my $req = List::Util::sum @req;
1425 1538
1426 if ($req > $space) { 1539 if ($req > $space) {
1427 # ah well, not enough space 1540 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1541 $_ *= $space / $req for @req;
1429 } else { 1542 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1543 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1544
1432 $space = ($space - $req) / $expand; # remaining space to give away 1545 $space = ($space - $req) / $expand; # remaining space to give away
1433 1546
1434 $req[$_] += $space * $children->[$_]{expand} 1547 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1548 for 0 .. $#children;
1436 } 1549 }
1437 } 1550 }
1438 1551
1439 CFClient::UI::harmonize \@req; 1552 CFClient::UI::harmonize \@req;
1440 1553
1441 my $pos = 0; 1554 my $pos = 0;
1442 for (0 .. $#$children) { 1555 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1556 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1558
1446 $pos += $alloc; 1559 $pos += $alloc;
1447 } 1560 }
1448 1561
1449 1 1562 1
… …
1522 } 1635 }
1523 1636
1524 $self 1637 $self
1525} 1638}
1526 1639
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1640sub update {
1538 my ($self) = @_; 1641 my ($self) = @_;
1539 1642
1540 delete $self->{texture}; 1643 delete $self->{texture};
1541 $self->SUPER::update; 1644 $self->SUPER::update;
1542} 1645}
1543 1646
1647sub realloc {
1648 my ($self) = @_;
1649
1650 delete $self->{ox};
1651 $self->SUPER::realloc;
1652}
1653
1544sub set_text { 1654sub set_text {
1545 my ($self, $text) = @_; 1655 my ($self, $text) = @_;
1546 1656
1547 return if $self->{text} eq "T$text"; 1657 return if $self->{text} eq "T$text";
1548 $self->{text} = "T$text"; 1658 $self->{text} = "T$text";
1549 1659
1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1551 $self->{layout}->set_text ($text); 1660 $self->{layout}->set_text ($text);
1552 1661
1662 delete $self->{size_req};
1553 $self->realloc; 1663 $self->realloc;
1554 $self->update; 1664 $self->update;
1555} 1665}
1556 1666
1557sub set_markup { 1667sub set_markup {
… …
1560 return if $self->{text} eq "M$markup"; 1670 return if $self->{text} eq "M$markup";
1561 $self->{text} = "M$markup"; 1671 $self->{text} = "M$markup";
1562 1672
1563 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1673 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1564 1674
1565 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1566 $self->{layout}->set_markup ($markup); 1675 $self->{layout}->set_markup ($markup);
1567 1676
1677 delete $self->{size_req};
1568 $self->realloc; 1678 $self->realloc;
1569 $self->update; 1679 $self->update;
1570} 1680}
1571 1681
1572sub size_request { 1682sub size_request {
1573 my ($self) = @_; 1683 my ($self) = @_;
1574 1684
1685 $self->{size_req} ||= do {
1575 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1686 $self->{layout}->set_font ($self->{font}) if $self->{font};
1576 $self->{layout}->set_width ($self->{max_w} || -1); 1687 $self->{layout}->set_width ($self->{max_w} || -1);
1577 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1688 $self->{layout}->set_ellipsise ($self->{ellipsise});
1578 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1689 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1579 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1690 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1691
1581 my ($w, $h) = $self->{layout}->size; 1692 my ($w, $h) = $self->{layout}->size;
1582 1693
1583 if (exists $self->{template}) { 1694 if (exists $self->{template}) {
1584 $self->{template}->set_font ($self->{font}) if $self->{font}; 1695 $self->{template}->set_font ($self->{font}) if $self->{font};
1696 $self->{template}->set_width ($self->{max_w} || -1);
1585 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1697 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1586 1698
1587 my ($w2, $h2) = $self->{template}->size; 1699 my ($w2, $h2) = $self->{template}->size;
1588 1700
1589 $w = List::Util::max $w, $w2; 1701 $w = List::Util::max $w, $w2;
1590 $h = List::Util::max $h, $h2; 1702 $h = List::Util::max $h, $h2;
1703 }
1704
1705 [$w, $h]
1591 } 1706 };
1592 1707
1593 ($w, $h) 1708 @{ $self->{size_req} }
1594} 1709}
1595 1710
1711sub baseline_shift {
1712 $_[0]{layout}->descent
1713}
1714
1596sub size_allocate { 1715sub invoke_size_allocate {
1597 my ($self, $w, $h) = @_; 1716 my ($self, $w, $h) = @_;
1598 1717
1599 delete $self->{ox}; 1718 delete $self->{ox};
1600 1719
1601 delete $self->{texture} 1720 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1721 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1722
1723 1
1603} 1724}
1604 1725
1605sub set_fontsize { 1726sub set_fontsize {
1606 my ($self, $fontsize) = @_; 1727 my ($self, $fontsize) = @_;
1607 1728
1608 $self->{fontsize} = $fontsize; 1729 $self->{fontsize} = $fontsize;
1730 delete $self->{size_req};
1609 delete $self->{texture}; 1731 delete $self->{texture};
1610 1732
1611 $self->realloc; 1733 $self->realloc;
1612} 1734}
1613 1735
1736sub reconfigure {
1737 my ($self) = @_;
1738
1739 delete $self->{size_req};
1740 delete $self->{texture};
1741
1742 $self->SUPER::reconfigure;
1743}
1744
1614sub _draw { 1745sub _draw {
1615 my ($self) = @_; 1746 my ($self) = @_;
1616 1747
1617 $self->SUPER::_draw; # draw background, if applicable 1748 $self->SUPER::_draw; # draw background, if applicable
1618 1749
1619 my $tex = $self->{texture} ||= do { 1750 my $size = $self->{texture} ||= do {
1620 $self->{layout}->set_foreground (@{$self->{fg}}); 1751 $self->{layout}->set_foreground (@{$self->{fg}});
1621 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1752 $self->{layout}->set_font ($self->{font}) if $self->{font};
1622 $self->{layout}->set_width ($self->{w}); 1753 $self->{layout}->set_width ($self->{w});
1623 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1754 $self->{layout}->set_ellipsise ($self->{ellipsise});
1624 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1755 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1625 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1756 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1626 1757
1627 new_from_layout CFClient::Texture $self->{layout} 1758 [$self->{layout}->size]
1628 }; 1759 };
1629 1760
1630 unless (exists $self->{ox}) { 1761 unless (exists $self->{ox}) {
1631 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1762 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1632 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1763 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1633 : ($self->{w} - $tex->{w}) * 0.5); 1764 : ($self->{w} - $size->[0]) * 0.5);
1634 1765
1635 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1767 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1637 : ($self->{h} - $tex->{h}) * 0.5); 1768 : ($self->{h} - $size->[1]) * 0.5);
1638 }; 1769 };
1639 1770
1640 glEnable GL_TEXTURE_2D; 1771 my $w = List::Util::min $self->{w} + 4, $size->[0];
1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1772 my $h = List::Util::min $self->{h} + 2, $size->[1];
1642 1773
1643 if ($tex->{format} == GL_ALPHA) { 1774 $self->{layout}->render ($self->{ox}, $self->{oy});
1644 glColor @{$self->{fg}};
1645 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1646 } else {
1647 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1648 }
1649
1650 glDisable GL_TEXTURE_2D;
1651} 1775}
1652 1776
1653############################################################################# 1777#############################################################################
1654 1778
1655package CFClient::UI::EntryBase; 1779package CFClient::UI::EntryBase;
… …
1669 can_hover => 1, 1793 can_hover => 1,
1670 can_focus => 1, 1794 can_focus => 1,
1671 valign => 0, 1795 valign => 0,
1672 can_events => 1, 1796 can_events => 1,
1673 #text => ... 1797 #text => ...
1798 #hidden => "*",
1674 @_ 1799 @_
1675 ) 1800 )
1676} 1801}
1677 1802
1678sub _set_text { 1803sub _set_text {
… …
1685 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1686 $self->{text} = $text; 1811 $self->{text} = $text;
1687 1812
1688 $text =~ s/./*/g if $self->{hidden}; 1813 $text =~ s/./*/g if $self->{hidden};
1689 $self->{layout}->set_text ("$text "); 1814 $self->{layout}->set_text ("$text ");
1815 delete $self->{size_req};
1690 1816
1691 $self->_emit (changed => $self->{text}); 1817 $self->emit (changed => $self->{text});
1818
1819 $self->realloc;
1692 $self->update; 1820 $self->update;
1693} 1821}
1694 1822
1695sub set_text { 1823sub set_text {
1696 my ($self, $text) = @_; 1824 my ($self, $text) = @_;
1697 1825
1698 $self->{cursor} = length $text; 1826 $self->{cursor} = length $text;
1699 $self->_set_text ($text); 1827 $self->_set_text ($text);
1700
1701 $self->realloc;
1702} 1828}
1703 1829
1704sub get_text { 1830sub get_text {
1705 $_[0]{text} 1831 $_[0]{text}
1706} 1832}
… …
1711 my ($w, $h) = $self->SUPER::size_request; 1837 my ($w, $h) = $self->SUPER::size_request;
1712 1838
1713 ($w + 1, $h) # add 1 for cursor 1839 ($w + 1, $h) # add 1 for cursor
1714} 1840}
1715 1841
1716sub key_down { 1842sub invoke_key_down {
1717 my ($self, $ev) = @_; 1843 my ($self, $ev) = @_;
1718 1844
1719 my $mod = $ev->{mod}; 1845 my $mod = $ev->{mod};
1720 my $sym = $ev->{sym}; 1846 my $sym = $ev->{sym};
1721 my $uni = $ev->{unicode}; 1847 my $uni = $ev->{unicode};
… …
1733 } elsif ($sym == CFClient::SDLK_HOME) { 1859 } elsif ($sym == CFClient::SDLK_HOME) {
1734 $self->{cursor} = 0; 1860 $self->{cursor} = 0;
1735 } elsif ($sym == CFClient::SDLK_END) { 1861 } elsif ($sym == CFClient::SDLK_END) {
1736 $self->{cursor} = length $text; 1862 $self->{cursor} = length $text;
1737 } elsif ($uni == 27) { 1863 } elsif ($uni == 27) {
1738 $self->_emit ('escape'); 1864 $self->emit ('escape');
1739 } elsif ($uni) { 1865 } elsif ($uni) {
1740 substr $text, $self->{cursor}++, 0, chr $uni; 1866 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else { 1867 } else {
1742 return 0; 1868 return 0;
1743 } 1869 }
… …
1747 $self->realloc; 1873 $self->realloc;
1748 1874
1749 1 1875 1
1750} 1876}
1751 1877
1752sub focus_in { 1878sub invoke_focus_in {
1753 my ($self) = @_; 1879 my ($self) = @_;
1754 1880
1755 $self->{last_activity} = $::NOW; 1881 $self->{last_activity} = $::NOW;
1756 1882
1757 $self->SUPER::focus_in; 1883 $self->SUPER::invoke_focus_in
1758} 1884}
1759 1885
1760sub button_down { 1886sub invoke_button_down {
1761 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1762 1888
1763 $self->SUPER::button_down ($ev, $x, $y); 1889 $self->SUPER::invoke_button_down ($ev, $x, $y);
1764 1890
1765 my $idx = $self->{layout}->xy_to_index ($x, $y); 1891 my $idx = $self->{layout}->xy_to_index ($x, $y);
1766 1892
1767 # byte-index to char-index 1893 # byte-index to char-index
1768 my $text = $self->{text}; 1894 my $text = $self->{text};
1769 utf8::encode $text; 1895 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1770 $self->{cursor} = length substr $text, 0, $idx; 1896 $self->{cursor} = length $text;
1771 1897
1772 $self->_set_text ($self->{text}); 1898 $self->_set_text ($self->{text});
1773 $self->update; 1899 $self->update;
1774 1900
1775 1 1901 1
1776} 1902}
1777 1903
1778sub mouse_motion { 1904sub invoke_mouse_motion {
1779 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1780# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1906# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1781 1907
1782 0 1908 1
1783} 1909}
1784 1910
1785sub _draw { 1911sub _draw {
1786 my ($self) = @_; 1912 my ($self) = @_;
1787 1913
… …
1828 1954
1829our @ISA = CFClient::UI::EntryBase::; 1955our @ISA = CFClient::UI::EntryBase::;
1830 1956
1831use CFClient::OpenGL; 1957use CFClient::OpenGL;
1832 1958
1833sub key_down { 1959sub invoke_key_down {
1834 my ($self, $ev) = @_; 1960 my ($self, $ev) = @_;
1835 1961
1836 my $sym = $ev->{sym}; 1962 my $sym = $ev->{sym};
1837 1963
1838 if ($sym == 13) { 1964 if ($sym == 13) {
1839 unshift @{$self->{history}}, 1965 unshift @{$self->{history}},
1840 my $txt = $self->get_text; 1966 my $txt = $self->get_text;
1967
1841 $self->{history_pointer} = -1; 1968 $self->{history_pointer} = -1;
1842 $self->{history_saveback} = ''; 1969 $self->{history_saveback} = '';
1843 $self->_emit (activate => $txt); 1970 $self->emit (activate => $txt);
1844 $self->update; 1971 $self->update;
1845 1972
1846 } elsif ($sym == CFClient::SDLK_UP) { 1973 } elsif ($sym == CFClient::SDLK_UP) {
1847 if ($self->{history_pointer} < 0) { 1974 if ($self->{history_pointer} < 0) {
1848 $self->{history_saveback} = $self->get_text; 1975 $self->{history_saveback} = $self->get_text;
… …
1864 } else { 1991 } else {
1865 $self->set_text ($self->{history_saveback}); 1992 $self->set_text ($self->{history_saveback});
1866 } 1993 }
1867 1994
1868 } else { 1995 } else {
1869 return $self->SUPER::key_down ($ev) 1996 return $self->SUPER::invoke_key_down ($ev)
1870 } 1997 }
1871 1998
1872 1 1999 1
1873} 2000}
1874 2001
… …
1898 can_events => 1, 2025 can_events => 1,
1899 @_ 2026 @_
1900 ) 2027 )
1901} 2028}
1902 2029
1903sub activate { }
1904
1905sub button_up { 2030sub invoke_button_up {
1906 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1907 2032
1908 $self->emit ("activate") 2033 $self->emit ("activate")
1909 if $x >= 0 && $x < $self->{w} 2034 if $x >= 0 && $x < $self->{w}
1910 && $y >= 0 && $y < $self->{h}; 2035 && $y >= 0 && $y < $self->{h};
… …
1913} 2038}
1914 2039
1915sub _draw { 2040sub _draw {
1916 my ($self) = @_; 2041 my ($self) = @_;
1917 2042
1918 local $self->{fg} = $self->{fg}; 2043 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1919
1920 if ($GRAB == $self) {
1921 $self->{fg} = $self->{active_fg};
1922 }
1923 2044
1924 glEnable GL_TEXTURE_2D; 2045 glEnable GL_TEXTURE_2D;
1925 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2046 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1926 glColor 0, 0, 0, 1; 2047 glColor 0, 0, 0, 1;
1927 2048
… …
1964 my ($self) = @_; 2085 my ($self) = @_;
1965 2086
1966 (6) x 2 2087 (6) x 2
1967} 2088}
1968 2089
2090sub toggle {
2091 my ($self) = @_;
2092
2093 $self->{state} = !$self->{state};
2094 $self->emit (changed => $self->{state});
2095 $self->update;
2096}
2097
1969sub button_down { 2098sub invoke_button_down {
1970 my ($self, $ev, $x, $y) = @_; 2099 my ($self, $ev, $x, $y) = @_;
1971 2100
1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2101 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2102 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1974 $self->{state} = !$self->{state}; 2103 $self->toggle;
1975 $self->_emit (changed => $self->{state});
1976 } else { 2104 } else {
1977 return 0 2105 return 0
1978 } 2106 }
1979 2107
1980 1 2108 1
… …
2005package CFClient::UI::Image; 2133package CFClient::UI::Image;
2006 2134
2007our @ISA = CFClient::UI::Base::; 2135our @ISA = CFClient::UI::Base::;
2008 2136
2009use CFClient::OpenGL; 2137use CFClient::OpenGL;
2010use Carp qw/confess/;
2011 2138
2012our %loaded_images; 2139our %texture_cache;
2013 2140
2014sub new { 2141sub new {
2015 my $class = shift; 2142 my $class = shift;
2016 2143
2017 my $self = $class->SUPER::new (can_events => 0, @_); 2144 my $self = $class->SUPER::new (
2145 can_events => 0,
2146 @_,
2147 );
2018 2148
2019 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2149 $self->{path} || $self->{tex}
2150 or Carp::croak "'path' or 'tex' attributes required";
2020 2151
2021 $loaded_images{$self->{image}} ||= 2152 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2022 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2153 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2023 2154
2024 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2155 Scalar::Util::weaken $texture_cache{$self->{path}};
2025 2156
2026 Scalar::Util::weaken $loaded_images{$self->{image}}; 2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2027
2028 $self->{aspect} = $tex->{w} / $tex->{h};
2029 2158
2030 $self 2159 $self
2031} 2160}
2032 2161
2162sub STORABLE_freeze {
2163 my ($self, $cloning) = @_;
2164
2165 $self->{path}
2166 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2167
2168 $self->{path}
2169}
2170
2171sub STORABLE_attach {
2172 my ($self, $cloning, $path) = @_;
2173
2174 $self->new (path => $path)
2175}
2176
2033sub size_request { 2177sub size_request {
2034 my ($self) = @_; 2178 my ($self) = @_;
2035 2179
2036 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
2037} 2181}
2038 2182
2039sub _draw { 2183sub _draw {
2040 my ($self) = @_; 2184 my ($self) = @_;
2041 2185
… …
2051 } 2195 }
2052 2196
2053 glEnable GL_TEXTURE_2D; 2197 glEnable GL_TEXTURE_2D;
2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2198 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055 2199
2056 $tex->draw_quad_alpha (0, 0, $w, $h); 2200 $tex->draw_quad (0, 0, $w, $h);
2057 2201
2058 glDisable GL_TEXTURE_2D; 2202 glDisable GL_TEXTURE_2D;
2203}
2204
2205#############################################################################
2206
2207package CFClient::UI::ImageButton;
2208
2209our @ISA = CFClient::UI::Image::;
2210
2211use CFClient::OpenGL;
2212
2213my %textures;
2214
2215sub new {
2216 my $class = shift;
2217
2218 my $self = $class->SUPER::new (
2219 padding_x => 4,
2220 padding_y => 4,
2221 fg => [1, 1, 1],
2222 active_fg => [0, 0, 1],
2223 can_hover => 1,
2224 align => 0,
2225 valign => 0,
2226 can_events => 1,
2227 @_
2228 );
2229}
2230
2231sub invoke_button_up {
2232 my ($self, $ev, $x, $y) = @_;
2233
2234 $self->emit ("activate")
2235 if $x >= 0 && $x < $self->{w}
2236 && $y >= 0 && $y < $self->{h};
2237
2238 1
2059} 2239}
2060 2240
2061############################################################################# 2241#############################################################################
2062 2242
2063package CFClient::UI::VGauge; 2243package CFClient::UI::VGauge;
… …
2150 my $ycut1 = max 0, min 1, $ycut; 2330 my $ycut1 = max 0, min 1, $ycut;
2151 my $ycut2 = max 0, min 1, $ycut - 1; 2331 my $ycut2 = max 0, min 1, $ycut - 1;
2152 2332
2153 my $h1 = $self->{h} * (1 - $ycut1); 2333 my $h1 = $self->{h} * (1 - $ycut1);
2154 my $h2 = $self->{h} * (1 - $ycut2); 2334 my $h2 = $self->{h} * (1 - $ycut2);
2335 my $h3 = $self->{h};
2336
2337 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2155 2338
2156 glEnable GL_BLEND; 2339 glEnable GL_BLEND;
2157 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2340 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2158 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2341 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2159 glEnable GL_TEXTURE_2D; 2342 glEnable GL_TEXTURE_2D;
… …
2178 2361
2179 if ($t3) { 2362 if ($t3) {
2180 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2363 glBindTexture GL_TEXTURE_2D, $t3->{name};
2181 glBegin GL_QUADS; 2364 glBegin GL_QUADS;
2182 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2365 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2183 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2366 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2184 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2367 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2185 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2368 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2186 glEnd; 2369 glEnd;
2187 } 2370 }
2188 2371
2189 glDisable GL_BLEND; 2372 glDisable GL_BLEND;
… …
2277 $self->update; 2460 $self->update;
2278 2461
2279 $self 2462 $self
2280} 2463}
2281 2464
2282sub changed { }
2283
2284sub set_range { 2465sub set_range {
2285 my ($self, $range) = @_; 2466 my ($self, $range) = @_;
2286 2467
2287 ($range, $self->{range}) = ($self->{range}, $range); 2468 ($range, $self->{range}) = ($self->{range}, $range);
2288 2469
2289 $self->update
2290 if "@$range" ne "@{$self->{range}}"; 2470 if ("@$range" ne "@{$self->{range}}") {
2471 $self->update;
2472 $self->set_value ($self->{range}[0]);
2473 }
2291} 2474}
2292 2475
2293sub set_value { 2476sub set_value {
2294 my ($self, $value) = @_; 2477 my ($self, $value) = @_;
2295 2478
… …
2306 if $unit; 2489 if $unit;
2307 2490
2308 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2491 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2309 2492
2310 if ($value != $old_value) { 2493 if ($value != $old_value) {
2311 $self->_emit (changed => $value); 2494 $self->emit (changed => $value);
2312 $self->update; 2495 $self->update;
2313 } 2496 }
2314} 2497}
2315 2498
2316sub size_request { 2499sub size_request {
2317 my ($self) = @_; 2500 my ($self) = @_;
2318 2501
2319 ($self->{req_w}, $self->{req_h}) 2502 ($self->{req_w}, $self->{req_h})
2320} 2503}
2321 2504
2322sub button_down { 2505sub invoke_button_down {
2323 my ($self, $ev, $x, $y) = @_; 2506 my ($self, $ev, $x, $y) = @_;
2324 2507
2325 $self->SUPER::button_down ($ev, $x, $y); 2508 $self->SUPER::invoke_button_down ($ev, $x, $y);
2326 2509
2327 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2510 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2328 2511
2329 $self->mouse_motion ($ev, $x, $y) 2512 $self->invoke_mouse_motion ($ev, $x, $y)
2330} 2513}
2331 2514
2332sub mouse_motion { 2515sub invoke_mouse_motion {
2333 my ($self, $ev, $x, $y) = @_; 2516 my ($self, $ev, $x, $y) = @_;
2334 2517
2335 if ($GRAB == $self) { 2518 if ($GRAB == $self) {
2336 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2519 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2337 2520
… …
2343 } else { 2526 } else {
2344 return 0; 2527 return 0;
2345 } 2528 }
2346 2529
2347 1 2530 1
2531}
2532
2533sub invoke_mouse_wheel {
2534 my ($self, $ev) = @_;
2535
2536 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537
2538 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2539
2540 ! ! $delta
2348} 2541}
2349 2542
2350sub update { 2543sub update {
2351 my ($self) = @_; 2544 my ($self) = @_;
2352 2545
… …
2442sub set_range { shift->{slider}->set_range (@_) } 2635sub set_range { shift->{slider}->set_range (@_) }
2443sub set_value { shift->{slider}->set_value (@_) } 2636sub set_value { shift->{slider}->set_value (@_) }
2444 2637
2445############################################################################# 2638#############################################################################
2446 2639
2447package CFClient::UI::TextView; 2640package CFClient::UI::TextScroller;
2448 2641
2449our @ISA = CFClient::UI::HBox::; 2642our @ISA = CFClient::UI::HBox::;
2450 2643
2451use CFClient::OpenGL; 2644use CFClient::OpenGL;
2452 2645
2453sub new { 2646sub new {
2454 my $class = shift; 2647 my $class = shift;
2455 2648
2456 my $self = $class->SUPER::new ( 2649 my $self = $class->SUPER::new (
2457 fontsize => 1, 2650 fontsize => 1,
2458 can_events => 0, 2651 can_events => 1,
2652 indent => 0,
2459 #font => default_font 2653 #font => default_font
2460 @_, 2654 @_,
2461 2655
2462 layout => (new CFClient::Layout 1), 2656 layout => (new CFClient::Layout),
2463 par => [], 2657 par => [],
2464 height => 0, 2658 height => 0,
2465 children => [ 2659 children => [
2466 (new CFClient::UI::Empty expand => 1), 2660 (new CFClient::UI::Empty expand => 1),
2467 (new CFClient::UI::Slider vertical => 1), 2661 (new CFClient::UI::Slider vertical => 1),
… …
2478 2672
2479 $self->{fontsize} = $fontsize; 2673 $self->{fontsize} = $fontsize;
2480 $self->reflow; 2674 $self->reflow;
2481} 2675}
2482 2676
2677sub size_request {
2678 my ($self) = @_;
2679
2680 my ($empty, $slider) = @{ $self->{children} };
2681
2682 local $self->{children} = [$empty, $slider];
2683 $self->SUPER::size_request
2684}
2685
2483sub size_allocate { 2686sub invoke_size_allocate {
2484 my ($self, $w, $h) = @_; 2687 my ($self, $w, $h) = @_;
2485 2688
2486 $self->SUPER::size_allocate ($w, $h); 2689 my ($empty, $slider, @other) = @{ $self->{children} };
2690 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2487 2691
2488 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2692 $self->{layout}->set_font ($self->{font}) if $self->{font};
2489 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2490 $self->{layout}->set_width ($self->{children}[0]{w}); 2694 $self->{layout}->set_width ($empty->{w});
2695 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2491 2696
2492 $self->reflow; 2697 $self->reflow;
2493}
2494 2698
2495sub text_size { 2699 local $self->{children} = [$empty, $slider];
2700 $self->SUPER::invoke_size_allocate ($w, $h)
2701}
2702
2703sub invoke_mouse_wheel {
2496 my ($self, $text, $indent) = @_; 2704 my ($self, $ev) = @_;
2705
2706 return 0 unless $ev->{dy}; # only vertical movements
2707
2708 $self->{children}[1]->emit (mouse_wheel => $ev);
2709
2710 1
2711}
2712
2713sub get_layout {
2714 my ($self, $para) = @_;
2497 2715
2498 my $layout = $self->{layout}; 2716 my $layout = $self->{layout};
2499 2717
2718 $layout->set_font ($self->{font}) if $self->{font};
2719 $layout->set_foreground (@{$para->{fg}});
2500 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2720 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2501 $layout->set_width ($self->{children}[0]{w} - $indent); 2721 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2722 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2502 $layout->set_markup ($text); 2723 $layout->set_markup ($para->{markup});
2724
2725 $layout->set_shapes (
2726 map
2727 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2728 @{$para->{widget}}
2503 2729 );
2730
2504 $layout->size 2731 $layout
2505} 2732}
2506 2733
2507sub reflow { 2734sub reflow {
2508 my ($self) = @_; 2735 my ($self) = @_;
2509 2736
… …
2518 $self->{children}[1]->set_value ($offset); 2745 $self->{children}[1]->set_value ($offset);
2519} 2746}
2520 2747
2521sub clear { 2748sub clear {
2522 my ($self) = @_; 2749 my ($self) = @_;
2750
2751 my (undef, undef, @other) = @{ $self->{children} };
2752 $self->remove ($_) for @other;
2523 2753
2524 $self->{par} = []; 2754 $self->{par} = [];
2525 $self->{height} = 0; 2755 $self->{height} = 0;
2526 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2756 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2527} 2757}
2528 2758
2529sub add_paragraph { 2759sub add_paragraph {
2530 my ($self, $color, $text, $indent) = @_; 2760 my ($self, $color, $para, $indent) = @_;
2531 2761
2532 for my $line (split /\n/, $text) { 2762 my ($text, @w) = ref $para ? @$para : $para;
2533 my ($w, $h) = $self->text_size ($line); 2763
2534 $self->{height} += $h; 2764 $para = {
2535 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2765 w => 1e10,
2766 wrapped => 1,
2767 fg => $color,
2768 indent => $indent,
2769 markup => $text,
2770 widget => \@w,
2536 } 2771 };
2537 2772
2538 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2773 $self->add (@w) if @w;
2774 push @{$self->{par}}, $para;
2775
2776 $self->{need_reflow}++;
2777 $self->update;
2778}
2779
2780sub scroll_to_bottom {
2781 my ($self) = @_;
2782
2783 $self->{scroll_to_bottom} = 1;
2784 $self->update;
2539} 2785}
2540 2786
2541sub update { 2787sub update {
2542 my ($self) = @_; 2788 my ($self) = @_;
2543 2789
… …
2545 2791
2546 return unless $self->{h} > 0; 2792 return unless $self->{h} > 0;
2547 2793
2548 delete $self->{texture}; 2794 delete $self->{texture};
2549 2795
2550 $ROOT->on_post_alloc ($self, sub { 2796 $ROOT->on_post_alloc ($self => sub {
2551 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2797 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552 2798
2553 if (delete $self->{need_reflow}) { 2799 if (delete $self->{need_reflow}) {
2554 my $height = 0; 2800 my $height = 0;
2555 2801
2556 my $layout = $self->{layout};
2557
2558 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559
2560 for (@{$self->{par}}) { 2802 for my $para (@{$self->{par}}) {
2561 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2803 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2562 $layout->set_width ($W - $_->[3]); 2804 my $layout = $self->get_layout ($para);
2563 $layout->set_markup ($_->[4]);
2564 my ($w, $h) = $layout->size; 2805 my ($w, $h) = $layout->size;
2565 $_->[0] = $w + $_->[3]; 2806
2566 $_->[1] = $h; 2807 $para->{w} = $w + $para->{indent};
2808 $para->{h} = $h;
2809 $para->{wrapped} = $layout->has_wrapped;
2567 } 2810 }
2568 2811
2569 $height += $_->[1]; 2812 $height += $para->{h};
2570 } 2813 }
2571 2814
2572 $self->{height} = $height; 2815 $self->{height} = $height;
2573 2816
2574 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2817 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2575 2818
2576 delete $self->{texture}; 2819 delete $self->{texture};
2577 } 2820 }
2578 2821
2822 if (delete $self->{scroll_to_bottom}) {
2823 $self->{children}[1]->set_value (1e10);
2824 }
2825
2579 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2826 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2580 glClearColor 0.5, 0.5, 0.5, 0; 2827 glClearColor 0, 0, 0, 0;
2581 glClear GL_COLOR_BUFFER_BIT; 2828 glClear GL_COLOR_BUFFER_BIT;
2582 2829
2583 my $top = int $self->{children}[1]{range}[0]; 2830 my $top = int $self->{children}[1]{range}[0];
2584 2831
2585 my $y0 = $top; 2832 my $y0 = $top;
2586 my $y1 = $top + $H; 2833 my $y1 = $top + $H;
2587 2834
2588 my $y = 0; 2835 my $y = 0;
2589 2836
2590 my $layout = $self->{layout};
2591
2592 $layout->set_font ($self->{font}) if $self->{font};
2593
2594 glEnable GL_BLEND;
2595 #TODO# not correct in windows where rgba is forced off
2596 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2597
2598 for my $par (@{$self->{par}}) { 2837 for my $para (@{$self->{par}}) {
2599 my $h = $par->[1]; 2838 my $h = $para->{h};
2600 2839
2601 if ($y0 < $y + $h && $y < $y1) { 2840 if ($y0 < $y + $h && $y < $y1) {
2602 $layout->set_foreground (@{ $par->[2] });
2603 $layout->set_width ($W - $par->[3]);
2604 $layout->set_markup ($par->[4]);
2605 2841
2606 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2842 my $layout = $self->get_layout ($para);
2607 2843
2608 glRasterPos $par->[3], $y - $y0; 2844 $layout->render ($para->{indent}, $y - $y0);
2609 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2845
2846 if (my @w = @{ $para->{widget} }) {
2847 my @s = $layout->get_shapes;
2848
2849 for (@w) {
2850 my ($dx, $dy) = splice @s, 0, 2, ();
2851
2852 $_->{x} = $dx + $para->{indent};
2853 $_->{y} = $dy + $y - $y0;
2854
2855 $_->draw;
2856 }
2857 }
2610 } 2858 }
2611 2859
2612 $y += $h; 2860 $y += $h;
2613 } 2861 }
2614
2615 glDisable GL_BLEND;
2616 }; 2862 };
2617 }); 2863 });
2618} 2864}
2619 2865
2866sub reconfigure {
2867 my ($self) = @_;
2868
2869 $self->SUPER::reconfigure;
2870
2871 $_->{w} = 1e10 for @{ $self->{par} };
2872 $self->reflow;
2873}
2874
2620sub _draw { 2875sub _draw {
2621 my ($self) = @_; 2876 my ($self) = @_;
2622 2877
2623 glEnable GL_TEXTURE_2D; 2878 glEnable GL_TEXTURE_2D;
2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625 glColor 1, 1, 1, 1; 2880 glColor 0, 0, 0, 1;
2626 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2881 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2627 glDisable GL_TEXTURE_2D; 2882 glDisable GL_TEXTURE_2D;
2628 2883
2629 $self->{children}[1]->draw; 2884 $self->{children}[1]->draw;
2630
2631} 2885}
2632 2886
2633############################################################################# 2887#############################################################################
2634 2888
2635package CFClient::UI::Animator; 2889package CFClient::UI::Animator;
… …
2722 $tooltip .= "\n\n" . (ref $widget) . "\n" 2976 $tooltip .= "\n\n" . (ref $widget) . "\n"
2723 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2977 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724 . "req $widget->{req_w} $widget->{req_h}\n" 2978 . "req $widget->{req_w} $widget->{req_h}\n"
2725 . "visible $widget->{visible}"; 2979 . "visible $widget->{visible}";
2726 } 2980 }
2981
2982 $tooltip =~ s/^\n+//;
2983 $tooltip =~ s/\n+$//;
2727 2984
2728 $self->add (new CFClient::UI::Label 2985 $self->add (new CFClient::UI::Label
2729 markup => $tooltip, 2986 markup => $tooltip,
2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2987 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2731 fontsize => 0.8, 2988 fontsize => 0.8,
… …
2741 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2998 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2742 2999
2743 ($w + 4, $h + 4) 3000 ($w + 4, $h + 4)
2744} 3001}
2745 3002
2746sub size_allocate { 3003sub invoke_size_allocate {
2747 my ($self, $w, $h) = @_; 3004 my ($self, $w, $h) = @_;
2748 3005
2749 $self->SUPER::size_allocate ($w - 4, $h - 4); 3006 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2750} 3007}
2751 3008
2752sub visibility_change { 3009sub invoke_visibility_change {
2753 my ($self, $visible) = @_; 3010 my ($self, $visible) = @_;
2754 3011
2755 return unless $visible; 3012 return unless $visible;
2756 3013
2757 $self->{root}->on_post_alloc ("move_$self" => sub { 3014 $self->{root}->on_post_alloc ("move_$self" => sub {
2758 my $widget = $self->{owner} 3015 my $widget = $self->{owner}
2759 or return; 3016 or return;
2760 3017
3018 if ($widget->{visible}) {
2761 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3019 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762 3020
2763 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3021 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764 if $x + $self->{w} > $::WIDTH; 3022 if $x + $self->{w} > $self->{root}{w};
2765 3023
2766 $self->move_abs ($x, $y); 3024 $self->move_abs ($x, $y);
3025 } else {
3026 $self->hide;
3027 }
2767 }); 3028 });
2768} 3029}
2769 3030
2770sub _draw { 3031sub _draw {
2771 my ($self) = @_; 3032 my ($self) = @_;
… …
2797 3058
2798############################################################################# 3059#############################################################################
2799 3060
2800package CFClient::UI::Face; 3061package CFClient::UI::Face;
2801 3062
2802our @ISA = CFClient::UI::Base::; 3063our @ISA = CFClient::UI::DrawBG::;
2803 3064
2804use CFClient::OpenGL; 3065use CFClient::OpenGL;
2805 3066
2806sub new { 3067sub new {
2807 my $class = shift; 3068 my $class = shift;
… …
2844sub _draw { 3105sub _draw {
2845 my ($self) = @_; 3106 my ($self) = @_;
2846 3107
2847 return unless $::CONN; 3108 return unless $::CONN;
2848 3109
3110 $self->SUPER::_draw;
3111
2849 my $face; 3112 my $face;
2850 3113
2851 if ($self->{frame}) { 3114 if ($self->{frame}) {
2852 my $anim = $::CONN->{anim}[$self->{anim}]; 3115 my $anim = $::CONN->{anim}[$self->{anim}];
2853 3116
… …
2858 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3121 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2859 3122
2860 if ($tex) { 3123 if ($tex) {
2861 glEnable GL_TEXTURE_2D; 3124 glEnable GL_TEXTURE_2D;
2862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3125 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2863 glColor 1, 1, 1, 1; 3126 glColor 0, 0, 0, 1;
2864 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3127 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2865 glDisable GL_TEXTURE_2D; 3128 glDisable GL_TEXTURE_2D;
2866 } 3129 }
2867} 3130}
2868 3131
2869sub DESTROY { 3132sub destroy {
2870 my ($self) = @_; 3133 my ($self) = @_;
2871 3134
2872 $self->{timer}->cancel 3135 $self->{timer}->cancel
2873 if $self->{timer}; 3136 if $self->{timer};
2874 3137
2875 $self->SUPER::DESTROY; 3138 $self->SUPER::destroy;
2876} 3139}
2877 3140
2878############################################################################# 3141#############################################################################
2879 3142
2880package CFClient::UI::Buttonbar; 3143package CFClient::UI::Buttonbar;
… …
2901 ); 3164 );
2902 3165
2903 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3166 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2904 3167
2905 for my $item (@{ $self->{items} }) { 3168 for my $item (@{ $self->{items} }) {
2906 my ($widget, $cb) = @$item; 3169 my ($widget, $cb, $tooltip) = @$item;
2907 3170
2908 # handle various types of items, only text for now 3171 # handle various types of items, only text for now
2909 if (!ref $widget) { 3172 if (!ref $widget) {
3173 if ($widget =~ /\t/) {
3174 my ($left, $right) = split /\t/, $widget, 2;
3175
3176 $widget = new CFClient::UI::HBox
3177 can_hover => 1,
3178 can_events => 1,
3179 tooltip => $tooltip,
3180 children => [
3181 (new CFClient::UI::Label markup => $left, expand => 1),
3182 (new CFClient::UI::Label markup => $right, align => +1),
3183 ],
3184 ;
3185
3186 } else {
2910 $widget = new CFClient::UI::Label 3187 $widget = new CFClient::UI::Label
2911 can_hover => 1, 3188 can_hover => 1,
2912 can_events => 1, 3189 can_events => 1,
2913 text => $widget; 3190 markup => $widget,
3191 tooltip => $tooltip;
3192 }
2914 } 3193 }
2915 3194
2916 $self->{item}{$widget} = $item; 3195 $self->{item}{$widget} = $item;
2917 3196
2918 $self->{vbox}->add ($widget); 3197 $self->{vbox}->add ($widget);
… …
2923 3202
2924# popup given the event (must be a mouse button down event currently) 3203# popup given the event (must be a mouse button down event currently)
2925sub popup { 3204sub popup {
2926 my ($self, $ev) = @_; 3205 my ($self, $ev) = @_;
2927 3206
2928 $self->_emit ("popdown"); 3207 $self->emit ("popdown");
2929 3208
2930 # maybe save $GRAB? must be careful about events... 3209 # maybe save $GRAB? must be careful about events...
2931 $GRAB = $self; 3210 $GRAB = $self;
2932 $self->{button} = $ev->{button}; 3211 $self->{button} = $ev->{button};
2933 3212
2934 $self->show; 3213 $self->show;
2935 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3214 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2936} 3215}
2937 3216
2938sub mouse_motion { 3217sub invoke_mouse_motion {
2939 my ($self, $ev, $x, $y) = @_; 3218 my ($self, $ev, $x, $y) = @_;
2940 3219
2941 # TODO: should use vbox->find_widget or so 3220 # TODO: should use vbox->find_widget or so
2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3221 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2943 $self->{hover} = $self->{item}{$HOVER}; 3222 $self->{hover} = $self->{item}{$HOVER};
2944 3223
2945 0 3224 0
2946} 3225}
2947 3226
2948sub button_up { 3227sub invoke_button_up {
2949 my ($self, $ev, $x, $y) = @_; 3228 my ($self, $ev, $x, $y) = @_;
2950 3229
2951 if ($ev->{button} == $self->{button}) { 3230 if ($ev->{button} == $self->{button}) {
2952 undef $GRAB; 3231 undef $GRAB;
2953 $self->hide; 3232 $self->hide;
2954 3233
2955 $self->_emit ("popdown"); 3234 $self->emit ("popdown");
2956 $self->{hover}[1]->() if $self->{hover}; 3235 $self->{hover}[1]->() if $self->{hover};
2957 } else { 3236 } else {
2958 return 0 3237 return 0
2959 } 3238 }
2960 3239
… …
2987 3266
2988 $self->{current} = $self->{children}[0] 3267 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} }; 3268 if @{ $self->{children} };
2990} 3269}
2991 3270
3271sub get_current_page {
3272 my ($self) = @_;
3273
3274 $self->{current}
3275}
3276
2992sub set_current_page { 3277sub set_current_page {
2993 my ($self, $page_or_widget) = @_; 3278 my ($self, $page_or_widget) = @_;
2994 3279
2995 my $widget = ref $page_or_widget 3280 my $widget = ref $page_or_widget
2996 ? $page_or_widget 3281 ? $page_or_widget
2997 : $self->{children}[$page_or_widget]; 3282 : $self->{children}[$page_or_widget];
2998 3283
2999 $self->{current} = $widget; 3284 $self->{current} = $widget;
3000 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3285 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001 3286
3002 $self->_emit (page_changed => $self->{current}); 3287 $self->emit (page_changed => $self->{current});
3003 3288
3004 $self->realloc; 3289 $self->realloc;
3005} 3290}
3006 3291
3007sub visible_children { 3292sub visible_children {
… …
3012 my ($self) = @_; 3297 my ($self) = @_;
3013 3298
3014 $self->{current}->size_request 3299 $self->{current}->size_request
3015} 3300}
3016 3301
3017sub size_allocate { 3302sub invoke_size_allocate {
3018 my ($self, $w, $h) = @_; 3303 my ($self, $w, $h) = @_;
3019 3304
3020 $self->{current}->configure (0, 0, $w, $h); 3305 $self->{current}->configure (0, 0, $w, $h);
3306
3307 1
3021} 3308}
3022 3309
3023sub _draw { 3310sub _draw {
3024 my ($self) = @_; 3311 my ($self) = @_;
3025 3312
… …
3060 ); 3347 );
3061 3348
3062 $self->{multiplexer}->add ($widget); 3349 $self->{multiplexer}->add ($widget);
3063} 3350}
3064 3351
3352sub get_current_page {
3353 my ($self) = @_;
3354
3355 $self->{multiplexer}->get_current_page
3356}
3357
3065sub set_current_page { 3358sub set_current_page {
3066 my ($self, $page) = @_; 3359 my ($self, $page) = @_;
3067 3360
3068 $self->{multiplexer}->set_current_page ($page); 3361 $self->{multiplexer}->set_current_page ($page);
3069 $self->_emit (page_changed => $self->{multiplexer}{current}); 3362 $self->emit (page_changed => $self->{multiplexer}{current});
3070} 3363}
3071 3364
3072############################################################################# 3365#############################################################################
3073 3366
3074package CFClient::UI::Statusbox; 3367package CFClient::UI::Selector;
3075 3368
3369use utf8;
3370
3076our @ISA = CFClient::UI::VBox::; 3371our @ISA = CFClient::UI::Button::;
3077 3372
3078sub new { 3373sub new {
3079 my $class = shift; 3374 my $class = shift;
3080 3375
3081 $class->SUPER::new ( 3376 my $self = $class->SUPER::new (
3377 options => [], # [value, title, longdesc], ...
3378 value => undef,
3379 @_,
3380 );
3381
3382 $self->_set_value ($self->{value});
3383
3384 $self
3385}
3386
3387sub invoke_button_down {
3388 my ($self, $ev) = @_;
3389
3390 my @menu_items;
3391
3392 for (@{ $self->{options} }) {
3393 my ($value, $title, $tooltip) = @$_;
3394
3395 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3396 }
3397
3398 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3399}
3400
3401sub _set_value {
3402 my ($self, $value) = @_;
3403
3404 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3405 or return;
3406
3407 $self->{value} = $item->[0];
3408 $self->set_markup ("$item->[1] ⇓");
3409 $self->set_tooltip ($item->[2]);
3410}
3411
3412sub set_value {
3413 my ($self, $value) = @_;
3414
3415 return unless $self->{value} ne $value;
3416
3417 $self->_set_value ($value);
3418 $self->emit (changed => $value);
3419}
3420
3421#############################################################################
3422
3423package CFClient::UI::Statusbox;
3424
3425our @ISA = CFClient::UI::VBox::;
3426
3427sub new {
3428 my $class = shift;
3429
3430 my $self = $class->SUPER::new (
3082 fontsize => 0.8, 3431 fontsize => 0.8,
3083 @_, 3432 @_,
3084 ) 3433 );
3434
3435 Scalar::Util::weaken (my $this = $self);
3436
3437 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3438
3439 $self
3085} 3440}
3086 3441
3087sub reorder { 3442sub reorder {
3088 my ($self) = @_; 3443 my ($self) = @_;
3089 my $NOW = time; 3444 my $NOW = Time::HiRes::time;
3445
3446 # freeze display when hovering over any label
3447 return if $CFClient::UI::TOOLTIP->{owner}
3448 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3449 values %{ $self->{item} };
3090 3450
3091 while (my ($k, $v) = each %{ $self->{item} }) { 3451 while (my ($k, $v) = each %{ $self->{item} }) {
3092 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3452 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3093 } 3453 }
3094 3454
… …
3097 my @items = sort { 3457 my @items = sort {
3098 $a->{pri} <=> $b->{pri} 3458 $a->{pri} <=> $b->{pri}
3099 or $b->{id} <=> $a->{id} 3459 or $b->{id} <=> $a->{id}
3100 } values %{ $self->{item} }; 3460 } values %{ $self->{item} };
3101 3461
3462 $self->{timer}->interval (1);
3463
3102 my $count = 10 + 1; 3464 my $count = 10 + 1;
3103 for my $item (@items) { 3465 for my $item (@items) {
3104 last unless --$count; 3466 last unless --$count;
3105 3467
3106 push @widgets, $item->{label} ||= do { 3468 my $label = $item->{label} ||= do {
3107 # TODO: doesn't handle markup well (read as: at all) 3469 # TODO: doesn't handle markup well (read as: at all)
3108 my $short = $item->{count} > 1 3470 my $short = $item->{count} > 1
3109 ? "<b>$item->{count} ×</b> $item->{text}" 3471 ? "<b>$item->{count} ×</b> $item->{text}"
3110 : $item->{text}; 3472 : $item->{text};
3111 3473
… …
3119 tooltip => $item->{tooltip}, 3481 tooltip => $item->{tooltip},
3120 tooltip_font => $::FONT_PROP, 3482 tooltip_font => $::FONT_PROP,
3121 tooltip_width => 0.67, 3483 tooltip_width => 0.67,
3122 fontsize => $item->{fontsize} || $self->{fontsize}, 3484 fontsize => $item->{fontsize} || $self->{fontsize},
3123 max_w => $::WIDTH * 0.44, 3485 max_w => $::WIDTH * 0.44,
3124 fg => $item->{fg}, 3486 fg => [@{ $item->{fg} }],
3125 can_events => 1, 3487 can_events => 1,
3126 can_hover => 1 3488 can_hover => 1
3127 }; 3489 };
3490
3491 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3492 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3493 $label->update;
3494 $label->set_max_size (undef, $label->{req_h} * $diff)
3495 if $diff < 1;
3496 $self->{timer}->interval (1/30);
3497 } else {
3498 $label->{fg}[3] = $item->{fg}[3] || 1;
3499 }
3500
3501 push @widgets, $label;
3128 } 3502 }
3129 3503
3130 $self->clear; 3504 $self->clear;
3131 $self->SUPER::add (reverse @widgets); 3505 $self->SUPER::add (reverse @widgets);
3132} 3506}
… …
3137 $text =~ s/^\s+//; 3511 $text =~ s/^\s+//;
3138 $text =~ s/\s+$//; 3512 $text =~ s/\s+$//;
3139 3513
3140 return unless $text; 3514 return unless $text;
3141 3515
3142 my $timeout = time + ((delete $arg{timeout}) || 60); 3516 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3143 3517
3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3518 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3145 3519
3146 if (my $item = $self->{item}{$group}) { 3520 if (my $item = $self->{item}{$group}) {
3147 if ($item->{text} eq $text) { 3521 if ($item->{text} eq $text) {
3148 $item->{count}++; 3522 $item->{count}++;
3149 } else { 3523 } else {
3150 $item->{count} = 1; 3524 $item->{count} = 1;
3151 $item->{text} = $item->{tooltip} = $text; 3525 $item->{text} = $item->{tooltip} = $text;
3152 } 3526 }
3153 $item->{id} = ++$self->{id}; 3527 $item->{id} += 0.2;#d#
3154 $item->{timeout} = $timeout; 3528 $item->{timeout} = $timeout;
3155 delete $item->{label}; 3529 delete $item->{label};
3156 } else { 3530 } else {
3157 $self->{item}{$group} = { 3531 $self->{item}{$group} = {
3158 id => ++$self->{id}, 3532 id => ++$self->{id},
… …
3164 count => 1, 3538 count => 1,
3165 %arg, 3539 %arg,
3166 }; 3540 };
3167 } 3541 }
3168 3542
3543 $ROOT->on_refresh (reorder => sub {
3169 $self->reorder; 3544 $self->reorder;
3545 });
3170} 3546}
3171 3547
3172sub reconfigure { 3548sub reconfigure {
3173 my ($self) = @_; 3549 my ($self) = @_;
3174 3550
… …
3177 3553
3178 $self->reorder; 3554 $self->reorder;
3179 $self->SUPER::reconfigure; 3555 $self->SUPER::reconfigure;
3180} 3556}
3181 3557
3558sub destroy {
3559 my ($self) = @_;
3560
3561 $self->{timer}->cancel;
3562
3563 $self->SUPER::destroy;
3564}
3565
3182############################################################################# 3566#############################################################################
3183 3567
3184package CFClient::UI::Inventory; 3568package CFClient::UI::Inventory;
3185 3569
3186our @ISA = CFClient::UI::ScrolledWindow::; 3570our @ISA = CFClient::UI::Table::;
3187 3571
3188sub new { 3572sub new {
3189 my $class = shift; 3573 my $class = shift;
3190 3574
3191 my $self = $class->SUPER::new ( 3575 my $self = $class->SUPER::new (
3192 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3576 col_expand => [0, 1, 0],
3577 items => [],
3193 @_, 3578 @_,
3194 ); 3579 );
3195 3580
3581 $self->set_sort_order (undef);
3582
3196 $self 3583 $self
3584}
3585
3586sub update_items {
3587 my ($self) = @_;
3588
3589 $self->clear;
3590
3591 my @item = $self->{sort}->(@{ $self->{items} });
3592
3593 my @adds;
3594 my $row = 0;
3595 for my $item ($self->{sort}->(@{ $self->{items} })) {
3596 CFClient::Item::update_widgets $item;
3597
3598 push @adds, 0, $row, $item->{face_widget};
3599 push @adds, 1, $row, $item->{desc_widget};
3600 push @adds, 2, $row, $item->{weight_widget};
3601
3602 $row++;
3603 }
3604
3605 $self->add (@adds);
3606}
3607
3608sub set_sort_order {
3609 my ($self, $order) = @_;
3610
3611 $self->{sort} = $order ||= sub {
3612 sort {
3613 $a->{type} <=> $b->{type}
3614 or $a->{name} cmp $b->{name}
3615 } @_
3616 };
3617
3618 $self->update_items;
3197} 3619}
3198 3620
3199sub set_items { 3621sub set_items {
3200 my ($self, $items) = @_; 3622 my ($self, $items) = @_;
3201 3623
3202 $self->{child}->clear; 3624 $self->{items} = [$items ? values %$items : ()];
3203 return unless $items;
3204
3205 my @items = sort {
3206 ($a->{type} <=> $b->{type})
3207 or ($a->{name} cmp $b->{name})
3208 } @$items;
3209
3210 $self->{real_items} = \@items;
3211
3212 my $row = 0;
3213 for my $item (@items) {
3214 CFClient::Item::update_widgets $item;
3215
3216 $self->{child}->add (0, $row, $item->{face_widget});
3217 $self->{child}->add (1, $row, $item->{desc_widget});
3218 $self->{child}->add (2, $row, $item->{weight_widget});
3219
3220 $row++;
3221 }
3222}
3223
3224#############################################################################
3225
3226package CFClient::UI::BindEditor;
3227
3228our @ISA = CFClient::UI::FancyFrame::;
3229
3230sub new {
3231 my $class = shift;
3232
3233 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3234
3235 $self->add (my $vb = new CFClient::UI::VBox);
3236
3237
3238 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3239 text => "start recording",
3240 tooltip => "Start/Stops recording of actions."
3241 ."All subsequent actions after the recording started will be captured."
3242 ."The actions are displayed after the record was stopped."
3243 ."To bind the action you have to click on the 'Bind' button",
3244 on_activate => sub {
3245 unless ($self->{recording}) {
3246 $self->start;
3247 } else {
3248 $self->stop;
3249 }
3250 });
3251
3252 $vb->add (new CFClient::UI::Label text => "Actions:");
3253 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3254
3255 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3258 $hb->add (new CFClient::UI::Button
3259 text => "bind",
3260 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3261 on_activate => sub {
3262 $self->ask_for_bind;
3263 });
3264
3265 $vb->add (my $hb = new CFClient::UI::HBox);
3266 $hb->add (new CFClient::UI::Button
3267 text => "ok",
3268 expand => 1,
3269 tooltip => "This closes the binding editor and saves the binding",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->commit;
3273 });
3274
3275 $hb->add (new CFClient::UI::Button
3276 text => "cancel",
3277 expand => 1,
3278 tooltip => "This closes the binding editor without saving",
3279 on_activate => sub {
3280 $self->hide;
3281 $self->{binding_cancel}->()
3282 if $self->{binding_cancel};
3283 });
3284
3285 $self->update_binding_widgets; 3625 $self->update_items;
3286
3287 $self
3288}
3289
3290sub commit {
3291 my ($self) = @_;
3292 my ($mod, $sym, $cmds) = $self->get_binding;
3293 if ($sym != 0 && @$cmds > 0) {
3294 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3295 ."'. Don't forget 'Save Config'!");
3296 $self->{binding_change}->($mod, $sym, $cmds)
3297 if $self->{binding_change};
3298 } else {
3299 $::STATUSBOX->add ("No action bound, no key or action specified!");
3300 $self->{binding_cancel}->()
3301 if $self->{binding_cancel};
3302 }
3303}
3304
3305sub start {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("stop recording");
3309 $self->{recording} = 1;
3310 $self->clear_command_list;
3311 $::CONN->start_record if $::CONN;
3312}
3313
3314sub stop {
3315 my ($self) = @_;
3316
3317 $self->{rec_btn}->set_text ("start recording");
3318 $self->{recording} = 0;
3319
3320 my $rec;
3321 $rec = $::CONN->stop_record if $::CONN;
3322 return unless ref $rec eq 'ARRAY';
3323 $self->set_command_list ($rec);
3324}
3325
3326
3327sub ask_for_bind_and_commit {
3328 my ($self) = @_;
3329 $self->ask_for_bind (1);
3330}
3331
3332sub ask_for_bind {
3333 my ($self, $commit) = @_;
3334
3335 CFClient::Binder::open_binding_dialog (sub {
3336 my ($mod, $sym) = @_;
3337 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3338 $self->update_binding_widgets;
3339 $self->commit if $commit;
3340 });
3341}
3342
3343# $mod and $sym are the modifiers and key symbol
3344# $cmds is a array ref of strings (the commands)
3345# $cb is the callback that is executed on OK
3346# $ccb is the callback that is executed on CANCEL and
3347# when the binding was unsuccessful on OK
3348sub set_binding {
3349 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3350
3351 $self->clear_command_list;
3352 $self->{recording} = 0;
3353 $self->{rec_btn}->set_text ("start recording");
3354
3355 $self->{binding} = [$mod, $sym];
3356 $self->{commands} = $cmds;
3357
3358 $self->{binding_change} = $cb;
3359 $self->{binding_cancel} = $ccb;
3360
3361 $self->update_binding_widgets;
3362}
3363
3364# this is a shortcut method that asks for a binding
3365# and then just binds it.
3366sub do_quick_binding {
3367 my ($self, $cmds) = @_;
3368 $self->set_binding (undef, undef, $cmds, sub {
3369 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3370 });
3371 $self->ask_for_bind (1);
3372}
3373
3374sub update_binding_widgets {
3375 my ($self) = @_;
3376 my ($mod, $sym, $cmds) = $self->get_binding;
3377 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3378 $self->set_command_list ($cmds);
3379}
3380
3381sub get_binding {
3382 my ($self) = @_;
3383 return (
3384 $self->{binding}->[0],
3385 $self->{binding}->[1],
3386 [ grep { defined $_ } @{$self->{commands}} ]
3387 );
3388}
3389
3390sub clear_command_list {
3391 my ($self) = @_;
3392 $self->{cmdbox}->clear ();
3393}
3394
3395sub set_command_list {
3396 my ($self, $cmds) = @_;
3397
3398 $self->{cmdbox}->clear ();
3399 $self->{commands} = $cmds;
3400
3401 my $idx = 0;
3402
3403 for (@$cmds) {
3404 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3405
3406 my $i = $idx;
3407 $hb->add (new CFClient::UI::Label text => $_);
3408 $hb->add (new CFClient::UI::Button
3409 text => "delete",
3410 tooltip => "Deletes the action from the record",
3411 on_activate => sub {
3412 $self->{cmdbox}->remove ($hb);
3413 $cmds->[$i] = undef;
3414 });
3415
3416
3417 $idx++
3418 }
3419} 3626}
3420 3627
3421############################################################################# 3628#############################################################################
3422 3629
3423package CFClient::UI::SpellList; 3630package CFClient::UI::SpellList;
… …
3432 commands => [], 3639 commands => [],
3433 @_, 3640 @_,
3434 ) 3641 )
3435} 3642}
3436 3643
3437# XXX: Do sorting? Argl... 3644my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3645
3646my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3647 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3648my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3649 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3650my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3651 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3652my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3653 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3654my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3655 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3656
3657sub rebuild_spell_list {
3658 my ($self) = @_;
3659
3660 $CFClient::UI::ROOT->on_refresh ($self => sub {
3661 $self->clear;
3662
3663 return unless $::CONN;
3664
3665 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3666 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3667 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3668 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3669 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3670
3671 my $row = 0;
3672
3673 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3674 my $spell = $self->{spell}{$_};
3675
3676 $row++;
3677
3678 my $spell_cb = sub {
3679 my ($widget, $ev) = @_;
3680
3681 if ($ev->{button} == 1) {
3682 $::CONN->user_send ("cast $spell->{name}");
3683 } elsif ($ev->{button} == 2) {
3684 $::CONN->user_send ("invoke $spell->{name}");
3685 } elsif ($ev->{button} == 3) {
3686 (new CFClient::UI::Menu
3687 items => [
3688 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3689 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3690 ],
3691 )->popup ($ev);
3692 } else {
3693 return 0;
3694 }
3695
3696 1
3697 };
3698
3699 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3700
3701 #TODO: add path info to tooltip
3702 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3703
3704 $self->add (0, $row, new CFClient::UI::Face
3705 face => $spell->{face},
3706 can_hover => 1,
3707 can_events => 1,
3708 tooltip => $tooltip,
3709 on_button_down => $spell_cb,
3710 );
3711
3712 $self->add (1, $row, new CFClient::UI::Label
3713 expand => 1,
3714 text => $spell->{name},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3722 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3723 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3724 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3725 }
3726 });
3727}
3728
3438sub add_spell { 3729sub add_spell {
3439 my ($self, $spell) = @_; 3730 my ($self, $spell) = @_;
3731
3440 $self->{spells}->{$spell->{name}} = $spell; 3732 $self->{spell}->{$spell->{name}} = $spell;
3441 3733 $self->rebuild_spell_list;
3442 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3443 face => $spell->{face},
3444 can_hover => 1,
3445 can_events => 1,
3446 tooltip => $spell->{message});
3447
3448 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => $spell->{name},
3450 can_hover => 1,
3451 can_events => 1,
3452 tooltip => $spell->{message},
3453 expand => 1);
3454
3455 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3456 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3457 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3458 expand => 1);
3459
3460 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3461 text => "bind to key",
3462 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3463}
3464
3465sub rebuild_spell_list {
3466 my ($self) = @_;
3467 $self->{tbl_idx} = 0;
3468 $self->add_spell ($_) for values %{$self->{spells}};
3469} 3734}
3470 3735
3471sub remove_spell { 3736sub remove_spell {
3472 my ($self, $spell) = @_; 3737 my ($self, $spell) = @_;
3738
3473 delete $self->{spells}->{$spell->{name}}; 3739 delete $self->{spell}->{$spell->{name}};
3474 $self->rebuild_spell_list; 3740 $self->rebuild_spell_list;
3475} 3741}
3476 3742
3743sub clear_spells {
3744 my ($self) = @_;
3745
3746 $self->{spell} = {};
3747 $self->rebuild_spell_list;
3748}
3749
3477############################################################################# 3750#############################################################################
3478 3751
3479package CFClient::UI::Root; 3752package CFClient::UI::Root;
3480 3753
3481our @ISA = CFClient::UI::Container::; 3754our @ISA = CFClient::UI::Container::;
3755
3756use List::Util qw(min max);
3482 3757
3483use CFClient::OpenGL; 3758use CFClient::OpenGL;
3484 3759
3485sub new { 3760sub new {
3486 my $class = shift; 3761 my $class = shift;
… …
3513 $coord = $max - $size if $coord > $max - $size; 3788 $coord = $max - $size if $coord > $max - $size;
3514 3789
3515 int $coord + 0.5 3790 int $coord + 0.5
3516} 3791}
3517 3792
3518sub size_allocate { 3793sub invoke_size_allocate {
3519 my ($self, $w, $h) = @_; 3794 my ($self, $w, $h) = @_;
3520 3795
3521 for my $child ($self->children) { 3796 for my $child ($self->children) {
3522 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3797 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3523 3798
… …
3527 $X = _to_pixel $X, $W, $self->{w}; 3802 $X = _to_pixel $X, $W, $self->{w};
3528 $Y = _to_pixel $Y, $H, $self->{h}; 3803 $Y = _to_pixel $Y, $H, $self->{h};
3529 3804
3530 $child->configure ($X, $Y, $W, $H); 3805 $child->configure ($X, $Y, $W, $H);
3531 } 3806 }
3807
3808 1
3532} 3809}
3533 3810
3534sub coord2local { 3811sub coord2local {
3535 my ($self, $x, $y) = @_; 3812 my ($self, $x, $y) = @_;
3536 3813
… …
3621 3898
3622 delete $queue{$widget+0}; 3899 delete $queue{$widget+0};
3623 3900
3624 my ($w, $h) = $widget->size_request; 3901 my ($w, $h) = $widget->size_request;
3625 3902
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3903 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3904 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3905
3906 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3907 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3628 3908
3629 $w = $widget->{force_w} if exists $widget->{force_w}; 3909 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h}; 3910 $h = $widget->{force_h} if exists $widget->{force_h};
3631 3911
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3912 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3658 3938
3659 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3939 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3660 3940
3661 $w = 0 if $w < 0; 3941 $w = 0 if $w < 0;
3662 $h = 0 if $h < 0; 3942 $h = 0 if $h < 0;
3943
3944 $w = max $widget->{min_w}, $w;
3945 $h = max $widget->{min_h}, $h;
3946
3947# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3948# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3949
3950 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3951 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3663 3952
3664 $w = int $w + 0.5; 3953 $w = int $w + 0.5;
3665 $h = int $h + 0.5; 3954 $h = int $h + 0.5;
3666 3955
3667 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3956 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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