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

Diff Legend

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