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.277 by root, Sun Jun 4 00:21:52 2006 UTC vs.
Revision 1.331 by root, Sun Jul 23 04:46:02 2006 UTC

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

Diff Legend

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