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.378 by root, Mon Jul 16 20:22:39 2007 UTC vs.
Revision 1.430 by root, Tue Aug 21 02:39:17 2007 UTC

… …
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 }
… …
269 $self->emit ("destroy"); 273 $self->emit ("destroy");
270 %$self = (); 274 %$self = ();
271} 275}
272 276
273sub TO_JSON { 277sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} } 278 { __w_ => $_[0]{s_id} }
275} 279}
276 280
277sub show { 281sub show {
278 my ($self) = @_; 282 my ($self) = @_;
279 283
… …
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
552sub 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
564sub set_parent { 559sub 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.
601our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602 597
603sub 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
650sub _draw { 601sub _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
656my $cntx;#d#
657sub DESTROY { 607sub DESTROY {
658 my ($self) = @_; 608 my ($self) = @_;
659 609
660 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
661 611
612 local $@;
662 eval { $self->destroy }; 613 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 614 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664 615
665 delete $WIDGET{$self+0}; 616 delete $WIDGET{$self+0};
666} 617}
… …
674use strict; 625use strict;
675use CFPlus::OpenGL; 626use CFPlus::OpenGL;
676 627
677sub new { 628sub new {
678 my $class = shift; 629 my $class = shift;
679
680 # range [value, low, high, page]
681 630
682 $class->SUPER::new ( 631 $class->SUPER::new (
683 #bg => [0, 0, 0, 0.2], 632 #bg => [0, 0, 0, 0.2],
684 #active_bg => [1, 1, 1, 0.5], 633 #active_bg => [1, 1, 1, 0.5],
685 @_ 634 @_
… …
697 my ($w, $h) = @$self{qw(w h)}; 646 my ($w, $h) = @$self{qw(w h)};
698 647
699 glEnable GL_BLEND; 648 glEnable GL_BLEND;
700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 649 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701 glColor_premultiply @$color; 650 glColor_premultiply @$color;
702
703 glBegin GL_QUADS;
704 glVertex 0 , 0;
705 glVertex 0 , $h;
706 glVertex $w, $h; 651 glRect 0, 0, $w, $h;
707 glVertex $w, 0;
708 glEnd;
709
710 glDisable GL_BLEND; 652 glDisable GL_BLEND;
711 } 653 }
712} 654}
713 655
714############################################################################# 656#############################################################################
… …
746 can_events => 0, 688 can_events => 0,
747 %arg, 689 %arg,
748 ); 690 );
749 691
750 $self->add (@$children) 692 $self->add (@$children)
751 if $children; 693 if $children && @$children;
752 694
753 $self 695 $self
754} 696}
755 697
756sub realloc { 698sub realloc {
… …
765 my ($self, @widgets) = @_; 707 my ($self, @widgets) = @_;
766 708
767 $_->set_parent ($self) 709 $_->set_parent ($self)
768 for @widgets; 710 for @widgets;
769 711
712 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 713 use sort 'stable';
771 714
772 $self->{children} = [ 715 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 716 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 717 @{$self->{children}}, @widgets
775 ]; 718 ];
776 719
777 $self->realloc; 720 $self->realloc;
721
722 $self->emit (c_add => \@widgets);
723
724 map $_+0, @widgets
778} 725}
779 726
780sub children { 727sub children {
781 @{ $_[0]{children} } 728 @{ $_[0]{children} }
782} 729}
783 730
784sub remove { 731sub remove {
785 my ($self, $child) = @_; 732 my ($self, @widgets) = @_;
786 733
734 $self->emit (c_remove => \@widgets);
735
736 for my $child (@widgets) {
787 delete $child->{parent}; 737 delete $child->{parent};
788 $child->hide; 738 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 739 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
740 }
791 741
792 $self->realloc; 742 $self->realloc;
793} 743}
794 744
795sub clear { 745sub clear {
796 my ($self) = @_; 746 my ($self) = @_;
797 747
798 my $children = delete $self->{children}; 748 my $children = $self->{children};
799 $self->{children} = []; 749 $self->{children} = [];
800 750
801 for (@$children) { 751 for (@$children) {
802 delete $_->{parent}; 752 delete $_->{parent};
803 $_->hide; 753 $_->hide;
… …
823} 773}
824 774
825sub _draw { 775sub _draw {
826 my ($self) = @_; 776 my ($self) = @_;
827 777
828 $_->draw for @{$self->{children}}; 778 $_->draw for $self->visible_children;
829} 779}
830 780
831############################################################################# 781#############################################################################
832 782
833package CFPlus::UI::Bin; 783package CFPlus::UI::Bin;
… …
843} 793}
844 794
845sub add { 795sub add {
846 my ($self, $child) = @_; 796 my ($self, $child) = @_;
847 797
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 798 $self->clear;
849 $self->SUPER::add ($child); 799 $self->SUPER::add ($child);
850} 800}
851 801
852sub remove { 802sub remove {
853 my ($self, $widget) = @_; 803 my ($self, $widget) = @_;
… …
963sub size_request { 913sub size_request {
964 my ($self) = @_; 914 my ($self) = @_;
965 915
966 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 916 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967 917
968 $w = 10 if $self->{scroll_x}; 918 $w = 1 if $self->{scroll_x};
969 $h = 10 if $self->{scroll_y}; 919 $h = 1 if $self->{scroll_y};
970 920
971 ($w, $h) 921 ($w, $h)
972} 922}
973 923
974sub invoke_size_allocate { 924sub invoke_size_allocate {
… …
998 $self->emit (changed => $x, $y); 948 $self->emit (changed => $x, $y);
999 $self->update; 949 $self->update;
1000 } 950 }
1001} 951}
1002 952
953sub set_center {
954 my ($self, $x, $y) = @_;
955
956 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
957}
958
959sub make_visible {
960 my ($self, $x, $y, $border) = @_;
961
962 if ( $x < $self->{view_x} + $self->{w} * $border
963 || $x > $self->{view_x} + $self->{w} * (1 - $border)
964 || $y < $self->{view_y} + $self->{h} * $border
965 || $y > $self->{view_y} + $self->{h} * (1 - $border)
966 ) {
967 $self->set_center ($x, $y);
968 }
969}
970
1003# hmm, this does not work for topleft of $self... but we should not ask for that 971# hmm, this does not work for topleft of $self... but we should not ask for that
1004sub coord2local { 972sub coord2local {
1005 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
1006 974
1007 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 975 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
… …
1020 my ($self, $x, $y) = @_; 988 my ($self, $x, $y) = @_;
1021 989
1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 990 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 991 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1024 ) { 992 ) {
1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 993 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1026 } else { 994 } else {
1027 $self->CFPlus::UI::Base::find_widget ($x, $y) 995 $self->CFPlus::UI::Base::find_widget ($x, $y)
1028 } 996 }
1029} 997}
1030 998
… …
1051 my $child = delete $arg{child}; 1019 my $child = delete $arg{child};
1052 1020
1053 my $self; 1021 my $self;
1054 1022
1055 my $hslider = new CFPlus::UI::Slider 1023 my $hslider = new CFPlus::UI::Slider
1024 c_col => 0,
1025 c_row => 1,
1056 vertical => 0, 1026 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix 1027 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub { 1028 on_changed => sub {
1059 $self->{hpos} = $_[1]; 1029 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1030 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 }, 1031 },
1062 ; 1032 ;
1063 1033
1064 my $vslider = new CFPlus::UI::Slider 1034 my $vslider = new CFPlus::UI::Slider
1035 c_col => 1,
1036 c_row => 0,
1065 vertical => 1, 1037 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix 1038 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub { 1039 on_changed => sub {
1068 $self->{vpos} = $_[1]; 1040 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1041 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1080 row_expand => [1, 0], 1052 row_expand => [1, 0],
1081 %arg, 1053 %arg,
1082 ); 1054 );
1083 1055
1084 $self->{vp} = new CFPlus::UI::ViewPort 1056 $self->{vp} = new CFPlus::UI::ViewPort
1057 c_col => 0,
1058 c_row => 0,
1085 expand => 1, 1059 expand => 1,
1086 scroll_x => $self->{scroll_x}, 1060 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y}, 1061 scroll_y => $self->{scroll_y},
1088 on_changed => sub { 1062 on_changed => sub {
1089 my ($vp, $x, $y) = @_; 1063 my ($vp, $x, $y) = @_;
… …
1091 $vp->{parent}{hslider}->set_value ($x); 1065 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y); 1066 $vp->{parent}{vslider}->set_value ($y);
1093 1067
1094 0 1068 0
1095 }, 1069 },
1070 on_size_allocate => sub {
1071 my ($vp, $w, $h) = @_;
1072 $vp->{parent}->update_slider;
1073 0
1074 },
1096 ; 1075 ;
1097 1076
1098 $self->SUPER::add (0, 0, $self->{vp}); 1077 $self->SUPER::add ($self->{vp});
1099 1078
1100 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
1101 1080
1102 $self 1081 $self
1103} 1082}
1104
1105#TODO# update range on size_allocate depending on child
1106 1083
1107sub add { 1084sub add {
1108 my ($self, $widget) = @_; 1085 my ($self, $widget) = @_;
1109 1086
1110 $self->{vp}->add ($self->{child} = $widget); 1087 $self->{vp}->add ($self->{child} = $widget);
1111} 1088}
1112 1089
1090sub set_offset { shift->{vp}->set_offset (@_) }
1091sub set_center { shift->{vp}->set_center (@_) }
1092sub make_visible { shift->{vp}->make_visible (@_) }
1093
1113sub update_slider { 1094sub update_slider {
1114 my ($self) = @_; 1095 my ($self) = @_;
1115 1096
1116 my $child = ($self->{vp} or return)->child; 1097 my $child = ($self->{vp} or return)->child;
1117 1098
1099 if ($self->{scroll_x}) {
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1100 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1101 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120 1102
1121 my $visible = $w1 > $w2; 1103 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) { 1104 if ($visible != $self->{hslider_visible}) {
1105 $self->{hslider_visible} = $visible;
1123 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1106 $visible ? $self->SUPER::add ($self->{hslider})
1124 : $self->{hslider}->hide; 1107 : $self->SUPER::remove ($self->{hslider});
1108 }
1125 } 1109 }
1126 1110
1111 if ($self->{scroll_y}) {
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1112 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1113 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129 1114
1130 my $visible = $h1 > $h2; 1115 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) { 1116 if ($visible != $self->{vslider_visible}) {
1117 $self->{vslider_visible} = $visible;
1132 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1118 $visible ? $self->SUPER::add ($self->{vslider})
1133 : $self->{vslider}->hide; 1119 : $self->SUPER::remove ($self->{vslider});
1120 }
1121 }
1122}
1123
1124sub start_dragging {
1125 my ($self, $ev) = @_;
1126
1127 $self->grab_focus;
1128
1129 my $ox = $self->{vp}{view_x};
1130 my $oy = $self->{vp}{view_y};
1131
1132 $self->{motion} = sub {
1133 my ($ev, $x, $y) = @_;
1134
1135 $ox -= $ev->{xrel};
1136 $oy -= $ev->{yrel};
1137
1138 $self->{vp}->set_offset ($ox, $oy);
1134 } 1139 };
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142} 1140}
1143 1141
1144sub invoke_mouse_wheel { 1142sub invoke_mouse_wheel {
1145 my ($self, $ev) = @_; 1143 my ($self, $ev) = @_;
1146 1144
1147 return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149 $self->{vslider}->emit (mouse_wheel => $ev); 1145 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1146 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1150 1147
1151 1 1148 1
1152} 1149}
1153 1150
1154sub invoke_button_down { 1151sub invoke_button_down {
1155 my ($self, $ev, $x, $y) = @_; 1152 my ($self, $ev, $x, $y) = @_;
1156 1153
1157 if ($ev->{button} == 2) { 1154 if ($ev->{button} == 2) {
1158 $self->grab_focus; 1155 $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; 1156 return 1;
1171 } 1157 }
1172 1158
1173 0 1159 0
1174} 1160}
… …
1225 my ($w, $h) = @$self{qw(w h)}; 1211 my ($w, $h) = @$self{qw(w h)};
1226 1212
1227 glEnable GL_BLEND; 1213 glEnable GL_BLEND;
1228 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1214 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1229 glColor_premultiply @{ $self->{bg} }; 1215 glColor_premultiply @{ $self->{bg} };
1230
1231 glBegin GL_QUADS;
1232 glVertex 0 , 0;
1233 glVertex 0 , $h;
1234 glVertex $w, $h; 1216 glRect 0, 0, $w, $h;
1235 glVertex $w, 0;
1236 glEnd;
1237
1238 glDisable GL_BLEND; 1217 glDisable GL_BLEND;
1239 } 1218 }
1240 1219
1241 $self->SUPER::_draw; 1220 $self->SUPER::_draw;
1242} 1221}
… …
1355 1334
1356my @border = 1335my @border =
1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1336 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); 1337 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1359 1338
1339my @icon =
1340 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1341 qw(x1_move.png x1_resize.png);
1342
1360sub new { 1343sub new {
1361 my ($class, %arg) = @_; 1344 my ($class, %arg) = @_;
1362 1345
1363 my $self = $class->SUPER::new ( 1346 my $self = $class->SUPER::new (
1364 bg => [1, 1, 1, 1], 1347 bg => [1, 1, 1, 1],
… …
1532 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1533 1516
1534 my $border = $self->border; 1517 my $border = $self->border;
1535 1518
1536 glColor @{ $self->{border_bg} }; 1519 glColor @{ $self->{border_bg} };
1537 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1520 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1538 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1521 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1539 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1522 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1540 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1523 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1524
1525 # move
1526 my $w2 = ($w - $border) * .5;
1527 my $h2 = ($h - $border) * .5;
1528 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1529 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1530 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1531
1532 # resize
1533 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1534 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1535 unless $self->{has_close_button};
1536 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1537 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1541 1538
1542 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1539 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1543 glColor @{ $self->{bg} }; 1540 glColor @{ $self->{bg} };
1544 1541
1545 # TODO: repeat texture not scale 1542 # TODO: repeat texture not scale
… …
1566 1563
1567############################################################################# 1564#############################################################################
1568 1565
1569package CFPlus::UI::Table; 1566package CFPlus::UI::Table;
1570 1567
1571our @ISA = CFPlus::UI::Base::; 1568our @ISA = CFPlus::UI::Container::;
1572 1569
1573use List::Util qw(max sum); 1570use List::Util qw(max sum);
1574 1571
1575use CFPlus::OpenGL; 1572use CFPlus::OpenGL;
1576 1573
1577sub new { 1574sub new {
1578 my $class = shift; 1575 my $class = shift;
1579 1576
1580 $class->SUPER::new ( 1577 $class->SUPER::new (
1581 children => [],
1582 col_expand => [], 1578 col_expand => [],
1583 row_expand => [], 1579 row_expand => [],
1584 @_, 1580 @_,
1585 ) 1581 )
1586} 1582}
1587 1583
1588sub children {
1589 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1590}
1591
1592# TODO: store row/col info in child widget and use standard add/del
1593sub add { 1584sub add {
1585 my ($self, @widgets) = @_;
1586
1587 for my $child (@widgets) {
1588 $child->{c_rowspan} ||= 1;
1589 $child->{c_colspan} ||= 1;
1590 }
1591
1592 $self->SUPER::add (@widgets);
1593}
1594
1595sub add_at {
1594 my ($self) = shift; 1596 my $self = shift;
1597
1598 my @widgets;
1595 1599
1596 while (@_) { 1600 while (@_) {
1597 my ($x, $y, $child) = splice @_, 0, 3, (); 1601 my ($col, $row, $child) = splice @_, 0, 3, ();
1598 $child->set_parent ($self);
1599 $self->{children}[$y][$x] = $child;
1600 }
1601 1602
1602 $self->{force_realloc} = 1; 1603 $child->{c_row} = $row;
1603 $self->{force_size_alloc} = 1; 1604 $child->{c_col} = $col;
1604 $self->realloc;
1605}
1606 1605
1607sub remove { 1606 push @widgets, $child;
1607 }
1608
1609 $self->add (@widgets);
1610}
1611
1612sub get_wh {
1608 my ($self, $child) = @_; 1613 my ($self) = @_;
1609 1614
1610 for (@{ $self->{children} }) { 1615 my (@w, @h);
1611 for (@{ $_ || [] }) { 1616
1612 $_ = undef if $_ == $child; 1617 my @children = $self->children;
1618
1619 # first pass, columns
1620 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1621 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1622
1623 my $sw = sum @w[$c .. $c + $cs - 1];
1624
1625 if ($w > $sw) {
1626 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1613 } 1627 }
1614 } 1628 }
1615}
1616 1629
1617# TODO: move to container class maybe? send children a signal on removal? 1630 # second pass, rows
1618sub clear { 1631 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_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
1632sub 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)}; 1632 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1645 1633
1646 $w[$x] = max $w[$x], $w; 1634 my $sh = sum @h[$r .. $r + $rs - 1];
1647 $h[$y] = max $h[$y], $h; 1635
1636 if ($h > $sh) {
1637 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1648 } 1638 }
1649 } 1639 }
1650 1640
1651 (\@w, \@h) 1641 (\@w, \@h)
1652} 1642}
… …
1668 my ($ws, $hs) = $self->get_wh; 1658 my ($ws, $hs) = $self->get_wh;
1669 1659
1670 my $req_w = (sum @$ws) || 1; 1660 my $req_w = (sum @$ws) || 1;
1671 my $req_h = (sum @$hs) || 1; 1661 my $req_h = (sum @$hs) || 1;
1672 1662
1673 # TODO: nicer code 1663 # now linearly scale the rows/columns to the allocated size
1674 my @col_expand = @{$self->{col_expand}}; 1664 my @col_expand = @{$self->{col_expand}};
1675 @col_expand = (1) x @$ws unless @col_expand; 1665 @col_expand = (1) x @$ws unless @col_expand;
1676 my $col_expand = (sum @col_expand) || 1; 1666 my $col_expand = (sum @col_expand) || 1;
1677 1667
1678 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1668 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1685 1675
1686 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1676 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1687 1677
1688 CFPlus::UI::harmonize $hs; 1678 CFPlus::UI::harmonize $hs;
1689 1679
1690 my $y; 1680 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1681 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1691 1682
1692 for my $r (0 .. $#{$self->{children}}) { 1683 for my $widget ($self->children) {
1693 my $row = $self->{children}[$r] 1684 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1694 or next;
1695 1685
1696 my $x = 0; 1686 $widget->configure (
1697 my $row_h = $hs->[$r]; 1687 $x[$c], $y[$r],
1688 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1698 1689 );
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 } 1690 }
1711 1691
1712 1 1692 1
1713} 1693}
1714 1694
1715sub 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
1731sub _draw {
1732 my ($self) = @_;
1733
1734 for (grep $_, @{$self->{children}}) {
1735 $_->draw for grep $_, @$_;
1736 }
1737}
1738
1739############################################################################# 1695#############################################################################
1740 1696
1741package CFPlus::UI::Fixed; 1697package CFPlus::UI::Fixed;
1742 1698
1743use List::Util qw(min max); 1699use List::Util qw(min max);
1744 1700
1745our @ISA = CFPlus::UI::Container::; 1701our @ISA = CFPlus::UI::Container::;
1746 1702
1747sub 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
1754sub _scale($$$) { 1703sub _scale($$$) {
1755 my ($mode, $val, $max) = @_; 1704 my ($rel, $val, $max) = @_;
1756 1705
1757 $mode eq "abs" ? $val 1706 $rel ? $val * $max : $val
1758 : $mode eq "rel" ? $val * $max
1759 : 0
1760} 1707}
1761 1708
1762sub size_request { 1709sub size_request {
1763 my ($self) = @_; 1710 my ($self) = @_;
1764 1711
1765 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1712 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1766 1713
1767 # determine overall size by querying abs widgets 1714 # determine overall size by querying abs widgets
1768 for my $child ($self->visible_children) { 1715 for my $child ($self->visible_children) {
1769 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1716 unless ($child->{c_rel}) {
1717 my $x = $child->{c_x};
1718 my $y = $child->{c_y};
1770 1719
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; 1720 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1776 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1721 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1777 } 1722 }
1778 } 1723 }
1779 1724
1780 my $W = $x2 - $x1; 1725 my $W = $x2 - $x1;
1781 my $H = $y2 - $y1; 1726 my $H = $y2 - $y1;
1782 1727
1783 # now layout remaining widgets 1728 # now layout remaining widgets
1784 for my $child ($self->visible_children) { 1729 for my $child ($self->visible_children) {
1785 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1730 if ($child->{c_rel}) {
1731 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1732 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1786 1733
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; 1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1794 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1795 } 1736 }
1796 } 1737 }
1797 1738
1798 my $W = $x2 - $x1; 1739 my $W = $x2 - $x1;
1799 my $H = $y2 - $y1; 1740 my $H = $y2 - $y1;
… …
1803 1744
1804sub invoke_size_allocate { 1745sub invoke_size_allocate {
1805 my ($self, $W, $H) = @_; 1746 my ($self, $W, $H) = @_;
1806 1747
1807 for my $child ($self->visible_children) { 1748 for my $child ($self->visible_children) {
1808 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1749 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1750 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1809 1751
1810 $x = _scale $pos, $x, $W; 1752 $x += $child->{c_halign} * $child->{req_w};
1811 $y = _scale $pos, $x, $H; 1753 $y += $child->{c_valign} * $child->{req_h};
1812 $w = _scale $size, $w, $child->{req_w};
1813 $h = _scale $size, $h, $child->{req_h};
1814 1754
1815 $child->configure ($x, $y, $w, $h); 1755 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1816 } 1756 }
1817 1757
1818 1 1758 1
1819} 1759}
1820 1760
… …
1824 1764
1825our @ISA = CFPlus::UI::Container::; 1765our @ISA = CFPlus::UI::Container::;
1826 1766
1827sub size_request { 1767sub size_request {
1828 my ($self) = @_; 1768 my ($self) = @_;
1769
1770 my @children = $self->visible_children;
1829 1771
1830 $self->{vertical} 1772 $self->{vertical}
1831 ? ( 1773 ? (
1832 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::max map $_->{req_w}, @children),
1833 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::sum map $_->{req_h}, @children),
1834 ) 1776 )
1835 : ( 1777 : (
1836 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1778 (List::Util::sum map $_->{req_w}, @children),
1837 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1779 (List::Util::max map $_->{req_h}, @children),
1838 ) 1780 )
1839} 1781}
1840 1782
1841sub invoke_size_allocate { 1783sub invoke_size_allocate {
1842 my ($self, $w, $h) = @_; 1784 my ($self, $w, $h) = @_;
… …
1966 1908
1967 delete $self->{ox}; 1909 delete $self->{ox};
1968 $self->SUPER::realloc; 1910 $self->SUPER::realloc;
1969} 1911}
1970 1912
1913sub clear {
1914 my ($self) = @_;
1915
1916 $self->set_text ("");
1917}
1918
1971sub set_text { 1919sub set_text {
1972 my ($self, $text) = @_; 1920 my ($self, $text) = @_;
1973 1921
1974 return if $self->{text} eq "T$text"; 1922 return if $self->{text} eq "T$text";
1975 $self->{text} = "T$text"; 1923 $self->{text} = "T$text";
… …
2081 : ($self->{w} - $size->[0]) * 0.5); 2029 : ($self->{w} - $size->[0]) * 0.5);
2082 2030
2083 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2031 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2084 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2032 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2085 : ($self->{h} - $size->[1]) * 0.5); 2033 : ($self->{h} - $size->[1]) * 0.5);
2034
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2086 }; 2036 };
2087 2037
2088 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2038# unless ($self->{list}) {
2089 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2039# $self->{list} = CFPlus::OpenGL::glGenList;
2090 2040# CFPlus::OpenGL::glNewList $self->{list};
2091 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2041# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2042# CFPlus::OpenGL::glEndList;
2043# }
2044#
2045# CFPlus::OpenGL::glCallList $self->{list};
2046
2047 $self->{layout}->draw;
2092} 2048}
2049
2050#sub destroy {
2051# my ($self) = @_;
2052#
2053# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2054#
2055# $self->SUPER::destroy;
2056#}
2093 2057
2094############################################################################# 2058#############################################################################
2095 2059
2096package CFPlus::UI::EntryBase; 2060package CFPlus::UI::EntryBase;
2097 2061
… …
2103 my $class = shift; 2067 my $class = shift;
2104 2068
2105 $class->SUPER::new ( 2069 $class->SUPER::new (
2106 fg => [1, 1, 1], 2070 fg => [1, 1, 1],
2107 bg => [0, 0, 0, 0.2], 2071 bg => [0, 0, 0, 0.2],
2072 outline => [0.6, 0.3, 0.1],
2108 active_bg => [1, 1, 1, 0.5], 2073 active_bg => [0, 0, 1, .2],
2109 active_fg => [0, 0, 0], 2074 active_fg => [1, 1, 1],
2075 active_outline => [1, 1, 0],
2110 can_hover => 1, 2076 can_hover => 1,
2111 can_focus => 1, 2077 can_focus => 1,
2112 valign => 0, 2078 valign => 0,
2113 can_events => 1, 2079 can_events => 1,
2114 ellipsise => 0, 2080 ellipsise => 0,
… …
2254 glColor_premultiply @{$self->{bg}}; 2220 glColor_premultiply @{$self->{bg}};
2255 } 2221 }
2256 2222
2257 glEnable GL_BLEND; 2223 glEnable GL_BLEND;
2258 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2224 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2259 glBegin GL_QUADS;
2260 glVertex 0 , 0;
2261 glVertex 0 , $self->{h};
2262 glVertex $self->{w}, $self->{h}; 2225 glRect 0, 0, $self->{w}, $self->{h};
2263 glVertex $self->{w}, 0;
2264 glEnd;
2265 glDisable GL_BLEND; 2226 glDisable GL_BLEND;
2266 2227
2267 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
2268 2229
2269 #TODO: force update every cursor change :( 2230 #TODO: force update every cursor change :(
… …
2271 2232
2272 unless (exists $self->{cur_h}) { 2233 unless (exists $self->{cur_h}) {
2273 my $text = substr $self->{text}, 0, $self->{cursor}; 2234 my $text = substr $self->{text}, 0, $self->{cursor};
2274 utf8::encode $text; 2235 utf8::encode $text;
2275 2236
2276 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2237 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2277 } 2238 }
2278 2239
2240 glColor_premultiply @{$self->{active_fg}};
2279 glBegin GL_LINES; 2241 glBegin GL_LINES;
2280 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2242 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2281 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2243 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2244 glEnd;
2245
2246 glLineWidth 3;
2247 glColor @{$self->{active_outline}};
2248 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
2249 glLineWidth 1;
2250
2251 } else {
2252 glColor @{$self->{outline}};
2253 glTranslate .375, .375;
2254 glBegin GL_LINE_STRIP;
2255 glVertex 0, $self->{h} * .5;
2256 glVertex 0, $self->{h} - 3;
2257 glVertex $self->{w} - 1, $self->{h} - 3;
2258 glVertex $self->{w} - 1, $self->{h} * .5;
2282 glEnd; 2259 glEnd;
2283 } 2260 }
2284} 2261}
2285 2262
2286############################################################################# 2263#############################################################################
… …
2373 1 2350 1
2374} 2351}
2375 2352
2376############################################################################# 2353#############################################################################
2377 2354
2378package CFPlus::UI::Button; 2355package CFPlus::UI::ButtonBin;
2379 2356
2380our @ISA = CFPlus::UI::Label::; 2357our @ISA = CFPlus::UI::Bin::;
2381 2358
2382use CFPlus::OpenGL; 2359use CFPlus::OpenGL;
2383 2360
2384my @tex = 2361my @tex =
2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2362 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2386 qw(b1_button_active.png); 2363 qw(b1_button_inactive.png b1_button_active.png);
2387 2364
2388sub new { 2365sub new {
2389 my $class = shift; 2366 my $class = shift;
2390 2367
2391 $class->SUPER::new ( 2368 $class->SUPER::new (
2392 padding_x => 4,
2393 padding_y => 4,
2394 fg => [1, 1, 1],
2395 active_fg => [0, 0, 1],
2396 can_hover => 1, 2369 can_hover => 1,
2397 align => 0, 2370 align => 0,
2398 valign => 0, 2371 valign => 0,
2399 can_events => 1, 2372 can_events => 1,
2400 @_ 2373 @_
… …
2412} 2385}
2413 2386
2414sub _draw { 2387sub _draw {
2415 my ($self) = @_; 2388 my ($self) = @_;
2416 2389
2417 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2418
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});
2396
2397 glDisable GL_TEXTURE_2D;
2398
2399 $self->SUPER::_draw;
2400}
2401
2402#############################################################################
2403
2404package CFPlus::UI::Button;
2405
2406our @ISA = CFPlus::UI::Label::;
2407
2408use CFPlus::OpenGL;
2409
2410my @tex =
2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2412 qw(b1_button_inactive.png b1_button_active.png);
2413
2414sub new {
2415 my $class = shift;
2416
2417 $class->SUPER::new (
2418 padding_x => 4,
2419 padding_y => 4,
2420 fg => [1.0, 1.0, 1.0],
2421 active_fg => [0.8, 0.8, 0.8],
2422 can_hover => 1,
2423 align => 0,
2424 valign => 0,
2425 can_events => 1,
2426 @_
2427 )
2428}
2429
2430sub invoke_button_up {
2431 my ($self, $ev, $x, $y) = @_;
2432
2433 $self->emit ("activate")
2434 if $x >= 0 && $x < $self->{w}
2435 && $y >= 0 && $y < $self->{h};
2436
2437 1
2438}
2439
2440sub _draw {
2441 my ($self) = @_;
2442
2443 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2444
2445 glEnable GL_TEXTURE_2D;
2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2447 glColor 0, 0, 0, 1;
2448
2449 my $tex = $tex[$GRAB == $self];
2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2424 2451
2425 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
2426 2453
2427 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
2428} 2455}
… …
2515sub new { 2542sub new {
2516 my $class = shift; 2543 my $class = shift;
2517 2544
2518 my $self = $class->SUPER::new ( 2545 my $self = $class->SUPER::new (
2519 can_events => 0, 2546 can_events => 0,
2547 scale => 1,
2520 @_, 2548 @_,
2521 ); 2549 );
2522 2550
2523 $self->{path} || $self->{tex} 2551 $self->{path} || $self->{tex}
2524 or Carp::croak "'path' or 'tex' attributes required"; 2552 or Carp::croak "'path' or 'tex' attributes required";
… …
2549} 2577}
2550 2578
2551sub size_request { 2579sub size_request {
2552 my ($self) = @_; 2580 my ($self) = @_;
2553 2581
2554 ($self->{tex}{w}, $self->{tex}{h}) 2582 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2555} 2583}
2556 2584
2557sub _draw { 2585sub _draw {
2558 my ($self) = @_; 2586 my ($self) = @_;
2559 2587
… …
2569 } 2597 }
2570 2598
2571 glEnable GL_TEXTURE_2D; 2599 glEnable GL_TEXTURE_2D;
2572 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2600 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2573 2601
2574 $tex->draw_quad (0, 0, $w, $h); 2602 $tex->draw_quad_alpha (0, 0, $w, $h);
2575 2603
2576 glDisable GL_TEXTURE_2D; 2604 glDisable GL_TEXTURE_2D;
2577} 2605}
2578 2606
2579############################################################################# 2607#############################################################################
… …
2598 align => 0, 2626 align => 0,
2599 valign => 0, 2627 valign => 0,
2600 can_events => 1, 2628 can_events => 1,
2601 @_ 2629 @_
2602 ); 2630 );
2631}
2632
2633sub invoke_button_down {
2634 my ($self, $ev, $x, $y) = @_;
2635
2636 1
2603} 2637}
2604 2638
2605sub invoke_button_up { 2639sub invoke_button_up {
2606 my ($self, $ev, $x, $y) = @_; 2640 my ($self, $ev, $x, $y) = @_;
2607 2641
… …
2747 glDisable GL_TEXTURE_2D; 2781 glDisable GL_TEXTURE_2D;
2748} 2782}
2749 2783
2750############################################################################# 2784#############################################################################
2751 2785
2786package CFPlus::UI::Progress;
2787
2788our @ISA = CFPlus::UI::Label::;
2789
2790use CFPlus::OpenGL;
2791
2792sub new {
2793 my ($class, %arg) = @_;
2794
2795 my $self = $class->SUPER::new (
2796 fg => [1, 1, 1],
2797 bg => [0, 0, 1, 0.2],
2798 bar => [0.7, 0.5, 0.1, 0.8],
2799 outline => [0.4, 0.3, 0],
2800 fontsize => 0.9,
2801 valign => 0,
2802 align => 0,
2803 can_events => 1,
2804 ellipsise => 1,
2805 %arg,
2806 text => "-",
2807 value => -1,
2808 );
2809
2810 $self->set_value ($arg{value}) if exists $arg{value};
2811
2812 $self
2813}
2814
2815sub set_value {
2816 my ($self, $value) = @_;
2817
2818 if ($self->{value} != $value) {
2819 $self->{value} = $value;
2820 $self->set_text (sprintf "%d%%", $value * 100);
2821 $self->update;
2822 }
2823}
2824
2825sub _draw {
2826 my ($self) = @_;
2827
2828 glEnable GL_BLEND;
2829 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2830
2831 if ($self->{value} >= 0) {
2832 my $s = 3 + ($self->{w} - 6) * $self->{value};
2833
2834 glColor_premultiply @{$self->{bar}};
2835 glRect 2, 2, $s, $self->{h} - 2;
2836 glColor_premultiply @{$self->{bg}};
2837 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2838 }
2839
2840 glColor_premultiply @{$self->{outline}};
2841 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2842
2843 glDisable GL_BLEND;
2844
2845 {
2846 local $self->{bg}; # do not draw background
2847 $self->SUPER::_draw;
2848 }
2849}
2850
2851#############################################################################
2852
2853package CFPlus::UI::ExperienceProgress;
2854
2855our @ISA = CFPlus::UI::Progress::;
2856
2857sub new {
2858 my ($class, %arg) = @_;
2859
2860 my $self = $class->SUPER::new (
2861 %arg
2862 );
2863
2864 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2865 if $::CONN;
2866
2867 $self
2868}
2869
2870sub DESTROY {
2871 my ($self) = @_;
2872
2873 delete $::CONN->{on_exp_update}{$self+0}
2874 if $::CONN;
2875
2876 $self->SUPER::DESTROY;
2877}
2878
2879sub set_value {
2880 my ($self, $lvl, $exp) = @_;
2881
2882 my $v = 0;
2883
2884 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2885 my $l0 = $table->[$lvl - 1];
2886 my $l1 = $table->[$lvl];
2887
2888 $v = ($exp - $l0) / ($l1 - $l0);
2889 }
2890
2891 $self->SUPER::set_value ($v);
2892}
2893
2894#############################################################################
2895
2752package CFPlus::UI::Gauge; 2896package CFPlus::UI::Gauge;
2753 2897
2754our @ISA = CFPlus::UI::VBox::; 2898our @ISA = CFPlus::UI::VBox::;
2755 2899
2756sub new { 2900sub new {
… …
2881 3025
2882 $self->SUPER::invoke_button_down ($ev, $x, $y); 3026 $self->SUPER::invoke_button_down ($ev, $x, $y);
2883 3027
2884 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3028 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2885 3029
2886 $self->invoke_mouse_motion ($ev, $x, $y) 3030 $self->invoke_mouse_motion ($ev, $x, $y);
3031
3032 1
2887} 3033}
2888 3034
2889sub invoke_mouse_motion { 3035sub invoke_mouse_motion {
2890 my ($self, $ev, $x, $y) = @_; 3036 my ($self, $ev, $x, $y) = @_;
2891 3037
… …
2911 3057
2912 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3058 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2913 3059
2914 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3060 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2915 3061
2916 ! ! $delta 3062 1
2917} 3063}
2918 3064
2919sub update { 3065sub update {
2920 my ($self) = @_; 3066 my ($self) = @_;
2921 3067
… …
3052} 3198}
3053 3199
3054sub size_request { 3200sub size_request {
3055 my ($self) = @_; 3201 my ($self) = @_;
3056 3202
3057 my ($empty, $slider) = @{ $self->{children} }; 3203 my ($empty, $slider) = $self->visible_children;
3058 3204
3059 local $self->{children} = [$empty, $slider]; 3205 local $self->{children} = [$empty, $slider];
3060 $self->SUPER::size_request 3206 $self->SUPER::size_request
3061} 3207}
3062 3208
… …
3251 3397
3252 if ($y0 < $y + $h && $y < $y1) { 3398 if ($y0 < $y + $h && $y < $y1) {
3253 my $layout = $self->get_layout ($para); 3399 my $layout = $self->get_layout ($para);
3254 3400
3255 $layout->render ($para->{indent}, $y - $y0); 3401 $layout->render ($para->{indent}, $y - $y0);
3402 $layout->draw;
3256 3403
3257 if (my @w = @{ $para->{widget} }) { 3404 if (my @w = @{ $para->{widget} }) {
3258 my @s = $layout->get_shapes; 3405 my @s = $layout->get_shapes;
3259 3406
3260 for (@w) { 3407 for (@w) {
… …
3451 glTranslate 0.375, 0.375; 3598 glTranslate 0.375, 0.375;
3452 3599
3453 my ($w, $h) = @$self{qw(w h)}; 3600 my ($w, $h) = @$self{qw(w h)};
3454 3601
3455 glColor 1, 0.8, 0.4; 3602 glColor 1, 0.8, 0.4;
3456 glBegin GL_QUADS; 3603 glRect 0, 0, $w, $h;
3457 glVertex 0 , 0;
3458 glVertex 0 , $h;
3459 glVertex $w, $h;
3460 glVertex $w, 0;
3461 glEnd;
3462 3604
3463 glColor 0, 0, 0; 3605 glColor 0, 0, 0;
3464 glBegin GL_LINE_LOOP; 3606 glRect_lineloop 0, 0, $w, $h;
3465 glVertex 0 , 0;
3466 glVertex 0 , $h;
3467 glVertex $w, $h;
3468 glVertex $w, 0;
3469 glEnd;
3470 3607
3471 glTranslate 2 - 0.375, 2 - 0.375; 3608 glTranslate 2 - 0.375, 2 - 0.375;
3472 3609
3473 $self->SUPER::_draw; 3610 $self->SUPER::_draw;
3474} 3611}
… …
3493 ); 3630 );
3494 3631
3495 if ($self->{anim} && $self->{animspeed}) { 3632 if ($self->{anim} && $self->{animspeed}) {
3496 CFPlus::weaken (my $widget = $self); 3633 CFPlus::weaken (my $widget = $self);
3497 3634
3635 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3636 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3498 $self->{timer} = Event->timer ( 3637 $self->{timer} = Event->timer (
3499 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3500 hard => 1, 3638 parked => 1,
3501 interval => $self->{animspeed},
3502 cb => sub { 3639 cb => sub {
3503 return unless $::CONN; 3640 return unless $::CONN;
3504 3641
3642 my $w = $widget
3643 or return;
3644
3505 ++$widget->{frame}; 3645 ++$w->{frame};
3506 $self->update_face; 3646 $w->update_face;
3647
3648 # somehow, $widget can go away
3507 $self->update; 3649 $w->update;
3650 $w->update_timer;
3508 }, 3651 },
3509 ); 3652 );
3510 3653
3511 $self->update_face; 3654 $self->update_face;
3655 $self->update_timer;
3512 } 3656 }
3513 3657
3514 $self 3658 $self
3515} 3659}
3516 3660
3661sub update_timer {
3662 my ($self) = @_;
3663
3664 return unless $self->{timer};
3665
3666 if ($self->{visible}) {
3667 $self->{timer}->at (
3668 $self->{anim_start}
3669 + $self->{animspeed}
3670 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3671 );
3672 $self->{timer}->start;
3673 } else {
3674 $self->{timer}->stop;
3675 }
3676}
3677
3517sub update_face { 3678sub update_face {
3518 my ($self) = @_; 3679 my ($self) = @_;
3519 3680
3520 return unless $::CONN;
3521
3522 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3523 if ($anim && @$anim) {
3524 delete $self->{wait_face};
3525 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3526 }
3527 }
3528}
3529
3530sub size_request {
3531 my ($self) = @_;
3532
3533 if ($::CONN) { 3681 if ($::CONN) {
3534 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3682 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3535 if (my $tex = $::CONN->{texture}[$faceid]) { 3683 if ($anim && @$anim) {
3536 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3684 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3537 } else { 3685 delete $self->{face_change_cb};
3538 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3686
3539 $self->realloc; 3687 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3688 unless ($tex->{name} || $tex->{loading}) {
3689 $tex->upload (sub { $self->reconfigure });
3690 }
3540 }); 3691 }
3541 } 3692 }
3542 } 3693 }
3543 } 3694 }
3695}
3696
3697sub size_request {
3698 my ($self) = @_;
3699
3700 if ($::CONN) {
3701 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3702 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3703 if ($tex->{name}) {
3704 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3705 } elsif (!$tex->{loading}) {
3706 $tex->upload (sub { $self->reconfigure });
3707 }
3708 }
3709
3710 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3711 }
3712 }
3544 3713
3545 ($self->{size_w} || 8, $self->{size_h} || 8) 3714 ($self->{size_w} || 8, $self->{size_h} || 8)
3546} 3715}
3547 3716
3548sub update { 3717sub update {
… …
3551 return unless $self->{visible}; 3720 return unless $self->{visible};
3552 3721
3553 $self->SUPER::update; 3722 $self->SUPER::update;
3554} 3723}
3555 3724
3725sub invoke_visibility_change {
3726 my ($self) = @_;
3727
3728 $self->update_timer;
3729
3730 0
3731}
3732
3556sub _draw { 3733sub _draw {
3557 my ($self) = @_; 3734 my ($self) = @_;
3558 3735
3559 return unless $::CONN;
3560
3561 $self->SUPER::_draw; 3736 $self->SUPER::_draw;
3562 3737
3563 my $faceid = $::CONN->{faceid}[$self->{face}] 3738 if (my $tex = $self->{tex}) {
3564 or return;
3565
3566 my $tex = $::CONN->{texture}[$faceid];
3567
3568 if ($tex) {
3569 glEnable GL_TEXTURE_2D; 3739 glEnable GL_TEXTURE_2D;
3570 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3740 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3571 glColor 0, 0, 0, 1; 3741 glColor 0, 0, 0, 1;
3572 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3742 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3573 glDisable GL_TEXTURE_2D; 3743 glDisable GL_TEXTURE_2D;
… …
3575} 3745}
3576 3746
3577sub destroy { 3747sub destroy {
3578 my ($self) = @_; 3748 my ($self) = @_;
3579 3749
3580 $self->{timer}->cancel 3750 (delete $self->{timer})->cancel
3581 if $self->{timer}; 3751 if $self->{timer};
3582 3752
3583 $self->SUPER::destroy; 3753 $self->SUPER::destroy;
3584} 3754}
3585 3755
… …
3625 children => [ 3795 children => [
3626 (new CFPlus::UI::Label markup => $left, expand => 1), 3796 (new CFPlus::UI::Label markup => $left, expand => 1),
3627 (new CFPlus::UI::Label markup => $right, align => +1), 3797 (new CFPlus::UI::Label markup => $right, align => +1),
3628 ], 3798 ],
3629 ; 3799 ;
3630 3800
3631 } else { 3801 } else {
3632 $widget = new CFPlus::UI::Label 3802 $widget = new CFPlus::UI::Label
3633 can_hover => 1, 3803 can_hover => 1,
3634 can_events => 1, 3804 can_events => 1,
3635 markup => $widget, 3805 markup => $widget,
… …
3771 buttonbar => (new CFPlus::UI::Buttonbar), 3941 buttonbar => (new CFPlus::UI::Buttonbar),
3772 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3942 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3773 # filter => # will be put between multiplexer and $self 3943 # filter => # will be put between multiplexer and $self
3774 @_, 3944 @_,
3775 ); 3945 );
3776 3946
3777 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3947 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3778 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3948 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3779 3949
3950 {
3951 Scalar::Util::weaken (my $wself = $self);
3952
3953 $self->{multiplexer}->connect (c_add => sub {
3954 my ($mplex, $widgets) = @_;
3955
3956 for my $child (@$widgets) {
3957 Scalar::Util::weaken $child;
3958 $child->{c_tab_} ||= do {
3959 my $tab =
3960 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3961 ? $child->{c_tab}
3962 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3963
3964 $tab->connect (activate => sub {
3965 $wself->set_current_page ($child);
3966 });
3967
3968 $tab
3969 };
3970
3971 $self->{buttonbar}->add ($child->{c_tab_});
3972 }
3973 });
3974
3975 $self->{multiplexer}->connect (c_remove => sub {
3976 my ($mplex, $widgets) = @_;
3977
3978 for my $child (@$widgets) {
3979 $wself->{buttonbar}->remove ($child->{c_tab_});
3980 }
3981 });
3982 }
3983
3780 $self 3984 $self
3781} 3985}
3782 3986
3783sub add { 3987sub add {
3988 my ($self, @widgets) = @_;
3989
3990 $self->{multiplexer}->add (@widgets)
3991}
3992
3993sub remove {
3994 my ($self, @widgets) = @_;
3995
3996 $self->{multiplexer}->remove (@widgets)
3997}
3998
3999sub pages {
4000 my ($self) = @_;
4001 $self->{multiplexer}->children
4002}
4003
4004sub add_tab {
3784 my ($self, $title, $widget, $tooltip) = @_; 4005 my ($self, $title, $widget, $tooltip) = @_;
3785 4006
3786 CFPlus::weaken $self; 4007 $title = [$title, $tooltip] unless ref $title;
4008 $widget->{c_tab} = $title;
3787 4009
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); 4010 $self->add ($widget);
3795} 4011}
3796 4012
3797sub get_current_page { 4013sub get_current_page {
3798 my ($self) = @_; 4014 my ($self) = @_;
3799 4015
… …
4082} 4298}
4083 4299
4084sub update { 4300sub update {
4085 my ($self) = @_; 4301 my ($self) = @_;
4086 4302
4087 $::WANT_REFRESH++; 4303 $::WANT_REFRESH->start;
4088} 4304}
4089 4305
4090sub add { 4306sub add {
4091 my ($self, @children) = @_; 4307 my ($self, @children) = @_;
4092 4308
… …
4129 while ($self->{refresh_hook}) { 4345 while ($self->{refresh_hook}) {
4130 $_->() 4346 $_->()
4131 for values %{delete $self->{refresh_hook}}; 4347 for values %{delete $self->{refresh_hook}};
4132 } 4348 }
4133 4349
4134 if ($self->{realloc}) { 4350 while ($self->{realloc}) {
4135 my %queue; 4351 my %queue;
4136 my @queue; 4352 my @queue;
4137 my $widget; 4353 my $widget;
4138 4354
4139 outer: 4355 outer:
… …
4186 } 4402 }
4187 } 4403 }
4188 4404
4189 delete $self->{realloc}{$widget+0}; 4405 delete $self->{realloc}{$widget+0};
4190 } 4406 }
4191 }
4192 4407
4193 while (my $size_alloc = delete $self->{size_alloc}) { 4408 while (my $size_alloc = delete $self->{size_alloc}) {
4194 my @queue = sort { $b->{visible} <=> $a->{visible} } 4409 my @queue = sort { $a->{visible} <=> $b->{visible} }
4195 values %$size_alloc; 4410 values %$size_alloc;
4196 4411
4197 while () { 4412 while () {
4198 my $widget = pop @queue || last; 4413 my $widget = pop @queue || last;
4199 4414
4200 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4415 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4201 4416
4202 $w = 0 if $w < 0;
4203 $h = 0 if $h < 0;
4204
4205 $w = max $widget->{min_w}, $w; 4417 $w = max $widget->{min_w}, $w;
4206 $h = max $widget->{min_h}, $h; 4418 $h = max $widget->{min_h}, $h;
4207 4419
4208# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4420# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4209# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4421# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4210 4422
4211 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4423 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4212 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4424 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4213 4425
4214 $w = int $w + 0.5; 4426 $w = int $w + 0.5;
4215 $h = int $h + 0.5; 4427 $h = int $h + 0.5;
4216 4428
4217 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4429 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4218 $widget->{old_w} = $widget->{w}; 4430 $widget->{old_w} = $widget->{w};
4219 $widget->{old_h} = $widget->{h}; 4431 $widget->{old_h} = $widget->{h};
4220 4432
4221 $widget->{w} = $w; 4433 $widget->{w} = $w;
4222 $widget->{h} = $h; 4434 $widget->{h} = $h;
4223 4435
4224 $widget->emit (size_allocate => $w, $h); 4436 $widget->emit (size_allocate => $w, $h);
4437 }
4225 } 4438 }
4226 } 4439 }
4227 } 4440 }
4228 4441
4229 while ($self->{post_alloc_hook}) { 4442 while ($self->{post_alloc_hook}) {
4230 $_->() 4443 $_->()
4231 for values %{delete $self->{post_alloc_hook}}; 4444 for values %{delete $self->{post_alloc_hook}};
4232 } 4445 }
4233
4234 4446
4235 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4447 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4236 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4448 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4237 glClear GL_COLOR_BUFFER_BIT; 4449 glClear GL_COLOR_BUFFER_BIT;
4238 4450

Diff Legend

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