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.375 by root, Mon Jul 16 20:12:19 2007 UTC vs.
Revision 1.429 by root, Tue Aug 21 00:59:34 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 {
… …
986} 944}
987 945
988sub set_offset { 946sub set_offset {
989 my ($self, $x, $y) = @_; 947 my ($self, $x, $y) = @_;
990 948
991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x; 949 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y; 950 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993 951
952 if ($x != $self->{view_x} or $y != $self->{view_y}) {
953 $self->{view_x} = $x;
954 $self->{view_y} = $y;
955
956 $self->emit (changed => $x, $y);
994 $self->update; 957 $self->update;
958 }
959}
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 }
995} 977}
996 978
997# 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
998sub coord2local { 980sub coord2local {
999 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
… …
1014 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
1015 997
1016 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1017 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 999 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1018 ) { 1000 ) {
1019 $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})
1020 } else { 1002 } else {
1021 $self->CFPlus::UI::Base::find_widget ($x, $y) 1003 $self->CFPlus::UI::Base::find_widget ($x, $y)
1022 } 1004 }
1023} 1005}
1024 1006
… …
1045 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1046 1028
1047 my $self; 1029 my $self;
1048 1030
1049 my $hslider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 c_col => 0,
1033 c_row => 1,
1050 vertical => 0, 1034 vertical => 0,
1051 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
1052 on_changed => sub { 1036 on_changed => sub {
1053 $self->{hpos} = $_[1]; 1037 $self->{hpos} = $_[1];
1054 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1055 }, 1039 },
1056 ; 1040 ;
1057 1041
1058 my $vslider = new CFPlus::UI::Slider 1042 my $vslider = new CFPlus::UI::Slider
1043 c_col => 1,
1044 c_row => 0,
1059 vertical => 1, 1045 vertical => 1,
1060 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1061 on_changed => sub { 1047 on_changed => sub {
1062 $self->{vpos} = $_[1]; 1048 $self->{vpos} = $_[1];
1063 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1074 row_expand => [1, 0], 1060 row_expand => [1, 0],
1075 %arg, 1061 %arg,
1076 ); 1062 );
1077 1063
1078 $self->{vp} = new CFPlus::UI::ViewPort 1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 c_col => 0,
1066 c_row => 0,
1079 expand => 1, 1067 expand => 1,
1080 scroll_x => $self->{scroll_x}, 1068 scroll_x => $self->{scroll_x},
1081 scroll_y => $self->{scroll_y}, 1069 scroll_y => $self->{scroll_y},
1070 on_changed => sub {
1071 my ($vp, $x, $y) = @_;
1072
1073 $vp->{parent}{hslider}->set_value ($x);
1074 $vp->{parent}{vslider}->set_value ($y);
1075
1076 0
1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1082 ; 1083 ;
1083 1084
1084 $self->SUPER::add (0, 0, $self->{vp}); 1085 $self->SUPER::add ($self->{vp});
1085 1086
1086 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
1087 1088
1088 $self 1089 $self
1089} 1090}
1090
1091#TODO# update range on size_allocate depending on child
1092 1091
1093sub add { 1092sub add {
1094 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1095 1094
1096 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1097} 1096}
1098 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1099sub update_slider { 1102sub update_slider {
1100 my ($self) = @_; 1103 my ($self) = @_;
1101 1104
1102 my $child = ($self->{vp} or return)->child; 1105 my $child = ($self->{vp} or return)->child;
1103 1106
1107 if ($self->{scroll_x}) {
1104 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1105 $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]);
1106 1110
1107 my $visible = $w1 > $w2; 1111 my $visible = $w1 > $w2;
1108 if ($visible != $self->{hslider}{visible}) { 1112 if ($visible != $self->{hslider_visible}) {
1113 $self->{hslider_visible} = $visible;
1109 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1114 $visible ? $self->SUPER::add ($self->{hslider})
1110 : $self->{hslider}->hide; 1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1111 } 1117 }
1112 1118
1119 if ($self->{scroll_y}) {
1113 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1114 $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]);
1115 1122
1116 my $visible = $h1 > $h2; 1123 my $visible = $h1 > $h2;
1117 if ($visible != $self->{vslider}{visible}) { 1124 if ($visible != $self->{vslider_visible}) {
1125 $self->{vslider_visible} = $visible;
1118 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1126 $visible ? $self->SUPER::add ($self->{vslider})
1119 : $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);
1120 } 1147 };
1121}
1122
1123sub update {
1124 my ($self) = @_;
1125
1126 $self->SUPER::update;
1127 $self->update_slider;
1128} 1148}
1129 1149
1130sub invoke_mouse_wheel { 1150sub invoke_mouse_wheel {
1131 my ($self, $ev) = @_; 1151 my ($self, $ev) = @_;
1132 1152
1133 return 0 unless $ev->{dy}; # only vertical movements for now
1134
1135 $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};
1136 1155
1137 1 1156 1
1138} 1157}
1139 1158
1140sub invoke_button_down { 1159sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1160 my ($self, $ev, $x, $y) = @_;
1142 1161
1143 if ($ev->{button} == 2) { 1162 if ($ev->{button} == 2) {
1144 $self->grab_focus; 1163 $self->start_dragging ($ev);
1145
1146 $self->{motion} = sub {
1147 my ($ev, $x, $y) = @_;
1148
1149 $self->{vp}->set_offset (
1150 $self->{vp}{view_x} - $ev->{xrel},
1151 $self->{vp}{view_y} - $ev->{yrel},
1152 );
1153 };
1154
1155 return 1; 1164 return 1;
1156 } 1165 }
1157 1166
1158 0 1167 0
1159} 1168}
… …
1340 1349
1341my @border = 1350my @border =
1342 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1343 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);
1344 1353
1354my @icon =
1355 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1356 qw(x1_move.png x1_resize.png);
1357
1345sub new { 1358sub new {
1346 my ($class, %arg) = @_; 1359 my ($class, %arg) = @_;
1347 1360
1348 my $self = $class->SUPER::new ( 1361 my $self = $class->SUPER::new (
1349 bg => [1, 1, 1, 1], 1362 bg => [1, 1, 1, 1],
… …
1517 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1518 1531
1519 my $border = $self->border; 1532 my $border = $self->border;
1520 1533
1521 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1522 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1523 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1524 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1525 $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);
1526 1553
1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1528 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1529 1556
1530 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1551 1578
1552############################################################################# 1579#############################################################################
1553 1580
1554package CFPlus::UI::Table; 1581package CFPlus::UI::Table;
1555 1582
1556our @ISA = CFPlus::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1557 1584
1558use List::Util qw(max sum); 1585use List::Util qw(max sum);
1559 1586
1560use CFPlus::OpenGL; 1587use CFPlus::OpenGL;
1561 1588
1562sub new { 1589sub new {
1563 my $class = shift; 1590 my $class = shift;
1564 1591
1565 $class->SUPER::new ( 1592 $class->SUPER::new (
1566 children => [],
1567 col_expand => [], 1593 col_expand => [],
1568 row_expand => [], 1594 row_expand => [],
1569 @_, 1595 @_,
1570 ) 1596 )
1571} 1597}
1572 1598
1573sub children {
1574 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1575}
1576
1577# TODO: store row/col info in child widget and use standard add/del
1578sub 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 {
1579 my ($self) = shift; 1611 my $self = shift;
1612
1613 my @widgets;
1580 1614
1581 while (@_) { 1615 while (@_) {
1582 my ($x, $y, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1583 $child->set_parent ($self);
1584 $self->{children}[$y][$x] = $child;
1585 }
1586 1617
1587 $self->{force_realloc} = 1; 1618 $child->{c_row} = $row;
1588 $self->{force_size_alloc} = 1; 1619 $child->{c_col} = $col;
1589 $self->realloc;
1590}
1591 1620
1592sub remove { 1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1593 my ($self, $child) = @_; 1628 my ($self) = @_;
1594 1629
1595 for (@{ $self->{children} }) { 1630 my (@w, @h);
1596 for (@{ $_ || [] }) { 1631
1597 $_ = 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];
1598 } 1642 }
1599 } 1643 }
1600}
1601 1644
1602# TODO: move to container class maybe? send children a signal on removal? 1645 # second pass, rows
1603sub clear { 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1604 my ($self) = @_;
1605
1606 my @children = $self->children;
1607 delete $self->{children};
1608
1609 for (@children) {
1610 delete $_->{parent};
1611 $_->hide;
1612 }
1613
1614 $self->realloc;
1615}
1616
1617sub get_wh {
1618 my ($self) = @_;
1619
1620 my (@w, @h);
1621
1622 for my $y (0 .. $#{$self->{children}}) {
1623 my $row = $self->{children}[$y]
1624 or next;
1625
1626 for my $x (0 .. $#$row) {
1627 my $widget = $row->[$x]
1628 or next;
1629 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1630 1648
1631 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1632 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1633 } 1653 }
1634 } 1654 }
1635 1655
1636 (\@w, \@h) 1656 (\@w, \@h)
1637} 1657}
… …
1653 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1654 1674
1655 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1656 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1657 1677
1658 # TODO: nicer code 1678 # now linearly scale the rows/columns to the allocated size
1659 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1660 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1661 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1662 1682
1663 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1670 1690
1671 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1672 1692
1673 CFPlus::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1674 1694
1675 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1676 1697
1677 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1678 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)};
1679 or next;
1680 1700
1681 my $x = 0; 1701 $widget->configure (
1682 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1683 1704 );
1684 for my $c (0 .. $#$row) {
1685 my $col_w = $ws->[$c];
1686
1687 if (my $widget = $row->[$c]) {
1688 $widget->configure ($x, $y, $col_w, $row_h);
1689 }
1690
1691 $x += $col_w;
1692 }
1693
1694 $y += $row_h;
1695 } 1705 }
1696 1706
1697 1 1707 1
1698} 1708}
1699 1709
1700sub find_widget {
1701 my ($self, $x, $y) = @_;
1702
1703 $x -= $self->{x};
1704 $y -= $self->{y};
1705
1706 my $res;
1707
1708 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1709 $res = $_->find_widget ($x, $y)
1710 and return $res;
1711 }
1712
1713 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1714}
1715
1716sub _draw {
1717 my ($self) = @_;
1718
1719 for (grep $_, @{$self->{children}}) {
1720 $_->draw for grep $_, @$_;
1721 }
1722}
1723
1724############################################################################# 1710#############################################################################
1725 1711
1726package CFPlus::UI::Fixed; 1712package CFPlus::UI::Fixed;
1727 1713
1728use List::Util qw(min max); 1714use List::Util qw(min max);
1729 1715
1730our @ISA = CFPlus::UI::Container::; 1716our @ISA = CFPlus::UI::Container::;
1731 1717
1732sub add {
1733 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1734
1735 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1736 $self->SUPER::add ($child);
1737}
1738
1739sub _scale($$$) { 1718sub _scale($$$) {
1740 my ($mode, $val, $max) = @_; 1719 my ($rel, $val, $max) = @_;
1741 1720
1742 $mode eq "abs" ? $val 1721 $rel ? $val * $max : $val
1743 : $mode eq "rel" ? $val * $max
1744 : 0
1745} 1722}
1746 1723
1747sub size_request { 1724sub size_request {
1748 my ($self) = @_; 1725 my ($self) = @_;
1749 1726
1750 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1751 1728
1752 # determine overall size by querying abs widgets 1729 # determine overall size by querying abs widgets
1753 for my $child ($self->visible_children) { 1730 for my $child ($self->visible_children) {
1754 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};
1755 1734
1756 if ($pos eq "abs") {
1757 $w = _scale $size, $w, $child->{req_w};
1758 $h = _scale $size, $h, $child->{req_h};
1759
1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1762 } 1737 }
1763 } 1738 }
1764 1739
1765 my $W = $x2 - $x1; 1740 my $W = $x2 - $x1;
1766 my $H = $y2 - $y1; 1741 my $H = $y2 - $y1;
1767 1742
1768 # now layout remaining widgets 1743 # now layout remaining widgets
1769 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1770 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;
1771 1748
1772 if ($pos ne "abs") {
1773 $x = _scale $pos, $x, $W;
1774 $y = _scale $pos, $x, $H;
1775 $w = _scale $size, $w, $child->{req_w};
1776 $h = _scale $size, $h, $child->{req_h};
1777
1778 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1779 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1780 } 1751 }
1781 } 1752 }
1782 1753
1783 my $W = $x2 - $x1; 1754 my $W = $x2 - $x1;
1784 my $H = $y2 - $y1; 1755 my $H = $y2 - $y1;
… …
1788 1759
1789sub invoke_size_allocate { 1760sub invoke_size_allocate {
1790 my ($self, $W, $H) = @_; 1761 my ($self, $W, $H) = @_;
1791 1762
1792 for my $child ($self->visible_children) { 1763 for my $child ($self->visible_children) {
1793 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;
1794 1766
1795 $x = _scale $pos, $x, $W; 1767 $x += $child->{c_halign} * $child->{req_w};
1796 $y = _scale $pos, $x, $H; 1768 $y += $child->{c_valign} * $child->{req_h};
1797 $w = _scale $size, $w, $child->{req_w};
1798 $h = _scale $size, $h, $child->{req_h};
1799 1769
1800 $child->configure ($x, $y, $w, $h); 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1801 } 1771 }
1802 1772
1803 1 1773 1
1804} 1774}
1805 1775
… …
1809 1779
1810our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1811 1781
1812sub size_request { 1782sub size_request {
1813 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1814 1786
1815 $self->{vertical} 1787 $self->{vertical}
1816 ? ( 1788 ? (
1817 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1818 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1819 ) 1791 )
1820 : ( 1792 : (
1821 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1822 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1823 ) 1795 )
1824} 1796}
1825 1797
1826sub invoke_size_allocate { 1798sub invoke_size_allocate {
1827 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1951 1923
1952 delete $self->{ox}; 1924 delete $self->{ox};
1953 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1954} 1926}
1955 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1956sub set_text { 1934sub set_text {
1957 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1958 1936
1959 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1960 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
… …
2066 : ($self->{w} - $size->[0]) * 0.5); 2044 : ($self->{w} - $size->[0]) * 0.5);
2067 2045
2068 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2069 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2070 : ($self->{h} - $size->[1]) * 0.5); 2048 : ($self->{h} - $size->[1]) * 0.5);
2049
2050 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2071 }; 2051 };
2072 2052
2073 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2053# unless ($self->{list}) {
2074 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2054# $self->{list} = CFPlus::OpenGL::glGenList;
2075 2055# CFPlus::OpenGL::glNewList $self->{list};
2076 $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;
2077} 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#}
2078 2072
2079############################################################################# 2073#############################################################################
2080 2074
2081package CFPlus::UI::EntryBase; 2075package CFPlus::UI::EntryBase;
2082 2076
… …
2088 my $class = shift; 2082 my $class = shift;
2089 2083
2090 $class->SUPER::new ( 2084 $class->SUPER::new (
2091 fg => [1, 1, 1], 2085 fg => [1, 1, 1],
2092 bg => [0, 0, 0, 0.2], 2086 bg => [0, 0, 0, 0.2],
2087 outline => [0.6, 0.3, 0.1],
2093 active_bg => [1, 1, 1, 0.5], 2088 active_bg => [0, 0, 1, .2],
2094 active_fg => [0, 0, 0], 2089 active_fg => [1, 1, 1],
2090 active_outline => [1, 1, 0],
2095 can_hover => 1, 2091 can_hover => 1,
2096 can_focus => 1, 2092 can_focus => 1,
2097 valign => 0, 2093 valign => 0,
2098 can_events => 1, 2094 can_events => 1,
2099 ellipsise => 0, 2095 ellipsise => 0,
… …
2256 2252
2257 unless (exists $self->{cur_h}) { 2253 unless (exists $self->{cur_h}) {
2258 my $text = substr $self->{text}, 0, $self->{cursor}; 2254 my $text = substr $self->{text}, 0, $self->{cursor};
2259 utf8::encode $text; 2255 utf8::encode $text;
2260 2256
2261 @$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);
2262 } 2258 }
2263 2259
2260 glColor_premultiply @{$self->{active_fg}};
2264 glBegin GL_LINES; 2261 glBegin GL_LINES;
2265 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};
2266 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;
2267 glEnd; 2284 glEnd;
2268 } 2285 }
2269} 2286}
2270 2287
2271############################################################################# 2288#############################################################################
… …
2358 1 2375 1
2359} 2376}
2360 2377
2361############################################################################# 2378#############################################################################
2362 2379
2363package CFPlus::UI::Button; 2380package CFPlus::UI::ButtonBin;
2364 2381
2365our @ISA = CFPlus::UI::Label::; 2382our @ISA = CFPlus::UI::Bin::;
2366 2383
2367use CFPlus::OpenGL; 2384use CFPlus::OpenGL;
2368 2385
2369my @tex = 2386my @tex =
2370 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2387 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2371 qw(b1_button_active.png); 2388 qw(b1_button_inactive.png b1_button_active.png);
2372 2389
2373sub new { 2390sub new {
2374 my $class = shift; 2391 my $class = shift;
2375 2392
2376 $class->SUPER::new ( 2393 $class->SUPER::new (
2377 padding_x => 4,
2378 padding_y => 4,
2379 fg => [1, 1, 1],
2380 active_fg => [0, 0, 1],
2381 can_hover => 1, 2394 can_hover => 1,
2382 align => 0, 2395 align => 0,
2383 valign => 0, 2396 valign => 0,
2384 can_events => 1, 2397 can_events => 1,
2385 @_ 2398 @_
… …
2397} 2410}
2398 2411
2399sub _draw { 2412sub _draw {
2400 my ($self) = @_; 2413 my ($self) = @_;
2401 2414
2402 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2403
2404 glEnable GL_TEXTURE_2D; 2415 glEnable GL_TEXTURE_2D;
2405 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2406 glColor 0, 0, 0, 1; 2417 glColor 0, 0, 0, 1;
2407 2418
2419 my $tex = $tex[$GRAB == $self];
2408 $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});
2409 2476
2410 glDisable GL_TEXTURE_2D; 2477 glDisable GL_TEXTURE_2D;
2411 2478
2412 $self->SUPER::_draw; 2479 $self->SUPER::_draw;
2413} 2480}
… …
2500sub new { 2567sub new {
2501 my $class = shift; 2568 my $class = shift;
2502 2569
2503 my $self = $class->SUPER::new ( 2570 my $self = $class->SUPER::new (
2504 can_events => 0, 2571 can_events => 0,
2572 scale => 1,
2505 @_, 2573 @_,
2506 ); 2574 );
2507 2575
2508 $self->{path} || $self->{tex} 2576 $self->{path} || $self->{tex}
2509 or Carp::croak "'path' or 'tex' attributes required"; 2577 or Carp::croak "'path' or 'tex' attributes required";
… …
2534} 2602}
2535 2603
2536sub size_request { 2604sub size_request {
2537 my ($self) = @_; 2605 my ($self) = @_;
2538 2606
2539 ($self->{tex}{w}, $self->{tex}{h}) 2607 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2540} 2608}
2541 2609
2542sub _draw { 2610sub _draw {
2543 my ($self) = @_; 2611 my ($self) = @_;
2544 2612
… …
2554 } 2622 }
2555 2623
2556 glEnable GL_TEXTURE_2D; 2624 glEnable GL_TEXTURE_2D;
2557 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2558 2626
2559 $tex->draw_quad (0, 0, $w, $h); 2627 $tex->draw_quad_alpha (0, 0, $w, $h);
2560 2628
2561 glDisable GL_TEXTURE_2D; 2629 glDisable GL_TEXTURE_2D;
2562} 2630}
2563 2631
2564############################################################################# 2632#############################################################################
… …
2583 align => 0, 2651 align => 0,
2584 valign => 0, 2652 valign => 0,
2585 can_events => 1, 2653 can_events => 1,
2586 @_ 2654 @_
2587 ); 2655 );
2656}
2657
2658sub invoke_button_down {
2659 my ($self, $ev, $x, $y) = @_;
2660
2661 1
2588} 2662}
2589 2663
2590sub invoke_button_up { 2664sub invoke_button_up {
2591 my ($self, $ev, $x, $y) = @_; 2665 my ($self, $ev, $x, $y) = @_;
2592 2666
… …
2866 2940
2867 $self->SUPER::invoke_button_down ($ev, $x, $y); 2941 $self->SUPER::invoke_button_down ($ev, $x, $y);
2868 2942
2869 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2943 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2870 2944
2871 $self->invoke_mouse_motion ($ev, $x, $y) 2945 $self->invoke_mouse_motion ($ev, $x, $y);
2946
2947 1
2872} 2948}
2873 2949
2874sub invoke_mouse_motion { 2950sub invoke_mouse_motion {
2875 my ($self, $ev, $x, $y) = @_; 2951 my ($self, $ev, $x, $y) = @_;
2876 2952
… …
2896 2972
2897 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2973 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2898 2974
2899 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2975 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2900 2976
2901 ! ! $delta 2977 1
2902} 2978}
2903 2979
2904sub update { 2980sub update {
2905 my ($self) = @_; 2981 my ($self) = @_;
2906 2982
… …
3037} 3113}
3038 3114
3039sub size_request { 3115sub size_request {
3040 my ($self) = @_; 3116 my ($self) = @_;
3041 3117
3042 my ($empty, $slider) = @{ $self->{children} }; 3118 my ($empty, $slider) = $self->visible_children;
3043 3119
3044 local $self->{children} = [$empty, $slider]; 3120 local $self->{children} = [$empty, $slider];
3045 $self->SUPER::size_request 3121 $self->SUPER::size_request
3046} 3122}
3047 3123
… …
3236 3312
3237 if ($y0 < $y + $h && $y < $y1) { 3313 if ($y0 < $y + $h && $y < $y1) {
3238 my $layout = $self->get_layout ($para); 3314 my $layout = $self->get_layout ($para);
3239 3315
3240 $layout->render ($para->{indent}, $y - $y0); 3316 $layout->render ($para->{indent}, $y - $y0);
3317 $layout->draw;
3241 3318
3242 if (my @w = @{ $para->{widget} }) { 3319 if (my @w = @{ $para->{widget} }) {
3243 my @s = $layout->get_shapes; 3320 my @s = $layout->get_shapes;
3244 3321
3245 for (@w) { 3322 for (@w) {
… …
3436 glTranslate 0.375, 0.375; 3513 glTranslate 0.375, 0.375;
3437 3514
3438 my ($w, $h) = @$self{qw(w h)}; 3515 my ($w, $h) = @$self{qw(w h)};
3439 3516
3440 glColor 1, 0.8, 0.4; 3517 glColor 1, 0.8, 0.4;
3441 glBegin GL_QUADS; 3518 glRect 0, 0, $w, $h;
3442 glVertex 0 , 0;
3443 glVertex 0 , $h;
3444 glVertex $w, $h;
3445 glVertex $w, 0;
3446 glEnd;
3447 3519
3448 glColor 0, 0, 0; 3520 glColor 0, 0, 0;
3449 glBegin GL_LINE_LOOP; 3521 glBegin GL_LINE_LOOP;
3450 glVertex 0 , 0; 3522 glVertex 0 , 0;
3451 glVertex 0 , $h; 3523 glVertex 0 , $h;
… …
3478 ); 3550 );
3479 3551
3480 if ($self->{anim} && $self->{animspeed}) { 3552 if ($self->{anim} && $self->{animspeed}) {
3481 CFPlus::weaken (my $widget = $self); 3553 CFPlus::weaken (my $widget = $self);
3482 3554
3555 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3556 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3483 $self->{timer} = Event->timer ( 3557 $self->{timer} = Event->timer (
3484 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3485 hard => 1, 3558 parked => 1,
3486 interval => $self->{animspeed},
3487 cb => sub { 3559 cb => sub {
3488 return unless $::CONN; 3560 return unless $::CONN;
3489 3561
3562 my $w = $widget
3563 or return;
3564
3490 ++$widget->{frame}; 3565 ++$w->{frame};
3491 $self->update_face; 3566 $w->update_face;
3567
3568 # somehow, $widget can go away
3492 $self->update; 3569 $w->update;
3570 $w->update_timer;
3493 }, 3571 },
3494 ); 3572 );
3495 3573
3496 $self->update_face; 3574 $self->update_face;
3575 $self->update_timer;
3497 } 3576 }
3498 3577
3499 $self 3578 $self
3500} 3579}
3501 3580
3581sub update_timer {
3582 my ($self) = @_;
3583
3584 return unless $self->{timer};
3585
3586 if ($self->{visible}) {
3587 $self->{timer}->at (
3588 $self->{anim_start}
3589 + $self->{animspeed}
3590 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3591 );
3592 $self->{timer}->start;
3593 } else {
3594 $self->{timer}->stop;
3595 }
3596}
3597
3502sub update_face { 3598sub update_face {
3503 my ($self) = @_; 3599 my ($self) = @_;
3504 3600
3505 return unless $::CONN;
3506
3507 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3508 if ($anim && @$anim) {
3509 delete $self->{wait_face};
3510 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3511 }
3512 }
3513}
3514
3515sub size_request {
3516 my ($self) = @_;
3517
3518 if ($::CONN) { 3601 if ($::CONN) {
3519 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3602 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3520 if (my $tex = $::CONN->{texture}[$faceid]) { 3603 if ($anim && @$anim) {
3521 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3604 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3522 } else { 3605 delete $self->{face_change_cb};
3523 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3606
3524 $self->realloc; 3607 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3608 unless ($tex->{name} || $tex->{loading}) {
3609 $tex->upload (sub { $self->reconfigure });
3610 }
3525 }); 3611 }
3526 } 3612 }
3527 } 3613 }
3528 } 3614 }
3615}
3616
3617sub size_request {
3618 my ($self) = @_;
3619
3620 if ($::CONN) {
3621 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3622 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3623 if ($tex->{name}) {
3624 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3625 } elsif (!$tex->{loading}) {
3626 $tex->upload (sub { $self->reconfigure });
3627 }
3628 }
3629
3630 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3631 }
3632 }
3529 3633
3530 ($self->{size_w} || 8, $self->{size_h} || 8) 3634 ($self->{size_w} || 8, $self->{size_h} || 8)
3531} 3635}
3532 3636
3533sub update { 3637sub update {
… …
3536 return unless $self->{visible}; 3640 return unless $self->{visible};
3537 3641
3538 $self->SUPER::update; 3642 $self->SUPER::update;
3539} 3643}
3540 3644
3645sub invoke_visibility_change {
3646 my ($self) = @_;
3647
3648 $self->update_timer;
3649
3650 0
3651}
3652
3541sub _draw { 3653sub _draw {
3542 my ($self) = @_; 3654 my ($self) = @_;
3543 3655
3544 return unless $::CONN;
3545
3546 $self->SUPER::_draw; 3656 $self->SUPER::_draw;
3547 3657
3548 my $faceid = $::CONN->{faceid}[$self->{face}] 3658 if (my $tex = $self->{tex}) {
3549 or return;
3550
3551 my $tex = $::CONN->{texture}[$faceid];
3552
3553 if ($tex) {
3554 glEnable GL_TEXTURE_2D; 3659 glEnable GL_TEXTURE_2D;
3555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3556 glColor 0, 0, 0, 1; 3661 glColor 0, 0, 0, 1;
3557 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3662 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3558 glDisable GL_TEXTURE_2D; 3663 glDisable GL_TEXTURE_2D;
… …
3560} 3665}
3561 3666
3562sub destroy { 3667sub destroy {
3563 my ($self) = @_; 3668 my ($self) = @_;
3564 3669
3565 $self->{timer}->cancel 3670 (delete $self->{timer})->cancel
3566 if $self->{timer}; 3671 if $self->{timer};
3567 3672
3568 $self->SUPER::destroy; 3673 $self->SUPER::destroy;
3569} 3674}
3570 3675
… …
3610 children => [ 3715 children => [
3611 (new CFPlus::UI::Label markup => $left, expand => 1), 3716 (new CFPlus::UI::Label markup => $left, expand => 1),
3612 (new CFPlus::UI::Label markup => $right, align => +1), 3717 (new CFPlus::UI::Label markup => $right, align => +1),
3613 ], 3718 ],
3614 ; 3719 ;
3615 3720
3616 } else { 3721 } else {
3617 $widget = new CFPlus::UI::Label 3722 $widget = new CFPlus::UI::Label
3618 can_hover => 1, 3723 can_hover => 1,
3619 can_events => 1, 3724 can_events => 1,
3620 markup => $widget, 3725 markup => $widget,
… …
3756 buttonbar => (new CFPlus::UI::Buttonbar), 3861 buttonbar => (new CFPlus::UI::Buttonbar),
3757 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3862 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3758 # filter => # will be put between multiplexer and $self 3863 # filter => # will be put between multiplexer and $self
3759 @_, 3864 @_,
3760 ); 3865 );
3761 3866
3762 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3867 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3763 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3868 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3764 3869
3870 {
3871 Scalar::Util::weaken (my $wself = $self);
3872
3873 $self->{multiplexer}->connect (c_add => sub {
3874 my ($mplex, $widgets) = @_;
3875
3876 for my $child (@$widgets) {
3877 Scalar::Util::weaken $child;
3878 $child->{c_tab_} ||= do {
3879 my $tab =
3880 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3881 ? $child->{c_tab}
3882 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3883
3884 $tab->connect (activate => sub {
3885 $wself->set_current_page ($child);
3886 });
3887
3888 $tab
3889 };
3890
3891 $self->{buttonbar}->add ($child->{c_tab_});
3892 }
3893 });
3894
3895 $self->{multiplexer}->connect (c_remove => sub {
3896 my ($mplex, $widgets) = @_;
3897
3898 for my $child (@$widgets) {
3899 $wself->{buttonbar}->remove ($child->{c_tab_});
3900 }
3901 });
3902 }
3903
3765 $self 3904 $self
3766} 3905}
3767 3906
3768sub add { 3907sub add {
3908 my ($self, @widgets) = @_;
3909
3910 $self->{multiplexer}->add (@widgets)
3911}
3912
3913sub remove {
3914 my ($self, @widgets) = @_;
3915
3916 $self->{multiplexer}->remove (@widgets)
3917}
3918
3919sub pages {
3920 my ($self) = @_;
3921 $self->{multiplexer}->children
3922}
3923
3924sub add_tab {
3769 my ($self, $title, $widget, $tooltip) = @_; 3925 my ($self, $title, $widget, $tooltip) = @_;
3770 3926
3771 CFPlus::weaken $self; 3927 $title = [$title, $tooltip] unless ref $title;
3928 $widget->{c_tab} = $title;
3772 3929
3773 $self->{buttonbar}->add (new CFPlus::UI::Button
3774 markup => $title,
3775 tooltip => $tooltip,
3776 on_activate => sub { $self->set_current_page ($widget) },
3777 );
3778
3779 $self->{multiplexer}->add ($widget); 3930 $self->add ($widget);
3780} 3931}
3781 3932
3782sub get_current_page { 3933sub get_current_page {
3783 my ($self) = @_; 3934 my ($self) = @_;
3784 3935
… …
4067} 4218}
4068 4219
4069sub update { 4220sub update {
4070 my ($self) = @_; 4221 my ($self) = @_;
4071 4222
4072 $::WANT_REFRESH++; 4223 $::WANT_REFRESH->start;
4073} 4224}
4074 4225
4075sub add { 4226sub add {
4076 my ($self, @children) = @_; 4227 my ($self, @children) = @_;
4077 4228
… …
4114 while ($self->{refresh_hook}) { 4265 while ($self->{refresh_hook}) {
4115 $_->() 4266 $_->()
4116 for values %{delete $self->{refresh_hook}}; 4267 for values %{delete $self->{refresh_hook}};
4117 } 4268 }
4118 4269
4119 if ($self->{realloc}) { 4270 while ($self->{realloc}) {
4120 my %queue; 4271 my %queue;
4121 my @queue; 4272 my @queue;
4122 my $widget; 4273 my $widget;
4123 4274
4124 outer: 4275 outer:
… …
4171 } 4322 }
4172 } 4323 }
4173 4324
4174 delete $self->{realloc}{$widget+0}; 4325 delete $self->{realloc}{$widget+0};
4175 } 4326 }
4176 }
4177 4327
4178 while (my $size_alloc = delete $self->{size_alloc}) { 4328 while (my $size_alloc = delete $self->{size_alloc}) {
4179 my @queue = sort { $b->{visible} <=> $a->{visible} } 4329 my @queue = sort { $a->{visible} <=> $b->{visible} }
4180 values %$size_alloc; 4330 values %$size_alloc;
4181 4331
4182 while () { 4332 while () {
4183 my $widget = pop @queue || last; 4333 my $widget = pop @queue || last;
4184 4334
4185 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4335 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4186 4336
4187 $w = 0 if $w < 0;
4188 $h = 0 if $h < 0;
4189
4190 $w = max $widget->{min_w}, $w; 4337 $w = max $widget->{min_w}, $w;
4191 $h = max $widget->{min_h}, $h; 4338 $h = max $widget->{min_h}, $h;
4192 4339
4193# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4340# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4194# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4341# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4195 4342
4196 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4343 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4197 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4344 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4198 4345
4199 $w = int $w + 0.5; 4346 $w = int $w + 0.5;
4200 $h = int $h + 0.5; 4347 $h = int $h + 0.5;
4201 4348
4202 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4349 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4203 $widget->{old_w} = $widget->{w}; 4350 $widget->{old_w} = $widget->{w};
4204 $widget->{old_h} = $widget->{h}; 4351 $widget->{old_h} = $widget->{h};
4205 4352
4206 $widget->{w} = $w; 4353 $widget->{w} = $w;
4207 $widget->{h} = $h; 4354 $widget->{h} = $h;
4208 4355
4209 $widget->emit (size_allocate => $w, $h); 4356 $widget->emit (size_allocate => $w, $h);
4357 }
4210 } 4358 }
4211 } 4359 }
4212 } 4360 }
4213 4361
4214 while ($self->{post_alloc_hook}) { 4362 while ($self->{post_alloc_hook}) {
4215 $_->() 4363 $_->()
4216 for values %{delete $self->{post_alloc_hook}}; 4364 for values %{delete $self->{post_alloc_hook}};
4217 } 4365 }
4218
4219 4366
4220 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4367 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4221 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4368 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4222 glClear GL_COLOR_BUFFER_BIT; 4369 glClear GL_COLOR_BUFFER_BIT;
4223 4370

Diff Legend

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