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.368 by root, Mon Jun 25 05:43:37 2007 UTC vs.
Revision 1.440 by root, Sun Sep 16 18:27:48 2007 UTC

… …
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 32
33 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
34 34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 35 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 36 $TOOLTIP->show;
41 } 37 }
42 38
43 return; 39 return;
… …
113 } 109 }
114 110
115 if ($GRAB) { 111 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 112 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 113 # mousewheel
118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9; 114 my $delta = $ev->{button} * 2 - 9;
115 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
116
117 $ev->{dx} = $shift ? $delta : 0;
118 $ev->{dy} = $shift ? 0 : $delta;
119
120 $GRAB->emit (mouse_wheel => $ev); 120 $GRAB->emit (mouse_wheel => $ev);
121 } else { 121 } else {
122 $GRAB->emit (button_down => $ev) 122 $GRAB->emit (button_down => $ev)
123 } 123 }
124 } 124 }
… …
269 $self->emit ("destroy"); 269 $self->emit ("destroy");
270 %$self = (); 270 %$self = ();
271} 271}
272 272
273sub TO_JSON { 273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} } 274 { "\fw" => $_[0]{s_id} }
275} 275}
276 276
277sub show { 277sub show {
278 my ($self) = @_; 278 my ($self) = @_;
279 279
… …
320sub set_visibility { 320sub set_visibility {
321 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
322 322
323 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
324 324
325 $visible ? $self->hide 325 $visible ? $self->show
326 : $self->show; 326 : $self->hide;
327} 327}
328 328
329sub toggle_visibility { 329sub toggle_visibility {
330 my ($self) = @_; 330 my ($self) = @_;
331 331
… …
358 358
359 $self->{force_w} = $w; 359 $self->{force_w} = $w;
360 $self->{force_h} = $h; 360 $self->{force_h} = $h;
361 361
362 $self->realloc; 362 $self->realloc;
363}
364
365# traverse the widget chain up to find the maximum "physical" size constraints
366sub get_max_wh {
367 my ($self) = @_;
368
369 return $self->{parent}->get_max_wh
370 if $self->{parent};
371
372 ($::WIDTH, $::HEIGHT)
363} 373}
364 374
365sub size_request { 375sub size_request {
366 require Carp; 376 require Carp;
367 Carp::confess "size_request is abstract"; 377 Carp::confess "size_request is abstract";
… …
547 557
548 # parent 558 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 559 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 560}
551 561
552sub find_widget { 562#sub find_widget {
553 my ($self, $x, $y) = @_; 563# 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 564
564sub set_parent { 565sub set_parent {
565 my ($self, $parent) = @_; 566 my ($self, $parent) = @_;
566 567
567 CFPlus::weaken ($self->{parent} = $parent); 568 CFPlus::weaken ($self->{parent} = $parent);
… …
598 599
599# using global variables seems a bit hacky, but passing through all drawing 600# using global variables seems a bit hacky, but passing through all drawing
600# functions seems pointless. 601# functions seems pointless.
601our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 602our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602 603
603sub draw { 604#sub draw {
604 my ($self) = @_; 605#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 606
650sub _draw { 607sub _draw {
651 my ($self) = @_; 608 my ($self) = @_;
652 609
653 warn "no draw defined for $self\n"; 610 warn "no draw defined for $self\n";
654} 611}
655 612
656my $cntx;#d#
657sub DESTROY { 613sub DESTROY {
658 my ($self) = @_; 614 my ($self) = @_;
659 615
660 return if CFPlus::in_destruct; 616 return if CFPlus::in_destruct;
661 617
618 local $@;
662 eval { $self->destroy }; 619 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 620 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664 621
665 delete $WIDGET{$self+0}; 622 delete $WIDGET{$self+0};
666} 623}
… …
674use strict; 631use strict;
675use CFPlus::OpenGL; 632use CFPlus::OpenGL;
676 633
677sub new { 634sub new {
678 my $class = shift; 635 my $class = shift;
679
680 # range [value, low, high, page]
681 636
682 $class->SUPER::new ( 637 $class->SUPER::new (
683 #bg => [0, 0, 0, 0.2], 638 #bg => [0, 0, 0, 0.2],
684 #active_bg => [1, 1, 1, 0.5], 639 #active_bg => [1, 1, 1, 0.5],
685 @_ 640 @_
… …
697 my ($w, $h) = @$self{qw(w h)}; 652 my ($w, $h) = @$self{qw(w h)};
698 653
699 glEnable GL_BLEND; 654 glEnable GL_BLEND;
700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 655 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701 glColor_premultiply @$color; 656 glColor_premultiply @$color;
702
703 glBegin GL_QUADS;
704 glVertex 0 , 0;
705 glVertex 0 , $h;
706 glVertex $w, $h; 657 glRect 0, 0, $w, $h;
707 glVertex $w, 0;
708 glEnd;
709
710 glDisable GL_BLEND; 658 glDisable GL_BLEND;
711 } 659 }
712} 660}
713 661
714############################################################################# 662#############################################################################
… …
746 can_events => 0, 694 can_events => 0,
747 %arg, 695 %arg,
748 ); 696 );
749 697
750 $self->add (@$children) 698 $self->add (@$children)
751 if $children; 699 if $children && @$children;
752 700
753 $self 701 $self
754} 702}
755 703
756sub realloc { 704sub realloc {
… …
765 my ($self, @widgets) = @_; 713 my ($self, @widgets) = @_;
766 714
767 $_->set_parent ($self) 715 $_->set_parent ($self)
768 for @widgets; 716 for @widgets;
769 717
718 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 719 use sort 'stable';
771 720
772 $self->{children} = [ 721 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 722 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 723 @{$self->{children}}, @widgets
775 ]; 724 ];
776 725
777 $self->realloc; 726 $self->realloc;
727
728 $self->emit (c_add => \@widgets);
729
730 map $_+0, @widgets
778} 731}
779 732
780sub children { 733sub children {
781 @{ $_[0]{children} } 734 @{ $_[0]{children} }
782} 735}
783 736
784sub remove { 737sub remove {
785 my ($self, $child) = @_; 738 my ($self, @widgets) = @_;
786 739
740 $self->emit (c_remove => \@widgets);
741
742 for my $child (@widgets) {
787 delete $child->{parent}; 743 delete $child->{parent};
788 $child->hide; 744 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 745 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
746 }
791 747
792 $self->realloc; 748 $self->realloc;
793} 749}
794 750
795sub clear { 751sub clear {
796 my ($self) = @_; 752 my ($self) = @_;
797 753
798 my $children = delete $self->{children}; 754 my $children = $self->{children};
799 $self->{children} = []; 755 $self->{children} = [];
800 756
801 for (@$children) { 757 for (@$children) {
802 delete $_->{parent}; 758 delete $_->{parent};
803 $_->hide; 759 $_->hide;
… …
823} 779}
824 780
825sub _draw { 781sub _draw {
826 my ($self) = @_; 782 my ($self) = @_;
827 783
828 $_->draw for @{$self->{children}}; 784 $_->draw for $self->visible_children;
829} 785}
830 786
831############################################################################# 787#############################################################################
832 788
833package CFPlus::UI::Bin; 789package CFPlus::UI::Bin;
… …
843} 799}
844 800
845sub add { 801sub add {
846 my ($self, $child) = @_; 802 my ($self, $child) = @_;
847 803
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 804 $self->clear;
849 $self->SUPER::add ($child); 805 $self->SUPER::add ($child);
850} 806}
851 807
852sub remove { 808sub remove {
853 my ($self, $widget) = @_; 809 my ($self, $widget) = @_;
… …
871 827
872 1 828 1
873} 829}
874 830
875############################################################################# 831#############################################################################
876
877# back-buffered drawing area 832# back-buffered drawing area
878 833
879package CFPlus::UI::Window; 834package CFPlus::UI::Window;
880 835
881our @ISA = CFPlus::UI::Bin::; 836our @ISA = CFPlus::UI::Bin::;
… …
943} 898}
944 899
945############################################################################# 900#############################################################################
946 901
947package CFPlus::UI::ViewPort; 902package CFPlus::UI::ViewPort;
903
904use List::Util qw(min max);
948 905
949our @ISA = CFPlus::UI::Window::; 906our @ISA = CFPlus::UI::Window::;
950 907
951sub new { 908sub new {
952 my $class = shift; 909 my $class = shift;
… …
961sub size_request { 918sub size_request {
962 my ($self) = @_; 919 my ($self) = @_;
963 920
964 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 921 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965 922
966 $w = 10 if $self->{scroll_x}; 923 $w = 1 if $self->{scroll_x};
967 $h = 10 if $self->{scroll_y}; 924 $h = 1 if $self->{scroll_y};
968 925
969 ($w, $h) 926 ($w, $h)
970} 927}
971 928
972sub invoke_size_allocate { 929sub invoke_size_allocate {
… …
984} 941}
985 942
986sub set_offset { 943sub set_offset {
987 my ($self, $x, $y) = @_; 944 my ($self, $x, $y) = @_;
988 945
946 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
947 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
948
949 if ($x != $self->{view_x} or $y != $self->{view_y}) {
989 $self->{view_x} = int $x; 950 $self->{view_x} = $x;
990 $self->{view_y} = int $y; 951 $self->{view_y} = $y;
991 952
953 $self->emit (changed => $x, $y);
992 $self->update; 954 $self->update;
955 }
956}
957
958sub set_center {
959 my ($self, $x, $y) = @_;
960
961 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
962}
963
964sub make_visible {
965 my ($self, $x, $y, $border) = @_;
966
967 if ( $x < $self->{view_x} + $self->{w} * $border
968 || $x > $self->{view_x} + $self->{w} * (1 - $border)
969 || $y < $self->{view_y} + $self->{h} * $border
970 || $y > $self->{view_y} + $self->{h} * (1 - $border)
971 ) {
972 $self->set_center ($x, $y);
973 }
993} 974}
994 975
995# hmm, this does not work for topleft of $self... but we should not ask for that 976# hmm, this does not work for topleft of $self... but we should not ask for that
996sub coord2local { 977sub coord2local {
997 my ($self, $x, $y) = @_; 978 my ($self, $x, $y) = @_;
… …
1012 my ($self, $x, $y) = @_; 993 my ($self, $x, $y) = @_;
1013 994
1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 996 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016 ) { 997 ) {
1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1018 } else { 999 } else {
1019 $self->CFPlus::UI::Base::find_widget ($x, $y) 1000 $self->CFPlus::UI::Base::find_widget ($x, $y)
1020 } 1001 }
1021} 1002}
1022 1003
… …
1033 1014
1034############################################################################# 1015#############################################################################
1035 1016
1036package CFPlus::UI::ScrolledWindow; 1017package CFPlus::UI::ScrolledWindow;
1037 1018
1038our @ISA = CFPlus::UI::HBox::; 1019our @ISA = CFPlus::UI::Table::;
1039 1020
1040sub new { 1021sub new {
1041 my ($class, %arg) = @_; 1022 my ($class, %arg) = @_;
1042 1023
1043 my $child = delete $arg{child}; 1024 my $child = delete $arg{child};
1044 1025
1045 my $self; 1026 my $self;
1046 1027
1047 my $slider = new CFPlus::UI::Slider 1028 my $hslider = new CFPlus::UI::Slider
1029 c_col => 0,
1030 c_row => 1,
1031 vertical => 0,
1032 range => [0, 0, 1, 0.01], # HACK fix
1033 on_changed => sub {
1034 $self->{hpos} = $_[1];
1035 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1036 },
1037 ;
1038
1039 my $vslider = new CFPlus::UI::Slider
1040 c_col => 1,
1041 c_row => 0,
1048 vertical => 1, 1042 vertical => 1,
1049 range => [0, 0, 1, 0.01], # HACK fix 1043 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub { 1044 on_changed => sub {
1051 $self->{vp}->set_offset (0, $_[1]); 1045 $self->{vpos} = $_[1];
1046 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052 }, 1047 },
1053 ; 1048 ;
1054 1049
1055 $self = $class->SUPER::new ( 1050 $self = $class->SUPER::new (
1056 vp => (new CFPlus::UI::ViewPort expand => 1), 1051 scroll_x => 0,
1052 scroll_y => 1,
1057 can_events => 1, 1053 can_events => 1,
1058 slider => $slider, 1054 hslider => $hslider,
1055 vslider => $vslider,
1056 col_expand => [1, 0],
1057 row_expand => [1, 0],
1059 %arg, 1058 %arg,
1060 ); 1059 );
1061 1060
1061 $self->{vp} = new CFPlus::UI::ViewPort
1062 c_col => 0,
1063 c_row => 0,
1064 expand => 1,
1065 scroll_x => $self->{scroll_x},
1066 scroll_y => $self->{scroll_y},
1067 on_changed => sub {
1068 my ($vp, $x, $y) = @_;
1069
1070 $vp->{parent}{hslider}->set_value ($x);
1071 $vp->{parent}{vslider}->set_value ($y);
1072
1073 0
1074 },
1075 on_size_allocate => sub {
1076 my ($vp, $w, $h) = @_;
1077 $vp->{parent}->update_slider;
1078 0
1079 },
1080 ;
1081
1062 $self->SUPER::add ($self->{vp}, $self->{slider}); 1082 $self->SUPER::add ($self->{vp});
1083
1063 $self->add ($child) if $child; 1084 $self->add ($child) if $child;
1064 1085
1065 $self 1086 $self
1066} 1087}
1067
1068#TODO# update range on size_allocate depending on child
1069 1088
1070sub add { 1089sub add {
1071 my ($self, $widget) = @_; 1090 my ($self, $widget) = @_;
1072 1091
1073 $self->{vp}->add ($self->{child} = $widget); 1092 $self->{vp}->add ($self->{child} = $widget);
1074} 1093}
1075 1094
1095sub set_offset { shift->{vp}->set_offset (@_) }
1096sub set_center { shift->{vp}->set_center (@_) }
1097sub make_visible { shift->{vp}->make_visible (@_) }
1098
1099sub update_slider {
1100 my ($self) = @_;
1101
1102 my $child = ($self->{vp} or return)->child;
1103
1104 if ($self->{scroll_x}) {
1105 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1106 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1107
1108 my $visible = $w1 > $w2;
1109 if ($visible != $self->{hslider_visible}) {
1110 $self->{hslider_visible} = $visible;
1111 $visible ? $self->SUPER::add ($self->{hslider})
1112 : $self->SUPER::remove ($self->{hslider});
1113 }
1114 }
1115
1116 if ($self->{scroll_y}) {
1117 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1118 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1119
1120 my $visible = $h1 > $h2;
1121 if ($visible != $self->{vslider_visible}) {
1122 $self->{vslider_visible} = $visible;
1123 $visible ? $self->SUPER::add ($self->{vslider})
1124 : $self->SUPER::remove ($self->{vslider});
1125 }
1126 }
1127}
1128
1129sub start_dragging {
1130 my ($self, $ev) = @_;
1131
1132 $self->grab_focus;
1133
1134 my $ox = $self->{vp}{view_x};
1135 my $oy = $self->{vp}{view_y};
1136
1137 $self->{motion} = sub {
1138 my ($ev, $x, $y) = @_;
1139
1140 $ox -= $ev->{xrel};
1141 $oy -= $ev->{yrel};
1142
1143 $self->{vp}->set_offset ($ox, $oy);
1144 };
1145}
1146
1076sub invoke_mouse_wheel { 1147sub invoke_mouse_wheel {
1077 my ($self, $ev) = @_; 1148 my ($self, $ev) = @_;
1078 1149
1079 return 0 unless $ev->{dy}; # only vertical movements
1080
1081 $self->{slider}->emit (mouse_wheel => $ev); 1150 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1151 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1082 1152
1083 1 1153 1
1084} 1154}
1085 1155
1086sub update_slider { 1156sub invoke_button_down {
1087 my ($self) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1088 1158
1089 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1159 if ($ev->{button} == 2) {
1090} 1160 $self->start_dragging ($ev);
1161 return 1;
1162 }
1091 1163
1092sub update { 1164 0
1093 my ($self) = @_; 1165}
1094 1166
1095 $self->SUPER::update; 1167sub invoke_button_up {
1168 my ($self, $ev, $x, $y) = @_;
1096 1169
1097 $self->update_slider; 1170 if (delete $self->{motion}) {
1171 return 1;
1172 }
1173
1174 0
1175}
1176
1177sub invoke_mouse_motion {
1178 my ($self, $ev, $x, $y) = @_;
1179
1180 if ($self->{motion}) {
1181 $self->{motion}->($ev, $x, $y);
1182 return 1;
1183 }
1184
1185 0
1098} 1186}
1099 1187
1100sub invoke_size_allocate { 1188sub invoke_size_allocate {
1101 my ($self, $w, $h) = @_; 1189 my ($self, $w, $h) = @_;
1102 1190
1103 $self->update_slider; 1191 $self->update_slider;
1104
1105 $self->SUPER::invoke_size_allocate ($w, $h) 1192 $self->SUPER::invoke_size_allocate ($w, $h)
1106} 1193}
1107 1194
1108############################################################################# 1195#############################################################################
1109 1196
… …
1129 my ($w, $h) = @$self{qw(w h)}; 1216 my ($w, $h) = @$self{qw(w h)};
1130 1217
1131 glEnable GL_BLEND; 1218 glEnable GL_BLEND;
1132 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1133 glColor_premultiply @{ $self->{bg} }; 1220 glColor_premultiply @{ $self->{bg} };
1134
1135 glBegin GL_QUADS;
1136 glVertex 0 , 0;
1137 glVertex 0 , $h;
1138 glVertex $w, $h; 1221 glRect 0, 0, $w, $h;
1139 glVertex $w, 0;
1140 glEnd;
1141
1142 glDisable GL_BLEND; 1222 glDisable GL_BLEND;
1143 } 1223 }
1144 1224
1145 $self->SUPER::_draw; 1225 $self->SUPER::_draw;
1146} 1226}
… …
1259 1339
1260my @border = 1340my @border =
1261 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1341 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1262 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1342 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1263 1343
1344my @icon =
1345 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1346 qw(x1_move.png x1_resize.png);
1347
1264sub new { 1348sub new {
1265 my ($class, %arg) = @_; 1349 my ($class, %arg) = @_;
1266 1350
1267 my $self = $class->SUPER::new ( 1351 my $self = $class->SUPER::new (
1268 bg => [1, 1, 1, 1], 1352 bg => [1, 1, 1, 1],
… …
1303 1387
1304sub border { 1388sub border {
1305 int $_[0]{border} * $::FONTSIZE 1389 int $_[0]{border} * $::FONTSIZE
1306} 1390}
1307 1391
1392sub get_max_wh {
1393 my ($self) = @_;
1394
1395 return ($self->{w}, $self->{h})
1396 if $self->{visible} && $self->{w};
1397
1398 $self->SUPER::get_max_wh
1399}
1400
1308sub size_request { 1401sub size_request {
1309 my ($self) = @_; 1402 my ($self) = @_;
1310 1403
1311 $self->{title_widget}->size_request 1404 $self->{title_widget}->size_request
1312 if $self->{title_widget}; 1405 if $self->{title_widget};
… …
1436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1437 1530
1438 my $border = $self->border; 1531 my $border = $self->border;
1439 1532
1440 glColor @{ $self->{border_bg} }; 1533 glColor @{ $self->{border_bg} };
1441 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1534 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1442 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1535 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1443 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1536 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1444 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1537 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1538
1539 # move
1540 my $w2 = ($w - $border) * .5;
1541 my $h2 = ($h - $border) * .5;
1542 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1543 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1545
1546 # resize
1547 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1548 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1549 unless $self->{has_close_button};
1550 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1551 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1445 1552
1446 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1553 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1447 glColor @{ $self->{bg} }; 1554 glColor @{ $self->{bg} };
1448 1555
1449 # TODO: repeat texture not scale 1556 # TODO: repeat texture not scale
… …
1470 1577
1471############################################################################# 1578#############################################################################
1472 1579
1473package CFPlus::UI::Table; 1580package CFPlus::UI::Table;
1474 1581
1475our @ISA = CFPlus::UI::Base::; 1582our @ISA = CFPlus::UI::Container::;
1476 1583
1477use List::Util qw(max sum); 1584use List::Util qw(max sum);
1478 1585
1479use CFPlus::OpenGL; 1586use CFPlus::OpenGL;
1480 1587
1481sub new { 1588sub new {
1482 my $class = shift; 1589 my $class = shift;
1483 1590
1484 $class->SUPER::new ( 1591 $class->SUPER::new (
1485 col_expand => [], 1592 col_expand => [],
1593 row_expand => [],
1486 @_, 1594 @_,
1487 ) 1595 )
1488} 1596}
1489 1597
1490sub children {
1491 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1492}
1493
1494sub add { 1598sub add {
1599 my ($self, @widgets) = @_;
1600
1601 for my $child (@widgets) {
1602 $child->{c_rowspan} ||= 1;
1603 $child->{c_colspan} ||= 1;
1604 }
1605
1606 $self->SUPER::add (@widgets);
1607}
1608
1609sub add_at {
1495 my ($self) = shift; 1610 my $self = shift;
1611
1612 my @widgets;
1496 1613
1497 while (@_) { 1614 while (@_) {
1498 my ($x, $y, $child) = splice @_, 0, 3, (); 1615 my ($col, $row, $child) = splice @_, 0, 3, ();
1499 $child->set_parent ($self);
1500 $self->{children}[$y][$x] = $child;
1501 }
1502 1616
1503 $self->{force_realloc} = 1; 1617 $child->{c_row} = $row;
1504 $self->{force_size_alloc} = 1; 1618 $child->{c_col} = $col;
1505 $self->realloc;
1506}
1507 1619
1508sub remove { 1620 push @widgets, $child;
1621 }
1622
1623 $self->add (@widgets);
1624}
1625
1626sub get_wh {
1509 my ($self, $child) = @_; 1627 my ($self) = @_;
1510 1628
1511 # TODO: not yet implemented 1629 my (@w, @h);
1512}
1513
1514# TODO: move to container class maybe? send children a signal on removal?
1515sub clear {
1516 my ($self) = @_;
1517 1630
1518 my @children = $self->children; 1631 my @children = $self->children;
1519 delete $self->{children}; 1632
1633 # first pass, columns
1634 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1635 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1636
1637 my $sw = sum @w[$c .. $c + $cs - 1];
1638
1639 if ($w > $sw) {
1640 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1641 }
1520 1642 }
1521 for (@children) {
1522 delete $_->{parent};
1523 $_->hide;
1524 }
1525 1643
1526 $self->realloc; 1644 # second pass, rows
1527} 1645 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1528
1529sub get_wh {
1530 my ($self) = @_;
1531
1532 my (@w, @h);
1533
1534 for my $y (0 .. $#{$self->{children}}) {
1535 my $row = $self->{children}[$y]
1536 or next;
1537
1538 for my $x (0 .. $#$row) {
1539 my $widget = $row->[$x]
1540 or next;
1541 my ($w, $h) = @$widget{qw(req_w req_h)}; 1646 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1542 1647
1543 $w[$x] = max $w[$x], $w; 1648 my $sh = sum @h[$r .. $r + $rs - 1];
1544 $h[$y] = max $h[$y], $h; 1649
1650 if ($h > $sh) {
1651 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1545 } 1652 }
1546 } 1653 }
1547 1654
1548 (\@w, \@h) 1655 (\@w, \@h)
1549} 1656}
… …
1565 my ($ws, $hs) = $self->get_wh; 1672 my ($ws, $hs) = $self->get_wh;
1566 1673
1567 my $req_w = (sum @$ws) || 1; 1674 my $req_w = (sum @$ws) || 1;
1568 my $req_h = (sum @$hs) || 1; 1675 my $req_h = (sum @$hs) || 1;
1569 1676
1570 # TODO: nicer code && do row_expand 1677 # now linearly scale the rows/columns to the allocated size
1571 my @col_expand = @{$self->{col_expand}}; 1678 my @col_expand = @{$self->{col_expand}};
1572 @col_expand = (1) x @$ws unless @col_expand; 1679 @col_expand = (1) x @$ws unless @col_expand;
1573 my $col_expand = (sum @col_expand) || 1; 1680 my $col_expand = (sum @col_expand) || 1;
1574 1681
1575 # linearly scale sizes
1576 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1682 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1577 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1578 1683
1579 CFPlus::UI::harmonize $ws; 1684 CFPlus::UI::harmonize $ws;
1685
1686 my @row_expand = @{$self->{row_expand}};
1687 @row_expand = (1) x @$ws unless @row_expand;
1688 my $row_expand = (sum @row_expand) || 1;
1689
1690 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1691
1580 CFPlus::UI::harmonize $hs; 1692 CFPlus::UI::harmonize $hs;
1581 1693
1582 my $y; 1694 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1695 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1583 1696
1584 for my $r (0 .. $#{$self->{children}}) { 1697 for my $widget ($self->children) {
1585 my $row = $self->{children}[$r] 1698 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1586 or next;
1587 1699
1588 my $x = 0; 1700 $widget->configure (
1589 my $row_h = $hs->[$r]; 1701 $x[$c], $y[$r],
1702 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1590 1703 );
1591 for my $c (0 .. $#$row) { 1704 }
1592 my $col_w = $ws->[$c];
1593 1705
1594 if (my $widget = $row->[$c]) { 1706 1
1595 $widget->configure ($x, $y, $col_w, $row_h); 1707}
1596 }
1597 1708
1598 $x += $col_w; 1709#############################################################################
1710
1711package CFPlus::UI::Fixed;
1712
1713use List::Util qw(min max);
1714
1715our @ISA = CFPlus::UI::Container::;
1716
1717sub _scale($$$) {
1718 my ($rel, $val, $max) = @_;
1719
1720 $rel ? $val * $max : $val
1721}
1722
1723sub size_request {
1724 my ($self) = @_;
1725
1726 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1727
1728 # determine overall size by querying abs widgets
1729 for my $child ($self->visible_children) {
1730 unless ($child->{c_rel}) {
1731 my $x = $child->{c_x};
1732 my $y = $child->{c_y};
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1599 } 1736 }
1737 }
1600 1738
1601 $y += $row_h; 1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 # now layout remaining widgets
1743 for my $child ($self->visible_children) {
1744 if ($child->{c_rel}) {
1745 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1746 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1747
1748 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1749 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1750 }
1751 }
1752
1753 my $W = $x2 - $x1;
1754 my $H = $y2 - $y1;
1755
1756 ($W, $H)
1757}
1758
1759sub invoke_size_allocate {
1760 my ($self, $W, $H) = @_;
1761
1762 for my $child ($self->visible_children) {
1763 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1764 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1765
1766 $x += $child->{c_halign} * $child->{req_w};
1767 $y += $child->{c_valign} * $child->{req_h};
1768
1769 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1602 } 1770 }
1603 1771
1604 1 1772 1
1605} 1773}
1606 1774
1607sub find_widget {
1608 my ($self, $x, $y) = @_;
1609
1610 $x -= $self->{x};
1611 $y -= $self->{y};
1612
1613 my $res;
1614
1615 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1616 $res = $_->find_widget ($x, $y)
1617 and return $res;
1618 }
1619
1620 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1621}
1622
1623sub _draw {
1624 my ($self) = @_;
1625
1626 for (grep $_, @{$self->{children}}) {
1627 $_->draw for grep $_, @$_;
1628 }
1629}
1630
1631############################################################################# 1775#############################################################################
1632 1776
1633package CFPlus::UI::Box; 1777package CFPlus::UI::Box;
1634 1778
1635our @ISA = CFPlus::UI::Container::; 1779our @ISA = CFPlus::UI::Container::;
1636 1780
1637sub size_request { 1781sub size_request {
1638 my ($self) = @_; 1782 my ($self) = @_;
1783
1784 my @children = $self->visible_children;
1639 1785
1640 $self->{vertical} 1786 $self->{vertical}
1641 ? ( 1787 ? (
1642 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1788 (List::Util::max map $_->{req_w}, @children),
1643 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1789 (List::Util::sum map $_->{req_h}, @children),
1644 ) 1790 )
1645 : ( 1791 : (
1646 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::sum map $_->{req_w}, @children),
1647 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::max map $_->{req_h}, @children),
1648 ) 1794 )
1649} 1795}
1650 1796
1651sub invoke_size_allocate { 1797sub invoke_size_allocate {
1652 my ($self, $w, $h) = @_; 1798 my ($self, $w, $h) = @_;
… …
1776 1922
1777 delete $self->{ox}; 1923 delete $self->{ox};
1778 $self->SUPER::realloc; 1924 $self->SUPER::realloc;
1779} 1925}
1780 1926
1927sub clear {
1928 my ($self) = @_;
1929
1930 $self->set_text ("");
1931}
1932
1781sub set_text { 1933sub set_text {
1782 my ($self, $text) = @_; 1934 my ($self, $text) = @_;
1783 1935
1784 return if $self->{text} eq "T$text"; 1936 return if $self->{text} eq "T$text";
1785 $self->{text} = "T$text"; 1937 $self->{text} = "T$text";
… …
1808 1960
1809sub size_request { 1961sub size_request {
1810 my ($self) = @_; 1962 my ($self) = @_;
1811 1963
1812 $self->{size_req} ||= do { 1964 $self->{size_req} ||= do {
1965 my ($max_w, $max_h) = $self->get_max_wh;
1966
1813 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1967 $self->{layout}->set_font ($self->{font}) if $self->{font};
1814 $self->{layout}->set_width ($self->{max_w} || -1); 1968 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1815 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1969 $self->{layout}->set_ellipsise ($self->{ellipsise});
1816 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1970 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1817 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1971 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1818 1972
1819 my ($w, $h) = $self->{layout}->size; 1973 my ($w, $h) = $self->{layout}->size;
… …
1891 : ($self->{w} - $size->[0]) * 0.5); 2045 : ($self->{w} - $size->[0]) * 0.5);
1892 2046
1893 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2047 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1894 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2048 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1895 : ($self->{h} - $size->[1]) * 0.5); 2049 : ($self->{h} - $size->[1]) * 0.5);
2050
2051 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1896 }; 2052 };
1897 2053
1898 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2054# unless ($self->{list}) {
1899 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2055# $self->{list} = CFPlus::OpenGL::glGenList;
1900 2056# CFPlus::OpenGL::glNewList $self->{list};
1901 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2057# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2058# CFPlus::OpenGL::glEndList;
2059# }
2060#
2061# CFPlus::OpenGL::glCallList $self->{list};
2062
2063 $self->{layout}->draw;
1902} 2064}
2065
2066#sub destroy {
2067# my ($self) = @_;
2068#
2069# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2070#
2071# $self->SUPER::destroy;
2072#}
1903 2073
1904############################################################################# 2074#############################################################################
1905 2075
1906package CFPlus::UI::EntryBase; 2076package CFPlus::UI::EntryBase;
1907 2077
… …
1913 my $class = shift; 2083 my $class = shift;
1914 2084
1915 $class->SUPER::new ( 2085 $class->SUPER::new (
1916 fg => [1, 1, 1], 2086 fg => [1, 1, 1],
1917 bg => [0, 0, 0, 0.2], 2087 bg => [0, 0, 0, 0.2],
2088 outline => [0.6, 0.3, 0.1],
1918 active_bg => [1, 1, 1, 0.5], 2089 active_bg => [0, 0, 1, .2],
1919 active_fg => [0, 0, 0], 2090 active_fg => [1, 1, 1],
2091 active_outline => [1, 1, 0],
1920 can_hover => 1, 2092 can_hover => 1,
1921 can_focus => 1, 2093 can_focus => 1,
1922 valign => 0, 2094 valign => 0,
1923 can_events => 1, 2095 can_events => 1,
1924 ellipsise => 0, 2096 ellipsise => 0,
… …
2064 glColor_premultiply @{$self->{bg}}; 2236 glColor_premultiply @{$self->{bg}};
2065 } 2237 }
2066 2238
2067 glEnable GL_BLEND; 2239 glEnable GL_BLEND;
2068 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2240 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2069 glBegin GL_QUADS;
2070 glVertex 0 , 0;
2071 glVertex 0 , $self->{h};
2072 glVertex $self->{w}, $self->{h}; 2241 glRect 0, 0, $self->{w}, $self->{h};
2073 glVertex $self->{w}, 0;
2074 glEnd;
2075 glDisable GL_BLEND; 2242 glDisable GL_BLEND;
2076 2243
2077 $self->SUPER::_draw; 2244 $self->SUPER::_draw;
2078 2245
2079 #TODO: force update every cursor change :( 2246 #TODO: force update every cursor change :(
… …
2081 2248
2082 unless (exists $self->{cur_h}) { 2249 unless (exists $self->{cur_h}) {
2083 my $text = substr $self->{text}, 0, $self->{cursor}; 2250 my $text = substr $self->{text}, 0, $self->{cursor};
2084 utf8::encode $text; 2251 utf8::encode $text;
2085 2252
2086 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2253 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2087 } 2254 }
2088 2255
2256 glColor_premultiply @{$self->{active_fg}};
2089 glBegin GL_LINES; 2257 glBegin GL_LINES;
2090 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2258 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2091 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2259 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2260 glEnd;
2261
2262 glLineWidth 3;
2263 glColor @{$self->{active_outline}};
2264 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2265 glLineWidth 1;
2266
2267 } else {
2268 glColor @{$self->{outline}};
2269 glBegin GL_LINE_STRIP;
2270 glVertex .5, $self->{h} * .5;
2271 glVertex .5, $self->{h} - 2.5;
2272 glVertex $self->{w} - .5, $self->{h} - 2.5;
2273 glVertex $self->{w} - .5, $self->{h} * .5;
2092 glEnd; 2274 glEnd;
2093 } 2275 }
2094} 2276}
2095 2277
2096############################################################################# 2278#############################################################################
… …
2183 1 2365 1
2184} 2366}
2185 2367
2186############################################################################# 2368#############################################################################
2187 2369
2188package CFPlus::UI::Button; 2370package CFPlus::UI::ButtonBin;
2189 2371
2190our @ISA = CFPlus::UI::Label::; 2372our @ISA = CFPlus::UI::Bin::;
2191 2373
2192use CFPlus::OpenGL; 2374use CFPlus::OpenGL;
2193 2375
2194my @tex = 2376my @tex =
2195 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2377 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2196 qw(b1_button_active.png); 2378 qw(b1_button_inactive.png b1_button_active.png);
2197 2379
2198sub new { 2380sub new {
2199 my $class = shift; 2381 my $class = shift;
2200 2382
2201 $class->SUPER::new ( 2383 $class->SUPER::new (
2202 padding_x => 4,
2203 padding_y => 4,
2204 fg => [1, 1, 1],
2205 active_fg => [0, 0, 1],
2206 can_hover => 1, 2384 can_hover => 1,
2207 align => 0, 2385 align => 0,
2208 valign => 0, 2386 valign => 0,
2209 can_events => 1, 2387 can_events => 1,
2210 @_ 2388 @_
… …
2222} 2400}
2223 2401
2224sub _draw { 2402sub _draw {
2225 my ($self) = @_; 2403 my ($self) = @_;
2226 2404
2227 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2228
2229 glEnable GL_TEXTURE_2D; 2405 glEnable GL_TEXTURE_2D;
2230 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2406 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2231 glColor 0, 0, 0, 1; 2407 glColor 0, 0, 0, 1;
2232 2408
2409 my $tex = $tex[$GRAB == $self];
2233 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2410 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2411
2412 glDisable GL_TEXTURE_2D;
2413
2414 $self->SUPER::_draw;
2415}
2416
2417#############################################################################
2418
2419package CFPlus::UI::Button;
2420
2421our @ISA = CFPlus::UI::Label::;
2422
2423use CFPlus::OpenGL;
2424
2425my @tex =
2426 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2427 qw(b1_button_inactive.png b1_button_active.png);
2428
2429sub new {
2430 my $class = shift;
2431
2432 $class->SUPER::new (
2433 padding_x => 4,
2434 padding_y => 4,
2435 fg => [1.0, 1.0, 1.0],
2436 active_fg => [0.8, 0.8, 0.8],
2437 can_hover => 1,
2438 align => 0,
2439 valign => 0,
2440 can_events => 1,
2441 @_
2442 )
2443}
2444
2445sub invoke_button_up {
2446 my ($self, $ev, $x, $y) = @_;
2447
2448 $self->emit ("activate")
2449 if $x >= 0 && $x < $self->{w}
2450 && $y >= 0 && $y < $self->{h};
2451
2452 1
2453}
2454
2455sub _draw {
2456 my ($self) = @_;
2457
2458 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2459
2460 glEnable GL_TEXTURE_2D;
2461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2462 glColor 0, 0, 0, 1;
2463
2464 my $tex = $tex[$GRAB == $self];
2465 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2234 2466
2235 glDisable GL_TEXTURE_2D; 2467 glDisable GL_TEXTURE_2D;
2236 2468
2237 $self->SUPER::_draw; 2469 $self->SUPER::_draw;
2238} 2470}
… …
2295sub _draw { 2527sub _draw {
2296 my ($self) = @_; 2528 my ($self) = @_;
2297 2529
2298 $self->SUPER::_draw; 2530 $self->SUPER::_draw;
2299 2531
2300 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2532 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2301 2533
2302 my ($w, $h) = @$self{qw(w h)}; 2534 my ($w, $h) = @$self{qw(w h)};
2303 2535
2304 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2536 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2305 2537
… …
2325sub new { 2557sub new {
2326 my $class = shift; 2558 my $class = shift;
2327 2559
2328 my $self = $class->SUPER::new ( 2560 my $self = $class->SUPER::new (
2329 can_events => 0, 2561 can_events => 0,
2562 scale => 1,
2330 @_, 2563 @_,
2331 ); 2564 );
2332 2565
2333 $self->{path} || $self->{tex} 2566 $self->{path} || $self->{tex}
2334 or Carp::croak "'path' or 'tex' attributes required"; 2567 or Carp::croak "'path' or 'tex' attributes required";
… …
2359} 2592}
2360 2593
2361sub size_request { 2594sub size_request {
2362 my ($self) = @_; 2595 my ($self) = @_;
2363 2596
2364 ($self->{tex}{w}, $self->{tex}{h}) 2597 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2365} 2598}
2366 2599
2367sub _draw { 2600sub _draw {
2368 my ($self) = @_; 2601 my ($self) = @_;
2369 2602
… …
2379 } 2612 }
2380 2613
2381 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2382 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2383 2616
2384 $tex->draw_quad (0, 0, $w, $h); 2617 $tex->draw_quad_alpha (0, 0, $w, $h);
2385 2618
2386 glDisable GL_TEXTURE_2D; 2619 glDisable GL_TEXTURE_2D;
2387} 2620}
2388 2621
2389############################################################################# 2622#############################################################################
… …
2408 align => 0, 2641 align => 0,
2409 valign => 0, 2642 valign => 0,
2410 can_events => 1, 2643 can_events => 1,
2411 @_ 2644 @_
2412 ); 2645 );
2646}
2647
2648sub invoke_button_down {
2649 my ($self, $ev, $x, $y) = @_;
2650
2651 1
2413} 2652}
2414 2653
2415sub invoke_button_up { 2654sub invoke_button_up {
2416 my ($self, $ev, $x, $y) = @_; 2655 my ($self, $ev, $x, $y) = @_;
2417 2656
… …
2557 glDisable GL_TEXTURE_2D; 2796 glDisable GL_TEXTURE_2D;
2558} 2797}
2559 2798
2560############################################################################# 2799#############################################################################
2561 2800
2801package CFPlus::UI::Progress;
2802
2803our @ISA = CFPlus::UI::Label::;
2804
2805use CFPlus::OpenGL;
2806
2807sub new {
2808 my ($class, %arg) = @_;
2809
2810 my $self = $class->SUPER::new (
2811 fg => [1, 1, 1],
2812 bg => [0, 0, 1, 0.2],
2813 bar => [0.7, 0.5, 0.1, 0.8],
2814 outline => [0.4, 0.3, 0],
2815 fontsize => 0.9,
2816 valign => 0,
2817 align => 0,
2818 can_events => 1,
2819 ellipsise => 1,
2820 label => "%d%%",
2821 %arg,
2822 );
2823
2824 $self->set_value ($arg{value} || -1);
2825
2826 $self
2827}
2828
2829sub set_label {
2830 my ($self, $label) = @_;
2831
2832 return if $self->{label} eq $label;
2833 $self->{label} = $label;
2834
2835 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2836}
2837
2838sub set_value {
2839 my ($self, $value) = @_;
2840
2841 if ($self->{value} ne $value) {
2842 $self->{value} = $value;
2843
2844 if ($value < 0) {
2845 $self->set_text ("-");
2846 } else {
2847 $self->set_text (sprintf $self->{label}, $value * 100);
2848 }
2849
2850 $self->update;
2851 }
2852}
2853
2854sub _draw {
2855 my ($self) = @_;
2856
2857 glEnable GL_BLEND;
2858 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2859
2860 if ($self->{value} >= 0) {
2861 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2862
2863 glColor_premultiply @{$self->{bar}};
2864 glRect 2, 2, $s, $self->{h} - 2;
2865 glColor_premultiply @{$self->{bg}};
2866 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2867 }
2868
2869 glColor_premultiply @{$self->{outline}};
2870 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2871
2872 glDisable GL_BLEND;
2873
2874 {
2875 local $self->{bg}; # do not draw background
2876 $self->SUPER::_draw;
2877 }
2878}
2879
2880#############################################################################
2881
2882package CFPlus::UI::ExperienceProgress;
2883
2884our @ISA = CFPlus::UI::Progress::;
2885
2886sub new {
2887 my ($class, %arg) = @_;
2888
2889 my $self = $class->SUPER::new (
2890 tooltip => sub {
2891 my ($self) = @_;
2892
2893 sprintf "level %d\n%s points\n%s next level\n%s to go",
2894 $self->{lvl},
2895 ::formsep ($self->{exp}),
2896 ::formsep ($self->{nxt}),
2897 ::formsep ($self->{nxt} - $self->{exp}),
2898 },
2899 %arg
2900 );
2901
2902 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2903 if $::CONN;
2904
2905 $self
2906}
2907
2908sub DESTROY {
2909 my ($self) = @_;
2910
2911 delete $::CONN->{on_exp_update}{$self+0}
2912 if $::CONN;
2913
2914 $self->SUPER::DESTROY;
2915}
2916
2917sub set_value {
2918 my ($self, $lvl, $exp) = @_;
2919
2920 $self->{lvl} = $lvl;
2921 $self->{exp} = $exp;
2922
2923 my $v = -1;
2924
2925 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2926 my $l0 = $table->[$lvl - 1];
2927 my $l1 = $table->[$lvl];
2928
2929 $self->{nxt} = $l1;
2930
2931 $v = ($exp - $l0) / ($l1 - $l0);
2932 }
2933
2934 $self->SUPER::set_value ($v);
2935}
2936
2937#############################################################################
2938
2562package CFPlus::UI::Gauge; 2939package CFPlus::UI::Gauge;
2563 2940
2564our @ISA = CFPlus::UI::VBox::; 2941our @ISA = CFPlus::UI::VBox::;
2565 2942
2566sub new { 2943sub new {
… …
2691 3068
2692 $self->SUPER::invoke_button_down ($ev, $x, $y); 3069 $self->SUPER::invoke_button_down ($ev, $x, $y);
2693 3070
2694 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3071 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2695 3072
2696 $self->invoke_mouse_motion ($ev, $x, $y) 3073 $self->invoke_mouse_motion ($ev, $x, $y);
3074
3075 1
2697} 3076}
2698 3077
2699sub invoke_mouse_motion { 3078sub invoke_mouse_motion {
2700 my ($self, $ev, $x, $y) = @_; 3079 my ($self, $ev, $x, $y) = @_;
2701 3080
… …
2721 3100
2722 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3101 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2723 3102
2724 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3103 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2725 3104
2726 ! ! $delta 3105 1
2727} 3106}
2728 3107
2729sub update { 3108sub update {
2730 my ($self) = @_; 3109 my ($self) = @_;
2731 3110
… …
2862} 3241}
2863 3242
2864sub size_request { 3243sub size_request {
2865 my ($self) = @_; 3244 my ($self) = @_;
2866 3245
2867 my ($empty, $slider) = @{ $self->{children} }; 3246 my ($empty, $slider) = $self->visible_children;
2868 3247
2869 local $self->{children} = [$empty, $slider]; 3248 local $self->{children} = [$empty, $slider];
2870 $self->SUPER::size_request 3249 $self->SUPER::size_request
2871} 3250}
2872 3251
… …
3061 3440
3062 if ($y0 < $y + $h && $y < $y1) { 3441 if ($y0 < $y + $h && $y < $y1) {
3063 my $layout = $self->get_layout ($para); 3442 my $layout = $self->get_layout ($para);
3064 3443
3065 $layout->render ($para->{indent}, $y - $y0); 3444 $layout->render ($para->{indent}, $y - $y0);
3445 $layout->draw;
3066 3446
3067 if (my @w = @{ $para->{widget} }) { 3447 if (my @w = @{ $para->{widget} }) {
3068 my @s = $layout->get_shapes; 3448 my @s = $layout->get_shapes;
3069 3449
3070 for (@w) { 3450 for (@w) {
… …
3192} 3572}
3193 3573
3194sub set_tooltip_from { 3574sub set_tooltip_from {
3195 my ($self, $widget) = @_; 3575 my ($self, $widget) = @_;
3196 3576
3197 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3198 if $widget->{tooltip} =~ /^#(.*)$/;
3199
3200 my $tooltip = $widget->{tooltip}; 3577 my $tip = $widget->{tooltip};
3578 $tip = $tip->($widget) if "CODE" eq ref $tip;
3579
3580 $tip = CFPlus::Pod::section_label tooltip => $1
3581 if $tip =~ /^#(.*)$/;
3201 3582
3202 if ($ENV{CFPLUS_DEBUG} & 2) { 3583 if ($ENV{CFPLUS_DEBUG} & 2) {
3203 $tooltip .= "\n\n" . (ref $widget) . "\n" 3584 $tip .= "\n\n" . (ref $widget) . "\n"
3204 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3585 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3205 . "req $widget->{req_w} $widget->{req_h}\n" 3586 . "req $widget->{req_w} $widget->{req_h}\n"
3206 . "visible $widget->{visible}"; 3587 . "visible $widget->{visible}";
3207 } 3588 }
3208 3589
3209 $tooltip =~ s/^\n+//; 3590 $tip =~ s/^\n+//;
3210 $tooltip =~ s/\n+$//; 3591 $tip =~ s/\n+$//;
3211 3592
3212 $self->add (new CFPlus::UI::Label 3593 $self->add (new CFPlus::UI::Label
3213 markup => $tooltip, 3594 markup => $tip,
3214 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3595 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3215 fontsize => 0.8, 3596 fontsize => 0.8,
3216 style => 1, # FLAG_INVERSE 3597 style => 1, # FLAG_INVERSE
3217 ellipsise => 0, 3598 ellipsise => 0,
3218 font => ($widget->{tooltip_font} || $::FONT_PROP), 3599 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3256} 3637}
3257 3638
3258sub _draw { 3639sub _draw {
3259 my ($self) = @_; 3640 my ($self) = @_;
3260 3641
3261 glTranslate 0.375, 0.375;
3262
3263 my ($w, $h) = @$self{qw(w h)}; 3642 my ($w, $h) = @$self{qw(w h)};
3264 3643
3265 glColor 1, 0.8, 0.4; 3644 glColor 1, 0.8, 0.4;
3266 glBegin GL_QUADS; 3645 glRect 0, 0, $w, $h;
3267 glVertex 0 , 0;
3268 glVertex 0 , $h;
3269 glVertex $w, $h;
3270 glVertex $w, 0;
3271 glEnd;
3272 3646
3273 glColor 0, 0, 0; 3647 glColor 0, 0, 0;
3274 glBegin GL_LINE_LOOP; 3648 glRect_lineloop .5, .5, $w + .5, $h + .5;
3275 glVertex 0 , 0;
3276 glVertex 0 , $h;
3277 glVertex $w, $h;
3278 glVertex $w, 0;
3279 glEnd;
3280 3649
3281 glTranslate 2 - 0.375, 2 - 0.375; 3650 glTranslate 2, 2;
3282 3651
3283 $self->SUPER::_draw; 3652 $self->SUPER::_draw;
3284} 3653}
3285 3654
3286############################################################################# 3655#############################################################################
… …
3293 3662
3294sub new { 3663sub new {
3295 my $class = shift; 3664 my $class = shift;
3296 3665
3297 my $self = $class->SUPER::new ( 3666 my $self = $class->SUPER::new (
3667 size_w => 32,
3668 size_h => 8,
3298 aspect => 1, 3669 aspect => 1,
3299 can_events => 0, 3670 can_events => 0,
3300 @_, 3671 @_,
3301 ); 3672 );
3302 3673
3303 if ($self->{anim} && $self->{animspeed}) { 3674 if ($self->{anim} && $self->{animspeed}) {
3304 CFPlus::weaken (my $widget = $self); 3675 CFPlus::weaken (my $widget = $self);
3305 3676
3677 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3678 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3306 $self->{timer} = Event->timer ( 3679 $self->{timer} = Event->timer (
3307 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3308 hard => 1, 3680 parked => 1,
3309 interval => $self->{animspeed},
3310 cb => sub { 3681 cb => sub {
3682 return unless $::CONN;
3683
3684 my $w = $widget
3685 or return;
3686
3311 ++$widget->{frame}; 3687 ++$w->{frame};
3688 $w->update_face;
3689
3690 # somehow, $widget can go away
3312 $widget->update; 3691 $w->update;
3692 $w->update_timer;
3313 }, 3693 },
3314 ); 3694 );
3695
3696 $self->update_face;
3697 $self->update_timer;
3315 } 3698 }
3316 3699
3317 $self 3700 $self
3318} 3701}
3319 3702
3703sub update_timer {
3704 my ($self) = @_;
3705
3706 return unless $self->{timer};
3707
3708 if ($self->{visible}) {
3709 $self->{timer}->at (
3710 $self->{anim_start}
3711 + $self->{animspeed}
3712 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3713 );
3714 $self->{timer}->start;
3715 } else {
3716 $self->{timer}->stop;
3717 }
3718}
3719
3720sub update_face {
3721 my ($self) = @_;
3722
3723 if ($::CONN) {
3724 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3725 if ($anim && @$anim) {
3726 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3727 delete $self->{face_change_cb};
3728
3729 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3730 unless ($tex->{name} || $tex->{loading}) {
3731 $tex->upload (sub { $self->reconfigure });
3732 }
3733 }
3734 }
3735 }
3736 }
3737}
3738
3320sub size_request { 3739sub size_request {
3321 (32, 8) 3740 my ($self) = @_;
3741
3742 if ($::CONN) {
3743 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3744 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3745 if ($tex->{name}) {
3746 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3747 } elsif (!$tex->{loading}) {
3748 $tex->upload (sub { $self->reconfigure });
3749 }
3750 }
3751
3752 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3753 }
3754 }
3755
3756 ($self->{size_w} || 8, $self->{size_h} || 8)
3322} 3757}
3323 3758
3324sub update { 3759sub update {
3325 my ($self) = @_; 3760 my ($self) = @_;
3326 3761
3327 return unless $self->{visible}; 3762 return unless $self->{visible};
3328 3763
3329 $self->SUPER::update; 3764 $self->SUPER::update;
3330} 3765}
3331 3766
3767sub invoke_visibility_change {
3768 my ($self) = @_;
3769
3770 $self->update_timer;
3771
3772 0
3773}
3774
3332sub _draw { 3775sub _draw {
3333 my ($self) = @_; 3776 my ($self) = @_;
3334 3777
3335 return unless $::CONN;
3336
3337 $self->SUPER::_draw; 3778 $self->SUPER::_draw;
3338 3779
3339 my $face; 3780 if (my $tex = $self->{tex}) {
3340
3341 if ($self->{frame}) {
3342 my $anim = $::CONN->{anim}[$self->{anim}];
3343
3344 $face = $anim->[ $self->{frame} % @$anim ]
3345 if $anim && @$anim;
3346 }
3347
3348 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3349
3350 if ($tex) {
3351 glEnable GL_TEXTURE_2D; 3781 glEnable GL_TEXTURE_2D;
3352 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3782 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3353 glColor 0, 0, 0, 1; 3783 glColor 0, 0, 0, 1;
3354 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3784 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3355 glDisable GL_TEXTURE_2D; 3785 glDisable GL_TEXTURE_2D;
… …
3357} 3787}
3358 3788
3359sub destroy { 3789sub destroy {
3360 my ($self) = @_; 3790 my ($self) = @_;
3361 3791
3362 $self->{timer}->cancel 3792 (delete $self->{timer})->cancel
3363 if $self->{timer}; 3793 if $self->{timer};
3364 3794
3365 $self->SUPER::destroy; 3795 $self->SUPER::destroy;
3366} 3796}
3367 3797
… …
3407 children => [ 3837 children => [
3408 (new CFPlus::UI::Label markup => $left, expand => 1), 3838 (new CFPlus::UI::Label markup => $left, expand => 1),
3409 (new CFPlus::UI::Label markup => $right, align => +1), 3839 (new CFPlus::UI::Label markup => $right, align => +1),
3410 ], 3840 ],
3411 ; 3841 ;
3412 3842
3413 } else { 3843 } else {
3414 $widget = new CFPlus::UI::Label 3844 $widget = new CFPlus::UI::Label
3415 can_hover => 1, 3845 can_hover => 1,
3416 can_events => 1, 3846 can_events => 1,
3417 markup => $widget, 3847 markup => $widget,
… …
3542 3972
3543############################################################################# 3973#############################################################################
3544 3974
3545package CFPlus::UI::Notebook; 3975package CFPlus::UI::Notebook;
3546 3976
3977use CFPlus::OpenGL;
3978
3547our @ISA = CFPlus::UI::VBox::; 3979our @ISA = CFPlus::UI::VBox::;
3548 3980
3549sub new { 3981sub new {
3550 my $class = shift; 3982 my $class = shift;
3551 3983
3552 my $self = $class->SUPER::new ( 3984 my $self = $class->SUPER::new (
3553 buttonbar => (new CFPlus::UI::Buttonbar), 3985 buttonbar => (new CFPlus::UI::Buttonbar),
3554 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3986 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3987 active_outline => [.7, .7, 0.2],
3555 # filter => # will be put between multiplexer and $self 3988 # filter => # will be put between multiplexer and $self
3556 @_, 3989 @_,
3557 ); 3990 );
3558 3991
3559 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3992 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3560 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3993 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3561 3994
3995 {
3996 Scalar::Util::weaken (my $wself = $self);
3997
3998 $self->{multiplexer}->connect (c_add => sub {
3999 my ($mplex, $widgets) = @_;
4000
4001 for my $child (@$widgets) {
4002 Scalar::Util::weaken $child;
4003 $child->{c_tab_} ||= do {
4004 my $tab =
4005 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
4006 ? $child->{c_tab}
4007 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4008
4009 $tab->connect (activate => sub {
4010 $wself->set_current_page ($child);
4011 });
4012
4013 $tab
4014 };
4015
4016 $self->{buttonbar}->add ($child->{c_tab_});
4017 }
4018 });
4019
4020 $self->{multiplexer}->connect (c_remove => sub {
4021 my ($mplex, $widgets) = @_;
4022
4023 for my $child (@$widgets) {
4024 $wself->{buttonbar}->remove ($child->{c_tab_});
4025 }
4026 });
4027 }
4028
3562 $self 4029 $self
3563} 4030}
3564 4031
3565sub add { 4032sub add {
4033 my ($self, @widgets) = @_;
4034
4035 $self->{multiplexer}->add (@widgets)
4036}
4037
4038sub remove {
4039 my ($self, @widgets) = @_;
4040
4041 $self->{multiplexer}->remove (@widgets)
4042}
4043
4044sub pages {
4045 my ($self) = @_;
4046 $self->{multiplexer}->children
4047}
4048
4049sub add_tab {
3566 my ($self, $title, $widget, $tooltip) = @_; 4050 my ($self, $title, $widget, $tooltip) = @_;
3567 4051
3568 CFPlus::weaken $self; 4052 $title = [$title, $tooltip] unless ref $title;
4053 $widget->{c_tab} = $title;
3569 4054
3570 $self->{buttonbar}->add (new CFPlus::UI::Button
3571 markup => $title,
3572 tooltip => $tooltip,
3573 on_activate => sub { $self->set_current_page ($widget) },
3574 );
3575
3576 $self->{multiplexer}->add ($widget); 4055 $self->add ($widget);
3577} 4056}
3578 4057
3579sub get_current_page { 4058sub get_current_page {
3580 my ($self) = @_; 4059 my ($self) = @_;
3581 4060
… …
3585sub set_current_page { 4064sub set_current_page {
3586 my ($self, $page) = @_; 4065 my ($self, $page) = @_;
3587 4066
3588 $self->{multiplexer}->set_current_page ($page); 4067 $self->{multiplexer}->set_current_page ($page);
3589 $self->emit (page_changed => $self->{multiplexer}{current}); 4068 $self->emit (page_changed => $self->{multiplexer}{current});
4069}
4070
4071sub _draw {
4072 my ($self) = @_;
4073
4074 $self->SUPER::_draw ();
4075
4076 if (my $cur = $self->{multiplexer}{current}) {
4077 if ($cur = $cur->{c_tab_}) {
4078 glTranslate $self->{buttonbar}{x} + $cur->{x},
4079 $self->{buttonbar}{y} + $cur->{y};
4080 glLineWidth 3;
4081 #glEnable GL_BLEND;
4082 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4083 glColor @{$self->{active_outline}};
4084 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4085 glLineWidth 1;
4086 #glDisable GL_BLEND;
4087 }
4088 }
3590} 4089}
3591 4090
3592############################################################################# 4091#############################################################################
3593 4092
3594package CFPlus::UI::Selector; 4093package CFPlus::UI::Selector;
… …
3864} 4363}
3865 4364
3866sub update { 4365sub update {
3867 my ($self) = @_; 4366 my ($self) = @_;
3868 4367
3869 $::WANT_REFRESH++; 4368 $::WANT_REFRESH->start;
3870} 4369}
3871 4370
3872sub add { 4371sub add {
3873 my ($self, @children) = @_; 4372 my ($self, @children) = @_;
3874 4373
… …
3911 while ($self->{refresh_hook}) { 4410 while ($self->{refresh_hook}) {
3912 $_->() 4411 $_->()
3913 for values %{delete $self->{refresh_hook}}; 4412 for values %{delete $self->{refresh_hook}};
3914 } 4413 }
3915 4414
3916 if ($self->{realloc}) { 4415 while ($self->{realloc}) {
3917 my %queue; 4416 my %queue;
3918 my @queue; 4417 my @queue;
3919 my $widget; 4418 my $widget;
3920 4419
3921 outer: 4420 outer:
… …
3968 } 4467 }
3969 } 4468 }
3970 4469
3971 delete $self->{realloc}{$widget+0}; 4470 delete $self->{realloc}{$widget+0};
3972 } 4471 }
3973 }
3974 4472
3975 while (my $size_alloc = delete $self->{size_alloc}) { 4473 while (my $size_alloc = delete $self->{size_alloc}) {
3976 my @queue = sort { $b->{visible} <=> $a->{visible} } 4474 my @queue = sort { $a->{visible} <=> $b->{visible} }
3977 values %$size_alloc; 4475 values %$size_alloc;
3978 4476
3979 while () { 4477 while () {
3980 my $widget = pop @queue || last; 4478 my $widget = pop @queue || last;
3981 4479
3982 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4480 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3983 4481
3984 $w = 0 if $w < 0;
3985 $h = 0 if $h < 0;
3986
3987 $w = max $widget->{min_w}, $w; 4482 $w = max $widget->{min_w}, $w;
3988 $h = max $widget->{min_h}, $h; 4483 $h = max $widget->{min_h}, $h;
3989 4484
3990# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4485# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3991# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4486# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3992 4487
3993 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4488 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3994 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4489 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3995 4490
3996 $w = int $w + 0.5; 4491 $w = int $w + 0.5;
3997 $h = int $h + 0.5; 4492 $h = int $h + 0.5;
3998 4493
3999 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}) {
4000 $widget->{old_w} = $widget->{w}; 4495 $widget->{old_w} = $widget->{w};
4001 $widget->{old_h} = $widget->{h}; 4496 $widget->{old_h} = $widget->{h};
4002 4497
4003 $widget->{w} = $w; 4498 $widget->{w} = $w;
4004 $widget->{h} = $h; 4499 $widget->{h} = $h;
4005 4500
4006 $widget->emit (size_allocate => $w, $h); 4501 $widget->emit (size_allocate => $w, $h);
4502 }
4007 } 4503 }
4008 } 4504 }
4009 } 4505 }
4010 4506
4011 while ($self->{post_alloc_hook}) { 4507 while ($self->{post_alloc_hook}) {
4012 $_->() 4508 $_->()
4013 for values %{delete $self->{post_alloc_hook}}; 4509 for values %{delete $self->{post_alloc_hook}};
4014 } 4510 }
4015
4016 4511
4017 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4512 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4018 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4513 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4019 glClear GL_COLOR_BUFFER_BIT; 4514 glClear GL_COLOR_BUFFER_BIT;
4020 4515

Diff Legend

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