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.380 by root, Tue Jul 17 17:39:07 2007 UTC vs.
Revision 1.425 by root, Fri Aug 10 04:02:13 2007 UTC

… …
113 } 113 }
114 114
115 if ($GRAB) { 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 117 # mousewheel
118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9; 118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
120 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
121 } else { 125 } else {
122 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
123 } 127 }
124 } 128 }
… …
269 $self->emit ("destroy"); 273 $self->emit ("destroy");
270 %$self = (); 274 %$self = ();
271} 275}
272 276
273sub TO_JSON { 277sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} } 278 { __w_ => $_[0]{s_id} }
275} 279}
276 280
277sub show { 281sub show {
278 my ($self) = @_; 282 my ($self) = @_;
279 283
… …
547 551
548 # parent 552 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 554}
551 555
552sub find_widget { 556#sub find_widget {
553 my ($self, $x, $y) = @_; 557# in .xs
554
555 return () unless $self->{can_events};
556
557 return $self
558 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561 ()
562}
563 558
564sub set_parent { 559sub set_parent {
565 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
566 561
567 CFPlus::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
… …
598 593
599# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
600# functions seems pointless. 595# functions seems pointless.
601our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602 597
603sub draw { 598#sub draw {
604 my ($self) = @_; 599#CFPlus.xs
605
606 return unless $self->{h} && $self->{w};
607
608 # update screen rectangle
609 local $draw_x = $draw_x + $self->{x};
610 local $draw_y = $draw_y + $self->{y};
611
612 # skip widgets that are entirely outside the drawing area
613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
615
616 glPushMatrix;
617 glTranslate $self->{x}, $self->{y}, 0;
618
619 if ($self == $HOVER && $self->{can_hover}) {
620 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
621 glEnable GL_BLEND;
622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623 glBegin GL_QUADS;
624 glVertex 0 , 0;
625 glVertex $self->{w}, 0;
626 glVertex $self->{w}, $self->{h};
627 glVertex 0 , $self->{h};
628 glEnd;
629 glDisable GL_BLEND;
630 }
631
632 if ($ENV{CFPLUS_DEBUG} & 1) {
633 glPushMatrix;
634 glColor 1, 1, 0, 1;
635 glTranslate 0.375, 0.375;
636 glBegin GL_LINE_LOOP;
637 glVertex 0 , 0;
638 glVertex $self->{w} - 1, 0;
639 glVertex $self->{w} - 1, $self->{h} - 1;
640 glVertex 0 , $self->{h} - 1;
641 glEnd;
642 glPopMatrix;
643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
644 }
645
646 $self->_draw;
647 glPopMatrix;
648}
649 600
650sub _draw { 601sub _draw {
651 my ($self) = @_; 602 my ($self) = @_;
652 603
653 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
654} 605}
655 606
656my $cntx;#d#
657sub DESTROY { 607sub DESTROY {
658 my ($self) = @_; 608 my ($self) = @_;
659 609
660 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
661 611
… …
746 can_events => 0, 696 can_events => 0,
747 %arg, 697 %arg,
748 ); 698 );
749 699
750 $self->add (@$children) 700 $self->add (@$children)
751 if $children; 701 if $children && @$children;
752 702
753 $self 703 $self
754} 704}
755 705
756sub realloc { 706sub realloc {
… …
765 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
766 716
767 $_->set_parent ($self) 717 $_->set_parent ($self)
768 for @widgets; 718 for @widgets;
769 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 721 use sort 'stable';
771 722
772 $self->{children} = [ 723 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
775 ]; 726 ];
776 727
777 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
778} 733}
779 734
780sub children { 735sub children {
781 @{ $_[0]{children} } 736 @{ $_[0]{children} }
782} 737}
783 738
784sub remove { 739sub remove {
785 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
786 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
787 delete $child->{parent}; 745 delete $child->{parent};
788 $child->hide; 746 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
791 749
792 $self->realloc; 750 $self->realloc;
793} 751}
794 752
795sub clear { 753sub clear {
796 my ($self) = @_; 754 my ($self) = @_;
797 755
798 my $children = delete $self->{children}; 756 my $children = $self->{children};
799 $self->{children} = []; 757 $self->{children} = [];
800 758
801 for (@$children) { 759 for (@$children) {
802 delete $_->{parent}; 760 delete $_->{parent};
803 $_->hide; 761 $_->hide;
… …
823} 781}
824 782
825sub _draw { 783sub _draw {
826 my ($self) = @_; 784 my ($self) = @_;
827 785
828 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
829} 787}
830 788
831############################################################################# 789#############################################################################
832 790
833package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
… …
843} 801}
844 802
845sub add { 803sub add {
846 my ($self, $child) = @_; 804 my ($self, $child) = @_;
847 805
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
849 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
850} 808}
851 809
852sub remove { 810sub remove {
853 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
… …
963sub size_request { 921sub size_request {
964 my ($self) = @_; 922 my ($self) = @_;
965 923
966 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967 925
968 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
969 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
970 928
971 ($w, $h) 929 ($w, $h)
972} 930}
973 931
974sub invoke_size_allocate { 932sub invoke_size_allocate {
… …
998 $self->emit (changed => $x, $y); 956 $self->emit (changed => $x, $y);
999 $self->update; 957 $self->update;
1000 } 958 }
1001} 959}
1002 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 }
977}
978
1003# 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
1004sub coord2local { 980sub coord2local {
1005 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
1006 982
1007 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 983 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
… …
1020 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
1021 997
1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 999 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1024 ) { 1000 ) {
1025 $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})
1026 } else { 1002 } else {
1027 $self->CFPlus::UI::Base::find_widget ($x, $y) 1003 $self->CFPlus::UI::Base::find_widget ($x, $y)
1028 } 1004 }
1029} 1005}
1030 1006
… …
1051 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1052 1028
1053 my $self; 1029 my $self;
1054 1030
1055 my $hslider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 c_col => 0,
1033 c_row => 1,
1056 vertical => 0, 1034 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub { 1036 on_changed => sub {
1059 $self->{hpos} = $_[1]; 1037 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 }, 1039 },
1062 ; 1040 ;
1063 1041
1064 my $vslider = new CFPlus::UI::Slider 1042 my $vslider = new CFPlus::UI::Slider
1043 c_col => 1,
1044 c_row => 0,
1065 vertical => 1, 1045 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub { 1047 on_changed => sub {
1068 $self->{vpos} = $_[1]; 1048 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1080 row_expand => [1, 0], 1060 row_expand => [1, 0],
1081 %arg, 1061 %arg,
1082 ); 1062 );
1083 1063
1084 $self->{vp} = new CFPlus::UI::ViewPort 1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 c_col => 0,
1066 c_row => 0,
1085 expand => 1, 1067 expand => 1,
1086 scroll_x => $self->{scroll_x}, 1068 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y}, 1069 scroll_y => $self->{scroll_y},
1088 on_changed => sub { 1070 on_changed => sub {
1089 my ($vp, $x, $y) = @_; 1071 my ($vp, $x, $y) = @_;
… …
1091 $vp->{parent}{hslider}->set_value ($x); 1073 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y); 1074 $vp->{parent}{vslider}->set_value ($y);
1093 1075
1094 0 1076 0
1095 }, 1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1096 ; 1083 ;
1097 1084
1098 $self->SUPER::add (0, 0, $self->{vp}); 1085 $self->SUPER::add ($self->{vp});
1099 1086
1100 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
1101 1088
1102 $self 1089 $self
1103} 1090}
1104
1105#TODO# update range on size_allocate depending on child
1106 1091
1107sub add { 1092sub add {
1108 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1109 1094
1110 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1111} 1096}
1112 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1113sub update_slider { 1102sub update_slider {
1114 my ($self) = @_; 1103 my ($self) = @_;
1115 1104
1116 my $child = ($self->{vp} or return)->child; 1105 my $child = ($self->{vp} or return)->child;
1117 1106
1107 if ($self->{scroll_x}) {
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120 1110
1121 my $visible = $w1 > $w2; 1111 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) { 1112 if ($visible != $self->{hslider_visible}) {
1113 $self->{hslider_visible} = $visible;
1123 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1114 $visible ? $self->SUPER::add ($self->{hslider})
1124 : $self->{hslider}->hide; 1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1125 } 1117 }
1126 1118
1119 if ($self->{scroll_y}) {
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1121 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129 1122
1130 my $visible = $h1 > $h2; 1123 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) { 1124 if ($visible != $self->{vslider_visible}) {
1125 $self->{vslider_visible} = $visible;
1132 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1126 $visible ? $self->SUPER::add ($self->{vslider})
1133 : $self->{vslider}->hide; 1127 : $self->SUPER::remove ($self->{vslider});
1128 }
1129 }
1130}
1131
1132sub start_dragging {
1133 my ($self, $ev) = @_;
1134
1135 $self->grab_focus;
1136
1137 my $ox = $self->{vp}{view_x};
1138 my $oy = $self->{vp}{view_y};
1139
1140 $self->{motion} = sub {
1141 my ($ev, $x, $y) = @_;
1142
1143 $ox -= $ev->{xrel};
1144 $oy -= $ev->{yrel};
1145
1146 $self->{vp}->set_offset ($ox, $oy);
1134 } 1147 };
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142} 1148}
1143 1149
1144sub invoke_mouse_wheel { 1150sub invoke_mouse_wheel {
1145 my ($self, $ev) = @_; 1151 my ($self, $ev) = @_;
1146 1152
1147 return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149 $self->{vslider}->emit (mouse_wheel => $ev); 1153 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1154 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1150 1155
1151 1 1156 1
1152} 1157}
1153 1158
1154sub invoke_button_down { 1159sub invoke_button_down {
1155 my ($self, $ev, $x, $y) = @_; 1160 my ($self, $ev, $x, $y) = @_;
1156 1161
1157 if ($ev->{button} == 2) { 1162 if ($ev->{button} == 2) {
1158 $self->grab_focus; 1163 $self->start_dragging ($ev);
1159
1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1165
1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1169
1170 return 1; 1164 return 1;
1171 } 1165 }
1172 1166
1173 0 1167 0
1174} 1168}
… …
1355 1349
1356my @border = 1350my @border =
1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1358 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);
1359 1353
1354my @icon =
1355 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1356 qw(x1_move.png x1_resize.png);
1357
1360sub new { 1358sub new {
1361 my ($class, %arg) = @_; 1359 my ($class, %arg) = @_;
1362 1360
1363 my $self = $class->SUPER::new ( 1361 my $self = $class->SUPER::new (
1364 bg => [1, 1, 1, 1], 1362 bg => [1, 1, 1, 1],
… …
1532 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1533 1531
1534 my $border = $self->border; 1532 my $border = $self->border;
1535 1533
1536 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1537 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1538 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1539 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1540 $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);
1541 1553
1542 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1543 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1544 1556
1545 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1566 1578
1567############################################################################# 1579#############################################################################
1568 1580
1569package CFPlus::UI::Table; 1581package CFPlus::UI::Table;
1570 1582
1571our @ISA = CFPlus::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1572 1584
1573use List::Util qw(max sum); 1585use List::Util qw(max sum);
1574 1586
1575use CFPlus::OpenGL; 1587use CFPlus::OpenGL;
1576 1588
1577sub new { 1589sub new {
1578 my $class = shift; 1590 my $class = shift;
1579 1591
1580 $class->SUPER::new ( 1592 $class->SUPER::new (
1581 children => [],
1582 col_expand => [], 1593 col_expand => [],
1583 row_expand => [], 1594 row_expand => [],
1584 @_, 1595 @_,
1585 ) 1596 )
1586} 1597}
1587 1598
1588sub children {
1589 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1590}
1591
1592# TODO: store row/col info in child widget and use standard add/del
1593sub 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 {
1594 my ($self) = shift; 1611 my $self = shift;
1612
1613 my @widgets;
1595 1614
1596 while (@_) { 1615 while (@_) {
1597 my ($x, $y, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1598 $child->set_parent ($self);
1599 $self->{children}[$y][$x] = $child;
1600 }
1601 1617
1602 $self->{force_realloc} = 1; 1618 $child->{c_row} = $row;
1603 $self->{force_size_alloc} = 1; 1619 $child->{c_col} = $col;
1604 $self->realloc;
1605}
1606 1620
1607sub remove { 1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1608 my ($self, $child) = @_; 1628 my ($self) = @_;
1609 1629
1610 for (@{ $self->{children} }) { 1630 my (@w, @h);
1611 for (@{ $_ || [] }) { 1631
1612 $_ = undef if $_ == $child; 1632 my @children = $self->children;
1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637
1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639
1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1613 } 1642 }
1614 } 1643 }
1615}
1616 1644
1617# TODO: move to container class maybe? send children a signal on removal? 1645 # second pass, rows
1618sub clear { 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1619 my ($self) = @_;
1620
1621 my @children = $self->children;
1622 delete $self->{children};
1623
1624 for (@children) {
1625 delete $_->{parent};
1626 $_->hide;
1627 }
1628
1629 $self->realloc;
1630}
1631
1632sub get_wh {
1633 my ($self) = @_;
1634
1635 my (@w, @h);
1636
1637 for my $y (0 .. $#{$self->{children}}) {
1638 my $row = $self->{children}[$y]
1639 or next;
1640
1641 for my $x (0 .. $#$row) {
1642 my $widget = $row->[$x]
1643 or next;
1644 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1645 1648
1646 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1647 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1648 } 1653 }
1649 } 1654 }
1650 1655
1651 (\@w, \@h) 1656 (\@w, \@h)
1652} 1657}
… …
1668 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1669 1674
1670 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1671 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1672 1677
1673 # TODO: nicer code 1678 # now linearly scale the rows/columns to the allocated size
1674 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1675 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1676 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1677 1682
1678 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1685 1690
1686 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1687 1692
1688 CFPlus::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1689 1694
1690 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1691 1697
1692 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1693 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)};
1694 or next;
1695 1700
1696 my $x = 0; 1701 $widget->configure (
1697 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1698 1704 );
1699 for my $c (0 .. $#$row) {
1700 my $col_w = $ws->[$c];
1701
1702 if (my $widget = $row->[$c]) {
1703 $widget->configure ($x, $y, $col_w, $row_h);
1704 }
1705
1706 $x += $col_w;
1707 }
1708
1709 $y += $row_h;
1710 } 1705 }
1711 1706
1712 1 1707 1
1713} 1708}
1714 1709
1715sub find_widget {
1716 my ($self, $x, $y) = @_;
1717
1718 $x -= $self->{x};
1719 $y -= $self->{y};
1720
1721 my $res;
1722
1723 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1724 $res = $_->find_widget ($x, $y)
1725 and return $res;
1726 }
1727
1728 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1729}
1730
1731sub _draw {
1732 my ($self) = @_;
1733
1734 for (grep $_, @{$self->{children}}) {
1735 $_->draw for grep $_, @$_;
1736 }
1737}
1738
1739############################################################################# 1710#############################################################################
1740 1711
1741package CFPlus::UI::Fixed; 1712package CFPlus::UI::Fixed;
1742 1713
1743use List::Util qw(min max); 1714use List::Util qw(min max);
1744 1715
1745our @ISA = CFPlus::UI::Container::; 1716our @ISA = CFPlus::UI::Container::;
1746 1717
1747sub add {
1748 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1749
1750 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1751 $self->SUPER::add ($child);
1752}
1753
1754sub _scale($$$) { 1718sub _scale($$$) {
1755 my ($mode, $val, $max) = @_; 1719 my ($rel, $val, $max) = @_;
1756 1720
1757 $mode eq "abs" ? $val 1721 $rel ? $val * $max : $val
1758 : $mode eq "rel" ? $val * $max
1759 : 0
1760} 1722}
1761 1723
1762sub size_request { 1724sub size_request {
1763 my ($self) = @_; 1725 my ($self) = @_;
1764 1726
1765 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1766 1728
1767 # determine overall size by querying abs widgets 1729 # determine overall size by querying abs widgets
1768 for my $child ($self->visible_children) { 1730 for my $child ($self->visible_children) {
1769 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1770 1734
1771 if ($pos eq "abs") {
1772 $w = _scale $size, $w, $child->{req_w};
1773 $h = _scale $size, $h, $child->{req_h};
1774
1775 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1776 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1777 } 1737 }
1778 } 1738 }
1779 1739
1780 my $W = $x2 - $x1; 1740 my $W = $x2 - $x1;
1781 my $H = $y2 - $y1; 1741 my $H = $y2 - $y1;
1782 1742
1783 # now layout remaining widgets 1743 # now layout remaining widgets
1784 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1785 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1786 1748
1787 if ($pos ne "abs") {
1788 $x = _scale $pos, $x, $W;
1789 $y = _scale $pos, $x, $H;
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792
1793 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1794 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1795 } 1751 }
1796 } 1752 }
1797 1753
1798 my $W = $x2 - $x1; 1754 my $W = $x2 - $x1;
1799 my $H = $y2 - $y1; 1755 my $H = $y2 - $y1;
… …
1803 1759
1804sub invoke_size_allocate { 1760sub invoke_size_allocate {
1805 my ($self, $W, $H) = @_; 1761 my ($self, $W, $H) = @_;
1806 1762
1807 for my $child ($self->visible_children) { 1763 for my $child ($self->visible_children) {
1808 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1809 1766
1810 $x = _scale $pos, $x, $W; 1767 $x += $child->{c_halign} * $child->{req_w};
1811 $y = _scale $pos, $x, $H; 1768 $y += $child->{c_valign} * $child->{req_h};
1812 $w = _scale $size, $w, $child->{req_w};
1813 $h = _scale $size, $h, $child->{req_h};
1814 1769
1815 $child->configure ($x, $y, $w, $h); 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1816 } 1771 }
1817 1772
1818 1 1773 1
1819} 1774}
1820 1775
… …
1824 1779
1825our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1826 1781
1827sub size_request { 1782sub size_request {
1828 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1829 1786
1830 $self->{vertical} 1787 $self->{vertical}
1831 ? ( 1788 ? (
1832 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1833 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1834 ) 1791 )
1835 : ( 1792 : (
1836 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1837 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1838 ) 1795 )
1839} 1796}
1840 1797
1841sub invoke_size_allocate { 1798sub invoke_size_allocate {
1842 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1966 1923
1967 delete $self->{ox}; 1924 delete $self->{ox};
1968 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1969} 1926}
1970 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1971sub set_text { 1934sub set_text {
1972 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1973 1936
1974 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1975 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
… …
2083 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2084 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2085 : ($self->{h} - $size->[1]) * 0.5); 2048 : ($self->{h} - $size->[1]) * 0.5);
2086 }; 2049 };
2087 2050
2088 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2051# unless ($self->{list}) {
2089 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};
2090 2059
2091 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2060 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2092} 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#}
2093 2070
2094############################################################################# 2071#############################################################################
2095 2072
2096package CFPlus::UI::EntryBase; 2073package CFPlus::UI::EntryBase;
2097 2074
… …
2103 my $class = shift; 2080 my $class = shift;
2104 2081
2105 $class->SUPER::new ( 2082 $class->SUPER::new (
2106 fg => [1, 1, 1], 2083 fg => [1, 1, 1],
2107 bg => [0, 0, 0, 0.2], 2084 bg => [0, 0, 0, 0.2],
2085 outline => [0.6, 0.3, 0.1],
2108 active_bg => [1, 1, 1, 0.5], 2086 active_bg => [0, 0, 1, .2],
2109 active_fg => [0, 0, 0], 2087 active_fg => [1, 1, 1],
2088 active_outline => [1, 1, 0],
2110 can_hover => 1, 2089 can_hover => 1,
2111 can_focus => 1, 2090 can_focus => 1,
2112 valign => 0, 2091 valign => 0,
2113 can_events => 1, 2092 can_events => 1,
2114 ellipsise => 0, 2093 ellipsise => 0,
… …
2271 2250
2272 unless (exists $self->{cur_h}) { 2251 unless (exists $self->{cur_h}) {
2273 my $text = substr $self->{text}, 0, $self->{cursor}; 2252 my $text = substr $self->{text}, 0, $self->{cursor};
2274 utf8::encode $text; 2253 utf8::encode $text;
2275 2254
2276 @$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);
2277 } 2256 }
2278 2257
2258 glColor_premultiply @{$self->{active_fg}};
2279 glBegin GL_LINES; 2259 glBegin GL_LINES;
2280 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};
2281 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;
2282 glEnd; 2282 glEnd;
2283 } 2283 }
2284} 2284}
2285 2285
2286############################################################################# 2286#############################################################################
… …
2373 1 2373 1
2374} 2374}
2375 2375
2376############################################################################# 2376#############################################################################
2377 2377
2378package CFPlus::UI::Button; 2378package CFPlus::UI::ButtonBin;
2379 2379
2380our @ISA = CFPlus::UI::Label::; 2380our @ISA = CFPlus::UI::Bin::;
2381 2381
2382use CFPlus::OpenGL; 2382use CFPlus::OpenGL;
2383 2383
2384my @tex = 2384my @tex =
2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2386 qw(b1_button_active.png); 2386 qw(b1_button_inactive.png b1_button_active.png);
2387 2387
2388sub new { 2388sub new {
2389 my $class = shift; 2389 my $class = shift;
2390 2390
2391 $class->SUPER::new ( 2391 $class->SUPER::new (
2392 padding_x => 4,
2393 padding_y => 4,
2394 fg => [1, 1, 1],
2395 active_fg => [0, 0, 1],
2396 can_hover => 1, 2392 can_hover => 1,
2397 align => 0, 2393 align => 0,
2398 valign => 0, 2394 valign => 0,
2399 can_events => 1, 2395 can_events => 1,
2400 @_ 2396 @_
… …
2412} 2408}
2413 2409
2414sub _draw { 2410sub _draw {
2415 my ($self) = @_; 2411 my ($self) = @_;
2416 2412
2417 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2418
2419 glEnable GL_TEXTURE_2D; 2413 glEnable GL_TEXTURE_2D;
2420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2421 glColor 0, 0, 0, 1; 2415 glColor 0, 0, 0, 1;
2422 2416
2417 my $tex = $tex[$GRAB == $self];
2423 $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});
2424 2474
2425 glDisable GL_TEXTURE_2D; 2475 glDisable GL_TEXTURE_2D;
2426 2476
2427 $self->SUPER::_draw; 2477 $self->SUPER::_draw;
2428} 2478}
… …
2515sub new { 2565sub new {
2516 my $class = shift; 2566 my $class = shift;
2517 2567
2518 my $self = $class->SUPER::new ( 2568 my $self = $class->SUPER::new (
2519 can_events => 0, 2569 can_events => 0,
2570 scale => 1,
2520 @_, 2571 @_,
2521 ); 2572 );
2522 2573
2523 $self->{path} || $self->{tex} 2574 $self->{path} || $self->{tex}
2524 or Carp::croak "'path' or 'tex' attributes required"; 2575 or Carp::croak "'path' or 'tex' attributes required";
… …
2549} 2600}
2550 2601
2551sub size_request { 2602sub size_request {
2552 my ($self) = @_; 2603 my ($self) = @_;
2553 2604
2554 ($self->{tex}{w}, $self->{tex}{h}) 2605 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2555} 2606}
2556 2607
2557sub _draw { 2608sub _draw {
2558 my ($self) = @_; 2609 my ($self) = @_;
2559 2610
… …
2569 } 2620 }
2570 2621
2571 glEnable GL_TEXTURE_2D; 2622 glEnable GL_TEXTURE_2D;
2572 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2623 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2573 2624
2574 $tex->draw_quad (0, 0, $w, $h); 2625 $tex->draw_quad_alpha (0, 0, $w, $h);
2575 2626
2576 glDisable GL_TEXTURE_2D; 2627 glDisable GL_TEXTURE_2D;
2577} 2628}
2578 2629
2579############################################################################# 2630#############################################################################
… …
2881 2932
2882 $self->SUPER::invoke_button_down ($ev, $x, $y); 2933 $self->SUPER::invoke_button_down ($ev, $x, $y);
2883 2934
2884 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2935 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2885 2936
2886 $self->invoke_mouse_motion ($ev, $x, $y) 2937 $self->invoke_mouse_motion ($ev, $x, $y);
2938
2939 1
2887} 2940}
2888 2941
2889sub invoke_mouse_motion { 2942sub invoke_mouse_motion {
2890 my ($self, $ev, $x, $y) = @_; 2943 my ($self, $ev, $x, $y) = @_;
2891 2944
… …
2911 2964
2912 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2965 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2913 2966
2914 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2967 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2915 2968
2916 ! ! $delta 2969 1
2917} 2970}
2918 2971
2919sub update { 2972sub update {
2920 my ($self) = @_; 2973 my ($self) = @_;
2921 2974
… …
3052} 3105}
3053 3106
3054sub size_request { 3107sub size_request {
3055 my ($self) = @_; 3108 my ($self) = @_;
3056 3109
3057 my ($empty, $slider) = @{ $self->{children} }; 3110 my ($empty, $slider) = $self->visible_children;
3058 3111
3059 local $self->{children} = [$empty, $slider]; 3112 local $self->{children} = [$empty, $slider];
3060 $self->SUPER::size_request 3113 $self->SUPER::size_request
3061} 3114}
3062 3115
… …
3451 glTranslate 0.375, 0.375; 3504 glTranslate 0.375, 0.375;
3452 3505
3453 my ($w, $h) = @$self{qw(w h)}; 3506 my ($w, $h) = @$self{qw(w h)};
3454 3507
3455 glColor 1, 0.8, 0.4; 3508 glColor 1, 0.8, 0.4;
3456 glBegin GL_QUADS; 3509 glRect 0, 0, $w, $h;
3457 glVertex 0 , 0;
3458 glVertex 0 , $h;
3459 glVertex $w, $h;
3460 glVertex $w, 0;
3461 glEnd;
3462 3510
3463 glColor 0, 0, 0; 3511 glColor 0, 0, 0;
3464 glBegin GL_LINE_LOOP; 3512 glBegin GL_LINE_LOOP;
3465 glVertex 0 , 0; 3513 glVertex 0 , 0;
3466 glVertex 0 , $h; 3514 glVertex 0 , $h;
… …
3494 3542
3495 if ($self->{anim} && $self->{animspeed}) { 3543 if ($self->{anim} && $self->{animspeed}) {
3496 CFPlus::weaken (my $widget = $self); 3544 CFPlus::weaken (my $widget = $self);
3497 3545
3498 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3546 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3499 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3547 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3500 $self->{timer} = Event->timer ( 3548 $self->{timer} = Event->timer (
3501 parked => 1, 3549 parked => 1,
3502 cb => sub { 3550 cb => sub {
3503 return unless $::CONN && $widget; 3551 return unless $::CONN && $widget;
3504 3552
… …
3541 3589
3542 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3590 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3543 if ($anim && @$anim) { 3591 if ($anim && @$anim) {
3544 delete $self->{wait_face}; 3592 delete $self->{wait_face};
3545 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3593 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3594 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]) {
3595 unless ($tex->{name} || $tex->{loading}) {
3596 $tex->upload (sub { $self->reconfigure });
3597 }
3598 }
3546 } 3599 }
3547 } 3600 }
3548} 3601}
3549 3602
3550sub size_request { 3603sub size_request {
3551 my ($self) = @_; 3604 my ($self) = @_;
3552 3605
3553 if ($::CONN) { 3606 if ($::CONN) {
3554 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3607 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3555 if (my $tex = $::CONN->{texture}[$faceid]) { 3608 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3609 if ($tex->{name}) {
3556 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3610 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3611 } elsif (!$tex->{loading}) {
3612 $tex->upload (sub { $self->reconfigure });
3613 }
3557 } else { 3614 } else {
3558 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3615 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3559 $self->realloc; 3616 $self->reconfigure;
3560 }); 3617 });
3561 } 3618 }
3562 } 3619 }
3563 } 3620 }
3564 3621
… …
3582} 3639}
3583 3640
3584sub _draw { 3641sub _draw {
3585 my ($self) = @_; 3642 my ($self) = @_;
3586 3643
3587 return unless $::CONN;
3588
3589 $self->SUPER::_draw; 3644 $self->SUPER::_draw;
3590 3645
3591 my $faceid = $::CONN->{faceid}[$self->{face}] 3646 if (my $tex = $self->{tex}) {
3592 or return;
3593
3594 my $tex = $::CONN->{texture}[$faceid];
3595
3596 if ($tex) {
3597 glEnable GL_TEXTURE_2D; 3647 glEnable GL_TEXTURE_2D;
3598 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3648 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3599 glColor 0, 0, 0, 1; 3649 glColor 0, 0, 0, 1;
3600 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3650 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3601 glDisable GL_TEXTURE_2D; 3651 glDisable GL_TEXTURE_2D;
… …
3653 children => [ 3703 children => [
3654 (new CFPlus::UI::Label markup => $left, expand => 1), 3704 (new CFPlus::UI::Label markup => $left, expand => 1),
3655 (new CFPlus::UI::Label markup => $right, align => +1), 3705 (new CFPlus::UI::Label markup => $right, align => +1),
3656 ], 3706 ],
3657 ; 3707 ;
3658 3708
3659 } else { 3709 } else {
3660 $widget = new CFPlus::UI::Label 3710 $widget = new CFPlus::UI::Label
3661 can_hover => 1, 3711 can_hover => 1,
3662 can_events => 1, 3712 can_events => 1,
3663 markup => $widget, 3713 markup => $widget,
… …
3799 buttonbar => (new CFPlus::UI::Buttonbar), 3849 buttonbar => (new CFPlus::UI::Buttonbar),
3800 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3850 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3801 # filter => # will be put between multiplexer and $self 3851 # filter => # will be put between multiplexer and $self
3802 @_, 3852 @_,
3803 ); 3853 );
3804 3854
3805 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3855 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3806 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3856 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3807 3857
3858 {
3859 Scalar::Util::weaken (my $wself = $self);
3860
3861 $self->{multiplexer}->connect (c_add => sub {
3862 my ($mplex, $widgets) = @_;
3863
3864 for my $child (@$widgets) {
3865 Scalar::Util::weaken $child;
3866 $child->{c_tab_} ||= do {
3867 my $tab =
3868 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3869 ? $child->{c_tab}
3870 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3871
3872 $tab->connect (activate => sub {
3873 $wself->set_current_page ($child);
3874 });
3875
3876 $tab
3877 };
3878
3879 $self->{buttonbar}->add ($child->{c_tab_});
3880 }
3881 });
3882
3883 $self->{multiplexer}->connect (c_remove => sub {
3884 my ($mplex, $widgets) = @_;
3885
3886 for my $child (@$widgets) {
3887 $wself->{buttonbar}->remove ($child->{c_tab_});
3888 }
3889 });
3890 }
3891
3808 $self 3892 $self
3809} 3893}
3810 3894
3811sub add { 3895sub add {
3896 my ($self, @widgets) = @_;
3897
3898 $self->{multiplexer}->add (@widgets)
3899}
3900
3901sub remove {
3902 my ($self, @widgets) = @_;
3903
3904 $self->{multiplexer}->remove (@widgets)
3905}
3906
3907sub pages {
3908 my ($self) = @_;
3909 $self->{multiplexer}->children
3910}
3911
3912sub add_tab {
3812 my ($self, $title, $widget, $tooltip) = @_; 3913 my ($self, $title, $widget, $tooltip) = @_;
3813 3914
3814 CFPlus::weaken $self; 3915 $title = [$title, $tooltip] unless ref $title;
3916 $widget->{c_tab} = $title;
3815 3917
3816 $self->{buttonbar}->add (new CFPlus::UI::Button
3817 markup => $title,
3818 tooltip => $tooltip,
3819 on_activate => sub { $self->set_current_page ($widget) },
3820 );
3821
3822 $self->{multiplexer}->add ($widget); 3918 $self->add ($widget);
3823} 3919}
3824 3920
3825sub get_current_page { 3921sub get_current_page {
3826 my ($self) = @_; 3922 my ($self) = @_;
3827 3923
… …
4110} 4206}
4111 4207
4112sub update { 4208sub update {
4113 my ($self) = @_; 4209 my ($self) = @_;
4114 4210
4115 $::WANT_REFRESH++; 4211 $::WANT_REFRESH->start;
4116} 4212}
4117 4213
4118sub add { 4214sub add {
4119 my ($self, @children) = @_; 4215 my ($self, @children) = @_;
4120 4216
… …
4157 while ($self->{refresh_hook}) { 4253 while ($self->{refresh_hook}) {
4158 $_->() 4254 $_->()
4159 for values %{delete $self->{refresh_hook}}; 4255 for values %{delete $self->{refresh_hook}};
4160 } 4256 }
4161 4257
4162 if ($self->{realloc}) { 4258 while ($self->{realloc}) {
4163 my %queue; 4259 my %queue;
4164 my @queue; 4260 my @queue;
4165 my $widget; 4261 my $widget;
4166 4262
4167 outer: 4263 outer:
… …
4214 } 4310 }
4215 } 4311 }
4216 4312
4217 delete $self->{realloc}{$widget+0}; 4313 delete $self->{realloc}{$widget+0};
4218 } 4314 }
4219 }
4220 4315
4221 while (my $size_alloc = delete $self->{size_alloc}) { 4316 while (my $size_alloc = delete $self->{size_alloc}) {
4222 my @queue = sort { $b->{visible} <=> $a->{visible} } 4317 my @queue = sort { $a->{visible} <=> $b->{visible} }
4223 values %$size_alloc; 4318 values %$size_alloc;
4224 4319
4225 while () { 4320 while () {
4226 my $widget = pop @queue || last; 4321 my $widget = pop @queue || last;
4227 4322
4228 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4323 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4229 4324
4230 $w = 0 if $w < 0;
4231 $h = 0 if $h < 0;
4232
4233 $w = max $widget->{min_w}, $w; 4325 $w = max $widget->{min_w}, $w;
4234 $h = max $widget->{min_h}, $h; 4326 $h = max $widget->{min_h}, $h;
4235 4327
4236# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4328# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4237# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4329# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4238 4330
4239 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4331 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4240 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4332 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4241 4333
4242 $w = int $w + 0.5; 4334 $w = int $w + 0.5;
4243 $h = int $h + 0.5; 4335 $h = int $h + 0.5;
4244 4336
4245 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4337 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4246 $widget->{old_w} = $widget->{w}; 4338 $widget->{old_w} = $widget->{w};
4247 $widget->{old_h} = $widget->{h}; 4339 $widget->{old_h} = $widget->{h};
4248 4340
4249 $widget->{w} = $w; 4341 $widget->{w} = $w;
4250 $widget->{h} = $h; 4342 $widget->{h} = $h;
4251 4343
4252 $widget->emit (size_allocate => $w, $h); 4344 $widget->emit (size_allocate => $w, $h);
4345 }
4253 } 4346 }
4254 } 4347 }
4255 } 4348 }
4256 4349
4257 while ($self->{post_alloc_hook}) { 4350 while ($self->{post_alloc_hook}) {
4258 $_->() 4351 $_->()
4259 for values %{delete $self->{post_alloc_hook}}; 4352 for values %{delete $self->{post_alloc_hook}};
4260 } 4353 }
4261
4262 4354
4263 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4355 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4264 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4356 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4265 glClear GL_COLOR_BUFFER_BIT; 4357 glClear GL_COLOR_BUFFER_BIT;
4266 4358

Diff Legend

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