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.366 by root, Mon Apr 23 19:17:41 2007 UTC vs.
Revision 1.421 by root, Wed Aug 1 14:27: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) = @_;
… …
1889 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1890 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1891 : ($self->{h} - $size->[1]) * 0.5); 2042 : ($self->{h} - $size->[1]) * 0.5);
1892 }; 2043 };
1893 2044
1894 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2045# unless ($self->{list}) {
1895 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};
1896 2053
1897 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1898} 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#}
1899 2064
1900############################################################################# 2065#############################################################################
1901 2066
1902package CFPlus::UI::EntryBase; 2067package CFPlus::UI::EntryBase;
1903 2068
… …
1909 my $class = shift; 2074 my $class = shift;
1910 2075
1911 $class->SUPER::new ( 2076 $class->SUPER::new (
1912 fg => [1, 1, 1], 2077 fg => [1, 1, 1],
1913 bg => [0, 0, 0, 0.2], 2078 bg => [0, 0, 0, 0.2],
2079 outline => [0.6, 0.3, 0.1],
1914 active_bg => [1, 1, 1, 0.5], 2080 active_bg => [0, 0, 1, .2],
1915 active_fg => [0, 0, 0], 2081 active_fg => [1, 1, 1],
2082 active_outline => [1, 1, 0],
1916 can_hover => 1, 2083 can_hover => 1,
1917 can_focus => 1, 2084 can_focus => 1,
1918 valign => 0, 2085 valign => 0,
1919 can_events => 1, 2086 can_events => 1,
1920 ellipsise => 0, 2087 ellipsise => 0,
… …
1969 my $mod = $ev->{mod}; 2136 my $mod = $ev->{mod};
1970 my $sym = $ev->{sym}; 2137 my $sym = $ev->{sym};
1971 my $uni = $ev->{unicode}; 2138 my $uni = $ev->{unicode};
1972 2139
1973 my $text = $self->get_text; 2140 my $text = $self->get_text;
2141
2142 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1974 2143
1975 if ($uni == 8) { 2144 if ($uni == 8) {
1976 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2145 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1977 } elsif ($uni == 127) { 2146 } elsif ($uni == 127) {
1978 substr $text, $self->{cursor}, 1, ""; 2147 substr $text, $self->{cursor}, 1, "";
… …
2075 2244
2076 unless (exists $self->{cur_h}) { 2245 unless (exists $self->{cur_h}) {
2077 my $text = substr $self->{text}, 0, $self->{cursor}; 2246 my $text = substr $self->{text}, 0, $self->{cursor};
2078 utf8::encode $text; 2247 utf8::encode $text;
2079 2248
2080 @$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);
2081 } 2250 }
2082 2251
2252 glColor_premultiply @{$self->{active_fg}};
2083 glBegin GL_LINES; 2253 glBegin GL_LINES;
2084 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};
2085 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;
2086 glEnd; 2276 glEnd;
2087 } 2277 }
2088} 2278}
2089 2279
2090############################################################################# 2280#############################################################################
… …
2177 1 2367 1
2178} 2368}
2179 2369
2180############################################################################# 2370#############################################################################
2181 2371
2182package CFPlus::UI::Button; 2372package CFPlus::UI::ButtonBin;
2183 2373
2184our @ISA = CFPlus::UI::Label::; 2374our @ISA = CFPlus::UI::Bin::;
2185 2375
2186use CFPlus::OpenGL; 2376use CFPlus::OpenGL;
2187 2377
2188my @tex = 2378my @tex =
2189 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2190 qw(b1_button_active.png); 2380 qw(b1_button_inactive.png b1_button_active.png);
2191 2381
2192sub new { 2382sub new {
2193 my $class = shift; 2383 my $class = shift;
2194 2384
2195 $class->SUPER::new ( 2385 $class->SUPER::new (
2196 padding_x => 4,
2197 padding_y => 4,
2198 fg => [1, 1, 1],
2199 active_fg => [0, 0, 1],
2200 can_hover => 1, 2386 can_hover => 1,
2201 align => 0, 2387 align => 0,
2202 valign => 0, 2388 valign => 0,
2203 can_events => 1, 2389 can_events => 1,
2204 @_ 2390 @_
… …
2216} 2402}
2217 2403
2218sub _draw { 2404sub _draw {
2219 my ($self) = @_; 2405 my ($self) = @_;
2220 2406
2221 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2222
2223 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 0, 0, 0, 1; 2409 glColor 0, 0, 0, 1;
2226 2410
2411 my $tex = $tex[$GRAB == $self];
2227 $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});
2228 2468
2229 glDisable GL_TEXTURE_2D; 2469 glDisable GL_TEXTURE_2D;
2230 2470
2231 $self->SUPER::_draw; 2471 $self->SUPER::_draw;
2232} 2472}
… …
2319sub new { 2559sub new {
2320 my $class = shift; 2560 my $class = shift;
2321 2561
2322 my $self = $class->SUPER::new ( 2562 my $self = $class->SUPER::new (
2323 can_events => 0, 2563 can_events => 0,
2564 scale => 1,
2324 @_, 2565 @_,
2325 ); 2566 );
2326 2567
2327 $self->{path} || $self->{tex} 2568 $self->{path} || $self->{tex}
2328 or Carp::croak "'path' or 'tex' attributes required"; 2569 or Carp::croak "'path' or 'tex' attributes required";
… …
2353} 2594}
2354 2595
2355sub size_request { 2596sub size_request {
2356 my ($self) = @_; 2597 my ($self) = @_;
2357 2598
2358 ($self->{tex}{w}, $self->{tex}{h}) 2599 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2359} 2600}
2360 2601
2361sub _draw { 2602sub _draw {
2362 my ($self) = @_; 2603 my ($self) = @_;
2363 2604
… …
2373 } 2614 }
2374 2615
2375 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2376 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2377 2618
2378 $tex->draw_quad (0, 0, $w, $h); 2619 $tex->draw_quad_alpha (0, 0, $w, $h);
2379 2620
2380 glDisable GL_TEXTURE_2D; 2621 glDisable GL_TEXTURE_2D;
2381} 2622}
2382 2623
2383############################################################################# 2624#############################################################################
… …
2685 2926
2686 $self->SUPER::invoke_button_down ($ev, $x, $y); 2927 $self->SUPER::invoke_button_down ($ev, $x, $y);
2687 2928
2688 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2929 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2689 2930
2690 $self->invoke_mouse_motion ($ev, $x, $y) 2931 $self->invoke_mouse_motion ($ev, $x, $y);
2932
2933 1
2691} 2934}
2692 2935
2693sub invoke_mouse_motion { 2936sub invoke_mouse_motion {
2694 my ($self, $ev, $x, $y) = @_; 2937 my ($self, $ev, $x, $y) = @_;
2695 2938
… …
2715 2958
2716 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2959 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2717 2960
2718 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2961 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2719 2962
2720 ! ! $delta 2963 1
2721} 2964}
2722 2965
2723sub update { 2966sub update {
2724 my ($self) = @_; 2967 my ($self) = @_;
2725 2968
… …
2856} 3099}
2857 3100
2858sub size_request { 3101sub size_request {
2859 my ($self) = @_; 3102 my ($self) = @_;
2860 3103
2861 my ($empty, $slider) = @{ $self->{children} }; 3104 my ($empty, $slider) = $self->visible_children;
2862 3105
2863 local $self->{children} = [$empty, $slider]; 3106 local $self->{children} = [$empty, $slider];
2864 $self->SUPER::size_request 3107 $self->SUPER::size_request
2865} 3108}
2866 3109
… …
3255 glTranslate 0.375, 0.375; 3498 glTranslate 0.375, 0.375;
3256 3499
3257 my ($w, $h) = @$self{qw(w h)}; 3500 my ($w, $h) = @$self{qw(w h)};
3258 3501
3259 glColor 1, 0.8, 0.4; 3502 glColor 1, 0.8, 0.4;
3260 glBegin GL_QUADS; 3503 glRect 0, 0, $w, $h;
3261 glVertex 0 , 0;
3262 glVertex 0 , $h;
3263 glVertex $w, $h;
3264 glVertex $w, 0;
3265 glEnd;
3266 3504
3267 glColor 0, 0, 0; 3505 glColor 0, 0, 0;
3268 glBegin GL_LINE_LOOP; 3506 glBegin GL_LINE_LOOP;
3269 glVertex 0 , 0; 3507 glVertex 0 , 0;
3270 glVertex 0 , $h; 3508 glVertex 0 , $h;
… …
3287 3525
3288sub new { 3526sub new {
3289 my $class = shift; 3527 my $class = shift;
3290 3528
3291 my $self = $class->SUPER::new ( 3529 my $self = $class->SUPER::new (
3530 size_w => 32,
3531 size_h => 8,
3292 aspect => 1, 3532 aspect => 1,
3293 can_events => 0, 3533 can_events => 0,
3294 @_, 3534 @_,
3295 ); 3535 );
3296 3536
3297 if ($self->{anim} && $self->{animspeed}) { 3537 if ($self->{anim} && $self->{animspeed}) {
3298 CFPlus::weaken (my $widget = $self); 3538 CFPlus::weaken (my $widget = $self);
3299 3539
3540 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3541 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3300 $self->{timer} = Event->timer ( 3542 $self->{timer} = Event->timer (
3301 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3302 hard => 1, 3543 parked => 1,
3303 interval => $self->{animspeed},
3304 cb => sub { 3544 cb => sub {
3545 return unless $::CONN && $widget;
3546
3305 ++$widget->{frame}; 3547 ++$widget->{frame};
3548 $widget->update_face;
3306 $widget->update; 3549 $widget->update;
3550
3551 $widget->update_timer;
3307 }, 3552 },
3308 ); 3553 );
3554
3555 $self->update_face;
3556 $self->update_timer;
3309 } 3557 }
3310 3558
3311 $self 3559 $self
3312} 3560}
3313 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
3314sub size_request { 3593sub size_request {
3315 (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)
3316} 3610}
3317 3611
3318sub update { 3612sub update {
3319 my ($self) = @_; 3613 my ($self) = @_;
3320 3614
3321 return unless $self->{visible}; 3615 return unless $self->{visible};
3322 3616
3323 $self->SUPER::update; 3617 $self->SUPER::update;
3324} 3618}
3325 3619
3620sub invoke_visibility_change {
3621 my ($self) = @_;
3622
3623 $self->update_timer;
3624
3625 0
3626}
3627
3326sub _draw { 3628sub _draw {
3327 my ($self) = @_; 3629 my ($self) = @_;
3328 3630
3329 return unless $::CONN;
3330
3331 $self->SUPER::_draw; 3631 $self->SUPER::_draw;
3332 3632
3333 my $face; 3633 if (my $tex = $self->{tex}) {
3334
3335 if ($self->{frame}) {
3336 my $anim = $::CONN->{anim}[$self->{anim}];
3337
3338 $face = $anim->[ $self->{frame} % @$anim ]
3339 if $anim && @$anim;
3340 }
3341
3342 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3343
3344 if ($tex) {
3345 glEnable GL_TEXTURE_2D; 3634 glEnable GL_TEXTURE_2D;
3346 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3347 glColor 0, 0, 0, 1; 3636 glColor 0, 0, 0, 1;
3348 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3637 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3349 glDisable GL_TEXTURE_2D; 3638 glDisable GL_TEXTURE_2D;
… …
3351} 3640}
3352 3641
3353sub destroy { 3642sub destroy {
3354 my ($self) = @_; 3643 my ($self) = @_;
3355 3644
3356 $self->{timer}->cancel 3645 (delete $self->{timer})->cancel
3357 if $self->{timer}; 3646 if $self->{timer};
3358 3647
3359 $self->SUPER::destroy; 3648 $self->SUPER::destroy;
3360} 3649}
3361 3650
… …
3401 children => [ 3690 children => [
3402 (new CFPlus::UI::Label markup => $left, expand => 1), 3691 (new CFPlus::UI::Label markup => $left, expand => 1),
3403 (new CFPlus::UI::Label markup => $right, align => +1), 3692 (new CFPlus::UI::Label markup => $right, align => +1),
3404 ], 3693 ],
3405 ; 3694 ;
3406 3695
3407 } else { 3696 } else {
3408 $widget = new CFPlus::UI::Label 3697 $widget = new CFPlus::UI::Label
3409 can_hover => 1, 3698 can_hover => 1,
3410 can_events => 1, 3699 can_events => 1,
3411 markup => $widget, 3700 markup => $widget,
… …
3547 buttonbar => (new CFPlus::UI::Buttonbar), 3836 buttonbar => (new CFPlus::UI::Buttonbar),
3548 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3837 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3549 # filter => # will be put between multiplexer and $self 3838 # filter => # will be put between multiplexer and $self
3550 @_, 3839 @_,
3551 ); 3840 );
3552 3841
3553 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3842 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3554 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3843 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3555 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
3556 $self 3879 $self
3557} 3880}
3558 3881
3559sub 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 {
3560 my ($self, $title, $widget, $tooltip) = @_; 3900 my ($self, $title, $widget, $tooltip) = @_;
3561 3901
3562 CFPlus::weaken $self; 3902 $title = [$title, $tooltip] unless ref $title;
3903 $widget->{c_tab} = $title;
3563 3904
3564 $self->{buttonbar}->add (new CFPlus::UI::Button
3565 markup => $title,
3566 tooltip => $tooltip,
3567 on_activate => sub { $self->set_current_page ($widget) },
3568 );
3569
3570 $self->{multiplexer}->add ($widget); 3905 $self->add ($widget);
3571} 3906}
3572 3907
3573sub get_current_page { 3908sub get_current_page {
3574 my ($self) = @_; 3909 my ($self) = @_;
3575 3910
… …
3905 while ($self->{refresh_hook}) { 4240 while ($self->{refresh_hook}) {
3906 $_->() 4241 $_->()
3907 for values %{delete $self->{refresh_hook}}; 4242 for values %{delete $self->{refresh_hook}};
3908 } 4243 }
3909 4244
3910 if ($self->{realloc}) { 4245 while ($self->{realloc}) {
3911 my %queue; 4246 my %queue;
3912 my @queue; 4247 my @queue;
3913 my $widget; 4248 my $widget;
3914 4249
3915 outer: 4250 outer:
… …
3962 } 4297 }
3963 } 4298 }
3964 4299
3965 delete $self->{realloc}{$widget+0}; 4300 delete $self->{realloc}{$widget+0};
3966 } 4301 }
3967 }
3968 4302
3969 while (my $size_alloc = delete $self->{size_alloc}) { 4303 while (my $size_alloc = delete $self->{size_alloc}) {
3970 my @queue = sort { $b->{visible} <=> $a->{visible} } 4304 my @queue = sort { $a->{visible} <=> $b->{visible} }
3971 values %$size_alloc; 4305 values %$size_alloc;
3972 4306
3973 while () { 4307 while () {
3974 my $widget = pop @queue || last; 4308 my $widget = pop @queue || last;
3975 4309
3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4310 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977 4311
3978 $w = 0 if $w < 0;
3979 $h = 0 if $h < 0;
3980
3981 $w = max $widget->{min_w}, $w; 4312 $w = max $widget->{min_w}, $w;
3982 $h = max $widget->{min_h}, $h; 4313 $h = max $widget->{min_h}, $h;
3983 4314
3984# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4315# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3985# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4316# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3986 4317
3987 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4318 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3988 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4319 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3989 4320
3990 $w = int $w + 0.5; 4321 $w = int $w + 0.5;
3991 $h = int $h + 0.5; 4322 $h = int $h + 0.5;
3992 4323
3993 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}) {
3994 $widget->{old_w} = $widget->{w}; 4325 $widget->{old_w} = $widget->{w};
3995 $widget->{old_h} = $widget->{h}; 4326 $widget->{old_h} = $widget->{h};
3996 4327
3997 $widget->{w} = $w; 4328 $widget->{w} = $w;
3998 $widget->{h} = $h; 4329 $widget->{h} = $h;
3999 4330
4000 $widget->emit (size_allocate => $w, $h); 4331 $widget->emit (size_allocate => $w, $h);
4332 }
4001 } 4333 }
4002 } 4334 }
4003 } 4335 }
4004 4336
4005 while ($self->{post_alloc_hook}) { 4337 while ($self->{post_alloc_hook}) {
4006 $_->() 4338 $_->()
4007 for values %{delete $self->{post_alloc_hook}}; 4339 for values %{delete $self->{post_alloc_hook}};
4008 } 4340 }
4009
4010 4341
4011 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4342 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4012 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4343 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4013 glClear GL_COLOR_BUFFER_BIT; 4344 glClear GL_COLOR_BUFFER_BIT;
4014 4345

Diff Legend

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