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.371 by root, Sun Jul 15 22:07:48 2007 UTC vs.
Revision 1.451 by root, Wed Dec 26 19:11:13 2007 UTC

2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use List::Util (); 6use List::Util ();
7use Event;
8 7
9use CFPlus; 8use CFPlus;
10use CFPlus::Pod; 9use CFPlus::Pod;
11use CFPlus::Texture; 10use CFPlus::Texture;
12 11
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
30 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 33
33 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
34 35
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 37 $TOOLTIP->show;
41 } 38 }
42 39
43 return; 40 return;
46 } 43 }
47 44
48 $TOOLTIP->hide; 45 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
51}); 48};
52 49
53sub get_layout { 50sub get_layout {
54 my $layout; 51 my $layout;
55 52
56 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
91 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
92 89
93 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 92
96 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
97 } 94 }
98} 95}
99 96
100sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
101 my ($ev) = @_; 98 my ($ev) = @_;
107 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
108 105
109 $GRAB = $widget; 106 $GRAB = $widget;
110 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
111 108
112 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
113 } 110 }
114 111
115 if ($GRAB) { 112 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 114 # mousewheel
118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9; 115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
117
118 $ev->{dx} = $shift ? $delta : 0;
119 $ev->{dy} = $shift ? 0 : $delta;
120
120 $GRAB->emit (mouse_wheel => $ev); 121 $GRAB->emit (mouse_wheel => $ev);
121 } else { 122 } else {
122 $GRAB->emit (button_down => $ev) 123 $GRAB->emit (button_down => $ev)
123 } 124 }
124 } 125 }
138 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
139 $grab->update if $grab; 140 $grab->update if $grab;
140 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
141 142
142 check_hover $widget; 143 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
144 } 145 }
145} 146}
146 147
147sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
148 my ($ev) = @_; 149 my ($ev) = @_;
269 $self->emit ("destroy"); 270 $self->emit ("destroy");
270 %$self = (); 271 %$self = ();
271} 272}
272 273
273sub TO_JSON { 274sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} } 275 { "\fw" => $_[0]{s_id} }
275} 276}
276 277
277sub show { 278sub show {
278 my ($self) = @_; 279 my ($self) = @_;
279 280
308 delete $self->{root}; 309 delete $self->{root};
309 310
310 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
311 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
312 313
313 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $CFPlus::UI::TOOLTIP_WATCHER->invoke
314 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
315 316
316 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
317 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
318} 319}
358 359
359 $self->{force_w} = $w; 360 $self->{force_w} = $w;
360 $self->{force_h} = $h; 361 $self->{force_h} = $h;
361 362
362 $self->realloc; 363 $self->realloc;
364}
365
366# traverse the widget chain up to find the maximum "physical" size constraints
367sub get_max_wh {
368 my ($self) = @_;
369
370 return $self->{parent}->get_max_wh
371 if $self->{parent};
372
373 ($::WIDTH, $::HEIGHT)
363} 374}
364 375
365sub size_request { 376sub size_request {
366 require Carp; 377 require Carp;
367 Carp::confess "size_request is abstract"; 378 Carp::confess "size_request is abstract";
429 440
430 $self->{tooltip} = $tooltip; 441 $self->{tooltip} = $tooltip;
431 442
432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 443 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
433 delete $CFPlus::UI::TOOLTIP->{owner}; 444 delete $CFPlus::UI::TOOLTIP->{owner};
434 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 445 $CFPlus::UI::TOOLTIP_WATCHER->invoke;
435 } 446 }
436} 447}
437 448
438# translate global coordinates to local coordinate system 449# translate global coordinates to local coordinate system
439sub coord2local { 450sub coord2local {
440 my ($self, $x, $y) = @_; 451 my ($self, $x, $y) = @_;
441 452
442 Carp::confess unless $self->{parent};#d# 453 return (undef, undef) unless $self->{parent};
443 454
444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 455 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
445} 456}
446 457
447# translate local coordinates to global coordinate system 458# translate local coordinates to global coordinate system
448sub coord2global { 459sub coord2global {
449 my ($self, $x, $y) = @_; 460 my ($self, $x, $y) = @_;
450 461
451 Carp::confess unless $self->{parent};#d# 462 return (undef, undef) unless $self->{parent};
452 463
453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 464 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
454} 465}
455 466
456sub invoke_focus_in { 467sub invoke_focus_in {
547 558
548 # parent 559 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 560 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 561}
551 562
552sub find_widget { 563#sub find_widget {
553 my ($self, $x, $y) = @_; 564# in .xs
554
555 return () unless $self->{can_events};
556
557 return $self
558 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561 ()
562}
563 565
564sub set_parent { 566sub set_parent {
565 my ($self, $parent) = @_; 567 my ($self, $parent) = @_;
566 568
567 CFPlus::weaken ($self->{parent} = $parent); 569 CFPlus::weaken ($self->{parent} = $parent);
598 600
599# using global variables seems a bit hacky, but passing through all drawing 601# using global variables seems a bit hacky, but passing through all drawing
600# functions seems pointless. 602# functions seems pointless.
601our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 603our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602 604
603sub draw { 605#sub draw {
604 my ($self) = @_; 606#CFPlus.xs
605
606 return unless $self->{h} && $self->{w};
607
608 # update screen rectangle
609 local $draw_x = $draw_x + $self->{x};
610 local $draw_y = $draw_y + $self->{y};
611
612 # skip widgets that are entirely outside the drawing area
613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
615
616 glPushMatrix;
617 glTranslate $self->{x}, $self->{y}, 0;
618
619 if ($self == $HOVER && $self->{can_hover}) {
620 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
621 glEnable GL_BLEND;
622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623 glBegin GL_QUADS;
624 glVertex 0 , 0;
625 glVertex $self->{w}, 0;
626 glVertex $self->{w}, $self->{h};
627 glVertex 0 , $self->{h};
628 glEnd;
629 glDisable GL_BLEND;
630 }
631
632 if ($ENV{CFPLUS_DEBUG} & 1) {
633 glPushMatrix;
634 glColor 1, 1, 0, 1;
635 glTranslate 0.375, 0.375;
636 glBegin GL_LINE_LOOP;
637 glVertex 0 , 0;
638 glVertex $self->{w} - 1, 0;
639 glVertex $self->{w} - 1, $self->{h} - 1;
640 glVertex 0 , $self->{h} - 1;
641 glEnd;
642 glPopMatrix;
643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
644 }
645
646 $self->_draw;
647 glPopMatrix;
648}
649 607
650sub _draw { 608sub _draw {
651 my ($self) = @_; 609 my ($self) = @_;
652 610
653 warn "no draw defined for $self\n"; 611 warn "no draw defined for $self\n";
654} 612}
655 613
656my $cntx;#d#
657sub DESTROY { 614sub DESTROY {
658 my ($self) = @_; 615 my ($self) = @_;
659 616
660 return if CFPlus::in_destruct; 617 return if CFPlus::in_destruct;
661 618
619 local $@;
662 eval { $self->destroy }; 620 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 621 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664 622
665 delete $WIDGET{$self+0}; 623 delete $WIDGET{$self+0};
666} 624}
674use strict; 632use strict;
675use CFPlus::OpenGL; 633use CFPlus::OpenGL;
676 634
677sub new { 635sub new {
678 my $class = shift; 636 my $class = shift;
679
680 # range [value, low, high, page]
681 637
682 $class->SUPER::new ( 638 $class->SUPER::new (
683 #bg => [0, 0, 0, 0.2], 639 #bg => [0, 0, 0, 0.2],
684 #active_bg => [1, 1, 1, 0.5], 640 #active_bg => [1, 1, 1, 0.5],
685 @_ 641 @_
697 my ($w, $h) = @$self{qw(w h)}; 653 my ($w, $h) = @$self{qw(w h)};
698 654
699 glEnable GL_BLEND; 655 glEnable GL_BLEND;
700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 656 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701 glColor_premultiply @$color; 657 glColor_premultiply @$color;
702
703 glBegin GL_QUADS;
704 glVertex 0 , 0;
705 glVertex 0 , $h;
706 glVertex $w, $h; 658 glRect 0, 0, $w, $h;
707 glVertex $w, 0;
708 glEnd;
709
710 glDisable GL_BLEND; 659 glDisable GL_BLEND;
711 } 660 }
712} 661}
713 662
714############################################################################# 663#############################################################################
746 can_events => 0, 695 can_events => 0,
747 %arg, 696 %arg,
748 ); 697 );
749 698
750 $self->add (@$children) 699 $self->add (@$children)
751 if $children; 700 if $children && @$children;
752 701
753 $self 702 $self
754} 703}
755 704
756sub realloc { 705sub realloc {
765 my ($self, @widgets) = @_; 714 my ($self, @widgets) = @_;
766 715
767 $_->set_parent ($self) 716 $_->set_parent ($self)
768 for @widgets; 717 for @widgets;
769 718
719 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 720 use sort 'stable';
771 721
772 $self->{children} = [ 722 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 723 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 724 @{$self->{children}}, @widgets
775 ]; 725 ];
776 726
777 $self->realloc; 727 $self->realloc;
728
729 $self->emit (c_add => \@widgets);
730
731 map $_+0, @widgets
778} 732}
779 733
780sub children { 734sub children {
781 @{ $_[0]{children} } 735 @{ $_[0]{children} }
782} 736}
783 737
784sub remove { 738sub remove {
785 my ($self, $child) = @_; 739 my ($self, @widgets) = @_;
786 740
741 $self->emit (c_remove => \@widgets);
742
743 for my $child (@widgets) {
787 delete $child->{parent}; 744 delete $child->{parent};
788 $child->hide; 745 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 746 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
747 }
791 748
792 $self->realloc; 749 $self->realloc;
793} 750}
794 751
795sub clear { 752sub clear {
796 my ($self) = @_; 753 my ($self) = @_;
797 754
798 my $children = delete $self->{children}; 755 my $children = $self->{children};
799 $self->{children} = []; 756 $self->{children} = [];
800 757
801 for (@$children) { 758 for (@$children) {
802 delete $_->{parent}; 759 delete $_->{parent};
803 $_->hide; 760 $_->hide;
823} 780}
824 781
825sub _draw { 782sub _draw {
826 my ($self) = @_; 783 my ($self) = @_;
827 784
828 $_->draw for @{$self->{children}}; 785 $_->draw for $self->visible_children;
829} 786}
830 787
831############################################################################# 788#############################################################################
832 789
833package CFPlus::UI::Bin; 790package CFPlus::UI::Bin;
843} 800}
844 801
845sub add { 802sub add {
846 my ($self, $child) = @_; 803 my ($self, $child) = @_;
847 804
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 805 $self->clear;
849 $self->SUPER::add ($child); 806 $self->SUPER::add ($child);
850} 807}
851 808
852sub remove { 809sub remove {
853 my ($self, $widget) = @_; 810 my ($self, $widget) = @_;
871 828
872 1 829 1
873} 830}
874 831
875############################################################################# 832#############################################################################
876
877# back-buffered drawing area 833# back-buffered drawing area
878 834
879package CFPlus::UI::Window; 835package CFPlus::UI::Window;
880 836
881our @ISA = CFPlus::UI::Bin::; 837our @ISA = CFPlus::UI::Bin::;
943} 899}
944 900
945############################################################################# 901#############################################################################
946 902
947package CFPlus::UI::ViewPort; 903package CFPlus::UI::ViewPort;
904
905use List::Util qw(min max);
948 906
949our @ISA = CFPlus::UI::Window::; 907our @ISA = CFPlus::UI::Window::;
950 908
951sub new { 909sub new {
952 my $class = shift; 910 my $class = shift;
961sub size_request { 919sub size_request {
962 my ($self) = @_; 920 my ($self) = @_;
963 921
964 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 922 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965 923
966 $w = 10 if $self->{scroll_x}; 924 $w = 1 if $self->{scroll_x};
967 $h = 10 if $self->{scroll_y}; 925 $h = 1 if $self->{scroll_y};
968 926
969 ($w, $h) 927 ($w, $h)
970} 928}
971 929
972sub invoke_size_allocate { 930sub invoke_size_allocate {
984} 942}
985 943
986sub set_offset { 944sub set_offset {
987 my ($self, $x, $y) = @_; 945 my ($self, $x, $y) = @_;
988 946
947 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
948 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
949
950 if ($x != $self->{view_x} or $y != $self->{view_y}) {
989 $self->{view_x} = int $x; 951 $self->{view_x} = $x;
990 $self->{view_y} = int $y; 952 $self->{view_y} = $y;
991 953
954 $self->emit (changed => $x, $y);
992 $self->update; 955 $self->update;
956 }
957}
958
959sub set_center {
960 my ($self, $x, $y) = @_;
961
962 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
963}
964
965sub make_visible {
966 my ($self, $x, $y, $border) = @_;
967
968 if ( $x < $self->{view_x} + $self->{w} * $border
969 || $x > $self->{view_x} + $self->{w} * (1 - $border)
970 || $y < $self->{view_y} + $self->{h} * $border
971 || $y > $self->{view_y} + $self->{h} * (1 - $border)
972 ) {
973 $self->set_center ($x, $y);
974 }
993} 975}
994 976
995# hmm, this does not work for topleft of $self... but we should not ask for that 977# hmm, this does not work for topleft of $self... but we should not ask for that
996sub coord2local { 978sub coord2local {
997 my ($self, $x, $y) = @_; 979 my ($self, $x, $y) = @_;
1012 my ($self, $x, $y) = @_; 994 my ($self, $x, $y) = @_;
1013 995
1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 997 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016 ) { 998 ) {
1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1018 } else { 1000 } else {
1019 $self->CFPlus::UI::Base::find_widget ($x, $y) 1001 $self->CFPlus::UI::Base::find_widget ($x, $y)
1020 } 1002 }
1021} 1003}
1022 1004
1043 my $child = delete $arg{child}; 1025 my $child = delete $arg{child};
1044 1026
1045 my $self; 1027 my $self;
1046 1028
1047 my $hslider = new CFPlus::UI::Slider 1029 my $hslider = new CFPlus::UI::Slider
1030 c_col => 0,
1031 c_row => 1,
1048 vertical => 0, 1032 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix 1033 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub { 1034 on_changed => sub {
1051 $self->{hpos} = $_[1]; 1035 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1036 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 }, 1037 },
1054 ; 1038 ;
1055 1039
1056 my $vslider = new CFPlus::UI::Slider 1040 my $vslider = new CFPlus::UI::Slider
1041 c_col => 1,
1042 c_row => 0,
1057 vertical => 1, 1043 vertical => 1,
1058 range => [0, 0, 1, 0.01], # HACK fix 1044 range => [0, 0, 1, 0.01], # HACK fix
1059 on_changed => sub { 1045 on_changed => sub {
1060 $self->{vpos} = $_[1]; 1046 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1047 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1062 }, 1048 },
1063 ; 1049 ;
1064 1050
1065 $self = $class->SUPER::new ( 1051 $self = $class->SUPER::new (
1066 vp => (new CFPlus::UI::ViewPort expand => 1), 1052 scroll_x => 0,
1053 scroll_y => 1,
1067 can_events => 1, 1054 can_events => 1,
1068 hslider => $hslider, 1055 hslider => $hslider,
1069 vslider => $vslider, 1056 vslider => $vslider,
1070 col_expand => [1, 0], 1057 col_expand => [1, 0],
1071 row_expand => [1, 0], 1058 row_expand => [1, 0],
1072 %arg, 1059 %arg,
1073 ); 1060 );
1074 1061
1062 $self->{vp} = new CFPlus::UI::ViewPort
1063 c_col => 0,
1064 c_row => 0,
1065 expand => 1,
1066 scroll_x => $self->{scroll_x},
1067 scroll_y => $self->{scroll_y},
1068 on_changed => sub {
1069 my ($vp, $x, $y) = @_;
1070
1071 $vp->{parent}{hslider}->set_value ($x);
1072 $vp->{parent}{vslider}->set_value ($y);
1073
1074 0
1075 },
1076 on_size_allocate => sub {
1077 my ($vp, $w, $h) = @_;
1078 $vp->{parent}->update_slider;
1079 0
1080 },
1081 ;
1082
1075 $self->SUPER::add (0, 0, $self->{vp}); 1083 $self->SUPER::add ($self->{vp});
1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078 1084
1079 $self->add ($child) if $child; 1085 $self->add ($child) if $child;
1080 1086
1081 $self 1087 $self
1082} 1088}
1083
1084#TODO# update range on size_allocate depending on child
1085 1089
1086sub add { 1090sub add {
1087 my ($self, $widget) = @_; 1091 my ($self, $widget) = @_;
1088 1092
1089 $self->{vp}->add ($self->{child} = $widget); 1093 $self->{vp}->add ($self->{child} = $widget);
1090} 1094}
1091 1095
1096sub set_offset { shift->{vp}->set_offset (@_) }
1097sub set_center { shift->{vp}->set_center (@_) }
1098sub make_visible { shift->{vp}->make_visible (@_) }
1099
1100sub update_slider {
1101 my ($self) = @_;
1102
1103 my $child = ($self->{vp} or return)->child;
1104
1105 if ($self->{scroll_x}) {
1106 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1107 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1108
1109 my $visible = $w1 > $w2;
1110 if ($visible != $self->{hslider_visible}) {
1111 $self->{hslider_visible} = $visible;
1112 $visible ? $self->SUPER::add ($self->{hslider})
1113 : $self->SUPER::remove ($self->{hslider});
1114 }
1115 }
1116
1117 if ($self->{scroll_y}) {
1118 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120
1121 my $visible = $h1 > $h2;
1122 if ($visible != $self->{vslider_visible}) {
1123 $self->{vslider_visible} = $visible;
1124 $visible ? $self->SUPER::add ($self->{vslider})
1125 : $self->SUPER::remove ($self->{vslider});
1126 }
1127 }
1128}
1129
1130sub start_dragging {
1131 my ($self, $ev) = @_;
1132
1133 $self->grab_focus;
1134
1135 my $ox = $self->{vp}{view_x};
1136 my $oy = $self->{vp}{view_y};
1137
1138 $self->{motion} = sub {
1139 my ($ev, $x, $y) = @_;
1140
1141 $ox -= $ev->{xrel};
1142 $oy -= $ev->{yrel};
1143
1144 $self->{vp}->set_offset ($ox, $oy);
1145 };
1146}
1147
1092sub invoke_mouse_wheel { 1148sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_; 1149 my ($self, $ev) = @_;
1094 1150
1095 return 0 unless $ev->{dy}; # only vertical movements
1096
1097 $self->{vslider}->emit (mouse_wheel => $ev); 1151 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1152 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1098 1153
1099 1 1154 1
1100} 1155}
1101 1156
1102sub update_slider { 1157sub invoke_button_down {
1103 my ($self) = @_; 1158 my ($self, $ev, $x, $y) = @_;
1104 1159
1105 my $child = ($self->{vp} or return)->child; 1160 if ($ev->{button} == 2) {
1161 $self->start_dragging ($ev);
1162 return 1;
1163 }
1106 1164
1107 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1165 0
1108 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1109 #$self->{hslider}->set_visibility ($w1 != $w2);
1110
1111 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1112 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1113 #$self->{vslider}->set_visibility ($h1 != $h2);
1114} 1166}
1115 1167
1116sub update { 1168sub invoke_button_up {
1117 my ($self) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1118 1170
1119 $self->SUPER::update; 1171 if (delete $self->{motion}) {
1120 $self->update_slider; 1172 return 1;
1173 }
1174
1175 0
1176}
1177
1178sub invoke_mouse_motion {
1179 my ($self, $ev, $x, $y) = @_;
1180
1181 if ($self->{motion}) {
1182 $self->{motion}->($ev, $x, $y);
1183 return 1;
1184 }
1185
1186 0
1121} 1187}
1122 1188
1123sub invoke_size_allocate { 1189sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1190 my ($self, $w, $h) = @_;
1125 1191
1151 my ($w, $h) = @$self{qw(w h)}; 1217 my ($w, $h) = @$self{qw(w h)};
1152 1218
1153 glEnable GL_BLEND; 1219 glEnable GL_BLEND;
1154 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1155 glColor_premultiply @{ $self->{bg} }; 1221 glColor_premultiply @{ $self->{bg} };
1156
1157 glBegin GL_QUADS;
1158 glVertex 0 , 0;
1159 glVertex 0 , $h;
1160 glVertex $w, $h; 1222 glRect 0, 0, $w, $h;
1161 glVertex $w, 0;
1162 glEnd;
1163
1164 glDisable GL_BLEND; 1223 glDisable GL_BLEND;
1165 } 1224 }
1166 1225
1167 $self->SUPER::_draw; 1226 $self->SUPER::_draw;
1168} 1227}
1281 1340
1282my @border = 1341my @border =
1283 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1342 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1284 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1343 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1285 1344
1345my @icon =
1346 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1347 qw(x1_move.png x1_resize.png);
1348
1286sub new { 1349sub new {
1287 my ($class, %arg) = @_; 1350 my ($class, %arg) = @_;
1288 1351
1289 my $self = $class->SUPER::new ( 1352 my $self = $class->SUPER::new (
1290 bg => [1, 1, 1, 1], 1353 bg => [1, 1, 1, 1],
1325 1388
1326sub border { 1389sub border {
1327 int $_[0]{border} * $::FONTSIZE 1390 int $_[0]{border} * $::FONTSIZE
1328} 1391}
1329 1392
1393sub get_max_wh {
1394 my ($self) = @_;
1395
1396 return ($self->{w}, $self->{h})
1397 if $self->{visible} && $self->{w};
1398
1399 $self->SUPER::get_max_wh
1400}
1401
1330sub size_request { 1402sub size_request {
1331 my ($self) = @_; 1403 my ($self) = @_;
1332 1404
1333 $self->{title_widget}->size_request 1405 $self->{title_widget}->size_request
1334 if $self->{title_widget}; 1406 if $self->{title_widget};
1458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1459 1531
1460 my $border = $self->border; 1532 my $border = $self->border;
1461 1533
1462 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1463 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1464 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1465 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1466 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1538 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1539
1540 # move
1541 my $w2 = ($w - $border) * .5;
1542 my $h2 = ($h - $border) * .5;
1543 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1545 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1546
1547 # resize
1548 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1550 unless $self->{has_close_button};
1551 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1467 1553
1468 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1469 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1470 1556
1471 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
1492 1578
1493############################################################################# 1579#############################################################################
1494 1580
1495package CFPlus::UI::Table; 1581package CFPlus::UI::Table;
1496 1582
1497our @ISA = CFPlus::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1498 1584
1499use List::Util qw(max sum); 1585use List::Util qw(max sum);
1500 1586
1501use CFPlus::OpenGL; 1587use CFPlus::OpenGL;
1502 1588
1508 row_expand => [], 1594 row_expand => [],
1509 @_, 1595 @_,
1510 ) 1596 )
1511} 1597}
1512 1598
1513sub children {
1514 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1515}
1516
1517sub add { 1599sub add {
1600 my ($self, @widgets) = @_;
1601
1602 for my $child (@widgets) {
1603 $child->{c_rowspan} ||= 1;
1604 $child->{c_colspan} ||= 1;
1605 }
1606
1607 $self->SUPER::add (@widgets);
1608}
1609
1610sub add_at {
1518 my ($self) = shift; 1611 my $self = shift;
1612
1613 my @widgets;
1519 1614
1520 while (@_) { 1615 while (@_) {
1521 my ($x, $y, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1522 $child->set_parent ($self);
1523 $self->{children}[$y][$x] = $child;
1524 }
1525 1617
1526 $self->{force_realloc} = 1; 1618 $child->{c_row} = $row;
1527 $self->{force_size_alloc} = 1; 1619 $child->{c_col} = $col;
1528 $self->realloc;
1529}
1530 1620
1531sub remove { 1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1532 my ($self, $child) = @_; 1628 my ($self) = @_;
1533 1629
1534 # TODO: not yet implemented 1630 my (@w, @h);
1535}
1536
1537# TODO: move to container class maybe? send children a signal on removal?
1538sub clear {
1539 my ($self) = @_;
1540 1631
1541 my @children = $self->children; 1632 my @children = $self->children;
1542 delete $self->{children}; 1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637
1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639
1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 }
1543 1643 }
1544 for (@children) {
1545 delete $_->{parent};
1546 $_->hide;
1547 }
1548 1644
1549 $self->realloc; 1645 # second pass, rows
1550} 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1551
1552sub get_wh {
1553 my ($self) = @_;
1554
1555 my (@w, @h);
1556
1557 for my $y (0 .. $#{$self->{children}}) {
1558 my $row = $self->{children}[$y]
1559 or next;
1560
1561 for my $x (0 .. $#$row) {
1562 my $widget = $row->[$x]
1563 or next;
1564 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1565 1648
1566 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1567 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1568 } 1653 }
1569 } 1654 }
1570 1655
1571 (\@w, \@h) 1656 (\@w, \@h)
1572} 1657}
1588 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1589 1674
1590 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1591 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1592 1677
1593 # TODO: nicer code 1678 # now linearly scale the rows/columns to the allocated size
1594 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1595 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1596 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1597 1682
1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1605 1690
1606 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607 1692
1608 CFPlus::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1609 1694
1610 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1611 1697
1612 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1613 my $row = $self->{children}[$r] 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1614 or next;
1615 1700
1616 my $x = 0; 1701 $widget->configure (
1617 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1618 1704 );
1619 for my $c (0 .. $#$row) { 1705 }
1620 my $col_w = $ws->[$c];
1621 1706
1622 if (my $widget = $row->[$c]) { 1707 1
1623 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1624 }
1625 1709
1626 $x += $col_w; 1710#############################################################################
1711
1712package CFPlus::UI::Fixed;
1713
1714use List::Util qw(min max);
1715
1716our @ISA = CFPlus::UI::Container::;
1717
1718sub _scale($$$) {
1719 my ($rel, $val, $max) = @_;
1720
1721 $rel ? $val * $max : $val
1722}
1723
1724sub size_request {
1725 my ($self) = @_;
1726
1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1728
1729 # determine overall size by querying abs widgets
1730 for my $child ($self->visible_children) {
1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1734
1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1627 } 1737 }
1738 }
1628 1739
1629 $y += $row_h; 1740 my $W = $x2 - $x1;
1741 my $H = $y2 - $y1;
1742
1743 # now layout remaining widgets
1744 for my $child ($self->visible_children) {
1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1751 }
1752 }
1753
1754 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1;
1756
1757 ($W, $H)
1758}
1759
1760sub invoke_size_allocate {
1761 my ($self, $W, $H) = @_;
1762
1763 for my $child ($self->visible_children) {
1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1766
1767 $x += $child->{c_halign} * $child->{req_w};
1768 $y += $child->{c_valign} * $child->{req_h};
1769
1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1630 } 1771 }
1631 1772
1632 1 1773 1
1633} 1774}
1634 1775
1635sub find_widget {
1636 my ($self, $x, $y) = @_;
1637
1638 $x -= $self->{x};
1639 $y -= $self->{y};
1640
1641 my $res;
1642
1643 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1644 $res = $_->find_widget ($x, $y)
1645 and return $res;
1646 }
1647
1648 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1649}
1650
1651sub _draw {
1652 my ($self) = @_;
1653
1654 for (grep $_, @{$self->{children}}) {
1655 $_->draw for grep $_, @$_;
1656 }
1657}
1658
1659############################################################################# 1776#############################################################################
1660 1777
1661package CFPlus::UI::Box; 1778package CFPlus::UI::Box;
1662 1779
1663our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1664 1781
1665sub size_request { 1782sub size_request {
1666 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1667 1786
1668 $self->{vertical} 1787 $self->{vertical}
1669 ? ( 1788 ? (
1670 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1671 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1672 ) 1791 )
1673 : ( 1792 : (
1674 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1675 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1676 ) 1795 )
1677} 1796}
1678 1797
1679sub invoke_size_allocate { 1798sub invoke_size_allocate {
1680 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
1804 1923
1805 delete $self->{ox}; 1924 delete $self->{ox};
1806 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1807} 1926}
1808 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1809sub set_text { 1934sub set_text {
1810 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1811 1936
1812 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1813 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
1836 1961
1837sub size_request { 1962sub size_request {
1838 my ($self) = @_; 1963 my ($self) = @_;
1839 1964
1840 $self->{size_req} ||= do { 1965 $self->{size_req} ||= do {
1966 my ($max_w, $max_h) = $self->get_max_wh;
1967
1841 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1968 $self->{layout}->set_font ($self->{font}) if $self->{font};
1842 $self->{layout}->set_width ($self->{max_w} || -1); 1969 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1843 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1970 $self->{layout}->set_ellipsise ($self->{ellipsise});
1844 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1971 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1845 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1972 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1846 1973
1847 my ($w, $h) = $self->{layout}->size; 1974 my ($w, $h) = $self->{layout}->size;
1919 : ($self->{w} - $size->[0]) * 0.5); 2046 : ($self->{w} - $size->[0]) * 0.5);
1920 2047
1921 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2048 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1922 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2049 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1923 : ($self->{h} - $size->[1]) * 0.5); 2050 : ($self->{h} - $size->[1]) * 0.5);
2051
2052 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1924 }; 2053 };
1925 2054
1926 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2055# unless ($self->{list}) {
1927 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2056# $self->{list} = CFPlus::OpenGL::glGenList;
1928 2057# CFPlus::OpenGL::glNewList $self->{list};
1929 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2058# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2059# CFPlus::OpenGL::glEndList;
2060# }
2061#
2062# CFPlus::OpenGL::glCallList $self->{list};
2063
2064 $self->{layout}->draw;
1930} 2065}
2066
2067#sub destroy {
2068# my ($self) = @_;
2069#
2070# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2071#
2072# $self->SUPER::destroy;
2073#}
1931 2074
1932############################################################################# 2075#############################################################################
1933 2076
1934package CFPlus::UI::EntryBase; 2077package CFPlus::UI::EntryBase;
1935 2078
1941 my $class = shift; 2084 my $class = shift;
1942 2085
1943 $class->SUPER::new ( 2086 $class->SUPER::new (
1944 fg => [1, 1, 1], 2087 fg => [1, 1, 1],
1945 bg => [0, 0, 0, 0.2], 2088 bg => [0, 0, 0, 0.2],
2089 outline => [0.6, 0.3, 0.1],
1946 active_bg => [1, 1, 1, 0.5], 2090 active_bg => [0, 0, 1, .2],
1947 active_fg => [0, 0, 0], 2091 active_fg => [1, 1, 1],
2092 active_outline => [1, 1, 0],
1948 can_hover => 1, 2093 can_hover => 1,
1949 can_focus => 1, 2094 can_focus => 1,
1950 valign => 0, 2095 valign => 0,
1951 can_events => 1, 2096 can_events => 1,
1952 ellipsise => 0, 2097 ellipsise => 0,
2092 glColor_premultiply @{$self->{bg}}; 2237 glColor_premultiply @{$self->{bg}};
2093 } 2238 }
2094 2239
2095 glEnable GL_BLEND; 2240 glEnable GL_BLEND;
2096 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2241 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2097 glBegin GL_QUADS;
2098 glVertex 0 , 0;
2099 glVertex 0 , $self->{h};
2100 glVertex $self->{w}, $self->{h}; 2242 glRect 0, 0, $self->{w}, $self->{h};
2101 glVertex $self->{w}, 0;
2102 glEnd;
2103 glDisable GL_BLEND; 2243 glDisable GL_BLEND;
2104 2244
2105 $self->SUPER::_draw; 2245 $self->SUPER::_draw;
2106 2246
2107 #TODO: force update every cursor change :( 2247 #TODO: force update every cursor change :(
2109 2249
2110 unless (exists $self->{cur_h}) { 2250 unless (exists $self->{cur_h}) {
2111 my $text = substr $self->{text}, 0, $self->{cursor}; 2251 my $text = substr $self->{text}, 0, $self->{cursor};
2112 utf8::encode $text; 2252 utf8::encode $text;
2113 2253
2114 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2254 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2115 } 2255 }
2116 2256
2257 glColor_premultiply @{$self->{active_fg}};
2117 glBegin GL_LINES; 2258 glBegin GL_LINES;
2118 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2259 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2119 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2260 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2261 glEnd;
2262
2263 glLineWidth 3;
2264 glColor @{$self->{active_outline}};
2265 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2266 glLineWidth 1;
2267
2268 } else {
2269 glColor @{$self->{outline}};
2270 glBegin GL_LINE_STRIP;
2271 glVertex .5, $self->{h} * .5;
2272 glVertex .5, $self->{h} - 2.5;
2273 glVertex $self->{w} - .5, $self->{h} - 2.5;
2274 glVertex $self->{w} - .5, $self->{h} * .5;
2120 glEnd; 2275 glEnd;
2121 } 2276 }
2122} 2277}
2123 2278
2124############################################################################# 2279#############################################################################
2211 1 2366 1
2212} 2367}
2213 2368
2214############################################################################# 2369#############################################################################
2215 2370
2216package CFPlus::UI::Button; 2371package CFPlus::UI::ButtonBin;
2217 2372
2218our @ISA = CFPlus::UI::Label::; 2373our @ISA = CFPlus::UI::Bin::;
2219 2374
2220use CFPlus::OpenGL; 2375use CFPlus::OpenGL;
2221 2376
2222my @tex = 2377my @tex =
2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2224 qw(b1_button_active.png); 2379 qw(b1_button_inactive.png b1_button_active.png);
2225 2380
2226sub new { 2381sub new {
2227 my $class = shift; 2382 my $class = shift;
2228 2383
2229 $class->SUPER::new ( 2384 $class->SUPER::new (
2230 padding_x => 4,
2231 padding_y => 4,
2232 fg => [1, 1, 1],
2233 active_fg => [0, 0, 1],
2234 can_hover => 1, 2385 can_hover => 1,
2235 align => 0, 2386 align => 0,
2236 valign => 0, 2387 valign => 0,
2237 can_events => 1, 2388 can_events => 1,
2238 @_ 2389 @_
2250} 2401}
2251 2402
2252sub _draw { 2403sub _draw {
2253 my ($self) = @_; 2404 my ($self) = @_;
2254 2405
2255 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2256
2257 glEnable GL_TEXTURE_2D; 2406 glEnable GL_TEXTURE_2D;
2258 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2407 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2259 glColor 0, 0, 0, 1; 2408 glColor 0, 0, 0, 1;
2260 2409
2410 my $tex = $tex[$GRAB == $self];
2261 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2411 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2412
2413 glDisable GL_TEXTURE_2D;
2414
2415 $self->SUPER::_draw;
2416}
2417
2418#############################################################################
2419
2420package CFPlus::UI::Button;
2421
2422our @ISA = CFPlus::UI::Label::;
2423
2424use CFPlus::OpenGL;
2425
2426my @tex =
2427 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2428 qw(b1_button_inactive.png b1_button_active.png);
2429
2430sub new {
2431 my $class = shift;
2432
2433 $class->SUPER::new (
2434 padding_x => 4,
2435 padding_y => 4,
2436 fg => [1.0, 1.0, 1.0],
2437 active_fg => [0.8, 0.8, 0.8],
2438 can_hover => 1,
2439 align => 0,
2440 valign => 0,
2441 can_events => 1,
2442 @_
2443 )
2444}
2445
2446sub invoke_button_up {
2447 my ($self, $ev, $x, $y) = @_;
2448
2449 $self->emit ("activate")
2450 if $x >= 0 && $x < $self->{w}
2451 && $y >= 0 && $y < $self->{h};
2452
2453 1
2454}
2455
2456sub _draw {
2457 my ($self) = @_;
2458
2459 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2460
2461 glEnable GL_TEXTURE_2D;
2462 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2463 glColor 0, 0, 0, 1;
2464
2465 my $tex = $tex[$GRAB == $self];
2466 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2262 2467
2263 glDisable GL_TEXTURE_2D; 2468 glDisable GL_TEXTURE_2D;
2264 2469
2265 $self->SUPER::_draw; 2470 $self->SUPER::_draw;
2266} 2471}
2323sub _draw { 2528sub _draw {
2324 my ($self) = @_; 2529 my ($self) = @_;
2325 2530
2326 $self->SUPER::_draw; 2531 $self->SUPER::_draw;
2327 2532
2328 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2533 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2329 2534
2330 my ($w, $h) = @$self{qw(w h)}; 2535 my ($w, $h) = @$self{qw(w h)};
2331 2536
2332 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2537 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2333 2538
2353sub new { 2558sub new {
2354 my $class = shift; 2559 my $class = shift;
2355 2560
2356 my $self = $class->SUPER::new ( 2561 my $self = $class->SUPER::new (
2357 can_events => 0, 2562 can_events => 0,
2563 scale => 1,
2358 @_, 2564 @_,
2359 ); 2565 );
2360 2566
2361 $self->{path} || $self->{tex} 2567 $self->{path} || $self->{tex}
2362 or Carp::croak "'path' or 'tex' attributes required"; 2568 or Carp::croak "'path' or 'tex' attributes required";
2387} 2593}
2388 2594
2389sub size_request { 2595sub size_request {
2390 my ($self) = @_; 2596 my ($self) = @_;
2391 2597
2392 ($self->{tex}{w}, $self->{tex}{h}) 2598 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2393} 2599}
2394 2600
2395sub _draw { 2601sub _draw {
2396 my ($self) = @_; 2602 my ($self) = @_;
2397 2603
2407 } 2613 }
2408 2614
2409 glEnable GL_TEXTURE_2D; 2615 glEnable GL_TEXTURE_2D;
2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2411 2617
2412 $tex->draw_quad (0, 0, $w, $h); 2618 $tex->draw_quad_alpha (0, 0, $w, $h);
2413 2619
2414 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2415} 2621}
2416 2622
2417############################################################################# 2623#############################################################################
2436 align => 0, 2642 align => 0,
2437 valign => 0, 2643 valign => 0,
2438 can_events => 1, 2644 can_events => 1,
2439 @_ 2645 @_
2440 ); 2646 );
2647}
2648
2649sub invoke_button_down {
2650 my ($self, $ev, $x, $y) = @_;
2651
2652 1
2441} 2653}
2442 2654
2443sub invoke_button_up { 2655sub invoke_button_up {
2444 my ($self, $ev, $x, $y) = @_; 2656 my ($self, $ev, $x, $y) = @_;
2445 2657
2585 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
2586} 2798}
2587 2799
2588############################################################################# 2800#############################################################################
2589 2801
2802package CFPlus::UI::Progress;
2803
2804our @ISA = CFPlus::UI::Label::;
2805
2806use CFPlus::OpenGL;
2807
2808sub new {
2809 my ($class, %arg) = @_;
2810
2811 my $self = $class->SUPER::new (
2812 fg => [1, 1, 1],
2813 bg => [0, 0, 1, 0.2],
2814 bar => [0.7, 0.5, 0.1, 0.8],
2815 outline => [0.4, 0.3, 0],
2816 fontsize => 0.9,
2817 valign => 0,
2818 align => 0,
2819 can_events => 1,
2820 ellipsise => 1,
2821 label => "%d%%",
2822 %arg,
2823 );
2824
2825 $self->set_value ($arg{value} || -1);
2826
2827 $self
2828}
2829
2830sub set_label {
2831 my ($self, $label) = @_;
2832
2833 return if $self->{label} eq $label;
2834 $self->{label} = $label;
2835
2836 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2837}
2838
2839sub set_value {
2840 my ($self, $value) = @_;
2841
2842 if ($self->{value} ne $value) {
2843 $self->{value} = $value;
2844
2845 if ($value < 0) {
2846 $self->set_text ("-");
2847 } else {
2848 $self->set_text (sprintf $self->{label}, $value * 100);
2849 }
2850
2851 $self->update;
2852 }
2853}
2854
2855sub _draw {
2856 my ($self) = @_;
2857
2858 glEnable GL_BLEND;
2859 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2860
2861 if ($self->{value} >= 0) {
2862 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2863
2864 glColor_premultiply @{$self->{bar}};
2865 glRect 2, 2, $s, $self->{h} - 2;
2866 glColor_premultiply @{$self->{bg}};
2867 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2868 }
2869
2870 glColor_premultiply @{$self->{outline}};
2871 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2872
2873 glDisable GL_BLEND;
2874
2875 {
2876 local $self->{bg}; # do not draw background
2877 $self->SUPER::_draw;
2878 }
2879}
2880
2881#############################################################################
2882
2883package CFPlus::UI::ExperienceProgress;
2884
2885our @ISA = CFPlus::UI::Progress::;
2886
2887sub new {
2888 my ($class, %arg) = @_;
2889
2890 my $self = $class->SUPER::new (
2891 tooltip => sub {
2892 my ($self) = @_;
2893
2894 sprintf "level %d\n%s points\n%s next level\n%s to go",
2895 $self->{lvl},
2896 ::formsep ($self->{exp}),
2897 ::formsep ($self->{nxt}),
2898 ::formsep ($self->{nxt} - $self->{exp}),
2899 },
2900 %arg
2901 );
2902
2903 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2904 if $::CONN;
2905
2906 $self
2907}
2908
2909sub DESTROY {
2910 my ($self) = @_;
2911
2912 delete $::CONN->{on_exp_update}{$self+0}
2913 if $::CONN;
2914
2915 $self->SUPER::DESTROY;
2916}
2917
2918sub set_value {
2919 my ($self, $lvl, $exp) = @_;
2920
2921 $self->{lvl} = $lvl;
2922 $self->{exp} = $exp;
2923
2924 my $v = -1;
2925
2926 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2927 my $l0 = $table->[$lvl - 1];
2928 my $l1 = $table->[$lvl];
2929
2930 $self->{nxt} = $l1;
2931
2932 $v = ($exp - $l0) / ($l1 - $l0);
2933 }
2934
2935 $self->SUPER::set_value ($v);
2936}
2937
2938#############################################################################
2939
2590package CFPlus::UI::Gauge; 2940package CFPlus::UI::Gauge;
2591 2941
2592our @ISA = CFPlus::UI::VBox::; 2942our @ISA = CFPlus::UI::VBox::;
2593 2943
2594sub new { 2944sub new {
2719 3069
2720 $self->SUPER::invoke_button_down ($ev, $x, $y); 3070 $self->SUPER::invoke_button_down ($ev, $x, $y);
2721 3071
2722 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3072 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2723 3073
2724 $self->invoke_mouse_motion ($ev, $x, $y) 3074 $self->invoke_mouse_motion ($ev, $x, $y);
3075
3076 1
2725} 3077}
2726 3078
2727sub invoke_mouse_motion { 3079sub invoke_mouse_motion {
2728 my ($self, $ev, $x, $y) = @_; 3080 my ($self, $ev, $x, $y) = @_;
2729 3081
2749 3101
2750 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3102 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2751 3103
2752 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3104 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2753 3105
2754 ! ! $delta 3106 1
2755} 3107}
2756 3108
2757sub update { 3109sub update {
2758 my ($self) = @_; 3110 my ($self) = @_;
2759 3111
2890} 3242}
2891 3243
2892sub size_request { 3244sub size_request {
2893 my ($self) = @_; 3245 my ($self) = @_;
2894 3246
2895 my ($empty, $slider) = @{ $self->{children} }; 3247 my ($empty, $slider) = $self->visible_children;
2896 3248
2897 local $self->{children} = [$empty, $slider]; 3249 local $self->{children} = [$empty, $slider];
2898 $self->SUPER::size_request 3250 $self->SUPER::size_request
2899} 3251}
2900 3252
3089 3441
3090 if ($y0 < $y + $h && $y < $y1) { 3442 if ($y0 < $y + $h && $y < $y1) {
3091 my $layout = $self->get_layout ($para); 3443 my $layout = $self->get_layout ($para);
3092 3444
3093 $layout->render ($para->{indent}, $y - $y0); 3445 $layout->render ($para->{indent}, $y - $y0);
3446 $layout->draw;
3094 3447
3095 if (my @w = @{ $para->{widget} }) { 3448 if (my @w = @{ $para->{widget} }) {
3096 my @s = $layout->get_shapes; 3449 my @s = $layout->get_shapes;
3097 3450
3098 for (@w) { 3451 for (@w) {
3220} 3573}
3221 3574
3222sub set_tooltip_from { 3575sub set_tooltip_from {
3223 my ($self, $widget) = @_; 3576 my ($self, $widget) = @_;
3224 3577
3225 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3226 if $widget->{tooltip} =~ /^#(.*)$/;
3227
3228 my $tooltip = $widget->{tooltip}; 3578 my $tip = $widget->{tooltip};
3579 $tip = $tip->($widget) if "CODE" eq ref $tip;
3580
3581 $tip = CFPlus::Pod::section_label tooltip => $1
3582 if $tip =~ /^#(.*)$/;
3229 3583
3230 if ($ENV{CFPLUS_DEBUG} & 2) { 3584 if ($ENV{CFPLUS_DEBUG} & 2) {
3231 $tooltip .= "\n\n" . (ref $widget) . "\n" 3585 $tip .= "\n\n" . (ref $widget) . "\n"
3232 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3586 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3233 . "req $widget->{req_w} $widget->{req_h}\n" 3587 . "req $widget->{req_w} $widget->{req_h}\n"
3234 . "visible $widget->{visible}"; 3588 . "visible $widget->{visible}";
3235 } 3589 }
3236 3590
3237 $tooltip =~ s/^\n+//; 3591 $tip =~ s/^\n+//;
3238 $tooltip =~ s/\n+$//; 3592 $tip =~ s/\n+$//;
3239 3593
3240 $self->add (new CFPlus::UI::Label 3594 $self->add (new CFPlus::UI::Label
3241 markup => $tooltip, 3595 markup => $tip,
3242 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3596 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3243 fontsize => 0.8, 3597 fontsize => 0.8,
3244 style => 1, # FLAG_INVERSE 3598 style => 1, # FLAG_INVERSE
3245 ellipsise => 0, 3599 ellipsise => 0,
3246 font => ($widget->{tooltip_font} || $::FONT_PROP), 3600 font => ($widget->{tooltip_font} || $::FONT_PROP),
3284} 3638}
3285 3639
3286sub _draw { 3640sub _draw {
3287 my ($self) = @_; 3641 my ($self) = @_;
3288 3642
3289 glTranslate 0.375, 0.375;
3290
3291 my ($w, $h) = @$self{qw(w h)}; 3643 my ($w, $h) = @$self{qw(w h)};
3292 3644
3293 glColor 1, 0.8, 0.4; 3645 glColor 1, 0.8, 0.4;
3294 glBegin GL_QUADS; 3646 glRect 0, 0, $w, $h;
3295 glVertex 0 , 0;
3296 glVertex 0 , $h;
3297 glVertex $w, $h;
3298 glVertex $w, 0;
3299 glEnd;
3300 3647
3301 glColor 0, 0, 0; 3648 glColor 0, 0, 0;
3302 glBegin GL_LINE_LOOP; 3649 glRect_lineloop .5, .5, $w + .5, $h + .5;
3303 glVertex 0 , 0;
3304 glVertex 0 , $h;
3305 glVertex $w, $h;
3306 glVertex $w, 0;
3307 glEnd;
3308 3650
3309 glTranslate 2 - 0.375, 2 - 0.375; 3651 glTranslate 2, 2;
3310 3652
3311 $self->SUPER::_draw; 3653 $self->SUPER::_draw;
3312} 3654}
3313 3655
3314############################################################################# 3656#############################################################################
3321 3663
3322sub new { 3664sub new {
3323 my $class = shift; 3665 my $class = shift;
3324 3666
3325 my $self = $class->SUPER::new ( 3667 my $self = $class->SUPER::new (
3668 size_w => 32,
3669 size_h => 8,
3326 aspect => 1, 3670 aspect => 1,
3327 can_events => 0, 3671 can_events => 0,
3328 @_, 3672 @_,
3329 ); 3673 );
3330 3674
3331 if ($self->{anim} && $self->{animspeed}) { 3675 if ($self->{anim} && $self->{animspeed}) {
3332 CFPlus::weaken (my $widget = $self); 3676 CFPlus::weaken (my $widget = $self);
3333 3677
3334 $self->{timer} = Event->timer ( 3678 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3679 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3336 hard => 1, 3680 return unless $::CONN;
3337 interval => $self->{animspeed}, 3681
3338 cb => sub { 3682 my $w = $widget
3339 delete $self->{wait_face}; 3683 or return;
3684
3340 ++$widget->{frame}; 3685 ++$w->{frame};
3686 $w->update_face;
3687
3688 # somehow, $widget can go away
3341 $widget->update; 3689 $w->update;
3342 }, 3690 $w->update_timer;
3343 ); 3691 };
3692
3693 $self->update_face;
3694 $self->update_timer;
3344 } 3695 }
3345 3696
3346 $self 3697 $self
3347} 3698}
3348 3699
3700sub update_timer {
3701 my ($self) = @_;
3702
3703 return unless $self->{timer};
3704
3705 if ($self->{visible}) {
3706 $self->{timer}->start;
3707 } else {
3708 $self->{timer}->stop;
3709 }
3710}
3711
3712sub update_face {
3713 my ($self) = @_;
3714
3715 if ($::CONN) {
3716 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3717 if ($anim && @$anim) {
3718 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3719 delete $self->{face_change_cb};
3720
3721 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3722 unless ($tex->{name} || $tex->{loading}) {
3723 $tex->upload (sub { $self->reconfigure });
3724 }
3725 }
3726 }
3727 }
3728 }
3729}
3730
3349sub size_request { 3731sub size_request {
3350 (32, 8) 3732 my ($self) = @_;
3733
3734 if ($::CONN) {
3735 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3736 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3737 if ($tex->{name}) {
3738 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3739 } elsif (!$tex->{loading}) {
3740 $tex->upload (sub { $self->reconfigure });
3741 }
3742 }
3743
3744 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3745 }
3746 }
3747
3748 ($self->{size_w} || 8, $self->{size_h} || 8)
3351} 3749}
3352 3750
3353sub update { 3751sub update {
3354 my ($self) = @_; 3752 my ($self) = @_;
3355 3753
3356 return unless $self->{visible}; 3754 return unless $self->{visible};
3357 3755
3358 $self->SUPER::update; 3756 $self->SUPER::update;
3359} 3757}
3360 3758
3759sub invoke_visibility_change {
3760 my ($self) = @_;
3761
3762 $self->update_timer;
3763
3764 0
3765}
3766
3361sub _draw { 3767sub _draw {
3362 my ($self) = @_; 3768 my ($self) = @_;
3363 3769
3364 return unless $::CONN;
3365
3366 $self->SUPER::_draw; 3770 $self->SUPER::_draw;
3367 3771
3368 my $face; 3772 if (my $tex = $self->{tex}) {
3369
3370 if ($self->{frame}) {
3371 my $anim = $::CONN->{anim}[$self->{anim}];
3372
3373 $face = $anim->[ $self->{frame} % @$anim ]
3374 if $anim && @$anim;
3375 }
3376
3377 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3378 or return;
3379
3380 my $tex = $::CONN->{texture}[$faceid];
3381
3382 if ($tex) {
3383 glEnable GL_TEXTURE_2D; 3773 glEnable GL_TEXTURE_2D;
3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3774 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3385 glColor 0, 0, 0, 1; 3775 glColor 0, 0, 0, 1;
3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3776 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3387 glDisable GL_TEXTURE_2D; 3777 glDisable GL_TEXTURE_2D;
3388 } else {
3389 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390 $self->update;
3391 });
3392 } 3778 }
3393} 3779}
3394 3780
3395sub destroy { 3781sub destroy {
3396 my ($self) = @_; 3782 my ($self) = @_;
3397 3783
3398 $self->{timer}->cancel 3784 (delete $self->{timer})->cancel
3399 if $self->{timer}; 3785 if $self->{timer};
3400 3786
3401 $self->SUPER::destroy; 3787 $self->SUPER::destroy;
3402} 3788}
3403 3789
3443 children => [ 3829 children => [
3444 (new CFPlus::UI::Label markup => $left, expand => 1), 3830 (new CFPlus::UI::Label markup => $left, expand => 1),
3445 (new CFPlus::UI::Label markup => $right, align => +1), 3831 (new CFPlus::UI::Label markup => $right, align => +1),
3446 ], 3832 ],
3447 ; 3833 ;
3448 3834
3449 } else { 3835 } else {
3450 $widget = new CFPlus::UI::Label 3836 $widget = new CFPlus::UI::Label
3451 can_hover => 1, 3837 can_hover => 1,
3452 can_events => 1, 3838 can_events => 1,
3453 markup => $widget, 3839 markup => $widget,
3578 3964
3579############################################################################# 3965#############################################################################
3580 3966
3581package CFPlus::UI::Notebook; 3967package CFPlus::UI::Notebook;
3582 3968
3969use CFPlus::OpenGL;
3970
3583our @ISA = CFPlus::UI::VBox::; 3971our @ISA = CFPlus::UI::VBox::;
3584 3972
3585sub new { 3973sub new {
3586 my $class = shift; 3974 my $class = shift;
3587 3975
3588 my $self = $class->SUPER::new ( 3976 my $self = $class->SUPER::new (
3589 buttonbar => (new CFPlus::UI::Buttonbar), 3977 buttonbar => (new CFPlus::UI::Buttonbar),
3590 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3978 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3979 active_outline => [.7, .7, 0.2],
3591 # filter => # will be put between multiplexer and $self 3980 # filter => # will be put between multiplexer and $self
3592 @_, 3981 @_,
3593 ); 3982 );
3594 3983
3595 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3984 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3596 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3985 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3597 3986
3987 {
3988 Scalar::Util::weaken (my $wself = $self);
3989
3990 $self->{multiplexer}->connect (c_add => sub {
3991 my ($mplex, $widgets) = @_;
3992
3993 for my $child (@$widgets) {
3994 Scalar::Util::weaken $child;
3995 $child->{c_tab_} ||= do {
3996 my $tab =
3997 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3998 ? $child->{c_tab}
3999 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4000
4001 $tab->connect (activate => sub {
4002 $wself->set_current_page ($child);
4003 });
4004
4005 $tab
4006 };
4007
4008 $self->{buttonbar}->add ($child->{c_tab_});
4009 }
4010 });
4011
4012 $self->{multiplexer}->connect (c_remove => sub {
4013 my ($mplex, $widgets) = @_;
4014
4015 for my $child (@$widgets) {
4016 $wself->{buttonbar}->remove ($child->{c_tab_});
4017 }
4018 });
4019 }
4020
3598 $self 4021 $self
3599} 4022}
3600 4023
3601sub add { 4024sub add {
4025 my ($self, @widgets) = @_;
4026
4027 $self->{multiplexer}->add (@widgets)
4028}
4029
4030sub remove {
4031 my ($self, @widgets) = @_;
4032
4033 $self->{multiplexer}->remove (@widgets)
4034}
4035
4036sub pages {
4037 my ($self) = @_;
4038 $self->{multiplexer}->children
4039}
4040
4041sub add_tab {
3602 my ($self, $title, $widget, $tooltip) = @_; 4042 my ($self, $title, $widget, $tooltip) = @_;
3603 4043
3604 CFPlus::weaken $self; 4044 $title = [$title, $tooltip] unless ref $title;
4045 $widget->{c_tab} = $title;
3605 4046
3606 $self->{buttonbar}->add (new CFPlus::UI::Button
3607 markup => $title,
3608 tooltip => $tooltip,
3609 on_activate => sub { $self->set_current_page ($widget) },
3610 );
3611
3612 $self->{multiplexer}->add ($widget); 4047 $self->add ($widget);
3613} 4048}
3614 4049
3615sub get_current_page { 4050sub get_current_page {
3616 my ($self) = @_; 4051 my ($self) = @_;
3617 4052
3621sub set_current_page { 4056sub set_current_page {
3622 my ($self, $page) = @_; 4057 my ($self, $page) = @_;
3623 4058
3624 $self->{multiplexer}->set_current_page ($page); 4059 $self->{multiplexer}->set_current_page ($page);
3625 $self->emit (page_changed => $self->{multiplexer}{current}); 4060 $self->emit (page_changed => $self->{multiplexer}{current});
4061}
4062
4063sub _draw {
4064 my ($self) = @_;
4065
4066 $self->SUPER::_draw ();
4067
4068 if (my $cur = $self->{multiplexer}{current}) {
4069 if ($cur = $cur->{c_tab_}) {
4070 glTranslate $self->{buttonbar}{x} + $cur->{x},
4071 $self->{buttonbar}{y} + $cur->{y};
4072 glLineWidth 3;
4073 #glEnable GL_BLEND;
4074 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4075 glColor @{$self->{active_outline}};
4076 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4077 glLineWidth 1;
4078 #glDisable GL_BLEND;
4079 }
4080 }
3626} 4081}
3627 4082
3628############################################################################# 4083#############################################################################
3629 4084
3630package CFPlus::UI::Selector; 4085package CFPlus::UI::Selector;
3662} 4117}
3663 4118
3664sub _set_value { 4119sub _set_value {
3665 my ($self, $value) = @_; 4120 my ($self, $value) = @_;
3666 4121
3667 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4122 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4123 $item ||= $self->{options}[0]
3668 or return; 4124 or return;
3669 4125
3670 $self->{value} = $item->[0]; 4126 $self->{value} = $item->[0];
3671 $self->set_markup ("$item->[1] ⇓"); 4127 $self->set_markup ("$item->[1] ⇓");
3672 $self->set_tooltip ($item->[2]); 4128# $self->set_tooltip ($item->[2]);
3673} 4129}
3674 4130
3675sub set_value { 4131sub set_value {
3676 my ($self, $value) = @_; 4132 my ($self, $value) = @_;
3677 4133
3678 return unless $self->{value} ne $value; 4134 return unless $self->{value} ne $value;
3679 4135
3680 $self->_set_value ($value); 4136 $self->_set_value ($value);
3681 $self->emit (changed => $value); 4137 $self->emit (changed => $value);
4138}
4139
4140sub set_options {
4141 my ($self, $options) = @_;
4142
4143 $self->{options} = $options;
4144 $self->_set_value ($self->{value});
3682} 4145}
3683 4146
3684############################################################################# 4147#############################################################################
3685 4148
3686package CFPlus::UI::Statusbox; 4149package CFPlus::UI::Statusbox;
3695 @_, 4158 @_,
3696 ); 4159 );
3697 4160
3698 CFPlus::weaken (my $this = $self); 4161 CFPlus::weaken (my $this = $self);
3699 4162
3700 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4163 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3701 4164
3702 $self 4165 $self
3703} 4166}
3704 4167
3705sub reorder { 4168sub reorder {
3713 4176
3714 while (my ($k, $v) = each %{ $self->{item} }) { 4177 while (my ($k, $v) = each %{ $self->{item} }) {
3715 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4178 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3716 } 4179 }
3717 4180
4181 $self->{timer}->set (1, 1);
4182
3718 my @widgets; 4183 my @widgets;
3719 4184
3720 my @items = sort { 4185 my @items = sort {
3721 $a->{pri} <=> $b->{pri} 4186 $a->{pri} <=> $b->{pri}
3722 or $b->{id} <=> $a->{id} 4187 or $b->{id} <=> $a->{id}
3723 } values %{ $self->{item} }; 4188 } values %{ $self->{item} };
3724
3725 $self->{timer}->interval (1);
3726 4189
3727 my $count = 10 + 1; 4190 my $count = 10 + 1;
3728 for my $item (@items) { 4191 for my $item (@items) {
3729 last unless --$count; 4192 last unless --$count;
3730 4193
3754 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4217 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3755 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4218 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3756 $label->update; 4219 $label->update;
3757 $label->set_max_size (undef, $label->{req_h} * $diff) 4220 $label->set_max_size (undef, $label->{req_h} * $diff)
3758 if $diff < 1; 4221 if $diff < 1;
3759 $self->{timer}->interval (1/30); 4222 $self->{timer}->set (1/30, 1/30);
3760 } else { 4223 } else {
3761 $label->{fg}[3] = $item->{fg}[3] || 1; 4224 $label->{fg}[3] = $item->{fg}[3] || 1;
3762 } 4225 }
3763 4226
3764 push @widgets, $label; 4227 push @widgets, $label;
3900} 4363}
3901 4364
3902sub update { 4365sub update {
3903 my ($self) = @_; 4366 my ($self) = @_;
3904 4367
3905 $::WANT_REFRESH++; 4368 $::WANT_REFRESH = 1;
3906} 4369}
3907 4370
3908sub add { 4371sub add {
3909 my ($self, @children) = @_; 4372 my ($self, @children) = @_;
3910 4373
3947 while ($self->{refresh_hook}) { 4410 while ($self->{refresh_hook}) {
3948 $_->() 4411 $_->()
3949 for values %{delete $self->{refresh_hook}}; 4412 for values %{delete $self->{refresh_hook}};
3950 } 4413 }
3951 4414
3952 if ($self->{realloc}) { 4415 while ($self->{realloc}) {
3953 my %queue; 4416 my %queue;
3954 my @queue; 4417 my @queue;
3955 my $widget; 4418 my $widget;
3956 4419
3957 outer: 4420 outer:
4004 } 4467 }
4005 } 4468 }
4006 4469
4007 delete $self->{realloc}{$widget+0}; 4470 delete $self->{realloc}{$widget+0};
4008 } 4471 }
4009 }
4010 4472
4011 while (my $size_alloc = delete $self->{size_alloc}) { 4473 while (my $size_alloc = delete $self->{size_alloc}) {
4012 my @queue = sort { $b->{visible} <=> $a->{visible} } 4474 my @queue = sort { $a->{visible} <=> $b->{visible} }
4013 values %$size_alloc; 4475 values %$size_alloc;
4014 4476
4015 while () { 4477 while () {
4016 my $widget = pop @queue || last; 4478 my $widget = pop @queue || last;
4017 4479
4018 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4480 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4019 4481
4020 $w = 0 if $w < 0;
4021 $h = 0 if $h < 0;
4022
4023 $w = max $widget->{min_w}, $w; 4482 $w = max $widget->{min_w}, $w;
4024 $h = max $widget->{min_h}, $h; 4483 $h = max $widget->{min_h}, $h;
4025 4484
4026# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4485# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4027# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4486# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4028 4487
4029 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4488 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4030 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4489 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4031 4490
4032 $w = int $w + 0.5; 4491 $w = int $w + 0.5;
4033 $h = int $h + 0.5; 4492 $h = int $h + 0.5;
4034 4493
4035 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4494 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4036 $widget->{old_w} = $widget->{w}; 4495 $widget->{old_w} = $widget->{w};
4037 $widget->{old_h} = $widget->{h}; 4496 $widget->{old_h} = $widget->{h};
4038 4497
4039 $widget->{w} = $w; 4498 $widget->{w} = $w;
4040 $widget->{h} = $h; 4499 $widget->{h} = $h;
4041 4500
4042 $widget->emit (size_allocate => $w, $h); 4501 $widget->emit (size_allocate => $w, $h);
4502 }
4043 } 4503 }
4044 } 4504 }
4045 } 4505 }
4046 4506
4047 while ($self->{post_alloc_hook}) { 4507 while ($self->{post_alloc_hook}) {
4048 $_->() 4508 $_->()
4049 for values %{delete $self->{post_alloc_hook}}; 4509 for values %{delete $self->{post_alloc_hook}};
4050 } 4510 }
4051
4052 4511
4053 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4512 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4054 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4513 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4055 glClear GL_COLOR_BUFFER_BIT; 4514 glClear GL_COLOR_BUFFER_BIT;
4056 4515

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines