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.376 by root, Mon Jul 16 20:20:23 2007 UTC vs.
Revision 1.441 by root, Mon Oct 8 16:10:14 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
… …
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::;
… …
963sub size_request { 918sub size_request {
964 my ($self) = @_; 919 my ($self) = @_;
965 920
966 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 921 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967 922
968 $w = 10 if $self->{scroll_x}; 923 $w = 1 if $self->{scroll_x};
969 $h = 10 if $self->{scroll_y}; 924 $h = 1 if $self->{scroll_y};
970 925
971 ($w, $h) 926 ($w, $h)
972} 927}
973 928
974sub invoke_size_allocate { 929sub invoke_size_allocate {
… …
986} 941}
987 942
988sub set_offset { 943sub set_offset {
989 my ($self, $x, $y) = @_; 944 my ($self, $x, $y) = @_;
990 945
991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x; 946 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y; 947 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993 948
994 $self->emit (changed => $self->{view_x}, $self->{view_y}); 949 if ($x != $self->{view_x} or $y != $self->{view_y}) {
950 $self->{view_x} = $x;
951 $self->{view_y} = $y;
952
953 $self->emit (changed => $x, $y);
995 $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 }
996} 974}
997 975
998# 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
999sub coord2local { 977sub coord2local {
1000 my ($self, $x, $y) = @_; 978 my ($self, $x, $y) = @_;
… …
1015 my ($self, $x, $y) = @_; 993 my ($self, $x, $y) = @_;
1016 994
1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 996 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1019 ) { 997 ) {
1020 $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})
1021 } else { 999 } else {
1022 $self->CFPlus::UI::Base::find_widget ($x, $y) 1000 $self->CFPlus::UI::Base::find_widget ($x, $y)
1023 } 1001 }
1024} 1002}
1025 1003
… …
1046 my $child = delete $arg{child}; 1024 my $child = delete $arg{child};
1047 1025
1048 my $self; 1026 my $self;
1049 1027
1050 my $hslider = new CFPlus::UI::Slider 1028 my $hslider = new CFPlus::UI::Slider
1029 c_col => 0,
1030 c_row => 1,
1051 vertical => 0, 1031 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix 1032 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub { 1033 on_changed => sub {
1054 $self->{hpos} = $_[1]; 1034 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1035 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 }, 1036 },
1057 ; 1037 ;
1058 1038
1059 my $vslider = new CFPlus::UI::Slider 1039 my $vslider = new CFPlus::UI::Slider
1040 c_col => 1,
1041 c_row => 0,
1060 vertical => 1, 1042 vertical => 1,
1061 range => [0, 0, 1, 0.01], # HACK fix 1043 range => [0, 0, 1, 0.01], # HACK fix
1062 on_changed => sub { 1044 on_changed => sub {
1063 $self->{vpos} = $_[1]; 1045 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1046 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1075 row_expand => [1, 0], 1057 row_expand => [1, 0],
1076 %arg, 1058 %arg,
1077 ); 1059 );
1078 1060
1079 $self->{vp} = new CFPlus::UI::ViewPort 1061 $self->{vp} = new CFPlus::UI::ViewPort
1062 c_col => 0,
1063 c_row => 0,
1080 expand => 1, 1064 expand => 1,
1081 scroll_x => $self->{scroll_x}, 1065 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y}, 1066 scroll_y => $self->{scroll_y},
1083 on_changed => sub { 1067 on_changed => sub {
1084 my ($vp, $x, $y) = @_; 1068 my ($vp, $x, $y) = @_;
1069
1085 $vp->{parent}{hslider}->set_value ($x); 1070 $vp->{parent}{hslider}->set_value ($x);
1086 $vp->{parent}{vslider}->set_value ($y); 1071 $vp->{parent}{vslider}->set_value ($y);
1087 1072
1073 0
1074 },
1075 on_size_allocate => sub {
1076 my ($vp, $w, $h) = @_;
1077 $vp->{parent}->update_slider;
1088 0 1078 0
1089 }, 1079 },
1090 ; 1080 ;
1091 1081
1092 $self->SUPER::add (0, 0, $self->{vp}); 1082 $self->SUPER::add ($self->{vp});
1093 1083
1094 $self->add ($child) if $child; 1084 $self->add ($child) if $child;
1095 1085
1096 $self 1086 $self
1097} 1087}
1098
1099#TODO# update range on size_allocate depending on child
1100 1088
1101sub add { 1089sub add {
1102 my ($self, $widget) = @_; 1090 my ($self, $widget) = @_;
1103 1091
1104 $self->{vp}->add ($self->{child} = $widget); 1092 $self->{vp}->add ($self->{child} = $widget);
1105} 1093}
1106 1094
1095sub set_offset { shift->{vp}->set_offset (@_) }
1096sub set_center { shift->{vp}->set_center (@_) }
1097sub make_visible { shift->{vp}->make_visible (@_) }
1098
1107sub update_slider { 1099sub update_slider {
1108 my ($self) = @_; 1100 my ($self) = @_;
1109 1101
1110 my $child = ($self->{vp} or return)->child; 1102 my $child = ($self->{vp} or return)->child;
1111 1103
1104 if ($self->{scroll_x}) {
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1105 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1106 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114 1107
1115 my $visible = $w1 > $w2; 1108 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) { 1109 if ($visible != $self->{hslider_visible}) {
1110 $self->{hslider_visible} = $visible;
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1111 $visible ? $self->SUPER::add ($self->{hslider})
1118 : $self->{hslider}->hide; 1112 : $self->SUPER::remove ($self->{hslider});
1113 }
1119 } 1114 }
1120 1115
1116 if ($self->{scroll_y}) {
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1117 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1118 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123 1119
1124 my $visible = $h1 > $h2; 1120 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) { 1121 if ($visible != $self->{vslider_visible}) {
1122 $self->{vslider_visible} = $visible;
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1123 $visible ? $self->SUPER::add ($self->{vslider})
1127 : $self->{vslider}->hide; 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);
1128 } 1144 };
1129}
1130
1131sub update {
1132 my ($self) = @_;
1133
1134 $self->SUPER::update;
1135 $self->update_slider;
1136} 1145}
1137 1146
1138sub invoke_mouse_wheel { 1147sub invoke_mouse_wheel {
1139 my ($self, $ev) = @_; 1148 my ($self, $ev) = @_;
1140 1149
1141 return 0 unless $ev->{dy}; # only vertical movements for now
1142
1143 $self->{vslider}->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};
1144 1152
1145 1 1153 1
1146} 1154}
1147 1155
1148sub invoke_button_down { 1156sub invoke_button_down {
1149 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1150 1158
1151 if ($ev->{button} == 2) { 1159 if ($ev->{button} == 2) {
1152 $self->grab_focus; 1160 $self->start_dragging ($ev);
1153
1154 my $ox = $self->{vp}{view_x} + $ev->{x};
1155 my $oy = $self->{vp}{view_y} + $ev->{y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1159
1160 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1161 $self->update;
1162 };
1163
1164 return 1; 1161 return 1;
1165 } 1162 }
1166 1163
1167 0 1164 0
1168} 1165}
… …
1219 my ($w, $h) = @$self{qw(w h)}; 1216 my ($w, $h) = @$self{qw(w h)};
1220 1217
1221 glEnable GL_BLEND; 1218 glEnable GL_BLEND;
1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1223 glColor_premultiply @{ $self->{bg} }; 1220 glColor_premultiply @{ $self->{bg} };
1224
1225 glBegin GL_QUADS;
1226 glVertex 0 , 0;
1227 glVertex 0 , $h;
1228 glVertex $w, $h; 1221 glRect 0, 0, $w, $h;
1229 glVertex $w, 0;
1230 glEnd;
1231
1232 glDisable GL_BLEND; 1222 glDisable GL_BLEND;
1233 } 1223 }
1234 1224
1235 $self->SUPER::_draw; 1225 $self->SUPER::_draw;
1236} 1226}
… …
1349 1339
1350my @border = 1340my @border =
1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1341 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1352 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);
1353 1343
1344my @icon =
1345 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1346 qw(x1_move.png x1_resize.png);
1347
1354sub new { 1348sub new {
1355 my ($class, %arg) = @_; 1349 my ($class, %arg) = @_;
1356 1350
1357 my $self = $class->SUPER::new ( 1351 my $self = $class->SUPER::new (
1358 bg => [1, 1, 1, 1], 1352 bg => [1, 1, 1, 1],
… …
1393 1387
1394sub border { 1388sub border {
1395 int $_[0]{border} * $::FONTSIZE 1389 int $_[0]{border} * $::FONTSIZE
1396} 1390}
1397 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
1398sub size_request { 1401sub size_request {
1399 my ($self) = @_; 1402 my ($self) = @_;
1400 1403
1401 $self->{title_widget}->size_request 1404 $self->{title_widget}->size_request
1402 if $self->{title_widget}; 1405 if $self->{title_widget};
… …
1526 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1527 1530
1528 my $border = $self->border; 1531 my $border = $self->border;
1529 1532
1530 glColor @{ $self->{border_bg} }; 1533 glColor @{ $self->{border_bg} };
1531 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1534 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1532 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1535 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1533 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1536 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1534 $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);
1535 1552
1536 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1553 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1537 glColor @{ $self->{bg} }; 1554 glColor @{ $self->{bg} };
1538 1555
1539 # TODO: repeat texture not scale 1556 # TODO: repeat texture not scale
… …
1560 1577
1561############################################################################# 1578#############################################################################
1562 1579
1563package CFPlus::UI::Table; 1580package CFPlus::UI::Table;
1564 1581
1565our @ISA = CFPlus::UI::Base::; 1582our @ISA = CFPlus::UI::Container::;
1566 1583
1567use List::Util qw(max sum); 1584use List::Util qw(max sum);
1568 1585
1569use CFPlus::OpenGL; 1586use CFPlus::OpenGL;
1570 1587
1571sub new { 1588sub new {
1572 my $class = shift; 1589 my $class = shift;
1573 1590
1574 $class->SUPER::new ( 1591 $class->SUPER::new (
1575 children => [],
1576 col_expand => [], 1592 col_expand => [],
1577 row_expand => [], 1593 row_expand => [],
1578 @_, 1594 @_,
1579 ) 1595 )
1580} 1596}
1581 1597
1582sub children {
1583 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1584}
1585
1586# TODO: store row/col info in child widget and use standard add/del
1587sub 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 {
1588 my ($self) = shift; 1610 my $self = shift;
1611
1612 my @widgets;
1589 1613
1590 while (@_) { 1614 while (@_) {
1591 my ($x, $y, $child) = splice @_, 0, 3, (); 1615 my ($col, $row, $child) = splice @_, 0, 3, ();
1592 $child->set_parent ($self);
1593 $self->{children}[$y][$x] = $child;
1594 }
1595 1616
1596 $self->{force_realloc} = 1; 1617 $child->{c_row} = $row;
1597 $self->{force_size_alloc} = 1; 1618 $child->{c_col} = $col;
1598 $self->realloc;
1599}
1600 1619
1601sub remove { 1620 push @widgets, $child;
1621 }
1622
1623 $self->add (@widgets);
1624}
1625
1626sub get_wh {
1602 my ($self, $child) = @_; 1627 my ($self) = @_;
1603 1628
1604 for (@{ $self->{children} }) { 1629 my (@w, @h);
1605 for (@{ $_ || [] }) { 1630
1606 $_ = undef if $_ == $child; 1631 my @children = $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];
1607 } 1641 }
1608 } 1642 }
1609}
1610 1643
1611# TODO: move to container class maybe? send children a signal on removal? 1644 # second pass, rows
1612sub clear { 1645 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1613 my ($self) = @_;
1614
1615 my @children = $self->children;
1616 delete $self->{children};
1617
1618 for (@children) {
1619 delete $_->{parent};
1620 $_->hide;
1621 }
1622
1623 $self->realloc;
1624}
1625
1626sub get_wh {
1627 my ($self) = @_;
1628
1629 my (@w, @h);
1630
1631 for my $y (0 .. $#{$self->{children}}) {
1632 my $row = $self->{children}[$y]
1633 or next;
1634
1635 for my $x (0 .. $#$row) {
1636 my $widget = $row->[$x]
1637 or next;
1638 my ($w, $h) = @$widget{qw(req_w req_h)}; 1646 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1639 1647
1640 $w[$x] = max $w[$x], $w; 1648 my $sh = sum @h[$r .. $r + $rs - 1];
1641 $h[$y] = max $h[$y], $h; 1649
1650 if ($h > $sh) {
1651 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1642 } 1652 }
1643 } 1653 }
1644 1654
1645 (\@w, \@h) 1655 (\@w, \@h)
1646} 1656}
… …
1662 my ($ws, $hs) = $self->get_wh; 1672 my ($ws, $hs) = $self->get_wh;
1663 1673
1664 my $req_w = (sum @$ws) || 1; 1674 my $req_w = (sum @$ws) || 1;
1665 my $req_h = (sum @$hs) || 1; 1675 my $req_h = (sum @$hs) || 1;
1666 1676
1667 # TODO: nicer code 1677 # now linearly scale the rows/columns to the allocated size
1668 my @col_expand = @{$self->{col_expand}}; 1678 my @col_expand = @{$self->{col_expand}};
1669 @col_expand = (1) x @$ws unless @col_expand; 1679 @col_expand = (1) x @$ws unless @col_expand;
1670 my $col_expand = (sum @col_expand) || 1; 1680 my $col_expand = (sum @col_expand) || 1;
1671 1681
1672 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1682 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1679 1689
1680 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1690 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1681 1691
1682 CFPlus::UI::harmonize $hs; 1692 CFPlus::UI::harmonize $hs;
1683 1693
1684 my $y; 1694 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1695 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1685 1696
1686 for my $r (0 .. $#{$self->{children}}) { 1697 for my $widget ($self->children) {
1687 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)};
1688 or next;
1689 1699
1690 my $x = 0; 1700 $widget->configure (
1691 my $row_h = $hs->[$r]; 1701 $x[$c], $y[$r],
1702 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1692 1703 );
1693 for my $c (0 .. $#$row) {
1694 my $col_w = $ws->[$c];
1695
1696 if (my $widget = $row->[$c]) {
1697 $widget->configure ($x, $y, $col_w, $row_h);
1698 }
1699
1700 $x += $col_w;
1701 }
1702
1703 $y += $row_h;
1704 } 1704 }
1705 1705
1706 1 1706 1
1707} 1707}
1708 1708
1709sub find_widget {
1710 my ($self, $x, $y) = @_;
1711
1712 $x -= $self->{x};
1713 $y -= $self->{y};
1714
1715 my $res;
1716
1717 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1718 $res = $_->find_widget ($x, $y)
1719 and return $res;
1720 }
1721
1722 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1723}
1724
1725sub _draw {
1726 my ($self) = @_;
1727
1728 for (grep $_, @{$self->{children}}) {
1729 $_->draw for grep $_, @$_;
1730 }
1731}
1732
1733############################################################################# 1709#############################################################################
1734 1710
1735package CFPlus::UI::Fixed; 1711package CFPlus::UI::Fixed;
1736 1712
1737use List::Util qw(min max); 1713use List::Util qw(min max);
1738 1714
1739our @ISA = CFPlus::UI::Container::; 1715our @ISA = CFPlus::UI::Container::;
1740 1716
1741sub add {
1742 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1743
1744 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1745 $self->SUPER::add ($child);
1746}
1747
1748sub _scale($$$) { 1717sub _scale($$$) {
1749 my ($mode, $val, $max) = @_; 1718 my ($rel, $val, $max) = @_;
1750 1719
1751 $mode eq "abs" ? $val 1720 $rel ? $val * $max : $val
1752 : $mode eq "rel" ? $val * $max
1753 : 0
1754} 1721}
1755 1722
1756sub size_request { 1723sub size_request {
1757 my ($self) = @_; 1724 my ($self) = @_;
1758 1725
1759 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1726 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1760 1727
1761 # determine overall size by querying abs widgets 1728 # determine overall size by querying abs widgets
1762 for my $child ($self->visible_children) { 1729 for my $child ($self->visible_children) {
1763 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1730 unless ($child->{c_rel}) {
1731 my $x = $child->{c_x};
1732 my $y = $child->{c_y};
1764 1733
1765 if ($pos eq "abs") {
1766 $w = _scale $size, $w, $child->{req_w};
1767 $h = _scale $size, $h, $child->{req_h};
1768
1769 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1770 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1771 } 1736 }
1772 } 1737 }
1773 1738
1774 my $W = $x2 - $x1; 1739 my $W = $x2 - $x1;
1775 my $H = $y2 - $y1; 1740 my $H = $y2 - $y1;
1776 1741
1777 # now layout remaining widgets 1742 # now layout remaining widgets
1778 for my $child ($self->visible_children) { 1743 for my $child ($self->visible_children) {
1779 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 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;
1780 1747
1781 if ($pos ne "abs") {
1782 $x = _scale $pos, $x, $W;
1783 $y = _scale $pos, $x, $H;
1784 $w = _scale $size, $w, $child->{req_w};
1785 $h = _scale $size, $h, $child->{req_h};
1786
1787 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1748 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1788 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1749 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1789 } 1750 }
1790 } 1751 }
1791 1752
1792 my $W = $x2 - $x1; 1753 my $W = $x2 - $x1;
1793 my $H = $y2 - $y1; 1754 my $H = $y2 - $y1;
… …
1797 1758
1798sub invoke_size_allocate { 1759sub invoke_size_allocate {
1799 my ($self, $W, $H) = @_; 1760 my ($self, $W, $H) = @_;
1800 1761
1801 for my $child ($self->visible_children) { 1762 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1763 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1764 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1803 1765
1804 $x = _scale $pos, $x, $W; 1766 $x += $child->{c_halign} * $child->{req_w};
1805 $y = _scale $pos, $x, $H; 1767 $y += $child->{c_valign} * $child->{req_h};
1806 $w = _scale $size, $w, $child->{req_w};
1807 $h = _scale $size, $h, $child->{req_h};
1808 1768
1809 $child->configure ($x, $y, $w, $h); 1769 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1810 } 1770 }
1811 1771
1812 1 1772 1
1813} 1773}
1814 1774
… …
1818 1778
1819our @ISA = CFPlus::UI::Container::; 1779our @ISA = CFPlus::UI::Container::;
1820 1780
1821sub size_request { 1781sub size_request {
1822 my ($self) = @_; 1782 my ($self) = @_;
1783
1784 my @children = $self->visible_children;
1823 1785
1824 $self->{vertical} 1786 $self->{vertical}
1825 ? ( 1787 ? (
1826 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1788 (List::Util::max map $_->{req_w}, @children),
1827 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1789 (List::Util::sum map $_->{req_h}, @children),
1828 ) 1790 )
1829 : ( 1791 : (
1830 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::sum map $_->{req_w}, @children),
1831 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::max map $_->{req_h}, @children),
1832 ) 1794 )
1833} 1795}
1834 1796
1835sub invoke_size_allocate { 1797sub invoke_size_allocate {
1836 my ($self, $w, $h) = @_; 1798 my ($self, $w, $h) = @_;
… …
1960 1922
1961 delete $self->{ox}; 1923 delete $self->{ox};
1962 $self->SUPER::realloc; 1924 $self->SUPER::realloc;
1963} 1925}
1964 1926
1927sub clear {
1928 my ($self) = @_;
1929
1930 $self->set_text ("");
1931}
1932
1965sub set_text { 1933sub set_text {
1966 my ($self, $text) = @_; 1934 my ($self, $text) = @_;
1967 1935
1968 return if $self->{text} eq "T$text"; 1936 return if $self->{text} eq "T$text";
1969 $self->{text} = "T$text"; 1937 $self->{text} = "T$text";
… …
1992 1960
1993sub size_request { 1961sub size_request {
1994 my ($self) = @_; 1962 my ($self) = @_;
1995 1963
1996 $self->{size_req} ||= do { 1964 $self->{size_req} ||= do {
1965 my ($max_w, $max_h) = $self->get_max_wh;
1966
1997 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1967 $self->{layout}->set_font ($self->{font}) if $self->{font};
1998 $self->{layout}->set_width ($self->{max_w} || -1); 1968 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1999 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1969 $self->{layout}->set_ellipsise ($self->{ellipsise});
2000 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1970 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
2001 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1971 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2002 1972
2003 my ($w, $h) = $self->{layout}->size; 1973 my ($w, $h) = $self->{layout}->size;
… …
2075 : ($self->{w} - $size->[0]) * 0.5); 2045 : ($self->{w} - $size->[0]) * 0.5);
2076 2046
2077 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2047 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2078 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2048 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2079 : ($self->{h} - $size->[1]) * 0.5); 2049 : ($self->{h} - $size->[1]) * 0.5);
2050
2051 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2080 }; 2052 };
2081 2053
2082 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2054# unless ($self->{list}) {
2083 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2055# $self->{list} = CFPlus::OpenGL::glGenList;
2084 2056# CFPlus::OpenGL::glNewList $self->{list};
2085 $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;
2086} 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#}
2087 2073
2088############################################################################# 2074#############################################################################
2089 2075
2090package CFPlus::UI::EntryBase; 2076package CFPlus::UI::EntryBase;
2091 2077
… …
2097 my $class = shift; 2083 my $class = shift;
2098 2084
2099 $class->SUPER::new ( 2085 $class->SUPER::new (
2100 fg => [1, 1, 1], 2086 fg => [1, 1, 1],
2101 bg => [0, 0, 0, 0.2], 2087 bg => [0, 0, 0, 0.2],
2088 outline => [0.6, 0.3, 0.1],
2102 active_bg => [1, 1, 1, 0.5], 2089 active_bg => [0, 0, 1, .2],
2103 active_fg => [0, 0, 0], 2090 active_fg => [1, 1, 1],
2091 active_outline => [1, 1, 0],
2104 can_hover => 1, 2092 can_hover => 1,
2105 can_focus => 1, 2093 can_focus => 1,
2106 valign => 0, 2094 valign => 0,
2107 can_events => 1, 2095 can_events => 1,
2108 ellipsise => 0, 2096 ellipsise => 0,
… …
2248 glColor_premultiply @{$self->{bg}}; 2236 glColor_premultiply @{$self->{bg}};
2249 } 2237 }
2250 2238
2251 glEnable GL_BLEND; 2239 glEnable GL_BLEND;
2252 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2240 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glBegin GL_QUADS;
2254 glVertex 0 , 0;
2255 glVertex 0 , $self->{h};
2256 glVertex $self->{w}, $self->{h}; 2241 glRect 0, 0, $self->{w}, $self->{h};
2257 glVertex $self->{w}, 0;
2258 glEnd;
2259 glDisable GL_BLEND; 2242 glDisable GL_BLEND;
2260 2243
2261 $self->SUPER::_draw; 2244 $self->SUPER::_draw;
2262 2245
2263 #TODO: force update every cursor change :( 2246 #TODO: force update every cursor change :(
… …
2265 2248
2266 unless (exists $self->{cur_h}) { 2249 unless (exists $self->{cur_h}) {
2267 my $text = substr $self->{text}, 0, $self->{cursor}; 2250 my $text = substr $self->{text}, 0, $self->{cursor};
2268 utf8::encode $text; 2251 utf8::encode $text;
2269 2252
2270 @$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);
2271 } 2254 }
2272 2255
2256 glColor_premultiply @{$self->{active_fg}};
2273 glBegin GL_LINES; 2257 glBegin GL_LINES;
2274 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};
2275 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;
2276 glEnd; 2274 glEnd;
2277 } 2275 }
2278} 2276}
2279 2277
2280############################################################################# 2278#############################################################################
… …
2367 1 2365 1
2368} 2366}
2369 2367
2370############################################################################# 2368#############################################################################
2371 2369
2372package CFPlus::UI::Button; 2370package CFPlus::UI::ButtonBin;
2373 2371
2374our @ISA = CFPlus::UI::Label::; 2372our @ISA = CFPlus::UI::Bin::;
2375 2373
2376use CFPlus::OpenGL; 2374use CFPlus::OpenGL;
2377 2375
2378my @tex = 2376my @tex =
2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2377 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2380 qw(b1_button_active.png); 2378 qw(b1_button_inactive.png b1_button_active.png);
2381 2379
2382sub new { 2380sub new {
2383 my $class = shift; 2381 my $class = shift;
2384 2382
2385 $class->SUPER::new ( 2383 $class->SUPER::new (
2386 padding_x => 4,
2387 padding_y => 4,
2388 fg => [1, 1, 1],
2389 active_fg => [0, 0, 1],
2390 can_hover => 1, 2384 can_hover => 1,
2391 align => 0, 2385 align => 0,
2392 valign => 0, 2386 valign => 0,
2393 can_events => 1, 2387 can_events => 1,
2394 @_ 2388 @_
… …
2406} 2400}
2407 2401
2408sub _draw { 2402sub _draw {
2409 my ($self) = @_; 2403 my ($self) = @_;
2410 2404
2411 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2412
2413 glEnable GL_TEXTURE_2D; 2405 glEnable GL_TEXTURE_2D;
2414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2406 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2415 glColor 0, 0, 0, 1; 2407 glColor 0, 0, 0, 1;
2416 2408
2409 my $tex = $tex[$GRAB == $self];
2417 $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});
2418 2466
2419 glDisable GL_TEXTURE_2D; 2467 glDisable GL_TEXTURE_2D;
2420 2468
2421 $self->SUPER::_draw; 2469 $self->SUPER::_draw;
2422} 2470}
… …
2479sub _draw { 2527sub _draw {
2480 my ($self) = @_; 2528 my ($self) = @_;
2481 2529
2482 $self->SUPER::_draw; 2530 $self->SUPER::_draw;
2483 2531
2484 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2532 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2485 2533
2486 my ($w, $h) = @$self{qw(w h)}; 2534 my ($w, $h) = @$self{qw(w h)};
2487 2535
2488 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;
2489 2537
… …
2509sub new { 2557sub new {
2510 my $class = shift; 2558 my $class = shift;
2511 2559
2512 my $self = $class->SUPER::new ( 2560 my $self = $class->SUPER::new (
2513 can_events => 0, 2561 can_events => 0,
2562 scale => 1,
2514 @_, 2563 @_,
2515 ); 2564 );
2516 2565
2517 $self->{path} || $self->{tex} 2566 $self->{path} || $self->{tex}
2518 or Carp::croak "'path' or 'tex' attributes required"; 2567 or Carp::croak "'path' or 'tex' attributes required";
… …
2543} 2592}
2544 2593
2545sub size_request { 2594sub size_request {
2546 my ($self) = @_; 2595 my ($self) = @_;
2547 2596
2548 ($self->{tex}{w}, $self->{tex}{h}) 2597 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2549} 2598}
2550 2599
2551sub _draw { 2600sub _draw {
2552 my ($self) = @_; 2601 my ($self) = @_;
2553 2602
… …
2563 } 2612 }
2564 2613
2565 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2567 2616
2568 $tex->draw_quad (0, 0, $w, $h); 2617 $tex->draw_quad_alpha (0, 0, $w, $h);
2569 2618
2570 glDisable GL_TEXTURE_2D; 2619 glDisable GL_TEXTURE_2D;
2571} 2620}
2572 2621
2573############################################################################# 2622#############################################################################
… …
2592 align => 0, 2641 align => 0,
2593 valign => 0, 2642 valign => 0,
2594 can_events => 1, 2643 can_events => 1,
2595 @_ 2644 @_
2596 ); 2645 );
2646}
2647
2648sub invoke_button_down {
2649 my ($self, $ev, $x, $y) = @_;
2650
2651 1
2597} 2652}
2598 2653
2599sub invoke_button_up { 2654sub invoke_button_up {
2600 my ($self, $ev, $x, $y) = @_; 2655 my ($self, $ev, $x, $y) = @_;
2601 2656
… …
2741 glDisable GL_TEXTURE_2D; 2796 glDisable GL_TEXTURE_2D;
2742} 2797}
2743 2798
2744############################################################################# 2799#############################################################################
2745 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
2746package CFPlus::UI::Gauge; 2939package CFPlus::UI::Gauge;
2747 2940
2748our @ISA = CFPlus::UI::VBox::; 2941our @ISA = CFPlus::UI::VBox::;
2749 2942
2750sub new { 2943sub new {
… …
2875 3068
2876 $self->SUPER::invoke_button_down ($ev, $x, $y); 3069 $self->SUPER::invoke_button_down ($ev, $x, $y);
2877 3070
2878 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3071 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2879 3072
2880 $self->invoke_mouse_motion ($ev, $x, $y) 3073 $self->invoke_mouse_motion ($ev, $x, $y);
3074
3075 1
2881} 3076}
2882 3077
2883sub invoke_mouse_motion { 3078sub invoke_mouse_motion {
2884 my ($self, $ev, $x, $y) = @_; 3079 my ($self, $ev, $x, $y) = @_;
2885 3080
… …
2905 3100
2906 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3101 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2907 3102
2908 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3103 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2909 3104
2910 ! ! $delta 3105 1
2911} 3106}
2912 3107
2913sub update { 3108sub update {
2914 my ($self) = @_; 3109 my ($self) = @_;
2915 3110
… …
3046} 3241}
3047 3242
3048sub size_request { 3243sub size_request {
3049 my ($self) = @_; 3244 my ($self) = @_;
3050 3245
3051 my ($empty, $slider) = @{ $self->{children} }; 3246 my ($empty, $slider) = $self->visible_children;
3052 3247
3053 local $self->{children} = [$empty, $slider]; 3248 local $self->{children} = [$empty, $slider];
3054 $self->SUPER::size_request 3249 $self->SUPER::size_request
3055} 3250}
3056 3251
… …
3245 3440
3246 if ($y0 < $y + $h && $y < $y1) { 3441 if ($y0 < $y + $h && $y < $y1) {
3247 my $layout = $self->get_layout ($para); 3442 my $layout = $self->get_layout ($para);
3248 3443
3249 $layout->render ($para->{indent}, $y - $y0); 3444 $layout->render ($para->{indent}, $y - $y0);
3445 $layout->draw;
3250 3446
3251 if (my @w = @{ $para->{widget} }) { 3447 if (my @w = @{ $para->{widget} }) {
3252 my @s = $layout->get_shapes; 3448 my @s = $layout->get_shapes;
3253 3449
3254 for (@w) { 3450 for (@w) {
… …
3376} 3572}
3377 3573
3378sub set_tooltip_from { 3574sub set_tooltip_from {
3379 my ($self, $widget) = @_; 3575 my ($self, $widget) = @_;
3380 3576
3381 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3382 if $widget->{tooltip} =~ /^#(.*)$/;
3383
3384 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 =~ /^#(.*)$/;
3385 3582
3386 if ($ENV{CFPLUS_DEBUG} & 2) { 3583 if ($ENV{CFPLUS_DEBUG} & 2) {
3387 $tooltip .= "\n\n" . (ref $widget) . "\n" 3584 $tip .= "\n\n" . (ref $widget) . "\n"
3388 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3585 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3389 . "req $widget->{req_w} $widget->{req_h}\n" 3586 . "req $widget->{req_w} $widget->{req_h}\n"
3390 . "visible $widget->{visible}"; 3587 . "visible $widget->{visible}";
3391 } 3588 }
3392 3589
3393 $tooltip =~ s/^\n+//; 3590 $tip =~ s/^\n+//;
3394 $tooltip =~ s/\n+$//; 3591 $tip =~ s/\n+$//;
3395 3592
3396 $self->add (new CFPlus::UI::Label 3593 $self->add (new CFPlus::UI::Label
3397 markup => $tooltip, 3594 markup => $tip,
3398 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3595 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3399 fontsize => 0.8, 3596 fontsize => 0.8,
3400 style => 1, # FLAG_INVERSE 3597 style => 1, # FLAG_INVERSE
3401 ellipsise => 0, 3598 ellipsise => 0,
3402 font => ($widget->{tooltip_font} || $::FONT_PROP), 3599 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3440} 3637}
3441 3638
3442sub _draw { 3639sub _draw {
3443 my ($self) = @_; 3640 my ($self) = @_;
3444 3641
3445 glTranslate 0.375, 0.375;
3446
3447 my ($w, $h) = @$self{qw(w h)}; 3642 my ($w, $h) = @$self{qw(w h)};
3448 3643
3449 glColor 1, 0.8, 0.4; 3644 glColor 1, 0.8, 0.4;
3450 glBegin GL_QUADS; 3645 glRect 0, 0, $w, $h;
3451 glVertex 0 , 0;
3452 glVertex 0 , $h;
3453 glVertex $w, $h;
3454 glVertex $w, 0;
3455 glEnd;
3456 3646
3457 glColor 0, 0, 0; 3647 glColor 0, 0, 0;
3458 glBegin GL_LINE_LOOP; 3648 glRect_lineloop .5, .5, $w + .5, $h + .5;
3459 glVertex 0 , 0;
3460 glVertex 0 , $h;
3461 glVertex $w, $h;
3462 glVertex $w, 0;
3463 glEnd;
3464 3649
3465 glTranslate 2 - 0.375, 2 - 0.375; 3650 glTranslate 2, 2;
3466 3651
3467 $self->SUPER::_draw; 3652 $self->SUPER::_draw;
3468} 3653}
3469 3654
3470############################################################################# 3655#############################################################################
… …
3487 ); 3672 );
3488 3673
3489 if ($self->{anim} && $self->{animspeed}) { 3674 if ($self->{anim} && $self->{animspeed}) {
3490 CFPlus::weaken (my $widget = $self); 3675 CFPlus::weaken (my $widget = $self);
3491 3676
3677 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3678 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3492 $self->{timer} = Event->timer ( 3679 $self->{timer} = Event->timer (
3493 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3494 hard => 1, 3680 parked => 1,
3495 interval => $self->{animspeed},
3496 cb => sub { 3681 cb => sub {
3497 return unless $::CONN; 3682 return unless $::CONN;
3498 3683
3684 my $w = $widget
3685 or return;
3686
3499 ++$widget->{frame}; 3687 ++$w->{frame};
3500 $self->update_face; 3688 $w->update_face;
3689
3690 # somehow, $widget can go away
3501 $self->update; 3691 $w->update;
3692 $w->update_timer;
3502 }, 3693 },
3503 ); 3694 );
3504 3695
3505 $self->update_face; 3696 $self->update_face;
3697 $self->update_timer;
3506 } 3698 }
3507 3699
3508 $self 3700 $self
3509} 3701}
3510 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
3511sub update_face { 3720sub update_face {
3512 my ($self) = @_; 3721 my ($self) = @_;
3513 3722
3514 return unless $::CONN;
3515
3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3517 if ($anim && @$anim) {
3518 delete $self->{wait_face};
3519 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3520 }
3521 }
3522}
3523
3524sub size_request {
3525 my ($self) = @_;
3526
3527 if ($::CONN) { 3723 if ($::CONN) {
3528 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3724 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3529 if (my $tex = $::CONN->{texture}[$faceid]) { 3725 if ($anim && @$anim) {
3530 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3726 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3531 } else { 3727 delete $self->{face_change_cb};
3532 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3728
3533 $self->realloc; 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 }
3534 }); 3733 }
3535 } 3734 }
3536 } 3735 }
3537 } 3736 }
3737}
3738
3739sub size_request {
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 }
3538 3755
3539 ($self->{size_w} || 8, $self->{size_h} || 8) 3756 ($self->{size_w} || 8, $self->{size_h} || 8)
3540} 3757}
3541 3758
3542sub update { 3759sub update {
… …
3545 return unless $self->{visible}; 3762 return unless $self->{visible};
3546 3763
3547 $self->SUPER::update; 3764 $self->SUPER::update;
3548} 3765}
3549 3766
3767sub invoke_visibility_change {
3768 my ($self) = @_;
3769
3770 $self->update_timer;
3771
3772 0
3773}
3774
3550sub _draw { 3775sub _draw {
3551 my ($self) = @_; 3776 my ($self) = @_;
3552 3777
3553 return unless $::CONN;
3554
3555 $self->SUPER::_draw; 3778 $self->SUPER::_draw;
3556 3779
3557 my $faceid = $::CONN->{faceid}[$self->{face}] 3780 if (my $tex = $self->{tex}) {
3558 or return;
3559
3560 my $tex = $::CONN->{texture}[$faceid];
3561
3562 if ($tex) {
3563 glEnable GL_TEXTURE_2D; 3781 glEnable GL_TEXTURE_2D;
3564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3782 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3565 glColor 0, 0, 0, 1; 3783 glColor 0, 0, 0, 1;
3566 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3784 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3567 glDisable GL_TEXTURE_2D; 3785 glDisable GL_TEXTURE_2D;
… …
3569} 3787}
3570 3788
3571sub destroy { 3789sub destroy {
3572 my ($self) = @_; 3790 my ($self) = @_;
3573 3791
3574 $self->{timer}->cancel 3792 (delete $self->{timer})->cancel
3575 if $self->{timer}; 3793 if $self->{timer};
3576 3794
3577 $self->SUPER::destroy; 3795 $self->SUPER::destroy;
3578} 3796}
3579 3797
… …
3619 children => [ 3837 children => [
3620 (new CFPlus::UI::Label markup => $left, expand => 1), 3838 (new CFPlus::UI::Label markup => $left, expand => 1),
3621 (new CFPlus::UI::Label markup => $right, align => +1), 3839 (new CFPlus::UI::Label markup => $right, align => +1),
3622 ], 3840 ],
3623 ; 3841 ;
3624 3842
3625 } else { 3843 } else {
3626 $widget = new CFPlus::UI::Label 3844 $widget = new CFPlus::UI::Label
3627 can_hover => 1, 3845 can_hover => 1,
3628 can_events => 1, 3846 can_events => 1,
3629 markup => $widget, 3847 markup => $widget,
… …
3754 3972
3755############################################################################# 3973#############################################################################
3756 3974
3757package CFPlus::UI::Notebook; 3975package CFPlus::UI::Notebook;
3758 3976
3977use CFPlus::OpenGL;
3978
3759our @ISA = CFPlus::UI::VBox::; 3979our @ISA = CFPlus::UI::VBox::;
3760 3980
3761sub new { 3981sub new {
3762 my $class = shift; 3982 my $class = shift;
3763 3983
3764 my $self = $class->SUPER::new ( 3984 my $self = $class->SUPER::new (
3765 buttonbar => (new CFPlus::UI::Buttonbar), 3985 buttonbar => (new CFPlus::UI::Buttonbar),
3766 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3986 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3987 active_outline => [.7, .7, 0.2],
3767 # filter => # will be put between multiplexer and $self 3988 # filter => # will be put between multiplexer and $self
3768 @_, 3989 @_,
3769 ); 3990 );
3770 3991
3771 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3992 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3772 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3993 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3773 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
3774 $self 4029 $self
3775} 4030}
3776 4031
3777sub 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 {
3778 my ($self, $title, $widget, $tooltip) = @_; 4050 my ($self, $title, $widget, $tooltip) = @_;
3779 4051
3780 CFPlus::weaken $self; 4052 $title = [$title, $tooltip] unless ref $title;
4053 $widget->{c_tab} = $title;
3781 4054
3782 $self->{buttonbar}->add (new CFPlus::UI::Button
3783 markup => $title,
3784 tooltip => $tooltip,
3785 on_activate => sub { $self->set_current_page ($widget) },
3786 );
3787
3788 $self->{multiplexer}->add ($widget); 4055 $self->add ($widget);
3789} 4056}
3790 4057
3791sub get_current_page { 4058sub get_current_page {
3792 my ($self) = @_; 4059 my ($self) = @_;
3793 4060
… …
3797sub set_current_page { 4064sub set_current_page {
3798 my ($self, $page) = @_; 4065 my ($self, $page) = @_;
3799 4066
3800 $self->{multiplexer}->set_current_page ($page); 4067 $self->{multiplexer}->set_current_page ($page);
3801 $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 }
3802} 4089}
3803 4090
3804############################################################################# 4091#############################################################################
3805 4092
3806package CFPlus::UI::Selector; 4093package CFPlus::UI::Selector;
… …
3838} 4125}
3839 4126
3840sub _set_value { 4127sub _set_value {
3841 my ($self, $value) = @_; 4128 my ($self, $value) = @_;
3842 4129
3843 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4130 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4131 $item ||= $self->{options}[0]
3844 or return; 4132 or return;
3845 4133
3846 $self->{value} = $item->[0]; 4134 $self->{value} = $item->[0];
3847 $self->set_markup ("$item->[1] ⇓"); 4135 $self->set_markup ("$item->[1] ⇓");
3848 $self->set_tooltip ($item->[2]); 4136 $self->set_tooltip ($item->[2]);
… …
3853 4141
3854 return unless $self->{value} ne $value; 4142 return unless $self->{value} ne $value;
3855 4143
3856 $self->_set_value ($value); 4144 $self->_set_value ($value);
3857 $self->emit (changed => $value); 4145 $self->emit (changed => $value);
4146}
4147
4148sub set_options {
4149 my ($self, $options) = @_;
4150
4151 $self->{options} = $options;
4152 $self->_set_value ($self->{value});
3858} 4153}
3859 4154
3860############################################################################# 4155#############################################################################
3861 4156
3862package CFPlus::UI::Statusbox; 4157package CFPlus::UI::Statusbox;
… …
4076} 4371}
4077 4372
4078sub update { 4373sub update {
4079 my ($self) = @_; 4374 my ($self) = @_;
4080 4375
4081 $::WANT_REFRESH++; 4376 $::WANT_REFRESH->start;
4082} 4377}
4083 4378
4084sub add { 4379sub add {
4085 my ($self, @children) = @_; 4380 my ($self, @children) = @_;
4086 4381
… …
4123 while ($self->{refresh_hook}) { 4418 while ($self->{refresh_hook}) {
4124 $_->() 4419 $_->()
4125 for values %{delete $self->{refresh_hook}}; 4420 for values %{delete $self->{refresh_hook}};
4126 } 4421 }
4127 4422
4128 if ($self->{realloc}) { 4423 while ($self->{realloc}) {
4129 my %queue; 4424 my %queue;
4130 my @queue; 4425 my @queue;
4131 my $widget; 4426 my $widget;
4132 4427
4133 outer: 4428 outer:
… …
4180 } 4475 }
4181 } 4476 }
4182 4477
4183 delete $self->{realloc}{$widget+0}; 4478 delete $self->{realloc}{$widget+0};
4184 } 4479 }
4185 }
4186 4480
4187 while (my $size_alloc = delete $self->{size_alloc}) { 4481 while (my $size_alloc = delete $self->{size_alloc}) {
4188 my @queue = sort { $b->{visible} <=> $a->{visible} } 4482 my @queue = sort { $a->{visible} <=> $b->{visible} }
4189 values %$size_alloc; 4483 values %$size_alloc;
4190 4484
4191 while () { 4485 while () {
4192 my $widget = pop @queue || last; 4486 my $widget = pop @queue || last;
4193 4487
4194 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4488 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4195 4489
4196 $w = 0 if $w < 0;
4197 $h = 0 if $h < 0;
4198
4199 $w = max $widget->{min_w}, $w; 4490 $w = max $widget->{min_w}, $w;
4200 $h = max $widget->{min_h}, $h; 4491 $h = max $widget->{min_h}, $h;
4201 4492
4202# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4493# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4203# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4494# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4204 4495
4205 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4496 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4206 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4497 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4207 4498
4208 $w = int $w + 0.5; 4499 $w = int $w + 0.5;
4209 $h = int $h + 0.5; 4500 $h = int $h + 0.5;
4210 4501
4211 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4502 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4212 $widget->{old_w} = $widget->{w}; 4503 $widget->{old_w} = $widget->{w};
4213 $widget->{old_h} = $widget->{h}; 4504 $widget->{old_h} = $widget->{h};
4214 4505
4215 $widget->{w} = $w; 4506 $widget->{w} = $w;
4216 $widget->{h} = $h; 4507 $widget->{h} = $h;
4217 4508
4218 $widget->emit (size_allocate => $w, $h); 4509 $widget->emit (size_allocate => $w, $h);
4510 }
4219 } 4511 }
4220 } 4512 }
4221 } 4513 }
4222 4514
4223 while ($self->{post_alloc_hook}) { 4515 while ($self->{post_alloc_hook}) {
4224 $_->() 4516 $_->()
4225 for values %{delete $self->{post_alloc_hook}}; 4517 for values %{delete $self->{post_alloc_hook}};
4226 } 4518 }
4227
4228 4519
4229 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4520 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4230 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4521 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4231 glClear GL_COLOR_BUFFER_BIT; 4522 glClear GL_COLOR_BUFFER_BIT;
4232 4523

Diff Legend

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