ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.378 by root, Mon Jul 16 20:22:39 2007 UTC vs.
Revision 1.426 by root, Sat Aug 11 12:07:54 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
… …
746 can_events => 0, 696 can_events => 0,
747 %arg, 697 %arg,
748 ); 698 );
749 699
750 $self->add (@$children) 700 $self->add (@$children)
751 if $children; 701 if $children && @$children;
752 702
753 $self 703 $self
754} 704}
755 705
756sub realloc { 706sub realloc {
… …
765 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
766 716
767 $_->set_parent ($self) 717 $_->set_parent ($self)
768 for @widgets; 718 for @widgets;
769 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 721 use sort 'stable';
771 722
772 $self->{children} = [ 723 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
775 ]; 726 ];
776 727
777 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
778} 733}
779 734
780sub children { 735sub children {
781 @{ $_[0]{children} } 736 @{ $_[0]{children} }
782} 737}
783 738
784sub remove { 739sub remove {
785 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
786 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
787 delete $child->{parent}; 745 delete $child->{parent};
788 $child->hide; 746 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
791 749
792 $self->realloc; 750 $self->realloc;
793} 751}
794 752
795sub clear { 753sub clear {
796 my ($self) = @_; 754 my ($self) = @_;
797 755
798 my $children = delete $self->{children}; 756 my $children = $self->{children};
799 $self->{children} = []; 757 $self->{children} = [];
800 758
801 for (@$children) { 759 for (@$children) {
802 delete $_->{parent}; 760 delete $_->{parent};
803 $_->hide; 761 $_->hide;
… …
823} 781}
824 782
825sub _draw { 783sub _draw {
826 my ($self) = @_; 784 my ($self) = @_;
827 785
828 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
829} 787}
830 788
831############################################################################# 789#############################################################################
832 790
833package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
… …
843} 801}
844 802
845sub add { 803sub add {
846 my ($self, $child) = @_; 804 my ($self, $child) = @_;
847 805
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
849 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
850} 808}
851 809
852sub remove { 810sub remove {
853 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
… …
963sub size_request { 921sub size_request {
964 my ($self) = @_; 922 my ($self) = @_;
965 923
966 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967 925
968 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
969 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
970 928
971 ($w, $h) 929 ($w, $h)
972} 930}
973 931
974sub invoke_size_allocate { 932sub invoke_size_allocate {
… …
998 $self->emit (changed => $x, $y); 956 $self->emit (changed => $x, $y);
999 $self->update; 957 $self->update;
1000 } 958 }
1001} 959}
1002 960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
976 }
977}
978
1003# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
1004sub coord2local { 980sub coord2local {
1005 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
1006 982
1007 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 983 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
… …
1020 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
1021 997
1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 999 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1024 ) { 1000 ) {
1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1001 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1026 } else { 1002 } else {
1027 $self->CFPlus::UI::Base::find_widget ($x, $y) 1003 $self->CFPlus::UI::Base::find_widget ($x, $y)
1028 } 1004 }
1029} 1005}
1030 1006
… …
1051 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1052 1028
1053 my $self; 1029 my $self;
1054 1030
1055 my $hslider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 c_col => 0,
1033 c_row => 1,
1056 vertical => 0, 1034 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub { 1036 on_changed => sub {
1059 $self->{hpos} = $_[1]; 1037 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 }, 1039 },
1062 ; 1040 ;
1063 1041
1064 my $vslider = new CFPlus::UI::Slider 1042 my $vslider = new CFPlus::UI::Slider
1043 c_col => 1,
1044 c_row => 0,
1065 vertical => 1, 1045 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub { 1047 on_changed => sub {
1068 $self->{vpos} = $_[1]; 1048 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1080 row_expand => [1, 0], 1060 row_expand => [1, 0],
1081 %arg, 1061 %arg,
1082 ); 1062 );
1083 1063
1084 $self->{vp} = new CFPlus::UI::ViewPort 1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 c_col => 0,
1066 c_row => 0,
1085 expand => 1, 1067 expand => 1,
1086 scroll_x => $self->{scroll_x}, 1068 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y}, 1069 scroll_y => $self->{scroll_y},
1088 on_changed => sub { 1070 on_changed => sub {
1089 my ($vp, $x, $y) = @_; 1071 my ($vp, $x, $y) = @_;
… …
1091 $vp->{parent}{hslider}->set_value ($x); 1073 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y); 1074 $vp->{parent}{vslider}->set_value ($y);
1093 1075
1094 0 1076 0
1095 }, 1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1096 ; 1083 ;
1097 1084
1098 $self->SUPER::add (0, 0, $self->{vp}); 1085 $self->SUPER::add ($self->{vp});
1099 1086
1100 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
1101 1088
1102 $self 1089 $self
1103} 1090}
1104
1105#TODO# update range on size_allocate depending on child
1106 1091
1107sub add { 1092sub add {
1108 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1109 1094
1110 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1111} 1096}
1112 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1113sub update_slider { 1102sub update_slider {
1114 my ($self) = @_; 1103 my ($self) = @_;
1115 1104
1116 my $child = ($self->{vp} or return)->child; 1105 my $child = ($self->{vp} or return)->child;
1117 1106
1107 if ($self->{scroll_x}) {
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120 1110
1121 my $visible = $w1 > $w2; 1111 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) { 1112 if ($visible != $self->{hslider_visible}) {
1113 $self->{hslider_visible} = $visible;
1123 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1114 $visible ? $self->SUPER::add ($self->{hslider})
1124 : $self->{hslider}->hide; 1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1125 } 1117 }
1126 1118
1119 if ($self->{scroll_y}) {
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1121 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129 1122
1130 my $visible = $h1 > $h2; 1123 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) { 1124 if ($visible != $self->{vslider_visible}) {
1125 $self->{vslider_visible} = $visible;
1132 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1126 $visible ? $self->SUPER::add ($self->{vslider})
1133 : $self->{vslider}->hide; 1127 : $self->SUPER::remove ($self->{vslider});
1128 }
1129 }
1130}
1131
1132sub start_dragging {
1133 my ($self, $ev) = @_;
1134
1135 $self->grab_focus;
1136
1137 my $ox = $self->{vp}{view_x};
1138 my $oy = $self->{vp}{view_y};
1139
1140 $self->{motion} = sub {
1141 my ($ev, $x, $y) = @_;
1142
1143 $ox -= $ev->{xrel};
1144 $oy -= $ev->{yrel};
1145
1146 $self->{vp}->set_offset ($ox, $oy);
1134 } 1147 };
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142} 1148}
1143 1149
1144sub invoke_mouse_wheel { 1150sub invoke_mouse_wheel {
1145 my ($self, $ev) = @_; 1151 my ($self, $ev) = @_;
1146 1152
1147 return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149 $self->{vslider}->emit (mouse_wheel => $ev); 1153 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1154 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1150 1155
1151 1 1156 1
1152} 1157}
1153 1158
1154sub invoke_button_down { 1159sub invoke_button_down {
1155 my ($self, $ev, $x, $y) = @_; 1160 my ($self, $ev, $x, $y) = @_;
1156 1161
1157 if ($ev->{button} == 2) { 1162 if ($ev->{button} == 2) {
1158 $self->grab_focus; 1163 $self->start_dragging ($ev);
1159
1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1165
1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1169
1170 return 1; 1164 return 1;
1171 } 1165 }
1172 1166
1173 0 1167 0
1174} 1168}
… …
1355 1349
1356my @border = 1350my @border =
1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1359 1353
1354my @icon =
1355 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1356 qw(x1_move.png x1_resize.png);
1357
1360sub new { 1358sub new {
1361 my ($class, %arg) = @_; 1359 my ($class, %arg) = @_;
1362 1360
1363 my $self = $class->SUPER::new ( 1361 my $self = $class->SUPER::new (
1364 bg => [1, 1, 1, 1], 1362 bg => [1, 1, 1, 1],
… …
1532 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1533 1531
1534 my $border = $self->border; 1532 my $border = $self->border;
1535 1533
1536 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1537 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1538 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1539 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1540 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1538 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1539
1540 # move
1541 my $w2 = ($w - $border) * .5;
1542 my $h2 = ($h - $border) * .5;
1543 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1545 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1546
1547 # resize
1548 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1550 unless $self->{has_close_button};
1551 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1541 1553
1542 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1543 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1544 1556
1545 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1566 1578
1567############################################################################# 1579#############################################################################
1568 1580
1569package CFPlus::UI::Table; 1581package CFPlus::UI::Table;
1570 1582
1571our @ISA = CFPlus::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1572 1584
1573use List::Util qw(max sum); 1585use List::Util qw(max sum);
1574 1586
1575use CFPlus::OpenGL; 1587use CFPlus::OpenGL;
1576 1588
1577sub new { 1589sub new {
1578 my $class = shift; 1590 my $class = shift;
1579 1591
1580 $class->SUPER::new ( 1592 $class->SUPER::new (
1581 children => [],
1582 col_expand => [], 1593 col_expand => [],
1583 row_expand => [], 1594 row_expand => [],
1584 @_, 1595 @_,
1585 ) 1596 )
1586} 1597}
1587 1598
1588sub children {
1589 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1590}
1591
1592# TODO: store row/col info in child widget and use standard add/del
1593sub add { 1599sub add {
1600 my ($self, @widgets) = @_;
1601
1602 for my $child (@widgets) {
1603 $child->{c_rowspan} ||= 1;
1604 $child->{c_colspan} ||= 1;
1605 }
1606
1607 $self->SUPER::add (@widgets);
1608}
1609
1610sub add_at {
1594 my ($self) = shift; 1611 my $self = shift;
1612
1613 my @widgets;
1595 1614
1596 while (@_) { 1615 while (@_) {
1597 my ($x, $y, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1598 $child->set_parent ($self);
1599 $self->{children}[$y][$x] = $child;
1600 }
1601 1617
1602 $self->{force_realloc} = 1; 1618 $child->{c_row} = $row;
1603 $self->{force_size_alloc} = 1; 1619 $child->{c_col} = $col;
1604 $self->realloc;
1605}
1606 1620
1607sub remove { 1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1608 my ($self, $child) = @_; 1628 my ($self) = @_;
1609 1629
1610 for (@{ $self->{children} }) { 1630 my (@w, @h);
1611 for (@{ $_ || [] }) { 1631
1612 $_ = undef if $_ == $child; 1632 my @children = $self->children;
1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637
1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639
1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1613 } 1642 }
1614 } 1643 }
1615}
1616 1644
1617# TODO: move to container class maybe? send children a signal on removal? 1645 # second pass, rows
1618sub clear { 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1619 my ($self) = @_;
1620
1621 my @children = $self->children;
1622 delete $self->{children};
1623
1624 for (@children) {
1625 delete $_->{parent};
1626 $_->hide;
1627 }
1628
1629 $self->realloc;
1630}
1631
1632sub get_wh {
1633 my ($self) = @_;
1634
1635 my (@w, @h);
1636
1637 for my $y (0 .. $#{$self->{children}}) {
1638 my $row = $self->{children}[$y]
1639 or next;
1640
1641 for my $x (0 .. $#$row) {
1642 my $widget = $row->[$x]
1643 or next;
1644 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1645 1648
1646 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1647 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1648 } 1653 }
1649 } 1654 }
1650 1655
1651 (\@w, \@h) 1656 (\@w, \@h)
1652} 1657}
… …
1668 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1669 1674
1670 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1671 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1672 1677
1673 # TODO: nicer code 1678 # now linearly scale the rows/columns to the allocated size
1674 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1675 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1676 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1677 1682
1678 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1685 1690
1686 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1687 1692
1688 CFPlus::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1689 1694
1690 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1691 1697
1692 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1693 my $row = $self->{children}[$r] 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1694 or next;
1695 1700
1696 my $x = 0; 1701 $widget->configure (
1697 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1698 1704 );
1699 for my $c (0 .. $#$row) {
1700 my $col_w = $ws->[$c];
1701
1702 if (my $widget = $row->[$c]) {
1703 $widget->configure ($x, $y, $col_w, $row_h);
1704 }
1705
1706 $x += $col_w;
1707 }
1708
1709 $y += $row_h;
1710 } 1705 }
1711 1706
1712 1 1707 1
1713} 1708}
1714 1709
1715sub find_widget {
1716 my ($self, $x, $y) = @_;
1717
1718 $x -= $self->{x};
1719 $y -= $self->{y};
1720
1721 my $res;
1722
1723 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1724 $res = $_->find_widget ($x, $y)
1725 and return $res;
1726 }
1727
1728 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1729}
1730
1731sub _draw {
1732 my ($self) = @_;
1733
1734 for (grep $_, @{$self->{children}}) {
1735 $_->draw for grep $_, @$_;
1736 }
1737}
1738
1739############################################################################# 1710#############################################################################
1740 1711
1741package CFPlus::UI::Fixed; 1712package CFPlus::UI::Fixed;
1742 1713
1743use List::Util qw(min max); 1714use List::Util qw(min max);
1744 1715
1745our @ISA = CFPlus::UI::Container::; 1716our @ISA = CFPlus::UI::Container::;
1746 1717
1747sub add {
1748 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1749
1750 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1751 $self->SUPER::add ($child);
1752}
1753
1754sub _scale($$$) { 1718sub _scale($$$) {
1755 my ($mode, $val, $max) = @_; 1719 my ($rel, $val, $max) = @_;
1756 1720
1757 $mode eq "abs" ? $val 1721 $rel ? $val * $max : $val
1758 : $mode eq "rel" ? $val * $max
1759 : 0
1760} 1722}
1761 1723
1762sub size_request { 1724sub size_request {
1763 my ($self) = @_; 1725 my ($self) = @_;
1764 1726
1765 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1766 1728
1767 # determine overall size by querying abs widgets 1729 # determine overall size by querying abs widgets
1768 for my $child ($self->visible_children) { 1730 for my $child ($self->visible_children) {
1769 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1770 1734
1771 if ($pos eq "abs") {
1772 $w = _scale $size, $w, $child->{req_w};
1773 $h = _scale $size, $h, $child->{req_h};
1774
1775 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1776 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1777 } 1737 }
1778 } 1738 }
1779 1739
1780 my $W = $x2 - $x1; 1740 my $W = $x2 - $x1;
1781 my $H = $y2 - $y1; 1741 my $H = $y2 - $y1;
1782 1742
1783 # now layout remaining widgets 1743 # now layout remaining widgets
1784 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1785 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1786 1748
1787 if ($pos ne "abs") {
1788 $x = _scale $pos, $x, $W;
1789 $y = _scale $pos, $x, $H;
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792
1793 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1794 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1795 } 1751 }
1796 } 1752 }
1797 1753
1798 my $W = $x2 - $x1; 1754 my $W = $x2 - $x1;
1799 my $H = $y2 - $y1; 1755 my $H = $y2 - $y1;
… …
1803 1759
1804sub invoke_size_allocate { 1760sub invoke_size_allocate {
1805 my ($self, $W, $H) = @_; 1761 my ($self, $W, $H) = @_;
1806 1762
1807 for my $child ($self->visible_children) { 1763 for my $child ($self->visible_children) {
1808 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1809 1766
1810 $x = _scale $pos, $x, $W; 1767 $x += $child->{c_halign} * $child->{req_w};
1811 $y = _scale $pos, $x, $H; 1768 $y += $child->{c_valign} * $child->{req_h};
1812 $w = _scale $size, $w, $child->{req_w};
1813 $h = _scale $size, $h, $child->{req_h};
1814 1769
1815 $child->configure ($x, $y, $w, $h); 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1816 } 1771 }
1817 1772
1818 1 1773 1
1819} 1774}
1820 1775
… …
1824 1779
1825our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1826 1781
1827sub size_request { 1782sub size_request {
1828 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1829 1786
1830 $self->{vertical} 1787 $self->{vertical}
1831 ? ( 1788 ? (
1832 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1833 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1834 ) 1791 )
1835 : ( 1792 : (
1836 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1837 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1838 ) 1795 )
1839} 1796}
1840 1797
1841sub invoke_size_allocate { 1798sub invoke_size_allocate {
1842 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1966 1923
1967 delete $self->{ox}; 1924 delete $self->{ox};
1968 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1969} 1926}
1970 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1971sub set_text { 1934sub set_text {
1972 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1973 1936
1974 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1975 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
… …
2081 : ($self->{w} - $size->[0]) * 0.5); 2044 : ($self->{w} - $size->[0]) * 0.5);
2082 2045
2083 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2084 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2085 : ($self->{h} - $size->[1]) * 0.5); 2048 : ($self->{h} - $size->[1]) * 0.5);
2049
2050 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2086 }; 2051 };
2087 2052
2088 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2053# unless ($self->{list}) {
2089 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2054# $self->{list} = CFPlus::OpenGL::glGenList;
2090 2055# CFPlus::OpenGL::glNewList $self->{list};
2091 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2056# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2057# CFPlus::OpenGL::glEndList;
2058# }
2059#
2060# CFPlus::OpenGL::glCallList $self->{list};
2061
2062 $self->{layout}->draw;
2092} 2063}
2064
2065#sub destroy {
2066# my ($self) = @_;
2067#
2068# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2069#
2070# $self->SUPER::destroy;
2071#}
2093 2072
2094############################################################################# 2073#############################################################################
2095 2074
2096package CFPlus::UI::EntryBase; 2075package CFPlus::UI::EntryBase;
2097 2076
… …
2103 my $class = shift; 2082 my $class = shift;
2104 2083
2105 $class->SUPER::new ( 2084 $class->SUPER::new (
2106 fg => [1, 1, 1], 2085 fg => [1, 1, 1],
2107 bg => [0, 0, 0, 0.2], 2086 bg => [0, 0, 0, 0.2],
2087 outline => [0.6, 0.3, 0.1],
2108 active_bg => [1, 1, 1, 0.5], 2088 active_bg => [0, 0, 1, .2],
2109 active_fg => [0, 0, 0], 2089 active_fg => [1, 1, 1],
2090 active_outline => [1, 1, 0],
2110 can_hover => 1, 2091 can_hover => 1,
2111 can_focus => 1, 2092 can_focus => 1,
2112 valign => 0, 2093 valign => 0,
2113 can_events => 1, 2094 can_events => 1,
2114 ellipsise => 0, 2095 ellipsise => 0,
… …
2271 2252
2272 unless (exists $self->{cur_h}) { 2253 unless (exists $self->{cur_h}) {
2273 my $text = substr $self->{text}, 0, $self->{cursor}; 2254 my $text = substr $self->{text}, 0, $self->{cursor};
2274 utf8::encode $text; 2255 utf8::encode $text;
2275 2256
2276 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2277 } 2258 }
2278 2259
2260 glColor_premultiply @{$self->{active_fg}};
2279 glBegin GL_LINES; 2261 glBegin GL_LINES;
2280 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2262 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2281 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2263 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2264 glEnd;
2265
2266 glLineWidth 3;
2267 glColor @{$self->{active_outline}};
2268 glBegin GL_LINE_LOOP;
2269 glVertex 0, 0;
2270 glVertex $self->{w} - 1, 0;
2271 glVertex $self->{w} - 1, $self->{h} - 1;
2272 glVertex 0, $self->{h} - 1;
2273 glEnd;
2274 glLineWidth 1;
2275
2276 } else {
2277 glColor @{$self->{outline}};
2278 glTranslate .375, .375;
2279 glBegin GL_LINE_STRIP;
2280 glVertex 0, $self->{h} * .5;
2281 glVertex 0, $self->{h} - 3;
2282 glVertex $self->{w} - 1, $self->{h} - 3;
2283 glVertex $self->{w} - 1, $self->{h} * .5;
2282 glEnd; 2284 glEnd;
2283 } 2285 }
2284} 2286}
2285 2287
2286############################################################################# 2288#############################################################################
… …
2373 1 2375 1
2374} 2376}
2375 2377
2376############################################################################# 2378#############################################################################
2377 2379
2378package CFPlus::UI::Button; 2380package CFPlus::UI::ButtonBin;
2379 2381
2380our @ISA = CFPlus::UI::Label::; 2382our @ISA = CFPlus::UI::Bin::;
2381 2383
2382use CFPlus::OpenGL; 2384use CFPlus::OpenGL;
2383 2385
2384my @tex = 2386my @tex =
2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2387 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2386 qw(b1_button_active.png); 2388 qw(b1_button_inactive.png b1_button_active.png);
2387 2389
2388sub new { 2390sub new {
2389 my $class = shift; 2391 my $class = shift;
2390 2392
2391 $class->SUPER::new ( 2393 $class->SUPER::new (
2392 padding_x => 4,
2393 padding_y => 4,
2394 fg => [1, 1, 1],
2395 active_fg => [0, 0, 1],
2396 can_hover => 1, 2394 can_hover => 1,
2397 align => 0, 2395 align => 0,
2398 valign => 0, 2396 valign => 0,
2399 can_events => 1, 2397 can_events => 1,
2400 @_ 2398 @_
… …
2412} 2410}
2413 2411
2414sub _draw { 2412sub _draw {
2415 my ($self) = @_; 2413 my ($self) = @_;
2416 2414
2417 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2418
2419 glEnable GL_TEXTURE_2D; 2415 glEnable GL_TEXTURE_2D;
2420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2421 glColor 0, 0, 0, 1; 2417 glColor 0, 0, 0, 1;
2422 2418
2419 my $tex = $tex[$GRAB == $self];
2423 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2420 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2421
2422 glDisable GL_TEXTURE_2D;
2423
2424 $self->SUPER::_draw;
2425}
2426
2427#############################################################################
2428
2429package CFPlus::UI::Button;
2430
2431our @ISA = CFPlus::UI::Label::;
2432
2433use CFPlus::OpenGL;
2434
2435my @tex =
2436 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2437 qw(b1_button_inactive.png b1_button_active.png);
2438
2439sub new {
2440 my $class = shift;
2441
2442 $class->SUPER::new (
2443 padding_x => 4,
2444 padding_y => 4,
2445 fg => [1.0, 1.0, 1.0],
2446 active_fg => [0.8, 0.8, 0.8],
2447 can_hover => 1,
2448 align => 0,
2449 valign => 0,
2450 can_events => 1,
2451 @_
2452 )
2453}
2454
2455sub invoke_button_up {
2456 my ($self, $ev, $x, $y) = @_;
2457
2458 $self->emit ("activate")
2459 if $x >= 0 && $x < $self->{w}
2460 && $y >= 0 && $y < $self->{h};
2461
2462 1
2463}
2464
2465sub _draw {
2466 my ($self) = @_;
2467
2468 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2469
2470 glEnable GL_TEXTURE_2D;
2471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2472 glColor 0, 0, 0, 1;
2473
2474 my $tex = $tex[$GRAB == $self];
2475 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2424 2476
2425 glDisable GL_TEXTURE_2D; 2477 glDisable GL_TEXTURE_2D;
2426 2478
2427 $self->SUPER::_draw; 2479 $self->SUPER::_draw;
2428} 2480}
… …
2515sub new { 2567sub new {
2516 my $class = shift; 2568 my $class = shift;
2517 2569
2518 my $self = $class->SUPER::new ( 2570 my $self = $class->SUPER::new (
2519 can_events => 0, 2571 can_events => 0,
2572 scale => 1,
2520 @_, 2573 @_,
2521 ); 2574 );
2522 2575
2523 $self->{path} || $self->{tex} 2576 $self->{path} || $self->{tex}
2524 or Carp::croak "'path' or 'tex' attributes required"; 2577 or Carp::croak "'path' or 'tex' attributes required";
… …
2549} 2602}
2550 2603
2551sub size_request { 2604sub size_request {
2552 my ($self) = @_; 2605 my ($self) = @_;
2553 2606
2554 ($self->{tex}{w}, $self->{tex}{h}) 2607 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2555} 2608}
2556 2609
2557sub _draw { 2610sub _draw {
2558 my ($self) = @_; 2611 my ($self) = @_;
2559 2612
… …
2569 } 2622 }
2570 2623
2571 glEnable GL_TEXTURE_2D; 2624 glEnable GL_TEXTURE_2D;
2572 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2573 2626
2574 $tex->draw_quad (0, 0, $w, $h); 2627 $tex->draw_quad_alpha (0, 0, $w, $h);
2575 2628
2576 glDisable GL_TEXTURE_2D; 2629 glDisable GL_TEXTURE_2D;
2577} 2630}
2578 2631
2579############################################################################# 2632#############################################################################
… …
2881 2934
2882 $self->SUPER::invoke_button_down ($ev, $x, $y); 2935 $self->SUPER::invoke_button_down ($ev, $x, $y);
2883 2936
2884 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2937 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2885 2938
2886 $self->invoke_mouse_motion ($ev, $x, $y) 2939 $self->invoke_mouse_motion ($ev, $x, $y);
2940
2941 1
2887} 2942}
2888 2943
2889sub invoke_mouse_motion { 2944sub invoke_mouse_motion {
2890 my ($self, $ev, $x, $y) = @_; 2945 my ($self, $ev, $x, $y) = @_;
2891 2946
… …
2911 2966
2912 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2967 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2913 2968
2914 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2969 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2915 2970
2916 ! ! $delta 2971 1
2917} 2972}
2918 2973
2919sub update { 2974sub update {
2920 my ($self) = @_; 2975 my ($self) = @_;
2921 2976
… …
3052} 3107}
3053 3108
3054sub size_request { 3109sub size_request {
3055 my ($self) = @_; 3110 my ($self) = @_;
3056 3111
3057 my ($empty, $slider) = @{ $self->{children} }; 3112 my ($empty, $slider) = $self->visible_children;
3058 3113
3059 local $self->{children} = [$empty, $slider]; 3114 local $self->{children} = [$empty, $slider];
3060 $self->SUPER::size_request 3115 $self->SUPER::size_request
3061} 3116}
3062 3117
… …
3251 3306
3252 if ($y0 < $y + $h && $y < $y1) { 3307 if ($y0 < $y + $h && $y < $y1) {
3253 my $layout = $self->get_layout ($para); 3308 my $layout = $self->get_layout ($para);
3254 3309
3255 $layout->render ($para->{indent}, $y - $y0); 3310 $layout->render ($para->{indent}, $y - $y0);
3311 $layout->draw;
3256 3312
3257 if (my @w = @{ $para->{widget} }) { 3313 if (my @w = @{ $para->{widget} }) {
3258 my @s = $layout->get_shapes; 3314 my @s = $layout->get_shapes;
3259 3315
3260 for (@w) { 3316 for (@w) {
… …
3451 glTranslate 0.375, 0.375; 3507 glTranslate 0.375, 0.375;
3452 3508
3453 my ($w, $h) = @$self{qw(w h)}; 3509 my ($w, $h) = @$self{qw(w h)};
3454 3510
3455 glColor 1, 0.8, 0.4; 3511 glColor 1, 0.8, 0.4;
3456 glBegin GL_QUADS; 3512 glRect 0, 0, $w, $h;
3457 glVertex 0 , 0;
3458 glVertex 0 , $h;
3459 glVertex $w, $h;
3460 glVertex $w, 0;
3461 glEnd;
3462 3513
3463 glColor 0, 0, 0; 3514 glColor 0, 0, 0;
3464 glBegin GL_LINE_LOOP; 3515 glBegin GL_LINE_LOOP;
3465 glVertex 0 , 0; 3516 glVertex 0 , 0;
3466 glVertex 0 , $h; 3517 glVertex 0 , $h;
… …
3493 ); 3544 );
3494 3545
3495 if ($self->{anim} && $self->{animspeed}) { 3546 if ($self->{anim} && $self->{animspeed}) {
3496 CFPlus::weaken (my $widget = $self); 3547 CFPlus::weaken (my $widget = $self);
3497 3548
3549 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3550 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3498 $self->{timer} = Event->timer ( 3551 $self->{timer} = Event->timer (
3499 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3500 hard => 1, 3552 parked => 1,
3501 interval => $self->{animspeed},
3502 cb => sub { 3553 cb => sub {
3503 return unless $::CONN; 3554 return unless $::CONN && $widget;
3504 3555
3505 ++$widget->{frame}; 3556 ++$widget->{frame};
3506 $self->update_face; 3557 $widget->update_face;
3507 $self->update; 3558 $widget->update;
3559
3560 $widget->update_timer;
3508 }, 3561 },
3509 ); 3562 );
3510 3563
3511 $self->update_face; 3564 $self->update_face;
3565 $self->update_timer;
3512 } 3566 }
3513 3567
3514 $self 3568 $self
3569}
3570
3571sub update_timer {
3572 my ($self) = @_;
3573
3574 return unless $self->{timer};
3575
3576 if ($self->{visible}) {
3577 $self->{timer}->at (
3578 $self->{anim_start}
3579 + $self->{animspeed}
3580 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3581 );
3582 $self->{timer}->start;
3583 } else {
3584 $self->{timer}->stop;
3585 }
3515} 3586}
3516 3587
3517sub update_face { 3588sub update_face {
3518 my ($self) = @_; 3589 my ($self) = @_;
3519 3590
… …
3521 3592
3522 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3593 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3523 if ($anim && @$anim) { 3594 if ($anim && @$anim) {
3524 delete $self->{wait_face}; 3595 delete $self->{wait_face};
3525 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3596 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3597 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]) {
3598 unless ($tex->{name} || $tex->{loading}) {
3599 $tex->upload (sub { $self->reconfigure });
3600 }
3601 }
3526 } 3602 }
3527 } 3603 }
3528} 3604}
3529 3605
3530sub size_request { 3606sub size_request {
3531 my ($self) = @_; 3607 my ($self) = @_;
3532 3608
3533 if ($::CONN) { 3609 if ($::CONN) {
3534 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3610 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3535 if (my $tex = $::CONN->{texture}[$faceid]) { 3611 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3612 if ($tex->{name}) {
3536 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3613 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3614 } elsif (!$tex->{loading}) {
3615 $tex->upload (sub { $self->reconfigure });
3616 }
3537 } else { 3617 } else {
3538 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3618 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3539 $self->realloc; 3619 $self->reconfigure;
3540 }); 3620 });
3541 } 3621 }
3542 } 3622 }
3543 } 3623 }
3544 3624
… …
3551 return unless $self->{visible}; 3631 return unless $self->{visible};
3552 3632
3553 $self->SUPER::update; 3633 $self->SUPER::update;
3554} 3634}
3555 3635
3636sub invoke_visibility_change {
3637 my ($self) = @_;
3638
3639 $self->update_timer;
3640
3641 0
3642}
3643
3556sub _draw { 3644sub _draw {
3557 my ($self) = @_; 3645 my ($self) = @_;
3558 3646
3559 return unless $::CONN;
3560
3561 $self->SUPER::_draw; 3647 $self->SUPER::_draw;
3562 3648
3563 my $faceid = $::CONN->{faceid}[$self->{face}] 3649 if (my $tex = $self->{tex}) {
3564 or return;
3565
3566 my $tex = $::CONN->{texture}[$faceid];
3567
3568 if ($tex) {
3569 glEnable GL_TEXTURE_2D; 3650 glEnable GL_TEXTURE_2D;
3570 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3651 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3571 glColor 0, 0, 0, 1; 3652 glColor 0, 0, 0, 1;
3572 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3653 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3573 glDisable GL_TEXTURE_2D; 3654 glDisable GL_TEXTURE_2D;
… …
3575} 3656}
3576 3657
3577sub destroy { 3658sub destroy {
3578 my ($self) = @_; 3659 my ($self) = @_;
3579 3660
3580 $self->{timer}->cancel 3661 (delete $self->{timer})->cancel
3581 if $self->{timer}; 3662 if $self->{timer};
3582 3663
3583 $self->SUPER::destroy; 3664 $self->SUPER::destroy;
3584} 3665}
3585 3666
… …
3625 children => [ 3706 children => [
3626 (new CFPlus::UI::Label markup => $left, expand => 1), 3707 (new CFPlus::UI::Label markup => $left, expand => 1),
3627 (new CFPlus::UI::Label markup => $right, align => +1), 3708 (new CFPlus::UI::Label markup => $right, align => +1),
3628 ], 3709 ],
3629 ; 3710 ;
3630 3711
3631 } else { 3712 } else {
3632 $widget = new CFPlus::UI::Label 3713 $widget = new CFPlus::UI::Label
3633 can_hover => 1, 3714 can_hover => 1,
3634 can_events => 1, 3715 can_events => 1,
3635 markup => $widget, 3716 markup => $widget,
… …
3771 buttonbar => (new CFPlus::UI::Buttonbar), 3852 buttonbar => (new CFPlus::UI::Buttonbar),
3772 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3853 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3773 # filter => # will be put between multiplexer and $self 3854 # filter => # will be put between multiplexer and $self
3774 @_, 3855 @_,
3775 ); 3856 );
3776 3857
3777 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3858 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3778 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3859 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3779 3860
3861 {
3862 Scalar::Util::weaken (my $wself = $self);
3863
3864 $self->{multiplexer}->connect (c_add => sub {
3865 my ($mplex, $widgets) = @_;
3866
3867 for my $child (@$widgets) {
3868 Scalar::Util::weaken $child;
3869 $child->{c_tab_} ||= do {
3870 my $tab =
3871 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3872 ? $child->{c_tab}
3873 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3874
3875 $tab->connect (activate => sub {
3876 $wself->set_current_page ($child);
3877 });
3878
3879 $tab
3880 };
3881
3882 $self->{buttonbar}->add ($child->{c_tab_});
3883 }
3884 });
3885
3886 $self->{multiplexer}->connect (c_remove => sub {
3887 my ($mplex, $widgets) = @_;
3888
3889 for my $child (@$widgets) {
3890 $wself->{buttonbar}->remove ($child->{c_tab_});
3891 }
3892 });
3893 }
3894
3780 $self 3895 $self
3781} 3896}
3782 3897
3783sub add { 3898sub add {
3899 my ($self, @widgets) = @_;
3900
3901 $self->{multiplexer}->add (@widgets)
3902}
3903
3904sub remove {
3905 my ($self, @widgets) = @_;
3906
3907 $self->{multiplexer}->remove (@widgets)
3908}
3909
3910sub pages {
3911 my ($self) = @_;
3912 $self->{multiplexer}->children
3913}
3914
3915sub add_tab {
3784 my ($self, $title, $widget, $tooltip) = @_; 3916 my ($self, $title, $widget, $tooltip) = @_;
3785 3917
3786 CFPlus::weaken $self; 3918 $title = [$title, $tooltip] unless ref $title;
3919 $widget->{c_tab} = $title;
3787 3920
3788 $self->{buttonbar}->add (new CFPlus::UI::Button
3789 markup => $title,
3790 tooltip => $tooltip,
3791 on_activate => sub { $self->set_current_page ($widget) },
3792 );
3793
3794 $self->{multiplexer}->add ($widget); 3921 $self->add ($widget);
3795} 3922}
3796 3923
3797sub get_current_page { 3924sub get_current_page {
3798 my ($self) = @_; 3925 my ($self) = @_;
3799 3926
… …
4082} 4209}
4083 4210
4084sub update { 4211sub update {
4085 my ($self) = @_; 4212 my ($self) = @_;
4086 4213
4087 $::WANT_REFRESH++; 4214 $::WANT_REFRESH->start;
4088} 4215}
4089 4216
4090sub add { 4217sub add {
4091 my ($self, @children) = @_; 4218 my ($self, @children) = @_;
4092 4219
… …
4129 while ($self->{refresh_hook}) { 4256 while ($self->{refresh_hook}) {
4130 $_->() 4257 $_->()
4131 for values %{delete $self->{refresh_hook}}; 4258 for values %{delete $self->{refresh_hook}};
4132 } 4259 }
4133 4260
4134 if ($self->{realloc}) { 4261 while ($self->{realloc}) {
4135 my %queue; 4262 my %queue;
4136 my @queue; 4263 my @queue;
4137 my $widget; 4264 my $widget;
4138 4265
4139 outer: 4266 outer:
… …
4186 } 4313 }
4187 } 4314 }
4188 4315
4189 delete $self->{realloc}{$widget+0}; 4316 delete $self->{realloc}{$widget+0};
4190 } 4317 }
4191 }
4192 4318
4193 while (my $size_alloc = delete $self->{size_alloc}) { 4319 while (my $size_alloc = delete $self->{size_alloc}) {
4194 my @queue = sort { $b->{visible} <=> $a->{visible} } 4320 my @queue = sort { $a->{visible} <=> $b->{visible} }
4195 values %$size_alloc; 4321 values %$size_alloc;
4196 4322
4197 while () { 4323 while () {
4198 my $widget = pop @queue || last; 4324 my $widget = pop @queue || last;
4199 4325
4200 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4326 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4201 4327
4202 $w = 0 if $w < 0;
4203 $h = 0 if $h < 0;
4204
4205 $w = max $widget->{min_w}, $w; 4328 $w = max $widget->{min_w}, $w;
4206 $h = max $widget->{min_h}, $h; 4329 $h = max $widget->{min_h}, $h;
4207 4330
4208# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4331# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4209# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4332# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4210 4333
4211 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4334 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4212 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4335 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4213 4336
4214 $w = int $w + 0.5; 4337 $w = int $w + 0.5;
4215 $h = int $h + 0.5; 4338 $h = int $h + 0.5;
4216 4339
4217 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4340 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4218 $widget->{old_w} = $widget->{w}; 4341 $widget->{old_w} = $widget->{w};
4219 $widget->{old_h} = $widget->{h}; 4342 $widget->{old_h} = $widget->{h};
4220 4343
4221 $widget->{w} = $w; 4344 $widget->{w} = $w;
4222 $widget->{h} = $h; 4345 $widget->{h} = $h;
4223 4346
4224 $widget->emit (size_allocate => $w, $h); 4347 $widget->emit (size_allocate => $w, $h);
4348 }
4225 } 4349 }
4226 } 4350 }
4227 } 4351 }
4228 4352
4229 while ($self->{post_alloc_hook}) { 4353 while ($self->{post_alloc_hook}) {
4230 $_->() 4354 $_->()
4231 for values %{delete $self->{post_alloc_hook}}; 4355 for values %{delete $self->{post_alloc_hook}};
4232 } 4356 }
4233
4234 4357
4235 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4358 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4236 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4359 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4237 glClear GL_COLOR_BUFFER_BIT; 4360 glClear GL_COLOR_BUFFER_BIT;
4238 4361

Diff Legend

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