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.270 by elmex, Fri Jun 2 09:02:49 2006 UTC vs.
Revision 1.323 by root, Wed Jul 5 03:01:01 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
377}
378
379sub visible_children {
380 $_[0]->children
376} 381}
377 382
378sub set_max_size { 383sub set_max_size {
379 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
380 385
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
383} 390}
384 391
385sub set_tooltip { 392sub set_tooltip {
386 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
387 394
… …
392 399
393 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
394 401
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
398 } 405 }
399} 406}
400 407
401# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
402sub coord2local { 409sub coord2local {
… …
410 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
411 418
412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
413} 420}
414 421
415sub focus_in { 422sub invoke_focus_in {
416 my ($self) = @_; 423 my ($self) = @_;
417 424
418 return if $FOCUS == $self; 425 return if $FOCUS == $self;
419 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
420 427
421 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
422 429
423 $self->_emit (focus_in => $focus); 430 $self->update;
424 431
425 $focus->update if $focus; 432 0
426 $FOCUS->update;
427} 433}
428 434
429sub focus_out { 435sub invoke_focus_out {
430 my ($self) = @_; 436 my ($self) = @_;
431 437
432 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
433 439
434 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
435 441
436 $self->_emit (focus_out => $focus); 442 $self->update;
437 443
438 $focus->update if $focus; #?
439
440 $::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
441 unless $FOCUS; 445 unless $FOCUS;
442}
443 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
444sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
445sub button_up { } 458sub invoke_button_up { 1 }
446sub key_down { } 459sub invoke_key_down { 1 }
447sub key_up { } 460sub invoke_key_up { 1 }
448 461
449sub button_down { 462sub invoke_button_down {
450 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
451 464
452 $self->focus_in; 465 $self->grab_focus;
466
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
453} 483}
454 484
455sub find_widget { 485sub find_widget {
456 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
457 487
… …
467sub set_parent { 497sub set_parent {
468 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
469 499
470 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495} 502}
496 503
497sub realloc { 504sub realloc {
498 my ($self) = @_; 505 my ($self) = @_;
499 506
… …
532 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
533 540
534 # update screen rectangle 541 # update screen rectangle
535 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
536 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
537 local $draw_w = $draw_x + $self->{w};
538 local $draw_h = $draw_y + $self->{h};
539 544
540 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
543 548
544 glPushMatrix; 549 glPushMatrix;
545 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
546 $self->_draw;
547 glPopMatrix;
548 551
549 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
550 my ($x, $y) = @$self{qw(x y)};
551
552 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
553 glEnable GL_BLEND; 554 glEnable GL_BLEND;
554 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
555 glBegin GL_QUADS; 556 glBegin GL_QUADS;
556 glVertex $x , $y; 557 glVertex 0 , 0;
557 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
558 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
559 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
560 glEnd; 561 glEnd;
561 glDisable GL_BLEND; 562 glDisable GL_BLEND;
562 } 563 }
563 564
564 if ($ENV{CFPLUS_DEBUG} & 1) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
565 glPushMatrix; 566 glPushMatrix;
566 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
568 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
569 glVertex 0 , 0; 570 glVertex 0 , 0;
570 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
571 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
572 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
573 glEnd; 574 glEnd;
574 glPopMatrix; 575 glPopMatrix;
575 #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;
576 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
577} 581}
578 582
579sub _draw { 583sub _draw {
580 my ($self) = @_; 584 my ($self) = @_;
581 585
… …
584 588
585sub DESTROY { 589sub DESTROY {
586 my ($self) = @_; 590 my ($self) = @_;
587 591
588 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
589 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
590} 596}
591 597
592############################################################################# 598#############################################################################
593 599
594package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
619 625
620 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
621 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
622 628
623 glEnable GL_BLEND; 629 glEnable GL_BLEND;
624 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
625 glColor @$color; 631 glColor_premultiply @$color;
626 632
627 glBegin GL_QUADS; 633 glBegin GL_QUADS;
628 glVertex 0 , 0; 634 glVertex 0 , 0;
629 glVertex 0 , $h; 635 glVertex 0 , $h;
630 glVertex $w, $h; 636 glVertex $w, $h;
… …
661our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
662 668
663sub new { 669sub new {
664 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
665 671
666 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
667 673
668 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
669 children => [], 675 children => [],
670 can_events => 0, 676 can_events => 0,
671 %arg, 677 %arg,
672 ); 678 );
679
673 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
674 682
675 $self 683 $self
676} 684}
677 685
678sub add { 686sub add {
… …
726 $x -= $self->{x}; 734 $x -= $self->{x};
727 $y -= $self->{y}; 735 $y -= $self->{y};
728 736
729 my $res; 737 my $res;
730 738
731 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
732 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
733 and return $res; 741 and return $res;
734 } 742 }
735 743
736 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
757} 765}
758 766
759sub add { 767sub add {
760 my ($self, $child) = @_; 768 my ($self, $child) = @_;
761 769
762 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
763
764 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
765} 772}
766 773
767sub remove { 774sub remove {
768 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
777 784
778sub size_request { 785sub size_request {
779 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
780} 787}
781 788
782sub size_allocate { 789sub invoke_size_allocate {
783 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
784 791
785 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
786} 795}
787 796
788############################################################################# 797#############################################################################
798
799# back-buffered drawing area
789 800
790package CFClient::UI::Window; 801package CFClient::UI::Window;
791 802
792our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
793 804
… …
804 815
805 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
806 $self->SUPER::update; 817 $self->SUPER::update;
807} 818}
808 819
809sub size_allocate { 820sub invoke_size_allocate {
810 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
811 822
812 $self->SUPER::size_allocate ($w, $h);
813 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
814} 826}
815 827
816sub _render { 828sub _render {
817 my ($self) = @_; 829 my ($self) = @_;
818 830
… …
845 my $tex = $self->{texture} 857 my $tex = $self->{texture}
846 or return; 858 or return;
847 859
848 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
850 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
851 863
852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
853 865
854 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
855} 867}
… …
879 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
880 892
881 ($w, $h) 893 ($w, $h)
882} 894}
883 895
884sub size_allocate { 896sub invoke_size_allocate {
885 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
886 898
887 my $child = $self->child; 899 my $child = $self->child;
888 900
889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
891 903
892 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
893 $self->update; 905 $self->update;
906
907 1
894} 908}
895 909
896sub set_offset { 910sub set_offset {
897 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
898 912
… …
946package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
947 961
948our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
949 963
950sub new { 964sub new {
951 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
952 968
953 my $self; 969 my $self;
954 970
955 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
956 vertical => 1, 972 vertical => 1,
… …
961 ; 977 ;
962 978
963 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
964 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
965 slider => $slider, 981 slider => $slider,
966 @_, 982 %arg,
967 ); 983 );
968 984
969 $self->{vp}->add ($self->{scrolled});
970 $self->add ($self->{vp});
971 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
972 987
973 $self 988 $self
974} 989}
975 990
991#TODO# update range on size_allocate depending on child
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
997}
998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
976sub update { 1005sub update {
977 my ($self) = @_; 1006 my ($self) = @_;
978 1007
979 $self->SUPER::update; 1008 $self->SUPER::update;
980 1009
981 # todo: overwrite size_allocate of child 1010 $self->update_slider;
982 my $child = $self->{vp}->child;
983 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
984} 1011}
985 1012
986sub size_allocate { 1013sub invoke_size_allocate {
987 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
988 1015
1016 $self->update_slider;
1017
989 $self->SUPER::size_allocate ($w, $h); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
990
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993} 1019}
994
995#TODO# update range on size_allocate depending on child
996# update viewport offset on scroll
997 1020
998############################################################################# 1021#############################################################################
999 1022
1000package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
1001 1024
… …
1017 1040
1018 if ($self->{bg}) { 1041 if ($self->{bg}) {
1019 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
1020 1043
1021 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1023 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
1024 1047
1025 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
1026 glVertex 0 , 0; 1049 glVertex 0 , 0;
1027 glVertex 0 , $h; 1050 glVertex 0 , $h;
1028 glVertex $w, $h; 1051 glVertex $w, $h;
… …
1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1053 1076
1054sub new { 1077sub new {
1055 my ($class, %arg) = @_; 1078 my ($class, %arg) = @_;
1056
1057 my $title = delete $arg{title};
1058 1079
1059 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1060 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1061 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1062 border => 0.6, 1083 border => 0.6,
… …
1064 min_w => 16, 1085 min_w => 16,
1065 min_h => 16, 1086 min_h => 16,
1066 %arg, 1087 %arg,
1067 ); 1088 );
1068 1089
1069 $self->{title} = new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1070 align => 0, 1091 align => 0,
1071 valign => 1, 1092 valign => 1,
1072 text => $title, 1093 text => $self->{title},
1073 fontsize => $self->{border} 1094 fontsize => $self->{border},
1074 if defined $title; 1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1075 1105
1076 $self 1106 $self
1077} 1107}
1078 1108
1079sub add { 1109sub add {
1080 my ($self, @widgets) = @_; 1110 my ($self, @widgets) = @_;
1081 1111
1082 $self->SUPER::add (@widgets); 1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1083 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1084} 1115}
1085 1116
1086sub border { 1117sub border {
1087 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1088} 1119}
1089 1120
1090sub size_request { 1121sub size_request {
1091 my ($self) = @_; 1122 my ($self) = @_;
1092 1123
1093 $self->{title}->size_request 1124 $self->{title_widget}->size_request
1094 if $self->{title}; 1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1095 1129
1096 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1097 1131
1098 ( 1132 (
1099 $w + $self->border * 2, 1133 $w + $self->border * 2,
1100 $h + $self->border * 2, 1134 $h + $self->border * 2,
1101 ) 1135 )
1102} 1136}
1103 1137
1104sub size_allocate { 1138sub invoke_size_allocate {
1105 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1106 1140
1107 if ($self->{title}) { 1141 if ($self->{title_widget}) {
1108 $self->{title}{w} = $w; 1142 $self->{title_widget}{w} = $w;
1109 $self->{title}{h} = $h; 1143 $self->{title_widget}{h} = $h;
1110 $self->{title}->size_allocate ($w, $h); 1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1111 } 1145 }
1112 1146
1113 my $border = $self->border; 1147 my $border = $self->border;
1114 1148
1115 $h -= List::Util::max 0, $border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1116 $w -= List::Util::max 0, $border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1151
1152 $self->child->configure ($border, $border, $w, $h);
1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1117 1164
1118 $self->child->configure ($border, $border, $w, $h); 1165 1
1119} 1166}
1120 1167
1121sub button_down { 1168sub invoke_button_down {
1122 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1123 1170
1124 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
1125 my $border = $self->border; 1172 my $border = $self->border;
1126 1173
… …
1142 my $dy = $ev->{y} - $oy; 1189 my $dy = $ev->{y} - $oy;
1143 1190
1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1191 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1192 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146 1193
1194 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1147 $self->realloc; 1195 $self->realloc;
1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 }; 1196 };
1150 1197
1151 } elsif ($lr ^ $td) { 1198 } elsif ($lr ^ $td) {
1152 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1199 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1153 my ($bx, $by) = ($self->{x}, $self->{y}); 1200 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1156 my ($ev, $x, $y) = @_; 1203 my ($ev, $x, $y) = @_;
1157 1204
1158 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1159 1206
1160 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1208 # HACK: the next line is required to enforce placement
1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1161 }; 1210 };
1211 } else {
1212 return 0;
1213 }
1214
1162 } 1215 1
1163} 1216}
1164 1217
1165sub button_up { 1218sub invoke_button_up {
1166 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1167 1220
1168 delete $self->{motion}; 1221 ! ! delete $self->{motion}
1169} 1222}
1170 1223
1171sub mouse_motion { 1224sub invoke_mouse_motion {
1172 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1173 1226
1174 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228
1229 ! ! $self->{motion}
1175} 1230}
1176 1231
1177sub _draw { 1232sub _draw {
1178 my ($self) = @_; 1233 my ($self) = @_;
1179 1234
… …
1205 1260
1206 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
1207 1262
1208 $child->draw; 1263 $child->draw;
1209 1264
1210 if ($self->{title}) { 1265 if ($self->{title_widget}) {
1211 glTranslate 0, $border - $self->{h}; 1266 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw; 1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1213 } 1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1214} 1274}
1215 1275
1216############################################################################# 1276#############################################################################
1217 1277
1218package CFClient::UI::Table; 1278package CFClient::UI::Table;
… …
1241 1301
1242 $child->set_parent ($self); 1302 $child->set_parent ($self);
1243 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1244 1304
1245 $self->realloc; 1305 $self->realloc;
1306}
1307
1308sub remove {
1309 my ($self, $child) = @_;
1310
1311 # TODO: not yet implemented
1246} 1312}
1247 1313
1248# TODO: move to container class maybe? send children a signal on removal? 1314# TODO: move to container class maybe? send children a signal on removal?
1249sub clear { 1315sub clear {
1250 my ($self) = @_; 1316 my ($self) = @_;
… …
1291 (sum @$ws), 1357 (sum @$ws),
1292 (sum @$hs), 1358 (sum @$hs),
1293 ) 1359 )
1294} 1360}
1295 1361
1296sub size_allocate { 1362sub invoke_size_allocate {
1297 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1298 1364
1299 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1300 1366
1301 my $req_w = (sum @$ws) || 1; 1367 my $req_w = (sum @$ws) || 1;
… …
1333 } 1399 }
1334 1400
1335 $y += $row_h; 1401 $y += $row_h;
1336 } 1402 }
1337 1403
1404 1
1338} 1405}
1339 1406
1340sub find_widget { 1407sub find_widget {
1341 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1342 1409
… …
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1381 ) 1448 )
1382} 1449}
1383 1450
1384sub size_allocate { 1451sub invoke_size_allocate {
1385 my ($self, $w, $h) = @_; 1452 my ($self, $w, $h) = @_;
1386 1453
1387 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1388 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1389 1456
1390 my @req; 1457 my @req;
1391 1458
1392 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1393 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1394 } else { 1461 } else {
1395 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1396 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1397 1464
1398 if ($req > $space) { 1465 if ($req > $space) {
1399 # ah well, not enough space 1466 # ah well, not enough space
1400 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1401 } else { 1468 } else {
1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1403 1470
1404 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1405 1472
1406 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1407 for 0 .. $#$children; 1474 for 0 .. $#children;
1408 } 1475 }
1409 } 1476 }
1410 1477
1411 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1412 1479
1413 my $pos = 0; 1480 my $pos = 0;
1414 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1415 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1416 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1417 1484
1418 $pos += $alloc; 1485 $pos += $alloc;
1419 } 1486 }
1420 1487
1421 1 1488 1
… …
1511 1578
1512 delete $self->{texture}; 1579 delete $self->{texture};
1513 $self->SUPER::update; 1580 $self->SUPER::update;
1514} 1581}
1515 1582
1583sub realloc {
1584 my ($self) = @_;
1585
1586 delete $self->{ox};
1587 $self->SUPER::realloc;
1588}
1589
1516sub set_text { 1590sub set_text {
1517 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1518 1592
1519 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1520 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1521 1595
1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1523 $self->{layout}->set_text ($text); 1596 $self->{layout}->set_text ($text);
1524 1597
1598 delete $self->{size_req};
1525 $self->realloc; 1599 $self->realloc;
1526 $self->update; 1600 $self->update;
1527} 1601}
1528 1602
1529sub set_markup { 1603sub set_markup {
… …
1532 return if $self->{text} eq "M$markup"; 1606 return if $self->{text} eq "M$markup";
1533 $self->{text} = "M$markup"; 1607 $self->{text} = "M$markup";
1534 1608
1535 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1609 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1536 1610
1537 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1538 $self->{layout}->set_markup ($markup); 1611 $self->{layout}->set_markup ($markup);
1539 1612
1613 delete $self->{size_req};
1540 $self->realloc; 1614 $self->realloc;
1541 $self->update; 1615 $self->update;
1542} 1616}
1543 1617
1544sub size_request { 1618sub size_request {
1545 my ($self) = @_; 1619 my ($self) = @_;
1546 1620
1621 $self->{size_req} ||= do {
1547 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1622 $self->{layout}->set_font ($self->{font}) if $self->{font};
1548 $self->{layout}->set_width ($self->{max_w} || -1); 1623 $self->{layout}->set_width ($self->{max_w} || -1);
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1624 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1625 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1627
1553 my ($w, $h) = $self->{layout}->size; 1628 my ($w, $h) = $self->{layout}->size;
1554 1629
1555 if (exists $self->{template}) { 1630 if (exists $self->{template}) {
1556 $self->{template}->set_font ($self->{font}) if $self->{font}; 1631 $self->{template}->set_font ($self->{font}) if $self->{font};
1632 $self->{template}->set_width ($self->{max_w} || -1);
1557 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1633 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1558 1634
1559 my ($w2, $h2) = $self->{template}->size; 1635 my ($w2, $h2) = $self->{template}->size;
1560 1636
1561 $w = List::Util::max $w, $w2; 1637 $w = List::Util::max $w, $w2;
1562 $h = List::Util::max $h, $h2; 1638 $h = List::Util::max $h, $h2;
1639 }
1640
1641 [$w, $h]
1563 } 1642 };
1564 1643
1565 ($w, $h) 1644 @{ $self->{size_req} }
1566} 1645}
1567 1646
1647sub baseline_shift {
1648 $_[0]{layout}->descent
1649}
1650
1568sub size_allocate { 1651sub invoke_size_allocate {
1569 my ($self, $w, $h) = @_; 1652 my ($self, $w, $h) = @_;
1570 1653
1571 delete $self->{ox}; 1654 delete $self->{ox};
1572 1655
1573 delete $self->{texture} 1656 delete $self->{texture}
1574 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1657 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1658
1659 1
1575} 1660}
1576 1661
1577sub set_fontsize { 1662sub set_fontsize {
1578 my ($self, $fontsize) = @_; 1663 my ($self, $fontsize) = @_;
1579 1664
1580 $self->{fontsize} = $fontsize; 1665 $self->{fontsize} = $fontsize;
1666 delete $self->{size_req};
1581 delete $self->{texture}; 1667 delete $self->{texture};
1582 1668
1583 $self->realloc; 1669 $self->realloc;
1584} 1670}
1585 1671
1672sub reconfigure {
1673 my ($self) = @_;
1674
1675 delete $self->{size_req};
1676 delete $self->{texture};
1677
1678 $self->SUPER::reconfigure;
1679}
1680
1586sub _draw { 1681sub _draw {
1587 my ($self) = @_; 1682 my ($self) = @_;
1588 1683
1589 $self->SUPER::_draw; # draw background, if applicable 1684 $self->SUPER::_draw; # draw background, if applicable
1590 1685
1591 my $tex = $self->{texture} ||= do { 1686 my $size = $self->{texture} ||= do {
1592 $self->{layout}->set_foreground (@{$self->{fg}}); 1687 $self->{layout}->set_foreground (@{$self->{fg}});
1593 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1688 $self->{layout}->set_font ($self->{font}) if $self->{font};
1594 $self->{layout}->set_width ($self->{w}); 1689 $self->{layout}->set_width ($self->{w});
1595 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1690 $self->{layout}->set_ellipsise ($self->{ellipsise});
1596 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 1693
1599 new_from_layout CFClient::Texture $self->{layout} 1694 [$self->{layout}->size]
1600 }; 1695 };
1601 1696
1602 unless (exists $self->{ox}) { 1697 unless (exists $self->{ox}) {
1603 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1604 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1699 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1605 : ($self->{w} - $tex->{w}) * 0.5); 1700 : ($self->{w} - $size->[0]) * 0.5);
1606 1701
1607 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1703 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1609 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $size->[1]) * 0.5);
1610 }; 1705 };
1611 1706
1612 glEnable GL_TEXTURE_2D; 1707 my $w = List::Util::min $self->{w} + 4, $size->[0];
1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1708 my $h = List::Util::min $self->{h} + 2, $size->[1];
1614 1709
1615 if ($tex->{format} == GL_ALPHA) { 1710 $self->{layout}->render ($self->{ox}, $self->{oy});
1616 glColor @{$self->{fg}};
1617 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1618 } else {
1619 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1620 }
1621
1622 glDisable GL_TEXTURE_2D;
1623} 1711}
1624 1712
1625############################################################################# 1713#############################################################################
1626 1714
1627package CFClient::UI::EntryBase; 1715package CFClient::UI::EntryBase;
… …
1641 can_hover => 1, 1729 can_hover => 1,
1642 can_focus => 1, 1730 can_focus => 1,
1643 valign => 0, 1731 valign => 0,
1644 can_events => 1, 1732 can_events => 1,
1645 #text => ... 1733 #text => ...
1734 #hidden => "*",
1646 @_ 1735 @_
1647 ) 1736 )
1648} 1737}
1649 1738
1650sub _set_text { 1739sub _set_text {
… …
1652 1741
1653 delete $self->{cur_h}; 1742 delete $self->{cur_h};
1654 1743
1655 return if $self->{text} eq $text; 1744 return if $self->{text} eq $text;
1656 1745
1657 delete $self->{texture};
1658
1659 $self->{last_activity} = $::NOW; 1746 $self->{last_activity} = $::NOW;
1660 $self->{text} = $text; 1747 $self->{text} = $text;
1661 1748
1662 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1663 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1751 delete $self->{size_req};
1664 1752
1665 $self->_emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1754
1755 $self->realloc;
1756 $self->update;
1666} 1757}
1667 1758
1668sub set_text { 1759sub set_text {
1669 my ($self, $text) = @_; 1760 my ($self, $text) = @_;
1670 1761
1671 $self->{cursor} = length $text; 1762 $self->{cursor} = length $text;
1672 $self->_set_text ($text); 1763 $self->_set_text ($text);
1673
1674 $self->realloc;
1675} 1764}
1676 1765
1677sub get_text { 1766sub get_text {
1678 $_[0]{text} 1767 $_[0]{text}
1679} 1768}
… …
1684 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1685 1774
1686 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1687} 1776}
1688 1777
1689sub key_down { 1778sub invoke_key_down {
1690 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1691 1780
1692 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1693 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1694 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
… …
1706 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1707 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1708 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1709 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1710 } elsif ($uni == 27) { 1799 } elsif ($uni == 27) {
1711 $self->_emit ('escape'); 1800 $self->emit ('escape');
1712 } elsif ($uni) { 1801 } elsif ($uni) {
1713 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else {
1804 return 0;
1714 } 1805 }
1715 1806
1716 $self->_set_text ($text); 1807 $self->_set_text ($text);
1717 1808
1718 $self->realloc; 1809 $self->realloc;
1719}
1720 1810
1811 1
1812}
1813
1721sub focus_in { 1814sub invoke_focus_in {
1722 my ($self) = @_; 1815 my ($self) = @_;
1723 1816
1724 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1725 1818
1726 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1727} 1820}
1728 1821
1729sub button_down { 1822sub invoke_button_down {
1730 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1731 1824
1732 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1733 1826
1734 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1735 1828
1736 # byte-index to char-index 1829 # byte-index to char-index
1737 my $text = $self->{text}; 1830 my $text = $self->{text};
1738 utf8::encode $text; 1831 utf8::encode $text;
1739 $self->{cursor} = length substr $text, 0, $idx; 1832 $self->{cursor} = length substr $text, 0, $idx;
1740 1833
1741 $self->_set_text ($self->{text}); 1834 $self->_set_text ($self->{text});
1742 $self->update; 1835 $self->update;
1836
1837 1
1743} 1838}
1744 1839
1745sub mouse_motion { 1840sub invoke_mouse_motion {
1746 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1747# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1842# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1843
1844 1
1748} 1845}
1749 1846
1750sub _draw { 1847sub _draw {
1751 my ($self) = @_; 1848 my ($self) = @_;
1752 1849
1753 local $self->{fg} = $self->{fg}; 1850 local $self->{fg} = $self->{fg};
1754 1851
1755 if ($FOCUS == $self) { 1852 if ($FOCUS == $self) {
1756 glColor @{$self->{active_bg}}; 1853 glColor_premultiply @{$self->{active_bg}};
1757 $self->{fg} = $self->{active_fg}; 1854 $self->{fg} = $self->{active_fg};
1758 } else { 1855 } else {
1759 glColor @{$self->{bg}}; 1856 glColor_premultiply @{$self->{bg}};
1760 } 1857 }
1761 1858
1762 glEnable GL_BLEND; 1859 glEnable GL_BLEND;
1763 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1860 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1764 glBegin GL_QUADS; 1861 glBegin GL_QUADS;
1765 glVertex 0 , 0; 1862 glVertex 0 , 0;
1766 glVertex 0 , $self->{h}; 1863 glVertex 0 , $self->{h};
1767 glVertex $self->{w}, $self->{h}; 1864 glVertex $self->{w}, $self->{h};
1768 glVertex $self->{w}, 0; 1865 glVertex $self->{w}, 0;
… …
1793 1890
1794our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1795 1892
1796use CFClient::OpenGL; 1893use CFClient::OpenGL;
1797 1894
1798sub key_down { 1895sub invoke_key_down {
1799 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1800 1897
1801 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1802 1899
1803 if ($sym == 13) { 1900 if ($sym == 13) {
1804 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1805 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1806 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1807 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1808 $self->_emit (activate => $txt); 1906 $self->emit (activate => $txt);
1809 $self->update; 1907 $self->update;
1810 1908
1811 } elsif ($sym == CFClient::SDLK_UP) { 1909 } elsif ($sym == CFClient::SDLK_UP) {
1812 if ($self->{history_pointer} < 0) { 1910 if ($self->{history_pointer} < 0) {
1813 $self->{history_saveback} = $self->get_text; 1911 $self->{history_saveback} = $self->get_text;
… …
1829 } else { 1927 } else {
1830 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1831 } 1929 }
1832 1930
1833 } else { 1931 } else {
1834 $self->SUPER::key_down ($ev); 1932 return $self->SUPER::invoke_key_down ($ev)
1933 }
1934
1835 } 1935 1
1836
1837} 1936}
1838 1937
1839############################################################################# 1938#############################################################################
1840 1939
1841package CFClient::UI::Button; 1940package CFClient::UI::Button;
… …
1862 can_events => 1, 1961 can_events => 1,
1863 @_ 1962 @_
1864 ) 1963 )
1865} 1964}
1866 1965
1867sub activate { }
1868
1869sub button_up { 1966sub invoke_button_up {
1870 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1871 1968
1872 $self->emit ("activate") 1969 $self->emit ("activate")
1873 if $x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1874 && $y >= 0 && $y < $self->{h}; 1971 && $y >= 0 && $y < $self->{h};
1972
1973 1
1875} 1974}
1876 1975
1877sub _draw { 1976sub _draw {
1878 my ($self) = @_; 1977 my ($self) = @_;
1879 1978
1880 local $self->{fg} = $self->{fg}; 1979 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1881
1882 if ($GRAB == $self) {
1883 $self->{fg} = $self->{active_fg};
1884 }
1885 1980
1886 glEnable GL_TEXTURE_2D; 1981 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 glColor 0, 0, 0, 1; 1983 glColor 0, 0, 0, 1;
1889 1984
1890 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1891 1986
1892 glDisable GL_TEXTURE_2D; 1987 glDisable GL_TEXTURE_2D;
1893 1988
1894 $self->SUPER::_draw; 1989 $self->SUPER::_draw;
1990}
1991
1992#############################################################################
1993
1994package CFClient::UI::ImageButton;
1995
1996our @ISA = CFClient::UI::Image::;
1997
1998use CFClient::OpenGL;
1999
2000my %textures;
2001
2002sub new {
2003 my $class = shift;
2004
2005 my $self = $class->SUPER::new (
2006 padding_x => 4,
2007 padding_y => 4,
2008 fg => [1, 1, 1],
2009 active_fg => [0, 0, 1],
2010 can_hover => 1,
2011 align => 0,
2012 valign => 0,
2013 can_events => 1,
2014 @_
2015 );
2016}
2017
2018sub invoke_button_up {
2019 my ($self, $ev, $x, $y) = @_;
2020
2021 $self->emit ("activate")
2022 if $x >= 0 && $x < $self->{w}
2023 && $y >= 0 && $y < $self->{h};
2024
2025 1
1895} 2026}
1896 2027
1897############################################################################# 2028#############################################################################
1898 2029
1899package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
… …
1926 my ($self) = @_; 2057 my ($self) = @_;
1927 2058
1928 (6) x 2 2059 (6) x 2
1929} 2060}
1930 2061
2062sub toggle {
2063 my ($self) = @_;
2064
2065 $self->{state} = !$self->{state};
2066 $self->emit (changed => $self->{state});
2067 $self->update;
2068}
2069
1931sub button_down { 2070sub invoke_button_down {
1932 my ($self, $ev, $x, $y) = @_; 2071 my ($self, $ev, $x, $y) = @_;
1933 2072
1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2073 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2074 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1936 $self->{state} = !$self->{state}; 2075 $self->toggle;
1937 $self->_emit (changed => $self->{state}); 2076 } else {
2077 return 0
2078 }
2079
1938 } 2080 1
1939} 2081}
1940 2082
1941sub _draw { 2083sub _draw {
1942 my ($self) = @_; 2084 my ($self) = @_;
1943 2085
… …
1963package CFClient::UI::Image; 2105package CFClient::UI::Image;
1964 2106
1965our @ISA = CFClient::UI::Base::; 2107our @ISA = CFClient::UI::Base::;
1966 2108
1967use CFClient::OpenGL; 2109use CFClient::OpenGL;
1968use Carp qw/confess/;
1969 2110
1970our %loaded_images; 2111our %texture_cache;
1971 2112
1972sub new { 2113sub new {
1973 my $class = shift; 2114 my $class = shift;
1974 2115
1975 my $self = $class->SUPER::new (can_events => 0, @_); 2116 my $self = $class->SUPER::new (
2117 can_events => 0,
2118 @_,
2119 );
1976 2120
1977 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2121 $self->{path}
2122 or Carp::croak "required attribute 'path' not set";
1978 2123
1979 $loaded_images{$self->{image}} ||= 2124 $self->{tex} = $texture_cache{$self->{path}} ||=
1980 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2125 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1981 2126
1982 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2127 Scalar::Util::weaken $texture_cache{$self->{path}};
1983 2128
1984 Scalar::Util::weaken $loaded_images{$self->{image}}; 2129 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1985
1986 $self->{aspect} = $tex->{w} / $tex->{h};
1987 2130
1988 $self 2131 $self
1989} 2132}
1990 2133
1991sub size_request { 2134sub size_request {
1992 my ($self) = @_; 2135 my ($self) = @_;
1993 2136
1994 ($self->{tex}->{w}, $self->{tex}->{h}) 2137 ($self->{tex}{w}, $self->{tex}{h})
1995} 2138}
1996 2139
1997sub _draw { 2140sub _draw {
1998 my ($self) = @_; 2141 my ($self) = @_;
1999 2142
… …
2108 my $ycut1 = max 0, min 1, $ycut; 2251 my $ycut1 = max 0, min 1, $ycut;
2109 my $ycut2 = max 0, min 1, $ycut - 1; 2252 my $ycut2 = max 0, min 1, $ycut - 1;
2110 2253
2111 my $h1 = $self->{h} * (1 - $ycut1); 2254 my $h1 = $self->{h} * (1 - $ycut1);
2112 my $h2 = $self->{h} * (1 - $ycut2); 2255 my $h2 = $self->{h} * (1 - $ycut2);
2256 my $h3 = $self->{h};
2257
2258 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2113 2259
2114 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
2115 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2261 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2262 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2116 glEnable GL_TEXTURE_2D; 2263 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2264 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2265
2119 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2266 glBindTexture GL_TEXTURE_2D, $t1->{name};
2120 glBegin GL_QUADS; 2267 glBegin GL_QUADS;
… …
2135 2282
2136 if ($t3) { 2283 if ($t3) {
2137 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2284 glBindTexture GL_TEXTURE_2D, $t3->{name};
2138 glBegin GL_QUADS; 2285 glBegin GL_QUADS;
2139 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2286 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2140 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2287 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2141 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2288 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2142 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2289 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2143 glEnd; 2290 glEnd;
2144 } 2291 }
2145 2292
2146 glDisable GL_BLEND; 2293 glDisable GL_BLEND;
… …
2234 $self->update; 2381 $self->update;
2235 2382
2236 $self 2383 $self
2237} 2384}
2238 2385
2239sub changed { }
2240
2241sub set_range { 2386sub set_range {
2242 my ($self, $range) = @_; 2387 my ($self, $range) = @_;
2243 2388
2244 ($range, $self->{range}) = ($self->{range}, $range); 2389 ($range, $self->{range}) = ($self->{range}, $range);
2245 2390
2246 $self->update
2247 if "@$range" ne "@{$self->{range}}"; 2391 if ("@$range" ne "@{$self->{range}}") {
2392 $self->update;
2393 $self->set_value ($self->{range}[0]);
2394 }
2248} 2395}
2249 2396
2250sub set_value { 2397sub set_value {
2251 my ($self, $value) = @_; 2398 my ($self, $value) = @_;
2252 2399
… …
2263 if $unit; 2410 if $unit;
2264 2411
2265 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2412 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2266 2413
2267 if ($value != $old_value) { 2414 if ($value != $old_value) {
2268 $self->_emit (changed => $value); 2415 $self->emit (changed => $value);
2269 $self->update; 2416 $self->update;
2270 } 2417 }
2271} 2418}
2272 2419
2273sub size_request { 2420sub size_request {
2274 my ($self) = @_; 2421 my ($self) = @_;
2275 2422
2276 ($self->{req_w}, $self->{req_h}) 2423 ($self->{req_w}, $self->{req_h})
2277} 2424}
2278 2425
2279sub button_down { 2426sub invoke_button_down {
2280 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2281 2428
2282 $self->SUPER::button_down ($ev, $x, $y); 2429 $self->SUPER::invoke_button_down ($ev, $x, $y);
2283 2430
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2431 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285 2432
2286 $self->mouse_motion ($ev, $x, $y); 2433 $self->invoke_mouse_motion ($ev, $x, $y)
2287} 2434}
2288 2435
2289sub mouse_motion { 2436sub invoke_mouse_motion {
2290 my ($self, $ev, $x, $y) = @_; 2437 my ($self, $ev, $x, $y) = @_;
2291 2438
2292 if ($GRAB == $self) { 2439 if ($GRAB == $self) {
2293 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2440 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2294 2441
2295 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2442 my (undef, $lo, $hi, $page) = @{$self->{range}};
2296 2443
2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2444 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298 2445
2299 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2446 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2447 } else {
2448 return 0;
2449 }
2450
2300 } 2451 1
2301} 2452}
2302 2453
2303sub update { 2454sub update {
2304 my ($self) = @_; 2455 my ($self) = @_;
2305 2456
2306 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2457 delete $self->{knob_w};
2458 $self->SUPER::update;
2459}
2460
2461sub _draw {
2462 my ($self) = @_;
2463
2464 unless ($self->{knob_w}) {
2307 $self->set_value ($self->{range}[0]); 2465 $self->set_value ($self->{range}[0]);
2308 2466
2309 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2467 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100; 2468 my $range = ($hi - $page - $lo) || 1e-100;
2311 2469
… …
2317 $value = ($value - $lo) / $range; 2475 $value = ($value - $lo) / $range;
2318 $value = $value * $self->{scale} + $self->{offset}; 2476 $value = $value * $self->{scale} + $self->{offset};
2319 2477
2320 $self->{knob_x} = $value - $knob_w * 0.5; 2478 $self->{knob_x} = $value - $knob_w * 0.5;
2321 $self->{knob_w} = $knob_w; 2479 $self->{knob_w} = $knob_w;
2322 }); 2480 }
2323
2324 $self->SUPER::update;
2325}
2326
2327sub _draw {
2328 my ($self) = @_;
2329 2481
2330 $self->SUPER::_draw (); 2482 $self->SUPER::_draw ();
2331 2483
2332 glScale $self->{w}, $self->{h}; 2484 glScale $self->{w}, $self->{h};
2333 2485
… …
2394sub set_range { shift->{slider}->set_range (@_) } 2546sub set_range { shift->{slider}->set_range (@_) }
2395sub set_value { shift->{slider}->set_value (@_) } 2547sub set_value { shift->{slider}->set_value (@_) }
2396 2548
2397############################################################################# 2549#############################################################################
2398 2550
2399package CFClient::UI::TextView; 2551package CFClient::UI::TextScroller;
2400 2552
2401our @ISA = CFClient::UI::HBox::; 2553our @ISA = CFClient::UI::HBox::;
2402 2554
2403use CFClient::OpenGL; 2555use CFClient::OpenGL;
2404 2556
… …
2406 my $class = shift; 2558 my $class = shift;
2407 2559
2408 my $self = $class->SUPER::new ( 2560 my $self = $class->SUPER::new (
2409 fontsize => 1, 2561 fontsize => 1,
2410 can_events => 0, 2562 can_events => 0,
2563 indent => 0,
2411 #font => default_font 2564 #font => default_font
2412 @_, 2565 @_,
2413 2566
2414 layout => (new CFClient::Layout 1), 2567 layout => (new CFClient::Layout),
2415 par => [], 2568 par => [],
2416 height => 0, 2569 height => 0,
2417 children => [ 2570 children => [
2418 (new CFClient::UI::Empty expand => 1), 2571 (new CFClient::UI::Empty expand => 1),
2419 (new CFClient::UI::Slider vertical => 1), 2572 (new CFClient::UI::Slider vertical => 1),
… …
2430 2583
2431 $self->{fontsize} = $fontsize; 2584 $self->{fontsize} = $fontsize;
2432 $self->reflow; 2585 $self->reflow;
2433} 2586}
2434 2587
2588sub size_request {
2589 my ($self) = @_;
2590
2591 my ($empty, $slider) = @{ $self->{children} };
2592
2593 local $self->{children} = [$empty, $slider];
2594 $self->SUPER::size_request
2595}
2596
2435sub size_allocate { 2597sub invoke_size_allocate {
2436 my ($self, $w, $h) = @_; 2598 my ($self, $w, $h) = @_;
2437 2599
2438 $self->SUPER::size_allocate ($w, $h); 2600 my ($empty, $slider, @other) = @{ $self->{children} };
2601 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2439 2602
2440 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2603 $self->{layout}->set_font ($self->{font}) if $self->{font};
2441 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2604 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2442 $self->{layout}->set_width ($self->{children}[0]{w}); 2605 $self->{layout}->set_width ($empty->{w});
2606 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2443 2607
2444 $self->reflow; 2608 $self->reflow;
2445}
2446 2609
2447sub text_size { 2610 local $self->{children} = [$empty, $slider];
2448 my ($self, $text, $indent) = @_; 2611 $self->SUPER::invoke_size_allocate ($w, $h)
2612}
2613
2614sub get_layout {
2615 my ($self, $para) = @_;
2449 2616
2450 my $layout = $self->{layout}; 2617 my $layout = $self->{layout};
2451 2618
2619 $layout->set_font ($self->{font}) if $self->{font};
2620 $layout->set_foreground (@{$para->{fg}});
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2621 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453 $layout->set_width ($self->{children}[0]{w} - $indent); 2622 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2623 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2454 $layout->set_markup ($text); 2624 $layout->set_markup ($para->{markup});
2625
2626 $layout->set_shapes (
2627 map
2628 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2629 @{$para->{widget}}
2455 2630 );
2631
2456 $layout->size 2632 $layout
2457} 2633}
2458 2634
2459sub reflow { 2635sub reflow {
2460 my ($self) = @_; 2636 my ($self) = @_;
2461 2637
… …
2470 $self->{children}[1]->set_value ($offset); 2646 $self->{children}[1]->set_value ($offset);
2471} 2647}
2472 2648
2473sub clear { 2649sub clear {
2474 my ($self) = @_; 2650 my ($self) = @_;
2651
2652 my (undef, undef, @other) = @{ $self->{children} };
2653 $self->remove ($_) for @other;
2475 2654
2476 $self->{par} = []; 2655 $self->{par} = [];
2477 $self->{height} = 0; 2656 $self->{height} = 0;
2478 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2657 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2479} 2658}
2480 2659
2481sub add_paragraph { 2660sub add_paragraph {
2482 my ($self, $color, $text, $indent) = @_; 2661 my ($self, $color, $para, $indent) = @_;
2483 2662
2484 for my $line (split /\n/, $text) { 2663 my ($text, @w) = ref $para ? @$para : $para;
2485 my ($w, $h) = $self->text_size ($line); 2664
2486 $self->{height} += $h; 2665 $para = {
2487 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2666 w => 1e10,
2667 wrapped => 1,
2668 fg => $color,
2669 indent => $indent,
2670 markup => $text,
2671 widget => \@w,
2488 } 2672 };
2489 2673
2490 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2674 $self->add (@w) if @w;
2675 push @{$self->{par}}, $para;
2676
2677 $self->{need_reflow}++;
2678 $self->update;
2679}
2680
2681sub scroll_to_bottom {
2682 my ($self) = @_;
2683
2684 $self->{scroll_to_bottom} = 1;
2685 $self->update;
2491} 2686}
2492 2687
2493sub update { 2688sub update {
2494 my ($self) = @_; 2689 my ($self) = @_;
2495 2690
… …
2497 2692
2498 return unless $self->{h} > 0; 2693 return unless $self->{h} > 0;
2499 2694
2500 delete $self->{texture}; 2695 delete $self->{texture};
2501 2696
2502 $ROOT->on_post_alloc ($self, sub { 2697 $ROOT->on_post_alloc ($self => sub {
2503 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2698 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504 2699
2505 if (delete $self->{need_reflow}) { 2700 if (delete $self->{need_reflow}) {
2506 my $height = 0; 2701 my $height = 0;
2507 2702
2508 my $layout = $self->{layout};
2509
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511
2512 for (@{$self->{par}}) { 2703 for my $para (@{$self->{par}}) {
2513 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2704 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2514 $layout->set_width ($W - $_->[3]); 2705 my $layout = $self->get_layout ($para);
2515 $layout->set_markup ($_->[4]);
2516 my ($w, $h) = $layout->size; 2706 my ($w, $h) = $layout->size;
2517 $_->[0] = $w + $_->[3]; 2707
2518 $_->[1] = $h; 2708 $para->{w} = $w + $para->{indent};
2709 $para->{h} = $h;
2710 $para->{wrapped} = $layout->has_wrapped;
2519 } 2711 }
2520 2712
2521 $height += $_->[1]; 2713 $height += $para->{h};
2522 } 2714 }
2523 2715
2524 $self->{height} = $height; 2716 $self->{height} = $height;
2525 2717
2526 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2718 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2527 2719
2528 delete $self->{texture}; 2720 delete $self->{texture};
2529 } 2721 }
2530 2722
2723 if (delete $self->{scroll_to_bottom}) {
2724 $self->{children}[1]->set_value (1e10);
2725 }
2726
2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2727 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2532 glClearColor 0.5, 0.5, 0.5, 0; 2728 glClearColor 0, 0, 0, 0;
2533 glClear GL_COLOR_BUFFER_BIT; 2729 glClear GL_COLOR_BUFFER_BIT;
2534 2730
2535 my $top = int $self->{children}[1]{range}[0]; 2731 my $top = int $self->{children}[1]{range}[0];
2536 2732
2537 my $y0 = $top; 2733 my $y0 = $top;
2538 my $y1 = $top + $H; 2734 my $y1 = $top + $H;
2539 2735
2540 my $y = 0; 2736 my $y = 0;
2541 2737
2542 my $layout = $self->{layout};
2543
2544 $layout->set_font ($self->{font}) if $self->{font};
2545
2546 glEnable GL_BLEND;
2547 #TODO# not correct in windows where rgba is forced off
2548 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2549
2550 for my $par (@{$self->{par}}) { 2738 for my $para (@{$self->{par}}) {
2551 my $h = $par->[1]; 2739 my $h = $para->{h};
2552 2740
2553 if ($y0 < $y + $h && $y < $y1) { 2741 if ($y0 < $y + $h && $y < $y1) {
2554 $layout->set_foreground (@{ $par->[2] });
2555 $layout->set_width ($W - $par->[3]);
2556 $layout->set_markup ($par->[4]);
2557 2742
2558 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2743 my $layout = $self->get_layout ($para);
2559 2744
2560 glRasterPos $par->[3], $y - $y0; 2745 $layout->render ($para->{indent}, $y - $y0);
2561 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2746
2747 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes;
2749
2750 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, ();
2752
2753 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0;
2755
2756 $_->draw;
2757 }
2758 }
2562 } 2759 }
2563 2760
2564 $y += $h; 2761 $y += $h;
2565 } 2762 }
2566
2567 glDisable GL_BLEND;
2568 }; 2763 };
2569 }); 2764 });
2570} 2765}
2571 2766
2767sub reconfigure {
2768 my ($self) = @_;
2769
2770 $self->SUPER::reconfigure;
2771
2772 $_->{w} = 1e10 for @{ $self->{par} };
2773 $self->reflow;
2774}
2775
2572sub _draw { 2776sub _draw {
2573 my ($self) = @_; 2777 my ($self) = @_;
2574 2778
2575 glEnable GL_TEXTURE_2D; 2779 glEnable GL_TEXTURE_2D;
2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2780 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2577 glColor 1, 1, 1, 1; 2781 glColor 0, 0, 0, 1;
2578 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2782 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2579 glDisable GL_TEXTURE_2D; 2783 glDisable GL_TEXTURE_2D;
2580 2784
2581 $self->{children}[1]->draw; 2785 $self->{children}[1]->draw;
2582
2583} 2786}
2584 2787
2585############################################################################# 2788#############################################################################
2586 2789
2587package CFClient::UI::Animator; 2790package CFClient::UI::Animator;
… …
2674 $tooltip .= "\n\n" . (ref $widget) . "\n" 2877 $tooltip .= "\n\n" . (ref $widget) . "\n"
2675 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2878 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676 . "req $widget->{req_w} $widget->{req_h}\n" 2879 . "req $widget->{req_w} $widget->{req_h}\n"
2677 . "visible $widget->{visible}"; 2880 . "visible $widget->{visible}";
2678 } 2881 }
2882
2883 $tooltip =~ s/^\n+//;
2884 $tooltip =~ s/\n+$//;
2679 2885
2680 $self->add (new CFClient::UI::Label 2886 $self->add (new CFClient::UI::Label
2681 markup => $tooltip, 2887 markup => $tooltip,
2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2888 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2683 fontsize => 0.8, 2889 fontsize => 0.8,
… …
2693 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2899 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2694 2900
2695 ($w + 4, $h + 4) 2901 ($w + 4, $h + 4)
2696} 2902}
2697 2903
2698sub size_allocate { 2904sub invoke_size_allocate {
2699 my ($self, $w, $h) = @_; 2905 my ($self, $w, $h) = @_;
2700 2906
2701 $self->SUPER::size_allocate ($w - 4, $h - 4); 2907 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2702} 2908}
2703 2909
2704sub visibility_change { 2910sub invoke_visibility_change {
2705 my ($self, $visible) = @_; 2911 my ($self, $visible) = @_;
2706 2912
2707 return unless $visible; 2913 return unless $visible;
2708 2914
2709 $self->{root}->on_post_alloc ("move_$self" => sub { 2915 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2711 or return; 2917 or return;
2712 2918
2713 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2919 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714 2920
2715 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2921 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716 if $x + $self->{w} > $::WIDTH; 2922 if $x + $self->{w} > $self->{root}{w};
2717 2923
2718 $self->move_abs ($x, $y); 2924 $self->move_abs ($x, $y);
2719 }); 2925 });
2720} 2926}
2721 2927
… …
2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3016 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2811 3017
2812 if ($tex) { 3018 if ($tex) {
2813 glEnable GL_TEXTURE_2D; 3019 glEnable GL_TEXTURE_2D;
2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3020 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2815 glColor 1, 1, 1, 1; 3021 glColor 0, 0, 0, 1;
2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3022 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2817 glDisable GL_TEXTURE_2D; 3023 glDisable GL_TEXTURE_2D;
2818 } 3024 }
2819} 3025}
2820 3026
2821sub DESTROY { 3027sub destroy {
2822 my ($self) = @_; 3028 my ($self) = @_;
2823 3029
2824 $self->{timer}->cancel 3030 $self->{timer}->cancel
2825 if $self->{timer}; 3031 if $self->{timer};
2826 3032
2827 $self->SUPER::DESTROY; 3033 $self->SUPER::destroy;
2828} 3034}
3035
3036#############################################################################
3037
3038package CFClient::UI::Buttonbar;
3039
3040our @ISA = CFClient::UI::HBox::;
3041
3042# TODO: should actualyl wrap buttons and other goodies.
2829 3043
2830############################################################################# 3044#############################################################################
2831 3045
2832package CFClient::UI::Menu; 3046package CFClient::UI::Menu;
2833 3047
… …
2845 ); 3059 );
2846 3060
2847 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3061 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2848 3062
2849 for my $item (@{ $self->{items} }) { 3063 for my $item (@{ $self->{items} }) {
2850 my ($widget, $cb) = @$item; 3064 my ($widget, $cb, $tooltip) = @$item;
2851 3065
2852 # handle various types of items, only text for now 3066 # handle various types of items, only text for now
2853 if (!ref $widget) { 3067 if (!ref $widget) {
3068 if ($widget =~ /\t/) {
3069 my ($left, $right) = split /\t/, $widget, 2;
3070
3071 $widget = new CFClient::UI::HBox
3072 can_hover => 1,
3073 can_events => 1,
3074 tooltip => $tooltip,
3075 children => [
3076 (new CFClient::UI::Label markup => $left, expand => 1),
3077 (new CFClient::UI::Label markup => $right, align => +1),
3078 ],
3079 ;
3080
3081 } else {
2854 $widget = new CFClient::UI::Label 3082 $widget = new CFClient::UI::Label
2855 can_hover => 1, 3083 can_hover => 1,
2856 can_events => 1, 3084 can_events => 1,
2857 text => $widget; 3085 markup => $widget,
3086 tooltip => $tooltip;
3087 }
2858 } 3088 }
2859 3089
2860 $self->{item}{$widget} = $item; 3090 $self->{item}{$widget} = $item;
2861 3091
2862 $self->{vbox}->add ($widget); 3092 $self->{vbox}->add ($widget);
… …
2867 3097
2868# popup given the event (must be a mouse button down event currently) 3098# popup given the event (must be a mouse button down event currently)
2869sub popup { 3099sub popup {
2870 my ($self, $ev) = @_; 3100 my ($self, $ev) = @_;
2871 3101
2872 $self->_emit ("popdown"); 3102 $self->emit ("popdown");
2873 3103
2874 # maybe save $GRAB? must be careful about events... 3104 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 3105 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 3106 $self->{button} = $ev->{button};
2877 3107
2878 $self->show; 3108 $self->show;
2879 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3109 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2880} 3110}
2881 3111
2882sub mouse_motion { 3112sub invoke_mouse_motion {
2883 my ($self, $ev, $x, $y) = @_; 3113 my ($self, $ev, $x, $y) = @_;
2884 3114
2885 # TODO: should use vbox->find_widget or so 3115 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3116 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 3117 $self->{hover} = $self->{item}{$HOVER};
2888}
2889 3118
3119 0
3120}
3121
2890sub button_up { 3122sub invoke_button_up {
2891 my ($self, $ev, $x, $y) = @_; 3123 my ($self, $ev, $x, $y) = @_;
2892 3124
2893 if ($ev->{button} == $self->{button}) { 3125 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 3126 undef $GRAB;
2895 $self->hide; 3127 $self->hide;
2896 3128
2897 $self->_emit ("popdown"); 3129 $self->emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 3130 $self->{hover}[1]->() if $self->{hover};
3131 } else {
3132 return 0
3133 }
3134
2899 } 3135 1
2900} 3136}
2901 3137
2902############################################################################# 3138#############################################################################
2903 3139
2904package CFClient::UI::Statusbox; 3140package CFClient::UI::Multiplexer;
2905 3141
2906our @ISA = CFClient::UI::VBox::; 3142our @ISA = CFClient::UI::Container::;
2907 3143
2908sub new { 3144sub new {
2909 my $class = shift; 3145 my $class = shift;
2910 3146
2911 $class->SUPER::new ( 3147 my $self = $class->SUPER::new (
3148 @_,
3149 );
3150
3151 $self->{current} = $self->{children}[0]
3152 if @{ $self->{children} };
3153
3154 $self
3155}
3156
3157sub add {
3158 my ($self, @widgets) = @_;
3159
3160 $self->SUPER::add (@widgets);
3161
3162 $self->{current} = $self->{children}[0]
3163 if @{ $self->{children} };
3164}
3165
3166sub get_current_page {
3167 my ($self) = @_;
3168
3169 $self->{current}
3170}
3171
3172sub set_current_page {
3173 my ($self, $page_or_widget) = @_;
3174
3175 my $widget = ref $page_or_widget
3176 ? $page_or_widget
3177 : $self->{children}[$page_or_widget];
3178
3179 $self->{current} = $widget;
3180 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3181
3182 $self->emit (page_changed => $self->{current});
3183
3184 $self->realloc;
3185}
3186
3187sub visible_children {
3188 $_[0]{current}
3189}
3190
3191sub size_request {
3192 my ($self) = @_;
3193
3194 $self->{current}->size_request
3195}
3196
3197sub invoke_size_allocate {
3198 my ($self, $w, $h) = @_;
3199
3200 $self->{current}->configure (0, 0, $w, $h);
3201
3202 1
3203}
3204
3205sub _draw {
3206 my ($self) = @_;
3207
3208 $self->{current}->draw;
3209}
3210
3211#############################################################################
3212
3213package CFClient::UI::Notebook;
3214
3215our @ISA = CFClient::UI::VBox::;
3216
3217sub new {
3218 my $class = shift;
3219
3220 my $self = $class->SUPER::new (
3221 buttonbar => (new CFClient::UI::Buttonbar),
3222 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3223 # filter => # will be put between multiplexer and $self
3224 @_,
3225 );
3226
3227 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3228 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3229
3230 $self
3231}
3232
3233sub add {
3234 my ($self, $title, $widget, $tooltip) = @_;
3235
3236 Scalar::Util::weaken $self;
3237
3238 $self->{buttonbar}->add (new CFClient::UI::Button
3239 markup => $title,
3240 tooltip => $tooltip,
3241 on_activate => sub { $self->set_current_page ($widget) },
3242 );
3243
3244 $self->{multiplexer}->add ($widget);
3245}
3246
3247sub get_current_page {
3248 my ($self) = @_;
3249
3250 $self->{multiplexer}->get_current_page
3251}
3252
3253sub set_current_page {
3254 my ($self, $page) = @_;
3255
3256 $self->{multiplexer}->set_current_page ($page);
3257 $self->emit (page_changed => $self->{multiplexer}{current});
3258}
3259
3260#############################################################################
3261
3262package CFClient::UI::Combobox;
3263
3264use utf8;
3265
3266our @ISA = CFClient::UI::Button::;
3267
3268sub new {
3269 my $class = shift;
3270
3271 my $self = $class->SUPER::new (
3272 options => [], # [value, title, longdesc], ...
3273 value => undef,
3274 @_,
3275 );
3276
3277 $self->_set_value ($self->{value});
3278
3279 $self
3280}
3281
3282sub invoke_button_down {
3283 my ($self, $ev) = @_;
3284
3285 my @menu_items;
3286
3287 for (@{ $self->{options} }) {
3288 my ($value, $title, $tooltip) = @$_;
3289
3290 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3291 }
3292
3293 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3294}
3295
3296sub _set_value {
3297 my ($self, $value) = @_;
3298
3299 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3300 or return;
3301
3302 $self->{value} = $item->[0];
3303 $self->set_markup ("$item->[1] ⇓");
3304 $self->set_tooltip ($item->[2]);
3305}
3306
3307sub set_value {
3308 my ($self, $value) = @_;
3309
3310 return unless $self->{value} ne $value;
3311
3312 $self->_set_value ($value);
3313 $self->emit (changed => $value);
3314}
3315
3316#############################################################################
3317
3318package CFClient::UI::Statusbox;
3319
3320our @ISA = CFClient::UI::VBox::;
3321
3322sub new {
3323 my $class = shift;
3324
3325 my $self = $class->SUPER::new (
2912 fontsize => 0.8, 3326 fontsize => 0.8,
2913 @_, 3327 @_,
2914 ) 3328 );
3329
3330 Scalar::Util::weaken (my $this = $self);
3331
3332 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3333
3334 $self
2915} 3335}
2916 3336
2917sub reorder { 3337sub reorder {
2918 my ($self) = @_; 3338 my ($self) = @_;
2919 my $NOW = time; 3339 my $NOW = Time::HiRes::time;
3340
3341 # freeze display when hovering over any label
3342 return if $CFClient::UI::TOOLTIP->{owner}
3343 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3344 values %{ $self->{item} };
2920 3345
2921 while (my ($k, $v) = each %{ $self->{item} }) { 3346 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3347 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 3348 }
2924 3349
… …
2927 my @items = sort { 3352 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 3353 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 3354 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 3355 } values %{ $self->{item} };
2931 3356
3357 $self->{timer}->interval (1);
3358
2932 my $count = 10 + 1; 3359 my $count = 10 + 1;
2933 for my $item (@items) { 3360 for my $item (@items) {
2934 last unless --$count; 3361 last unless --$count;
2935 3362
2936 push @widgets, $item->{label} ||= do { 3363 my $label = $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all) 3364 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1 3365 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}" 3366 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text}; 3367 : $item->{text};
2941 3368
… …
2949 tooltip => $item->{tooltip}, 3376 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP, 3377 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 3378 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 3379 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 3380 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 3381 fg => [@{ $item->{fg} }],
2955 can_events => 1, 3382 can_events => 1,
2956 can_hover => 1 3383 can_hover => 1
2957 }; 3384 };
3385
3386 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3387 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3388 $label->update;
3389 $label->set_max_size (undef, $label->{req_h} * $diff)
3390 if $diff < 1;
3391 $self->{timer}->interval (1/30);
3392 } else {
3393 $label->{fg}[3] = $item->{fg}[3] || 1;
3394 }
3395
3396 push @widgets, $label;
2958 } 3397 }
2959 3398
2960 $self->clear; 3399 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 3400 $self->SUPER::add (reverse @widgets);
2962} 3401}
… …
2967 $text =~ s/^\s+//; 3406 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 3407 $text =~ s/\s+$//;
2969 3408
2970 return unless $text; 3409 return unless $text;
2971 3410
2972 my $timeout = time + ((delete $arg{timeout}) || 60); 3411 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2973 3412
2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3413 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975 3414
2976 if (my $item = $self->{item}{$group}) { 3415 if (my $item = $self->{item}{$group}) {
2977 if ($item->{text} eq $text) { 3416 if ($item->{text} eq $text) {
2978 $item->{count}++; 3417 $item->{count}++;
2979 } else { 3418 } else {
2980 $item->{count} = 1; 3419 $item->{count} = 1;
2981 $item->{text} = $item->{tooltip} = $text; 3420 $item->{text} = $item->{tooltip} = $text;
2982 } 3421 }
2983 $item->{id} = ++$self->{id}; 3422 $item->{id} += 0.2;#d#
2984 $item->{timeout} = $timeout; 3423 $item->{timeout} = $timeout;
2985 delete $item->{label}; 3424 delete $item->{label};
2986 } else { 3425 } else {
2987 $self->{item}{$group} = { 3426 $self->{item}{$group} = {
2988 id => ++$self->{id}, 3427 id => ++$self->{id},
… …
2994 count => 1, 3433 count => 1,
2995 %arg, 3434 %arg,
2996 }; 3435 };
2997 } 3436 }
2998 3437
3438 $ROOT->on_refresh (reorder => sub {
2999 $self->reorder; 3439 $self->reorder;
3440 });
3000} 3441}
3001 3442
3002sub reconfigure { 3443sub reconfigure {
3003 my ($self) = @_; 3444 my ($self) = @_;
3004 3445
… …
3007 3448
3008 $self->reorder; 3449 $self->reorder;
3009 $self->SUPER::reconfigure; 3450 $self->SUPER::reconfigure;
3010} 3451}
3011 3452
3453sub destroy {
3454 my ($self) = @_;
3455
3456 $self->{timer}->cancel;
3457
3458 $self->SUPER::destroy;
3459}
3460
3012############################################################################# 3461#############################################################################
3013 3462
3014package CFClient::UI::Inventory; 3463package CFClient::UI::Inventory;
3015 3464
3016our @ISA = CFClient::UI::ScrolledWindow::; 3465our @ISA = CFClient::UI::Table::;
3017 3466
3018sub new { 3467sub new {
3019 my $class = shift; 3468 my $class = shift;
3020 3469
3021 my $self = $class->SUPER::new ( 3470 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3471 col_expand => [0, 1, 0],
3023 @_, 3472 @_,
3024 ); 3473 );
3025 3474
3026 $self 3475 $self
3027} 3476}
3028 3477
3029sub set_items { 3478sub set_items {
3030 my ($self, $items) = @_; 3479 my ($self, $items) = @_;
3031 3480
3032 $self->{scrolled}->clear; 3481 $self->clear;
3033 return unless $items; 3482 return unless $items;
3034 3483
3035 my @items = sort { 3484 my @items = sort {
3036 ($a->{type} <=> $b->{type}) 3485 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name}) 3486 or ($a->{name} cmp $b->{name})
3038 } @$items; 3487 } values %$items;
3039 3488
3040 $self->{real_items} = \@items; 3489 $self->{real_items} = \@items;
3041 3490
3042 my $row = 0; 3491 my $row = 0;
3043 for my $item (@items) { 3492 for my $item (@items) {
3044 CFClient::Item::update_widgets $item; 3493 CFClient::Item::update_widgets $item;
3045 3494
3046 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3495 $self->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3496 $self->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3497 $self->add (2, $row, $item->{weight_widget});
3049 3498
3050 $row++; 3499 $row++;
3051 } 3500 }
3052} 3501}
3053 3502
3054############################################################################# 3503#############################################################################
3055 3504
3056package CFClient::UI::BindEditor; 3505package CFClient::UI::SpellList;
3057 3506
3058our @ISA = CFClient::UI::FancyFrame::; 3507our @ISA = CFClient::UI::Table::;
3059 3508
3060sub new { 3509sub new {
3061 my $class = shift; 3510 my $class = shift;
3062 3511
3063 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3512 my $self = $class->SUPER::new (
3513 binding => [],
3514 commands => [],
3515 @_,
3516 )
3517}
3064 3518
3065 $self->add (my $vb = new CFClient::UI::VBox); 3519my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3066 3520
3521my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3522 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3523my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3524 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3525my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3526 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3527my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3528 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3529my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3067 3531
3068 $vb->add ($self->{rec_btn} = new CFClient::UI::Button 3532sub rebuild_spell_list {
3069 text => "start recording", 3533 my ($self) = @_;
3070 tooltip => "Start/Stops recording of actions." 3534
3071 ."All subsequent actions after the recording started will be captured." 3535 $CFClient::UI::ROOT->on_refresh ($self => sub {
3072 ."The actions are displayed after the record was stopped." 3536 $self->clear;
3073 ."To bind the action you have to click on the 'Bind' button", 3537
3074 on_activate => sub { 3538 return unless $::CONN;
3075 unless ($self->{recording}) { 3539
3076 $self->start; 3540 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3541 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3542 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3543 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3544 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3545
3546 my $row = 0;
3547
3548 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3549 my $spell = $self->{spell}{$_};
3550
3551 $row++;
3552
3553 my $spell_cb = sub {
3554 my ($widget, $ev) = @_;
3555
3556 if ($ev->{button} == 1) {
3557 $::CONN->user_send ("cast $spell->{name}");
3558 } elsif ($ev->{button} == 2) {
3559 $::CONN->user_send ("invoke $spell->{name}");
3560 } elsif ($ev->{button} == 3) {
3561 (new CFClient::UI::Menu
3562 items => [
3563 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3564 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3565 ],
3566 )->popup ($ev);
3077 } else { 3567 } else {
3078 $self->stop; 3568 return 0;
3569 }
3570
3571 1
3079 } 3572 };
3573
3574 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3575
3576 #TODO: add path info to tooltip
3577 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3578
3579 $self->add (0, $row, new CFClient::UI::Face
3580 face => $spell->{face},
3581 can_hover => 1,
3582 can_events => 1,
3583 tooltip => $tooltip,
3584 on_button_down => $spell_cb,
3585 );
3586
3587 $self->add (1, $row, new CFClient::UI::Label
3588 expand => 1,
3589 text => $spell->{name},
3590 can_hover => 1,
3591 can_events => 1,
3592 tooltip => $tooltip,
3593 on_button_down => $spell_cb,
3594 );
3595
3596 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3597 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3080 }); 3600 }
3081
3082 $vb->add (new CFClient::UI::Label text => "Actions:");
3083 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3084
3085 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3086 $vb->add (my $hb = new CFClient::UI::HBox);
3087 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3088 $hb->add (new CFClient::UI::Button
3089 text => "bind",
3090 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3091 on_activate => sub {
3092 $self->ask_for_bind;
3093 });
3094
3095 $vb->add (my $hb = new CFClient::UI::HBox);
3096 $hb->add (new CFClient::UI::Button
3097 text => "ok",
3098 expand => 1,
3099 tooltip => "This closes the binding editor and saves the binding",
3100 on_activate => sub {
3101 $self->hide;
3102 $self->commit;
3103 });
3104
3105 $hb->add (new CFClient::UI::Button
3106 text => "cancel",
3107 expand => 1,
3108 tooltip => "This closes the binding editor without saving",
3109 on_activate => sub {
3110 $self->hide;
3111 $self->{binding_cancel}->()
3112 if $self->{binding_cancel};
3113 });
3114
3115 $self->update_binding_widgets;
3116
3117 $self
3118}
3119
3120sub commit {
3121 my ($self) = @_;
3122 my ($mod, $sym, $cmds) = $self->get_binding;
3123 if ($sym != 0 && @$cmds > 0) {
3124 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3125 ."'. Don't forget 'Save Config'!");
3126 $self->{binding_change}->($mod, $sym, $cmds)
3127 if $self->{binding_change};
3128 } else {
3129 $::STATUSBOX->add ("No action bound, no key or action specified!");
3130 $self->{binding_cancel}->()
3131 if $self->{binding_cancel};
3132 }
3133}
3134
3135sub start {
3136 my ($self) = @_;
3137
3138 $self->{rec_btn}->set_text ("stop recording");
3139 $self->{recording} = 1;
3140 $self->clear_command_list;
3141 $::CONN->start_record if $::CONN;
3142}
3143
3144sub stop {
3145 my ($self) = @_;
3146
3147 $self->{rec_btn}->set_text ("start recording");
3148 $self->{recording} = 0;
3149
3150 my $rec;
3151 $rec = $::CONN->stop_record if $::CONN;
3152 return unless ref $rec eq 'ARRAY';
3153 $self->set_command_list ($rec);
3154}
3155
3156
3157sub ask_for_bind_and_commit {
3158 my ($self) = @_;
3159 $self->ask_for_bind (1);
3160}
3161
3162sub ask_for_bind {
3163 my ($self, $commit) = @_;
3164
3165 CFClient::Binder::open_binding_dialog (sub {
3166 my ($mod, $sym) = @_;
3167 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3168 $self->update_binding_widgets;
3169 $self->commit if $commit;
3170 }); 3601 });
3171} 3602}
3172 3603
3173# $mod and $sym are the modifiers and key symbol
3174# $cmds is a array ref of strings (the commands)
3175# $cb is the callback that is executed on OK
3176# $ccb is the callback that is executed on CANCEL and
3177# when the binding was unsuccessful on OK
3178sub set_binding {
3179 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3180
3181 $self->clear_command_list;
3182 $self->{recording} = 0;
3183 $self->{rec_btn}->set_text ("start recording");
3184
3185 $self->{binding} = [$mod, $sym];
3186 $self->{commands} = $cmds;
3187
3188 $self->{binding_change} = $cb;
3189 $self->{binding_cancel} = $ccb;
3190
3191 $self->update_binding_widgets;
3192}
3193
3194# this is a shortcut method that asks for a binding
3195# and then just binds it.
3196sub do_quick_binding {
3197 my ($self, $cmds) = @_;
3198 $self->set_binding (undef, undef, $cmds, sub {
3199 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3200 });
3201 $self->ask_for_bind (1);
3202}
3203
3204sub update_binding_widgets {
3205 my ($self) = @_;
3206 my ($mod, $sym, $cmds) = $self->get_binding;
3207 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3208 $self->set_command_list ($cmds);
3209}
3210
3211sub get_binding {
3212 my ($self) = @_;
3213 return (
3214 $self->{binding}->[0],
3215 $self->{binding}->[1],
3216 [ grep { defined $_ } @{$self->{commands}} ]
3217 );
3218}
3219
3220sub clear_command_list {
3221 my ($self) = @_;
3222 $self->{cmdbox}->clear ();
3223}
3224
3225sub set_command_list {
3226 my ($self, $cmds) = @_;
3227
3228 $self->{cmdbox}->clear ();
3229 $self->{commands} = $cmds;
3230
3231 my $idx = 0;
3232
3233 for (@$cmds) {
3234 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3235
3236 my $i = $idx;
3237 $hb->add (new CFClient::UI::Label text => $_);
3238 $hb->add (new CFClient::UI::Button
3239 text => "delete",
3240 tooltip => "Deletes the action from the record",
3241 on_activate => sub {
3242 $self->{cmdbox}->remove ($hb);
3243 $cmds->[$i] = undef;
3244 });
3245
3246
3247 $idx++
3248 }
3249}
3250
3251#############################################################################
3252
3253package CFClient::UI::SpellList;
3254
3255our @ISA = CFClient::UI::FancyFrame::;
3256
3257sub new {
3258 my $class = shift;
3259
3260 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3261
3262 $self->add (new CFClient::UI::ScrolledWindow
3263 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3264
3265 $self;
3266}
3267
3268# XXX: Do sorting? Argl...
3269sub add_spell { 3604sub add_spell {
3270 my ($self, $spell) = @_; 3605 my ($self, $spell) = @_;
3606
3271 $self->{spells}->{$spell->{name}} = $spell; 3607 $self->{spell}->{$spell->{name}} = $spell;
3272 3608 $self->rebuild_spell_list;
3273 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3274 face => $spell->{face},
3275 can_hover => 1,
3276 can_events => 1,
3277 tooltip => $spell->{message});
3278
3279 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3280 text => $spell->{name},
3281 can_hover => 1,
3282 can_events => 1,
3283 tooltip => $spell->{message},
3284 expand => 1);
3285
3286 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3287 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3288 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3289 expand => 1);
3290
3291 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3292 text => "bind to key",
3293 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3294}
3295
3296sub rebuild_spell_list {
3297 my ($self) = @_;
3298 $self->{tbl_idx} = 0;
3299 $self->add_spell ($_) for values %{$self->{spells}};
3300} 3609}
3301 3610
3302sub remove_spell { 3611sub remove_spell {
3303 my ($self, $spell) = @_; 3612 my ($self, $spell) = @_;
3613
3304 delete $self->{spells}->{$spell->{name}}; 3614 delete $self->{spell}->{$spell->{name}};
3305 $self->rebuild_spell_list; 3615 $self->rebuild_spell_list;
3306} 3616}
3307 3617
3618sub clear_spells {
3619 my ($self) = @_;
3620
3621 $self->{spell} = {};
3622 $self->rebuild_spell_list;
3623}
3624
3308############################################################################# 3625#############################################################################
3309 3626
3310package CFClient::UI::Root; 3627package CFClient::UI::Root;
3311 3628
3312our @ISA = CFClient::UI::Container::; 3629our @ISA = CFClient::UI::Container::;
3630
3631use List::Util qw(min max);
3313 3632
3314use CFClient::OpenGL; 3633use CFClient::OpenGL;
3315 3634
3316sub new { 3635sub new {
3317 my $class = shift; 3636 my $class = shift;
… …
3344 $coord = $max - $size if $coord > $max - $size; 3663 $coord = $max - $size if $coord > $max - $size;
3345 3664
3346 int $coord + 0.5 3665 int $coord + 0.5
3347} 3666}
3348 3667
3349sub size_allocate { 3668sub invoke_size_allocate {
3350 my ($self, $w, $h) = @_; 3669 my ($self, $w, $h) = @_;
3351 3670
3352 for my $child ($self->children) { 3671 for my $child ($self->children) {
3353 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3672 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3354 3673
… …
3358 $X = _to_pixel $X, $W, $self->{w}; 3677 $X = _to_pixel $X, $W, $self->{w};
3359 $Y = _to_pixel $Y, $H, $self->{h}; 3678 $Y = _to_pixel $Y, $H, $self->{h};
3360 3679
3361 $child->configure ($X, $Y, $W, $H); 3680 $child->configure ($X, $Y, $W, $H);
3362 } 3681 }
3682
3683 1
3363} 3684}
3364 3685
3365sub coord2local { 3686sub coord2local {
3366 my ($self, $x, $y) = @_; 3687 my ($self, $x, $y) = @_;
3367 3688
… …
3452 3773
3453 delete $queue{$widget+0}; 3774 delete $queue{$widget+0};
3454 3775
3455 my ($w, $h) = $widget->size_request; 3776 my ($w, $h) = $widget->size_request;
3456 3777
3457 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3778 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3458 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3779 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3780
3781 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3782 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3459 3783
3460 $w = $widget->{force_w} if exists $widget->{force_w}; 3784 $w = $widget->{force_w} if exists $widget->{force_w};
3461 $h = $widget->{force_h} if exists $widget->{force_h}; 3785 $h = $widget->{force_h} if exists $widget->{force_h};
3462 3786
3463 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3787 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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