… | |
… | |
113 | } |
113 | } |
114 | |
114 | |
115 | if ($GRAB) { |
115 | if ($GRAB) { |
116 | if ($ev->{button} == 4 || $ev->{button} == 5) { |
116 | if ($ev->{button} == 4 || $ev->{button} == 5) { |
117 | # mousewheel |
117 | # mousewheel |
118 | $ev->{dx} = 0; |
|
|
119 | $ev->{dy} = $ev->{button} * 2 - 9; |
118 | my $delta = $ev->{button} * 2 - 9; |
|
|
119 | my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT; |
|
|
120 | |
|
|
121 | $ev->{dx} = $shift ? $delta : 0; |
|
|
122 | $ev->{dy} = $shift ? 0 : $delta; |
|
|
123 | |
120 | $GRAB->emit (mouse_wheel => $ev); |
124 | $GRAB->emit (mouse_wheel => $ev); |
121 | } else { |
125 | } else { |
122 | $GRAB->emit (button_down => $ev) |
126 | $GRAB->emit (button_down => $ev) |
123 | } |
127 | } |
124 | } |
128 | } |
… | |
… | |
547 | |
551 | |
548 | # parent |
552 | # parent |
549 | $self->{parent} && $self->{parent}->emit ($signal, @args) |
553 | $self->{parent} && $self->{parent}->emit ($signal, @args) |
550 | } |
554 | } |
551 | |
555 | |
552 | sub find_widget { |
556 | #sub find_widget { |
553 | my ($self, $x, $y) = @_; |
557 | # 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 | |
558 | |
564 | sub set_parent { |
559 | sub set_parent { |
565 | my ($self, $parent) = @_; |
560 | my ($self, $parent) = @_; |
566 | |
561 | |
567 | CFPlus::weaken ($self->{parent} = $parent); |
562 | CFPlus::weaken ($self->{parent} = $parent); |
… | |
… | |
598 | |
593 | |
599 | # using global variables seems a bit hacky, but passing through all drawing |
594 | # using global variables seems a bit hacky, but passing through all drawing |
600 | # functions seems pointless. |
595 | # functions seems pointless. |
601 | our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn |
596 | our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn |
602 | |
597 | |
603 | sub draw { |
598 | #sub draw { |
604 | my ($self) = @_; |
599 | #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 | |
600 | |
650 | sub _draw { |
601 | sub _draw { |
651 | my ($self) = @_; |
602 | my ($self) = @_; |
652 | |
603 | |
653 | warn "no draw defined for $self\n"; |
604 | warn "no draw defined for $self\n"; |
654 | } |
605 | } |
655 | |
606 | |
656 | my $cntx;#d# |
|
|
657 | sub DESTROY { |
607 | sub DESTROY { |
658 | my ($self) = @_; |
608 | my ($self) = @_; |
659 | |
609 | |
660 | return if CFPlus::in_destruct; |
610 | return if CFPlus::in_destruct; |
661 | |
611 | |
… | |
… | |
746 | can_events => 0, |
696 | can_events => 0, |
747 | %arg, |
697 | %arg, |
748 | ); |
698 | ); |
749 | |
699 | |
750 | $self->add (@$children) |
700 | $self->add (@$children) |
751 | if $children; |
701 | if $children && @$children; |
752 | |
702 | |
753 | $self |
703 | $self |
754 | } |
704 | } |
755 | |
705 | |
756 | sub realloc { |
706 | sub realloc { |
… | |
… | |
765 | my ($self, @widgets) = @_; |
715 | my ($self, @widgets) = @_; |
766 | |
716 | |
767 | $_->set_parent ($self) |
717 | $_->set_parent ($self) |
768 | for @widgets; |
718 | for @widgets; |
769 | |
719 | |
|
|
720 | # TODO: only do this in widgets that need it, e.g. root, fixed |
770 | use sort 'stable'; |
721 | use sort 'stable'; |
771 | |
722 | |
772 | $self->{children} = [ |
723 | $self->{children} = [ |
773 | sort { $a->{z} <=> $b->{z} } |
724 | sort { $a->{z} <=> $b->{z} } |
774 | @{$self->{children}}, @widgets |
725 | @{$self->{children}}, @widgets |
775 | ]; |
726 | ]; |
776 | |
727 | |
777 | $self->realloc; |
728 | $self->realloc; |
|
|
729 | |
|
|
730 | $self->emit (c_add => \@widgets); |
|
|
731 | |
|
|
732 | map $_+0, @widgets |
778 | } |
733 | } |
779 | |
734 | |
780 | sub children { |
735 | sub children { |
781 | @{ $_[0]{children} } |
736 | @{ $_[0]{children} } |
782 | } |
737 | } |
783 | |
738 | |
784 | sub remove { |
739 | sub remove { |
785 | my ($self, $child) = @_; |
740 | my ($self, @widgets) = @_; |
786 | |
741 | |
|
|
742 | $self->emit (c_remove => \@widgets); |
|
|
743 | |
|
|
744 | for my $child (@widgets) { |
787 | delete $child->{parent}; |
745 | delete $child->{parent}; |
788 | $child->hide; |
746 | $child->hide; |
789 | |
|
|
790 | $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; |
747 | $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; |
|
|
748 | } |
791 | |
749 | |
792 | $self->realloc; |
750 | $self->realloc; |
793 | } |
751 | } |
794 | |
752 | |
795 | sub clear { |
753 | sub clear { |
796 | my ($self) = @_; |
754 | my ($self) = @_; |
797 | |
755 | |
798 | my $children = delete $self->{children}; |
756 | my $children = $self->{children}; |
799 | $self->{children} = []; |
757 | $self->{children} = []; |
800 | |
758 | |
801 | for (@$children) { |
759 | for (@$children) { |
802 | delete $_->{parent}; |
760 | delete $_->{parent}; |
803 | $_->hide; |
761 | $_->hide; |
… | |
… | |
823 | } |
781 | } |
824 | |
782 | |
825 | sub _draw { |
783 | sub _draw { |
826 | my ($self) = @_; |
784 | my ($self) = @_; |
827 | |
785 | |
828 | $_->draw for @{$self->{children}}; |
786 | $_->draw for $self->visible_children; |
829 | } |
787 | } |
830 | |
788 | |
831 | ############################################################################# |
789 | ############################################################################# |
832 | |
790 | |
833 | package CFPlus::UI::Bin; |
791 | package CFPlus::UI::Bin; |
… | |
… | |
843 | } |
801 | } |
844 | |
802 | |
845 | sub add { |
803 | sub add { |
846 | my ($self, $child) = @_; |
804 | my ($self, $child) = @_; |
847 | |
805 | |
848 | $self->SUPER::remove ($_) for @{ $self->{children} }; |
806 | $self->clear; |
849 | $self->SUPER::add ($child); |
807 | $self->SUPER::add ($child); |
850 | } |
808 | } |
851 | |
809 | |
852 | sub remove { |
810 | sub remove { |
853 | my ($self, $widget) = @_; |
811 | my ($self, $widget) = @_; |
… | |
… | |
963 | sub size_request { |
921 | sub size_request { |
964 | my ($self) = @_; |
922 | my ($self) = @_; |
965 | |
923 | |
966 | my ($w, $h) = @{$self->child}{qw(req_w req_h)}; |
924 | my ($w, $h) = @{$self->child}{qw(req_w req_h)}; |
967 | |
925 | |
968 | $w = 10 if $self->{scroll_x}; |
926 | $w = 1 if $self->{scroll_x}; |
969 | $h = 10 if $self->{scroll_y}; |
927 | $h = 1 if $self->{scroll_y}; |
970 | |
928 | |
971 | ($w, $h) |
929 | ($w, $h) |
972 | } |
930 | } |
973 | |
931 | |
974 | sub invoke_size_allocate { |
932 | sub invoke_size_allocate { |
… | |
… | |
998 | $self->emit (changed => $x, $y); |
956 | $self->emit (changed => $x, $y); |
999 | $self->update; |
957 | $self->update; |
1000 | } |
958 | } |
1001 | } |
959 | } |
1002 | |
960 | |
|
|
961 | sub set_center { |
|
|
962 | my ($self, $x, $y) = @_; |
|
|
963 | |
|
|
964 | $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5); |
|
|
965 | } |
|
|
966 | |
|
|
967 | sub make_visible { |
|
|
968 | my ($self, $x, $y, $border) = @_; |
|
|
969 | |
|
|
970 | if ( $x < $self->{view_x} + $self->{w} * $border |
|
|
971 | || $x > $self->{view_x} + $self->{w} * (1 - $border) |
|
|
972 | || $y < $self->{view_y} + $self->{h} * $border |
|
|
973 | || $y > $self->{view_y} + $self->{h} * (1 - $border) |
|
|
974 | ) { |
|
|
975 | $self->set_center ($x, $y); |
|
|
976 | } |
|
|
977 | } |
|
|
978 | |
1003 | # hmm, this does not work for topleft of $self... but we should not ask for that |
979 | # hmm, this does not work for topleft of $self... but we should not ask for that |
1004 | sub coord2local { |
980 | sub coord2local { |
1005 | my ($self, $x, $y) = @_; |
981 | my ($self, $x, $y) = @_; |
1006 | |
982 | |
1007 | $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) |
983 | $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) |
… | |
… | |
1020 | my ($self, $x, $y) = @_; |
996 | my ($self, $x, $y) = @_; |
1021 | |
997 | |
1022 | if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} |
998 | if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} |
1023 | && $y >= $self->{y} && $y < $self->{y} + $self->{h} |
999 | && $y >= $self->{y} && $y < $self->{y} + $self->{h} |
1024 | ) { |
1000 | ) { |
1025 | $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) |
1001 | $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) |
1026 | } else { |
1002 | } else { |
1027 | $self->CFPlus::UI::Base::find_widget ($x, $y) |
1003 | $self->CFPlus::UI::Base::find_widget ($x, $y) |
1028 | } |
1004 | } |
1029 | } |
1005 | } |
1030 | |
1006 | |
… | |
… | |
1051 | my $child = delete $arg{child}; |
1027 | my $child = delete $arg{child}; |
1052 | |
1028 | |
1053 | my $self; |
1029 | my $self; |
1054 | |
1030 | |
1055 | my $hslider = new CFPlus::UI::Slider |
1031 | my $hslider = new CFPlus::UI::Slider |
|
|
1032 | col => 0, |
|
|
1033 | row => 1, |
1056 | vertical => 0, |
1034 | vertical => 0, |
1057 | range => [0, 0, 1, 0.01], # HACK fix |
1035 | range => [0, 0, 1, 0.01], # HACK fix |
1058 | on_changed => sub { |
1036 | on_changed => sub { |
1059 | $self->{hpos} = $_[1]; |
1037 | $self->{hpos} = $_[1]; |
1060 | $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); |
1038 | $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); |
1061 | }, |
1039 | }, |
1062 | ; |
1040 | ; |
1063 | |
1041 | |
1064 | my $vslider = new CFPlus::UI::Slider |
1042 | my $vslider = new CFPlus::UI::Slider |
|
|
1043 | col => 1, |
|
|
1044 | row => 0, |
1065 | vertical => 1, |
1045 | vertical => 1, |
1066 | range => [0, 0, 1, 0.01], # HACK fix |
1046 | range => [0, 0, 1, 0.01], # HACK fix |
1067 | on_changed => sub { |
1047 | on_changed => sub { |
1068 | $self->{vpos} = $_[1]; |
1048 | $self->{vpos} = $_[1]; |
1069 | $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); |
1049 | $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); |
… | |
… | |
1080 | row_expand => [1, 0], |
1060 | row_expand => [1, 0], |
1081 | %arg, |
1061 | %arg, |
1082 | ); |
1062 | ); |
1083 | |
1063 | |
1084 | $self->{vp} = new CFPlus::UI::ViewPort |
1064 | $self->{vp} = new CFPlus::UI::ViewPort |
|
|
1065 | col => 0, |
|
|
1066 | row => 0, |
1085 | expand => 1, |
1067 | expand => 1, |
1086 | scroll_x => $self->{scroll_x}, |
1068 | scroll_x => $self->{scroll_x}, |
1087 | scroll_y => $self->{scroll_y}, |
1069 | scroll_y => $self->{scroll_y}, |
1088 | on_changed => sub { |
1070 | on_changed => sub { |
1089 | my ($vp, $x, $y) = @_; |
1071 | my ($vp, $x, $y) = @_; |
… | |
… | |
1091 | $vp->{parent}{hslider}->set_value ($x); |
1073 | $vp->{parent}{hslider}->set_value ($x); |
1092 | $vp->{parent}{vslider}->set_value ($y); |
1074 | $vp->{parent}{vslider}->set_value ($y); |
1093 | |
1075 | |
1094 | 0 |
1076 | 0 |
1095 | }, |
1077 | }, |
|
|
1078 | on_size_allocate => sub { |
|
|
1079 | my ($vp, $w, $h) = @_; |
|
|
1080 | $vp->{parent}->update_slider; |
|
|
1081 | 0 |
|
|
1082 | }, |
1096 | ; |
1083 | ; |
1097 | |
1084 | |
1098 | $self->SUPER::add (0, 0, $self->{vp}); |
1085 | $self->SUPER::add ($self->{vp}); |
1099 | |
1086 | |
1100 | $self->add ($child) if $child; |
1087 | $self->add ($child) if $child; |
1101 | |
1088 | |
1102 | $self |
1089 | $self |
1103 | } |
1090 | } |
1104 | |
|
|
1105 | #TODO# update range on size_allocate depending on child |
|
|
1106 | |
1091 | |
1107 | sub add { |
1092 | sub add { |
1108 | my ($self, $widget) = @_; |
1093 | my ($self, $widget) = @_; |
1109 | |
1094 | |
1110 | $self->{vp}->add ($self->{child} = $widget); |
1095 | $self->{vp}->add ($self->{child} = $widget); |
1111 | } |
1096 | } |
1112 | |
1097 | |
|
|
1098 | sub set_offset { shift->{vp}->set_offset (@_) } |
|
|
1099 | sub set_center { shift->{vp}->set_center (@_) } |
|
|
1100 | sub make_visible { shift->{vp}->make_visible (@_) } |
|
|
1101 | |
1113 | sub update_slider { |
1102 | sub update_slider { |
1114 | my ($self) = @_; |
1103 | my ($self) = @_; |
1115 | |
1104 | |
1116 | my $child = ($self->{vp} or return)->child; |
1105 | my $child = ($self->{vp} or return)->child; |
1117 | |
1106 | |
|
|
1107 | if ($self->{scroll_x}) { |
1118 | my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); |
1108 | my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w}); |
1119 | $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); |
1109 | $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); |
1120 | |
1110 | |
1121 | my $visible = $w1 > $w2; |
1111 | my $visible = $w1 > $w2; |
1122 | if ($visible != $self->{hslider}{visible}) { |
1112 | if ($visible != $self->{hslider_visible}) { |
|
|
1113 | $self->{hslider_visible} = $visible; |
1123 | $visible ? $self->SUPER::add (0, 1, $self->{hslider}) |
1114 | $visible ? $self->SUPER::add ($self->{hslider}) |
1124 | : $self->{hslider}->hide; |
1115 | : $self->SUPER::remove ($self->{hslider}); |
|
|
1116 | } |
1125 | } |
1117 | } |
1126 | |
1118 | |
|
|
1119 | if ($self->{scroll_y}) { |
1127 | my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); |
1120 | my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h}); |
1128 | $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); |
1121 | $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); |
1129 | |
1122 | |
1130 | my $visible = $h1 > $h2; |
1123 | my $visible = $h1 > $h2; |
1131 | if ($visible != $self->{vslider}{visible}) { |
1124 | if ($visible != $self->{vslider_visible}) { |
|
|
1125 | $self->{vslider_visible} = $visible; |
1132 | $visible ? $self->SUPER::add (1, 0, $self->{vslider}) |
1126 | $visible ? $self->SUPER::add ($self->{vslider}) |
1133 | : $self->{vslider}->hide; |
1127 | : $self->SUPER::remove ($self->{vslider}); |
|
|
1128 | } |
|
|
1129 | } |
|
|
1130 | } |
|
|
1131 | |
|
|
1132 | sub start_dragging { |
|
|
1133 | my ($self, $ev) = @_; |
|
|
1134 | |
|
|
1135 | $self->grab_focus; |
|
|
1136 | |
|
|
1137 | my $ox = $self->{vp}{view_x}; |
|
|
1138 | my $oy = $self->{vp}{view_y}; |
|
|
1139 | |
|
|
1140 | $self->{motion} = sub { |
|
|
1141 | my ($ev, $x, $y) = @_; |
|
|
1142 | |
|
|
1143 | $ox -= $ev->{xrel}; |
|
|
1144 | $oy -= $ev->{yrel}; |
|
|
1145 | |
|
|
1146 | $self->{vp}->set_offset ($ox, $oy); |
1134 | } |
1147 | }; |
1135 | } |
|
|
1136 | |
|
|
1137 | sub update { |
|
|
1138 | my ($self) = @_; |
|
|
1139 | |
|
|
1140 | $self->SUPER::update; |
|
|
1141 | $self->update_slider; |
|
|
1142 | } |
1148 | } |
1143 | |
1149 | |
1144 | sub invoke_mouse_wheel { |
1150 | sub invoke_mouse_wheel { |
1145 | my ($self, $ev) = @_; |
1151 | my ($self, $ev) = @_; |
1146 | |
1152 | |
1147 | return 0 unless $ev->{dy}; # only vertical movements for now |
|
|
1148 | |
|
|
1149 | $self->{vslider}->emit (mouse_wheel => $ev); |
1153 | $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible}; |
|
|
1154 | $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible}; |
1150 | |
1155 | |
1151 | 1 |
1156 | 1 |
1152 | } |
1157 | } |
1153 | |
1158 | |
1154 | sub invoke_button_down { |
1159 | sub invoke_button_down { |
1155 | my ($self, $ev, $x, $y) = @_; |
1160 | my ($self, $ev, $x, $y) = @_; |
1156 | |
1161 | |
1157 | if ($ev->{button} == 2) { |
1162 | if ($ev->{button} == 2) { |
1158 | $self->grab_focus; |
1163 | $self->start_dragging ($ev); |
1159 | |
|
|
1160 | my $ox = $self->{vp}{view_x} + $ev->{x}; |
|
|
1161 | my $oy = $self->{vp}{view_y} + $ev->{y}; |
|
|
1162 | |
|
|
1163 | $self->{motion} = sub { |
|
|
1164 | my ($ev, $x, $y) = @_; |
|
|
1165 | |
|
|
1166 | $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y}); |
|
|
1167 | $self->update; |
|
|
1168 | }; |
|
|
1169 | |
|
|
1170 | return 1; |
1164 | return 1; |
1171 | } |
1165 | } |
1172 | |
1166 | |
1173 | 0 |
1167 | 0 |
1174 | } |
1168 | } |
… | |
… | |
1355 | |
1349 | |
1356 | my @border = |
1350 | my @border = |
1357 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
1351 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
1358 | qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); |
1352 | qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); |
1359 | |
1353 | |
|
|
1354 | my @icon = |
|
|
1355 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
|
|
1356 | qw(x1_move.png x1_resize.png); |
|
|
1357 | |
1360 | sub new { |
1358 | sub new { |
1361 | my ($class, %arg) = @_; |
1359 | my ($class, %arg) = @_; |
1362 | |
1360 | |
1363 | my $self = $class->SUPER::new ( |
1361 | my $self = $class->SUPER::new ( |
1364 | bg => [1, 1, 1, 1], |
1362 | bg => [1, 1, 1, 1], |
… | |
… | |
1532 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
1530 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
1533 | |
1531 | |
1534 | my $border = $self->border; |
1532 | my $border = $self->border; |
1535 | |
1533 | |
1536 | glColor @{ $self->{border_bg} }; |
1534 | glColor @{ $self->{border_bg} }; |
1537 | $border[0]->draw_quad_alpha (0, 0, $w, $border); |
1535 | $border[0]->draw_quad_alpha ( 0, 0, $w, $border); |
1538 | $border[1]->draw_quad_alpha (0, $border, $border, $ch); |
1536 | $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); |
1539 | $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); |
1537 | $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); |
1540 | $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); |
1538 | $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); |
|
|
1539 | |
|
|
1540 | # move |
|
|
1541 | my $w2 = ($w - $border) * .5; |
|
|
1542 | my $h2 = ($h - $border) * .5; |
|
|
1543 | $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); |
|
|
1544 | $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); |
|
|
1545 | $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); |
|
|
1546 | |
|
|
1547 | # resize |
|
|
1548 | $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); |
|
|
1549 | $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) |
|
|
1550 | unless $self->{has_close_button}; |
|
|
1551 | $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); |
|
|
1552 | $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); |
1541 | |
1553 | |
1542 | if (@{$self->{bg}} < 4 || $self->{bg}[3]) { |
1554 | if (@{$self->{bg}} < 4 || $self->{bg}[3]) { |
1543 | glColor @{ $self->{bg} }; |
1555 | glColor @{ $self->{bg} }; |
1544 | |
1556 | |
1545 | # TODO: repeat texture not scale |
1557 | # TODO: repeat texture not scale |
… | |
… | |
1566 | |
1578 | |
1567 | ############################################################################# |
1579 | ############################################################################# |
1568 | |
1580 | |
1569 | package CFPlus::UI::Table; |
1581 | package CFPlus::UI::Table; |
1570 | |
1582 | |
1571 | our @ISA = CFPlus::UI::Base::; |
1583 | our @ISA = CFPlus::UI::Container::; |
1572 | |
1584 | |
1573 | use List::Util qw(max sum); |
1585 | use List::Util qw(max sum); |
1574 | |
1586 | |
1575 | use CFPlus::OpenGL; |
1587 | use CFPlus::OpenGL; |
1576 | |
1588 | |
1577 | sub new { |
1589 | sub new { |
1578 | my $class = shift; |
1590 | my $class = shift; |
1579 | |
1591 | |
1580 | $class->SUPER::new ( |
1592 | $class->SUPER::new ( |
1581 | children => [], |
|
|
1582 | col_expand => [], |
1593 | col_expand => [], |
1583 | row_expand => [], |
1594 | row_expand => [], |
1584 | @_, |
1595 | @_, |
1585 | ) |
1596 | ) |
1586 | } |
1597 | } |
1587 | |
1598 | |
1588 | sub children { |
|
|
1589 | grep $_, map @$_, grep $_, @{ $_[0]{children} } |
|
|
1590 | } |
|
|
1591 | |
|
|
1592 | # TODO: store row/col info in child widget and use standard add/del |
|
|
1593 | sub add { |
1599 | sub add { |
|
|
1600 | my ($self, @widgets) = @_; |
|
|
1601 | |
|
|
1602 | for my $child (@widgets) { |
|
|
1603 | $child->{rowspan} ||= 1; |
|
|
1604 | $child->{colspan} ||= 1; |
|
|
1605 | } |
|
|
1606 | |
|
|
1607 | $self->SUPER::add (@widgets); |
|
|
1608 | } |
|
|
1609 | |
|
|
1610 | sub add_at { |
1594 | my ($self) = shift; |
1611 | my $self = shift; |
|
|
1612 | |
|
|
1613 | my @widgets; |
1595 | |
1614 | |
1596 | while (@_) { |
1615 | while (@_) { |
1597 | my ($x, $y, $child) = splice @_, 0, 3, (); |
1616 | my ($col, $row, $child) = splice @_, 0, 3, (); |
1598 | $child->set_parent ($self); |
|
|
1599 | $self->{children}[$y][$x] = $child; |
|
|
1600 | } |
|
|
1601 | |
1617 | |
1602 | $self->{force_realloc} = 1; |
1618 | $child->{row} = $row; |
1603 | $self->{force_size_alloc} = 1; |
1619 | $child->{col} = $col; |
1604 | $self->realloc; |
|
|
1605 | } |
|
|
1606 | |
1620 | |
1607 | sub remove { |
1621 | push @widgets, $child; |
|
|
1622 | } |
|
|
1623 | |
|
|
1624 | $self->add (@widgets); |
|
|
1625 | } |
|
|
1626 | |
|
|
1627 | sub get_wh { |
1608 | my ($self, $child) = @_; |
1628 | my ($self) = @_; |
1609 | |
1629 | |
1610 | for (@{ $self->{children} }) { |
1630 | my (@w, @h); |
1611 | for (@{ $_ || [] }) { |
1631 | |
1612 | $_ = undef if $_ == $child; |
1632 | my @children = $self->children; |
|
|
1633 | |
|
|
1634 | # first pass, columns |
|
|
1635 | for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { |
|
|
1636 | my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; |
|
|
1637 | |
|
|
1638 | my $sw = sum @w[$c .. $c + $cs - 1]; |
|
|
1639 | |
|
|
1640 | if ($w > $sw) { |
|
|
1641 | $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; |
1613 | } |
1642 | } |
1614 | } |
1643 | } |
1615 | } |
|
|
1616 | |
1644 | |
1617 | # TODO: move to container class maybe? send children a signal on removal? |
1645 | # second pass, rows |
1618 | sub clear { |
1646 | for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { |
1619 | my ($self) = @_; |
|
|
1620 | |
|
|
1621 | my @children = $self->children; |
|
|
1622 | delete $self->{children}; |
|
|
1623 | |
|
|
1624 | for (@children) { |
|
|
1625 | delete $_->{parent}; |
|
|
1626 | $_->hide; |
|
|
1627 | } |
|
|
1628 | |
|
|
1629 | $self->realloc; |
|
|
1630 | } |
|
|
1631 | |
|
|
1632 | sub get_wh { |
|
|
1633 | my ($self) = @_; |
|
|
1634 | |
|
|
1635 | my (@w, @h); |
|
|
1636 | |
|
|
1637 | for my $y (0 .. $#{$self->{children}}) { |
|
|
1638 | my $row = $self->{children}[$y] |
|
|
1639 | or next; |
|
|
1640 | |
|
|
1641 | for my $x (0 .. $#$row) { |
|
|
1642 | my $widget = $row->[$x] |
|
|
1643 | or next; |
|
|
1644 | my ($w, $h) = @$widget{qw(req_w req_h)}; |
1647 | my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; |
1645 | |
1648 | |
1646 | $w[$x] = max $w[$x], $w; |
1649 | my $sh = sum @h[$r .. $r + $rs - 1]; |
1647 | $h[$y] = max $h[$y], $h; |
1650 | |
|
|
1651 | if ($h > $sh) { |
|
|
1652 | $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; |
1648 | } |
1653 | } |
1649 | } |
1654 | } |
1650 | |
1655 | |
1651 | (\@w, \@h) |
1656 | (\@w, \@h) |
1652 | } |
1657 | } |
… | |
… | |
1668 | my ($ws, $hs) = $self->get_wh; |
1673 | my ($ws, $hs) = $self->get_wh; |
1669 | |
1674 | |
1670 | my $req_w = (sum @$ws) || 1; |
1675 | my $req_w = (sum @$ws) || 1; |
1671 | my $req_h = (sum @$hs) || 1; |
1676 | my $req_h = (sum @$hs) || 1; |
1672 | |
1677 | |
1673 | # TODO: nicer code |
1678 | # now linearly scale the rows/columns to the allocated size |
1674 | my @col_expand = @{$self->{col_expand}}; |
1679 | my @col_expand = @{$self->{col_expand}}; |
1675 | @col_expand = (1) x @$ws unless @col_expand; |
1680 | @col_expand = (1) x @$ws unless @col_expand; |
1676 | my $col_expand = (sum @col_expand) || 1; |
1681 | my $col_expand = (sum @col_expand) || 1; |
1677 | |
1682 | |
1678 | $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; |
1683 | $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; |
… | |
… | |
1685 | |
1690 | |
1686 | $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; |
1691 | $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; |
1687 | |
1692 | |
1688 | CFPlus::UI::harmonize $hs; |
1693 | CFPlus::UI::harmonize $hs; |
1689 | |
1694 | |
1690 | my $y; |
1695 | my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } |
|
|
1696 | my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } |
1691 | |
1697 | |
1692 | for my $r (0 .. $#{$self->{children}}) { |
1698 | for my $widget ($self->children) { |
1693 | my $row = $self->{children}[$r] |
1699 | my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; |
1694 | or next; |
|
|
1695 | |
1700 | |
1696 | my $x = 0; |
1701 | $widget->configure ( |
1697 | my $row_h = $hs->[$r]; |
1702 | $x[$c], $y[$r], |
|
|
1703 | $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], |
1698 | |
1704 | ); |
1699 | for my $c (0 .. $#$row) { |
|
|
1700 | my $col_w = $ws->[$c]; |
|
|
1701 | |
|
|
1702 | if (my $widget = $row->[$c]) { |
|
|
1703 | $widget->configure ($x, $y, $col_w, $row_h); |
|
|
1704 | } |
|
|
1705 | |
|
|
1706 | $x += $col_w; |
|
|
1707 | } |
|
|
1708 | |
|
|
1709 | $y += $row_h; |
|
|
1710 | } |
1705 | } |
1711 | |
1706 | |
1712 | 1 |
1707 | 1 |
1713 | } |
1708 | } |
1714 | |
1709 | |
1715 | sub find_widget { |
|
|
1716 | my ($self, $x, $y) = @_; |
|
|
1717 | |
|
|
1718 | $x -= $self->{x}; |
|
|
1719 | $y -= $self->{y}; |
|
|
1720 | |
|
|
1721 | my $res; |
|
|
1722 | |
|
|
1723 | for (grep $_, map @$_, grep $_, @{ $self->{children} }) { |
|
|
1724 | $res = $_->find_widget ($x, $y) |
|
|
1725 | and return $res; |
|
|
1726 | } |
|
|
1727 | |
|
|
1728 | $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) |
|
|
1729 | } |
|
|
1730 | |
|
|
1731 | sub _draw { |
|
|
1732 | my ($self) = @_; |
|
|
1733 | |
|
|
1734 | for (grep $_, @{$self->{children}}) { |
|
|
1735 | $_->draw for grep $_, @$_; |
|
|
1736 | } |
|
|
1737 | } |
|
|
1738 | |
|
|
1739 | ############################################################################# |
1710 | ############################################################################# |
1740 | |
1711 | |
1741 | package CFPlus::UI::Fixed; |
1712 | package CFPlus::UI::Fixed; |
1742 | |
1713 | |
1743 | use List::Util qw(min max); |
1714 | use List::Util qw(min max); |
1744 | |
1715 | |
1745 | our @ISA = CFPlus::UI::Container::; |
1716 | our @ISA = CFPlus::UI::Container::; |
1746 | |
1717 | |
1747 | sub add { |
|
|
1748 | my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_; |
|
|
1749 | |
|
|
1750 | $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h]; |
|
|
1751 | $self->SUPER::add ($child); |
|
|
1752 | } |
|
|
1753 | |
|
|
1754 | sub _scale($$$) { |
1718 | sub _scale($$$) { |
1755 | my ($mode, $val, $max) = @_; |
1719 | my ($rel, $val, $max) = @_; |
1756 | |
1720 | |
1757 | $mode eq "abs" ? $val |
1721 | $rel ? $val * $max : $val |
1758 | : $mode eq "rel" ? $val * $max |
|
|
1759 | : 0 |
|
|
1760 | } |
1722 | } |
1761 | |
1723 | |
1762 | sub size_request { |
1724 | sub size_request { |
1763 | my ($self) = @_; |
1725 | my ($self) = @_; |
1764 | |
1726 | |
1765 | my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); |
1727 | my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); |
1766 | |
1728 | |
1767 | # determine overall size by querying abs widgets |
1729 | # determine overall size by querying abs widgets |
1768 | for my $child ($self->visible_children) { |
1730 | for my $child ($self->visible_children) { |
1769 | my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; |
1731 | unless ($child->{c_rel}) { |
|
|
1732 | my $x = $child->{c_x}; |
|
|
1733 | my $y = $child->{c_y}; |
1770 | |
1734 | |
1771 | if ($pos eq "abs") { |
|
|
1772 | $w = _scale $size, $w, $child->{req_w}; |
|
|
1773 | $h = _scale $size, $h, $child->{req_h}; |
|
|
1774 | |
|
|
1775 | $x1 = min $x1, $x; $x2 = max $x2, $x + $w; |
1735 | $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w}; |
1776 | $y1 = min $y1, $y; $y2 = max $y2, $y + $h; |
1736 | $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h}; |
1777 | } |
1737 | } |
1778 | } |
1738 | } |
1779 | |
1739 | |
1780 | my $W = $x2 - $x1; |
1740 | my $W = $x2 - $x1; |
1781 | my $H = $y2 - $y1; |
1741 | my $H = $y2 - $y1; |
1782 | |
1742 | |
1783 | # now layout remaining widgets |
1743 | # now layout remaining widgets |
1784 | for my $child ($self->visible_children) { |
1744 | for my $child ($self->visible_children) { |
1785 | my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; |
1745 | if ($child->{c_rel}) { |
|
|
1746 | my $x = _scale $child->{c_rel}, $child->{c_x}, $W; |
|
|
1747 | my $y = _scale $child->{c_rel}, $child->{c_y}, $H; |
1786 | |
1748 | |
1787 | if ($pos ne "abs") { |
|
|
1788 | $x = _scale $pos, $x, $W; |
|
|
1789 | $y = _scale $pos, $x, $H; |
|
|
1790 | $w = _scale $size, $w, $child->{req_w}; |
|
|
1791 | $h = _scale $size, $h, $child->{req_h}; |
|
|
1792 | |
|
|
1793 | $x1 = min $x1, $x; $x2 = max $x2, $x + $w; |
1749 | $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w}; |
1794 | $y1 = min $y1, $y; $y2 = max $y2, $y + $h; |
1750 | $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h}; |
1795 | } |
1751 | } |
1796 | } |
1752 | } |
1797 | |
1753 | |
1798 | my $W = $x2 - $x1; |
1754 | my $W = $x2 - $x1; |
1799 | my $H = $y2 - $y1; |
1755 | my $H = $y2 - $y1; |
… | |
… | |
1803 | |
1759 | |
1804 | sub invoke_size_allocate { |
1760 | sub invoke_size_allocate { |
1805 | my ($self, $W, $H) = @_; |
1761 | my ($self, $W, $H) = @_; |
1806 | |
1762 | |
1807 | for my $child ($self->visible_children) { |
1763 | for my $child ($self->visible_children) { |
1808 | my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; |
1764 | my $x = _scale $child->{c_rel}, $child->{c_x}, $W; |
|
|
1765 | my $y = _scale $child->{c_rel}, $child->{c_y}, $H; |
1809 | |
1766 | |
1810 | $x = _scale $pos, $x, $W; |
1767 | $x += $child->{c_halign} * $child->{req_w}; |
1811 | $y = _scale $pos, $x, $H; |
1768 | $y += $child->{c_valign} * $child->{req_h}; |
1812 | $w = _scale $size, $w, $child->{req_w}; |
|
|
1813 | $h = _scale $size, $h, $child->{req_h}; |
|
|
1814 | |
1769 | |
1815 | $child->configure ($x, $y, $w, $h); |
1770 | $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h}); |
1816 | } |
1771 | } |
1817 | |
1772 | |
1818 | 1 |
1773 | 1 |
1819 | } |
1774 | } |
1820 | |
1775 | |
… | |
… | |
1824 | |
1779 | |
1825 | our @ISA = CFPlus::UI::Container::; |
1780 | our @ISA = CFPlus::UI::Container::; |
1826 | |
1781 | |
1827 | sub size_request { |
1782 | sub size_request { |
1828 | my ($self) = @_; |
1783 | my ($self) = @_; |
|
|
1784 | |
|
|
1785 | my @children = $self->visible_children; |
1829 | |
1786 | |
1830 | $self->{vertical} |
1787 | $self->{vertical} |
1831 | ? ( |
1788 | ? ( |
1832 | (List::Util::max map $_->{req_w}, @{$self->{children}}), |
1789 | (List::Util::max map $_->{req_w}, @children), |
1833 | (List::Util::sum map $_->{req_h}, @{$self->{children}}), |
1790 | (List::Util::sum map $_->{req_h}, @children), |
1834 | ) |
1791 | ) |
1835 | : ( |
1792 | : ( |
1836 | (List::Util::sum map $_->{req_w}, @{$self->{children}}), |
1793 | (List::Util::sum map $_->{req_w}, @children), |
1837 | (List::Util::max map $_->{req_h}, @{$self->{children}}), |
1794 | (List::Util::max map $_->{req_h}, @children), |
1838 | ) |
1795 | ) |
1839 | } |
1796 | } |
1840 | |
1797 | |
1841 | sub invoke_size_allocate { |
1798 | sub invoke_size_allocate { |
1842 | my ($self, $w, $h) = @_; |
1799 | my ($self, $w, $h) = @_; |
… | |
… | |
2083 | $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} |
2040 | $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} |
2084 | : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} |
2041 | : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} |
2085 | : ($self->{h} - $size->[1]) * 0.5); |
2042 | : ($self->{h} - $size->[1]) * 0.5); |
2086 | }; |
2043 | }; |
2087 | |
2044 | |
2088 | my $w = List::Util::min $self->{w} + 4, $size->[0]; |
2045 | # unless ($self->{list}) { |
2089 | my $h = List::Util::min $self->{h} + 2, $size->[1]; |
2046 | # $self->{list} = CFPlus::OpenGL::glGenList; |
|
|
2047 | # CFPlus::OpenGL::glNewList $self->{list}; |
|
|
2048 | # $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); |
|
|
2049 | # CFPlus::OpenGL::glEndList; |
|
|
2050 | # } |
|
|
2051 | # |
|
|
2052 | # CFPlus::OpenGL::glCallList $self->{list}; |
2090 | |
2053 | |
2091 | $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); |
2054 | $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); |
2092 | } |
2055 | } |
|
|
2056 | |
|
|
2057 | #sub destroy { |
|
|
2058 | # my ($self) = @_; |
|
|
2059 | # |
|
|
2060 | # CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list}; |
|
|
2061 | # |
|
|
2062 | # $self->SUPER::destroy; |
|
|
2063 | #} |
2093 | |
2064 | |
2094 | ############################################################################# |
2065 | ############################################################################# |
2095 | |
2066 | |
2096 | package CFPlus::UI::EntryBase; |
2067 | package CFPlus::UI::EntryBase; |
2097 | |
2068 | |
… | |
… | |
2381 | |
2352 | |
2382 | use CFPlus::OpenGL; |
2353 | use CFPlus::OpenGL; |
2383 | |
2354 | |
2384 | my @tex = |
2355 | my @tex = |
2385 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
2356 | map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } |
2386 | qw(b1_button_active.png); |
2357 | qw(b1_button_inactive.png b1_button_active.png); |
2387 | |
2358 | |
2388 | sub new { |
2359 | sub new { |
2389 | my $class = shift; |
2360 | my $class = shift; |
2390 | |
2361 | |
2391 | $class->SUPER::new ( |
2362 | $class->SUPER::new ( |
2392 | padding_x => 4, |
2363 | padding_x => 4, |
2393 | padding_y => 4, |
2364 | padding_y => 4, |
2394 | fg => [1, 1, 1], |
2365 | fg => [1.0, 1.0, 1.0], |
2395 | active_fg => [0, 0, 1], |
2366 | active_fg => [0.8, 0.8, 0.8], |
2396 | can_hover => 1, |
2367 | can_hover => 1, |
2397 | align => 0, |
2368 | align => 0, |
2398 | valign => 0, |
2369 | valign => 0, |
2399 | can_events => 1, |
2370 | can_events => 1, |
2400 | @_ |
2371 | @_ |
… | |
… | |
2418 | |
2389 | |
2419 | glEnable GL_TEXTURE_2D; |
2390 | glEnable GL_TEXTURE_2D; |
2420 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2391 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
2421 | glColor 0, 0, 0, 1; |
2392 | glColor 0, 0, 0, 1; |
2422 | |
2393 | |
|
|
2394 | my $tex = $tex[$GRAB == $self]; |
2423 | $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2395 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
2424 | |
2396 | |
2425 | glDisable GL_TEXTURE_2D; |
2397 | glDisable GL_TEXTURE_2D; |
2426 | |
2398 | |
2427 | $self->SUPER::_draw; |
2399 | $self->SUPER::_draw; |
2428 | } |
2400 | } |
… | |
… | |
2881 | |
2853 | |
2882 | $self->SUPER::invoke_button_down ($ev, $x, $y); |
2854 | $self->SUPER::invoke_button_down ($ev, $x, $y); |
2883 | |
2855 | |
2884 | $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; |
2856 | $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; |
2885 | |
2857 | |
2886 | $self->invoke_mouse_motion ($ev, $x, $y) |
2858 | $self->invoke_mouse_motion ($ev, $x, $y); |
|
|
2859 | |
|
|
2860 | 1 |
2887 | } |
2861 | } |
2888 | |
2862 | |
2889 | sub invoke_mouse_motion { |
2863 | sub invoke_mouse_motion { |
2890 | my ($self, $ev, $x, $y) = @_; |
2864 | my ($self, $ev, $x, $y) = @_; |
2891 | |
2865 | |
… | |
… | |
2911 | |
2885 | |
2912 | my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; |
2886 | my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; |
2913 | |
2887 | |
2914 | $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); |
2888 | $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); |
2915 | |
2889 | |
2916 | ! ! $delta |
2890 | 1 |
2917 | } |
2891 | } |
2918 | |
2892 | |
2919 | sub update { |
2893 | sub update { |
2920 | my ($self) = @_; |
2894 | my ($self) = @_; |
2921 | |
2895 | |
… | |
… | |
3052 | } |
3026 | } |
3053 | |
3027 | |
3054 | sub size_request { |
3028 | sub size_request { |
3055 | my ($self) = @_; |
3029 | my ($self) = @_; |
3056 | |
3030 | |
3057 | my ($empty, $slider) = @{ $self->{children} }; |
3031 | my ($empty, $slider) = $self->visible_children; |
3058 | |
3032 | |
3059 | local $self->{children} = [$empty, $slider]; |
3033 | local $self->{children} = [$empty, $slider]; |
3060 | $self->SUPER::size_request |
3034 | $self->SUPER::size_request |
3061 | } |
3035 | } |
3062 | |
3036 | |
… | |
… | |
3493 | ); |
3467 | ); |
3494 | |
3468 | |
3495 | if ($self->{anim} && $self->{animspeed}) { |
3469 | if ($self->{anim} && $self->{animspeed}) { |
3496 | CFPlus::weaken (my $widget = $self); |
3470 | CFPlus::weaken (my $widget = $self); |
3497 | |
3471 | |
|
|
3472 | $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; |
|
|
3473 | $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; |
3498 | $self->{timer} = Event->timer ( |
3474 | $self->{timer} = Event->timer ( |
3499 | at => $self->{animspeed} * int $::NOW / $self->{animspeed}, |
|
|
3500 | hard => 1, |
3475 | parked => 1, |
3501 | interval => $self->{animspeed}, |
|
|
3502 | cb => sub { |
3476 | cb => sub { |
3503 | return unless $::CONN; |
3477 | return unless $::CONN && $widget; |
3504 | |
3478 | |
3505 | ++$widget->{frame}; |
3479 | ++$widget->{frame}; |
3506 | $self->update_face; |
3480 | $widget->update_face; |
3507 | $self->update; |
3481 | $widget->update; |
|
|
3482 | |
|
|
3483 | $widget->update_timer; |
3508 | }, |
3484 | }, |
3509 | ); |
3485 | ); |
3510 | |
3486 | |
3511 | $self->update_face; |
3487 | $self->update_face; |
|
|
3488 | $self->update_timer; |
3512 | } |
3489 | } |
3513 | |
3490 | |
3514 | $self |
3491 | $self |
|
|
3492 | } |
|
|
3493 | |
|
|
3494 | sub update_timer { |
|
|
3495 | my ($self) = @_; |
|
|
3496 | |
|
|
3497 | return unless $self->{timer}; |
|
|
3498 | |
|
|
3499 | if ($self->{visible}) { |
|
|
3500 | $self->{timer}->at ( |
|
|
3501 | $self->{anim_start} |
|
|
3502 | + $self->{animspeed} |
|
|
3503 | * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed} |
|
|
3504 | ); |
|
|
3505 | $self->{timer}->start; |
|
|
3506 | } else { |
|
|
3507 | $self->{timer}->stop; |
|
|
3508 | } |
3515 | } |
3509 | } |
3516 | |
3510 | |
3517 | sub update_face { |
3511 | sub update_face { |
3518 | my ($self) = @_; |
3512 | my ($self) = @_; |
3519 | |
3513 | |
… | |
… | |
3521 | |
3515 | |
3522 | if (my $anim = $::CONN->{anim}[$self->{anim}]) { |
3516 | if (my $anim = $::CONN->{anim}[$self->{anim}]) { |
3523 | if ($anim && @$anim) { |
3517 | if ($anim && @$anim) { |
3524 | delete $self->{wait_face}; |
3518 | delete $self->{wait_face}; |
3525 | $self->{face} = $anim->[ $self->{frame} % @$anim ]; |
3519 | $self->{face} = $anim->[ $self->{frame} % @$anim ]; |
|
|
3520 | $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; |
3526 | } |
3521 | } |
3527 | } |
3522 | } |
3528 | } |
3523 | } |
3529 | |
3524 | |
3530 | sub size_request { |
3525 | sub size_request { |
3531 | my ($self) = @_; |
3526 | my ($self) = @_; |
3532 | |
3527 | |
3533 | if ($::CONN) { |
3528 | if ($::CONN) { |
3534 | if (my $faceid = $::CONN->{faceid}[$self->{face}]) { |
3529 | if (my $faceid = $::CONN->{faceid}[$self->{face}]) { |
3535 | if (my $tex = $::CONN->{texture}[$faceid]) { |
3530 | if (my $tex = $::CONN->{texture}[$faceid]) { |
|
|
3531 | $self->{tex} = $tex; |
3536 | return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); |
3532 | return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); |
3537 | } else { |
3533 | } else { |
3538 | $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { |
3534 | $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { |
3539 | $self->realloc; |
3535 | $self->realloc; |
3540 | }); |
3536 | }); |
… | |
… | |
3551 | return unless $self->{visible}; |
3547 | return unless $self->{visible}; |
3552 | |
3548 | |
3553 | $self->SUPER::update; |
3549 | $self->SUPER::update; |
3554 | } |
3550 | } |
3555 | |
3551 | |
|
|
3552 | sub invoke_visibility_change { |
|
|
3553 | my ($self) = @_; |
|
|
3554 | |
|
|
3555 | $self->update_timer; |
|
|
3556 | |
|
|
3557 | 0 |
|
|
3558 | } |
|
|
3559 | |
3556 | sub _draw { |
3560 | sub _draw { |
3557 | my ($self) = @_; |
3561 | my ($self) = @_; |
3558 | |
3562 | |
3559 | return unless $::CONN; |
|
|
3560 | |
|
|
3561 | $self->SUPER::_draw; |
3563 | $self->SUPER::_draw; |
3562 | |
3564 | |
3563 | my $faceid = $::CONN->{faceid}[$self->{face}] |
3565 | if (my $tex = $self->{tex}) { |
3564 | or return; |
|
|
3565 | |
|
|
3566 | my $tex = $::CONN->{texture}[$faceid]; |
|
|
3567 | |
|
|
3568 | if ($tex) { |
|
|
3569 | glEnable GL_TEXTURE_2D; |
3566 | glEnable GL_TEXTURE_2D; |
3570 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
3567 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
3571 | glColor 0, 0, 0, 1; |
3568 | glColor 0, 0, 0, 1; |
3572 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
3569 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
3573 | glDisable GL_TEXTURE_2D; |
3570 | glDisable GL_TEXTURE_2D; |
… | |
… | |
3575 | } |
3572 | } |
3576 | |
3573 | |
3577 | sub destroy { |
3574 | sub destroy { |
3578 | my ($self) = @_; |
3575 | my ($self) = @_; |
3579 | |
3576 | |
3580 | $self->{timer}->cancel |
3577 | (delete $self->{timer})->cancel |
3581 | if $self->{timer}; |
3578 | if $self->{timer}; |
3582 | |
3579 | |
3583 | $self->SUPER::destroy; |
3580 | $self->SUPER::destroy; |
3584 | } |
3581 | } |
3585 | |
3582 | |
… | |
… | |
3771 | buttonbar => (new CFPlus::UI::Buttonbar), |
3768 | buttonbar => (new CFPlus::UI::Buttonbar), |
3772 | multiplexer => (new CFPlus::UI::Multiplexer expand => 1), |
3769 | multiplexer => (new CFPlus::UI::Multiplexer expand => 1), |
3773 | # filter => # will be put between multiplexer and $self |
3770 | # filter => # will be put between multiplexer and $self |
3774 | @_, |
3771 | @_, |
3775 | ); |
3772 | ); |
3776 | |
3773 | |
3777 | $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; |
3774 | $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; |
3778 | $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); |
3775 | $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); |
3779 | |
3776 | |
|
|
3777 | { |
|
|
3778 | Scalar::Util::weaken (my $wself = $self); |
|
|
3779 | |
|
|
3780 | $self->{multiplexer}->connect (c_add => sub { |
|
|
3781 | my ($mplex, $widgets) = @_; |
|
|
3782 | |
|
|
3783 | for my $child (@$widgets) { |
|
|
3784 | Scalar::Util::weaken $child; |
|
|
3785 | $child->{c_tab_} ||= do { |
|
|
3786 | my $tab = |
|
|
3787 | (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base") |
|
|
3788 | ? $child->{c_tab} |
|
|
3789 | : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1]; |
|
|
3790 | |
|
|
3791 | $tab->connect (activate => sub { |
|
|
3792 | $wself->set_current_page ($child); |
|
|
3793 | }); |
|
|
3794 | |
|
|
3795 | $tab |
|
|
3796 | }; |
|
|
3797 | |
|
|
3798 | $self->{buttonbar}->add ($child->{c_tab_}); |
|
|
3799 | } |
|
|
3800 | }); |
|
|
3801 | |
|
|
3802 | $self->{multiplexer}->connect (c_remove => sub { |
|
|
3803 | my ($mplex, $widgets) = @_; |
|
|
3804 | |
|
|
3805 | for my $child (@$widgets) { |
|
|
3806 | $wself->{buttonbar}->remove ($child->{c_tab_}); |
|
|
3807 | } |
|
|
3808 | }); |
|
|
3809 | } |
|
|
3810 | |
3780 | $self |
3811 | $self |
3781 | } |
3812 | } |
3782 | |
3813 | |
3783 | sub add { |
3814 | sub add { |
|
|
3815 | my ($self, @widgets) = @_; |
|
|
3816 | |
|
|
3817 | $self->{multiplexer}->add (@widgets) |
|
|
3818 | } |
|
|
3819 | |
|
|
3820 | sub remove { |
|
|
3821 | my ($self, @widgets) = @_; |
|
|
3822 | |
|
|
3823 | $self->{multiplexer}->remove (@widgets) |
|
|
3824 | } |
|
|
3825 | |
|
|
3826 | sub pages { |
|
|
3827 | my ($self) = @_; |
|
|
3828 | $self->{multiplexer}->children |
|
|
3829 | } |
|
|
3830 | |
|
|
3831 | sub add_tab { |
3784 | my ($self, $title, $widget, $tooltip) = @_; |
3832 | my ($self, $title, $widget, $tooltip) = @_; |
3785 | |
3833 | |
3786 | CFPlus::weaken $self; |
3834 | $title = [$title, $tooltip] unless ref $title; |
|
|
3835 | $widget->{c_tab} = $title; |
3787 | |
3836 | |
3788 | $self->{buttonbar}->add (new CFPlus::UI::Button |
|
|
3789 | markup => $title, |
|
|
3790 | tooltip => $tooltip, |
|
|
3791 | on_activate => sub { $self->set_current_page ($widget) }, |
|
|
3792 | ); |
|
|
3793 | |
|
|
3794 | $self->{multiplexer}->add ($widget); |
3837 | $self->add ($widget); |
3795 | } |
3838 | } |
3796 | |
3839 | |
3797 | sub get_current_page { |
3840 | sub get_current_page { |
3798 | my ($self) = @_; |
3841 | my ($self) = @_; |
3799 | |
3842 | |
… | |
… | |
4129 | while ($self->{refresh_hook}) { |
4172 | while ($self->{refresh_hook}) { |
4130 | $_->() |
4173 | $_->() |
4131 | for values %{delete $self->{refresh_hook}}; |
4174 | for values %{delete $self->{refresh_hook}}; |
4132 | } |
4175 | } |
4133 | |
4176 | |
4134 | if ($self->{realloc}) { |
4177 | while ($self->{realloc}) { |
4135 | my %queue; |
4178 | my %queue; |
4136 | my @queue; |
4179 | my @queue; |
4137 | my $widget; |
4180 | my $widget; |
4138 | |
4181 | |
4139 | outer: |
4182 | outer: |
… | |
… | |
4186 | } |
4229 | } |
4187 | } |
4230 | } |
4188 | |
4231 | |
4189 | delete $self->{realloc}{$widget+0}; |
4232 | delete $self->{realloc}{$widget+0}; |
4190 | } |
4233 | } |
4191 | } |
|
|
4192 | |
4234 | |
4193 | while (my $size_alloc = delete $self->{size_alloc}) { |
4235 | while (my $size_alloc = delete $self->{size_alloc}) { |
4194 | my @queue = sort { $b->{visible} <=> $a->{visible} } |
4236 | my @queue = sort { $a->{visible} <=> $b->{visible} } |
4195 | values %$size_alloc; |
4237 | values %$size_alloc; |
4196 | |
4238 | |
4197 | while () { |
4239 | while () { |
4198 | my $widget = pop @queue || last; |
4240 | my $widget = pop @queue || last; |
4199 | |
4241 | |
4200 | my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; |
4242 | my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; |
4201 | |
4243 | |
4202 | $w = 0 if $w < 0; |
|
|
4203 | $h = 0 if $h < 0; |
|
|
4204 | |
|
|
4205 | $w = max $widget->{min_w}, $w; |
4244 | $w = max $widget->{min_w}, $w; |
4206 | $h = max $widget->{min_h}, $h; |
4245 | $h = max $widget->{min_h}, $h; |
4207 | |
4246 | |
4208 | # $w = min $self->{w} - $widget->{x}, $w if $self->{w}; |
4247 | # $w = min $self->{w} - $widget->{x}, $w if $self->{w}; |
4209 | # $h = min $self->{h} - $widget->{y}, $h if $self->{h}; |
4248 | # $h = min $self->{h} - $widget->{y}, $h if $self->{h}; |
4210 | |
4249 | |
4211 | $w = min $widget->{max_w}, $w if exists $widget->{max_w}; |
4250 | $w = min $widget->{max_w}, $w if exists $widget->{max_w}; |
4212 | $h = min $widget->{max_h}, $h if exists $widget->{max_h}; |
4251 | $h = min $widget->{max_h}, $h if exists $widget->{max_h}; |
4213 | |
4252 | |
4214 | $w = int $w + 0.5; |
4253 | $w = int $w + 0.5; |
4215 | $h = int $h + 0.5; |
4254 | $h = int $h + 0.5; |
4216 | |
4255 | |
4217 | if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { |
4256 | if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { |
4218 | $widget->{old_w} = $widget->{w}; |
4257 | $widget->{old_w} = $widget->{w}; |
4219 | $widget->{old_h} = $widget->{h}; |
4258 | $widget->{old_h} = $widget->{h}; |
4220 | |
4259 | |
4221 | $widget->{w} = $w; |
4260 | $widget->{w} = $w; |
4222 | $widget->{h} = $h; |
4261 | $widget->{h} = $h; |
4223 | |
4262 | |
4224 | $widget->emit (size_allocate => $w, $h); |
4263 | $widget->emit (size_allocate => $w, $h); |
|
|
4264 | } |
4225 | } |
4265 | } |
4226 | } |
4266 | } |
4227 | } |
4267 | } |
4228 | |
4268 | |
4229 | while ($self->{post_alloc_hook}) { |
4269 | while ($self->{post_alloc_hook}) { |
4230 | $_->() |
4270 | $_->() |
4231 | for values %{delete $self->{post_alloc_hook}}; |
4271 | for values %{delete $self->{post_alloc_hook}}; |
4232 | } |
4272 | } |
4233 | |
|
|
4234 | |
4273 | |
4235 | glViewport 0, 0, $::WIDTH, $::HEIGHT; |
4274 | glViewport 0, 0, $::WIDTH, $::HEIGHT; |
4236 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
4275 | glClearColor +($::CFG->{fow_intensity}) x 3, 1; |
4237 | glClear GL_COLOR_BUFFER_BIT; |
4276 | glClear GL_COLOR_BUFFER_BIT; |
4238 | |
4277 | |