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.367 by root, Fri Apr 27 00:59:14 2007 UTC vs.
Revision 1.422 by root, Thu Aug 2 14:35:21 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 }
… …
268 $self->hide; 272 $self->hide;
269 $self->emit ("destroy"); 273 $self->emit ("destroy");
270 %$self = (); 274 %$self = ();
271} 275}
272 276
277sub TO_JSON {
278 { __w_ => $_[0]{s_id} }
279}
280
273sub show { 281sub show {
274 my ($self) = @_; 282 my ($self) = @_;
275 283
276 return if $self->{parent}; 284 return if $self->{parent};
277 285
… …
316sub set_visibility { 324sub set_visibility {
317 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
318 326
319 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
320 328
321 $visible ? $self->hide 329 $visible ? $self->show
322 : $self->show; 330 : $self->hide;
323} 331}
324 332
325sub toggle_visibility { 333sub toggle_visibility {
326 my ($self) = @_; 334 my ($self) = @_;
327 335
… …
543 551
544 # parent 552 # parent
545 $self->{parent} && $self->{parent}->emit ($signal, @args) 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
546} 554}
547 555
548sub find_widget { 556#sub find_widget {
549 my ($self, $x, $y) = @_; 557# in .xs
550
551 return () unless $self->{can_events};
552
553 return $self
554 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
555 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
556
557 ()
558}
559 558
560sub set_parent { 559sub set_parent {
561 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
562 561
563 CFPlus::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
… …
594 593
595# 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
596# functions seems pointless. 595# functions seems pointless.
597our ($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
598 597
599sub draw { 598#sub draw {
600 my ($self) = @_; 599#CFPlus.xs
601
602 return unless $self->{h} && $self->{w};
603
604 # update screen rectangle
605 local $draw_x = $draw_x + $self->{x};
606 local $draw_y = $draw_y + $self->{y};
607
608 # skip widgets that are entirely outside the drawing area
609 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
610 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
611
612 glPushMatrix;
613 glTranslate $self->{x}, $self->{y}, 0;
614
615 if ($self == $HOVER && $self->{can_hover}) {
616 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
617 glEnable GL_BLEND;
618 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
619 glBegin GL_QUADS;
620 glVertex 0 , 0;
621 glVertex $self->{w}, 0;
622 glVertex $self->{w}, $self->{h};
623 glVertex 0 , $self->{h};
624 glEnd;
625 glDisable GL_BLEND;
626 }
627
628 if ($ENV{CFPLUS_DEBUG} & 1) {
629 glPushMatrix;
630 glColor 1, 1, 0, 1;
631 glTranslate 0.375, 0.375;
632 glBegin GL_LINE_LOOP;
633 glVertex 0 , 0;
634 glVertex $self->{w} - 1, 0;
635 glVertex $self->{w} - 1, $self->{h} - 1;
636 glVertex 0 , $self->{h} - 1;
637 glEnd;
638 glPopMatrix;
639 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
640 }
641
642 $self->_draw;
643 glPopMatrix;
644}
645 600
646sub _draw { 601sub _draw {
647 my ($self) = @_; 602 my ($self) = @_;
648 603
649 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
650} 605}
651 606
652my $cntx;#d#
653sub DESTROY { 607sub DESTROY {
654 my ($self) = @_; 608 my ($self) = @_;
655 609
656 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
657 611
… …
742 can_events => 0, 696 can_events => 0,
743 %arg, 697 %arg,
744 ); 698 );
745 699
746 $self->add (@$children) 700 $self->add (@$children)
747 if $children; 701 if $children && @$children;
748 702
749 $self 703 $self
750} 704}
751 705
752sub realloc { 706sub realloc {
… …
761 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
762 716
763 $_->set_parent ($self) 717 $_->set_parent ($self)
764 for @widgets; 718 for @widgets;
765 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
766 use sort 'stable'; 721 use sort 'stable';
767 722
768 $self->{children} = [ 723 $self->{children} = [
769 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
771 ]; 726 ];
772 727
773 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
774} 733}
775 734
776sub children { 735sub children {
777 @{ $_[0]{children} } 736 @{ $_[0]{children} }
778} 737}
779 738
780sub remove { 739sub remove {
781 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
782 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
783 delete $child->{parent}; 745 delete $child->{parent};
784 $child->hide; 746 $child->hide;
785
786 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
787 749
788 $self->realloc; 750 $self->realloc;
789} 751}
790 752
791sub clear { 753sub clear {
792 my ($self) = @_; 754 my ($self) = @_;
793 755
794 my $children = delete $self->{children}; 756 my $children = $self->{children};
795 $self->{children} = []; 757 $self->{children} = [];
796 758
797 for (@$children) { 759 for (@$children) {
798 delete $_->{parent}; 760 delete $_->{parent};
799 $_->hide; 761 $_->hide;
… …
819} 781}
820 782
821sub _draw { 783sub _draw {
822 my ($self) = @_; 784 my ($self) = @_;
823 785
824 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
825} 787}
826 788
827############################################################################# 789#############################################################################
828 790
829package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
… …
839} 801}
840 802
841sub add { 803sub add {
842 my ($self, $child) = @_; 804 my ($self, $child) = @_;
843 805
844 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
845 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
846} 808}
847 809
848sub remove { 810sub remove {
849 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
… …
939} 901}
940 902
941############################################################################# 903#############################################################################
942 904
943package CFPlus::UI::ViewPort; 905package CFPlus::UI::ViewPort;
906
907use List::Util qw(min max);
944 908
945our @ISA = CFPlus::UI::Window::; 909our @ISA = CFPlus::UI::Window::;
946 910
947sub new { 911sub new {
948 my $class = shift; 912 my $class = shift;
… …
957sub size_request { 921sub size_request {
958 my ($self) = @_; 922 my ($self) = @_;
959 923
960 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
961 925
962 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
963 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
964 928
965 ($w, $h) 929 ($w, $h)
966} 930}
967 931
968sub invoke_size_allocate { 932sub invoke_size_allocate {
… …
980} 944}
981 945
982sub set_offset { 946sub set_offset {
983 my ($self, $x, $y) = @_; 947 my ($self, $x, $y) = @_;
984 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}) {
985 $self->{view_x} = int $x; 953 $self->{view_x} = $x;
986 $self->{view_y} = int $y; 954 $self->{view_y} = $y;
987 955
956 $self->emit (changed => $x, $y);
988 $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 }
989} 977}
990 978
991# 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
992sub coord2local { 980sub coord2local {
993 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
… …
1008 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
1009 997
1010 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1011 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 999 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1012 ) { 1000 ) {
1013 $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})
1014 } else { 1002 } else {
1015 $self->CFPlus::UI::Base::find_widget ($x, $y) 1003 $self->CFPlus::UI::Base::find_widget ($x, $y)
1016 } 1004 }
1017} 1005}
1018 1006
… …
1029 1017
1030############################################################################# 1018#############################################################################
1031 1019
1032package CFPlus::UI::ScrolledWindow; 1020package CFPlus::UI::ScrolledWindow;
1033 1021
1034our @ISA = CFPlus::UI::HBox::; 1022our @ISA = CFPlus::UI::Table::;
1035 1023
1036sub new { 1024sub new {
1037 my ($class, %arg) = @_; 1025 my ($class, %arg) = @_;
1038 1026
1039 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1040 1028
1041 my $self; 1029 my $self;
1042 1030
1043 my $slider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 c_col => 0,
1033 c_row => 1,
1034 vertical => 0,
1035 range => [0, 0, 1, 0.01], # HACK fix
1036 on_changed => sub {
1037 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039 },
1040 ;
1041
1042 my $vslider = new CFPlus::UI::Slider
1043 c_col => 1,
1044 c_row => 0,
1044 vertical => 1, 1045 vertical => 1,
1045 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1046 on_changed => sub { 1047 on_changed => sub {
1047 $self->{vp}->set_offset (0, $_[1]); 1048 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1048 }, 1050 },
1049 ; 1051 ;
1050 1052
1051 $self = $class->SUPER::new ( 1053 $self = $class->SUPER::new (
1052 vp => (new CFPlus::UI::ViewPort expand => 1), 1054 scroll_x => 0,
1055 scroll_y => 1,
1053 can_events => 1, 1056 can_events => 1,
1054 slider => $slider, 1057 hslider => $hslider,
1058 vslider => $vslider,
1059 col_expand => [1, 0],
1060 row_expand => [1, 0],
1055 %arg, 1061 %arg,
1056 ); 1062 );
1057 1063
1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 c_col => 0,
1066 c_row => 0,
1067 expand => 1,
1068 scroll_x => $self->{scroll_x},
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 },
1083 ;
1084
1058 $self->SUPER::add ($self->{vp}, $self->{slider}); 1085 $self->SUPER::add ($self->{vp});
1086
1059 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
1060 1088
1061 $self 1089 $self
1062} 1090}
1063
1064#TODO# update range on size_allocate depending on child
1065 1091
1066sub add { 1092sub add {
1067 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1068 1094
1069 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1070} 1096}
1071 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
1072sub invoke_mouse_wheel { 1150sub invoke_mouse_wheel {
1073 my ($self, $ev) = @_; 1151 my ($self, $ev) = @_;
1074 1152
1075 return 0 unless $ev->{dy}; # only vertical movements
1076
1077 $self->{slider}->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};
1078 1155
1079 1 1156 1
1080} 1157}
1081 1158
1082sub update_slider { 1159sub invoke_button_down {
1083 my ($self) = @_; 1160 my ($self, $ev, $x, $y) = @_;
1084 1161
1085 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1162 if ($ev->{button} == 2) {
1086} 1163 $self->start_dragging ($ev);
1164 return 1;
1165 }
1087 1166
1088sub update { 1167 0
1089 my ($self) = @_; 1168}
1090 1169
1091 $self->SUPER::update; 1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1092 1172
1093 $self->update_slider; 1173 if (delete $self->{motion}) {
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
1094} 1189}
1095 1190
1096sub invoke_size_allocate { 1191sub invoke_size_allocate {
1097 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1098 1193
1099 $self->update_slider; 1194 $self->update_slider;
1100
1101 $self->SUPER::invoke_size_allocate ($w, $h) 1195 $self->SUPER::invoke_size_allocate ($w, $h)
1102} 1196}
1103 1197
1104############################################################################# 1198#############################################################################
1105 1199
… …
1255 1349
1256my @border = 1350my @border =
1257 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1258 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);
1259 1353
1354my @icon =
1355 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1356 qw(x1_move.png x1_resize.png);
1357
1260sub new { 1358sub new {
1261 my ($class, %arg) = @_; 1359 my ($class, %arg) = @_;
1262 1360
1263 my $self = $class->SUPER::new ( 1361 my $self = $class->SUPER::new (
1264 bg => [1, 1, 1, 1], 1362 bg => [1, 1, 1, 1],
… …
1432 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1433 1531
1434 my $border = $self->border; 1532 my $border = $self->border;
1435 1533
1436 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1437 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1438 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1439 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1440 $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);
1441 1553
1442 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1443 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1444 1556
1445 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1466 1578
1467############################################################################# 1579#############################################################################
1468 1580
1469package CFPlus::UI::Table; 1581package CFPlus::UI::Table;
1470 1582
1471our @ISA = CFPlus::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1472 1584
1473use List::Util qw(max sum); 1585use List::Util qw(max sum);
1474 1586
1475use CFPlus::OpenGL; 1587use CFPlus::OpenGL;
1476 1588
1477sub new { 1589sub new {
1478 my $class = shift; 1590 my $class = shift;
1479 1591
1480 $class->SUPER::new ( 1592 $class->SUPER::new (
1481 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
1482 @_, 1595 @_,
1483 ) 1596 )
1484} 1597}
1485 1598
1486sub children {
1487 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1488}
1489
1490sub 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 {
1491 my ($self) = shift; 1611 my $self = shift;
1612
1613 my @widgets;
1492 1614
1493 while (@_) { 1615 while (@_) {
1494 my ($x, $y, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1495 $child->set_parent ($self);
1496 $self->{children}[$y][$x] = $child;
1497 }
1498 1617
1499 $self->{force_realloc} = 1; 1618 $child->{c_row} = $row;
1500 $self->{force_size_alloc} = 1; 1619 $child->{c_col} = $col;
1501 $self->realloc;
1502}
1503 1620
1504sub remove { 1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1505 my ($self, $child) = @_; 1628 my ($self) = @_;
1506 1629
1507 # TODO: not yet implemented 1630 my (@w, @h);
1508}
1509
1510# TODO: move to container class maybe? send children a signal on removal?
1511sub clear {
1512 my ($self) = @_;
1513 1631
1514 my @children = $self->children; 1632 my @children = $self->children;
1515 delete $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];
1642 }
1516 1643 }
1517 for (@children) {
1518 delete $_->{parent};
1519 $_->hide;
1520 }
1521 1644
1522 $self->realloc; 1645 # second pass, rows
1523} 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1524
1525sub get_wh {
1526 my ($self) = @_;
1527
1528 my (@w, @h);
1529
1530 for my $y (0 .. $#{$self->{children}}) {
1531 my $row = $self->{children}[$y]
1532 or next;
1533
1534 for my $x (0 .. $#$row) {
1535 my $widget = $row->[$x]
1536 or next;
1537 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1538 1648
1539 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1540 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1541 } 1653 }
1542 } 1654 }
1543 1655
1544 (\@w, \@h) 1656 (\@w, \@h)
1545} 1657}
… …
1561 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1562 1674
1563 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1564 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1565 1677
1566 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
1567 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1568 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1569 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1570 1682
1571 # linearly scale sizes
1572 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1573 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1574 1684
1575 CFPlus::UI::harmonize $ws; 1685 CFPlus::UI::harmonize $ws;
1686
1687 my @row_expand = @{$self->{row_expand}};
1688 @row_expand = (1) x @$ws unless @row_expand;
1689 my $row_expand = (sum @row_expand) || 1;
1690
1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1692
1576 CFPlus::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1577 1694
1578 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1579 1697
1580 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1581 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)};
1582 or next;
1583 1700
1584 my $x = 0; 1701 $widget->configure (
1585 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1586 1704 );
1587 for my $c (0 .. $#$row) { 1705 }
1588 my $col_w = $ws->[$c];
1589 1706
1590 if (my $widget = $row->[$c]) { 1707 1
1591 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1592 }
1593 1709
1594 $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};
1595 } 1737 }
1738 }
1596 1739
1597 $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});
1598 } 1771 }
1599 1772
1600 1 1773 1
1601} 1774}
1602 1775
1603sub find_widget {
1604 my ($self, $x, $y) = @_;
1605
1606 $x -= $self->{x};
1607 $y -= $self->{y};
1608
1609 my $res;
1610
1611 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1612 $res = $_->find_widget ($x, $y)
1613 and return $res;
1614 }
1615
1616 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1617}
1618
1619sub _draw {
1620 my ($self) = @_;
1621
1622 for (grep $_, @{$self->{children}}) {
1623 $_->draw for grep $_, @$_;
1624 }
1625}
1626
1627############################################################################# 1776#############################################################################
1628 1777
1629package CFPlus::UI::Box; 1778package CFPlus::UI::Box;
1630 1779
1631our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1632 1781
1633sub size_request { 1782sub size_request {
1634 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1635 1786
1636 $self->{vertical} 1787 $self->{vertical}
1637 ? ( 1788 ? (
1638 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1639 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1640 ) 1791 )
1641 : ( 1792 : (
1642 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1643 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1644 ) 1795 )
1645} 1796}
1646 1797
1647sub invoke_size_allocate { 1798sub invoke_size_allocate {
1648 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1772 1923
1773 delete $self->{ox}; 1924 delete $self->{ox};
1774 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1775} 1926}
1776 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1777sub set_text { 1934sub set_text {
1778 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1779 1936
1780 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1781 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
… …
1889 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1890 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1891 : ($self->{h} - $size->[1]) * 0.5); 2048 : ($self->{h} - $size->[1]) * 0.5);
1892 }; 2049 };
1893 2050
1894 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2051# unless ($self->{list}) {
1895 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2052# $self->{list} = CFPlus::OpenGL::glGenList;
2053# CFPlus::OpenGL::glNewList $self->{list};
2054# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2055# CFPlus::OpenGL::glEndList;
2056# }
2057#
2058# CFPlus::OpenGL::glCallList $self->{list};
1896 2059
1897 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2060 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1898} 2061}
2062
2063#sub destroy {
2064# my ($self) = @_;
2065#
2066# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2067#
2068# $self->SUPER::destroy;
2069#}
1899 2070
1900############################################################################# 2071#############################################################################
1901 2072
1902package CFPlus::UI::EntryBase; 2073package CFPlus::UI::EntryBase;
1903 2074
… …
1909 my $class = shift; 2080 my $class = shift;
1910 2081
1911 $class->SUPER::new ( 2082 $class->SUPER::new (
1912 fg => [1, 1, 1], 2083 fg => [1, 1, 1],
1913 bg => [0, 0, 0, 0.2], 2084 bg => [0, 0, 0, 0.2],
2085 outline => [0.6, 0.3, 0.1],
1914 active_bg => [1, 1, 1, 0.5], 2086 active_bg => [0, 0, 1, .2],
1915 active_fg => [0, 0, 0], 2087 active_fg => [1, 1, 1],
2088 active_outline => [1, 1, 0],
1916 can_hover => 1, 2089 can_hover => 1,
1917 can_focus => 1, 2090 can_focus => 1,
1918 valign => 0, 2091 valign => 0,
1919 can_events => 1, 2092 can_events => 1,
1920 ellipsise => 0, 2093 ellipsise => 0,
… …
2077 2250
2078 unless (exists $self->{cur_h}) { 2251 unless (exists $self->{cur_h}) {
2079 my $text = substr $self->{text}, 0, $self->{cursor}; 2252 my $text = substr $self->{text}, 0, $self->{cursor};
2080 utf8::encode $text; 2253 utf8::encode $text;
2081 2254
2082 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2255 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2083 } 2256 }
2084 2257
2258 glColor_premultiply @{$self->{active_fg}};
2085 glBegin GL_LINES; 2259 glBegin GL_LINES;
2086 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2260 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2087 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2261 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2262 glEnd;
2263
2264 glLineWidth 3;
2265 glColor @{$self->{active_outline}};
2266 glBegin GL_LINE_LOOP;
2267 glVertex 0, 0;
2268 glVertex $self->{w} - 1, 0;
2269 glVertex $self->{w} - 1, $self->{h} - 1;
2270 glVertex 0, $self->{h} - 1;
2271 glEnd;
2272 glLineWidth 1;
2273
2274 } else {
2275 glColor @{$self->{outline}};
2276 glTranslate .375, .375;
2277 glBegin GL_LINE_STRIP;
2278 glVertex 0, $self->{h} * .5;
2279 glVertex 0, $self->{h} - 3;
2280 glVertex $self->{w} - 1, $self->{h} - 3;
2281 glVertex $self->{w} - 1, $self->{h} * .5;
2088 glEnd; 2282 glEnd;
2089 } 2283 }
2090} 2284}
2091 2285
2092############################################################################# 2286#############################################################################
… …
2179 1 2373 1
2180} 2374}
2181 2375
2182############################################################################# 2376#############################################################################
2183 2377
2184package CFPlus::UI::Button; 2378package CFPlus::UI::ButtonBin;
2185 2379
2186our @ISA = CFPlus::UI::Label::; 2380our @ISA = CFPlus::UI::Bin::;
2187 2381
2188use CFPlus::OpenGL; 2382use CFPlus::OpenGL;
2189 2383
2190my @tex = 2384my @tex =
2191 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2192 qw(b1_button_active.png); 2386 qw(b1_button_inactive.png b1_button_active.png);
2193 2387
2194sub new { 2388sub new {
2195 my $class = shift; 2389 my $class = shift;
2196 2390
2197 $class->SUPER::new ( 2391 $class->SUPER::new (
2198 padding_x => 4,
2199 padding_y => 4,
2200 fg => [1, 1, 1],
2201 active_fg => [0, 0, 1],
2202 can_hover => 1, 2392 can_hover => 1,
2203 align => 0, 2393 align => 0,
2204 valign => 0, 2394 valign => 0,
2205 can_events => 1, 2395 can_events => 1,
2206 @_ 2396 @_
… …
2218} 2408}
2219 2409
2220sub _draw { 2410sub _draw {
2221 my ($self) = @_; 2411 my ($self) = @_;
2222 2412
2223 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2224
2225 glEnable GL_TEXTURE_2D; 2413 glEnable GL_TEXTURE_2D;
2226 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2227 glColor 0, 0, 0, 1; 2415 glColor 0, 0, 0, 1;
2228 2416
2417 my $tex = $tex[$GRAB == $self];
2229 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2418 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419
2420 glDisable GL_TEXTURE_2D;
2421
2422 $self->SUPER::_draw;
2423}
2424
2425#############################################################################
2426
2427package CFPlus::UI::Button;
2428
2429our @ISA = CFPlus::UI::Label::;
2430
2431use CFPlus::OpenGL;
2432
2433my @tex =
2434 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2435 qw(b1_button_inactive.png b1_button_active.png);
2436
2437sub new {
2438 my $class = shift;
2439
2440 $class->SUPER::new (
2441 padding_x => 4,
2442 padding_y => 4,
2443 fg => [1.0, 1.0, 1.0],
2444 active_fg => [0.8, 0.8, 0.8],
2445 can_hover => 1,
2446 align => 0,
2447 valign => 0,
2448 can_events => 1,
2449 @_
2450 )
2451}
2452
2453sub invoke_button_up {
2454 my ($self, $ev, $x, $y) = @_;
2455
2456 $self->emit ("activate")
2457 if $x >= 0 && $x < $self->{w}
2458 && $y >= 0 && $y < $self->{h};
2459
2460 1
2461}
2462
2463sub _draw {
2464 my ($self) = @_;
2465
2466 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2467
2468 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 0, 0, 0, 1;
2471
2472 my $tex = $tex[$GRAB == $self];
2473 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2230 2474
2231 glDisable GL_TEXTURE_2D; 2475 glDisable GL_TEXTURE_2D;
2232 2476
2233 $self->SUPER::_draw; 2477 $self->SUPER::_draw;
2234} 2478}
… …
2321sub new { 2565sub new {
2322 my $class = shift; 2566 my $class = shift;
2323 2567
2324 my $self = $class->SUPER::new ( 2568 my $self = $class->SUPER::new (
2325 can_events => 0, 2569 can_events => 0,
2570 scale => 1,
2326 @_, 2571 @_,
2327 ); 2572 );
2328 2573
2329 $self->{path} || $self->{tex} 2574 $self->{path} || $self->{tex}
2330 or Carp::croak "'path' or 'tex' attributes required"; 2575 or Carp::croak "'path' or 'tex' attributes required";
… …
2355} 2600}
2356 2601
2357sub size_request { 2602sub size_request {
2358 my ($self) = @_; 2603 my ($self) = @_;
2359 2604
2360 ($self->{tex}{w}, $self->{tex}{h}) 2605 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2361} 2606}
2362 2607
2363sub _draw { 2608sub _draw {
2364 my ($self) = @_; 2609 my ($self) = @_;
2365 2610
… …
2375 } 2620 }
2376 2621
2377 glEnable GL_TEXTURE_2D; 2622 glEnable GL_TEXTURE_2D;
2378 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2623 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2379 2624
2380 $tex->draw_quad (0, 0, $w, $h); 2625 $tex->draw_quad_alpha (0, 0, $w, $h);
2381 2626
2382 glDisable GL_TEXTURE_2D; 2627 glDisable GL_TEXTURE_2D;
2383} 2628}
2384 2629
2385############################################################################# 2630#############################################################################
… …
2687 2932
2688 $self->SUPER::invoke_button_down ($ev, $x, $y); 2933 $self->SUPER::invoke_button_down ($ev, $x, $y);
2689 2934
2690 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2935 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2691 2936
2692 $self->invoke_mouse_motion ($ev, $x, $y) 2937 $self->invoke_mouse_motion ($ev, $x, $y);
2938
2939 1
2693} 2940}
2694 2941
2695sub invoke_mouse_motion { 2942sub invoke_mouse_motion {
2696 my ($self, $ev, $x, $y) = @_; 2943 my ($self, $ev, $x, $y) = @_;
2697 2944
… …
2717 2964
2718 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2965 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2719 2966
2720 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2967 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2721 2968
2722 ! ! $delta 2969 1
2723} 2970}
2724 2971
2725sub update { 2972sub update {
2726 my ($self) = @_; 2973 my ($self) = @_;
2727 2974
… …
2858} 3105}
2859 3106
2860sub size_request { 3107sub size_request {
2861 my ($self) = @_; 3108 my ($self) = @_;
2862 3109
2863 my ($empty, $slider) = @{ $self->{children} }; 3110 my ($empty, $slider) = $self->visible_children;
2864 3111
2865 local $self->{children} = [$empty, $slider]; 3112 local $self->{children} = [$empty, $slider];
2866 $self->SUPER::size_request 3113 $self->SUPER::size_request
2867} 3114}
2868 3115
… …
3257 glTranslate 0.375, 0.375; 3504 glTranslate 0.375, 0.375;
3258 3505
3259 my ($w, $h) = @$self{qw(w h)}; 3506 my ($w, $h) = @$self{qw(w h)};
3260 3507
3261 glColor 1, 0.8, 0.4; 3508 glColor 1, 0.8, 0.4;
3262 glBegin GL_QUADS; 3509 glRect 0, 0, $w, $h;
3263 glVertex 0 , 0;
3264 glVertex 0 , $h;
3265 glVertex $w, $h;
3266 glVertex $w, 0;
3267 glEnd;
3268 3510
3269 glColor 0, 0, 0; 3511 glColor 0, 0, 0;
3270 glBegin GL_LINE_LOOP; 3512 glBegin GL_LINE_LOOP;
3271 glVertex 0 , 0; 3513 glVertex 0 , 0;
3272 glVertex 0 , $h; 3514 glVertex 0 , $h;
… …
3289 3531
3290sub new { 3532sub new {
3291 my $class = shift; 3533 my $class = shift;
3292 3534
3293 my $self = $class->SUPER::new ( 3535 my $self = $class->SUPER::new (
3536 size_w => 32,
3537 size_h => 8,
3294 aspect => 1, 3538 aspect => 1,
3295 can_events => 0, 3539 can_events => 0,
3296 @_, 3540 @_,
3297 ); 3541 );
3298 3542
3299 if ($self->{anim} && $self->{animspeed}) { 3543 if ($self->{anim} && $self->{animspeed}) {
3300 CFPlus::weaken (my $widget = $self); 3544 CFPlus::weaken (my $widget = $self);
3301 3545
3546 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3547 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3302 $self->{timer} = Event->timer ( 3548 $self->{timer} = Event->timer (
3303 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3304 hard => 1, 3549 parked => 1,
3305 interval => $self->{animspeed},
3306 cb => sub { 3550 cb => sub {
3551 return unless $::CONN && $widget;
3552
3307 ++$widget->{frame}; 3553 ++$widget->{frame};
3554 $widget->update_face;
3308 $widget->update; 3555 $widget->update;
3556
3557 $widget->update_timer;
3309 }, 3558 },
3310 ); 3559 );
3560
3561 $self->update_face;
3562 $self->update_timer;
3311 } 3563 }
3312 3564
3313 $self 3565 $self
3314} 3566}
3315 3567
3568sub update_timer {
3569 my ($self) = @_;
3570
3571 return unless $self->{timer};
3572
3573 if ($self->{visible}) {
3574 $self->{timer}->at (
3575 $self->{anim_start}
3576 + $self->{animspeed}
3577 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3578 );
3579 $self->{timer}->start;
3580 } else {
3581 $self->{timer}->stop;
3582 }
3583}
3584
3585sub update_face {
3586 my ($self) = @_;
3587
3588 return unless $::CONN;
3589
3590 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3591 if ($anim && @$anim) {
3592 delete $self->{wait_face};
3593 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3594 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3595 }
3596 }
3597}
3598
3316sub size_request { 3599sub size_request {
3317 (32, 8) 3600 my ($self) = @_;
3601
3602 if ($::CONN) {
3603 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3604 if (my $tex = $::CONN->{texture}[$faceid]) {
3605 $self->{tex} = $tex;
3606 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3607 } else {
3608 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3609 $self->realloc;
3610 });
3611 }
3612 }
3613 }
3614
3615 ($self->{size_w} || 8, $self->{size_h} || 8)
3318} 3616}
3319 3617
3320sub update { 3618sub update {
3321 my ($self) = @_; 3619 my ($self) = @_;
3322 3620
3323 return unless $self->{visible}; 3621 return unless $self->{visible};
3324 3622
3325 $self->SUPER::update; 3623 $self->SUPER::update;
3326} 3624}
3327 3625
3626sub invoke_visibility_change {
3627 my ($self) = @_;
3628
3629 $self->update_timer;
3630
3631 0
3632}
3633
3328sub _draw { 3634sub _draw {
3329 my ($self) = @_; 3635 my ($self) = @_;
3330 3636
3331 return unless $::CONN;
3332
3333 $self->SUPER::_draw; 3637 $self->SUPER::_draw;
3334 3638
3335 my $face; 3639 if (my $tex = $self->{tex}) {
3336
3337 if ($self->{frame}) {
3338 my $anim = $::CONN->{anim}[$self->{anim}];
3339
3340 $face = $anim->[ $self->{frame} % @$anim ]
3341 if $anim && @$anim;
3342 }
3343
3344 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3345
3346 if ($tex) {
3347 glEnable GL_TEXTURE_2D; 3640 glEnable GL_TEXTURE_2D;
3348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3349 glColor 0, 0, 0, 1; 3642 glColor 0, 0, 0, 1;
3350 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3643 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3351 glDisable GL_TEXTURE_2D; 3644 glDisable GL_TEXTURE_2D;
… …
3353} 3646}
3354 3647
3355sub destroy { 3648sub destroy {
3356 my ($self) = @_; 3649 my ($self) = @_;
3357 3650
3358 $self->{timer}->cancel 3651 (delete $self->{timer})->cancel
3359 if $self->{timer}; 3652 if $self->{timer};
3360 3653
3361 $self->SUPER::destroy; 3654 $self->SUPER::destroy;
3362} 3655}
3363 3656
… …
3403 children => [ 3696 children => [
3404 (new CFPlus::UI::Label markup => $left, expand => 1), 3697 (new CFPlus::UI::Label markup => $left, expand => 1),
3405 (new CFPlus::UI::Label markup => $right, align => +1), 3698 (new CFPlus::UI::Label markup => $right, align => +1),
3406 ], 3699 ],
3407 ; 3700 ;
3408 3701
3409 } else { 3702 } else {
3410 $widget = new CFPlus::UI::Label 3703 $widget = new CFPlus::UI::Label
3411 can_hover => 1, 3704 can_hover => 1,
3412 can_events => 1, 3705 can_events => 1,
3413 markup => $widget, 3706 markup => $widget,
… …
3549 buttonbar => (new CFPlus::UI::Buttonbar), 3842 buttonbar => (new CFPlus::UI::Buttonbar),
3550 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3843 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3551 # filter => # will be put between multiplexer and $self 3844 # filter => # will be put between multiplexer and $self
3552 @_, 3845 @_,
3553 ); 3846 );
3554 3847
3555 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3848 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3556 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3849 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3557 3850
3851 {
3852 Scalar::Util::weaken (my $wself = $self);
3853
3854 $self->{multiplexer}->connect (c_add => sub {
3855 my ($mplex, $widgets) = @_;
3856
3857 for my $child (@$widgets) {
3858 Scalar::Util::weaken $child;
3859 $child->{c_tab_} ||= do {
3860 my $tab =
3861 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3862 ? $child->{c_tab}
3863 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3864
3865 $tab->connect (activate => sub {
3866 $wself->set_current_page ($child);
3867 });
3868
3869 $tab
3870 };
3871
3872 $self->{buttonbar}->add ($child->{c_tab_});
3873 }
3874 });
3875
3876 $self->{multiplexer}->connect (c_remove => sub {
3877 my ($mplex, $widgets) = @_;
3878
3879 for my $child (@$widgets) {
3880 $wself->{buttonbar}->remove ($child->{c_tab_});
3881 }
3882 });
3883 }
3884
3558 $self 3885 $self
3559} 3886}
3560 3887
3561sub add { 3888sub add {
3889 my ($self, @widgets) = @_;
3890
3891 $self->{multiplexer}->add (@widgets)
3892}
3893
3894sub remove {
3895 my ($self, @widgets) = @_;
3896
3897 $self->{multiplexer}->remove (@widgets)
3898}
3899
3900sub pages {
3901 my ($self) = @_;
3902 $self->{multiplexer}->children
3903}
3904
3905sub add_tab {
3562 my ($self, $title, $widget, $tooltip) = @_; 3906 my ($self, $title, $widget, $tooltip) = @_;
3563 3907
3564 CFPlus::weaken $self; 3908 $title = [$title, $tooltip] unless ref $title;
3909 $widget->{c_tab} = $title;
3565 3910
3566 $self->{buttonbar}->add (new CFPlus::UI::Button
3567 markup => $title,
3568 tooltip => $tooltip,
3569 on_activate => sub { $self->set_current_page ($widget) },
3570 );
3571
3572 $self->{multiplexer}->add ($widget); 3911 $self->add ($widget);
3573} 3912}
3574 3913
3575sub get_current_page { 3914sub get_current_page {
3576 my ($self) = @_; 3915 my ($self) = @_;
3577 3916
… …
3907 while ($self->{refresh_hook}) { 4246 while ($self->{refresh_hook}) {
3908 $_->() 4247 $_->()
3909 for values %{delete $self->{refresh_hook}}; 4248 for values %{delete $self->{refresh_hook}};
3910 } 4249 }
3911 4250
3912 if ($self->{realloc}) { 4251 while ($self->{realloc}) {
3913 my %queue; 4252 my %queue;
3914 my @queue; 4253 my @queue;
3915 my $widget; 4254 my $widget;
3916 4255
3917 outer: 4256 outer:
… …
3964 } 4303 }
3965 } 4304 }
3966 4305
3967 delete $self->{realloc}{$widget+0}; 4306 delete $self->{realloc}{$widget+0};
3968 } 4307 }
3969 }
3970 4308
3971 while (my $size_alloc = delete $self->{size_alloc}) { 4309 while (my $size_alloc = delete $self->{size_alloc}) {
3972 my @queue = sort { $b->{visible} <=> $a->{visible} } 4310 my @queue = sort { $a->{visible} <=> $b->{visible} }
3973 values %$size_alloc; 4311 values %$size_alloc;
3974 4312
3975 while () { 4313 while () {
3976 my $widget = pop @queue || last; 4314 my $widget = pop @queue || last;
3977 4315
3978 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4316 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3979 4317
3980 $w = 0 if $w < 0;
3981 $h = 0 if $h < 0;
3982
3983 $w = max $widget->{min_w}, $w; 4318 $w = max $widget->{min_w}, $w;
3984 $h = max $widget->{min_h}, $h; 4319 $h = max $widget->{min_h}, $h;
3985 4320
3986# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4321# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3987# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4322# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3988 4323
3989 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4324 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3990 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4325 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3991 4326
3992 $w = int $w + 0.5; 4327 $w = int $w + 0.5;
3993 $h = int $h + 0.5; 4328 $h = int $h + 0.5;
3994 4329
3995 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4330 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3996 $widget->{old_w} = $widget->{w}; 4331 $widget->{old_w} = $widget->{w};
3997 $widget->{old_h} = $widget->{h}; 4332 $widget->{old_h} = $widget->{h};
3998 4333
3999 $widget->{w} = $w; 4334 $widget->{w} = $w;
4000 $widget->{h} = $h; 4335 $widget->{h} = $h;
4001 4336
4002 $widget->emit (size_allocate => $w, $h); 4337 $widget->emit (size_allocate => $w, $h);
4338 }
4003 } 4339 }
4004 } 4340 }
4005 } 4341 }
4006 4342
4007 while ($self->{post_alloc_hook}) { 4343 while ($self->{post_alloc_hook}) {
4008 $_->() 4344 $_->()
4009 for values %{delete $self->{post_alloc_hook}}; 4345 for values %{delete $self->{post_alloc_hook}};
4010 } 4346 }
4011
4012 4347
4013 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4348 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4014 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4349 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4015 glClear GL_COLOR_BUFFER_BIT; 4350 glClear GL_COLOR_BUFFER_BIT;
4016 4351

Diff Legend

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