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.361 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.418 by elmex, Tue Jul 24 18:39:39 2007 UTC

1package CFPlus::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFPlus; 9use CFPlus;
11use CFPlus::Pod; 10use CFPlus::Pod;
… …
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24 if (!$GRAB) { 23 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 28 $TOOLTIP->hide;
29 29
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 32
32 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
33 34
34 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
35 36
… …
43 } 44 }
44 } 45 }
45 } 46 }
46 47
47 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
49}); 51});
50 52
51sub get_layout { 53sub get_layout {
52 my $layout; 54 my $layout;
… …
111 } 113 }
112 114
113 if ($GRAB) { 115 if ($GRAB) {
114 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
115 # mousewheel 117 # mousewheel
116 $ev->{dx} = 0;
117 $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
118 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
119 } else { 125 } else {
120 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
121 } 127 }
122 } 128 }
… …
235 h => undef, 241 h => undef,
236 can_events => 1, 242 can_events => 1,
237 @_ 243 @_
238 }, $class; 244 }, $class;
239 245
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 247
242 for (keys %$self) { 248 for (keys %$self) {
243 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
245 } 251 }
… …
266 $self->hide; 272 $self->hide;
267 $self->emit ("destroy"); 273 $self->emit ("destroy");
268 %$self = (); 274 %$self = ();
269} 275}
270 276
277sub TO_JSON {
278 { __w_ => $_[0]{s_id} }
279}
280
271sub show { 281sub show {
272 my ($self) = @_; 282 my ($self) = @_;
273 283
274 return if $self->{parent}; 284 return if $self->{parent};
275 285
… …
314sub set_visibility { 324sub set_visibility {
315 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
316 326
317 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
318 328
319 $visible ? $self->hide 329 $visible ? $self->show
320 : $self->show; 330 : $self->hide;
321} 331}
322 332
323sub toggle_visibility { 333sub toggle_visibility {
324 my ($self) = @_; 334 my ($self) = @_;
325 335
… …
530 ? $args[0]->xy ($self) 540 ? $args[0]->xy ($self)
531 : (); 541 : ();
532 542
533 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
534 544
535 #d##TODO# stop propagating at first true, do not use sum 545 for my $cb (
536 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 546 @{$self->{signal_cb}{$signal} || []}, # before
537 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
538 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
539} 554}
540 555
541sub find_widget { 556#sub find_widget {
542 my ($self, $x, $y) = @_; 557# in .xs
543
544 return () unless $self->{can_events};
545
546 return $self
547 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
548 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
549
550 ()
551}
552 558
553sub set_parent { 559sub set_parent {
554 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
555 561
556 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
557 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
558} 564}
559 565
560sub realloc { 566sub realloc {
561 my ($self) = @_; 567 my ($self) = @_;
… …
587 593
588# 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
589# functions seems pointless. 595# functions seems pointless.
590our ($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
591 597
592sub draw { 598#sub draw {
593 my ($self) = @_; 599#CFPlus.xs
594
595 return unless $self->{h} && $self->{w};
596
597 # update screen rectangle
598 local $draw_x = $draw_x + $self->{x};
599 local $draw_y = $draw_y + $self->{y};
600
601 # skip widgets that are entirely outside the drawing area
602 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
603 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
604
605 glPushMatrix;
606 glTranslate $self->{x}, $self->{y}, 0;
607
608 if ($self == $HOVER && $self->{can_hover}) {
609 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
610 glEnable GL_BLEND;
611 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612 glBegin GL_QUADS;
613 glVertex 0 , 0;
614 glVertex $self->{w}, 0;
615 glVertex $self->{w}, $self->{h};
616 glVertex 0 , $self->{h};
617 glEnd;
618 glDisable GL_BLEND;
619 }
620
621 if ($ENV{CFPLUS_DEBUG} & 1) {
622 glPushMatrix;
623 glColor 1, 1, 0, 1;
624 glTranslate 0.375, 0.375;
625 glBegin GL_LINE_LOOP;
626 glVertex 0 , 0;
627 glVertex $self->{w} - 1, 0;
628 glVertex $self->{w} - 1, $self->{h} - 1;
629 glVertex 0 , $self->{h} - 1;
630 glEnd;
631 glPopMatrix;
632 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
633 }
634
635 $self->_draw;
636 glPopMatrix;
637}
638 600
639sub _draw { 601sub _draw {
640 my ($self) = @_; 602 my ($self) = @_;
641 603
642 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
… …
734 can_events => 0, 696 can_events => 0,
735 %arg, 697 %arg,
736 ); 698 );
737 699
738 $self->add (@$children) 700 $self->add (@$children)
739 if $children; 701 if $children && @$children;
740 702
741 $self 703 $self
742} 704}
743 705
744sub realloc { 706sub realloc {
… …
753 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
754 716
755 $_->set_parent ($self) 717 $_->set_parent ($self)
756 for @widgets; 718 for @widgets;
757 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
758 use sort 'stable'; 721 use sort 'stable';
759 722
760 $self->{children} = [ 723 $self->{children} = [
761 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
762 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
763 ]; 726 ];
764 727
765 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
766} 733}
767 734
768sub children { 735sub children {
769 @{ $_[0]{children} } 736 @{ $_[0]{children} }
770} 737}
771 738
772sub remove { 739sub remove {
773 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
774 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
775 delete $child->{parent}; 745 delete $child->{parent};
776 $child->hide; 746 $child->hide;
777
778 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
779 749
780 $self->realloc; 750 $self->realloc;
781} 751}
782 752
783sub clear { 753sub clear {
784 my ($self) = @_; 754 my ($self) = @_;
785 755
786 my $children = delete $self->{children}; 756 my $children = $self->{children};
787 $self->{children} = []; 757 $self->{children} = [];
788 758
789 for (@$children) { 759 for (@$children) {
790 delete $_->{parent}; 760 delete $_->{parent};
791 $_->hide; 761 $_->hide;
… …
811} 781}
812 782
813sub _draw { 783sub _draw {
814 my ($self) = @_; 784 my ($self) = @_;
815 785
816 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
817} 787}
818 788
819############################################################################# 789#############################################################################
820 790
821package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
… …
831} 801}
832 802
833sub add { 803sub add {
834 my ($self, $child) = @_; 804 my ($self, $child) = @_;
835 805
836 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
837 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
838} 808}
839 809
840sub remove { 810sub remove {
841 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
… …
931} 901}
932 902
933############################################################################# 903#############################################################################
934 904
935package CFPlus::UI::ViewPort; 905package CFPlus::UI::ViewPort;
906
907use List::Util qw(min max);
936 908
937our @ISA = CFPlus::UI::Window::; 909our @ISA = CFPlus::UI::Window::;
938 910
939sub new { 911sub new {
940 my $class = shift; 912 my $class = shift;
… …
949sub size_request { 921sub size_request {
950 my ($self) = @_; 922 my ($self) = @_;
951 923
952 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
953 925
954 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
955 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
956 928
957 ($w, $h) 929 ($w, $h)
958} 930}
959 931
960sub invoke_size_allocate { 932sub invoke_size_allocate {
… …
972} 944}
973 945
974sub set_offset { 946sub set_offset {
975 my ($self, $x, $y) = @_; 947 my ($self, $x, $y) = @_;
976 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}) {
977 $self->{view_x} = int $x; 953 $self->{view_x} = $x;
978 $self->{view_y} = int $y; 954 $self->{view_y} = $y;
979 955
956 $self->emit (changed => $x, $y);
980 $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 }
981} 977}
982 978
983# 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
984sub coord2local { 980sub coord2local {
985 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
… …
1000 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
1001 997
1002 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1003 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 999 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1004 ) { 1000 ) {
1005 $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})
1006 } else { 1002 } else {
1007 $self->CFPlus::UI::Base::find_widget ($x, $y) 1003 $self->CFPlus::UI::Base::find_widget ($x, $y)
1008 } 1004 }
1009} 1005}
1010 1006
… …
1021 1017
1022############################################################################# 1018#############################################################################
1023 1019
1024package CFPlus::UI::ScrolledWindow; 1020package CFPlus::UI::ScrolledWindow;
1025 1021
1026our @ISA = CFPlus::UI::HBox::; 1022our @ISA = CFPlus::UI::Table::;
1027 1023
1028sub new { 1024sub new {
1029 my ($class, %arg) = @_; 1025 my ($class, %arg) = @_;
1030 1026
1031 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1032 1028
1033 my $self; 1029 my $self;
1034 1030
1035 my $slider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 col => 0,
1033 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 col => 1,
1044 row => 0,
1036 vertical => 1, 1045 vertical => 1,
1037 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1038 on_changed => sub { 1047 on_changed => sub {
1039 $self->{vp}->set_offset (0, $_[1]); 1048 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1040 }, 1050 },
1041 ; 1051 ;
1042 1052
1043 $self = $class->SUPER::new ( 1053 $self = $class->SUPER::new (
1044 vp => (new CFPlus::UI::ViewPort expand => 1), 1054 scroll_x => 0,
1055 scroll_y => 1,
1045 can_events => 1, 1056 can_events => 1,
1046 slider => $slider, 1057 hslider => $hslider,
1058 vslider => $vslider,
1059 col_expand => [1, 0],
1060 row_expand => [1, 0],
1047 %arg, 1061 %arg,
1048 ); 1062 );
1049 1063
1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 col => 0,
1066 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
1050 $self->SUPER::add ($self->{vp}, $self->{slider}); 1085 $self->SUPER::add ($self->{vp});
1086
1051 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
1052 1088
1053 $self 1089 $self
1054} 1090}
1055
1056#TODO# update range on size_allocate depending on child
1057 1091
1058sub add { 1092sub add {
1059 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1060 1094
1061 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1062} 1096}
1063 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
1064sub invoke_mouse_wheel { 1150sub invoke_mouse_wheel {
1065 my ($self, $ev) = @_; 1151 my ($self, $ev) = @_;
1066 1152
1067 return 0 unless $ev->{dy}; # only vertical movements
1068
1069 $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};
1070 1155
1071 1 1156 1
1072} 1157}
1073 1158
1074sub update_slider { 1159sub invoke_button_down {
1075 my ($self) = @_; 1160 my ($self, $ev, $x, $y) = @_;
1076 1161
1077 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1162 if ($ev->{button} == 2) {
1078} 1163 $self->start_dragging ($ev);
1164 return 1;
1165 }
1079 1166
1080sub update { 1167 0
1081 my ($self) = @_; 1168}
1082 1169
1083 $self->SUPER::update; 1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1084 1172
1085 $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
1086} 1189}
1087 1190
1088sub invoke_size_allocate { 1191sub invoke_size_allocate {
1089 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1090 1193
1091 $self->update_slider; 1194 $self->update_slider;
1092
1093 $self->SUPER::invoke_size_allocate ($w, $h) 1195 $self->SUPER::invoke_size_allocate ($w, $h)
1094} 1196}
1095 1197
1096############################################################################# 1198#############################################################################
1097 1199
… …
1247 1349
1248my @border = 1350my @border =
1249 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1250 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);
1251 1353
1354my @icon =
1355 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1356 qw(x1_move.png x1_resize.png);
1357
1252sub new { 1358sub new {
1253 my ($class, %arg) = @_; 1359 my ($class, %arg) = @_;
1254 1360
1255 my $self = $class->SUPER::new ( 1361 my $self = $class->SUPER::new (
1256 bg => [1, 1, 1, 1], 1362 bg => [1, 1, 1, 1],
… …
1424 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1425 1531
1426 my $border = $self->border; 1532 my $border = $self->border;
1427 1533
1428 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1429 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1430 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1431 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1432 $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);
1433 1553
1434 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1435 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1436 1556
1437 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1458 1578
1459############################################################################# 1579#############################################################################
1460 1580
1461package CFPlus::UI::Table; 1581package CFPlus::UI::Table;
1462 1582
1463our @ISA = CFPlus::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1464 1584
1465use List::Util qw(max sum); 1585use List::Util qw(max sum);
1466 1586
1467use CFPlus::OpenGL; 1587use CFPlus::OpenGL;
1468 1588
1469sub new { 1589sub new {
1470 my $class = shift; 1590 my $class = shift;
1471 1591
1472 $class->SUPER::new ( 1592 $class->SUPER::new (
1473 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
1474 @_, 1595 @_,
1475 ) 1596 )
1476} 1597}
1477 1598
1478sub children {
1479 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1480}
1481
1482sub add { 1599sub add {
1600 my ($self, @widgets) = @_;
1601
1602 for my $child (@widgets) {
1603 $child->{rowspan} ||= 1;
1604 $child->{colspan} ||= 1;
1605 }
1606
1607 $self->SUPER::add (@widgets);
1608}
1609
1610sub add_at {
1483 my ($self) = shift; 1611 my $self = shift;
1612
1613 my @widgets;
1484 1614
1485 while (@_) { 1615 while (@_) {
1486 my ($x, $y, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1487 $child->set_parent ($self);
1488 $self->{children}[$y][$x] = $child;
1489 }
1490 1617
1491 $self->{force_realloc} = 1; 1618 $child->{row} = $row;
1492 $self->{force_size_alloc} = 1; 1619 $child->{col} = $col;
1493 $self->realloc;
1494}
1495 1620
1496sub remove { 1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1497 my ($self, $child) = @_; 1628 my ($self) = @_;
1498 1629
1499 # TODO: not yet implemented 1630 my (@w, @h);
1500}
1501
1502# TODO: move to container class maybe? send children a signal on removal?
1503sub clear {
1504 my ($self) = @_;
1505 1631
1506 my @children = $self->children; 1632 my @children = $self->children;
1507 delete $self->{children}; 1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1637
1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639
1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 }
1508 1643 }
1509 for (@children) {
1510 delete $_->{parent};
1511 $_->hide;
1512 }
1513 1644
1514 $self->realloc; 1645 # second pass, rows
1515} 1646 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1516
1517sub get_wh {
1518 my ($self) = @_;
1519
1520 my (@w, @h);
1521
1522 for my $y (0 .. $#{$self->{children}}) {
1523 my $row = $self->{children}[$y]
1524 or next;
1525
1526 for my $x (0 .. $#$row) {
1527 my $widget = $row->[$x]
1528 or next;
1529 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1530 1648
1531 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1532 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1533 } 1653 }
1534 } 1654 }
1535 1655
1536 (\@w, \@h) 1656 (\@w, \@h)
1537} 1657}
… …
1553 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1554 1674
1555 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1556 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1557 1677
1558 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
1559 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1560 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1561 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1562 1682
1563 # linearly scale sizes
1564 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1565 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1566 1684
1567 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
1568 CFPlus::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1569 1694
1570 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1571 1697
1572 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1573 my $row = $self->{children}[$r] 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1574 or next;
1575 1700
1576 my $x = 0; 1701 $widget->configure (
1577 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1578 1704 );
1579 for my $c (0 .. $#$row) { 1705 }
1580 my $col_w = $ws->[$c];
1581 1706
1582 if (my $widget = $row->[$c]) { 1707 1
1583 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1584 }
1585 1709
1586 $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};
1587 } 1737 }
1738 }
1588 1739
1589 $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});
1590 } 1771 }
1591 1772
1592 1 1773 1
1593} 1774}
1594 1775
1595sub find_widget {
1596 my ($self, $x, $y) = @_;
1597
1598 $x -= $self->{x};
1599 $y -= $self->{y};
1600
1601 my $res;
1602
1603 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1604 $res = $_->find_widget ($x, $y)
1605 and return $res;
1606 }
1607
1608 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1609}
1610
1611sub _draw {
1612 my ($self) = @_;
1613
1614 for (grep $_, @{$self->{children}}) {
1615 $_->draw for grep $_, @$_;
1616 }
1617}
1618
1619############################################################################# 1776#############################################################################
1620 1777
1621package CFPlus::UI::Box; 1778package CFPlus::UI::Box;
1622 1779
1623our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1624 1781
1625sub size_request { 1782sub size_request {
1626 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1627 1786
1628 $self->{vertical} 1787 $self->{vertical}
1629 ? ( 1788 ? (
1630 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1631 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1632 ) 1791 )
1633 : ( 1792 : (
1634 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1635 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1636 ) 1795 )
1637} 1796}
1638 1797
1639sub invoke_size_allocate { 1798sub invoke_size_allocate {
1640 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1881 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1882 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1883 : ($self->{h} - $size->[1]) * 0.5); 2042 : ($self->{h} - $size->[1]) * 0.5);
1884 }; 2043 };
1885 2044
1886 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2045# unless ($self->{list}) {
1887 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};
1888 2053
1889 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1890} 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#}
1891 2064
1892############################################################################# 2065#############################################################################
1893 2066
1894package CFPlus::UI::EntryBase; 2067package CFPlus::UI::EntryBase;
1895 2068
… …
1901 my $class = shift; 2074 my $class = shift;
1902 2075
1903 $class->SUPER::new ( 2076 $class->SUPER::new (
1904 fg => [1, 1, 1], 2077 fg => [1, 1, 1],
1905 bg => [0, 0, 0, 0.2], 2078 bg => [0, 0, 0, 0.2],
1906 active_bg => [1, 1, 1, 0.5], 2079 active_bg => [0, 0, 1, .2],
1907 active_fg => [0, 0, 0], 2080 active_fg => [1, 1, 1],
2081 active_outline => [1, 1, 0],
1908 can_hover => 1, 2082 can_hover => 1,
1909 can_focus => 1, 2083 can_focus => 1,
1910 valign => 0, 2084 valign => 0,
1911 can_events => 1, 2085 can_events => 1,
1912 ellipsise => 0, 2086 ellipsise => 0,
… …
1962 my $sym = $ev->{sym}; 2136 my $sym = $ev->{sym};
1963 my $uni = $ev->{unicode}; 2137 my $uni = $ev->{unicode};
1964 2138
1965 my $text = $self->get_text; 2139 my $text = $self->get_text;
1966 2140
2141 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2142
1967 if ($uni == 8) { 2143 if ($uni == 8) {
1968 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2144 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1969 } elsif ($uni == 127) { 2145 } elsif ($uni == 127) {
1970 substr $text, $self->{cursor}, 1, ""; 2146 substr $text, $self->{cursor}, 1, "";
1971 } elsif ($sym == CFPlus::SDLK_LEFT) { 2147 } elsif ($sym == CFPlus::SDLK_LEFT) {
1972 --$self->{cursor} if $self->{cursor}; 2148 --$self->{cursor} if $self->{cursor};
1973 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2149 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1974 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2150 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1975 } elsif ($sym == CFPlus::SDLK_HOME) { 2151 } elsif ($sym == CFPlus::SDLK_HOME) {
2152 # what a hack
1976 $self->{cursor} = 0; 2153 $self->{cursor} =
2154 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2155 ? length $1
2156 : 0;
1977 } elsif ($sym == CFPlus::SDLK_END) { 2157 } elsif ($sym == CFPlus::SDLK_END) {
2158 # uh, again
2159 $self->{cursor} =
2160 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1978 $self->{cursor} = length $text; 2161 ? $self->{cursor} + length $1
2162 : length $self->{text};
1979 } elsif ($uni == 21) { # ctrl-u 2163 } elsif ($uni == 21) { # ctrl-u
1980 $text = ""; 2164 $text = "";
1981 $self->{cursor} = 0; 2165 $self->{cursor} = 0;
1982 } elsif ($uni == 27) { 2166 } elsif ($uni == 27) {
1983 $self->emit ('escape'); 2167 $self->emit ('escape');
1984 } elsif ($uni >= 0x20 || $uni == 0x0d) { 2168 } elsif ($uni == 0x0d) {
2169 substr $text, $self->{cursor}++, 0, "\012";
2170 } elsif ($uni >= 0x20) {
1985 substr $text, $self->{cursor}++, 0, chr $uni; 2171 substr $text, $self->{cursor}++, 0, chr $uni;
1986 } else { 2172 } else {
1987 return 0; 2173 return 0;
1988 } 2174 }
1989 2175
… …
2057 2243
2058 unless (exists $self->{cur_h}) { 2244 unless (exists $self->{cur_h}) {
2059 my $text = substr $self->{text}, 0, $self->{cursor}; 2245 my $text = substr $self->{text}, 0, $self->{cursor};
2060 utf8::encode $text; 2246 utf8::encode $text;
2061 2247
2062 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2248 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2063 } 2249 }
2064 2250
2251 glColor_premultiply @{$self->{active_fg}};
2065 glBegin GL_LINES; 2252 glBegin GL_LINES;
2066 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2253 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2067 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2254 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2068 glEnd; 2255 glEnd;
2256
2257 glLineWidth 3;
2258 glColor @{$self->{active_outline}};
2259 glTranslate -.375, -.375;
2260 glBegin GL_LINE_LOOP;
2261 glVertex 0, 0;
2262 glVertex $self->{w}, 0;
2263 glVertex $self->{w}, $self->{h};
2264 glVertex 0, $self->{h};
2265 glEnd;
2266 glLineWidth 1;
2069 } 2267 }
2070} 2268}
2071 2269
2072############################################################################# 2270#############################################################################
2073 2271
… …
2159 1 2357 1
2160} 2358}
2161 2359
2162############################################################################# 2360#############################################################################
2163 2361
2164package CFPlus::UI::Button; 2362package CFPlus::UI::ButtonBin;
2165 2363
2166our @ISA = CFPlus::UI::Label::; 2364our @ISA = CFPlus::UI::Bin::;
2167 2365
2168use CFPlus::OpenGL; 2366use CFPlus::OpenGL;
2169 2367
2170my @tex = 2368my @tex =
2171 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2369 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw(b1_button_active.png); 2370 qw(b1_button_inactive.png b1_button_active.png);
2173 2371
2174sub new { 2372sub new {
2175 my $class = shift; 2373 my $class = shift;
2176 2374
2177 $class->SUPER::new ( 2375 $class->SUPER::new (
2178 padding_x => 4,
2179 padding_y => 4,
2180 fg => [1, 1, 1],
2181 active_fg => [0, 0, 1],
2182 can_hover => 1, 2376 can_hover => 1,
2183 align => 0, 2377 align => 0,
2184 valign => 0, 2378 valign => 0,
2185 can_events => 1, 2379 can_events => 1,
2186 @_ 2380 @_
… …
2198} 2392}
2199 2393
2200sub _draw { 2394sub _draw {
2201 my ($self) = @_; 2395 my ($self) = @_;
2202 2396
2203 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2204
2205 glEnable GL_TEXTURE_2D; 2397 glEnable GL_TEXTURE_2D;
2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2398 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2207 glColor 0, 0, 0, 1; 2399 glColor 0, 0, 0, 1;
2208 2400
2401 my $tex = $tex[$GRAB == $self];
2209 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2402 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2403
2404 glDisable GL_TEXTURE_2D;
2405
2406 $self->SUPER::_draw;
2407}
2408
2409#############################################################################
2410
2411package CFPlus::UI::Button;
2412
2413our @ISA = CFPlus::UI::Label::;
2414
2415use CFPlus::OpenGL;
2416
2417my @tex =
2418 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2419 qw(b1_button_inactive.png b1_button_active.png);
2420
2421sub new {
2422 my $class = shift;
2423
2424 $class->SUPER::new (
2425 padding_x => 4,
2426 padding_y => 4,
2427 fg => [1.0, 1.0, 1.0],
2428 active_fg => [0.8, 0.8, 0.8],
2429 can_hover => 1,
2430 align => 0,
2431 valign => 0,
2432 can_events => 1,
2433 @_
2434 )
2435}
2436
2437sub invoke_button_up {
2438 my ($self, $ev, $x, $y) = @_;
2439
2440 $self->emit ("activate")
2441 if $x >= 0 && $x < $self->{w}
2442 && $y >= 0 && $y < $self->{h};
2443
2444 1
2445}
2446
2447sub _draw {
2448 my ($self) = @_;
2449
2450 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2451
2452 glEnable GL_TEXTURE_2D;
2453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2454 glColor 0, 0, 0, 1;
2455
2456 my $tex = $tex[$GRAB == $self];
2457 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2210 2458
2211 glDisable GL_TEXTURE_2D; 2459 glDisable GL_TEXTURE_2D;
2212 2460
2213 $self->SUPER::_draw; 2461 $self->SUPER::_draw;
2214} 2462}
… …
2301sub new { 2549sub new {
2302 my $class = shift; 2550 my $class = shift;
2303 2551
2304 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2305 can_events => 0, 2553 can_events => 0,
2554 scale => 1,
2306 @_, 2555 @_,
2307 ); 2556 );
2308 2557
2309 $self->{path} || $self->{tex} 2558 $self->{path} || $self->{tex}
2310 or Carp::croak "'path' or 'tex' attributes required"; 2559 or Carp::croak "'path' or 'tex' attributes required";
2311 2560
2312 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2561 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2313 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2562 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2314 2563
2315 Scalar::Util::weaken $texture_cache{$self->{path}}; 2564 CFPlus::weaken $texture_cache{$self->{path}};
2316 2565
2317 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2566 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2318 2567
2319 $self 2568 $self
2320} 2569}
… …
2335} 2584}
2336 2585
2337sub size_request { 2586sub size_request {
2338 my ($self) = @_; 2587 my ($self) = @_;
2339 2588
2340 ($self->{tex}{w}, $self->{tex}{h}) 2589 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2341} 2590}
2342 2591
2343sub _draw { 2592sub _draw {
2344 my ($self) = @_; 2593 my ($self) = @_;
2345 2594
… …
2355 } 2604 }
2356 2605
2357 glEnable GL_TEXTURE_2D; 2606 glEnable GL_TEXTURE_2D;
2358 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2607 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2359 2608
2360 $tex->draw_quad (0, 0, $w, $h); 2609 $tex->draw_quad_alpha (0, 0, $w, $h);
2361 2610
2362 glDisable GL_TEXTURE_2D; 2611 glDisable GL_TEXTURE_2D;
2363} 2612}
2364 2613
2365############################################################################# 2614#############################################################################
… …
2667 2916
2668 $self->SUPER::invoke_button_down ($ev, $x, $y); 2917 $self->SUPER::invoke_button_down ($ev, $x, $y);
2669 2918
2670 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2919 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2671 2920
2672 $self->invoke_mouse_motion ($ev, $x, $y) 2921 $self->invoke_mouse_motion ($ev, $x, $y);
2922
2923 1
2673} 2924}
2674 2925
2675sub invoke_mouse_motion { 2926sub invoke_mouse_motion {
2676 my ($self, $ev, $x, $y) = @_; 2927 my ($self, $ev, $x, $y) = @_;
2677 2928
… …
2693sub invoke_mouse_wheel { 2944sub invoke_mouse_wheel {
2694 my ($self, $ev) = @_; 2945 my ($self, $ev) = @_;
2695 2946
2696 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2947 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2697 2948
2949 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2950
2698 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2951 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2699 2952
2700 ! ! $delta 2953 1
2701} 2954}
2702 2955
2703sub update { 2956sub update {
2704 my ($self) = @_; 2957 my ($self) = @_;
2705 2958
… …
2813 #font => default_font 3066 #font => default_font
2814 @_, 3067 @_,
2815 3068
2816 layout => (new CFPlus::Layout), 3069 layout => (new CFPlus::Layout),
2817 par => [], 3070 par => [],
3071 max_par => 0,
2818 height => 0, 3072 height => 0,
2819 children => [ 3073 children => [
2820 (new CFPlus::UI::Empty expand => 1), 3074 (new CFPlus::UI::Empty expand => 1),
2821 (new CFPlus::UI::Slider vertical => 1), 3075 (new CFPlus::UI::Slider vertical => 1),
2822 ], 3076 ],
… …
2835} 3089}
2836 3090
2837sub size_request { 3091sub size_request {
2838 my ($self) = @_; 3092 my ($self) = @_;
2839 3093
2840 my ($empty, $slider) = @{ $self->{children} }; 3094 my ($empty, $slider) = $self->visible_children;
2841 3095
2842 local $self->{children} = [$empty, $slider]; 3096 local $self->{children} = [$empty, $slider];
2843 $self->SUPER::size_request 3097 $self->SUPER::size_request
2844} 3098}
2845 3099
… …
2945 wrapped => 1, 3199 wrapped => 1,
2946 }; 3200 };
2947 3201
2948 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3202 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2949 push @{$self->{par}}, $para; 3203 push @{$self->{par}}, $para;
3204 }
3205
3206 if (my $max = $self->{max_par}) {
3207 shift @{$self->{par}} while @{$self->{par}} > $max;
2950 } 3208 }
2951 3209
2952 $self->{need_reflow}++; 3210 $self->{need_reflow}++;
2953 $self->update; 3211 $self->update;
2954} 3212}
… …
3262 3520
3263sub new { 3521sub new {
3264 my $class = shift; 3522 my $class = shift;
3265 3523
3266 my $self = $class->SUPER::new ( 3524 my $self = $class->SUPER::new (
3525 size_w => 32,
3526 size_h => 8,
3267 aspect => 1, 3527 aspect => 1,
3268 can_events => 0, 3528 can_events => 0,
3269 @_, 3529 @_,
3270 ); 3530 );
3271 3531
3272 if ($self->{anim} && $self->{animspeed}) { 3532 if ($self->{anim} && $self->{animspeed}) {
3273 Scalar::Util::weaken (my $widget = $self); 3533 CFPlus::weaken (my $widget = $self);
3274 3534
3535 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3536 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3275 $self->{timer} = Event->timer ( 3537 $self->{timer} = Event->timer (
3276 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3277 hard => 1, 3538 parked => 1,
3278 interval => $self->{animspeed},
3279 cb => sub { 3539 cb => sub {
3540 return unless $::CONN && $widget;
3541
3280 ++$widget->{frame}; 3542 ++$widget->{frame};
3543 $widget->update_face;
3281 $widget->update; 3544 $widget->update;
3545
3546 $widget->update_timer;
3282 }, 3547 },
3283 ); 3548 );
3549
3550 $self->update_face;
3551 $self->update_timer;
3284 } 3552 }
3285 3553
3286 $self 3554 $self
3287} 3555}
3288 3556
3557sub update_timer {
3558 my ($self) = @_;
3559
3560 return unless $self->{timer};
3561
3562 if ($self->{visible}) {
3563 $self->{timer}->at (
3564 $self->{anim_start}
3565 + $self->{animspeed}
3566 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3567 );
3568 $self->{timer}->start;
3569 } else {
3570 $self->{timer}->stop;
3571 }
3572}
3573
3574sub update_face {
3575 my ($self) = @_;
3576
3577 return unless $::CONN;
3578
3579 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3580 if ($anim && @$anim) {
3581 delete $self->{wait_face};
3582 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3583 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3584 }
3585 }
3586}
3587
3289sub size_request { 3588sub size_request {
3290 (32, 8) 3589 my ($self) = @_;
3590
3591 if ($::CONN) {
3592 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3593 if (my $tex = $::CONN->{texture}[$faceid]) {
3594 $self->{tex} = $tex;
3595 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3596 } else {
3597 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3598 $self->realloc;
3599 });
3600 }
3601 }
3602 }
3603
3604 ($self->{size_w} || 8, $self->{size_h} || 8)
3291} 3605}
3292 3606
3293sub update { 3607sub update {
3294 my ($self) = @_; 3608 my ($self) = @_;
3295 3609
3296 return unless $self->{visible}; 3610 return unless $self->{visible};
3297 3611
3298 $self->SUPER::update; 3612 $self->SUPER::update;
3299} 3613}
3300 3614
3615sub invoke_visibility_change {
3616 my ($self) = @_;
3617
3618 $self->update_timer;
3619
3620 0
3621}
3622
3301sub _draw { 3623sub _draw {
3302 my ($self) = @_; 3624 my ($self) = @_;
3303 3625
3304 return unless $::CONN;
3305
3306 $self->SUPER::_draw; 3626 $self->SUPER::_draw;
3307 3627
3308 my $face; 3628 if (my $tex = $self->{tex}) {
3309
3310 if ($self->{frame}) {
3311 my $anim = $::CONN->{anim}[$self->{anim}];
3312
3313 $face = $anim->[ $self->{frame} % @$anim ]
3314 if $anim && @$anim;
3315 }
3316
3317 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3318
3319 if ($tex) {
3320 glEnable GL_TEXTURE_2D; 3629 glEnable GL_TEXTURE_2D;
3321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3322 glColor 0, 0, 0, 1; 3631 glColor 0, 0, 0, 1;
3323 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3632 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3324 glDisable GL_TEXTURE_2D; 3633 glDisable GL_TEXTURE_2D;
… …
3326} 3635}
3327 3636
3328sub destroy { 3637sub destroy {
3329 my ($self) = @_; 3638 my ($self) = @_;
3330 3639
3331 $self->{timer}->cancel 3640 (delete $self->{timer})->cancel
3332 if $self->{timer}; 3641 if $self->{timer};
3333 3642
3334 $self->SUPER::destroy; 3643 $self->SUPER::destroy;
3335} 3644}
3336 3645
… …
3376 children => [ 3685 children => [
3377 (new CFPlus::UI::Label markup => $left, expand => 1), 3686 (new CFPlus::UI::Label markup => $left, expand => 1),
3378 (new CFPlus::UI::Label markup => $right, align => +1), 3687 (new CFPlus::UI::Label markup => $right, align => +1),
3379 ], 3688 ],
3380 ; 3689 ;
3381 3690
3382 } else { 3691 } else {
3383 $widget = new CFPlus::UI::Label 3692 $widget = new CFPlus::UI::Label
3384 can_hover => 1, 3693 can_hover => 1,
3385 can_events => 1, 3694 can_events => 1,
3386 markup => $widget, 3695 markup => $widget,
… …
3522 buttonbar => (new CFPlus::UI::Buttonbar), 3831 buttonbar => (new CFPlus::UI::Buttonbar),
3523 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3832 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3524 # filter => # will be put between multiplexer and $self 3833 # filter => # will be put between multiplexer and $self
3525 @_, 3834 @_,
3526 ); 3835 );
3527 3836
3528 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3837 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3529 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3838 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3530 3839
3840 {
3841 Scalar::Util::weaken (my $wself = $self);
3842
3843 $self->{multiplexer}->connect (c_add => sub {
3844 my ($mplex, $widgets) = @_;
3845
3846 for my $child (@$widgets) {
3847 Scalar::Util::weaken $child;
3848 $child->{c_tab_} ||= do {
3849 my $tab =
3850 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3851 ? $child->{c_tab}
3852 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3853
3854 $tab->connect (activate => sub {
3855 $wself->set_current_page ($child);
3856 });
3857
3858 $tab
3859 };
3860
3861 $self->{buttonbar}->add ($child->{c_tab_});
3862 }
3863 });
3864
3865 $self->{multiplexer}->connect (c_remove => sub {
3866 my ($mplex, $widgets) = @_;
3867
3868 for my $child (@$widgets) {
3869 $wself->{buttonbar}->remove ($child->{c_tab_});
3870 }
3871 });
3872 }
3873
3531 $self 3874 $self
3532} 3875}
3533 3876
3534sub add { 3877sub add {
3878 my ($self, @widgets) = @_;
3879
3880 $self->{multiplexer}->add (@widgets)
3881}
3882
3883sub remove {
3884 my ($self, @widgets) = @_;
3885
3886 $self->{multiplexer}->remove (@widgets)
3887}
3888
3889sub pages {
3890 my ($self) = @_;
3891 $self->{multiplexer}->children
3892}
3893
3894sub add_tab {
3535 my ($self, $title, $widget, $tooltip) = @_; 3895 my ($self, $title, $widget, $tooltip) = @_;
3536 3896
3537 Scalar::Util::weaken $self; 3897 $title = [$title, $tooltip] unless ref $title;
3898 $widget->{c_tab} = $title;
3538 3899
3539 $self->{buttonbar}->add (new CFPlus::UI::Button
3540 markup => $title,
3541 tooltip => $tooltip,
3542 on_activate => sub { $self->set_current_page ($widget) },
3543 );
3544
3545 $self->{multiplexer}->add ($widget); 3900 $self->add ($widget);
3546} 3901}
3547 3902
3548sub get_current_page { 3903sub get_current_page {
3549 my ($self) = @_; 3904 my ($self) = @_;
3550 3905
… …
3626 my $self = $class->SUPER::new ( 3981 my $self = $class->SUPER::new (
3627 fontsize => 0.8, 3982 fontsize => 0.8,
3628 @_, 3983 @_,
3629 ); 3984 );
3630 3985
3631 Scalar::Util::weaken (my $this = $self); 3986 CFPlus::weaken (my $this = $self);
3632 3987
3633 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3988 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3634 3989
3635 $self 3990 $self
3636} 3991}
… …
3775 my $self = $class->SUPER::new ( 4130 my $self = $class->SUPER::new (
3776 visible => 1, 4131 visible => 1,
3777 @_, 4132 @_,
3778 ); 4133 );
3779 4134
3780 Scalar::Util::weaken ($self->{root} = $self); 4135 CFPlus::weaken ($self->{root} = $self);
3781 4136
3782 $self 4137 $self
3783} 4138}
3784 4139
3785sub size_request { 4140sub size_request {
… …
3880 while ($self->{refresh_hook}) { 4235 while ($self->{refresh_hook}) {
3881 $_->() 4236 $_->()
3882 for values %{delete $self->{refresh_hook}}; 4237 for values %{delete $self->{refresh_hook}};
3883 } 4238 }
3884 4239
3885 if ($self->{realloc}) { 4240 while ($self->{realloc}) {
3886 my %queue; 4241 my %queue;
3887 my @queue; 4242 my @queue;
3888 my $widget; 4243 my $widget;
3889 4244
3890 outer: 4245 outer:
… …
3937 } 4292 }
3938 } 4293 }
3939 4294
3940 delete $self->{realloc}{$widget+0}; 4295 delete $self->{realloc}{$widget+0};
3941 } 4296 }
3942 }
3943 4297
3944 while (my $size_alloc = delete $self->{size_alloc}) { 4298 while (my $size_alloc = delete $self->{size_alloc}) {
3945 my @queue = sort { $b->{visible} <=> $a->{visible} } 4299 my @queue = sort { $a->{visible} <=> $b->{visible} }
3946 values %$size_alloc; 4300 values %$size_alloc;
3947 4301
3948 while () { 4302 while () {
3949 my $widget = pop @queue || last; 4303 my $widget = pop @queue || last;
3950 4304
3951 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4305 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3952 4306
3953 $w = 0 if $w < 0;
3954 $h = 0 if $h < 0;
3955
3956 $w = max $widget->{min_w}, $w; 4307 $w = max $widget->{min_w}, $w;
3957 $h = max $widget->{min_h}, $h; 4308 $h = max $widget->{min_h}, $h;
3958 4309
3959# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4310# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3960# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4311# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3961 4312
3962 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4313 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3963 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4314 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3964 4315
3965 $w = int $w + 0.5; 4316 $w = int $w + 0.5;
3966 $h = int $h + 0.5; 4317 $h = int $h + 0.5;
3967 4318
3968 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4319 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3969 $widget->{old_w} = $widget->{w}; 4320 $widget->{old_w} = $widget->{w};
3970 $widget->{old_h} = $widget->{h}; 4321 $widget->{old_h} = $widget->{h};
3971 4322
3972 $widget->{w} = $w; 4323 $widget->{w} = $w;
3973 $widget->{h} = $h; 4324 $widget->{h} = $h;
3974 4325
3975 $widget->emit (size_allocate => $w, $h); 4326 $widget->emit (size_allocate => $w, $h);
4327 }
3976 } 4328 }
3977 } 4329 }
3978 } 4330 }
3979 4331
3980 while ($self->{post_alloc_hook}) { 4332 while ($self->{post_alloc_hook}) {
3981 $_->() 4333 $_->()
3982 for values %{delete $self->{post_alloc_hook}}; 4334 for values %{delete $self->{post_alloc_hook}};
3983 } 4335 }
3984
3985 4336
3986 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4337 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3987 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4338 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3988 glClear GL_COLOR_BUFFER_BIT; 4339 glClear GL_COLOR_BUFFER_BIT;
3989 4340

Diff Legend

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