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.385 by root, Fri Jul 20 16:32:17 2007 UTC vs.
Revision 1.432 by root, Tue Aug 21 23:42:02 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_at (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_at (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_at (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 {
1612 my $self = shift; 1585 my ($self, @widgets) = @_;
1613 1586
1614 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d# 1587 for my $child (@widgets) {
1615 $self->add_at (@_); 1588 $child->{c_rowspan} ||= 1;
1589 $child->{c_colspan} ||= 1;
1590 }
1591
1592 $self->SUPER::add (@widgets);
1616} 1593}
1617 1594
1618sub add_at { 1595sub add_at {
1619 my $self = shift; 1596 my $self = shift;
1620 1597
1598 my @widgets;
1599
1621 while (@_) { 1600 while (@_) {
1622 my ($col, $row, $child) = splice @_, 0, 3, (); 1601 my ($col, $row, $child) = splice @_, 0, 3, ();
1623 1602
1624 $child->set_parent ($self); 1603 $child->{c_row} = $row;
1625 $self->{children}[$row][$col] = $child; 1604 $child->{c_col} = $col;
1626 }
1627 1605
1628 $self->{force_realloc} = 1; 1606 push @widgets, $child;
1629 $self->{force_size_alloc} = 1; 1607 }
1630 $self->realloc;
1631}
1632 1608
1633sub remove { 1609 $self->add (@widgets);
1610}
1611
1612sub get_wh {
1634 my ($self, $child) = @_; 1613 my ($self) = @_;
1635 1614
1636 for (@{ $self->{children} }) { 1615 my (@w, @h);
1637 for (@{ $_ || [] }) { 1616
1638 $_ = 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];
1639 } 1627 }
1640 } 1628 }
1641}
1642 1629
1643# TODO: move to container class maybe? send children a signal on removal? 1630 # second pass, rows
1644sub clear { 1631 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1645 my ($self) = @_;
1646
1647 my @children = $self->children;
1648 delete $self->{children};
1649
1650 for (@children) {
1651 delete $_->{parent};
1652 $_->hide;
1653 }
1654
1655 $self->realloc;
1656}
1657
1658sub get_wh {
1659 my ($self) = @_;
1660
1661 my (@w, @h);
1662
1663 for my $y (0 .. $#{$self->{children}}) {
1664 my $row = $self->{children}[$y]
1665 or next;
1666
1667 for my $x (0 .. $#$row) {
1668 my $widget = $row->[$x]
1669 or next;
1670 my ($w, $h) = @$widget{qw(req_w req_h)}; 1632 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1671 1633
1672 $w[$x] = max $w[$x], $w; 1634 my $sh = sum @h[$r .. $r + $rs - 1];
1673 $h[$y] = max $h[$y], $h; 1635
1636 if ($h > $sh) {
1637 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1674 } 1638 }
1675 } 1639 }
1676 1640
1677 (\@w, \@h) 1641 (\@w, \@h)
1678} 1642}
… …
1694 my ($ws, $hs) = $self->get_wh; 1658 my ($ws, $hs) = $self->get_wh;
1695 1659
1696 my $req_w = (sum @$ws) || 1; 1660 my $req_w = (sum @$ws) || 1;
1697 my $req_h = (sum @$hs) || 1; 1661 my $req_h = (sum @$hs) || 1;
1698 1662
1699 # TODO: nicer code 1663 # now linearly scale the rows/columns to the allocated size
1700 my @col_expand = @{$self->{col_expand}}; 1664 my @col_expand = @{$self->{col_expand}};
1701 @col_expand = (1) x @$ws unless @col_expand; 1665 @col_expand = (1) x @$ws unless @col_expand;
1702 my $col_expand = (sum @col_expand) || 1; 1666 my $col_expand = (sum @col_expand) || 1;
1703 1667
1704 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1668 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1711 1675
1712 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1676 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1713 1677
1714 CFPlus::UI::harmonize $hs; 1678 CFPlus::UI::harmonize $hs;
1715 1679
1716 my $y; 1680 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1681 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1717 1682
1718 for my $r (0 .. $#{$self->{children}}) { 1683 for my $widget ($self->children) {
1719 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)};
1720 or next;
1721 1685
1722 my $x = 0; 1686 $widget->configure (
1723 my $row_h = $hs->[$r]; 1687 $x[$c], $y[$r],
1688 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1724 1689 );
1725 for my $c (0 .. $#$row) {
1726 my $col_w = $ws->[$c];
1727
1728 if (my $widget = $row->[$c]) {
1729 $widget->configure ($x, $y, $col_w, $row_h);
1730 }
1731
1732 $x += $col_w;
1733 }
1734
1735 $y += $row_h;
1736 } 1690 }
1737 1691
1738 1 1692 1
1739} 1693}
1740 1694
1741sub find_widget {
1742 my ($self, $x, $y) = @_;
1743
1744 $x -= $self->{x};
1745 $y -= $self->{y};
1746
1747 my $res;
1748
1749 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1750 $res = $_->find_widget ($x, $y)
1751 and return $res;
1752 }
1753
1754 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1755}
1756
1757sub _draw {
1758 my ($self) = @_;
1759
1760 for (grep $_, @{$self->{children}}) {
1761 $_->draw for grep $_, @$_;
1762 }
1763}
1764
1765############################################################################# 1695#############################################################################
1766 1696
1767package CFPlus::UI::Fixed; 1697package CFPlus::UI::Fixed;
1768 1698
1769use List::Util qw(min max); 1699use List::Util qw(min max);
1770 1700
1771our @ISA = CFPlus::UI::Container::; 1701our @ISA = CFPlus::UI::Container::;
1772 1702
1773sub add {
1774 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1775
1776 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1777 $self->SUPER::add ($child);
1778}
1779
1780sub _scale($$$) { 1703sub _scale($$$) {
1781 my ($mode, $val, $max) = @_; 1704 my ($rel, $val, $max) = @_;
1782 1705
1783 $mode eq "abs" ? $val 1706 $rel ? $val * $max : $val
1784 : $mode eq "rel" ? $val * $max
1785 : 0
1786} 1707}
1787 1708
1788sub size_request { 1709sub size_request {
1789 my ($self) = @_; 1710 my ($self) = @_;
1790 1711
1791 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1712 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1792 1713
1793 # determine overall size by querying abs widgets 1714 # determine overall size by querying abs widgets
1794 for my $child ($self->visible_children) { 1715 for my $child ($self->visible_children) {
1795 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};
1796 1719
1797 if ($pos eq "abs") {
1798 $w = _scale $size, $w, $child->{req_w};
1799 $h = _scale $size, $h, $child->{req_h};
1800
1801 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1720 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1802 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1721 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1803 } 1722 }
1804 } 1723 }
1805 1724
1806 my $W = $x2 - $x1; 1725 my $W = $x2 - $x1;
1807 my $H = $y2 - $y1; 1726 my $H = $y2 - $y1;
1808 1727
1809 # now layout remaining widgets 1728 # now layout remaining widgets
1810 for my $child ($self->visible_children) { 1729 for my $child ($self->visible_children) {
1811 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;
1812 1733
1813 if ($pos ne "abs") {
1814 $x = _scale $pos, $x, $W;
1815 $y = _scale $pos, $x, $H;
1816 $w = _scale $size, $w, $child->{req_w};
1817 $h = _scale $size, $h, $child->{req_h};
1818
1819 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1820 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1821 } 1736 }
1822 } 1737 }
1823 1738
1824 my $W = $x2 - $x1; 1739 my $W = $x2 - $x1;
1825 my $H = $y2 - $y1; 1740 my $H = $y2 - $y1;
… …
1829 1744
1830sub invoke_size_allocate { 1745sub invoke_size_allocate {
1831 my ($self, $W, $H) = @_; 1746 my ($self, $W, $H) = @_;
1832 1747
1833 for my $child ($self->visible_children) { 1748 for my $child ($self->visible_children) {
1834 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;
1835 1751
1836 $x = _scale $pos, $x, $W; 1752 $x += $child->{c_halign} * $child->{req_w};
1837 $y = _scale $pos, $x, $H; 1753 $y += $child->{c_valign} * $child->{req_h};
1838 $w = _scale $size, $w, $child->{req_w};
1839 $h = _scale $size, $h, $child->{req_h};
1840 1754
1841 $child->configure ($x, $y, $w, $h); 1755 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1842 } 1756 }
1843 1757
1844 1 1758 1
1845} 1759}
1846 1760
… …
1850 1764
1851our @ISA = CFPlus::UI::Container::; 1765our @ISA = CFPlus::UI::Container::;
1852 1766
1853sub size_request { 1767sub size_request {
1854 my ($self) = @_; 1768 my ($self) = @_;
1769
1770 my @children = $self->visible_children;
1855 1771
1856 $self->{vertical} 1772 $self->{vertical}
1857 ? ( 1773 ? (
1858 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::max map $_->{req_w}, @children),
1859 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::sum map $_->{req_h}, @children),
1860 ) 1776 )
1861 : ( 1777 : (
1862 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1778 (List::Util::sum map $_->{req_w}, @children),
1863 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1779 (List::Util::max map $_->{req_h}, @children),
1864 ) 1780 )
1865} 1781}
1866 1782
1867sub invoke_size_allocate { 1783sub invoke_size_allocate {
1868 my ($self, $w, $h) = @_; 1784 my ($self, $w, $h) = @_;
… …
1992 1908
1993 delete $self->{ox}; 1909 delete $self->{ox};
1994 $self->SUPER::realloc; 1910 $self->SUPER::realloc;
1995} 1911}
1996 1912
1913sub clear {
1914 my ($self) = @_;
1915
1916 $self->set_text ("");
1917}
1918
1997sub set_text { 1919sub set_text {
1998 my ($self, $text) = @_; 1920 my ($self, $text) = @_;
1999 1921
2000 return if $self->{text} eq "T$text"; 1922 return if $self->{text} eq "T$text";
2001 $self->{text} = "T$text"; 1923 $self->{text} = "T$text";
… …
2107 : ($self->{w} - $size->[0]) * 0.5); 2029 : ($self->{w} - $size->[0]) * 0.5);
2108 2030
2109 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2031 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2110 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2032 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2111 : ($self->{h} - $size->[1]) * 0.5); 2033 : ($self->{h} - $size->[1]) * 0.5);
2034
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2112 }; 2036 };
2113 2037
2114 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2038# unless ($self->{list}) {
2115 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2039# $self->{list} = CFPlus::OpenGL::glGenList;
2116 2040# CFPlus::OpenGL::glNewList $self->{list};
2117 $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;
2118} 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#}
2119 2057
2120############################################################################# 2058#############################################################################
2121 2059
2122package CFPlus::UI::EntryBase; 2060package CFPlus::UI::EntryBase;
2123 2061
… …
2129 my $class = shift; 2067 my $class = shift;
2130 2068
2131 $class->SUPER::new ( 2069 $class->SUPER::new (
2132 fg => [1, 1, 1], 2070 fg => [1, 1, 1],
2133 bg => [0, 0, 0, 0.2], 2071 bg => [0, 0, 0, 0.2],
2072 outline => [0.6, 0.3, 0.1],
2134 active_bg => [1, 1, 1, 0.5], 2073 active_bg => [0, 0, 1, .2],
2135 active_fg => [0, 0, 0], 2074 active_fg => [1, 1, 1],
2075 active_outline => [1, 1, 0],
2136 can_hover => 1, 2076 can_hover => 1,
2137 can_focus => 1, 2077 can_focus => 1,
2138 valign => 0, 2078 valign => 0,
2139 can_events => 1, 2079 can_events => 1,
2140 ellipsise => 0, 2080 ellipsise => 0,
… …
2280 glColor_premultiply @{$self->{bg}}; 2220 glColor_premultiply @{$self->{bg}};
2281 } 2221 }
2282 2222
2283 glEnable GL_BLEND; 2223 glEnable GL_BLEND;
2284 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2224 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2285 glBegin GL_QUADS;
2286 glVertex 0 , 0;
2287 glVertex 0 , $self->{h};
2288 glVertex $self->{w}, $self->{h}; 2225 glRect 0, 0, $self->{w}, $self->{h};
2289 glVertex $self->{w}, 0;
2290 glEnd;
2291 glDisable GL_BLEND; 2226 glDisable GL_BLEND;
2292 2227
2293 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
2294 2229
2295 #TODO: force update every cursor change :( 2230 #TODO: force update every cursor change :(
… …
2297 2232
2298 unless (exists $self->{cur_h}) { 2233 unless (exists $self->{cur_h}) {
2299 my $text = substr $self->{text}, 0, $self->{cursor}; 2234 my $text = substr $self->{text}, 0, $self->{cursor};
2300 utf8::encode $text; 2235 utf8::encode $text;
2301 2236
2302 @$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);
2303 } 2238 }
2304 2239
2240 glColor_premultiply @{$self->{active_fg}};
2305 glBegin GL_LINES; 2241 glBegin GL_LINES;
2306 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};
2307 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;
2308 glEnd; 2259 glEnd;
2309 } 2260 }
2310} 2261}
2311 2262
2312############################################################################# 2263#############################################################################
… …
2399 1 2350 1
2400} 2351}
2401 2352
2402############################################################################# 2353#############################################################################
2403 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
2404package CFPlus::UI::Button; 2404package CFPlus::UI::Button;
2405 2405
2406our @ISA = CFPlus::UI::Label::; 2406our @ISA = CFPlus::UI::Label::;
2407 2407
2408use CFPlus::OpenGL; 2408use CFPlus::OpenGL;
… …
2542sub new { 2542sub new {
2543 my $class = shift; 2543 my $class = shift;
2544 2544
2545 my $self = $class->SUPER::new ( 2545 my $self = $class->SUPER::new (
2546 can_events => 0, 2546 can_events => 0,
2547 scale => 1,
2547 @_, 2548 @_,
2548 ); 2549 );
2549 2550
2550 $self->{path} || $self->{tex} 2551 $self->{path} || $self->{tex}
2551 or Carp::croak "'path' or 'tex' attributes required"; 2552 or Carp::croak "'path' or 'tex' attributes required";
… …
2576} 2577}
2577 2578
2578sub size_request { 2579sub size_request {
2579 my ($self) = @_; 2580 my ($self) = @_;
2580 2581
2581 ($self->{tex}{w}, $self->{tex}{h}) 2582 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2582} 2583}
2583 2584
2584sub _draw { 2585sub _draw {
2585 my ($self) = @_; 2586 my ($self) = @_;
2586 2587
… …
2596 } 2597 }
2597 2598
2598 glEnable GL_TEXTURE_2D; 2599 glEnable GL_TEXTURE_2D;
2599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2600 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2600 2601
2601 $tex->draw_quad (0, 0, $w, $h); 2602 $tex->draw_quad_alpha (0, 0, $w, $h);
2602 2603
2603 glDisable GL_TEXTURE_2D; 2604 glDisable GL_TEXTURE_2D;
2604} 2605}
2605 2606
2606############################################################################# 2607#############################################################################
… …
2625 align => 0, 2626 align => 0,
2626 valign => 0, 2627 valign => 0,
2627 can_events => 1, 2628 can_events => 1,
2628 @_ 2629 @_
2629 ); 2630 );
2631}
2632
2633sub invoke_button_down {
2634 my ($self, $ev, $x, $y) = @_;
2635
2636 1
2630} 2637}
2631 2638
2632sub invoke_button_up { 2639sub invoke_button_up {
2633 my ($self, $ev, $x, $y) = @_; 2640 my ($self, $ev, $x, $y) = @_;
2634 2641
… …
2774 glDisable GL_TEXTURE_2D; 2781 glDisable GL_TEXTURE_2D;
2775} 2782}
2776 2783
2777############################################################################# 2784#############################################################################
2778 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 );
2807
2808 $self->set_value ($arg{value} || -1);
2809
2810 $self
2811}
2812
2813sub set_value {
2814 my ($self, $value) = @_;
2815
2816 if ($self->{value} != $value) {
2817 $self->{value} = $value;
2818
2819 if ($value < 0) {
2820 $self->set_text ("-");
2821 } else {
2822 $self->set_text (sprintf "%d%%", $value * 100);
2823 }
2824 $self->update;
2825 }
2826}
2827
2828sub _draw {
2829 my ($self) = @_;
2830
2831 glEnable GL_BLEND;
2832 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2833
2834 if ($self->{value} >= 0) {
2835 my $s = 3 + ($self->{w} - 6) * $self->{value};
2836
2837 glColor_premultiply @{$self->{bar}};
2838 glRect 2, 2, $s, $self->{h} - 2;
2839 glColor_premultiply @{$self->{bg}};
2840 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2841 }
2842
2843 glColor_premultiply @{$self->{outline}};
2844 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2845
2846 glDisable GL_BLEND;
2847
2848 {
2849 local $self->{bg}; # do not draw background
2850 $self->SUPER::_draw;
2851 }
2852}
2853
2854#############################################################################
2855
2856package CFPlus::UI::ExperienceProgress;
2857
2858our @ISA = CFPlus::UI::Progress::;
2859
2860sub new {
2861 my ($class, %arg) = @_;
2862
2863 my $self = $class->SUPER::new (
2864 %arg
2865 );
2866
2867 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2868 if $::CONN;
2869
2870 $self
2871}
2872
2873sub DESTROY {
2874 my ($self) = @_;
2875
2876 delete $::CONN->{on_exp_update}{$self+0}
2877 if $::CONN;
2878
2879 $self->SUPER::DESTROY;
2880}
2881
2882sub set_value {
2883 my ($self, $lvl, $exp) = @_;
2884
2885 my $v = -1;
2886
2887 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2888 my $l0 = $table->[$lvl - 1];
2889 my $l1 = $table->[$lvl];
2890
2891 $v = ($exp - $l0) / ($l1 - $l0);
2892 }
2893
2894 $self->SUPER::set_value ($v);
2895}
2896
2897#############################################################################
2898
2779package CFPlus::UI::Gauge; 2899package CFPlus::UI::Gauge;
2780 2900
2781our @ISA = CFPlus::UI::VBox::; 2901our @ISA = CFPlus::UI::VBox::;
2782 2902
2783sub new { 2903sub new {
… …
2908 3028
2909 $self->SUPER::invoke_button_down ($ev, $x, $y); 3029 $self->SUPER::invoke_button_down ($ev, $x, $y);
2910 3030
2911 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3031 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2912 3032
2913 $self->invoke_mouse_motion ($ev, $x, $y) 3033 $self->invoke_mouse_motion ($ev, $x, $y);
3034
3035 1
2914} 3036}
2915 3037
2916sub invoke_mouse_motion { 3038sub invoke_mouse_motion {
2917 my ($self, $ev, $x, $y) = @_; 3039 my ($self, $ev, $x, $y) = @_;
2918 3040
… …
2938 3060
2939 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3061 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2940 3062
2941 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3063 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2942 3064
2943 ! ! $delta 3065 1
2944} 3066}
2945 3067
2946sub update { 3068sub update {
2947 my ($self) = @_; 3069 my ($self) = @_;
2948 3070
… …
3079} 3201}
3080 3202
3081sub size_request { 3203sub size_request {
3082 my ($self) = @_; 3204 my ($self) = @_;
3083 3205
3084 my ($empty, $slider) = @{ $self->{children} }; 3206 my ($empty, $slider) = $self->visible_children;
3085 3207
3086 local $self->{children} = [$empty, $slider]; 3208 local $self->{children} = [$empty, $slider];
3087 $self->SUPER::size_request 3209 $self->SUPER::size_request
3088} 3210}
3089 3211
… …
3278 3400
3279 if ($y0 < $y + $h && $y < $y1) { 3401 if ($y0 < $y + $h && $y < $y1) {
3280 my $layout = $self->get_layout ($para); 3402 my $layout = $self->get_layout ($para);
3281 3403
3282 $layout->render ($para->{indent}, $y - $y0); 3404 $layout->render ($para->{indent}, $y - $y0);
3405 $layout->draw;
3283 3406
3284 if (my @w = @{ $para->{widget} }) { 3407 if (my @w = @{ $para->{widget} }) {
3285 my @s = $layout->get_shapes; 3408 my @s = $layout->get_shapes;
3286 3409
3287 for (@w) { 3410 for (@w) {
… …
3478 glTranslate 0.375, 0.375; 3601 glTranslate 0.375, 0.375;
3479 3602
3480 my ($w, $h) = @$self{qw(w h)}; 3603 my ($w, $h) = @$self{qw(w h)};
3481 3604
3482 glColor 1, 0.8, 0.4; 3605 glColor 1, 0.8, 0.4;
3483 glBegin GL_QUADS; 3606 glRect 0, 0, $w, $h;
3484 glVertex 0 , 0;
3485 glVertex 0 , $h;
3486 glVertex $w, $h;
3487 glVertex $w, 0;
3488 glEnd;
3489 3607
3490 glColor 0, 0, 0; 3608 glColor 0, 0, 0;
3491 glBegin GL_LINE_LOOP; 3609 glRect_lineloop 0, 0, $w, $h;
3492 glVertex 0 , 0;
3493 glVertex 0 , $h;
3494 glVertex $w, $h;
3495 glVertex $w, 0;
3496 glEnd;
3497 3610
3498 glTranslate 2 - 0.375, 2 - 0.375; 3611 glTranslate 2 - 0.375, 2 - 0.375;
3499 3612
3500 $self->SUPER::_draw; 3613 $self->SUPER::_draw;
3501} 3614}
… …
3521 3634
3522 if ($self->{anim} && $self->{animspeed}) { 3635 if ($self->{anim} && $self->{animspeed}) {
3523 CFPlus::weaken (my $widget = $self); 3636 CFPlus::weaken (my $widget = $self);
3524 3637
3525 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3638 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3526 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3639 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3527 $self->{timer} = Event->timer ( 3640 $self->{timer} = Event->timer (
3528 parked => 1, 3641 parked => 1,
3529 cb => sub { 3642 cb => sub {
3530 return unless $::CONN && $widget; 3643 return unless $::CONN;
3531 3644
3645 my $w = $widget
3646 or return;
3647
3532 ++$widget->{frame}; 3648 ++$w->{frame};
3533 $widget->update_face; 3649 $w->update_face;
3650
3651 # somehow, $widget can go away
3534 $widget->update; 3652 $w->update;
3535
3536 $widget->update_timer; 3653 $w->update_timer;
3537 }, 3654 },
3538 ); 3655 );
3539 3656
3540 $self->update_face; 3657 $self->update_face;
3541 $self->update_timer; 3658 $self->update_timer;
… …
3562} 3679}
3563 3680
3564sub update_face { 3681sub update_face {
3565 my ($self) = @_; 3682 my ($self) = @_;
3566 3683
3567 return unless $::CONN;
3568
3569 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3570 if ($anim && @$anim) {
3571 delete $self->{wait_face};
3572 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3573 }
3574 }
3575}
3576
3577sub size_request {
3578 my ($self) = @_;
3579
3580 if ($::CONN) { 3684 if ($::CONN) {
3581 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3685 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3582 if (my $tex = $::CONN->{texture}[$faceid]) { 3686 if ($anim && @$anim) {
3583 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3687 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3584 } else { 3688 delete $self->{face_change_cb};
3585 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3689
3586 $self->realloc; 3690 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3691 unless ($tex->{name} || $tex->{loading}) {
3692 $tex->upload (sub { $self->reconfigure });
3693 }
3587 }); 3694 }
3588 } 3695 }
3589 } 3696 }
3590 } 3697 }
3698}
3699
3700sub size_request {
3701 my ($self) = @_;
3702
3703 if ($::CONN) {
3704 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3705 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3706 if ($tex->{name}) {
3707 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3708 } elsif (!$tex->{loading}) {
3709 $tex->upload (sub { $self->reconfigure });
3710 }
3711 }
3712
3713 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3714 }
3715 }
3591 3716
3592 ($self->{size_w} || 8, $self->{size_h} || 8) 3717 ($self->{size_w} || 8, $self->{size_h} || 8)
3593} 3718}
3594 3719
3595sub update { 3720sub update {
… …
3609} 3734}
3610 3735
3611sub _draw { 3736sub _draw {
3612 my ($self) = @_; 3737 my ($self) = @_;
3613 3738
3614 return unless $::CONN;
3615
3616 $self->SUPER::_draw; 3739 $self->SUPER::_draw;
3617 3740
3618 my $faceid = $::CONN->{faceid}[$self->{face}] 3741 if (my $tex = $self->{tex}) {
3619 or return;
3620
3621 my $tex = $::CONN->{texture}[$faceid];
3622
3623 if ($tex) {
3624 glEnable GL_TEXTURE_2D; 3742 glEnable GL_TEXTURE_2D;
3625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3626 glColor 0, 0, 0, 1; 3744 glColor 0, 0, 0, 1;
3627 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3745 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3628 glDisable GL_TEXTURE_2D; 3746 glDisable GL_TEXTURE_2D;
… …
3680 children => [ 3798 children => [
3681 (new CFPlus::UI::Label markup => $left, expand => 1), 3799 (new CFPlus::UI::Label markup => $left, expand => 1),
3682 (new CFPlus::UI::Label markup => $right, align => +1), 3800 (new CFPlus::UI::Label markup => $right, align => +1),
3683 ], 3801 ],
3684 ; 3802 ;
3685 3803
3686 } else { 3804 } else {
3687 $widget = new CFPlus::UI::Label 3805 $widget = new CFPlus::UI::Label
3688 can_hover => 1, 3806 can_hover => 1,
3689 can_events => 1, 3807 can_events => 1,
3690 markup => $widget, 3808 markup => $widget,
… …
3815 3933
3816############################################################################# 3934#############################################################################
3817 3935
3818package CFPlus::UI::Notebook; 3936package CFPlus::UI::Notebook;
3819 3937
3938use CFPlus::OpenGL;
3939
3820our @ISA = CFPlus::UI::VBox::; 3940our @ISA = CFPlus::UI::VBox::;
3821 3941
3822sub new { 3942sub new {
3823 my $class = shift; 3943 my $class = shift;
3824 3944
3825 my $self = $class->SUPER::new ( 3945 my $self = $class->SUPER::new (
3826 buttonbar => (new CFPlus::UI::Buttonbar), 3946 buttonbar => (new CFPlus::UI::Buttonbar),
3827 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3947 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3948 active_outline => [1, 1, 0],
3828 # filter => # will be put between multiplexer and $self 3949 # filter => # will be put between multiplexer and $self
3829 @_, 3950 @_,
3830 ); 3951 );
3831 3952
3832 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3953 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3833 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3954 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3834 3955
3956 {
3957 Scalar::Util::weaken (my $wself = $self);
3958
3959 $self->{multiplexer}->connect (c_add => sub {
3960 my ($mplex, $widgets) = @_;
3961
3962 for my $child (@$widgets) {
3963 Scalar::Util::weaken $child;
3964 $child->{c_tab_} ||= do {
3965 my $tab =
3966 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3967 ? $child->{c_tab}
3968 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3969
3970 $tab->connect (activate => sub {
3971 $wself->set_current_page ($child);
3972 });
3973
3974 $tab
3975 };
3976
3977 $self->{buttonbar}->add ($child->{c_tab_});
3978 }
3979 });
3980
3981 $self->{multiplexer}->connect (c_remove => sub {
3982 my ($mplex, $widgets) = @_;
3983
3984 for my $child (@$widgets) {
3985 $wself->{buttonbar}->remove ($child->{c_tab_});
3986 }
3987 });
3988 }
3989
3835 $self 3990 $self
3836} 3991}
3837 3992
3838sub add { 3993sub add {
3994 my ($self, @widgets) = @_;
3995
3996 $self->{multiplexer}->add (@widgets)
3997}
3998
3999sub remove {
4000 my ($self, @widgets) = @_;
4001
4002 $self->{multiplexer}->remove (@widgets)
4003}
4004
4005sub pages {
4006 my ($self) = @_;
4007 $self->{multiplexer}->children
4008}
4009
4010sub add_tab {
3839 my ($self, $title, $widget, $tooltip) = @_; 4011 my ($self, $title, $widget, $tooltip) = @_;
3840 4012
3841 CFPlus::weaken $self; 4013 $title = [$title, $tooltip] unless ref $title;
4014 $widget->{c_tab} = $title;
3842 4015
3843 $self->{buttonbar}->add (new CFPlus::UI::Button
3844 markup => $title,
3845 tooltip => $tooltip,
3846 on_activate => sub { $self->set_current_page ($widget) },
3847 );
3848
3849 $self->{multiplexer}->add ($widget); 4016 $self->add ($widget);
3850} 4017}
3851 4018
3852sub get_current_page { 4019sub get_current_page {
3853 my ($self) = @_; 4020 my ($self) = @_;
3854 4021
… …
3858sub set_current_page { 4025sub set_current_page {
3859 my ($self, $page) = @_; 4026 my ($self, $page) = @_;
3860 4027
3861 $self->{multiplexer}->set_current_page ($page); 4028 $self->{multiplexer}->set_current_page ($page);
3862 $self->emit (page_changed => $self->{multiplexer}{current}); 4029 $self->emit (page_changed => $self->{multiplexer}{current});
4030}
4031
4032sub _draw {
4033 my ($self) = @_;
4034
4035 $self->SUPER::_draw ();
4036
4037 if (my $cur = $self->{multiplexer}{current}) {
4038 if ($cur = $cur->{c_tab_}) {
4039 glTranslate $cur->{x}, $cur->{y};
4040 glLineWidth 3;
4041 glColor @{$self->{active_outline}};
4042 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
4043 glLineWidth 1;
4044 }
4045 }
3863} 4046}
3864 4047
3865############################################################################# 4048#############################################################################
3866 4049
3867package CFPlus::UI::Selector; 4050package CFPlus::UI::Selector;
… …
4137} 4320}
4138 4321
4139sub update { 4322sub update {
4140 my ($self) = @_; 4323 my ($self) = @_;
4141 4324
4142 $::WANT_REFRESH++; 4325 $::WANT_REFRESH->start;
4143} 4326}
4144 4327
4145sub add { 4328sub add {
4146 my ($self, @children) = @_; 4329 my ($self, @children) = @_;
4147 4330
… …
4184 while ($self->{refresh_hook}) { 4367 while ($self->{refresh_hook}) {
4185 $_->() 4368 $_->()
4186 for values %{delete $self->{refresh_hook}}; 4369 for values %{delete $self->{refresh_hook}};
4187 } 4370 }
4188 4371
4189 if ($self->{realloc}) { 4372 while ($self->{realloc}) {
4190 my %queue; 4373 my %queue;
4191 my @queue; 4374 my @queue;
4192 my $widget; 4375 my $widget;
4193 4376
4194 outer: 4377 outer:
… …
4241 } 4424 }
4242 } 4425 }
4243 4426
4244 delete $self->{realloc}{$widget+0}; 4427 delete $self->{realloc}{$widget+0};
4245 } 4428 }
4246 }
4247 4429
4248 while (my $size_alloc = delete $self->{size_alloc}) { 4430 while (my $size_alloc = delete $self->{size_alloc}) {
4249 my @queue = sort { $b->{visible} <=> $a->{visible} } 4431 my @queue = sort { $a->{visible} <=> $b->{visible} }
4250 values %$size_alloc; 4432 values %$size_alloc;
4251 4433
4252 while () { 4434 while () {
4253 my $widget = pop @queue || last; 4435 my $widget = pop @queue || last;
4254 4436
4255 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4437 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4256 4438
4257 $w = 0 if $w < 0;
4258 $h = 0 if $h < 0;
4259
4260 $w = max $widget->{min_w}, $w; 4439 $w = max $widget->{min_w}, $w;
4261 $h = max $widget->{min_h}, $h; 4440 $h = max $widget->{min_h}, $h;
4262 4441
4263# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4442# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4264# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4443# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4265 4444
4266 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4445 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4267 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4446 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4268 4447
4269 $w = int $w + 0.5; 4448 $w = int $w + 0.5;
4270 $h = int $h + 0.5; 4449 $h = int $h + 0.5;
4271 4450
4272 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4451 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4273 $widget->{old_w} = $widget->{w}; 4452 $widget->{old_w} = $widget->{w};
4274 $widget->{old_h} = $widget->{h}; 4453 $widget->{old_h} = $widget->{h};
4275 4454
4276 $widget->{w} = $w; 4455 $widget->{w} = $w;
4277 $widget->{h} = $h; 4456 $widget->{h} = $h;
4278 4457
4279 $widget->emit (size_allocate => $w, $h); 4458 $widget->emit (size_allocate => $w, $h);
4459 }
4280 } 4460 }
4281 } 4461 }
4282 } 4462 }
4283 4463
4284 while ($self->{post_alloc_hook}) { 4464 while ($self->{post_alloc_hook}) {

Diff Legend

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