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.363 by root, Sun Dec 10 00:06:49 2006 UTC vs.
Revision 1.413 by root, Mon Jul 23 15:30:45 2007 UTC

… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
110 } 113 }
111 114
112 if ($GRAB) { 115 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel 117 # mousewheel
115 $ev->{dx} = 0;
116 $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
117 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
118 } else { 125 } else {
119 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
120 } 127 }
121 } 128 }
… …
265 $self->hide; 272 $self->hide;
266 $self->emit ("destroy"); 273 $self->emit ("destroy");
267 %$self = (); 274 %$self = ();
268} 275}
269 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
270sub show { 281sub show {
271 my ($self) = @_; 282 my ($self) = @_;
272 283
273 return if $self->{parent}; 284 return if $self->{parent};
274 285
… …
313sub set_visibility { 324sub set_visibility {
314 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
315 326
316 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
317 328
318 $visible ? $self->hide 329 $visible ? $self->show
319 : $self->show; 330 : $self->hide;
320} 331}
321 332
322sub toggle_visibility { 333sub toggle_visibility {
323 my ($self) = @_; 334 my ($self) = @_;
324 335
… …
540 551
541 # parent 552 # parent
542 $self->{parent} && $self->{parent}->emit ($signal, @args) 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
543} 554}
544 555
545sub find_widget { 556#sub find_widget {
546 my ($self, $x, $y) = @_; 557# in .xs
547
548 return () unless $self->{can_events};
549
550 return $self
551 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
552 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
553
554 ()
555}
556 558
557sub set_parent { 559sub set_parent {
558 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
559 561
560 CFPlus::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
… …
591 593
592# 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
593# functions seems pointless. 595# functions seems pointless.
594our ($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
595 597
596sub draw { 598#sub draw {
597 my ($self) = @_; 599#CFPlus.xs
598
599 return unless $self->{h} && $self->{w};
600
601 # update screen rectangle
602 local $draw_x = $draw_x + $self->{x};
603 local $draw_y = $draw_y + $self->{y};
604
605 # skip widgets that are entirely outside the drawing area
606 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
607 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
608
609 glPushMatrix;
610 glTranslate $self->{x}, $self->{y}, 0;
611
612 if ($self == $HOVER && $self->{can_hover}) {
613 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
614 glEnable GL_BLEND;
615 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616 glBegin GL_QUADS;
617 glVertex 0 , 0;
618 glVertex $self->{w}, 0;
619 glVertex $self->{w}, $self->{h};
620 glVertex 0 , $self->{h};
621 glEnd;
622 glDisable GL_BLEND;
623 }
624
625 if ($ENV{CFPLUS_DEBUG} & 1) {
626 glPushMatrix;
627 glColor 1, 1, 0, 1;
628 glTranslate 0.375, 0.375;
629 glBegin GL_LINE_LOOP;
630 glVertex 0 , 0;
631 glVertex $self->{w} - 1, 0;
632 glVertex $self->{w} - 1, $self->{h} - 1;
633 glVertex 0 , $self->{h} - 1;
634 glEnd;
635 glPopMatrix;
636 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
637 }
638
639 $self->_draw;
640 glPopMatrix;
641}
642 600
643sub _draw { 601sub _draw {
644 my ($self) = @_; 602 my ($self) = @_;
645 603
646 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
647} 605}
648 606
649my $cntx;#d#
650sub DESTROY { 607sub DESTROY {
651 my ($self) = @_; 608 my ($self) = @_;
652 609
653 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
654 611
… …
739 can_events => 0, 696 can_events => 0,
740 %arg, 697 %arg,
741 ); 698 );
742 699
743 $self->add (@$children) 700 $self->add (@$children)
744 if $children; 701 if $children && @$children;
745 702
746 $self 703 $self
747} 704}
748 705
749sub realloc { 706sub realloc {
… …
758 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
759 716
760 $_->set_parent ($self) 717 $_->set_parent ($self)
761 for @widgets; 718 for @widgets;
762 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
763 use sort 'stable'; 721 use sort 'stable';
764 722
765 $self->{children} = [ 723 $self->{children} = [
766 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
767 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
768 ]; 726 ];
769 727
770 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
771} 733}
772 734
773sub children { 735sub children {
774 @{ $_[0]{children} } 736 @{ $_[0]{children} }
775} 737}
776 738
777sub remove { 739sub remove {
778 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
779 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
780 delete $child->{parent}; 745 delete $child->{parent};
781 $child->hide; 746 $child->hide;
782
783 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
784 749
785 $self->realloc; 750 $self->realloc;
786} 751}
787 752
788sub clear { 753sub clear {
789 my ($self) = @_; 754 my ($self) = @_;
790 755
791 my $children = delete $self->{children}; 756 my $children = $self->{children};
792 $self->{children} = []; 757 $self->{children} = [];
793 758
794 for (@$children) { 759 for (@$children) {
795 delete $_->{parent}; 760 delete $_->{parent};
796 $_->hide; 761 $_->hide;
… …
816} 781}
817 782
818sub _draw { 783sub _draw {
819 my ($self) = @_; 784 my ($self) = @_;
820 785
821 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
822} 787}
823 788
824############################################################################# 789#############################################################################
825 790
826package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
… …
836} 801}
837 802
838sub add { 803sub add {
839 my ($self, $child) = @_; 804 my ($self, $child) = @_;
840 805
841 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
842 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
843} 808}
844 809
845sub remove { 810sub remove {
846 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
… …
936} 901}
937 902
938############################################################################# 903#############################################################################
939 904
940package CFPlus::UI::ViewPort; 905package CFPlus::UI::ViewPort;
906
907use List::Util qw(min max);
941 908
942our @ISA = CFPlus::UI::Window::; 909our @ISA = CFPlus::UI::Window::;
943 910
944sub new { 911sub new {
945 my $class = shift; 912 my $class = shift;
… …
954sub size_request { 921sub size_request {
955 my ($self) = @_; 922 my ($self) = @_;
956 923
957 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
958 925
959 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
960 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
961 928
962 ($w, $h) 929 ($w, $h)
963} 930}
964 931
965sub invoke_size_allocate { 932sub invoke_size_allocate {
… …
977} 944}
978 945
979sub set_offset { 946sub set_offset {
980 my ($self, $x, $y) = @_; 947 my ($self, $x, $y) = @_;
981 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}) {
982 $self->{view_x} = int $x; 953 $self->{view_x} = $x;
983 $self->{view_y} = int $y; 954 $self->{view_y} = $y;
984 955
956 $self->emit (changed => $x, $y);
985 $self->update; 957 $self->update;
958 }
986} 959}
987 960
988# hmm, this does not work for topleft of $self... but we should not ask for that 961# hmm, this does not work for topleft of $self... but we should not ask for that
989sub coord2local { 962sub coord2local {
990 my ($self, $x, $y) = @_; 963 my ($self, $x, $y) = @_;
… …
1005 my ($self, $x, $y) = @_; 978 my ($self, $x, $y) = @_;
1006 979
1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 980 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 981 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1009 ) { 982 ) {
1010 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 983 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1011 } else { 984 } else {
1012 $self->CFPlus::UI::Base::find_widget ($x, $y) 985 $self->CFPlus::UI::Base::find_widget ($x, $y)
1013 } 986 }
1014} 987}
1015 988
… …
1026 999
1027############################################################################# 1000#############################################################################
1028 1001
1029package CFPlus::UI::ScrolledWindow; 1002package CFPlus::UI::ScrolledWindow;
1030 1003
1031our @ISA = CFPlus::UI::HBox::; 1004our @ISA = CFPlus::UI::Table::;
1032 1005
1033sub new { 1006sub new {
1034 my ($class, %arg) = @_; 1007 my ($class, %arg) = @_;
1035 1008
1036 my $child = delete $arg{child}; 1009 my $child = delete $arg{child};
1037 1010
1038 my $self; 1011 my $self;
1039 1012
1040 my $slider = new CFPlus::UI::Slider 1013 my $hslider = new CFPlus::UI::Slider
1014 col => 0,
1015 row => 1,
1016 vertical => 0,
1017 range => [0, 0, 1, 0.01], # HACK fix
1018 on_changed => sub {
1019 $self->{hpos} = $_[1];
1020 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1021 },
1022 ;
1023
1024 my $vslider = new CFPlus::UI::Slider
1025 col => 1,
1026 row => 0,
1041 vertical => 1, 1027 vertical => 1,
1042 range => [0, 0, 1, 0.01], # HACK fix 1028 range => [0, 0, 1, 0.01], # HACK fix
1043 on_changed => sub { 1029 on_changed => sub {
1044 $self->{vp}->set_offset (0, $_[1]); 1030 $self->{vpos} = $_[1];
1031 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1045 }, 1032 },
1046 ; 1033 ;
1047 1034
1048 $self = $class->SUPER::new ( 1035 $self = $class->SUPER::new (
1049 vp => (new CFPlus::UI::ViewPort expand => 1), 1036 scroll_x => 0,
1037 scroll_y => 1,
1050 can_events => 1, 1038 can_events => 1,
1051 slider => $slider, 1039 hslider => $hslider,
1040 vslider => $vslider,
1041 col_expand => [1, 0],
1042 row_expand => [1, 0],
1052 %arg, 1043 %arg,
1053 ); 1044 );
1054 1045
1046 $self->{vp} = new CFPlus::UI::ViewPort
1047 col => 0,
1048 row => 0,
1049 expand => 1,
1050 scroll_x => $self->{scroll_x},
1051 scroll_y => $self->{scroll_y},
1052 on_changed => sub {
1053 my ($vp, $x, $y) = @_;
1054
1055 $vp->{parent}{hslider}->set_value ($x);
1056 $vp->{parent}{vslider}->set_value ($y);
1057
1058 0
1059 },
1060 on_size_allocate => sub {
1061 my ($vp, $w, $h) = @_;
1062 $vp->{parent}->update_slider;
1063 0
1064 },
1065 ;
1066
1055 $self->SUPER::add ($self->{vp}, $self->{slider}); 1067 $self->SUPER::add ($self->{vp});
1068
1056 $self->add ($child) if $child; 1069 $self->add ($child) if $child;
1057 1070
1058 $self 1071 $self
1059} 1072}
1060
1061#TODO# update range on size_allocate depending on child
1062 1073
1063sub add { 1074sub add {
1064 my ($self, $widget) = @_; 1075 my ($self, $widget) = @_;
1065 1076
1066 $self->{vp}->add ($self->{child} = $widget); 1077 $self->{vp}->add ($self->{child} = $widget);
1067} 1078}
1068 1079
1080sub update_slider {
1081 my ($self) = @_;
1082
1083 my $child = ($self->{vp} or return)->child;
1084
1085 if ($self->{scroll_x}) {
1086 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1087 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1088
1089 my $visible = $w1 > $w2;
1090 if ($visible != $self->{hslider_visible}) {
1091 $self->{hslider_visible} = $visible;
1092 $visible ? $self->SUPER::add ($self->{hslider})
1093 : $self->SUPER::remove ($self->{hslider});
1094 }
1095 }
1096
1097 if ($self->{scroll_y}) {
1098 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1099 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1100
1101 my $visible = $h1 > $h2;
1102 if ($visible != $self->{vslider_visible}) {
1103 $self->{vslider_visible} = $visible;
1104 $visible ? $self->SUPER::add ($self->{vslider})
1105 : $self->SUPER::remove ($self->{vslider});
1106 }
1107 }
1108}
1109
1110sub start_dragging {
1111 my ($self, $ev) = @_;
1112
1113 $self->grab_focus;
1114
1115 my $ox = $self->{vp}{view_x};
1116 my $oy = $self->{vp}{view_y};
1117
1118 $self->{motion} = sub {
1119 my ($ev, $x, $y) = @_;
1120
1121 $ox -= $ev->{xrel};
1122 $oy -= $ev->{yrel};
1123
1124 $self->{vp}->set_offset ($ox, $oy);
1125 };
1126}
1127
1069sub invoke_mouse_wheel { 1128sub invoke_mouse_wheel {
1070 my ($self, $ev) = @_; 1129 my ($self, $ev) = @_;
1071 1130
1072 return 0 unless $ev->{dy}; # only vertical movements
1073
1074 $self->{slider}->emit (mouse_wheel => $ev); 1131 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1132 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1075 1133
1076 1 1134 1
1077} 1135}
1078 1136
1079sub update_slider { 1137sub invoke_button_down {
1080 my ($self) = @_; 1138 my ($self, $ev, $x, $y) = @_;
1081 1139
1082 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1140 if ($ev->{button} == 2) {
1083} 1141 $self->start_dragging ($ev);
1142 return 1;
1143 }
1084 1144
1085sub update { 1145 0
1086 my ($self) = @_; 1146}
1087 1147
1088 $self->SUPER::update; 1148sub invoke_button_up {
1149 my ($self, $ev, $x, $y) = @_;
1089 1150
1090 $self->update_slider; 1151 if (delete $self->{motion}) {
1152 return 1;
1153 }
1154
1155 0
1156}
1157
1158sub invoke_mouse_motion {
1159 my ($self, $ev, $x, $y) = @_;
1160
1161 if ($self->{motion}) {
1162 $self->{motion}->($ev, $x, $y);
1163 return 1;
1164 }
1165
1166 0
1091} 1167}
1092 1168
1093sub invoke_size_allocate { 1169sub invoke_size_allocate {
1094 my ($self, $w, $h) = @_; 1170 my ($self, $w, $h) = @_;
1095 1171
1096 $self->update_slider; 1172 $self->update_slider;
1097
1098 $self->SUPER::invoke_size_allocate ($w, $h) 1173 $self->SUPER::invoke_size_allocate ($w, $h)
1099} 1174}
1100 1175
1101############################################################################# 1176#############################################################################
1102 1177
… …
1252 1327
1253my @border = 1328my @border =
1254 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1329 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1255 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1330 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1256 1331
1332my @icon =
1333 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1334 qw(x1_move.png x1_resize.png);
1335
1257sub new { 1336sub new {
1258 my ($class, %arg) = @_; 1337 my ($class, %arg) = @_;
1259 1338
1260 my $self = $class->SUPER::new ( 1339 my $self = $class->SUPER::new (
1261 bg => [1, 1, 1, 1], 1340 bg => [1, 1, 1, 1],
… …
1429 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1508 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1430 1509
1431 my $border = $self->border; 1510 my $border = $self->border;
1432 1511
1433 glColor @{ $self->{border_bg} }; 1512 glColor @{ $self->{border_bg} };
1434 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1513 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1435 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1514 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1436 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1515 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1437 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1516 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1517
1518 # move
1519 my $w2 = ($w - $border) * .5;
1520 my $h2 = ($h - $border) * .5;
1521 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1522 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1523 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1524
1525 # resize
1526 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1527 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1528 unless $self->{has_close_button};
1529 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1530 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1438 1531
1439 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1532 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1440 glColor @{ $self->{bg} }; 1533 glColor @{ $self->{bg} };
1441 1534
1442 # TODO: repeat texture not scale 1535 # TODO: repeat texture not scale
… …
1463 1556
1464############################################################################# 1557#############################################################################
1465 1558
1466package CFPlus::UI::Table; 1559package CFPlus::UI::Table;
1467 1560
1468our @ISA = CFPlus::UI::Base::; 1561our @ISA = CFPlus::UI::Container::;
1469 1562
1470use List::Util qw(max sum); 1563use List::Util qw(max sum);
1471 1564
1472use CFPlus::OpenGL; 1565use CFPlus::OpenGL;
1473 1566
1474sub new { 1567sub new {
1475 my $class = shift; 1568 my $class = shift;
1476 1569
1477 $class->SUPER::new ( 1570 $class->SUPER::new (
1478 col_expand => [], 1571 col_expand => [],
1572 row_expand => [],
1479 @_, 1573 @_,
1480 ) 1574 )
1481} 1575}
1482 1576
1483sub children {
1484 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1485}
1486
1487sub add { 1577sub add {
1578 my ($self, @widgets) = @_;
1579
1580 for my $child (@widgets) {
1581 $child->{rowspan} ||= 1;
1582 $child->{colspan} ||= 1;
1583 }
1584
1585 $self->SUPER::add (@widgets);
1586}
1587
1588sub add_at {
1488 my ($self) = shift; 1589 my $self = shift;
1590
1591 my @widgets;
1489 1592
1490 while (@_) { 1593 while (@_) {
1491 my ($x, $y, $child) = splice @_, 0, 3, (); 1594 my ($col, $row, $child) = splice @_, 0, 3, ();
1492 $child->set_parent ($self);
1493 $self->{children}[$y][$x] = $child;
1494 }
1495 1595
1496 $self->{force_realloc} = 1; 1596 $child->{row} = $row;
1497 $self->{force_size_alloc} = 1; 1597 $child->{col} = $col;
1498 $self->realloc;
1499}
1500 1598
1501sub remove { 1599 push @widgets, $child;
1600 }
1601
1602 $self->add (@widgets);
1603}
1604
1605sub get_wh {
1502 my ($self, $child) = @_; 1606 my ($self) = @_;
1503 1607
1504 # TODO: not yet implemented 1608 my (@w, @h);
1505}
1506
1507# TODO: move to container class maybe? send children a signal on removal?
1508sub clear {
1509 my ($self) = @_;
1510 1609
1511 my @children = $self->children; 1610 my @children = $self->children;
1512 delete $self->{children}; 1611
1612 # first pass, columns
1613 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1614 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1615
1616 my $sw = sum @w[$c .. $c + $cs - 1];
1617
1618 if ($w > $sw) {
1619 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1620 }
1513 1621 }
1514 for (@children) {
1515 delete $_->{parent};
1516 $_->hide;
1517 }
1518 1622
1519 $self->realloc; 1623 # second pass, rows
1520} 1624 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1521
1522sub get_wh {
1523 my ($self) = @_;
1524
1525 my (@w, @h);
1526
1527 for my $y (0 .. $#{$self->{children}}) {
1528 my $row = $self->{children}[$y]
1529 or next;
1530
1531 for my $x (0 .. $#$row) {
1532 my $widget = $row->[$x]
1533 or next;
1534 my ($w, $h) = @$widget{qw(req_w req_h)}; 1625 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1535 1626
1536 $w[$x] = max $w[$x], $w; 1627 my $sh = sum @h[$r .. $r + $rs - 1];
1537 $h[$y] = max $h[$y], $h; 1628
1629 if ($h > $sh) {
1630 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1538 } 1631 }
1539 } 1632 }
1540 1633
1541 (\@w, \@h) 1634 (\@w, \@h)
1542} 1635}
… …
1558 my ($ws, $hs) = $self->get_wh; 1651 my ($ws, $hs) = $self->get_wh;
1559 1652
1560 my $req_w = (sum @$ws) || 1; 1653 my $req_w = (sum @$ws) || 1;
1561 my $req_h = (sum @$hs) || 1; 1654 my $req_h = (sum @$hs) || 1;
1562 1655
1563 # TODO: nicer code && do row_expand 1656 # now linearly scale the rows/columns to the allocated size
1564 my @col_expand = @{$self->{col_expand}}; 1657 my @col_expand = @{$self->{col_expand}};
1565 @col_expand = (1) x @$ws unless @col_expand; 1658 @col_expand = (1) x @$ws unless @col_expand;
1566 my $col_expand = (sum @col_expand) || 1; 1659 my $col_expand = (sum @col_expand) || 1;
1567 1660
1568 # linearly scale sizes
1569 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1661 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1570 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1571 1662
1572 CFPlus::UI::harmonize $ws; 1663 CFPlus::UI::harmonize $ws;
1664
1665 my @row_expand = @{$self->{row_expand}};
1666 @row_expand = (1) x @$ws unless @row_expand;
1667 my $row_expand = (sum @row_expand) || 1;
1668
1669 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1670
1573 CFPlus::UI::harmonize $hs; 1671 CFPlus::UI::harmonize $hs;
1574 1672
1575 my $y; 1673 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1674 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1576 1675
1577 for my $r (0 .. $#{$self->{children}}) { 1676 for my $widget ($self->children) {
1578 my $row = $self->{children}[$r] 1677 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1579 or next;
1580 1678
1581 my $x = 0; 1679 $widget->configure (
1582 my $row_h = $hs->[$r]; 1680 $x[$c], $y[$r],
1681 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1583 1682 );
1584 for my $c (0 .. $#$row) { 1683 }
1585 my $col_w = $ws->[$c];
1586 1684
1587 if (my $widget = $row->[$c]) { 1685 1
1588 $widget->configure ($x, $y, $col_w, $row_h); 1686}
1589 }
1590 1687
1591 $x += $col_w; 1688#############################################################################
1689
1690package CFPlus::UI::Fixed;
1691
1692use List::Util qw(min max);
1693
1694our @ISA = CFPlus::UI::Container::;
1695
1696sub _scale($$$) {
1697 my ($rel, $val, $max) = @_;
1698
1699 $rel ? $val * $max : $val
1700}
1701
1702sub size_request {
1703 my ($self) = @_;
1704
1705 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1706
1707 # determine overall size by querying abs widgets
1708 for my $child ($self->visible_children) {
1709 unless ($child->{c_rel}) {
1710 my $x = $child->{c_x};
1711 my $y = $child->{c_y};
1712
1713 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1714 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1592 } 1715 }
1716 }
1593 1717
1594 $y += $row_h; 1718 my $W = $x2 - $x1;
1719 my $H = $y2 - $y1;
1720
1721 # now layout remaining widgets
1722 for my $child ($self->visible_children) {
1723 if ($child->{c_rel}) {
1724 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1725 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1726
1727 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1728 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1729 }
1730 }
1731
1732 my $W = $x2 - $x1;
1733 my $H = $y2 - $y1;
1734
1735 ($W, $H)
1736}
1737
1738sub invoke_size_allocate {
1739 my ($self, $W, $H) = @_;
1740
1741 for my $child ($self->visible_children) {
1742 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1743 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1744
1745 $x += $child->{c_halign} * $child->{req_w};
1746 $y += $child->{c_valign} * $child->{req_h};
1747
1748 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1595 } 1749 }
1596 1750
1597 1 1751 1
1598} 1752}
1599 1753
1600sub find_widget {
1601 my ($self, $x, $y) = @_;
1602
1603 $x -= $self->{x};
1604 $y -= $self->{y};
1605
1606 my $res;
1607
1608 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1609 $res = $_->find_widget ($x, $y)
1610 and return $res;
1611 }
1612
1613 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1614}
1615
1616sub _draw {
1617 my ($self) = @_;
1618
1619 for (grep $_, @{$self->{children}}) {
1620 $_->draw for grep $_, @$_;
1621 }
1622}
1623
1624############################################################################# 1754#############################################################################
1625 1755
1626package CFPlus::UI::Box; 1756package CFPlus::UI::Box;
1627 1757
1628our @ISA = CFPlus::UI::Container::; 1758our @ISA = CFPlus::UI::Container::;
1629 1759
1630sub size_request { 1760sub size_request {
1631 my ($self) = @_; 1761 my ($self) = @_;
1762
1763 my @children = $self->visible_children;
1632 1764
1633 $self->{vertical} 1765 $self->{vertical}
1634 ? ( 1766 ? (
1635 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1767 (List::Util::max map $_->{req_w}, @children),
1636 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1768 (List::Util::sum map $_->{req_h}, @children),
1637 ) 1769 )
1638 : ( 1770 : (
1639 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1771 (List::Util::sum map $_->{req_w}, @children),
1640 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1772 (List::Util::max map $_->{req_h}, @children),
1641 ) 1773 )
1642} 1774}
1643 1775
1644sub invoke_size_allocate { 1776sub invoke_size_allocate {
1645 my ($self, $w, $h) = @_; 1777 my ($self, $w, $h) = @_;
… …
1886 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2018 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1887 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2019 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1888 : ($self->{h} - $size->[1]) * 0.5); 2020 : ($self->{h} - $size->[1]) * 0.5);
1889 }; 2021 };
1890 2022
1891 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2023# unless ($self->{list}) {
1892 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2024# $self->{list} = CFPlus::OpenGL::glGenList;
2025# CFPlus::OpenGL::glNewList $self->{list};
2026# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2027# CFPlus::OpenGL::glEndList;
2028# }
2029#
2030# CFPlus::OpenGL::glCallList $self->{list};
1893 2031
1894 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1895} 2033}
2034
2035#sub destroy {
2036# my ($self) = @_;
2037#
2038# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2039#
2040# $self->SUPER::destroy;
2041#}
1896 2042
1897############################################################################# 2043#############################################################################
1898 2044
1899package CFPlus::UI::EntryBase; 2045package CFPlus::UI::EntryBase;
1900 2046
… …
1966 my $mod = $ev->{mod}; 2112 my $mod = $ev->{mod};
1967 my $sym = $ev->{sym}; 2113 my $sym = $ev->{sym};
1968 my $uni = $ev->{unicode}; 2114 my $uni = $ev->{unicode};
1969 2115
1970 my $text = $self->get_text; 2116 my $text = $self->get_text;
2117
2118 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1971 2119
1972 if ($uni == 8) { 2120 if ($uni == 8) {
1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2121 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974 } elsif ($uni == 127) { 2122 } elsif ($uni == 127) {
1975 substr $text, $self->{cursor}, 1, ""; 2123 substr $text, $self->{cursor}, 1, "";
… …
2182 2330
2183use CFPlus::OpenGL; 2331use CFPlus::OpenGL;
2184 2332
2185my @tex = 2333my @tex =
2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2334 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187 qw(b1_button_active.png); 2335 qw(b1_button_inactive.png b1_button_active.png);
2188 2336
2189sub new { 2337sub new {
2190 my $class = shift; 2338 my $class = shift;
2191 2339
2192 $class->SUPER::new ( 2340 $class->SUPER::new (
2193 padding_x => 4, 2341 padding_x => 4,
2194 padding_y => 4, 2342 padding_y => 4,
2195 fg => [1, 1, 1], 2343 fg => [1.0, 1.0, 1.0],
2196 active_fg => [0, 0, 1], 2344 active_fg => [0.8, 0.8, 0.8],
2197 can_hover => 1, 2345 can_hover => 1,
2198 align => 0, 2346 align => 0,
2199 valign => 0, 2347 valign => 0,
2200 can_events => 1, 2348 can_events => 1,
2201 @_ 2349 @_
… …
2219 2367
2220 glEnable GL_TEXTURE_2D; 2368 glEnable GL_TEXTURE_2D;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2369 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222 glColor 0, 0, 0, 1; 2370 glColor 0, 0, 0, 1;
2223 2371
2372 my $tex = $tex[$GRAB == $self];
2224 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2373 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2225 2374
2226 glDisable GL_TEXTURE_2D; 2375 glDisable GL_TEXTURE_2D;
2227 2376
2228 $self->SUPER::_draw; 2377 $self->SUPER::_draw;
2229} 2378}
… …
2682 2831
2683 $self->SUPER::invoke_button_down ($ev, $x, $y); 2832 $self->SUPER::invoke_button_down ($ev, $x, $y);
2684 2833
2685 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2834 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2686 2835
2687 $self->invoke_mouse_motion ($ev, $x, $y) 2836 $self->invoke_mouse_motion ($ev, $x, $y);
2837
2838 1
2688} 2839}
2689 2840
2690sub invoke_mouse_motion { 2841sub invoke_mouse_motion {
2691 my ($self, $ev, $x, $y) = @_; 2842 my ($self, $ev, $x, $y) = @_;
2692 2843
… …
2708sub invoke_mouse_wheel { 2859sub invoke_mouse_wheel {
2709 my ($self, $ev) = @_; 2860 my ($self, $ev) = @_;
2710 2861
2711 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2862 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2712 2863
2864 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2865
2713 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2866 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2714 2867
2715 ! ! $delta 2868 1
2716} 2869}
2717 2870
2718sub update { 2871sub update {
2719 my ($self) = @_; 2872 my ($self) = @_;
2720 2873
… …
2828 #font => default_font 2981 #font => default_font
2829 @_, 2982 @_,
2830 2983
2831 layout => (new CFPlus::Layout), 2984 layout => (new CFPlus::Layout),
2832 par => [], 2985 par => [],
2986 max_par => 0,
2833 height => 0, 2987 height => 0,
2834 children => [ 2988 children => [
2835 (new CFPlus::UI::Empty expand => 1), 2989 (new CFPlus::UI::Empty expand => 1),
2836 (new CFPlus::UI::Slider vertical => 1), 2990 (new CFPlus::UI::Slider vertical => 1),
2837 ], 2991 ],
… …
2850} 3004}
2851 3005
2852sub size_request { 3006sub size_request {
2853 my ($self) = @_; 3007 my ($self) = @_;
2854 3008
2855 my ($empty, $slider) = @{ $self->{children} }; 3009 my ($empty, $slider) = $self->visible_children;
2856 3010
2857 local $self->{children} = [$empty, $slider]; 3011 local $self->{children} = [$empty, $slider];
2858 $self->SUPER::size_request 3012 $self->SUPER::size_request
2859} 3013}
2860 3014
… …
2960 wrapped => 1, 3114 wrapped => 1,
2961 }; 3115 };
2962 3116
2963 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3117 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2964 push @{$self->{par}}, $para; 3118 push @{$self->{par}}, $para;
3119 }
3120
3121 if (my $max = $self->{max_par}) {
3122 shift @{$self->{par}} while @{$self->{par}} > $max;
2965 } 3123 }
2966 3124
2967 $self->{need_reflow}++; 3125 $self->{need_reflow}++;
2968 $self->update; 3126 $self->update;
2969} 3127}
… …
3277 3435
3278sub new { 3436sub new {
3279 my $class = shift; 3437 my $class = shift;
3280 3438
3281 my $self = $class->SUPER::new ( 3439 my $self = $class->SUPER::new (
3440 size_w => 32,
3441 size_h => 8,
3282 aspect => 1, 3442 aspect => 1,
3283 can_events => 0, 3443 can_events => 0,
3284 @_, 3444 @_,
3285 ); 3445 );
3286 3446
3287 if ($self->{anim} && $self->{animspeed}) { 3447 if ($self->{anim} && $self->{animspeed}) {
3288 CFPlus::weaken (my $widget = $self); 3448 CFPlus::weaken (my $widget = $self);
3289 3449
3450 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3451 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3290 $self->{timer} = Event->timer ( 3452 $self->{timer} = Event->timer (
3291 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3292 hard => 1, 3453 parked => 1,
3293 interval => $self->{animspeed},
3294 cb => sub { 3454 cb => sub {
3455 return unless $::CONN && $widget;
3456
3295 ++$widget->{frame}; 3457 ++$widget->{frame};
3458 $widget->update_face;
3296 $widget->update; 3459 $widget->update;
3460
3461 $widget->update_timer;
3297 }, 3462 },
3298 ); 3463 );
3464
3465 $self->update_face;
3466 $self->update_timer;
3299 } 3467 }
3300 3468
3301 $self 3469 $self
3302} 3470}
3303 3471
3472sub update_timer {
3473 my ($self) = @_;
3474
3475 return unless $self->{timer};
3476
3477 if ($self->{visible}) {
3478 $self->{timer}->at (
3479 $self->{anim_start}
3480 + $self->{animspeed}
3481 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3482 );
3483 $self->{timer}->start;
3484 } else {
3485 $self->{timer}->stop;
3486 }
3487}
3488
3489sub update_face {
3490 my ($self) = @_;
3491
3492 return unless $::CONN;
3493
3494 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3495 if ($anim && @$anim) {
3496 delete $self->{wait_face};
3497 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3498 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3499 }
3500 }
3501}
3502
3304sub size_request { 3503sub size_request {
3305 (32, 8) 3504 my ($self) = @_;
3505
3506 if ($::CONN) {
3507 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3508 if (my $tex = $::CONN->{texture}[$faceid]) {
3509 $self->{tex} = $tex;
3510 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3511 } else {
3512 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3513 $self->realloc;
3514 });
3515 }
3516 }
3517 }
3518
3519 ($self->{size_w} || 8, $self->{size_h} || 8)
3306} 3520}
3307 3521
3308sub update { 3522sub update {
3309 my ($self) = @_; 3523 my ($self) = @_;
3310 3524
3311 return unless $self->{visible}; 3525 return unless $self->{visible};
3312 3526
3313 $self->SUPER::update; 3527 $self->SUPER::update;
3314} 3528}
3315 3529
3530sub invoke_visibility_change {
3531 my ($self) = @_;
3532
3533 $self->update_timer;
3534
3535 0
3536}
3537
3316sub _draw { 3538sub _draw {
3317 my ($self) = @_; 3539 my ($self) = @_;
3318 3540
3319 return unless $::CONN;
3320
3321 $self->SUPER::_draw; 3541 $self->SUPER::_draw;
3322 3542
3323 my $face; 3543 if (my $tex = $self->{tex}) {
3324
3325 if ($self->{frame}) {
3326 my $anim = $::CONN->{anim}[$self->{anim}];
3327
3328 $face = $anim->[ $self->{frame} % @$anim ]
3329 if $anim && @$anim;
3330 }
3331
3332 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3333
3334 if ($tex) {
3335 glEnable GL_TEXTURE_2D; 3544 glEnable GL_TEXTURE_2D;
3336 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3545 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3337 glColor 0, 0, 0, 1; 3546 glColor 0, 0, 0, 1;
3338 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3547 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3339 glDisable GL_TEXTURE_2D; 3548 glDisable GL_TEXTURE_2D;
… …
3341} 3550}
3342 3551
3343sub destroy { 3552sub destroy {
3344 my ($self) = @_; 3553 my ($self) = @_;
3345 3554
3346 $self->{timer}->cancel 3555 (delete $self->{timer})->cancel
3347 if $self->{timer}; 3556 if $self->{timer};
3348 3557
3349 $self->SUPER::destroy; 3558 $self->SUPER::destroy;
3350} 3559}
3351 3560
… …
3541 ); 3750 );
3542 3751
3543 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3752 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3544 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3753 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3545 3754
3755 {
3756 Scalar::Util::weaken (my $wself = $self);
3757
3758 $self->{multiplexer}->connect (c_add => sub {
3759 my ($mplex, $widgets) = @_;
3760
3761 for my $child (@$widgets) {
3762 Scalar::Util::weaken $child;
3763 $child->{c_tab_} ||= do {
3764 my $tab =
3765 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3766 ? $child->{c_tab}
3767 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3768
3769 $tab->connect (activate => sub {
3770 $wself->set_current_page ($child);
3771 });
3772
3773 $tab
3774 };
3775
3776 $self->{buttonbar}->add ($child->{c_tab_});
3777 }
3778 });
3779
3780 $self->{multiplexer}->connect (c_remove => sub {
3781 my ($mplex, $widgets) = @_;
3782
3783 for my $child (@$widgets) {
3784 $wself->{buttonbar}->remove ($child->{c_tab_});
3785 }
3786 });
3787 }
3788
3546 $self 3789 $self
3547} 3790}
3548 3791
3549sub add { 3792sub add {
3793 my ($self, @widgets) = @_;
3794
3795 $self->{multiplexer}->add (@widgets)
3796}
3797
3798sub remove {
3799 my ($self, @widgets) = @_;
3800
3801 $self->{multiplexer}->remove (@widgets)
3802}
3803
3804sub add_tab {
3550 my ($self, $title, $widget, $tooltip) = @_; 3805 my ($self, $title, $widget, $tooltip) = @_;
3551 3806
3552 CFPlus::weaken $self; 3807 $title = [$title, $tooltip] unless ref $title;
3808 $widget->{c_tab} = $title;
3553 3809
3554 $self->{buttonbar}->add (new CFPlus::UI::Button
3555 markup => $title,
3556 tooltip => $tooltip,
3557 on_activate => sub { $self->set_current_page ($widget) },
3558 );
3559
3560 $self->{multiplexer}->add ($widget); 3810 $self->add ($widget);
3561} 3811}
3562 3812
3563sub get_current_page { 3813sub get_current_page {
3564 my ($self) = @_; 3814 my ($self) = @_;
3565 3815
… …
3895 while ($self->{refresh_hook}) { 4145 while ($self->{refresh_hook}) {
3896 $_->() 4146 $_->()
3897 for values %{delete $self->{refresh_hook}}; 4147 for values %{delete $self->{refresh_hook}};
3898 } 4148 }
3899 4149
3900 if ($self->{realloc}) { 4150 while ($self->{realloc}) {
3901 my %queue; 4151 my %queue;
3902 my @queue; 4152 my @queue;
3903 my $widget; 4153 my $widget;
3904 4154
3905 outer: 4155 outer:
… …
3952 } 4202 }
3953 } 4203 }
3954 4204
3955 delete $self->{realloc}{$widget+0}; 4205 delete $self->{realloc}{$widget+0};
3956 } 4206 }
3957 }
3958 4207
3959 while (my $size_alloc = delete $self->{size_alloc}) { 4208 while (my $size_alloc = delete $self->{size_alloc}) {
3960 my @queue = sort { $b->{visible} <=> $a->{visible} } 4209 my @queue = sort { $a->{visible} <=> $b->{visible} }
3961 values %$size_alloc; 4210 values %$size_alloc;
3962 4211
3963 while () { 4212 while () {
3964 my $widget = pop @queue || last; 4213 my $widget = pop @queue || last;
3965 4214
3966 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4215 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3967 4216
3968 $w = 0 if $w < 0;
3969 $h = 0 if $h < 0;
3970
3971 $w = max $widget->{min_w}, $w; 4217 $w = max $widget->{min_w}, $w;
3972 $h = max $widget->{min_h}, $h; 4218 $h = max $widget->{min_h}, $h;
3973 4219
3974# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4220# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3975# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4221# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3976 4222
3977 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4223 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3978 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4224 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3979 4225
3980 $w = int $w + 0.5; 4226 $w = int $w + 0.5;
3981 $h = int $h + 0.5; 4227 $h = int $h + 0.5;
3982 4228
3983 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4229 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3984 $widget->{old_w} = $widget->{w}; 4230 $widget->{old_w} = $widget->{w};
3985 $widget->{old_h} = $widget->{h}; 4231 $widget->{old_h} = $widget->{h};
3986 4232
3987 $widget->{w} = $w; 4233 $widget->{w} = $w;
3988 $widget->{h} = $h; 4234 $widget->{h} = $h;
3989 4235
3990 $widget->emit (size_allocate => $w, $h); 4236 $widget->emit (size_allocate => $w, $h);
4237 }
3991 } 4238 }
3992 } 4239 }
3993 } 4240 }
3994 4241
3995 while ($self->{post_alloc_hook}) { 4242 while ($self->{post_alloc_hook}) {
3996 $_->() 4243 $_->()
3997 for values %{delete $self->{post_alloc_hook}}; 4244 for values %{delete $self->{post_alloc_hook}};
3998 } 4245 }
3999
4000 4246
4001 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4247 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4002 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4248 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4003 glClear GL_COLOR_BUFFER_BIT; 4249 glClear GL_COLOR_BUFFER_BIT;
4004 4250

Diff Legend

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