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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.328 by root, Sat Jul 22 13:43:05 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}
… …
82 83
83sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
84 my ($ev) = @_; 85 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
86 87
88 warn "button down $ev->{button}\n";#d#
89
87 if (!$BUTTON_STATE) { 90 if (!$BUTTON_STATE) {
88 my $widget = $ROOT->find_widget ($x, $y); 91 my $widget = $ROOT->find_widget ($x, $y);
89 92
90 $GRAB = $widget; 93 $GRAB = $widget;
91 $GRAB->update if $GRAB; 94 $GRAB->update if $GRAB;
92 95
93 check_tooltip; 96 $TOOLTIP_WATCHER->cb->();
94 } 97 }
95 98
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 99 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 100
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 101 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 116 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 117 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 118 $grab->update if $grab;
116 $GRAB->update if $GRAB; 119 $GRAB->update if $GRAB;
117 120
118 check_tooltip; 121 $TOOLTIP_WATCHER->cb->();
119 } 122 }
120} 123}
121 124
122sub feed_sdl_motion_event { 125sub feed_sdl_motion_event {
123 my ($ev) = @_; 126 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 132 my $hover = $HOVER; $HOVER = $widget;
130 133
131 $hover->update if $hover && $hover->{can_hover}; 134 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 135 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 136
134 check_tooltip; 137 $TOOLTIP_WATCHER->start;
135 } 138 }
136 139
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 140 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 141 if $HOVER;
139} 142}
… …
271 274
272 return unless $self->{visible}; 275 return unless $self->{visible};
273 276
274 $_->set_invisible for $self->children; 277 $_->set_invisible for $self->children;
275 278
279 delete $self->{visible};
276 delete $self->{root}; 280 delete $self->{root};
277 delete $self->{visible};
278 281
279 undef $GRAB if $GRAB == $self; 282 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 283 undef $HOVER if $HOVER == $self;
281 284
282 CFClient::UI::check_tooltip 285 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 286 if $TOOLTIP->{owner} == $self;
284 287
285 $self->focus_out; 288 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 289 $self->emit (visibility_change => 0);
288} 290}
289 291
290sub set_visibility { 292sub set_visibility {
291 my ($self, $visible) = @_; 293 my ($self, $visible) = @_;
… …
314} 316}
315 317
316sub move_abs { 318sub move_abs {
317 my ($self, $x, $y, $z) = @_; 319 my ($self, $x, $y, $z) = @_;
318 320
319 $self->{x} = List::Util::max 0, int $x; 321 $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; 322 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 323 $self->{z} = $z if defined $z;
322 324
323 $self->update; 325 $self->update;
324} 326}
325 327
… …
333} 335}
334 336
335sub size_request { 337sub size_request {
336 require Carp; 338 require Carp;
337 Carp::confess "size_request is abstract"; 339 Carp::confess "size_request is abstract";
340}
341
342sub baseline_shift {
343 0
338} 344}
339 345
340sub configure { 346sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 347 my ($self, $x, $y, $w, $h) = @_;
342 348
… …
366 372
367 $self->{root}{size_alloc}{$self+0} = $self; 373 $self->{root}{size_alloc}{$self+0} = $self;
368 } 374 }
369} 375}
370 376
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 377sub children {
376 # nop 378 # nop
377} 379}
378 380
379sub visible_children { 381sub visible_children {
… …
381} 383}
382 384
383sub set_max_size { 385sub set_max_size {
384 my ($self, $w, $h) = @_; 386 my ($self, $w, $h) = @_;
385 387
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 388 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 389 $self->{max_h} = int $h if defined $h;
390
391 $self->realloc;
388} 392}
389 393
390sub set_tooltip { 394sub set_tooltip {
391 my ($self, $tooltip) = @_; 395 my ($self, $tooltip) = @_;
392 396
… …
397 401
398 $self->{tooltip} = $tooltip; 402 $self->{tooltip} = $tooltip;
399 403
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 404 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 405 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 406 $CFClient::UI::TOOLTIP_WATCHER->cb->();
403 } 407 }
404} 408}
405 409
406# translate global coordinates to local coordinate system 410# translate global coordinates to local coordinate system
407sub coord2local { 411sub coord2local {
… …
415 my ($self, $x, $y) = @_; 419 my ($self, $x, $y) = @_;
416 420
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 421 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 422}
419 423
420sub focus_in { 424sub invoke_focus_in {
421 my ($self) = @_; 425 my ($self) = @_;
422 426
423 return if $FOCUS == $self; 427 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 428 return unless $self->{can_focus};
425 429
426 my $focus = $FOCUS; $FOCUS = $self; 430 $FOCUS = $self;
427 431
428 $self->_emit (focus_in => $focus); 432 $self->update;
429 433
430 $focus->update if $focus; 434 0
431 $FOCUS->update;
432} 435}
433 436
434sub focus_out { 437sub invoke_focus_out {
435 my ($self) = @_; 438 my ($self) = @_;
436 439
437 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
438 441
439 my $focus = $FOCUS; undef $FOCUS; 442 undef $FOCUS;
440 443
441 $self->_emit (focus_out => $focus); 444 $self->update;
442 445
443 $focus->update if $focus; #?
444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 446 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 447 unless $FOCUS;
447}
448 448
449 0
450}
451
452sub grab_focus {
453 my ($self) = @_;
454
455 $FOCUS->emit ("focus_out") if $FOCUS;
456 $self->emit ("focus_in");
457}
458
449sub mouse_motion { 0 } 459sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 460sub invoke_button_up { 0 }
451sub key_down { 0 } 461sub invoke_key_down { 0 }
452sub key_up { 0 } 462sub invoke_key_up { 0 }
453 463
454sub button_down { 464sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 465 my ($self, $ev, $x, $y) = @_;
456 466
457 $self->focus_in; 467 $self->grab_focus;
468
469 warn "button down $ev->{button} $x $y\n";#d#
458 470
459 0 471 0
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub emit {
481 my ($self, $signal, @args) = @_;
482
483 #d##TODO# stop propagating at first true, do not use sum
484 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
485 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
486 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460} 487}
461 488
462sub find_widget { 489sub find_widget {
463 my ($self, $x, $y) = @_; 490 my ($self, $x, $y) = @_;
464 491
… …
474sub set_parent { 501sub set_parent {
475 my ($self, $parent) = @_; 502 my ($self, $parent) = @_;
476 503
477 Scalar::Util::weaken ($self->{parent} = $parent); 504 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 505 $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} 506}
503 507
504sub realloc { 508sub realloc {
505 my ($self) = @_; 509 my ($self) = @_;
506 510
… …
539 return unless $self->{h} && $self->{w}; 543 return unless $self->{h} && $self->{w};
540 544
541 # update screen rectangle 545 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 546 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 547 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 548
547 # skip widgets that are entirely outside the drawing area 549 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 552
551 glPushMatrix; 553 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 555
556 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 558 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 560 glBegin GL_QUADS;
563 glVertex $x , $y; 561 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
567 glEnd; 565 glEnd;
568 glDisable GL_BLEND; 566 glDisable GL_BLEND;
569 } 567 }
570 568
571 if ($ENV{CFPLUS_DEBUG} & 1) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 570 glPushMatrix;
573 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 574 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
580 glEnd; 578 glEnd;
581 glPopMatrix; 579 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
584} 585}
585 586
586sub _draw { 587sub _draw {
587 my ($self) = @_; 588 my ($self) = @_;
588 589
… …
590} 591}
591 592
592sub DESTROY { 593sub DESTROY {
593 my ($self) = @_; 594 my ($self) = @_;
594 595
596 return if CFClient::in_destruct;
597
595 delete $WIDGET{$self+0}; 598 delete $WIDGET{$self+0};
596 #$self->deactivate; 599
600 eval { $self->destroy };
601 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
597} 602}
598 603
599############################################################################# 604#############################################################################
600 605
601package CFClient::UI::DrawBG; 606package CFClient::UI::DrawBG;
… …
626 631
627 if ($color && (@$color < 4 || $color->[3])) { 632 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 633 my ($w, $h) = @$self{qw(w h)};
629 634
630 glEnable GL_BLEND; 635 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 636 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 637 glColor_premultiply @$color;
633 638
634 glBegin GL_QUADS; 639 glBegin GL_QUADS;
635 glVertex 0 , 0; 640 glVertex 0 , 0;
636 glVertex 0 , $h; 641 glVertex 0 , $h;
637 glVertex $w, $h; 642 glVertex $w, $h;
… …
766} 771}
767 772
768sub add { 773sub add {
769 my ($self, $child) = @_; 774 my ($self, $child) = @_;
770 775
771 $self->{children} = []; 776 $self->SUPER::remove ($_) for @{ $self->{children} };
772
773 $self->SUPER::add ($child); 777 $self->SUPER::add ($child);
774} 778}
775 779
776sub remove { 780sub remove {
777 my ($self, $widget) = @_; 781 my ($self, $widget) = @_;
… …
786 790
787sub size_request { 791sub size_request {
788 $_[0]{children}[0]->size_request 792 $_[0]{children}[0]->size_request
789} 793}
790 794
791sub size_allocate { 795sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 796 my ($self, $w, $h) = @_;
793 797
794 $self->{children}[0]->configure (0, 0, $w, $h); 798 $self->{children}[0]->configure (0, 0, $w, $h);
799
800 1
795} 801}
796 802
797############################################################################# 803#############################################################################
804
805# back-buffered drawing area
798 806
799package CFClient::UI::Window; 807package CFClient::UI::Window;
800 808
801our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
802 810
… …
813 821
814 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 822 $ROOT->on_post_alloc ($self => sub { $self->render_child });
815 $self->SUPER::update; 823 $self->SUPER::update;
816} 824}
817 825
818sub size_allocate { 826sub invoke_size_allocate {
819 my ($self, $w, $h) = @_; 827 my ($self, $w, $h) = @_;
820 828
821 $self->SUPER::size_allocate ($w, $h);
822 $self->update; 829 $self->update;
830
831 $self->SUPER::invoke_size_allocate ($w, $h)
823} 832}
824 833
825sub _render { 834sub _render {
826 my ($self) = @_; 835 my ($self) = @_;
827 836
… …
854 my $tex = $self->{texture} 863 my $tex = $self->{texture}
855 or return; 864 or return;
856 865
857 glEnable GL_TEXTURE_2D; 866 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 867 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 868 glColor 0, 0, 0, 1;
860 869
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 870 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862 871
863 glDisable GL_TEXTURE_2D; 872 glDisable GL_TEXTURE_2D;
864} 873}
… …
888 $h = 10 if $self->{scroll_y}; 897 $h = 10 if $self->{scroll_y};
889 898
890 ($w, $h) 899 ($w, $h)
891} 900}
892 901
893sub size_allocate { 902sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 903 my ($self, $w, $h) = @_;
895 904
896 my $child = $self->child; 905 my $child = $self->child;
897 906
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 907 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 908 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900 909
901 $self->child->configure (0, 0, $w, $h); 910 $self->child->configure (0, 0, $w, $h);
902 $self->update; 911 $self->update;
912
913 1
903} 914}
904 915
905sub set_offset { 916sub set_offset {
906 my ($self, $x, $y) = @_; 917 my ($self, $x, $y) = @_;
907 918
… …
955package CFClient::UI::ScrolledWindow; 966package CFClient::UI::ScrolledWindow;
956 967
957our @ISA = CFClient::UI::HBox::; 968our @ISA = CFClient::UI::HBox::;
958 969
959sub new { 970sub new {
960 my $class = shift; 971 my ($class, %arg) = @_;
972
973 my $child = delete $arg{child};
961 974
962 my $self; 975 my $self;
963 976
964 my $slider = new CFClient::UI::Slider 977 my $slider = new CFClient::UI::Slider
965 vertical => 1, 978 vertical => 1,
… …
970 ; 983 ;
971 984
972 $self = $class->SUPER::new ( 985 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1), 986 vp => (new CFClient::UI::ViewPort expand => 1),
974 slider => $slider, 987 slider => $slider,
975 @_, 988 %arg,
976 ); 989 );
977 990
978 $self->{vp}->add ($self->{scrolled});
979 $self->add ($self->{vp});
980 $self->add ($self->{slider}); 991 $self->SUPER::add ($self->{vp}, $self->{slider});
992 $self->add ($child) if $child;
981 993
982 $self 994 $self
983} 995}
984 996
997#TODO# update range on size_allocate depending on child
998
999sub add {
1000 my ($self, $widget) = @_;
1001
1002 $self->{vp}->add ($self->{child} = $widget);
1003}
1004
1005sub invoke_button_down {
1006 my ($self, $ev) = @_;
1007
1008 warn "button down $ev->{button}\n";#d#
1009
1010 0
1011}
1012
1013sub update_slider {
1014 my ($self) = @_;
1015
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1017}
1018
985sub update { 1019sub update {
986 my ($self) = @_; 1020 my ($self) = @_;
987 1021
988 $self->SUPER::update; 1022 $self->SUPER::update;
989 1023
990 # todo: overwrite size_allocate of child 1024 $self->update_slider;
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993} 1025}
994 1026
995sub size_allocate { 1027sub invoke_size_allocate {
996 my ($self, $w, $h) = @_; 1028 my ($self, $w, $h) = @_;
997 1029
1030 $self->update_slider;
1031
998 $self->SUPER::size_allocate ($w, $h); 1032 $self->SUPER::invoke_size_allocate ($w, $h)
999
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002} 1033}
1003
1004#TODO# update range on size_allocate depending on child
1005# update viewport offset on scroll
1006 1034
1007############################################################################# 1035#############################################################################
1008 1036
1009package CFClient::UI::Frame; 1037package CFClient::UI::Frame;
1010 1038
… …
1026 1054
1027 if ($self->{bg}) { 1055 if ($self->{bg}) {
1028 my ($w, $h) = @$self{qw(w h)}; 1056 my ($w, $h) = @$self{qw(w h)};
1029 1057
1030 glEnable GL_BLEND; 1058 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1059 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1032 glColor @{ $self->{bg} }; 1060 glColor_premultiply @{ $self->{bg} };
1033 1061
1034 glBegin GL_QUADS; 1062 glBegin GL_QUADS;
1035 glVertex 0 , 0; 1063 glVertex 0 , 0;
1036 glVertex 0 , $h; 1064 glVertex 0 , $h;
1037 glVertex $w, $h; 1065 glVertex $w, $h;
… …
1061 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1089 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1062 1090
1063sub new { 1091sub new {
1064 my ($class, %arg) = @_; 1092 my ($class, %arg) = @_;
1065 1093
1066 my $title = delete $arg{title};
1067
1068 my $self = $class->SUPER::new ( 1094 my $self = $class->SUPER::new (
1069 bg => [1, 1, 1, 1], 1095 bg => [1, 1, 1, 1],
1070 border_bg => [1, 1, 1, 1], 1096 border_bg => [1, 1, 1, 1],
1071 border => 0.6, 1097 border => 0.6,
1072 can_events => 1, 1098 can_events => 1,
1073 min_w => 16, 1099 min_w => 64,
1074 min_h => 16, 1100 min_h => 32,
1075 %arg, 1101 %arg,
1076 ); 1102 );
1077 1103
1078 $self->{title} = new CFClient::UI::Label 1104 $self->{title_widget} = new CFClient::UI::Label
1079 align => 0, 1105 align => 0,
1080 valign => 1, 1106 valign => 1,
1081 text => $title, 1107 text => $self->{title},
1082 fontsize => $self->{border} 1108 fontsize => $self->{border},
1083 if defined $title; 1109 if exists $self->{title};
1110
1111 if ($self->{has_close_button}) {
1112 $self->{close_button} =
1113 new CFClient::UI::ImageButton
1114 path => 'x1_close.png',
1115 on_activate => sub { $self->emit ("delete") };
1116
1117 $self->CFClient::UI::Container::add ($self->{close_button});
1118 }
1084 1119
1085 $self 1120 $self
1086} 1121}
1087 1122
1088sub add { 1123sub add {
1089 my ($self, @widgets) = @_; 1124 my ($self, @widgets) = @_;
1090 1125
1091 $self->SUPER::add (@widgets); 1126 $self->SUPER::add (@widgets);
1127 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1128 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1093} 1129}
1094 1130
1095sub border { 1131sub border {
1096 int $_[0]{border} * $::FONTSIZE 1132 int $_[0]{border} * $::FONTSIZE
1097} 1133}
1098 1134
1099sub size_request { 1135sub size_request {
1100 my ($self) = @_; 1136 my ($self) = @_;
1101 1137
1102 $self->{title}->size_request 1138 $self->{title_widget}->size_request
1103 if $self->{title}; 1139 if $self->{title_widget};
1140
1141 $self->{close_button}->size_request
1142 if $self->{close_button};
1104 1143
1105 my ($w, $h) = $self->SUPER::size_request; 1144 my ($w, $h) = $self->SUPER::size_request;
1106 1145
1107 ( 1146 (
1108 $w + $self->border * 2, 1147 $w + $self->border * 2,
1109 $h + $self->border * 2, 1148 $h + $self->border * 2,
1110 ) 1149 )
1111} 1150}
1112 1151
1113sub size_allocate { 1152sub invoke_size_allocate {
1114 my ($self, $w, $h) = @_; 1153 my ($self, $w, $h) = @_;
1115 1154
1116 if ($self->{title}) { 1155 if ($self->{title_widget}) {
1117 $self->{title}{w} = $w; 1156 $self->{title_widget}{w} = $w;
1118 $self->{title}{h} = $h; 1157 $self->{title_widget}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h); 1158 $self->{title_widget}->invoke_size_allocate ($w, $h);
1120 } 1159 }
1121 1160
1122 my $border = $self->border; 1161 my $border = $self->border;
1123 1162
1124 $h -= List::Util::max 0, $border * 2; 1163 $h -= List::Util::max 0, $border * 2;
1125 $w -= List::Util::max 0, $border * 2; 1164 $w -= List::Util::max 0, $border * 2;
1165
1166 $self->child->configure ($border, $border, $w, $h);
1167
1168 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1169 if $self->{close_button};
1170
1171 1
1172}
1173
1174sub invoke_delete {
1175 my ($self) = @_;
1176
1177 $self->hide;
1126 1178
1127 $self->child->configure ($border, $border, $w, $h); 1179 1
1128} 1180}
1129 1181
1130sub button_down { 1182sub invoke_button_down {
1131 my ($self, $ev, $x, $y) = @_; 1183 my ($self, $ev, $x, $y) = @_;
1132 1184
1133 my ($w, $h) = @$self{qw(w h)}; 1185 my ($w, $h) = @$self{qw(w h)};
1134 my $border = $self->border; 1186 my $border = $self->border;
1135 1187
… …
1151 my $dy = $ev->{y} - $oy; 1203 my $dy = $ev->{y} - $oy;
1152 1204
1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1205 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1206 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155 1207
1208 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1156 $self->realloc; 1209 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1158 }; 1210 };
1159 1211
1160 } elsif ($lr ^ $td) { 1212 } elsif ($lr ^ $td) {
1161 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1213 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1162 my ($bx, $by) = ($self->{x}, $self->{y}); 1214 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1165 my ($ev, $x, $y) = @_; 1217 my ($ev, $x, $y) = @_;
1166 1218
1167 ($x, $y) = ($ev->{x}, $ev->{y}); 1219 ($x, $y) = ($ev->{x}, $ev->{y});
1168 1220
1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1221 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1222 # HACK: the next line is required to enforce placement
1223 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1170 }; 1224 };
1171 } else { 1225 } else {
1172 return 0; 1226 return 0;
1173 } 1227 }
1174 1228
1175 1 1229 1
1176} 1230}
1177 1231
1178sub button_up { 1232sub invoke_button_up {
1179 my ($self, $ev, $x, $y) = @_; 1233 my ($self, $ev, $x, $y) = @_;
1180 1234
1181 !!delete $self->{motion} 1235 ! ! delete $self->{motion}
1182} 1236}
1183 1237
1184sub mouse_motion { 1238sub invoke_mouse_motion {
1185 my ($self, $ev, $x, $y) = @_; 1239 my ($self, $ev, $x, $y) = @_;
1186 1240
1187 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1241 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188 1242
1189 !!$self->{motion} 1243 ! ! $self->{motion}
1190} 1244}
1191 1245
1192sub _draw { 1246sub _draw {
1193 my ($self) = @_; 1247 my ($self) = @_;
1194 1248
… …
1220 1274
1221 glDisable GL_TEXTURE_2D; 1275 glDisable GL_TEXTURE_2D;
1222 1276
1223 $child->draw; 1277 $child->draw;
1224 1278
1225 if ($self->{title}) { 1279 if ($self->{title_widget}) {
1226 glTranslate 0, $border - $self->{h}; 1280 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw; 1281 $self->{title_widget}->_draw;
1282
1283 glTranslate 0, - ($border - $self->{h});
1228 } 1284 }
1285
1286 $self->{close_button}->draw
1287 if $self->{close_button};
1229} 1288}
1230 1289
1231############################################################################# 1290#############################################################################
1232 1291
1233package CFClient::UI::Table; 1292package CFClient::UI::Table;
… …
1256 1315
1257 $child->set_parent ($self); 1316 $child->set_parent ($self);
1258 $self->{children}[$y][$x] = $child; 1317 $self->{children}[$y][$x] = $child;
1259 1318
1260 $self->realloc; 1319 $self->realloc;
1320}
1321
1322sub remove {
1323 my ($self, $child) = @_;
1324
1325 # TODO: not yet implemented
1261} 1326}
1262 1327
1263# TODO: move to container class maybe? send children a signal on removal? 1328# TODO: move to container class maybe? send children a signal on removal?
1264sub clear { 1329sub clear {
1265 my ($self) = @_; 1330 my ($self) = @_;
… …
1306 (sum @$ws), 1371 (sum @$ws),
1307 (sum @$hs), 1372 (sum @$hs),
1308 ) 1373 )
1309} 1374}
1310 1375
1311sub size_allocate { 1376sub invoke_size_allocate {
1312 my ($self, $w, $h) = @_; 1377 my ($self, $w, $h) = @_;
1313 1378
1314 my ($ws, $hs) = $self->get_wh; 1379 my ($ws, $hs) = $self->get_wh;
1315 1380
1316 my $req_w = (sum @$ws) || 1; 1381 my $req_w = (sum @$ws) || 1;
… …
1348 } 1413 }
1349 1414
1350 $y += $row_h; 1415 $y += $row_h;
1351 } 1416 }
1352 1417
1418 1
1353} 1419}
1354 1420
1355sub find_widget { 1421sub find_widget {
1356 my ($self, $x, $y) = @_; 1422 my ($self, $x, $y) = @_;
1357 1423
… …
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1460 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1461 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1396 ) 1462 )
1397} 1463}
1398 1464
1399sub size_allocate { 1465sub invoke_size_allocate {
1400 my ($self, $w, $h) = @_; 1466 my ($self, $w, $h) = @_;
1401 1467
1402 my $space = $self->{vertical} ? $h : $w; 1468 my $space = $self->{vertical} ? $h : $w;
1403 my $children = $self->{children}; 1469 my @children = $self->visible_children;
1404 1470
1405 my @req; 1471 my @req;
1406 1472
1407 if ($self->{homogeneous}) { 1473 if ($self->{homogeneous}) {
1408 @req = ($space / (@$children || 1)) x @$children; 1474 @req = ($space / (@children || 1)) x @children;
1409 } else { 1475 } else {
1410 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1476 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1411 my $req = List::Util::sum @req; 1477 my $req = List::Util::sum @req;
1412 1478
1413 if ($req > $space) { 1479 if ($req > $space) {
1414 # ah well, not enough space 1480 # ah well, not enough space
1415 $_ *= $space / $req for @req; 1481 $_ *= $space / $req for @req;
1416 } else { 1482 } else {
1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1483 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1418 1484
1419 $space = ($space - $req) / $expand; # remaining space to give away 1485 $space = ($space - $req) / $expand; # remaining space to give away
1420 1486
1421 $req[$_] += $space * $children->[$_]{expand} 1487 $req[$_] += $space * $children[$_]{expand}
1422 for 0 .. $#$children; 1488 for 0 .. $#children;
1423 } 1489 }
1424 } 1490 }
1425 1491
1426 CFClient::UI::harmonize \@req; 1492 CFClient::UI::harmonize \@req;
1427 1493
1428 my $pos = 0; 1494 my $pos = 0;
1429 for (0 .. $#$children) { 1495 for (0 .. $#children) {
1430 my $alloc = $req[$_]; 1496 my $alloc = $req[$_];
1431 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1497 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1432 1498
1433 $pos += $alloc; 1499 $pos += $alloc;
1434 } 1500 }
1435 1501
1436 1 1502 1
… …
1526 1592
1527 delete $self->{texture}; 1593 delete $self->{texture};
1528 $self->SUPER::update; 1594 $self->SUPER::update;
1529} 1595}
1530 1596
1597sub realloc {
1598 my ($self) = @_;
1599
1600 delete $self->{ox};
1601 $self->SUPER::realloc;
1602}
1603
1531sub set_text { 1604sub set_text {
1532 my ($self, $text) = @_; 1605 my ($self, $text) = @_;
1533 1606
1534 return if $self->{text} eq "T$text"; 1607 return if $self->{text} eq "T$text";
1535 $self->{text} = "T$text"; 1608 $self->{text} = "T$text";
1536 1609
1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1538 $self->{layout}->set_text ($text); 1610 $self->{layout}->set_text ($text);
1539 1611
1612 delete $self->{size_req};
1540 $self->realloc; 1613 $self->realloc;
1541 $self->update; 1614 $self->update;
1542} 1615}
1543 1616
1544sub set_markup { 1617sub set_markup {
… …
1547 return if $self->{text} eq "M$markup"; 1620 return if $self->{text} eq "M$markup";
1548 $self->{text} = "M$markup"; 1621 $self->{text} = "M$markup";
1549 1622
1550 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1623 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1551 1624
1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1553 $self->{layout}->set_markup ($markup); 1625 $self->{layout}->set_markup ($markup);
1554 1626
1627 delete $self->{size_req};
1555 $self->realloc; 1628 $self->realloc;
1556 $self->update; 1629 $self->update;
1557} 1630}
1558 1631
1559sub size_request { 1632sub size_request {
1560 my ($self) = @_; 1633 my ($self) = @_;
1561 1634
1635 $self->{size_req} ||= do {
1562 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1636 $self->{layout}->set_font ($self->{font}) if $self->{font};
1563 $self->{layout}->set_width ($self->{max_w} || -1); 1637 $self->{layout}->set_width ($self->{max_w} || -1);
1564 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1638 $self->{layout}->set_ellipsise ($self->{ellipsise});
1565 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1639 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1640 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1567 1641
1568 my ($w, $h) = $self->{layout}->size; 1642 my ($w, $h) = $self->{layout}->size;
1569 1643
1570 if (exists $self->{template}) { 1644 if (exists $self->{template}) {
1571 $self->{template}->set_font ($self->{font}) if $self->{font}; 1645 $self->{template}->set_font ($self->{font}) if $self->{font};
1646 $self->{template}->set_width ($self->{max_w} || -1);
1572 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1647 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1648
1574 my ($w2, $h2) = $self->{template}->size; 1649 my ($w2, $h2) = $self->{template}->size;
1575 1650
1576 $w = List::Util::max $w, $w2; 1651 $w = List::Util::max $w, $w2;
1577 $h = List::Util::max $h, $h2; 1652 $h = List::Util::max $h, $h2;
1653 }
1654
1655 [$w, $h]
1578 } 1656 };
1579 1657
1580 ($w, $h) 1658 @{ $self->{size_req} }
1581} 1659}
1582 1660
1661sub baseline_shift {
1662 $_[0]{layout}->descent
1663}
1664
1583sub size_allocate { 1665sub invoke_size_allocate {
1584 my ($self, $w, $h) = @_; 1666 my ($self, $w, $h) = @_;
1585 1667
1586 delete $self->{ox}; 1668 delete $self->{ox};
1587 1669
1588 delete $self->{texture} 1670 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1671 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1672
1673 1
1590} 1674}
1591 1675
1592sub set_fontsize { 1676sub set_fontsize {
1593 my ($self, $fontsize) = @_; 1677 my ($self, $fontsize) = @_;
1594 1678
1595 $self->{fontsize} = $fontsize; 1679 $self->{fontsize} = $fontsize;
1680 delete $self->{size_req};
1596 delete $self->{texture}; 1681 delete $self->{texture};
1597 1682
1598 $self->realloc; 1683 $self->realloc;
1599} 1684}
1600 1685
1686sub reconfigure {
1687 my ($self) = @_;
1688
1689 delete $self->{size_req};
1690 delete $self->{texture};
1691
1692 $self->SUPER::reconfigure;
1693}
1694
1601sub _draw { 1695sub _draw {
1602 my ($self) = @_; 1696 my ($self) = @_;
1603 1697
1604 $self->SUPER::_draw; # draw background, if applicable 1698 $self->SUPER::_draw; # draw background, if applicable
1605 1699
1606 my $tex = $self->{texture} ||= do { 1700 my $size = $self->{texture} ||= do {
1607 $self->{layout}->set_foreground (@{$self->{fg}}); 1701 $self->{layout}->set_foreground (@{$self->{fg}});
1608 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1702 $self->{layout}->set_font ($self->{font}) if $self->{font};
1609 $self->{layout}->set_width ($self->{w}); 1703 $self->{layout}->set_width ($self->{w});
1610 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1704 $self->{layout}->set_ellipsise ($self->{ellipsise});
1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1705 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1706 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1613 1707
1614 new_from_layout CFClient::Texture $self->{layout} 1708 [$self->{layout}->size]
1615 }; 1709 };
1616 1710
1617 unless (exists $self->{ox}) { 1711 unless (exists $self->{ox}) {
1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1712 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1713 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1620 : ($self->{w} - $tex->{w}) * 0.5); 1714 : ($self->{w} - $size->[0]) * 0.5);
1621 1715
1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1716 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1717 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1624 : ($self->{h} - $tex->{h}) * 0.5); 1718 : ($self->{h} - $size->[1]) * 0.5);
1625 }; 1719 };
1626 1720
1627 glEnable GL_TEXTURE_2D; 1721 my $w = List::Util::min $self->{w} + 4, $size->[0];
1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1722 my $h = List::Util::min $self->{h} + 2, $size->[1];
1629 1723
1630 if ($tex->{format} == GL_ALPHA) { 1724 $self->{layout}->render ($self->{ox}, $self->{oy});
1631 glColor @{$self->{fg}};
1632 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1633 } else {
1634 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1635 }
1636
1637 glDisable GL_TEXTURE_2D;
1638} 1725}
1639 1726
1640############################################################################# 1727#############################################################################
1641 1728
1642package CFClient::UI::EntryBase; 1729package CFClient::UI::EntryBase;
… …
1656 can_hover => 1, 1743 can_hover => 1,
1657 can_focus => 1, 1744 can_focus => 1,
1658 valign => 0, 1745 valign => 0,
1659 can_events => 1, 1746 can_events => 1,
1660 #text => ... 1747 #text => ...
1748 #hidden => "*",
1661 @_ 1749 @_
1662 ) 1750 )
1663} 1751}
1664 1752
1665sub _set_text { 1753sub _set_text {
… …
1667 1755
1668 delete $self->{cur_h}; 1756 delete $self->{cur_h};
1669 1757
1670 return if $self->{text} eq $text; 1758 return if $self->{text} eq $text;
1671 1759
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 1760 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 1761 $self->{text} = $text;
1676 1762
1677 $text =~ s/./*/g if $self->{hidden}; 1763 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 1764 $self->{layout}->set_text ("$text ");
1765 delete $self->{size_req};
1679 1766
1680 $self->_emit (changed => $self->{text}); 1767 $self->emit (changed => $self->{text});
1768
1769 $self->realloc;
1770 $self->update;
1681} 1771}
1682 1772
1683sub set_text { 1773sub set_text {
1684 my ($self, $text) = @_; 1774 my ($self, $text) = @_;
1685 1775
1686 $self->{cursor} = length $text; 1776 $self->{cursor} = length $text;
1687 $self->_set_text ($text); 1777 $self->_set_text ($text);
1688
1689 $self->realloc;
1690} 1778}
1691 1779
1692sub get_text { 1780sub get_text {
1693 $_[0]{text} 1781 $_[0]{text}
1694} 1782}
… …
1699 my ($w, $h) = $self->SUPER::size_request; 1787 my ($w, $h) = $self->SUPER::size_request;
1700 1788
1701 ($w + 1, $h) # add 1 for cursor 1789 ($w + 1, $h) # add 1 for cursor
1702} 1790}
1703 1791
1704sub key_down { 1792sub invoke_key_down {
1705 my ($self, $ev) = @_; 1793 my ($self, $ev) = @_;
1706 1794
1707 my $mod = $ev->{mod}; 1795 my $mod = $ev->{mod};
1708 my $sym = $ev->{sym}; 1796 my $sym = $ev->{sym};
1709 my $uni = $ev->{unicode}; 1797 my $uni = $ev->{unicode};
… …
1721 } elsif ($sym == CFClient::SDLK_HOME) { 1809 } elsif ($sym == CFClient::SDLK_HOME) {
1722 $self->{cursor} = 0; 1810 $self->{cursor} = 0;
1723 } elsif ($sym == CFClient::SDLK_END) { 1811 } elsif ($sym == CFClient::SDLK_END) {
1724 $self->{cursor} = length $text; 1812 $self->{cursor} = length $text;
1725 } elsif ($uni == 27) { 1813 } elsif ($uni == 27) {
1726 $self->_emit ('escape'); 1814 $self->emit ('escape');
1727 } elsif ($uni) { 1815 } elsif ($uni) {
1728 substr $text, $self->{cursor}++, 0, chr $uni; 1816 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else { 1817 } else {
1730 return 0; 1818 return 0;
1731 } 1819 }
… …
1735 $self->realloc; 1823 $self->realloc;
1736 1824
1737 1 1825 1
1738} 1826}
1739 1827
1740sub focus_in { 1828sub invoke_focus_in {
1741 my ($self) = @_; 1829 my ($self) = @_;
1742 1830
1743 $self->{last_activity} = $::NOW; 1831 $self->{last_activity} = $::NOW;
1744 1832
1745 $self->SUPER::focus_in; 1833 $self->SUPER::invoke_focus_in
1746} 1834}
1747 1835
1748sub button_down { 1836sub invoke_button_down {
1749 my ($self, $ev, $x, $y) = @_; 1837 my ($self, $ev, $x, $y) = @_;
1750 1838
1751 $self->SUPER::button_down ($ev, $x, $y); 1839 $self->SUPER::invoke_button_down ($ev, $x, $y);
1752 1840
1753 my $idx = $self->{layout}->xy_to_index ($x, $y); 1841 my $idx = $self->{layout}->xy_to_index ($x, $y);
1754 1842
1755 # byte-index to char-index 1843 # byte-index to char-index
1756 my $text = $self->{text}; 1844 my $text = $self->{text};
1757 utf8::encode $text; 1845 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1758 $self->{cursor} = length substr $text, 0, $idx; 1846 $self->{cursor} = length $text;
1759 1847
1760 $self->_set_text ($self->{text}); 1848 $self->_set_text ($self->{text});
1761 $self->update; 1849 $self->update;
1762 1850
1763 1 1851 1
1764} 1852}
1765 1853
1766sub mouse_motion { 1854sub invoke_mouse_motion {
1767 my ($self, $ev, $x, $y) = @_; 1855 my ($self, $ev, $x, $y) = @_;
1768# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1856# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769 1857
1770 0 1858 1
1771} 1859}
1772 1860
1773sub _draw { 1861sub _draw {
1774 my ($self) = @_; 1862 my ($self) = @_;
1775 1863
1776 local $self->{fg} = $self->{fg}; 1864 local $self->{fg} = $self->{fg};
1777 1865
1778 if ($FOCUS == $self) { 1866 if ($FOCUS == $self) {
1779 glColor @{$self->{active_bg}}; 1867 glColor_premultiply @{$self->{active_bg}};
1780 $self->{fg} = $self->{active_fg}; 1868 $self->{fg} = $self->{active_fg};
1781 } else { 1869 } else {
1782 glColor @{$self->{bg}}; 1870 glColor_premultiply @{$self->{bg}};
1783 } 1871 }
1784 1872
1785 glEnable GL_BLEND; 1873 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1874 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787 glBegin GL_QUADS; 1875 glBegin GL_QUADS;
1788 glVertex 0 , 0; 1876 glVertex 0 , 0;
1789 glVertex 0 , $self->{h}; 1877 glVertex 0 , $self->{h};
1790 glVertex $self->{w}, $self->{h}; 1878 glVertex $self->{w}, $self->{h};
1791 glVertex $self->{w}, 0; 1879 glVertex $self->{w}, 0;
… …
1816 1904
1817our @ISA = CFClient::UI::EntryBase::; 1905our @ISA = CFClient::UI::EntryBase::;
1818 1906
1819use CFClient::OpenGL; 1907use CFClient::OpenGL;
1820 1908
1821sub key_down { 1909sub invoke_key_down {
1822 my ($self, $ev) = @_; 1910 my ($self, $ev) = @_;
1823 1911
1824 my $sym = $ev->{sym}; 1912 my $sym = $ev->{sym};
1825 1913
1826 if ($sym == 13) { 1914 if ($sym == 13) {
1827 unshift @{$self->{history}}, 1915 unshift @{$self->{history}},
1828 my $txt = $self->get_text; 1916 my $txt = $self->get_text;
1917
1829 $self->{history_pointer} = -1; 1918 $self->{history_pointer} = -1;
1830 $self->{history_saveback} = ''; 1919 $self->{history_saveback} = '';
1831 $self->_emit (activate => $txt); 1920 $self->emit (activate => $txt);
1832 $self->update; 1921 $self->update;
1833 1922
1834 } elsif ($sym == CFClient::SDLK_UP) { 1923 } elsif ($sym == CFClient::SDLK_UP) {
1835 if ($self->{history_pointer} < 0) { 1924 if ($self->{history_pointer} < 0) {
1836 $self->{history_saveback} = $self->get_text; 1925 $self->{history_saveback} = $self->get_text;
… …
1852 } else { 1941 } else {
1853 $self->set_text ($self->{history_saveback}); 1942 $self->set_text ($self->{history_saveback});
1854 } 1943 }
1855 1944
1856 } else { 1945 } else {
1857 return $self->SUPER::key_down ($ev) 1946 return $self->SUPER::invoke_key_down ($ev)
1858 } 1947 }
1859 1948
1860 1 1949 1
1861} 1950}
1862 1951
… …
1886 can_events => 1, 1975 can_events => 1,
1887 @_ 1976 @_
1888 ) 1977 )
1889} 1978}
1890 1979
1891sub activate { }
1892
1893sub button_up { 1980sub invoke_button_up {
1894 my ($self, $ev, $x, $y) = @_; 1981 my ($self, $ev, $x, $y) = @_;
1895 1982
1896 $self->emit ("activate") 1983 $self->emit ("activate")
1897 if $x >= 0 && $x < $self->{w} 1984 if $x >= 0 && $x < $self->{w}
1898 && $y >= 0 && $y < $self->{h}; 1985 && $y >= 0 && $y < $self->{h};
… …
1901} 1988}
1902 1989
1903sub _draw { 1990sub _draw {
1904 my ($self) = @_; 1991 my ($self) = @_;
1905 1992
1906 local $self->{fg} = $self->{fg}; 1993 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1907
1908 if ($GRAB == $self) {
1909 $self->{fg} = $self->{active_fg};
1910 }
1911 1994
1912 glEnable GL_TEXTURE_2D; 1995 glEnable GL_TEXTURE_2D;
1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914 glColor 0, 0, 0, 1; 1997 glColor 0, 0, 0, 1;
1915 1998
1916 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1999 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1917 2000
1918 glDisable GL_TEXTURE_2D; 2001 glDisable GL_TEXTURE_2D;
1919 2002
1920 $self->SUPER::_draw; 2003 $self->SUPER::_draw;
2004}
2005
2006#############################################################################
2007
2008package CFClient::UI::ImageButton;
2009
2010our @ISA = CFClient::UI::Image::;
2011
2012use CFClient::OpenGL;
2013
2014my %textures;
2015
2016sub new {
2017 my $class = shift;
2018
2019 my $self = $class->SUPER::new (
2020 padding_x => 4,
2021 padding_y => 4,
2022 fg => [1, 1, 1],
2023 active_fg => [0, 0, 1],
2024 can_hover => 1,
2025 align => 0,
2026 valign => 0,
2027 can_events => 1,
2028 @_
2029 );
2030}
2031
2032sub invoke_button_up {
2033 my ($self, $ev, $x, $y) = @_;
2034
2035 $self->emit ("activate")
2036 if $x >= 0 && $x < $self->{w}
2037 && $y >= 0 && $y < $self->{h};
2038
2039 1
1921} 2040}
1922 2041
1923############################################################################# 2042#############################################################################
1924 2043
1925package CFClient::UI::CheckBox; 2044package CFClient::UI::CheckBox;
… …
1952 my ($self) = @_; 2071 my ($self) = @_;
1953 2072
1954 (6) x 2 2073 (6) x 2
1955} 2074}
1956 2075
2076sub toggle {
2077 my ($self) = @_;
2078
2079 $self->{state} = !$self->{state};
2080 $self->emit (changed => $self->{state});
2081 $self->update;
2082}
2083
1957sub button_down { 2084sub invoke_button_down {
1958 my ($self, $ev, $x, $y) = @_; 2085 my ($self, $ev, $x, $y) = @_;
1959 2086
1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2087 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2088 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1962 $self->{state} = !$self->{state}; 2089 $self->toggle;
1963 $self->_emit (changed => $self->{state});
1964 } else { 2090 } else {
1965 return 0 2091 return 0
1966 } 2092 }
1967 2093
1968 1 2094 1
… …
1993package CFClient::UI::Image; 2119package CFClient::UI::Image;
1994 2120
1995our @ISA = CFClient::UI::Base::; 2121our @ISA = CFClient::UI::Base::;
1996 2122
1997use CFClient::OpenGL; 2123use CFClient::OpenGL;
1998use Carp qw/confess/;
1999 2124
2000our %loaded_images; 2125our %texture_cache;
2001 2126
2002sub new { 2127sub new {
2003 my $class = shift; 2128 my $class = shift;
2004 2129
2005 my $self = $class->SUPER::new (can_events => 0, @_); 2130 my $self = $class->SUPER::new (
2131 can_events => 0,
2132 @_,
2133 );
2006 2134
2007 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2135 $self->{path} || $self->{tex}
2136 or Carp::croak "'path' or 'tex' attributes required";
2008 2137
2009 $loaded_images{$self->{image}} ||= 2138 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2010 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2139 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2011 2140
2012 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2141 Scalar::Util::weaken $texture_cache{$self->{path}};
2013 2142
2014 Scalar::Util::weaken $loaded_images{$self->{image}}; 2143 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2015
2016 $self->{aspect} = $tex->{w} / $tex->{h};
2017 2144
2018 $self 2145 $self
2019} 2146}
2020 2147
2021sub size_request { 2148sub size_request {
2022 my ($self) = @_; 2149 my ($self) = @_;
2023 2150
2024 ($self->{tex}->{w}, $self->{tex}->{h}) 2151 ($self->{tex}{w}, $self->{tex}{h})
2025} 2152}
2026 2153
2027sub _draw { 2154sub _draw {
2028 my ($self) = @_; 2155 my ($self) = @_;
2029 2156
… …
2138 my $ycut1 = max 0, min 1, $ycut; 2265 my $ycut1 = max 0, min 1, $ycut;
2139 my $ycut2 = max 0, min 1, $ycut - 1; 2266 my $ycut2 = max 0, min 1, $ycut - 1;
2140 2267
2141 my $h1 = $self->{h} * (1 - $ycut1); 2268 my $h1 = $self->{h} * (1 - $ycut1);
2142 my $h2 = $self->{h} * (1 - $ycut2); 2269 my $h2 = $self->{h} * (1 - $ycut2);
2270 my $h3 = $self->{h};
2271
2272 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2143 2273
2144 glEnable GL_BLEND; 2274 glEnable GL_BLEND;
2145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2275 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2276 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2146 glEnable GL_TEXTURE_2D; 2277 glEnable GL_TEXTURE_2D;
2147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2278 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2148 2279
2149 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2280 glBindTexture GL_TEXTURE_2D, $t1->{name};
2150 glBegin GL_QUADS; 2281 glBegin GL_QUADS;
… …
2165 2296
2166 if ($t3) { 2297 if ($t3) {
2167 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2298 glBindTexture GL_TEXTURE_2D, $t3->{name};
2168 glBegin GL_QUADS; 2299 glBegin GL_QUADS;
2169 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2300 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2170 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2301 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2171 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2302 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2172 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2303 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2173 glEnd; 2304 glEnd;
2174 } 2305 }
2175 2306
2176 glDisable GL_BLEND; 2307 glDisable GL_BLEND;
… …
2264 $self->update; 2395 $self->update;
2265 2396
2266 $self 2397 $self
2267} 2398}
2268 2399
2269sub changed { }
2270
2271sub set_range { 2400sub set_range {
2272 my ($self, $range) = @_; 2401 my ($self, $range) = @_;
2273 2402
2274 ($range, $self->{range}) = ($self->{range}, $range); 2403 ($range, $self->{range}) = ($self->{range}, $range);
2275 2404
2276 $self->update
2277 if "@$range" ne "@{$self->{range}}"; 2405 if ("@$range" ne "@{$self->{range}}") {
2406 $self->update;
2407 $self->set_value ($self->{range}[0]);
2408 }
2278} 2409}
2279 2410
2280sub set_value { 2411sub set_value {
2281 my ($self, $value) = @_; 2412 my ($self, $value) = @_;
2282 2413
… …
2293 if $unit; 2424 if $unit;
2294 2425
2295 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2426 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2296 2427
2297 if ($value != $old_value) { 2428 if ($value != $old_value) {
2298 $self->_emit (changed => $value); 2429 $self->emit (changed => $value);
2299 $self->update; 2430 $self->update;
2300 } 2431 }
2301} 2432}
2302 2433
2303sub size_request { 2434sub size_request {
2304 my ($self) = @_; 2435 my ($self) = @_;
2305 2436
2306 ($self->{req_w}, $self->{req_h}) 2437 ($self->{req_w}, $self->{req_h})
2307} 2438}
2308 2439
2309sub button_down { 2440sub invoke_button_down {
2310 my ($self, $ev, $x, $y) = @_; 2441 my ($self, $ev, $x, $y) = @_;
2311 2442
2312 $self->SUPER::button_down ($ev, $x, $y); 2443 $self->SUPER::invoke_button_down ($ev, $x, $y);
2313 2444
2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2445 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2315 2446
2316 $self->mouse_motion ($ev, $x, $y) 2447 $self->invoke_mouse_motion ($ev, $x, $y)
2317} 2448}
2318 2449
2319sub mouse_motion { 2450sub invoke_mouse_motion {
2320 my ($self, $ev, $x, $y) = @_; 2451 my ($self, $ev, $x, $y) = @_;
2321 2452
2322 if ($GRAB == $self) { 2453 if ($GRAB == $self) {
2323 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2454 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2324 2455
… …
2335} 2466}
2336 2467
2337sub update { 2468sub update {
2338 my ($self) = @_; 2469 my ($self) = @_;
2339 2470
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2471 delete $self->{knob_w};
2472 $self->SUPER::update;
2473}
2474
2475sub _draw {
2476 my ($self) = @_;
2477
2478 unless ($self->{knob_w}) {
2341 $self->set_value ($self->{range}[0]); 2479 $self->set_value ($self->{range}[0]);
2342 2480
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2481 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2482 my $range = ($hi - $page - $lo) || 1e-100;
2345 2483
… …
2351 $value = ($value - $lo) / $range; 2489 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2490 $value = $value * $self->{scale} + $self->{offset};
2353 2491
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2492 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2493 $self->{knob_w} = $knob_w;
2356 }); 2494 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2495
2364 $self->SUPER::_draw (); 2496 $self->SUPER::_draw ();
2365 2497
2366 glScale $self->{w}, $self->{h}; 2498 glScale $self->{w}, $self->{h};
2367 2499
… …
2428sub set_range { shift->{slider}->set_range (@_) } 2560sub set_range { shift->{slider}->set_range (@_) }
2429sub set_value { shift->{slider}->set_value (@_) } 2561sub set_value { shift->{slider}->set_value (@_) }
2430 2562
2431############################################################################# 2563#############################################################################
2432 2564
2433package CFClient::UI::TextView; 2565package CFClient::UI::TextScroller;
2434 2566
2435our @ISA = CFClient::UI::HBox::; 2567our @ISA = CFClient::UI::HBox::;
2436 2568
2437use CFClient::OpenGL; 2569use CFClient::OpenGL;
2438 2570
… …
2440 my $class = shift; 2572 my $class = shift;
2441 2573
2442 my $self = $class->SUPER::new ( 2574 my $self = $class->SUPER::new (
2443 fontsize => 1, 2575 fontsize => 1,
2444 can_events => 0, 2576 can_events => 0,
2577 indent => 0,
2445 #font => default_font 2578 #font => default_font
2446 @_, 2579 @_,
2447 2580
2448 layout => (new CFClient::Layout 1), 2581 layout => (new CFClient::Layout),
2449 par => [], 2582 par => [],
2450 height => 0, 2583 height => 0,
2451 children => [ 2584 children => [
2452 (new CFClient::UI::Empty expand => 1), 2585 (new CFClient::UI::Empty expand => 1),
2453 (new CFClient::UI::Slider vertical => 1), 2586 (new CFClient::UI::Slider vertical => 1),
… …
2464 2597
2465 $self->{fontsize} = $fontsize; 2598 $self->{fontsize} = $fontsize;
2466 $self->reflow; 2599 $self->reflow;
2467} 2600}
2468 2601
2602sub size_request {
2603 my ($self) = @_;
2604
2605 my ($empty, $slider) = @{ $self->{children} };
2606
2607 local $self->{children} = [$empty, $slider];
2608 $self->SUPER::size_request
2609}
2610
2469sub size_allocate { 2611sub invoke_size_allocate {
2470 my ($self, $w, $h) = @_; 2612 my ($self, $w, $h) = @_;
2471 2613
2472 $self->SUPER::size_allocate ($w, $h); 2614 my ($empty, $slider, @other) = @{ $self->{children} };
2615 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2473 2616
2474 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2617 $self->{layout}->set_font ($self->{font}) if $self->{font};
2475 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2476 $self->{layout}->set_width ($self->{children}[0]{w}); 2619 $self->{layout}->set_width ($empty->{w});
2620 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2477 2621
2478 $self->reflow; 2622 $self->reflow;
2479}
2480 2623
2481sub text_size { 2624 local $self->{children} = [$empty, $slider];
2482 my ($self, $text, $indent) = @_; 2625 $self->SUPER::invoke_size_allocate ($w, $h)
2626}
2627
2628sub get_layout {
2629 my ($self, $para) = @_;
2483 2630
2484 my $layout = $self->{layout}; 2631 my $layout = $self->{layout};
2485 2632
2633 $layout->set_font ($self->{font}) if $self->{font};
2634 $layout->set_foreground (@{$para->{fg}});
2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2635 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $layout->set_width ($self->{children}[0]{w} - $indent); 2636 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2637 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488 $layout->set_markup ($text); 2638 $layout->set_markup ($para->{markup});
2639
2640 $layout->set_shapes (
2641 map
2642 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2643 @{$para->{widget}}
2489 2644 );
2645
2490 $layout->size 2646 $layout
2491} 2647}
2492 2648
2493sub reflow { 2649sub reflow {
2494 my ($self) = @_; 2650 my ($self) = @_;
2495 2651
… …
2504 $self->{children}[1]->set_value ($offset); 2660 $self->{children}[1]->set_value ($offset);
2505} 2661}
2506 2662
2507sub clear { 2663sub clear {
2508 my ($self) = @_; 2664 my ($self) = @_;
2665
2666 my (undef, undef, @other) = @{ $self->{children} };
2667 $self->remove ($_) for @other;
2509 2668
2510 $self->{par} = []; 2669 $self->{par} = [];
2511 $self->{height} = 0; 2670 $self->{height} = 0;
2512 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2671 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2513} 2672}
2514 2673
2515sub add_paragraph { 2674sub add_paragraph {
2516 my ($self, $color, $text, $indent) = @_; 2675 my ($self, $color, $para, $indent) = @_;
2517 2676
2518 for my $line (split /\n/, $text) { 2677 my ($text, @w) = ref $para ? @$para : $para;
2519 my ($w, $h) = $self->text_size ($line); 2678
2520 $self->{height} += $h; 2679 $para = {
2521 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2680 w => 1e10,
2681 wrapped => 1,
2682 fg => $color,
2683 indent => $indent,
2684 markup => $text,
2685 widget => \@w,
2522 } 2686 };
2523 2687
2524 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2688 $self->add (@w) if @w;
2689 push @{$self->{par}}, $para;
2690
2691 $self->{need_reflow}++;
2692 $self->update;
2693}
2694
2695sub scroll_to_bottom {
2696 my ($self) = @_;
2697
2698 $self->{scroll_to_bottom} = 1;
2699 $self->update;
2525} 2700}
2526 2701
2527sub update { 2702sub update {
2528 my ($self) = @_; 2703 my ($self) = @_;
2529 2704
… …
2531 2706
2532 return unless $self->{h} > 0; 2707 return unless $self->{h} > 0;
2533 2708
2534 delete $self->{texture}; 2709 delete $self->{texture};
2535 2710
2536 $ROOT->on_post_alloc ($self, sub { 2711 $ROOT->on_post_alloc ($self => sub {
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2712 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538 2713
2539 if (delete $self->{need_reflow}) { 2714 if (delete $self->{need_reflow}) {
2540 my $height = 0; 2715 my $height = 0;
2541 2716
2542 my $layout = $self->{layout};
2543
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545
2546 for (@{$self->{par}}) { 2717 for my $para (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2718 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2548 $layout->set_width ($W - $_->[3]); 2719 my $layout = $self->get_layout ($para);
2549 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size; 2720 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3]; 2721
2552 $_->[1] = $h; 2722 $para->{w} = $w + $para->{indent};
2723 $para->{h} = $h;
2724 $para->{wrapped} = $layout->has_wrapped;
2553 } 2725 }
2554 2726
2555 $height += $_->[1]; 2727 $height += $para->{h};
2556 } 2728 }
2557 2729
2558 $self->{height} = $height; 2730 $self->{height} = $height;
2559 2731
2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2732 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2561 2733
2562 delete $self->{texture}; 2734 delete $self->{texture};
2563 } 2735 }
2564 2736
2737 if (delete $self->{scroll_to_bottom}) {
2738 $self->{children}[1]->set_value (1e10);
2739 }
2740
2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2741 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2566 glClearColor 0.5, 0.5, 0.5, 0; 2742 glClearColor 0, 0, 0, 0;
2567 glClear GL_COLOR_BUFFER_BIT; 2743 glClear GL_COLOR_BUFFER_BIT;
2568 2744
2569 my $top = int $self->{children}[1]{range}[0]; 2745 my $top = int $self->{children}[1]{range}[0];
2570 2746
2571 my $y0 = $top; 2747 my $y0 = $top;
2572 my $y1 = $top + $H; 2748 my $y1 = $top + $H;
2573 2749
2574 my $y = 0; 2750 my $y = 0;
2575 2751
2576 my $layout = $self->{layout};
2577
2578 $layout->set_font ($self->{font}) if $self->{font};
2579
2580 glEnable GL_BLEND;
2581 #TODO# not correct in windows where rgba is forced off
2582 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2583
2584 for my $par (@{$self->{par}}) { 2752 for my $para (@{$self->{par}}) {
2585 my $h = $par->[1]; 2753 my $h = $para->{h};
2586 2754
2587 if ($y0 < $y + $h && $y < $y1) { 2755 if ($y0 < $y + $h && $y < $y1) {
2588 $layout->set_foreground (@{ $par->[2] });
2589 $layout->set_width ($W - $par->[3]);
2590 $layout->set_markup ($par->[4]);
2591 2756
2592 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2757 my $layout = $self->get_layout ($para);
2593 2758
2594 glRasterPos $par->[3], $y - $y0; 2759 $layout->render ($para->{indent}, $y - $y0);
2595 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2760
2761 if (my @w = @{ $para->{widget} }) {
2762 my @s = $layout->get_shapes;
2763
2764 for (@w) {
2765 my ($dx, $dy) = splice @s, 0, 2, ();
2766
2767 $_->{x} = $dx + $para->{indent};
2768 $_->{y} = $dy + $y - $y0;
2769
2770 $_->draw;
2771 }
2772 }
2596 } 2773 }
2597 2774
2598 $y += $h; 2775 $y += $h;
2599 } 2776 }
2600
2601 glDisable GL_BLEND;
2602 }; 2777 };
2603 }); 2778 });
2604} 2779}
2605 2780
2781sub reconfigure {
2782 my ($self) = @_;
2783
2784 $self->SUPER::reconfigure;
2785
2786 $_->{w} = 1e10 for @{ $self->{par} };
2787 $self->reflow;
2788}
2789
2606sub _draw { 2790sub _draw {
2607 my ($self) = @_; 2791 my ($self) = @_;
2608 2792
2609 glEnable GL_TEXTURE_2D; 2793 glEnable GL_TEXTURE_2D;
2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2794 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611 glColor 1, 1, 1, 1; 2795 glColor 0, 0, 0, 1;
2612 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2796 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2613 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
2614 2798
2615 $self->{children}[1]->draw; 2799 $self->{children}[1]->draw;
2616
2617} 2800}
2618 2801
2619############################################################################# 2802#############################################################################
2620 2803
2621package CFClient::UI::Animator; 2804package CFClient::UI::Animator;
… …
2708 $tooltip .= "\n\n" . (ref $widget) . "\n" 2891 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2892 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n" 2893 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}"; 2894 . "visible $widget->{visible}";
2712 } 2895 }
2896
2897 $tooltip =~ s/^\n+//;
2898 $tooltip =~ s/\n+$//;
2713 2899
2714 $self->add (new CFClient::UI::Label 2900 $self->add (new CFClient::UI::Label
2715 markup => $tooltip, 2901 markup => $tooltip,
2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2902 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2717 fontsize => 0.8, 2903 fontsize => 0.8,
… …
2727 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2913 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2728 2914
2729 ($w + 4, $h + 4) 2915 ($w + 4, $h + 4)
2730} 2916}
2731 2917
2732sub size_allocate { 2918sub invoke_size_allocate {
2733 my ($self, $w, $h) = @_; 2919 my ($self, $w, $h) = @_;
2734 2920
2735 $self->SUPER::size_allocate ($w - 4, $h - 4); 2921 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2736} 2922}
2737 2923
2738sub visibility_change { 2924sub invoke_visibility_change {
2739 my ($self, $visible) = @_; 2925 my ($self, $visible) = @_;
2740 2926
2741 return unless $visible; 2927 return unless $visible;
2742 2928
2743 $self->{root}->on_post_alloc ("move_$self" => sub { 2929 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2745 or return; 2931 or return;
2746 2932
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2933 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748 2934
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2935 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH; 2936 if $x + $self->{w} > $self->{root}{w};
2751 2937
2752 $self->move_abs ($x, $y); 2938 $self->move_abs ($x, $y);
2753 }); 2939 });
2754} 2940}
2755 2941
… …
2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3030 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2845 3031
2846 if ($tex) { 3032 if ($tex) {
2847 glEnable GL_TEXTURE_2D; 3033 glEnable GL_TEXTURE_2D;
2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3034 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849 glColor 1, 1, 1, 1; 3035 glColor 0, 0, 0, 1;
2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3036 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851 glDisable GL_TEXTURE_2D; 3037 glDisable GL_TEXTURE_2D;
2852 } 3038 }
2853} 3039}
2854 3040
2855sub DESTROY { 3041sub destroy {
2856 my ($self) = @_; 3042 my ($self) = @_;
2857 3043
2858 $self->{timer}->cancel 3044 $self->{timer}->cancel
2859 if $self->{timer}; 3045 if $self->{timer};
2860 3046
2861 $self->SUPER::DESTROY; 3047 $self->SUPER::destroy;
2862} 3048}
2863 3049
2864############################################################################# 3050#############################################################################
2865 3051
2866package CFClient::UI::Buttonbar; 3052package CFClient::UI::Buttonbar;
… …
2887 ); 3073 );
2888 3074
2889 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3075 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2890 3076
2891 for my $item (@{ $self->{items} }) { 3077 for my $item (@{ $self->{items} }) {
2892 my ($widget, $cb) = @$item; 3078 my ($widget, $cb, $tooltip) = @$item;
2893 3079
2894 # handle various types of items, only text for now 3080 # handle various types of items, only text for now
2895 if (!ref $widget) { 3081 if (!ref $widget) {
3082 if ($widget =~ /\t/) {
3083 my ($left, $right) = split /\t/, $widget, 2;
3084
3085 $widget = new CFClient::UI::HBox
3086 can_hover => 1,
3087 can_events => 1,
3088 tooltip => $tooltip,
3089 children => [
3090 (new CFClient::UI::Label markup => $left, expand => 1),
3091 (new CFClient::UI::Label markup => $right, align => +1),
3092 ],
3093 ;
3094
3095 } else {
2896 $widget = new CFClient::UI::Label 3096 $widget = new CFClient::UI::Label
2897 can_hover => 1, 3097 can_hover => 1,
2898 can_events => 1, 3098 can_events => 1,
2899 text => $widget; 3099 markup => $widget,
3100 tooltip => $tooltip;
3101 }
2900 } 3102 }
2901 3103
2902 $self->{item}{$widget} = $item; 3104 $self->{item}{$widget} = $item;
2903 3105
2904 $self->{vbox}->add ($widget); 3106 $self->{vbox}->add ($widget);
… …
2909 3111
2910# popup given the event (must be a mouse button down event currently) 3112# popup given the event (must be a mouse button down event currently)
2911sub popup { 3113sub popup {
2912 my ($self, $ev) = @_; 3114 my ($self, $ev) = @_;
2913 3115
2914 $self->_emit ("popdown"); 3116 $self->emit ("popdown");
2915 3117
2916 # maybe save $GRAB? must be careful about events... 3118 # maybe save $GRAB? must be careful about events...
2917 $GRAB = $self; 3119 $GRAB = $self;
2918 $self->{button} = $ev->{button}; 3120 $self->{button} = $ev->{button};
2919 3121
2920 $self->show; 3122 $self->show;
2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3123 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2922} 3124}
2923 3125
2924sub mouse_motion { 3126sub invoke_mouse_motion {
2925 my ($self, $ev, $x, $y) = @_; 3127 my ($self, $ev, $x, $y) = @_;
2926 3128
2927 # TODO: should use vbox->find_widget or so 3129 # TODO: should use vbox->find_widget or so
2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3130 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2929 $self->{hover} = $self->{item}{$HOVER}; 3131 $self->{hover} = $self->{item}{$HOVER};
2930 3132
2931 0 3133 0
2932} 3134}
2933 3135
2934sub button_up { 3136sub invoke_button_up {
2935 my ($self, $ev, $x, $y) = @_; 3137 my ($self, $ev, $x, $y) = @_;
2936 3138
2937 if ($ev->{button} == $self->{button}) { 3139 if ($ev->{button} == $self->{button}) {
2938 undef $GRAB; 3140 undef $GRAB;
2939 $self->hide; 3141 $self->hide;
2940 3142
2941 $self->_emit ("popdown"); 3143 $self->emit ("popdown");
2942 $self->{hover}[1]->() if $self->{hover}; 3144 $self->{hover}[1]->() if $self->{hover};
2943 } else { 3145 } else {
2944 return 0 3146 return 0
2945 } 3147 }
2946 3148
… …
2973 3175
2974 $self->{current} = $self->{children}[0] 3176 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} }; 3177 if @{ $self->{children} };
2976} 3178}
2977 3179
3180sub get_current_page {
3181 my ($self) = @_;
3182
3183 $self->{current}
3184}
3185
2978sub set_current_page { 3186sub set_current_page {
2979 my ($self, $page_or_widget) = @_; 3187 my ($self, $page_or_widget) = @_;
2980 3188
2981 my $widget = ref $page_or_widget 3189 my $widget = ref $page_or_widget
2982 ? $page_or_widget 3190 ? $page_or_widget
2983 : $self->{children}[$page_or_widget]; 3191 : $self->{children}[$page_or_widget];
2984 3192
2985 $self->{current} = $widget; 3193 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3194 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987 3195
2988 $self->_emit (page_changed => $self->{current}); 3196 $self->emit (page_changed => $self->{current});
2989 3197
2990 $self->realloc; 3198 $self->realloc;
2991} 3199}
2992 3200
2993sub visible_children { 3201sub visible_children {
… …
2998 my ($self) = @_; 3206 my ($self) = @_;
2999 3207
3000 $self->{current}->size_request 3208 $self->{current}->size_request
3001} 3209}
3002 3210
3003sub size_allocate { 3211sub invoke_size_allocate {
3004 my ($self, $w, $h) = @_; 3212 my ($self, $w, $h) = @_;
3005 3213
3006 $self->{current}->configure (0, 0, $w, $h); 3214 $self->{current}->configure (0, 0, $w, $h);
3215
3216 1
3007} 3217}
3008 3218
3009sub _draw { 3219sub _draw {
3010 my ($self) = @_; 3220 my ($self) = @_;
3011 3221
… …
3022 my $class = shift; 3232 my $class = shift;
3023 3233
3024 my $self = $class->SUPER::new ( 3234 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3235 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3236 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3237 # filter => # will be put between multiplexer and $self
3027 @_, 3238 @_,
3028 ); 3239 );
3029 3240
3241 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3242 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3243
3032 $self 3244 $self
3033} 3245}
3034 3246
3035sub add { 3247sub add {
… …
3044 ); 3256 );
3045 3257
3046 $self->{multiplexer}->add ($widget); 3258 $self->{multiplexer}->add ($widget);
3047} 3259}
3048 3260
3261sub get_current_page {
3262 my ($self) = @_;
3263
3264 $self->{multiplexer}->get_current_page
3265}
3266
3049sub set_current_page { 3267sub set_current_page {
3050 my ($self, $page) = @_; 3268 my ($self, $page) = @_;
3051 3269
3052 $self->{multiplexer}->set_current_page ($page); 3270 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current}); 3271 $self->emit (page_changed => $self->{multiplexer}{current});
3054} 3272}
3055 3273
3056############################################################################# 3274#############################################################################
3057 3275
3058package CFClient::UI::Statusbox; 3276package CFClient::UI::Combobox;
3059 3277
3278use utf8;
3279
3060our @ISA = CFClient::UI::VBox::; 3280our @ISA = CFClient::UI::Button::;
3061 3281
3062sub new { 3282sub new {
3063 my $class = shift; 3283 my $class = shift;
3064 3284
3065 $class->SUPER::new ( 3285 my $self = $class->SUPER::new (
3286 options => [], # [value, title, longdesc], ...
3287 value => undef,
3288 @_,
3289 );
3290
3291 $self->_set_value ($self->{value});
3292
3293 $self
3294}
3295
3296sub invoke_button_down {
3297 my ($self, $ev) = @_;
3298
3299 my @menu_items;
3300
3301 for (@{ $self->{options} }) {
3302 my ($value, $title, $tooltip) = @$_;
3303
3304 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3305 }
3306
3307 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3308}
3309
3310sub _set_value {
3311 my ($self, $value) = @_;
3312
3313 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3314 or return;
3315
3316 $self->{value} = $item->[0];
3317 $self->set_markup ("$item->[1] ⇓");
3318 $self->set_tooltip ($item->[2]);
3319}
3320
3321sub set_value {
3322 my ($self, $value) = @_;
3323
3324 return unless $self->{value} ne $value;
3325
3326 $self->_set_value ($value);
3327 $self->emit (changed => $value);
3328}
3329
3330#############################################################################
3331
3332package CFClient::UI::Statusbox;
3333
3334our @ISA = CFClient::UI::VBox::;
3335
3336sub new {
3337 my $class = shift;
3338
3339 my $self = $class->SUPER::new (
3066 fontsize => 0.8, 3340 fontsize => 0.8,
3067 @_, 3341 @_,
3068 ) 3342 );
3343
3344 Scalar::Util::weaken (my $this = $self);
3345
3346 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3347
3348 $self
3069} 3349}
3070 3350
3071sub reorder { 3351sub reorder {
3072 my ($self) = @_; 3352 my ($self) = @_;
3073 my $NOW = time; 3353 my $NOW = Time::HiRes::time;
3354
3355 # freeze display when hovering over any label
3356 return if $CFClient::UI::TOOLTIP->{owner}
3357 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3358 values %{ $self->{item} };
3074 3359
3075 while (my ($k, $v) = each %{ $self->{item} }) { 3360 while (my ($k, $v) = each %{ $self->{item} }) {
3076 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3361 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077 } 3362 }
3078 3363
… …
3081 my @items = sort { 3366 my @items = sort {
3082 $a->{pri} <=> $b->{pri} 3367 $a->{pri} <=> $b->{pri}
3083 or $b->{id} <=> $a->{id} 3368 or $b->{id} <=> $a->{id}
3084 } values %{ $self->{item} }; 3369 } values %{ $self->{item} };
3085 3370
3371 $self->{timer}->interval (1);
3372
3086 my $count = 10 + 1; 3373 my $count = 10 + 1;
3087 for my $item (@items) { 3374 for my $item (@items) {
3088 last unless --$count; 3375 last unless --$count;
3089 3376
3090 push @widgets, $item->{label} ||= do { 3377 my $label = $item->{label} ||= do {
3091 # TODO: doesn't handle markup well (read as: at all) 3378 # TODO: doesn't handle markup well (read as: at all)
3092 my $short = $item->{count} > 1 3379 my $short = $item->{count} > 1
3093 ? "<b>$item->{count} ×</b> $item->{text}" 3380 ? "<b>$item->{count} ×</b> $item->{text}"
3094 : $item->{text}; 3381 : $item->{text};
3095 3382
… …
3103 tooltip => $item->{tooltip}, 3390 tooltip => $item->{tooltip},
3104 tooltip_font => $::FONT_PROP, 3391 tooltip_font => $::FONT_PROP,
3105 tooltip_width => 0.67, 3392 tooltip_width => 0.67,
3106 fontsize => $item->{fontsize} || $self->{fontsize}, 3393 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44, 3394 max_w => $::WIDTH * 0.44,
3108 fg => $item->{fg}, 3395 fg => [@{ $item->{fg} }],
3109 can_events => 1, 3396 can_events => 1,
3110 can_hover => 1 3397 can_hover => 1
3111 }; 3398 };
3399
3400 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3401 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3402 $label->update;
3403 $label->set_max_size (undef, $label->{req_h} * $diff)
3404 if $diff < 1;
3405 $self->{timer}->interval (1/30);
3406 } else {
3407 $label->{fg}[3] = $item->{fg}[3] || 1;
3408 }
3409
3410 push @widgets, $label;
3112 } 3411 }
3113 3412
3114 $self->clear; 3413 $self->clear;
3115 $self->SUPER::add (reverse @widgets); 3414 $self->SUPER::add (reverse @widgets);
3116} 3415}
… …
3121 $text =~ s/^\s+//; 3420 $text =~ s/^\s+//;
3122 $text =~ s/\s+$//; 3421 $text =~ s/\s+$//;
3123 3422
3124 return unless $text; 3423 return unless $text;
3125 3424
3126 my $timeout = time + ((delete $arg{timeout}) || 60); 3425 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3127 3426
3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3427 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129 3428
3130 if (my $item = $self->{item}{$group}) { 3429 if (my $item = $self->{item}{$group}) {
3131 if ($item->{text} eq $text) { 3430 if ($item->{text} eq $text) {
3132 $item->{count}++; 3431 $item->{count}++;
3133 } else { 3432 } else {
3134 $item->{count} = 1; 3433 $item->{count} = 1;
3135 $item->{text} = $item->{tooltip} = $text; 3434 $item->{text} = $item->{tooltip} = $text;
3136 } 3435 }
3137 $item->{id} = ++$self->{id}; 3436 $item->{id} += 0.2;#d#
3138 $item->{timeout} = $timeout; 3437 $item->{timeout} = $timeout;
3139 delete $item->{label}; 3438 delete $item->{label};
3140 } else { 3439 } else {
3141 $self->{item}{$group} = { 3440 $self->{item}{$group} = {
3142 id => ++$self->{id}, 3441 id => ++$self->{id},
… …
3148 count => 1, 3447 count => 1,
3149 %arg, 3448 %arg,
3150 }; 3449 };
3151 } 3450 }
3152 3451
3452 $ROOT->on_refresh (reorder => sub {
3153 $self->reorder; 3453 $self->reorder;
3454 });
3154} 3455}
3155 3456
3156sub reconfigure { 3457sub reconfigure {
3157 my ($self) = @_; 3458 my ($self) = @_;
3158 3459
… …
3161 3462
3162 $self->reorder; 3463 $self->reorder;
3163 $self->SUPER::reconfigure; 3464 $self->SUPER::reconfigure;
3164} 3465}
3165 3466
3467sub destroy {
3468 my ($self) = @_;
3469
3470 $self->{timer}->cancel;
3471
3472 $self->SUPER::destroy;
3473}
3474
3166############################################################################# 3475#############################################################################
3167 3476
3168package CFClient::UI::Inventory; 3477package CFClient::UI::Inventory;
3169 3478
3170our @ISA = CFClient::UI::ScrolledWindow::; 3479our @ISA = CFClient::UI::Table::;
3171 3480
3172sub new { 3481sub new {
3173 my $class = shift; 3482 my $class = shift;
3174 3483
3175 my $self = $class->SUPER::new ( 3484 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3485 col_expand => [0, 1, 0],
3177 @_, 3486 @_,
3178 ); 3487 );
3179 3488
3180 $self 3489 $self
3181} 3490}
3182 3491
3183sub set_items { 3492sub set_items {
3184 my ($self, $items) = @_; 3493 my ($self, $items) = @_;
3185 3494
3186 $self->{scrolled}->clear; 3495 $self->clear;
3187 return unless $items; 3496 return unless $items;
3188 3497
3189 my @items = sort { 3498 my @items = sort {
3190 ($a->{type} <=> $b->{type}) 3499 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name}) 3500 or ($a->{name} cmp $b->{name})
3192 } @$items; 3501 } values %$items;
3193 3502
3194 $self->{real_items} = \@items; 3503 $self->{real_items} = \@items;
3195 3504
3196 my $row = 0; 3505 my $row = 0;
3197 for my $item (@items) { 3506 for my $item (@items) {
3198 CFClient::Item::update_widgets $item; 3507 CFClient::Item::update_widgets $item;
3199 3508
3200 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3509 $self->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3510 $self->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3511 $self->add (2, $row, $item->{weight_widget});
3203 3512
3204 $row++; 3513 $row++;
3205 } 3514 }
3206} 3515}
3207 3516
3208############################################################################# 3517#############################################################################
3209 3518
3210package CFClient::UI::BindEditor;
3211
3212our @ISA = CFClient::UI::FancyFrame::;
3213
3214sub new {
3215 my $class = shift;
3216
3217 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3218
3219 $self->add (my $vb = new CFClient::UI::VBox);
3220
3221
3222 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3223 text => "start recording",
3224 tooltip => "Start/Stops recording of actions."
3225 ."All subsequent actions after the recording started will be captured."
3226 ."The actions are displayed after the record was stopped."
3227 ."To bind the action you have to click on the 'Bind' button",
3228 on_activate => sub {
3229 unless ($self->{recording}) {
3230 $self->start;
3231 } else {
3232 $self->stop;
3233 }
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3238
3239 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3240 $vb->add (my $hb = new CFClient::UI::HBox);
3241 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3242 $hb->add (new CFClient::UI::Button
3243 text => "bind",
3244 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3245 on_activate => sub {
3246 $self->ask_for_bind;
3247 });
3248
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add (new CFClient::UI::Button
3251 text => "ok",
3252 expand => 1,
3253 tooltip => "This closes the binding editor and saves the binding",
3254 on_activate => sub {
3255 $self->hide;
3256 $self->commit;
3257 });
3258
3259 $hb->add (new CFClient::UI::Button
3260 text => "cancel",
3261 expand => 1,
3262 tooltip => "This closes the binding editor without saving",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->{binding_cancel}->()
3266 if $self->{binding_cancel};
3267 });
3268
3269 $self->update_binding_widgets;
3270
3271 $self
3272}
3273
3274sub commit {
3275 my ($self) = @_;
3276 my ($mod, $sym, $cmds) = $self->get_binding;
3277 if ($sym != 0 && @$cmds > 0) {
3278 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3279 ."'. Don't forget 'Save Config'!");
3280 $self->{binding_change}->($mod, $sym, $cmds)
3281 if $self->{binding_change};
3282 } else {
3283 $::STATUSBOX->add ("No action bound, no key or action specified!");
3284 $self->{binding_cancel}->()
3285 if $self->{binding_cancel};
3286 }
3287}
3288
3289sub start {
3290 my ($self) = @_;
3291
3292 $self->{rec_btn}->set_text ("stop recording");
3293 $self->{recording} = 1;
3294 $self->clear_command_list;
3295 $::CONN->start_record if $::CONN;
3296}
3297
3298sub stop {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("start recording");
3302 $self->{recording} = 0;
3303
3304 my $rec;
3305 $rec = $::CONN->stop_record if $::CONN;
3306 return unless ref $rec eq 'ARRAY';
3307 $self->set_command_list ($rec);
3308}
3309
3310
3311sub ask_for_bind_and_commit {
3312 my ($self) = @_;
3313 $self->ask_for_bind (1);
3314}
3315
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405#############################################################################
3406
3407package CFClient::UI::SpellList; 3519package CFClient::UI::SpellList;
3408 3520
3409our @ISA = CFClient::UI::ScrolledWindow::; 3521our @ISA = CFClient::UI::Table::;
3410 3522
3411sub new { 3523sub new {
3412 my $class = shift; 3524 my $class = shift;
3413 3525
3414 my $self = $class->SUPER::new ( 3526 my $self = $class->SUPER::new (
3415 binding => [], 3527 binding => [],
3416 commands => [], 3528 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_, 3529 @_,
3419 ) 3530 )
3420} 3531}
3421 3532
3422# XXX: Do sorting? Argl... 3533my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3534
3535my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3537my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3539my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3541my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3543my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3544 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3545
3546sub rebuild_spell_list {
3547 my ($self) = @_;
3548
3549 $CFClient::UI::ROOT->on_refresh ($self => sub {
3550 $self->clear;
3551
3552 return unless $::CONN;
3553
3554 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3555 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3556 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3557 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3558 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3559
3560 my $row = 0;
3561
3562 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3563 my $spell = $self->{spell}{$_};
3564
3565 $row++;
3566
3567 my $spell_cb = sub {
3568 my ($widget, $ev) = @_;
3569
3570 if ($ev->{button} == 1) {
3571 $::CONN->user_send ("cast $spell->{name}");
3572 } elsif ($ev->{button} == 2) {
3573 $::CONN->user_send ("invoke $spell->{name}");
3574 } elsif ($ev->{button} == 3) {
3575 (new CFClient::UI::Menu
3576 items => [
3577 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3578 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3579 ],
3580 )->popup ($ev);
3581 } else {
3582 return 0;
3583 }
3584
3585 1
3586 };
3587
3588 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3589
3590 #TODO: add path info to tooltip
3591 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3592
3593 $self->add (0, $row, new CFClient::UI::Face
3594 face => $spell->{face},
3595 can_hover => 1,
3596 can_events => 1,
3597 tooltip => $tooltip,
3598 on_button_down => $spell_cb,
3599 );
3600
3601 $self->add (1, $row, new CFClient::UI::Label
3602 expand => 1,
3603 text => $spell->{name},
3604 can_hover => 1,
3605 can_events => 1,
3606 tooltip => $tooltip,
3607 on_button_down => $spell_cb,
3608 );
3609
3610 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3611 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3612 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3613 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3614 }
3615 });
3616}
3617
3423sub add_spell { 3618sub add_spell {
3424 my ($self, $spell) = @_; 3619 my ($self, $spell) = @_;
3620
3425 $self->{spells}->{$spell->{name}} = $spell; 3621 $self->{spell}->{$spell->{name}} = $spell;
3426 3622 $self->rebuild_spell_list;
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454} 3623}
3455 3624
3456sub remove_spell { 3625sub remove_spell {
3457 my ($self, $spell) = @_; 3626 my ($self, $spell) = @_;
3627
3458 delete $self->{spells}->{$spell->{name}}; 3628 delete $self->{spell}->{$spell->{name}};
3459 $self->rebuild_spell_list; 3629 $self->rebuild_spell_list;
3460} 3630}
3461 3631
3632sub clear_spells {
3633 my ($self) = @_;
3634
3635 $self->{spell} = {};
3636 $self->rebuild_spell_list;
3637}
3638
3462############################################################################# 3639#############################################################################
3463 3640
3464package CFClient::UI::Root; 3641package CFClient::UI::Root;
3465 3642
3466our @ISA = CFClient::UI::Container::; 3643our @ISA = CFClient::UI::Container::;
3644
3645use List::Util qw(min max);
3467 3646
3468use CFClient::OpenGL; 3647use CFClient::OpenGL;
3469 3648
3470sub new { 3649sub new {
3471 my $class = shift; 3650 my $class = shift;
… …
3498 $coord = $max - $size if $coord > $max - $size; 3677 $coord = $max - $size if $coord > $max - $size;
3499 3678
3500 int $coord + 0.5 3679 int $coord + 0.5
3501} 3680}
3502 3681
3503sub size_allocate { 3682sub invoke_size_allocate {
3504 my ($self, $w, $h) = @_; 3683 my ($self, $w, $h) = @_;
3505 3684
3506 for my $child ($self->children) { 3685 for my $child ($self->children) {
3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3686 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3508 3687
… …
3512 $X = _to_pixel $X, $W, $self->{w}; 3691 $X = _to_pixel $X, $W, $self->{w};
3513 $Y = _to_pixel $Y, $H, $self->{h}; 3692 $Y = _to_pixel $Y, $H, $self->{h};
3514 3693
3515 $child->configure ($X, $Y, $W, $H); 3694 $child->configure ($X, $Y, $W, $H);
3516 } 3695 }
3696
3697 1
3517} 3698}
3518 3699
3519sub coord2local { 3700sub coord2local {
3520 my ($self, $x, $y) = @_; 3701 my ($self, $x, $y) = @_;
3521 3702
… …
3606 3787
3607 delete $queue{$widget+0}; 3788 delete $queue{$widget+0};
3608 3789
3609 my ($w, $h) = $widget->size_request; 3790 my ($w, $h) = $widget->size_request;
3610 3791
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3792 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3793 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3794
3795 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3796 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3613 3797
3614 $w = $widget->{force_w} if exists $widget->{force_w}; 3798 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h}; 3799 $h = $widget->{force_h} if exists $widget->{force_h};
3616 3800
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3801 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3643 3827
3644 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3828 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3645 3829
3646 $w = 0 if $w < 0; 3830 $w = 0 if $w < 0;
3647 $h = 0 if $h < 0; 3831 $h = 0 if $h < 0;
3832
3833 $w = max $widget->{min_w}, $w;
3834 $h = max $widget->{min_h}, $h;
3835
3836 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3648 3838
3649 $w = int $w + 0.5; 3839 $w = int $w + 0.5;
3650 $h = int $h + 0.5; 3840 $h = int $h + 0.5;
3651 3841
3652 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3842 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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