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.382 by root, Thu Jul 19 19:58:56 2007 UTC vs.
Revision 1.433 by root, Wed Aug 22 21:27:13 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}
… …
1584 1563
1585############################################################################# 1564#############################################################################
1586 1565
1587package CFPlus::UI::Table; 1566package CFPlus::UI::Table;
1588 1567
1589our @ISA = CFPlus::UI::Base::; 1568our @ISA = CFPlus::UI::Container::;
1590 1569
1591use List::Util qw(max sum); 1570use List::Util qw(max sum);
1592 1571
1593use CFPlus::OpenGL; 1572use CFPlus::OpenGL;
1594 1573
1595sub new { 1574sub new {
1596 my $class = shift; 1575 my $class = shift;
1597 1576
1598 $class->SUPER::new ( 1577 $class->SUPER::new (
1599 children => [],
1600 col_expand => [], 1578 col_expand => [],
1601 row_expand => [], 1579 row_expand => [],
1602 @_, 1580 @_,
1603 ) 1581 )
1604} 1582}
1605 1583
1606sub children {
1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1608}
1609
1610# TODO: store row/col info in child widget and use standard add/del
1611sub 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 {
1612 my ($self) = shift; 1596 my $self = shift;
1597
1598 my @widgets;
1613 1599
1614 while (@_) { 1600 while (@_) {
1615 my ($x, $y, $child) = splice @_, 0, 3, (); 1601 my ($col, $row, $child) = splice @_, 0, 3, ();
1616 $child->set_parent ($self);
1617 $self->{children}[$y][$x] = $child;
1618 }
1619 1602
1620 $self->{force_realloc} = 1; 1603 $child->{c_row} = $row;
1621 $self->{force_size_alloc} = 1; 1604 $child->{c_col} = $col;
1622 $self->realloc;
1623}
1624 1605
1625sub remove { 1606 push @widgets, $child;
1607 }
1608
1609 $self->add (@widgets);
1610}
1611
1612sub get_wh {
1626 my ($self, $child) = @_; 1613 my ($self) = @_;
1627 1614
1628 for (@{ $self->{children} }) { 1615 my (@w, @h);
1629 for (@{ $_ || [] }) { 1616
1630 $_ = 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];
1631 } 1627 }
1632 } 1628 }
1633}
1634 1629
1635# TODO: move to container class maybe? send children a signal on removal? 1630 # second pass, rows
1636sub clear { 1631 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1637 my ($self) = @_;
1638
1639 my @children = $self->children;
1640 delete $self->{children};
1641
1642 for (@children) {
1643 delete $_->{parent};
1644 $_->hide;
1645 }
1646
1647 $self->realloc;
1648}
1649
1650sub get_wh {
1651 my ($self) = @_;
1652
1653 my (@w, @h);
1654
1655 for my $y (0 .. $#{$self->{children}}) {
1656 my $row = $self->{children}[$y]
1657 or next;
1658
1659 for my $x (0 .. $#$row) {
1660 my $widget = $row->[$x]
1661 or next;
1662 my ($w, $h) = @$widget{qw(req_w req_h)}; 1632 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1663 1633
1664 $w[$x] = max $w[$x], $w; 1634 my $sh = sum @h[$r .. $r + $rs - 1];
1665 $h[$y] = max $h[$y], $h; 1635
1636 if ($h > $sh) {
1637 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1666 } 1638 }
1667 } 1639 }
1668 1640
1669 (\@w, \@h) 1641 (\@w, \@h)
1670} 1642}
… …
1686 my ($ws, $hs) = $self->get_wh; 1658 my ($ws, $hs) = $self->get_wh;
1687 1659
1688 my $req_w = (sum @$ws) || 1; 1660 my $req_w = (sum @$ws) || 1;
1689 my $req_h = (sum @$hs) || 1; 1661 my $req_h = (sum @$hs) || 1;
1690 1662
1691 # TODO: nicer code 1663 # now linearly scale the rows/columns to the allocated size
1692 my @col_expand = @{$self->{col_expand}}; 1664 my @col_expand = @{$self->{col_expand}};
1693 @col_expand = (1) x @$ws unless @col_expand; 1665 @col_expand = (1) x @$ws unless @col_expand;
1694 my $col_expand = (sum @col_expand) || 1; 1666 my $col_expand = (sum @col_expand) || 1;
1695 1667
1696 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1668 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1703 1675
1704 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1676 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1705 1677
1706 CFPlus::UI::harmonize $hs; 1678 CFPlus::UI::harmonize $hs;
1707 1679
1708 my $y; 1680 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1681 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1709 1682
1710 for my $r (0 .. $#{$self->{children}}) { 1683 for my $widget ($self->children) {
1711 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)};
1712 or next;
1713 1685
1714 my $x = 0; 1686 $widget->configure (
1715 my $row_h = $hs->[$r]; 1687 $x[$c], $y[$r],
1688 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1716 1689 );
1717 for my $c (0 .. $#$row) {
1718 my $col_w = $ws->[$c];
1719
1720 if (my $widget = $row->[$c]) {
1721 $widget->configure ($x, $y, $col_w, $row_h);
1722 }
1723
1724 $x += $col_w;
1725 }
1726
1727 $y += $row_h;
1728 } 1690 }
1729 1691
1730 1 1692 1
1731} 1693}
1732 1694
1733sub find_widget {
1734 my ($self, $x, $y) = @_;
1735
1736 $x -= $self->{x};
1737 $y -= $self->{y};
1738
1739 my $res;
1740
1741 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1742 $res = $_->find_widget ($x, $y)
1743 and return $res;
1744 }
1745
1746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1747}
1748
1749sub _draw {
1750 my ($self) = @_;
1751
1752 for (grep $_, @{$self->{children}}) {
1753 $_->draw for grep $_, @$_;
1754 }
1755}
1756
1757############################################################################# 1695#############################################################################
1758 1696
1759package CFPlus::UI::Fixed; 1697package CFPlus::UI::Fixed;
1760 1698
1761use List::Util qw(min max); 1699use List::Util qw(min max);
1762 1700
1763our @ISA = CFPlus::UI::Container::; 1701our @ISA = CFPlus::UI::Container::;
1764 1702
1765sub add {
1766 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1767
1768 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1769 $self->SUPER::add ($child);
1770}
1771
1772sub _scale($$$) { 1703sub _scale($$$) {
1773 my ($mode, $val, $max) = @_; 1704 my ($rel, $val, $max) = @_;
1774 1705
1775 $mode eq "abs" ? $val 1706 $rel ? $val * $max : $val
1776 : $mode eq "rel" ? $val * $max
1777 : 0
1778} 1707}
1779 1708
1780sub size_request { 1709sub size_request {
1781 my ($self) = @_; 1710 my ($self) = @_;
1782 1711
1783 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1712 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1784 1713
1785 # determine overall size by querying abs widgets 1714 # determine overall size by querying abs widgets
1786 for my $child ($self->visible_children) { 1715 for my $child ($self->visible_children) {
1787 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};
1788 1719
1789 if ($pos eq "abs") {
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; 1720 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1794 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1721 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1795 } 1722 }
1796 } 1723 }
1797 1724
1798 my $W = $x2 - $x1; 1725 my $W = $x2 - $x1;
1799 my $H = $y2 - $y1; 1726 my $H = $y2 - $y1;
1800 1727
1801 # now layout remaining widgets 1728 # now layout remaining widgets
1802 for my $child ($self->visible_children) { 1729 for my $child ($self->visible_children) {
1803 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;
1804 1733
1805 if ($pos ne "abs") {
1806 $x = _scale $pos, $x, $W;
1807 $y = _scale $pos, $x, $H;
1808 $w = _scale $size, $w, $child->{req_w};
1809 $h = _scale $size, $h, $child->{req_h};
1810
1811 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1812 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1813 } 1736 }
1814 } 1737 }
1815 1738
1816 my $W = $x2 - $x1; 1739 my $W = $x2 - $x1;
1817 my $H = $y2 - $y1; 1740 my $H = $y2 - $y1;
… …
1821 1744
1822sub invoke_size_allocate { 1745sub invoke_size_allocate {
1823 my ($self, $W, $H) = @_; 1746 my ($self, $W, $H) = @_;
1824 1747
1825 for my $child ($self->visible_children) { 1748 for my $child ($self->visible_children) {
1826 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;
1827 1751
1828 $x = _scale $pos, $x, $W; 1752 $x += $child->{c_halign} * $child->{req_w};
1829 $y = _scale $pos, $x, $H; 1753 $y += $child->{c_valign} * $child->{req_h};
1830 $w = _scale $size, $w, $child->{req_w};
1831 $h = _scale $size, $h, $child->{req_h};
1832 1754
1833 $child->configure ($x, $y, $w, $h); 1755 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1834 } 1756 }
1835 1757
1836 1 1758 1
1837} 1759}
1838 1760
… …
1842 1764
1843our @ISA = CFPlus::UI::Container::; 1765our @ISA = CFPlus::UI::Container::;
1844 1766
1845sub size_request { 1767sub size_request {
1846 my ($self) = @_; 1768 my ($self) = @_;
1769
1770 my @children = $self->visible_children;
1847 1771
1848 $self->{vertical} 1772 $self->{vertical}
1849 ? ( 1773 ? (
1850 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::max map $_->{req_w}, @children),
1851 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::sum map $_->{req_h}, @children),
1852 ) 1776 )
1853 : ( 1777 : (
1854 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1778 (List::Util::sum map $_->{req_w}, @children),
1855 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1779 (List::Util::max map $_->{req_h}, @children),
1856 ) 1780 )
1857} 1781}
1858 1782
1859sub invoke_size_allocate { 1783sub invoke_size_allocate {
1860 my ($self, $w, $h) = @_; 1784 my ($self, $w, $h) = @_;
… …
1984 1908
1985 delete $self->{ox}; 1909 delete $self->{ox};
1986 $self->SUPER::realloc; 1910 $self->SUPER::realloc;
1987} 1911}
1988 1912
1913sub clear {
1914 my ($self) = @_;
1915
1916 $self->set_text ("");
1917}
1918
1989sub set_text { 1919sub set_text {
1990 my ($self, $text) = @_; 1920 my ($self, $text) = @_;
1991 1921
1992 return if $self->{text} eq "T$text"; 1922 return if $self->{text} eq "T$text";
1993 $self->{text} = "T$text"; 1923 $self->{text} = "T$text";
… …
2099 : ($self->{w} - $size->[0]) * 0.5); 2029 : ($self->{w} - $size->[0]) * 0.5);
2100 2030
2101 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2031 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2102 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2032 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2103 : ($self->{h} - $size->[1]) * 0.5); 2033 : ($self->{h} - $size->[1]) * 0.5);
2034
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2104 }; 2036 };
2105 2037
2106 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2038# unless ($self->{list}) {
2107 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2039# $self->{list} = CFPlus::OpenGL::glGenList;
2108 2040# CFPlus::OpenGL::glNewList $self->{list};
2109 $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;
2110} 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#}
2111 2057
2112############################################################################# 2058#############################################################################
2113 2059
2114package CFPlus::UI::EntryBase; 2060package CFPlus::UI::EntryBase;
2115 2061
… …
2121 my $class = shift; 2067 my $class = shift;
2122 2068
2123 $class->SUPER::new ( 2069 $class->SUPER::new (
2124 fg => [1, 1, 1], 2070 fg => [1, 1, 1],
2125 bg => [0, 0, 0, 0.2], 2071 bg => [0, 0, 0, 0.2],
2072 outline => [0.6, 0.3, 0.1],
2126 active_bg => [1, 1, 1, 0.5], 2073 active_bg => [0, 0, 1, .2],
2127 active_fg => [0, 0, 0], 2074 active_fg => [1, 1, 1],
2075 active_outline => [1, 1, 0],
2128 can_hover => 1, 2076 can_hover => 1,
2129 can_focus => 1, 2077 can_focus => 1,
2130 valign => 0, 2078 valign => 0,
2131 can_events => 1, 2079 can_events => 1,
2132 ellipsise => 0, 2080 ellipsise => 0,
… …
2272 glColor_premultiply @{$self->{bg}}; 2220 glColor_premultiply @{$self->{bg}};
2273 } 2221 }
2274 2222
2275 glEnable GL_BLEND; 2223 glEnable GL_BLEND;
2276 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2224 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2277 glBegin GL_QUADS;
2278 glVertex 0 , 0;
2279 glVertex 0 , $self->{h};
2280 glVertex $self->{w}, $self->{h}; 2225 glRect 0, 0, $self->{w}, $self->{h};
2281 glVertex $self->{w}, 0;
2282 glEnd;
2283 glDisable GL_BLEND; 2226 glDisable GL_BLEND;
2284 2227
2285 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
2286 2229
2287 #TODO: force update every cursor change :( 2230 #TODO: force update every cursor change :(
… …
2289 2232
2290 unless (exists $self->{cur_h}) { 2233 unless (exists $self->{cur_h}) {
2291 my $text = substr $self->{text}, 0, $self->{cursor}; 2234 my $text = substr $self->{text}, 0, $self->{cursor};
2292 utf8::encode $text; 2235 utf8::encode $text;
2293 2236
2294 @$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);
2295 } 2238 }
2296 2239
2240 glColor_premultiply @{$self->{active_fg}};
2297 glBegin GL_LINES; 2241 glBegin GL_LINES;
2298 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};
2299 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;
2300 glEnd; 2259 glEnd;
2301 } 2260 }
2302} 2261}
2303 2262
2304############################################################################# 2263#############################################################################
… …
2391 1 2350 1
2392} 2351}
2393 2352
2394############################################################################# 2353#############################################################################
2395 2354
2355package CFPlus::UI::ButtonBin;
2356
2357our @ISA = CFPlus::UI::Bin::;
2358
2359use CFPlus::OpenGL;
2360
2361my @tex =
2362 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2363 qw(b1_button_inactive.png b1_button_active.png);
2364
2365sub new {
2366 my $class = shift;
2367
2368 $class->SUPER::new (
2369 can_hover => 1,
2370 align => 0,
2371 valign => 0,
2372 can_events => 1,
2373 @_
2374 )
2375}
2376
2377sub invoke_button_up {
2378 my ($self, $ev, $x, $y) = @_;
2379
2380 $self->emit ("activate")
2381 if $x >= 0 && $x < $self->{w}
2382 && $y >= 0 && $y < $self->{h};
2383
2384 1
2385}
2386
2387sub _draw {
2388 my ($self) = @_;
2389
2390 glEnable GL_TEXTURE_2D;
2391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2392 glColor 0, 0, 0, 1;
2393
2394 my $tex = $tex[$GRAB == $self];
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
2396package CFPlus::UI::Button; 2404package CFPlus::UI::Button;
2397 2405
2398our @ISA = CFPlus::UI::Label::; 2406our @ISA = CFPlus::UI::Label::;
2399 2407
2400use CFPlus::OpenGL; 2408use CFPlus::OpenGL;
… …
2534sub new { 2542sub new {
2535 my $class = shift; 2543 my $class = shift;
2536 2544
2537 my $self = $class->SUPER::new ( 2545 my $self = $class->SUPER::new (
2538 can_events => 0, 2546 can_events => 0,
2547 scale => 1,
2539 @_, 2548 @_,
2540 ); 2549 );
2541 2550
2542 $self->{path} || $self->{tex} 2551 $self->{path} || $self->{tex}
2543 or Carp::croak "'path' or 'tex' attributes required"; 2552 or Carp::croak "'path' or 'tex' attributes required";
… …
2568} 2577}
2569 2578
2570sub size_request { 2579sub size_request {
2571 my ($self) = @_; 2580 my ($self) = @_;
2572 2581
2573 ($self->{tex}{w}, $self->{tex}{h}) 2582 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2574} 2583}
2575 2584
2576sub _draw { 2585sub _draw {
2577 my ($self) = @_; 2586 my ($self) = @_;
2578 2587
… …
2588 } 2597 }
2589 2598
2590 glEnable GL_TEXTURE_2D; 2599 glEnable GL_TEXTURE_2D;
2591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2600 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2592 2601
2593 $tex->draw_quad (0, 0, $w, $h); 2602 $tex->draw_quad_alpha (0, 0, $w, $h);
2594 2603
2595 glDisable GL_TEXTURE_2D; 2604 glDisable GL_TEXTURE_2D;
2596} 2605}
2597 2606
2598############################################################################# 2607#############################################################################
… …
2617 align => 0, 2626 align => 0,
2618 valign => 0, 2627 valign => 0,
2619 can_events => 1, 2628 can_events => 1,
2620 @_ 2629 @_
2621 ); 2630 );
2631}
2632
2633sub invoke_button_down {
2634 my ($self, $ev, $x, $y) = @_;
2635
2636 1
2622} 2637}
2623 2638
2624sub invoke_button_up { 2639sub invoke_button_up {
2625 my ($self, $ev, $x, $y) = @_; 2640 my ($self, $ev, $x, $y) = @_;
2626 2641
… …
2766 glDisable GL_TEXTURE_2D; 2781 glDisable GL_TEXTURE_2D;
2767} 2782}
2768 2783
2769############################################################################# 2784#############################################################################
2770 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 label => "%d%%",
2806 %arg,
2807 );
2808
2809 $self->set_value ($arg{value} || -1);
2810
2811 $self
2812}
2813
2814sub set_label {
2815 my ($self, $label) = @_;
2816
2817 return if $self->{label} eq $label;
2818 $self->{label} = $label;
2819
2820 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2821}
2822
2823sub set_value {
2824 my ($self, $value) = @_;
2825
2826 if ($self->{value} ne $value) {
2827 $self->{value} = $value;
2828
2829 if ($value < 0) {
2830 $self->set_text ("-");
2831 } else {
2832 $self->set_text (sprintf $self->{label}, $value * 100);
2833 }
2834
2835 $self->update;
2836 }
2837}
2838
2839sub _draw {
2840 my ($self) = @_;
2841
2842 glEnable GL_BLEND;
2843 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2844
2845 if ($self->{value} >= 0) {
2846 my $s = 3 + ($self->{w} - 6) * $self->{value};
2847
2848 glColor_premultiply @{$self->{bar}};
2849 glRect 2, 2, $s, $self->{h} - 2;
2850 glColor_premultiply @{$self->{bg}};
2851 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2852 }
2853
2854 glColor_premultiply @{$self->{outline}};
2855 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2856
2857 glDisable GL_BLEND;
2858
2859 {
2860 local $self->{bg}; # do not draw background
2861 $self->SUPER::_draw;
2862 }
2863}
2864
2865#############################################################################
2866
2867package CFPlus::UI::ExperienceProgress;
2868
2869our @ISA = CFPlus::UI::Progress::;
2870
2871sub new {
2872 my ($class, %arg) = @_;
2873
2874 my $self = $class->SUPER::new (
2875 %arg
2876 );
2877
2878 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2879 if $::CONN;
2880
2881 $self
2882}
2883
2884sub DESTROY {
2885 my ($self) = @_;
2886
2887 delete $::CONN->{on_exp_update}{$self+0}
2888 if $::CONN;
2889
2890 $self->SUPER::DESTROY;
2891}
2892
2893sub set_value {
2894 my ($self, $lvl, $exp) = @_;
2895
2896 my $v = -1;
2897
2898 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2899 my $l0 = $table->[$lvl - 1];
2900 my $l1 = $table->[$lvl];
2901
2902 $v = ($exp - $l0) / ($l1 - $l0);
2903 }
2904
2905 $self->SUPER::set_value ($v);
2906}
2907
2908#############################################################################
2909
2771package CFPlus::UI::Gauge; 2910package CFPlus::UI::Gauge;
2772 2911
2773our @ISA = CFPlus::UI::VBox::; 2912our @ISA = CFPlus::UI::VBox::;
2774 2913
2775sub new { 2914sub new {
… …
2900 3039
2901 $self->SUPER::invoke_button_down ($ev, $x, $y); 3040 $self->SUPER::invoke_button_down ($ev, $x, $y);
2902 3041
2903 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3042 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2904 3043
2905 $self->invoke_mouse_motion ($ev, $x, $y) 3044 $self->invoke_mouse_motion ($ev, $x, $y);
3045
3046 1
2906} 3047}
2907 3048
2908sub invoke_mouse_motion { 3049sub invoke_mouse_motion {
2909 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2910 3051
… …
2930 3071
2931 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3072 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2932 3073
2933 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3074 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2934 3075
2935 ! ! $delta 3076 1
2936} 3077}
2937 3078
2938sub update { 3079sub update {
2939 my ($self) = @_; 3080 my ($self) = @_;
2940 3081
… …
3071} 3212}
3072 3213
3073sub size_request { 3214sub size_request {
3074 my ($self) = @_; 3215 my ($self) = @_;
3075 3216
3076 my ($empty, $slider) = @{ $self->{children} }; 3217 my ($empty, $slider) = $self->visible_children;
3077 3218
3078 local $self->{children} = [$empty, $slider]; 3219 local $self->{children} = [$empty, $slider];
3079 $self->SUPER::size_request 3220 $self->SUPER::size_request
3080} 3221}
3081 3222
… …
3270 3411
3271 if ($y0 < $y + $h && $y < $y1) { 3412 if ($y0 < $y + $h && $y < $y1) {
3272 my $layout = $self->get_layout ($para); 3413 my $layout = $self->get_layout ($para);
3273 3414
3274 $layout->render ($para->{indent}, $y - $y0); 3415 $layout->render ($para->{indent}, $y - $y0);
3416 $layout->draw;
3275 3417
3276 if (my @w = @{ $para->{widget} }) { 3418 if (my @w = @{ $para->{widget} }) {
3277 my @s = $layout->get_shapes; 3419 my @s = $layout->get_shapes;
3278 3420
3279 for (@w) { 3421 for (@w) {
… …
3470 glTranslate 0.375, 0.375; 3612 glTranslate 0.375, 0.375;
3471 3613
3472 my ($w, $h) = @$self{qw(w h)}; 3614 my ($w, $h) = @$self{qw(w h)};
3473 3615
3474 glColor 1, 0.8, 0.4; 3616 glColor 1, 0.8, 0.4;
3475 glBegin GL_QUADS; 3617 glRect 0, 0, $w, $h;
3476 glVertex 0 , 0;
3477 glVertex 0 , $h;
3478 glVertex $w, $h;
3479 glVertex $w, 0;
3480 glEnd;
3481 3618
3482 glColor 0, 0, 0; 3619 glColor 0, 0, 0;
3483 glBegin GL_LINE_LOOP; 3620 glRect_lineloop 0, 0, $w, $h;
3484 glVertex 0 , 0;
3485 glVertex 0 , $h;
3486 glVertex $w, $h;
3487 glVertex $w, 0;
3488 glEnd;
3489 3621
3490 glTranslate 2 - 0.375, 2 - 0.375; 3622 glTranslate 2 - 0.375, 2 - 0.375;
3491 3623
3492 $self->SUPER::_draw; 3624 $self->SUPER::_draw;
3493} 3625}
… …
3513 3645
3514 if ($self->{anim} && $self->{animspeed}) { 3646 if ($self->{anim} && $self->{animspeed}) {
3515 CFPlus::weaken (my $widget = $self); 3647 CFPlus::weaken (my $widget = $self);
3516 3648
3517 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3649 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3518 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3650 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3519 $self->{timer} = Event->timer ( 3651 $self->{timer} = Event->timer (
3520 parked => 1, 3652 parked => 1,
3521 cb => sub { 3653 cb => sub {
3522 return unless $::CONN && $widget; 3654 return unless $::CONN;
3523 3655
3656 my $w = $widget
3657 or return;
3658
3524 ++$widget->{frame}; 3659 ++$w->{frame};
3525 $widget->update_face; 3660 $w->update_face;
3661
3662 # somehow, $widget can go away
3526 $widget->update; 3663 $w->update;
3527
3528 $widget->update_timer; 3664 $w->update_timer;
3529 }, 3665 },
3530 ); 3666 );
3531 3667
3532 $self->update_face; 3668 $self->update_face;
3533 $self->update_timer; 3669 $self->update_timer;
… …
3554} 3690}
3555 3691
3556sub update_face { 3692sub update_face {
3557 my ($self) = @_; 3693 my ($self) = @_;
3558 3694
3559 return unless $::CONN;
3560
3561 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3562 if ($anim && @$anim) {
3563 delete $self->{wait_face};
3564 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3565 }
3566 }
3567}
3568
3569sub size_request {
3570 my ($self) = @_;
3571
3572 if ($::CONN) { 3695 if ($::CONN) {
3573 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3696 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3574 if (my $tex = $::CONN->{texture}[$faceid]) { 3697 if ($anim && @$anim) {
3575 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3698 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3576 } else { 3699 delete $self->{face_change_cb};
3577 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3700
3578 $self->realloc; 3701 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3702 unless ($tex->{name} || $tex->{loading}) {
3703 $tex->upload (sub { $self->reconfigure });
3704 }
3579 }); 3705 }
3580 } 3706 }
3581 } 3707 }
3582 } 3708 }
3709}
3710
3711sub size_request {
3712 my ($self) = @_;
3713
3714 if ($::CONN) {
3715 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3716 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3717 if ($tex->{name}) {
3718 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3719 } elsif (!$tex->{loading}) {
3720 $tex->upload (sub { $self->reconfigure });
3721 }
3722 }
3723
3724 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3725 }
3726 }
3583 3727
3584 ($self->{size_w} || 8, $self->{size_h} || 8) 3728 ($self->{size_w} || 8, $self->{size_h} || 8)
3585} 3729}
3586 3730
3587sub update { 3731sub update {
… …
3601} 3745}
3602 3746
3603sub _draw { 3747sub _draw {
3604 my ($self) = @_; 3748 my ($self) = @_;
3605 3749
3606 return unless $::CONN;
3607
3608 $self->SUPER::_draw; 3750 $self->SUPER::_draw;
3609 3751
3610 my $faceid = $::CONN->{faceid}[$self->{face}] 3752 if (my $tex = $self->{tex}) {
3611 or return;
3612
3613 my $tex = $::CONN->{texture}[$faceid];
3614
3615 if ($tex) {
3616 glEnable GL_TEXTURE_2D; 3753 glEnable GL_TEXTURE_2D;
3617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3754 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3618 glColor 0, 0, 0, 1; 3755 glColor 0, 0, 0, 1;
3619 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3756 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3620 glDisable GL_TEXTURE_2D; 3757 glDisable GL_TEXTURE_2D;
… …
3672 children => [ 3809 children => [
3673 (new CFPlus::UI::Label markup => $left, expand => 1), 3810 (new CFPlus::UI::Label markup => $left, expand => 1),
3674 (new CFPlus::UI::Label markup => $right, align => +1), 3811 (new CFPlus::UI::Label markup => $right, align => +1),
3675 ], 3812 ],
3676 ; 3813 ;
3677 3814
3678 } else { 3815 } else {
3679 $widget = new CFPlus::UI::Label 3816 $widget = new CFPlus::UI::Label
3680 can_hover => 1, 3817 can_hover => 1,
3681 can_events => 1, 3818 can_events => 1,
3682 markup => $widget, 3819 markup => $widget,
… …
3807 3944
3808############################################################################# 3945#############################################################################
3809 3946
3810package CFPlus::UI::Notebook; 3947package CFPlus::UI::Notebook;
3811 3948
3949use CFPlus::OpenGL;
3950
3812our @ISA = CFPlus::UI::VBox::; 3951our @ISA = CFPlus::UI::VBox::;
3813 3952
3814sub new { 3953sub new {
3815 my $class = shift; 3954 my $class = shift;
3816 3955
3817 my $self = $class->SUPER::new ( 3956 my $self = $class->SUPER::new (
3818 buttonbar => (new CFPlus::UI::Buttonbar), 3957 buttonbar => (new CFPlus::UI::Buttonbar),
3819 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3958 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3959 active_outline => [1, 1, 0],
3820 # filter => # will be put between multiplexer and $self 3960 # filter => # will be put between multiplexer and $self
3821 @_, 3961 @_,
3822 ); 3962 );
3823 3963
3824 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3964 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3825 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3965 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3826 3966
3967 {
3968 Scalar::Util::weaken (my $wself = $self);
3969
3970 $self->{multiplexer}->connect (c_add => sub {
3971 my ($mplex, $widgets) = @_;
3972
3973 for my $child (@$widgets) {
3974 Scalar::Util::weaken $child;
3975 $child->{c_tab_} ||= do {
3976 my $tab =
3977 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3978 ? $child->{c_tab}
3979 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3980
3981 $tab->connect (activate => sub {
3982 $wself->set_current_page ($child);
3983 });
3984
3985 $tab
3986 };
3987
3988 $self->{buttonbar}->add ($child->{c_tab_});
3989 }
3990 });
3991
3992 $self->{multiplexer}->connect (c_remove => sub {
3993 my ($mplex, $widgets) = @_;
3994
3995 for my $child (@$widgets) {
3996 $wself->{buttonbar}->remove ($child->{c_tab_});
3997 }
3998 });
3999 }
4000
3827 $self 4001 $self
3828} 4002}
3829 4003
3830sub add { 4004sub add {
4005 my ($self, @widgets) = @_;
4006
4007 $self->{multiplexer}->add (@widgets)
4008}
4009
4010sub remove {
4011 my ($self, @widgets) = @_;
4012
4013 $self->{multiplexer}->remove (@widgets)
4014}
4015
4016sub pages {
4017 my ($self) = @_;
4018 $self->{multiplexer}->children
4019}
4020
4021sub add_tab {
3831 my ($self, $title, $widget, $tooltip) = @_; 4022 my ($self, $title, $widget, $tooltip) = @_;
3832 4023
3833 CFPlus::weaken $self; 4024 $title = [$title, $tooltip] unless ref $title;
4025 $widget->{c_tab} = $title;
3834 4026
3835 $self->{buttonbar}->add (new CFPlus::UI::Button
3836 markup => $title,
3837 tooltip => $tooltip,
3838 on_activate => sub { $self->set_current_page ($widget) },
3839 );
3840
3841 $self->{multiplexer}->add ($widget); 4027 $self->add ($widget);
3842} 4028}
3843 4029
3844sub get_current_page { 4030sub get_current_page {
3845 my ($self) = @_; 4031 my ($self) = @_;
3846 4032
… …
3850sub set_current_page { 4036sub set_current_page {
3851 my ($self, $page) = @_; 4037 my ($self, $page) = @_;
3852 4038
3853 $self->{multiplexer}->set_current_page ($page); 4039 $self->{multiplexer}->set_current_page ($page);
3854 $self->emit (page_changed => $self->{multiplexer}{current}); 4040 $self->emit (page_changed => $self->{multiplexer}{current});
4041}
4042
4043sub _draw {
4044 my ($self) = @_;
4045
4046 $self->SUPER::_draw ();
4047
4048 if (my $cur = $self->{multiplexer}{current}) {
4049 if ($cur = $cur->{c_tab_}) {
4050 glTranslate $cur->{x}, $cur->{y};
4051 glLineWidth 3;
4052 glColor @{$self->{active_outline}};
4053 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
4054 glLineWidth 1;
4055 }
4056 }
3855} 4057}
3856 4058
3857############################################################################# 4059#############################################################################
3858 4060
3859package CFPlus::UI::Selector; 4061package CFPlus::UI::Selector;
… …
4129} 4331}
4130 4332
4131sub update { 4333sub update {
4132 my ($self) = @_; 4334 my ($self) = @_;
4133 4335
4134 $::WANT_REFRESH++; 4336 $::WANT_REFRESH->start;
4135} 4337}
4136 4338
4137sub add { 4339sub add {
4138 my ($self, @children) = @_; 4340 my ($self, @children) = @_;
4139 4341
… …
4176 while ($self->{refresh_hook}) { 4378 while ($self->{refresh_hook}) {
4177 $_->() 4379 $_->()
4178 for values %{delete $self->{refresh_hook}}; 4380 for values %{delete $self->{refresh_hook}};
4179 } 4381 }
4180 4382
4181 if ($self->{realloc}) { 4383 while ($self->{realloc}) {
4182 my %queue; 4384 my %queue;
4183 my @queue; 4385 my @queue;
4184 my $widget; 4386 my $widget;
4185 4387
4186 outer: 4388 outer:
… …
4233 } 4435 }
4234 } 4436 }
4235 4437
4236 delete $self->{realloc}{$widget+0}; 4438 delete $self->{realloc}{$widget+0};
4237 } 4439 }
4238 }
4239 4440
4240 while (my $size_alloc = delete $self->{size_alloc}) { 4441 while (my $size_alloc = delete $self->{size_alloc}) {
4241 my @queue = sort { $b->{visible} <=> $a->{visible} } 4442 my @queue = sort { $a->{visible} <=> $b->{visible} }
4242 values %$size_alloc; 4443 values %$size_alloc;
4243 4444
4244 while () { 4445 while () {
4245 my $widget = pop @queue || last; 4446 my $widget = pop @queue || last;
4246 4447
4247 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4448 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4248 4449
4249 $w = 0 if $w < 0;
4250 $h = 0 if $h < 0;
4251
4252 $w = max $widget->{min_w}, $w; 4450 $w = max $widget->{min_w}, $w;
4253 $h = max $widget->{min_h}, $h; 4451 $h = max $widget->{min_h}, $h;
4254 4452
4255# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4453# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4256# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4454# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4257 4455
4258 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4456 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4259 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4457 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4260 4458
4261 $w = int $w + 0.5; 4459 $w = int $w + 0.5;
4262 $h = int $h + 0.5; 4460 $h = int $h + 0.5;
4263 4461
4264 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4462 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4265 $widget->{old_w} = $widget->{w}; 4463 $widget->{old_w} = $widget->{w};
4266 $widget->{old_h} = $widget->{h}; 4464 $widget->{old_h} = $widget->{h};
4267 4465
4268 $widget->{w} = $w; 4466 $widget->{w} = $w;
4269 $widget->{h} = $h; 4467 $widget->{h} = $h;
4270 4468
4271 $widget->emit (size_allocate => $w, $h); 4469 $widget->emit (size_allocate => $w, $h);
4470 }
4272 } 4471 }
4273 } 4472 }
4274 } 4473 }
4275 4474
4276 while ($self->{post_alloc_hook}) { 4475 while ($self->{post_alloc_hook}) {

Diff Legend

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