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.372 by root, Sun Jul 15 22:13:43 2007 UTC vs.
Revision 1.420 by root, Wed Jul 25 15:50:17 2007 UTC

… …
113 } 113 }
114 114
115 if ($GRAB) { 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 117 # mousewheel
118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9; 118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
120 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
121 } else { 125 } else {
122 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
123 } 127 }
124 } 128 }
… …
269 $self->emit ("destroy"); 273 $self->emit ("destroy");
270 %$self = (); 274 %$self = ();
271} 275}
272 276
273sub TO_JSON { 277sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} } 278 { __w_ => $_[0]{s_id} }
275} 279}
276 280
277sub show { 281sub show {
278 my ($self) = @_; 282 my ($self) = @_;
279 283
… …
547 551
548 # parent 552 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 554}
551 555
552sub find_widget { 556#sub find_widget {
553 my ($self, $x, $y) = @_; 557# in .xs
554
555 return () unless $self->{can_events};
556
557 return $self
558 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561 ()
562}
563 558
564sub set_parent { 559sub set_parent {
565 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
566 561
567 CFPlus::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
… …
598 593
599# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
600# functions seems pointless. 595# functions seems pointless.
601our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602 597
603sub draw { 598#sub draw {
604 my ($self) = @_; 599#CFPlus.xs
605
606 return unless $self->{h} && $self->{w};
607
608 # update screen rectangle
609 local $draw_x = $draw_x + $self->{x};
610 local $draw_y = $draw_y + $self->{y};
611
612 # skip widgets that are entirely outside the drawing area
613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
615
616 glPushMatrix;
617 glTranslate $self->{x}, $self->{y}, 0;
618
619 if ($self == $HOVER && $self->{can_hover}) {
620 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
621 glEnable GL_BLEND;
622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623 glBegin GL_QUADS;
624 glVertex 0 , 0;
625 glVertex $self->{w}, 0;
626 glVertex $self->{w}, $self->{h};
627 glVertex 0 , $self->{h};
628 glEnd;
629 glDisable GL_BLEND;
630 }
631
632 if ($ENV{CFPLUS_DEBUG} & 1) {
633 glPushMatrix;
634 glColor 1, 1, 0, 1;
635 glTranslate 0.375, 0.375;
636 glBegin GL_LINE_LOOP;
637 glVertex 0 , 0;
638 glVertex $self->{w} - 1, 0;
639 glVertex $self->{w} - 1, $self->{h} - 1;
640 glVertex 0 , $self->{h} - 1;
641 glEnd;
642 glPopMatrix;
643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
644 }
645
646 $self->_draw;
647 glPopMatrix;
648}
649 600
650sub _draw { 601sub _draw {
651 my ($self) = @_; 602 my ($self) = @_;
652 603
653 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
654} 605}
655 606
656my $cntx;#d#
657sub DESTROY { 607sub DESTROY {
658 my ($self) = @_; 608 my ($self) = @_;
659 609
660 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
661 611
… …
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) = @_;
… …
943} 901}
944 902
945############################################################################# 903#############################################################################
946 904
947package CFPlus::UI::ViewPort; 905package CFPlus::UI::ViewPort;
906
907use List::Util qw(min max);
948 908
949our @ISA = CFPlus::UI::Window::; 909our @ISA = CFPlus::UI::Window::;
950 910
951sub new { 911sub new {
952 my $class = shift; 912 my $class = shift;
… …
961sub size_request { 921sub size_request {
962 my ($self) = @_; 922 my ($self) = @_;
963 923
964 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965 925
966 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
967 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
968 928
969 ($w, $h) 929 ($w, $h)
970} 930}
971 931
972sub invoke_size_allocate { 932sub invoke_size_allocate {
… …
984} 944}
985 945
986sub set_offset { 946sub set_offset {
987 my ($self, $x, $y) = @_; 947 my ($self, $x, $y) = @_;
988 948
949 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
950 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
951
952 if ($x != $self->{view_x} or $y != $self->{view_y}) {
989 $self->{view_x} = int $x; 953 $self->{view_x} = $x;
990 $self->{view_y} = int $y; 954 $self->{view_y} = $y;
991 955
956 $self->emit (changed => $x, $y);
992 $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 }
993} 977}
994 978
995# 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
996sub coord2local { 980sub coord2local {
997 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
… …
1012 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
1013 997
1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 999 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016 ) { 1000 ) {
1017 $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})
1018 } else { 1002 } else {
1019 $self->CFPlus::UI::Base::find_widget ($x, $y) 1003 $self->CFPlus::UI::Base::find_widget ($x, $y)
1020 } 1004 }
1021} 1005}
1022 1006
… …
1043 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1044 1028
1045 my $self; 1029 my $self;
1046 1030
1047 my $hslider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 col => 0,
1033 row => 1,
1048 vertical => 0, 1034 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub { 1036 on_changed => sub {
1051 $self->{hpos} = $_[1]; 1037 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 }, 1039 },
1054 ; 1040 ;
1055 1041
1056 my $vslider = new CFPlus::UI::Slider 1042 my $vslider = new CFPlus::UI::Slider
1043 col => 1,
1044 row => 0,
1057 vertical => 1, 1045 vertical => 1,
1058 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1059 on_changed => sub { 1047 on_changed => sub {
1060 $self->{vpos} = $_[1]; 1048 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1072 row_expand => [1, 0], 1060 row_expand => [1, 0],
1073 %arg, 1061 %arg,
1074 ); 1062 );
1075 1063
1076 $self->{vp} = new CFPlus::UI::ViewPort 1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 col => 0,
1066 row => 0,
1077 expand => 1, 1067 expand => 1,
1078 scroll_x => $self->{scroll_x}, 1068 scroll_x => $self->{scroll_x},
1079 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 },
1080 ; 1083 ;
1081 1084
1082 $self->SUPER::add (0, 0, $self->{vp}); 1085 $self->SUPER::add ($self->{vp});
1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
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
1102sub update_slider {
1103 my ($self) = @_;
1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 if ($self->{scroll_x}) {
1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1110
1111 my $visible = $w1 > $w2;
1112 if ($visible != $self->{hslider_visible}) {
1113 $self->{hslider_visible} = $visible;
1114 $visible ? $self->SUPER::add ($self->{hslider})
1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1117 }
1118
1119 if ($self->{scroll_y}) {
1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1121 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1122
1123 my $visible = $h1 > $h2;
1124 if ($visible != $self->{vslider_visible}) {
1125 $self->{vslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{vslider})
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);
1147 };
1148}
1149
1099sub invoke_mouse_wheel { 1150sub invoke_mouse_wheel {
1100 my ($self, $ev) = @_; 1151 my ($self, $ev) = @_;
1101 1152
1102 return 0 unless $ev->{dy}; # only vertical movements
1103
1104 $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};
1105 1155
1106 1 1156 1
1107} 1157}
1108 1158
1109sub update_slider { 1159sub invoke_button_down {
1110 my ($self) = @_; 1160 my ($self, $ev, $x, $y) = @_;
1111 1161
1112 my $child = ($self->{vp} or return)->child; 1162 if ($ev->{button} == 2) {
1163 $self->start_dragging ($ev);
1164 return 1;
1165 }
1113 1166
1114 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1167 0
1115 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1116 #$self->{hslider}->set_visibility ($w1 != $w2);
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120 #$self->{vslider}->set_visibility ($h1 != $h2);
1121} 1168}
1122 1169
1123sub update { 1170sub invoke_button_up {
1124 my ($self) = @_; 1171 my ($self, $ev, $x, $y) = @_;
1125 1172
1126 $self->SUPER::update; 1173 if (delete $self->{motion}) {
1127 $self->update_slider; 1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1128} 1189}
1129 1190
1130sub invoke_size_allocate { 1191sub invoke_size_allocate {
1131 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1132 1193
… …
1288 1349
1289my @border = 1350my @border =
1290 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1291 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);
1292 1353
1354my @icon =
1355 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1356 qw(x1_move.png x1_resize.png);
1357
1293sub new { 1358sub new {
1294 my ($class, %arg) = @_; 1359 my ($class, %arg) = @_;
1295 1360
1296 my $self = $class->SUPER::new ( 1361 my $self = $class->SUPER::new (
1297 bg => [1, 1, 1, 1], 1362 bg => [1, 1, 1, 1],
… …
1465 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1466 1531
1467 my $border = $self->border; 1532 my $border = $self->border;
1468 1533
1469 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1470 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1471 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1472 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1473 $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);
1474 1553
1475 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1476 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1477 1556
1478 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1499 1578
1500############################################################################# 1579#############################################################################
1501 1580
1502package CFPlus::UI::Table; 1581package CFPlus::UI::Table;
1503 1582
1504our @ISA = CFPlus::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1505 1584
1506use List::Util qw(max sum); 1585use List::Util qw(max sum);
1507 1586
1508use CFPlus::OpenGL; 1587use CFPlus::OpenGL;
1509 1588
… …
1515 row_expand => [], 1594 row_expand => [],
1516 @_, 1595 @_,
1517 ) 1596 )
1518} 1597}
1519 1598
1520sub children {
1521 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1522}
1523
1524sub add { 1599sub add {
1600 my ($self, @widgets) = @_;
1601
1602 for my $child (@widgets) {
1603 $child->{rowspan} ||= 1;
1604 $child->{colspan} ||= 1;
1605 }
1606
1607 $self->SUPER::add (@widgets);
1608}
1609
1610sub add_at {
1525 my ($self) = shift; 1611 my $self = shift;
1612
1613 my @widgets;
1526 1614
1527 while (@_) { 1615 while (@_) {
1528 my ($x, $y, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1529 $child->set_parent ($self);
1530 $self->{children}[$y][$x] = $child;
1531 }
1532 1617
1533 $self->{force_realloc} = 1; 1618 $child->{row} = $row;
1534 $self->{force_size_alloc} = 1; 1619 $child->{col} = $col;
1535 $self->realloc;
1536}
1537 1620
1538sub remove { 1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1539 my ($self, $child) = @_; 1628 my ($self) = @_;
1540 1629
1541 # TODO: not yet implemented 1630 my (@w, @h);
1542}
1543
1544# TODO: move to container class maybe? send children a signal on removal?
1545sub clear {
1546 my ($self) = @_;
1547 1631
1548 my @children = $self->children; 1632 my @children = $self->children;
1549 delete $self->{children}; 1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(col req_w 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];
1642 }
1550 1643 }
1551 for (@children) {
1552 delete $_->{parent};
1553 $_->hide;
1554 }
1555 1644
1556 $self->realloc; 1645 # second pass, rows
1557} 1646 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1558
1559sub get_wh {
1560 my ($self) = @_;
1561
1562 my (@w, @h);
1563
1564 for my $y (0 .. $#{$self->{children}}) {
1565 my $row = $self->{children}[$y]
1566 or next;
1567
1568 for my $x (0 .. $#$row) {
1569 my $widget = $row->[$x]
1570 or next;
1571 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1572 1648
1573 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1574 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1575 } 1653 }
1576 } 1654 }
1577 1655
1578 (\@w, \@h) 1656 (\@w, \@h)
1579} 1657}
… …
1595 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1596 1674
1597 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1598 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1599 1677
1600 # TODO: nicer code 1678 # now linearly scale the rows/columns to the allocated size
1601 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1602 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1603 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1604 1682
1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1612 1690
1613 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1614 1692
1615 CFPlus::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1616 1694
1617 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1618 1697
1619 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1620 my $row = $self->{children}[$r] 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1621 or next;
1622 1700
1623 my $x = 0; 1701 $widget->configure (
1624 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1625 1704 );
1626 for my $c (0 .. $#$row) { 1705 }
1627 my $col_w = $ws->[$c];
1628 1706
1629 if (my $widget = $row->[$c]) { 1707 1
1630 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1631 }
1632 1709
1633 $x += $col_w; 1710#############################################################################
1711
1712package CFPlus::UI::Fixed;
1713
1714use List::Util qw(min max);
1715
1716our @ISA = CFPlus::UI::Container::;
1717
1718sub _scale($$$) {
1719 my ($rel, $val, $max) = @_;
1720
1721 $rel ? $val * $max : $val
1722}
1723
1724sub size_request {
1725 my ($self) = @_;
1726
1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1728
1729 # determine overall size by querying abs widgets
1730 for my $child ($self->visible_children) {
1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1734
1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1634 } 1737 }
1738 }
1635 1739
1636 $y += $row_h; 1740 my $W = $x2 - $x1;
1741 my $H = $y2 - $y1;
1742
1743 # now layout remaining widgets
1744 for my $child ($self->visible_children) {
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;
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1751 }
1752 }
1753
1754 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1;
1756
1757 ($W, $H)
1758}
1759
1760sub invoke_size_allocate {
1761 my ($self, $W, $H) = @_;
1762
1763 for my $child ($self->visible_children) {
1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1766
1767 $x += $child->{c_halign} * $child->{req_w};
1768 $y += $child->{c_valign} * $child->{req_h};
1769
1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1637 } 1771 }
1638 1772
1639 1 1773 1
1640} 1774}
1641 1775
1642sub find_widget {
1643 my ($self, $x, $y) = @_;
1644
1645 $x -= $self->{x};
1646 $y -= $self->{y};
1647
1648 my $res;
1649
1650 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1651 $res = $_->find_widget ($x, $y)
1652 and return $res;
1653 }
1654
1655 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1656}
1657
1658sub _draw {
1659 my ($self) = @_;
1660
1661 for (grep $_, @{$self->{children}}) {
1662 $_->draw for grep $_, @$_;
1663 }
1664}
1665
1666############################################################################# 1776#############################################################################
1667 1777
1668package CFPlus::UI::Box; 1778package CFPlus::UI::Box;
1669 1779
1670our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1671 1781
1672sub size_request { 1782sub size_request {
1673 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1674 1786
1675 $self->{vertical} 1787 $self->{vertical}
1676 ? ( 1788 ? (
1677 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1678 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1679 ) 1791 )
1680 : ( 1792 : (
1681 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1682 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1683 ) 1795 )
1684} 1796}
1685 1797
1686sub invoke_size_allocate { 1798sub invoke_size_allocate {
1687 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1928 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1929 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1930 : ($self->{h} - $size->[1]) * 0.5); 2042 : ($self->{h} - $size->[1]) * 0.5);
1931 }; 2043 };
1932 2044
1933 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2045# unless ($self->{list}) {
1934 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2046# $self->{list} = CFPlus::OpenGL::glGenList;
2047# CFPlus::OpenGL::glNewList $self->{list};
2048# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2049# CFPlus::OpenGL::glEndList;
2050# }
2051#
2052# CFPlus::OpenGL::glCallList $self->{list};
1935 2053
1936 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1937} 2055}
2056
2057#sub destroy {
2058# my ($self) = @_;
2059#
2060# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2061#
2062# $self->SUPER::destroy;
2063#}
1938 2064
1939############################################################################# 2065#############################################################################
1940 2066
1941package CFPlus::UI::EntryBase; 2067package CFPlus::UI::EntryBase;
1942 2068
… …
1948 my $class = shift; 2074 my $class = shift;
1949 2075
1950 $class->SUPER::new ( 2076 $class->SUPER::new (
1951 fg => [1, 1, 1], 2077 fg => [1, 1, 1],
1952 bg => [0, 0, 0, 0.2], 2078 bg => [0, 0, 0, 0.2],
2079 outline => [0.6, 0.3, 0.1],
1953 active_bg => [1, 1, 1, 0.5], 2080 active_bg => [0, 0, 1, .2],
1954 active_fg => [0, 0, 0], 2081 active_fg => [1, 1, 1],
2082 active_outline => [1, 1, 0],
1955 can_hover => 1, 2083 can_hover => 1,
1956 can_focus => 1, 2084 can_focus => 1,
1957 valign => 0, 2085 valign => 0,
1958 can_events => 1, 2086 can_events => 1,
1959 ellipsise => 0, 2087 ellipsise => 0,
… …
2116 2244
2117 unless (exists $self->{cur_h}) { 2245 unless (exists $self->{cur_h}) {
2118 my $text = substr $self->{text}, 0, $self->{cursor}; 2246 my $text = substr $self->{text}, 0, $self->{cursor};
2119 utf8::encode $text; 2247 utf8::encode $text;
2120 2248
2121 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2249 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2122 } 2250 }
2123 2251
2252 glColor_premultiply @{$self->{active_fg}};
2124 glBegin GL_LINES; 2253 glBegin GL_LINES;
2125 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2254 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2126 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2255 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2256 glEnd;
2257
2258 glLineWidth 3;
2259 glColor @{$self->{active_outline}};
2260 glBegin GL_LINE_LOOP;
2261 glVertex 0, 0;
2262 glVertex $self->{w} - 1, 0;
2263 glVertex $self->{w} - 1, $self->{h} - 1;
2264 glVertex 0, $self->{h} - 1;
2265 glEnd;
2266 glLineWidth 1;
2267
2268 } else {
2269 glColor @{$self->{outline}};
2270 glTranslate .375, .375;
2271 glBegin GL_LINE_STRIP;
2272 glVertex 0, $self->{h} * .5;
2273 glVertex 0, $self->{h} - 3;
2274 glVertex $self->{w} - 1, $self->{h} - 3;
2275 glVertex $self->{w} - 1, $self->{h} * .5;
2127 glEnd; 2276 glEnd;
2128 } 2277 }
2129} 2278}
2130 2279
2131############################################################################# 2280#############################################################################
… …
2218 1 2367 1
2219} 2368}
2220 2369
2221############################################################################# 2370#############################################################################
2222 2371
2223package CFPlus::UI::Button; 2372package CFPlus::UI::ButtonBin;
2224 2373
2225our @ISA = CFPlus::UI::Label::; 2374our @ISA = CFPlus::UI::Bin::;
2226 2375
2227use CFPlus::OpenGL; 2376use CFPlus::OpenGL;
2228 2377
2229my @tex = 2378my @tex =
2230 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2231 qw(b1_button_active.png); 2380 qw(b1_button_inactive.png b1_button_active.png);
2232 2381
2233sub new { 2382sub new {
2234 my $class = shift; 2383 my $class = shift;
2235 2384
2236 $class->SUPER::new ( 2385 $class->SUPER::new (
2237 padding_x => 4,
2238 padding_y => 4,
2239 fg => [1, 1, 1],
2240 active_fg => [0, 0, 1],
2241 can_hover => 1, 2386 can_hover => 1,
2242 align => 0, 2387 align => 0,
2243 valign => 0, 2388 valign => 0,
2244 can_events => 1, 2389 can_events => 1,
2245 @_ 2390 @_
… …
2257} 2402}
2258 2403
2259sub _draw { 2404sub _draw {
2260 my ($self) = @_; 2405 my ($self) = @_;
2261 2406
2262 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2263
2264 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2266 glColor 0, 0, 0, 1; 2409 glColor 0, 0, 0, 1;
2267 2410
2411 my $tex = $tex[$GRAB == $self];
2268 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2412 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2413
2414 glDisable GL_TEXTURE_2D;
2415
2416 $self->SUPER::_draw;
2417}
2418
2419#############################################################################
2420
2421package CFPlus::UI::Button;
2422
2423our @ISA = CFPlus::UI::Label::;
2424
2425use CFPlus::OpenGL;
2426
2427my @tex =
2428 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2429 qw(b1_button_inactive.png b1_button_active.png);
2430
2431sub new {
2432 my $class = shift;
2433
2434 $class->SUPER::new (
2435 padding_x => 4,
2436 padding_y => 4,
2437 fg => [1.0, 1.0, 1.0],
2438 active_fg => [0.8, 0.8, 0.8],
2439 can_hover => 1,
2440 align => 0,
2441 valign => 0,
2442 can_events => 1,
2443 @_
2444 )
2445}
2446
2447sub invoke_button_up {
2448 my ($self, $ev, $x, $y) = @_;
2449
2450 $self->emit ("activate")
2451 if $x >= 0 && $x < $self->{w}
2452 && $y >= 0 && $y < $self->{h};
2453
2454 1
2455}
2456
2457sub _draw {
2458 my ($self) = @_;
2459
2460 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2461
2462 glEnable GL_TEXTURE_2D;
2463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2464 glColor 0, 0, 0, 1;
2465
2466 my $tex = $tex[$GRAB == $self];
2467 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2269 2468
2270 glDisable GL_TEXTURE_2D; 2469 glDisable GL_TEXTURE_2D;
2271 2470
2272 $self->SUPER::_draw; 2471 $self->SUPER::_draw;
2273} 2472}
… …
2360sub new { 2559sub new {
2361 my $class = shift; 2560 my $class = shift;
2362 2561
2363 my $self = $class->SUPER::new ( 2562 my $self = $class->SUPER::new (
2364 can_events => 0, 2563 can_events => 0,
2564 scale => 1,
2365 @_, 2565 @_,
2366 ); 2566 );
2367 2567
2368 $self->{path} || $self->{tex} 2568 $self->{path} || $self->{tex}
2369 or Carp::croak "'path' or 'tex' attributes required"; 2569 or Carp::croak "'path' or 'tex' attributes required";
… …
2394} 2594}
2395 2595
2396sub size_request { 2596sub size_request {
2397 my ($self) = @_; 2597 my ($self) = @_;
2398 2598
2399 ($self->{tex}{w}, $self->{tex}{h}) 2599 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2400} 2600}
2401 2601
2402sub _draw { 2602sub _draw {
2403 my ($self) = @_; 2603 my ($self) = @_;
2404 2604
… …
2414 } 2614 }
2415 2615
2416 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418 2618
2419 $tex->draw_quad (0, 0, $w, $h); 2619 $tex->draw_quad_alpha (0, 0, $w, $h);
2420 2620
2421 glDisable GL_TEXTURE_2D; 2621 glDisable GL_TEXTURE_2D;
2422} 2622}
2423 2623
2424############################################################################# 2624#############################################################################
… …
2726 2926
2727 $self->SUPER::invoke_button_down ($ev, $x, $y); 2927 $self->SUPER::invoke_button_down ($ev, $x, $y);
2728 2928
2729 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2929 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2730 2930
2731 $self->invoke_mouse_motion ($ev, $x, $y) 2931 $self->invoke_mouse_motion ($ev, $x, $y);
2932
2933 1
2732} 2934}
2733 2935
2734sub invoke_mouse_motion { 2936sub invoke_mouse_motion {
2735 my ($self, $ev, $x, $y) = @_; 2937 my ($self, $ev, $x, $y) = @_;
2736 2938
… …
2756 2958
2757 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2959 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2758 2960
2759 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2961 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2760 2962
2761 ! ! $delta 2963 1
2762} 2964}
2763 2965
2764sub update { 2966sub update {
2765 my ($self) = @_; 2967 my ($self) = @_;
2766 2968
… …
2897} 3099}
2898 3100
2899sub size_request { 3101sub size_request {
2900 my ($self) = @_; 3102 my ($self) = @_;
2901 3103
2902 my ($empty, $slider) = @{ $self->{children} }; 3104 my ($empty, $slider) = $self->visible_children;
2903 3105
2904 local $self->{children} = [$empty, $slider]; 3106 local $self->{children} = [$empty, $slider];
2905 $self->SUPER::size_request 3107 $self->SUPER::size_request
2906} 3108}
2907 3109
… …
3296 glTranslate 0.375, 0.375; 3498 glTranslate 0.375, 0.375;
3297 3499
3298 my ($w, $h) = @$self{qw(w h)}; 3500 my ($w, $h) = @$self{qw(w h)};
3299 3501
3300 glColor 1, 0.8, 0.4; 3502 glColor 1, 0.8, 0.4;
3301 glBegin GL_QUADS; 3503 glRect 0, 0, $w, $h;
3302 glVertex 0 , 0;
3303 glVertex 0 , $h;
3304 glVertex $w, $h;
3305 glVertex $w, 0;
3306 glEnd;
3307 3504
3308 glColor 0, 0, 0; 3505 glColor 0, 0, 0;
3309 glBegin GL_LINE_LOOP; 3506 glBegin GL_LINE_LOOP;
3310 glVertex 0 , 0; 3507 glVertex 0 , 0;
3311 glVertex 0 , $h; 3508 glVertex 0 , $h;
… …
3328 3525
3329sub new { 3526sub new {
3330 my $class = shift; 3527 my $class = shift;
3331 3528
3332 my $self = $class->SUPER::new ( 3529 my $self = $class->SUPER::new (
3530 size_w => 32,
3531 size_h => 8,
3333 aspect => 1, 3532 aspect => 1,
3334 can_events => 0, 3533 can_events => 0,
3335 @_, 3534 @_,
3336 ); 3535 );
3337 3536
3338 if ($self->{anim} && $self->{animspeed}) { 3537 if ($self->{anim} && $self->{animspeed}) {
3339 CFPlus::weaken (my $widget = $self); 3538 CFPlus::weaken (my $widget = $self);
3340 3539
3540 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3541 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3341 $self->{timer} = Event->timer ( 3542 $self->{timer} = Event->timer (
3342 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3343 hard => 1, 3543 parked => 1,
3344 interval => $self->{animspeed},
3345 cb => sub { 3544 cb => sub {
3346 delete $self->{wait_face}; 3545 return unless $::CONN && $widget;
3546
3347 ++$widget->{frame}; 3547 ++$widget->{frame};
3548 $widget->update_face;
3348 $widget->update; 3549 $widget->update;
3550
3551 $widget->update_timer;
3349 }, 3552 },
3350 ); 3553 );
3554
3555 $self->update_face;
3556 $self->update_timer;
3351 } 3557 }
3352 3558
3353 $self 3559 $self
3354} 3560}
3355 3561
3562sub update_timer {
3563 my ($self) = @_;
3564
3565 return unless $self->{timer};
3566
3567 if ($self->{visible}) {
3568 $self->{timer}->at (
3569 $self->{anim_start}
3570 + $self->{animspeed}
3571 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3572 );
3573 $self->{timer}->start;
3574 } else {
3575 $self->{timer}->stop;
3576 }
3577}
3578
3579sub update_face {
3580 my ($self) = @_;
3581
3582 return unless $::CONN;
3583
3584 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3585 if ($anim && @$anim) {
3586 delete $self->{wait_face};
3587 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3588 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3589 }
3590 }
3591}
3592
3356sub size_request { 3593sub size_request {
3357 (32, 8) 3594 my ($self) = @_;
3595
3596 if ($::CONN) {
3597 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3598 if (my $tex = $::CONN->{texture}[$faceid]) {
3599 $self->{tex} = $tex;
3600 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3601 } else {
3602 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3603 $self->realloc;
3604 });
3605 }
3606 }
3607 }
3608
3609 ($self->{size_w} || 8, $self->{size_h} || 8)
3358} 3610}
3359 3611
3360sub update { 3612sub update {
3361 my ($self) = @_; 3613 my ($self) = @_;
3362 3614
3363 return unless $self->{visible}; 3615 return unless $self->{visible};
3364 3616
3365 $self->SUPER::update; 3617 $self->SUPER::update;
3366} 3618}
3367 3619
3620sub invoke_visibility_change {
3621 my ($self) = @_;
3622
3623 $self->update_timer;
3624
3625 0
3626}
3627
3368sub _draw { 3628sub _draw {
3369 my ($self) = @_; 3629 my ($self) = @_;
3370 3630
3371 return unless $::CONN;
3372
3373 $self->SUPER::_draw; 3631 $self->SUPER::_draw;
3374 3632
3375 my $face; 3633 if (my $tex = $self->{tex}) {
3376
3377 if ($self->{frame}) {
3378 my $anim = $::CONN->{anim}[$self->{anim}];
3379
3380 $face = $anim->[ $self->{frame} % @$anim ]
3381 if $anim && @$anim;
3382 }
3383
3384 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3385 or return;
3386
3387 my $tex = $::CONN->{texture}[$faceid];
3388
3389 if ($tex) {
3390 glEnable GL_TEXTURE_2D; 3634 glEnable GL_TEXTURE_2D;
3391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3392 glColor 0, 0, 0, 1; 3636 glColor 0, 0, 0, 1;
3393 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3637 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3394 glDisable GL_TEXTURE_2D; 3638 glDisable GL_TEXTURE_2D;
3395 } else {
3396 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3397 $self->update;
3398 });
3399 } 3639 }
3400} 3640}
3401 3641
3402sub destroy { 3642sub destroy {
3403 my ($self) = @_; 3643 my ($self) = @_;
3404 3644
3405 $self->{timer}->cancel 3645 (delete $self->{timer})->cancel
3406 if $self->{timer}; 3646 if $self->{timer};
3407 3647
3408 $self->SUPER::destroy; 3648 $self->SUPER::destroy;
3409} 3649}
3410 3650
… …
3450 children => [ 3690 children => [
3451 (new CFPlus::UI::Label markup => $left, expand => 1), 3691 (new CFPlus::UI::Label markup => $left, expand => 1),
3452 (new CFPlus::UI::Label markup => $right, align => +1), 3692 (new CFPlus::UI::Label markup => $right, align => +1),
3453 ], 3693 ],
3454 ; 3694 ;
3455 3695
3456 } else { 3696 } else {
3457 $widget = new CFPlus::UI::Label 3697 $widget = new CFPlus::UI::Label
3458 can_hover => 1, 3698 can_hover => 1,
3459 can_events => 1, 3699 can_events => 1,
3460 markup => $widget, 3700 markup => $widget,
… …
3596 buttonbar => (new CFPlus::UI::Buttonbar), 3836 buttonbar => (new CFPlus::UI::Buttonbar),
3597 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3837 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3598 # filter => # will be put between multiplexer and $self 3838 # filter => # will be put between multiplexer and $self
3599 @_, 3839 @_,
3600 ); 3840 );
3601 3841
3602 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3842 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3603 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3843 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3604 3844
3845 {
3846 Scalar::Util::weaken (my $wself = $self);
3847
3848 $self->{multiplexer}->connect (c_add => sub {
3849 my ($mplex, $widgets) = @_;
3850
3851 for my $child (@$widgets) {
3852 Scalar::Util::weaken $child;
3853 $child->{c_tab_} ||= do {
3854 my $tab =
3855 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3856 ? $child->{c_tab}
3857 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3858
3859 $tab->connect (activate => sub {
3860 $wself->set_current_page ($child);
3861 });
3862
3863 $tab
3864 };
3865
3866 $self->{buttonbar}->add ($child->{c_tab_});
3867 }
3868 });
3869
3870 $self->{multiplexer}->connect (c_remove => sub {
3871 my ($mplex, $widgets) = @_;
3872
3873 for my $child (@$widgets) {
3874 $wself->{buttonbar}->remove ($child->{c_tab_});
3875 }
3876 });
3877 }
3878
3605 $self 3879 $self
3606} 3880}
3607 3881
3608sub add { 3882sub add {
3883 my ($self, @widgets) = @_;
3884
3885 $self->{multiplexer}->add (@widgets)
3886}
3887
3888sub remove {
3889 my ($self, @widgets) = @_;
3890
3891 $self->{multiplexer}->remove (@widgets)
3892}
3893
3894sub pages {
3895 my ($self) = @_;
3896 $self->{multiplexer}->children
3897}
3898
3899sub add_tab {
3609 my ($self, $title, $widget, $tooltip) = @_; 3900 my ($self, $title, $widget, $tooltip) = @_;
3610 3901
3611 CFPlus::weaken $self; 3902 $title = [$title, $tooltip] unless ref $title;
3903 $widget->{c_tab} = $title;
3612 3904
3613 $self->{buttonbar}->add (new CFPlus::UI::Button
3614 markup => $title,
3615 tooltip => $tooltip,
3616 on_activate => sub { $self->set_current_page ($widget) },
3617 );
3618
3619 $self->{multiplexer}->add ($widget); 3905 $self->add ($widget);
3620} 3906}
3621 3907
3622sub get_current_page { 3908sub get_current_page {
3623 my ($self) = @_; 3909 my ($self) = @_;
3624 3910
… …
3954 while ($self->{refresh_hook}) { 4240 while ($self->{refresh_hook}) {
3955 $_->() 4241 $_->()
3956 for values %{delete $self->{refresh_hook}}; 4242 for values %{delete $self->{refresh_hook}};
3957 } 4243 }
3958 4244
3959 if ($self->{realloc}) { 4245 while ($self->{realloc}) {
3960 my %queue; 4246 my %queue;
3961 my @queue; 4247 my @queue;
3962 my $widget; 4248 my $widget;
3963 4249
3964 outer: 4250 outer:
… …
4011 } 4297 }
4012 } 4298 }
4013 4299
4014 delete $self->{realloc}{$widget+0}; 4300 delete $self->{realloc}{$widget+0};
4015 } 4301 }
4016 }
4017 4302
4018 while (my $size_alloc = delete $self->{size_alloc}) { 4303 while (my $size_alloc = delete $self->{size_alloc}) {
4019 my @queue = sort { $b->{visible} <=> $a->{visible} } 4304 my @queue = sort { $a->{visible} <=> $b->{visible} }
4020 values %$size_alloc; 4305 values %$size_alloc;
4021 4306
4022 while () { 4307 while () {
4023 my $widget = pop @queue || last; 4308 my $widget = pop @queue || last;
4024 4309
4025 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4310 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4026 4311
4027 $w = 0 if $w < 0;
4028 $h = 0 if $h < 0;
4029
4030 $w = max $widget->{min_w}, $w; 4312 $w = max $widget->{min_w}, $w;
4031 $h = max $widget->{min_h}, $h; 4313 $h = max $widget->{min_h}, $h;
4032 4314
4033# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4315# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4034# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4316# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4035 4317
4036 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4318 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4037 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4319 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4038 4320
4039 $w = int $w + 0.5; 4321 $w = int $w + 0.5;
4040 $h = int $h + 0.5; 4322 $h = int $h + 0.5;
4041 4323
4042 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4324 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4043 $widget->{old_w} = $widget->{w}; 4325 $widget->{old_w} = $widget->{w};
4044 $widget->{old_h} = $widget->{h}; 4326 $widget->{old_h} = $widget->{h};
4045 4327
4046 $widget->{w} = $w; 4328 $widget->{w} = $w;
4047 $widget->{h} = $h; 4329 $widget->{h} = $h;
4048 4330
4049 $widget->emit (size_allocate => $w, $h); 4331 $widget->emit (size_allocate => $w, $h);
4332 }
4050 } 4333 }
4051 } 4334 }
4052 } 4335 }
4053 4336
4054 while ($self->{post_alloc_hook}) { 4337 while ($self->{post_alloc_hook}) {
4055 $_->() 4338 $_->()
4056 for values %{delete $self->{post_alloc_hook}}; 4339 for values %{delete $self->{post_alloc_hook}};
4057 } 4340 }
4058
4059 4341
4060 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4342 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4061 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4343 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4062 glClear GL_COLOR_BUFFER_BIT; 4344 glClear GL_COLOR_BUFFER_BIT;
4063 4345

Diff Legend

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