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.411 by root, Sun Jul 22 19:34:59 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 { __widget_ref__ => $_[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 map $_+0, @widgets
766} 731}
767 732
768sub children { 733sub children {
769 @{ $_[0]{children} } 734 @{ $_[0]{children} }
770} 735}
… …
781} 746}
782 747
783sub clear { 748sub clear {
784 my ($self) = @_; 749 my ($self) = @_;
785 750
786 my $children = delete $self->{children}; 751 my $children = $self->{children};
787 $self->{children} = []; 752 $self->{children} = [];
788 753
789 for (@$children) { 754 for (@$children) {
790 delete $_->{parent}; 755 delete $_->{parent};
791 $_->hide; 756 $_->hide;
… …
931} 896}
932 897
933############################################################################# 898#############################################################################
934 899
935package CFPlus::UI::ViewPort; 900package CFPlus::UI::ViewPort;
901
902use List::Util qw(min max);
936 903
937our @ISA = CFPlus::UI::Window::; 904our @ISA = CFPlus::UI::Window::;
938 905
939sub new { 906sub new {
940 my $class = shift; 907 my $class = shift;
… …
949sub size_request { 916sub size_request {
950 my ($self) = @_; 917 my ($self) = @_;
951 918
952 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 919 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
953 920
954 $w = 10 if $self->{scroll_x}; 921 $w = 1 if $self->{scroll_x};
955 $h = 10 if $self->{scroll_y}; 922 $h = 1 if $self->{scroll_y};
956 923
957 ($w, $h) 924 ($w, $h)
958} 925}
959 926
960sub invoke_size_allocate { 927sub invoke_size_allocate {
… …
972} 939}
973 940
974sub set_offset { 941sub set_offset {
975 my ($self, $x, $y) = @_; 942 my ($self, $x, $y) = @_;
976 943
944 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
945 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
946
947 if ($x != $self->{view_x} or $y != $self->{view_y}) {
977 $self->{view_x} = int $x; 948 $self->{view_x} = $x;
978 $self->{view_y} = int $y; 949 $self->{view_y} = $y;
979 950
951 $self->emit (changed => $x, $y);
980 $self->update; 952 $self->update;
953 }
981} 954}
982 955
983# hmm, this does not work for topleft of $self... but we should not ask for that 956# hmm, this does not work for topleft of $self... but we should not ask for that
984sub coord2local { 957sub coord2local {
985 my ($self, $x, $y) = @_; 958 my ($self, $x, $y) = @_;
… …
1000 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
1001 974
1002 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1003 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 976 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1004 ) { 977 ) {
1005 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1006 } else { 979 } else {
1007 $self->CFPlus::UI::Base::find_widget ($x, $y) 980 $self->CFPlus::UI::Base::find_widget ($x, $y)
1008 } 981 }
1009} 982}
1010 983
… …
1021 994
1022############################################################################# 995#############################################################################
1023 996
1024package CFPlus::UI::ScrolledWindow; 997package CFPlus::UI::ScrolledWindow;
1025 998
1026our @ISA = CFPlus::UI::HBox::; 999our @ISA = CFPlus::UI::Table::;
1027 1000
1028sub new { 1001sub new {
1029 my ($class, %arg) = @_; 1002 my ($class, %arg) = @_;
1030 1003
1031 my $child = delete $arg{child}; 1004 my $child = delete $arg{child};
1032 1005
1033 my $self; 1006 my $self;
1034 1007
1035 my $slider = new CFPlus::UI::Slider 1008 my $hslider = new CFPlus::UI::Slider
1009 col => 0,
1010 row => 1,
1011 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub {
1014 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 },
1017 ;
1018
1019 my $vslider = new CFPlus::UI::Slider
1020 col => 1,
1021 row => 0,
1036 vertical => 1, 1022 vertical => 1,
1037 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
1038 on_changed => sub { 1024 on_changed => sub {
1039 $self->{vp}->set_offset (0, $_[1]); 1025 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1040 }, 1027 },
1041 ; 1028 ;
1042 1029
1043 $self = $class->SUPER::new ( 1030 $self = $class->SUPER::new (
1044 vp => (new CFPlus::UI::ViewPort expand => 1), 1031 scroll_x => 0,
1032 scroll_y => 1,
1045 can_events => 1, 1033 can_events => 1,
1046 slider => $slider, 1034 hslider => $hslider,
1035 vslider => $vslider,
1036 col_expand => [1, 0],
1037 row_expand => [1, 0],
1047 %arg, 1038 %arg,
1048 ); 1039 );
1049 1040
1041 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0,
1043 row => 0,
1044 expand => 1,
1045 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y},
1047 on_changed => sub {
1048 my ($vp, $x, $y) = @_;
1049
1050 $vp->{parent}{hslider}->set_value ($x);
1051 $vp->{parent}{vslider}->set_value ($y);
1052
1053 0
1054 },
1055 on_size_allocate => sub {
1056 my ($vp, $w, $h) = @_;
1057 $vp->{parent}->update_slider;
1058 0
1059 },
1060 ;
1061
1050 $self->SUPER::add ($self->{vp}, $self->{slider}); 1062 $self->SUPER::add ($self->{vp});
1063
1051 $self->add ($child) if $child; 1064 $self->add ($child) if $child;
1052 1065
1053 $self 1066 $self
1054} 1067}
1055
1056#TODO# update range on size_allocate depending on child
1057 1068
1058sub add { 1069sub add {
1059 my ($self, $widget) = @_; 1070 my ($self, $widget) = @_;
1060 1071
1061 $self->{vp}->add ($self->{child} = $widget); 1072 $self->{vp}->add ($self->{child} = $widget);
1062} 1073}
1063 1074
1075sub update_slider {
1076 my ($self) = @_;
1077
1078 my $child = ($self->{vp} or return)->child;
1079
1080 if ($self->{scroll_x}) {
1081 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1082 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1083
1084 my $visible = $w1 > $w2;
1085 if ($visible != $self->{hslider_visible}) {
1086 $self->{hslider_visible} = $visible;
1087 $visible ? $self->SUPER::add ($self->{hslider})
1088 : $self->SUPER::remove ($self->{hslider});
1089 }
1090 }
1091
1092 if ($self->{scroll_y}) {
1093 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1094 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1095
1096 my $visible = $h1 > $h2;
1097 if ($visible != $self->{vslider_visible}) {
1098 $self->{vslider_visible} = $visible;
1099 $visible ? $self->SUPER::add ($self->{vslider})
1100 : $self->SUPER::remove ($self->{vslider});
1101 }
1102 }
1103}
1104
1105sub start_dragging {
1106 my ($self, $ev) = @_;
1107
1108 $self->grab_focus;
1109
1110 my $ox = $self->{vp}{view_x};
1111 my $oy = $self->{vp}{view_y};
1112
1113 $self->{motion} = sub {
1114 my ($ev, $x, $y) = @_;
1115
1116 $ox -= $ev->{xrel};
1117 $oy -= $ev->{yrel};
1118
1119 $self->{vp}->set_offset ($ox, $oy);
1120 };
1121}
1122
1064sub invoke_mouse_wheel { 1123sub invoke_mouse_wheel {
1065 my ($self, $ev) = @_; 1124 my ($self, $ev) = @_;
1066 1125
1067 return 0 unless $ev->{dy}; # only vertical movements
1068
1069 $self->{slider}->emit (mouse_wheel => $ev); 1126 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1127 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1070 1128
1071 1 1129 1
1072} 1130}
1073 1131
1074sub update_slider { 1132sub invoke_button_down {
1075 my ($self) = @_; 1133 my ($self, $ev, $x, $y) = @_;
1076 1134
1077 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1135 if ($ev->{button} == 2) {
1078} 1136 $self->start_dragging ($ev);
1137 return 1;
1138 }
1079 1139
1080sub update { 1140 0
1081 my ($self) = @_; 1141}
1082 1142
1083 $self->SUPER::update; 1143sub invoke_button_up {
1144 my ($self, $ev, $x, $y) = @_;
1084 1145
1085 $self->update_slider; 1146 if (delete $self->{motion}) {
1147 return 1;
1148 }
1149
1150 0
1151}
1152
1153sub invoke_mouse_motion {
1154 my ($self, $ev, $x, $y) = @_;
1155
1156 if ($self->{motion}) {
1157 $self->{motion}->($ev, $x, $y);
1158 return 1;
1159 }
1160
1161 0
1086} 1162}
1087 1163
1088sub invoke_size_allocate { 1164sub invoke_size_allocate {
1089 my ($self, $w, $h) = @_; 1165 my ($self, $w, $h) = @_;
1090 1166
1091 $self->update_slider; 1167 $self->update_slider;
1092
1093 $self->SUPER::invoke_size_allocate ($w, $h) 1168 $self->SUPER::invoke_size_allocate ($w, $h)
1094} 1169}
1095 1170
1096############################################################################# 1171#############################################################################
1097 1172
… …
1247 1322
1248my @border = 1323my @border =
1249 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1324 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); 1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1251 1326
1327my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png);
1330
1252sub new { 1331sub new {
1253 my ($class, %arg) = @_; 1332 my ($class, %arg) = @_;
1254 1333
1255 my $self = $class->SUPER::new ( 1334 my $self = $class->SUPER::new (
1256 bg => [1, 1, 1, 1], 1335 bg => [1, 1, 1, 1],
… …
1424 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1425 1504
1426 my $border = $self->border; 1505 my $border = $self->border;
1427 1506
1428 glColor @{ $self->{border_bg} }; 1507 glColor @{ $self->{border_bg} };
1429 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1430 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1431 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1432 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1511 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512
1513 # move
1514 my $w2 = ($w - $border) * .5;
1515 my $h2 = ($h - $border) * .5;
1516 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519
1520 # resize
1521 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523 unless $self->{has_close_button};
1524 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1433 1526
1434 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1435 glColor @{ $self->{bg} }; 1528 glColor @{ $self->{bg} };
1436 1529
1437 # TODO: repeat texture not scale 1530 # TODO: repeat texture not scale
… …
1458 1551
1459############################################################################# 1552#############################################################################
1460 1553
1461package CFPlus::UI::Table; 1554package CFPlus::UI::Table;
1462 1555
1463our @ISA = CFPlus::UI::Base::; 1556our @ISA = CFPlus::UI::Container::;
1464 1557
1465use List::Util qw(max sum); 1558use List::Util qw(max sum);
1466 1559
1467use CFPlus::OpenGL; 1560use CFPlus::OpenGL;
1468 1561
1469sub new { 1562sub new {
1470 my $class = shift; 1563 my $class = shift;
1471 1564
1472 $class->SUPER::new ( 1565 $class->SUPER::new (
1473 col_expand => [], 1566 col_expand => [],
1567 row_expand => [],
1474 @_, 1568 @_,
1475 ) 1569 )
1476} 1570}
1477 1571
1478sub children {
1479 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1480}
1481
1482sub add { 1572sub add {
1573 my ($self, @widgets) = @_;
1574
1575 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1;
1577 $child->{colspan} ||= 1;
1578 }
1579
1580 $self->SUPER::add (@widgets);
1581}
1582
1583sub add_at {
1483 my ($self) = shift; 1584 my $self = shift;
1585
1586 my @widgets;
1484 1587
1485 while (@_) { 1588 while (@_) {
1486 my ($x, $y, $child) = splice @_, 0, 3, (); 1589 my ($col, $row, $child) = splice @_, 0, 3, ();
1487 $child->set_parent ($self);
1488 $self->{children}[$y][$x] = $child;
1489 }
1490 1590
1491 $self->{force_realloc} = 1; 1591 $child->{row} = $row;
1492 $self->{force_size_alloc} = 1; 1592 $child->{col} = $col;
1493 $self->realloc;
1494}
1495 1593
1496sub remove { 1594 push @widgets, $child;
1595 }
1596
1597 $self->add (@widgets);
1598}
1599
1600sub get_wh {
1497 my ($self, $child) = @_; 1601 my ($self) = @_;
1498 1602
1499 # TODO: not yet implemented 1603 my (@w, @h);
1500}
1501
1502# TODO: move to container class maybe? send children a signal on removal?
1503sub clear {
1504 my ($self) = @_;
1505 1604
1506 my @children = $self->children; 1605 my @children = $self->children;
1507 delete $self->{children}; 1606
1607 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1610
1611 my $sw = sum @w[$c .. $c + $cs - 1];
1612
1613 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 }
1508 1616 }
1509 for (@children) {
1510 delete $_->{parent};
1511 $_->hide;
1512 }
1513 1617
1514 $self->realloc; 1618 # second pass, rows
1515} 1619 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)}; 1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1530 1621
1531 $w[$x] = max $w[$x], $w; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1532 $h[$y] = max $h[$y], $h; 1623
1624 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1533 } 1626 }
1534 } 1627 }
1535 1628
1536 (\@w, \@h) 1629 (\@w, \@h)
1537} 1630}
… …
1553 my ($ws, $hs) = $self->get_wh; 1646 my ($ws, $hs) = $self->get_wh;
1554 1647
1555 my $req_w = (sum @$ws) || 1; 1648 my $req_w = (sum @$ws) || 1;
1556 my $req_h = (sum @$hs) || 1; 1649 my $req_h = (sum @$hs) || 1;
1557 1650
1558 # TODO: nicer code && do row_expand 1651 # now linearly scale the rows/columns to the allocated size
1559 my @col_expand = @{$self->{col_expand}}; 1652 my @col_expand = @{$self->{col_expand}};
1560 @col_expand = (1) x @$ws unless @col_expand; 1653 @col_expand = (1) x @$ws unless @col_expand;
1561 my $col_expand = (sum @col_expand) || 1; 1654 my $col_expand = (sum @col_expand) || 1;
1562 1655
1563 # linearly scale sizes
1564 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1565 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1566 1657
1567 CFPlus::UI::harmonize $ws; 1658 CFPlus::UI::harmonize $ws;
1659
1660 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1;
1663
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665
1568 CFPlus::UI::harmonize $hs; 1666 CFPlus::UI::harmonize $hs;
1569 1667
1570 my $y; 1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1571 1670
1572 for my $r (0 .. $#{$self->{children}}) { 1671 for my $widget ($self->children) {
1573 my $row = $self->{children}[$r] 1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1574 or next;
1575 1673
1576 my $x = 0; 1674 $widget->configure (
1577 my $row_h = $hs->[$r]; 1675 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1578 1677 );
1579 for my $c (0 .. $#$row) { 1678 }
1580 my $col_w = $ws->[$c];
1581 1679
1582 if (my $widget = $row->[$c]) { 1680 1
1583 $widget->configure ($x, $y, $col_w, $row_h); 1681}
1584 }
1585 1682
1586 $x += $col_w; 1683#############################################################################
1684
1685package CFPlus::UI::Fixed;
1686
1687use List::Util qw(min max);
1688
1689our @ISA = CFPlus::UI::Container::;
1690
1691sub _scale($$$) {
1692 my ($rel, $val, $max) = @_;
1693
1694 $rel ? $val * $max : $val
1695}
1696
1697sub size_request {
1698 my ($self) = @_;
1699
1700 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1701
1702 # determine overall size by querying abs widgets
1703 for my $child ($self->visible_children) {
1704 unless ($child->{c_rel}) {
1705 my $x = $child->{c_x};
1706 my $y = $child->{c_y};
1707
1708 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1709 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1587 } 1710 }
1711 }
1588 1712
1589 $y += $row_h; 1713 my $W = $x2 - $x1;
1714 my $H = $y2 - $y1;
1715
1716 # now layout remaining widgets
1717 for my $child ($self->visible_children) {
1718 if ($child->{c_rel}) {
1719 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1720 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1721
1722 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1723 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1724 }
1725 }
1726
1727 my $W = $x2 - $x1;
1728 my $H = $y2 - $y1;
1729
1730 ($W, $H)
1731}
1732
1733sub invoke_size_allocate {
1734 my ($self, $W, $H) = @_;
1735
1736 for my $child ($self->visible_children) {
1737 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1738 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1739
1740 $x += $child->{c_halign} * $child->{req_w};
1741 $y += $child->{c_valign} * $child->{req_h};
1742
1743 $child->configure ($x, $y, $child->{req_w}, $child->{req_h});
1590 } 1744 }
1591 1745
1592 1 1746 1
1593}
1594
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} 1747}
1618 1748
1619############################################################################# 1749#############################################################################
1620 1750
1621package CFPlus::UI::Box; 1751package CFPlus::UI::Box;
… …
1881 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2011 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1882 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2012 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1883 : ($self->{h} - $size->[1]) * 0.5); 2013 : ($self->{h} - $size->[1]) * 0.5);
1884 }; 2014 };
1885 2015
1886 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2016# unless ($self->{list}) {
1887 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2017# $self->{list} = CFPlus::OpenGL::glGenList;
2018# CFPlus::OpenGL::glNewList $self->{list};
2019# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2020# CFPlus::OpenGL::glEndList;
2021# }
2022#
2023# CFPlus::OpenGL::glCallList $self->{list};
1888 2024
1889 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2025 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1890} 2026}
2027
2028#sub destroy {
2029# my ($self) = @_;
2030#
2031# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2032#
2033# $self->SUPER::destroy;
2034#}
1891 2035
1892############################################################################# 2036#############################################################################
1893 2037
1894package CFPlus::UI::EntryBase; 2038package CFPlus::UI::EntryBase;
1895 2039
… …
1962 my $sym = $ev->{sym}; 2106 my $sym = $ev->{sym};
1963 my $uni = $ev->{unicode}; 2107 my $uni = $ev->{unicode};
1964 2108
1965 my $text = $self->get_text; 2109 my $text = $self->get_text;
1966 2110
2111 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2112
1967 if ($uni == 8) { 2113 if ($uni == 8) {
1968 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2114 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1969 } elsif ($uni == 127) { 2115 } elsif ($uni == 127) {
1970 substr $text, $self->{cursor}, 1, ""; 2116 substr $text, $self->{cursor}, 1, "";
1971 } elsif ($sym == CFPlus::SDLK_LEFT) { 2117 } elsif ($sym == CFPlus::SDLK_LEFT) {
1972 --$self->{cursor} if $self->{cursor}; 2118 --$self->{cursor} if $self->{cursor};
1973 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2119 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1974 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2120 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1975 } elsif ($sym == CFPlus::SDLK_HOME) { 2121 } elsif ($sym == CFPlus::SDLK_HOME) {
2122 # what a hack
1976 $self->{cursor} = 0; 2123 $self->{cursor} =
2124 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2125 ? length $1
2126 : 0;
1977 } elsif ($sym == CFPlus::SDLK_END) { 2127 } elsif ($sym == CFPlus::SDLK_END) {
2128 # uh, again
2129 $self->{cursor} =
2130 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1978 $self->{cursor} = length $text; 2131 ? $self->{cursor} + length $1
2132 : length $self->{text};
1979 } elsif ($uni == 21) { # ctrl-u 2133 } elsif ($uni == 21) { # ctrl-u
1980 $text = ""; 2134 $text = "";
1981 $self->{cursor} = 0; 2135 $self->{cursor} = 0;
1982 } elsif ($uni == 27) { 2136 } elsif ($uni == 27) {
1983 $self->emit ('escape'); 2137 $self->emit ('escape');
1984 } elsif ($uni >= 0x20 || $uni == 0x0d) { 2138 } elsif ($uni == 0x0d) {
2139 substr $text, $self->{cursor}++, 0, "\012";
2140 } elsif ($uni >= 0x20) {
1985 substr $text, $self->{cursor}++, 0, chr $uni; 2141 substr $text, $self->{cursor}++, 0, chr $uni;
1986 } else { 2142 } else {
1987 return 0; 2143 return 0;
1988 } 2144 }
1989 2145
… …
2167 2323
2168use CFPlus::OpenGL; 2324use CFPlus::OpenGL;
2169 2325
2170my @tex = 2326my @tex =
2171 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2327 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw(b1_button_active.png); 2328 qw(b1_button_inactive.png b1_button_active.png);
2173 2329
2174sub new { 2330sub new {
2175 my $class = shift; 2331 my $class = shift;
2176 2332
2177 $class->SUPER::new ( 2333 $class->SUPER::new (
2178 padding_x => 4, 2334 padding_x => 4,
2179 padding_y => 4, 2335 padding_y => 4,
2180 fg => [1, 1, 1], 2336 fg => [1.0, 1.0, 1.0],
2181 active_fg => [0, 0, 1], 2337 active_fg => [0.8, 0.8, 0.8],
2182 can_hover => 1, 2338 can_hover => 1,
2183 align => 0, 2339 align => 0,
2184 valign => 0, 2340 valign => 0,
2185 can_events => 1, 2341 can_events => 1,
2186 @_ 2342 @_
… …
2204 2360
2205 glEnable GL_TEXTURE_2D; 2361 glEnable GL_TEXTURE_2D;
2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2207 glColor 0, 0, 0, 1; 2363 glColor 0, 0, 0, 1;
2208 2364
2365 my $tex = $tex[$GRAB == $self];
2209 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2366 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2210 2367
2211 glDisable GL_TEXTURE_2D; 2368 glDisable GL_TEXTURE_2D;
2212 2369
2213 $self->SUPER::_draw; 2370 $self->SUPER::_draw;
2214} 2371}
… …
2310 or Carp::croak "'path' or 'tex' attributes required"; 2467 or Carp::croak "'path' or 'tex' attributes required";
2311 2468
2312 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2469 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2313 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2470 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2314 2471
2315 Scalar::Util::weaken $texture_cache{$self->{path}}; 2472 CFPlus::weaken $texture_cache{$self->{path}};
2316 2473
2317 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2474 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2318 2475
2319 $self 2476 $self
2320} 2477}
… …
2667 2824
2668 $self->SUPER::invoke_button_down ($ev, $x, $y); 2825 $self->SUPER::invoke_button_down ($ev, $x, $y);
2669 2826
2670 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2827 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2671 2828
2672 $self->invoke_mouse_motion ($ev, $x, $y) 2829 $self->invoke_mouse_motion ($ev, $x, $y);
2830
2831 1
2673} 2832}
2674 2833
2675sub invoke_mouse_motion { 2834sub invoke_mouse_motion {
2676 my ($self, $ev, $x, $y) = @_; 2835 my ($self, $ev, $x, $y) = @_;
2677 2836
… …
2693sub invoke_mouse_wheel { 2852sub invoke_mouse_wheel {
2694 my ($self, $ev) = @_; 2853 my ($self, $ev) = @_;
2695 2854
2696 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2855 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2697 2856
2857 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2858
2698 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2859 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2699 2860
2700 ! ! $delta 2861 1
2701} 2862}
2702 2863
2703sub update { 2864sub update {
2704 my ($self) = @_; 2865 my ($self) = @_;
2705 2866
… …
2813 #font => default_font 2974 #font => default_font
2814 @_, 2975 @_,
2815 2976
2816 layout => (new CFPlus::Layout), 2977 layout => (new CFPlus::Layout),
2817 par => [], 2978 par => [],
2979 max_par => 0,
2818 height => 0, 2980 height => 0,
2819 children => [ 2981 children => [
2820 (new CFPlus::UI::Empty expand => 1), 2982 (new CFPlus::UI::Empty expand => 1),
2821 (new CFPlus::UI::Slider vertical => 1), 2983 (new CFPlus::UI::Slider vertical => 1),
2822 ], 2984 ],
… …
2945 wrapped => 1, 3107 wrapped => 1,
2946 }; 3108 };
2947 3109
2948 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3110 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2949 push @{$self->{par}}, $para; 3111 push @{$self->{par}}, $para;
3112 }
3113
3114 if (my $max = $self->{max_par}) {
3115 shift @{$self->{par}} while @{$self->{par}} > $max;
2950 } 3116 }
2951 3117
2952 $self->{need_reflow}++; 3118 $self->{need_reflow}++;
2953 $self->update; 3119 $self->update;
2954} 3120}
… …
3262 3428
3263sub new { 3429sub new {
3264 my $class = shift; 3430 my $class = shift;
3265 3431
3266 my $self = $class->SUPER::new ( 3432 my $self = $class->SUPER::new (
3433 size_w => 32,
3434 size_h => 8,
3267 aspect => 1, 3435 aspect => 1,
3268 can_events => 0, 3436 can_events => 0,
3269 @_, 3437 @_,
3270 ); 3438 );
3271 3439
3272 if ($self->{anim} && $self->{animspeed}) { 3440 if ($self->{anim} && $self->{animspeed}) {
3273 Scalar::Util::weaken (my $widget = $self); 3441 CFPlus::weaken (my $widget = $self);
3274 3442
3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3444 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3275 $self->{timer} = Event->timer ( 3445 $self->{timer} = Event->timer (
3276 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3277 hard => 1, 3446 parked => 1,
3278 interval => $self->{animspeed},
3279 cb => sub { 3447 cb => sub {
3448 return unless $::CONN && $widget;
3449
3280 ++$widget->{frame}; 3450 ++$widget->{frame};
3451 $widget->update_face;
3281 $widget->update; 3452 $widget->update;
3453
3454 $widget->update_timer;
3282 }, 3455 },
3283 ); 3456 );
3457
3458 $self->update_face;
3459 $self->update_timer;
3284 } 3460 }
3285 3461
3286 $self 3462 $self
3287} 3463}
3288 3464
3465sub update_timer {
3466 my ($self) = @_;
3467
3468 return unless $self->{timer};
3469
3470 if ($self->{visible}) {
3471 $self->{timer}->at (
3472 $self->{anim_start}
3473 + $self->{animspeed}
3474 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3475 );
3476 $self->{timer}->start;
3477 } else {
3478 $self->{timer}->stop;
3479 }
3480}
3481
3482sub update_face {
3483 my ($self) = @_;
3484
3485 return unless $::CONN;
3486
3487 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3488 if ($anim && @$anim) {
3489 delete $self->{wait_face};
3490 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3491 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3492 }
3493 }
3494}
3495
3289sub size_request { 3496sub size_request {
3290 (32, 8) 3497 my ($self) = @_;
3498
3499 if ($::CONN) {
3500 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3501 if (my $tex = $::CONN->{texture}[$faceid]) {
3502 $self->{tex} = $tex;
3503 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3504 } else {
3505 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3506 $self->realloc;
3507 });
3508 }
3509 }
3510 }
3511
3512 ($self->{size_w} || 8, $self->{size_h} || 8)
3291} 3513}
3292 3514
3293sub update { 3515sub update {
3294 my ($self) = @_; 3516 my ($self) = @_;
3295 3517
3296 return unless $self->{visible}; 3518 return unless $self->{visible};
3297 3519
3298 $self->SUPER::update; 3520 $self->SUPER::update;
3299} 3521}
3300 3522
3523sub invoke_visibility_change {
3524 my ($self) = @_;
3525
3526 $self->update_timer;
3527
3528 0
3529}
3530
3301sub _draw { 3531sub _draw {
3302 my ($self) = @_; 3532 my ($self) = @_;
3303 3533
3304 return unless $::CONN;
3305
3306 $self->SUPER::_draw; 3534 $self->SUPER::_draw;
3307 3535
3308 my $face; 3536 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; 3537 glEnable GL_TEXTURE_2D;
3321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3322 glColor 0, 0, 0, 1; 3539 glColor 0, 0, 0, 1;
3323 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3324 glDisable GL_TEXTURE_2D; 3541 glDisable GL_TEXTURE_2D;
… …
3326} 3543}
3327 3544
3328sub destroy { 3545sub destroy {
3329 my ($self) = @_; 3546 my ($self) = @_;
3330 3547
3331 $self->{timer}->cancel 3548 (delete $self->{timer})->cancel
3332 if $self->{timer}; 3549 if $self->{timer};
3333 3550
3334 $self->SUPER::destroy; 3551 $self->SUPER::destroy;
3335} 3552}
3336 3553
… …
3532} 3749}
3533 3750
3534sub add { 3751sub add {
3535 my ($self, $title, $widget, $tooltip) = @_; 3752 my ($self, $title, $widget, $tooltip) = @_;
3536 3753
3537 Scalar::Util::weaken $self; 3754 CFPlus::weaken $self;
3538 3755
3539 $self->{buttonbar}->add (new CFPlus::UI::Button 3756 unless (ref $title) {
3757 $title = new CFPlus::UI::Button
3540 markup => $title, 3758 markup => $title,
3541 tooltip => $tooltip, 3759 tooltip => $tooltip,
3760 ;
3761 }
3762
3542 on_activate => sub { $self->set_current_page ($widget) }, 3763 $title->connect (activate => sub { $self->set_current_page ($widget) });
3543 ); 3764 $self->{buttonbar}->add ($title);
3544 3765
3545 $self->{multiplexer}->add ($widget); 3766 $self->{multiplexer}->add ($widget);
3546} 3767}
3547 3768
3548sub get_current_page { 3769sub get_current_page {
… …
3626 my $self = $class->SUPER::new ( 3847 my $self = $class->SUPER::new (
3627 fontsize => 0.8, 3848 fontsize => 0.8,
3628 @_, 3849 @_,
3629 ); 3850 );
3630 3851
3631 Scalar::Util::weaken (my $this = $self); 3852 CFPlus::weaken (my $this = $self);
3632 3853
3633 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3854 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3634 3855
3635 $self 3856 $self
3636} 3857}
… …
3775 my $self = $class->SUPER::new ( 3996 my $self = $class->SUPER::new (
3776 visible => 1, 3997 visible => 1,
3777 @_, 3998 @_,
3778 ); 3999 );
3779 4000
3780 Scalar::Util::weaken ($self->{root} = $self); 4001 CFPlus::weaken ($self->{root} = $self);
3781 4002
3782 $self 4003 $self
3783} 4004}
3784 4005
3785sub size_request { 4006sub size_request {
… …
3880 while ($self->{refresh_hook}) { 4101 while ($self->{refresh_hook}) {
3881 $_->() 4102 $_->()
3882 for values %{delete $self->{refresh_hook}}; 4103 for values %{delete $self->{refresh_hook}};
3883 } 4104 }
3884 4105
3885 if ($self->{realloc}) { 4106 while ($self->{realloc}) {
3886 my %queue; 4107 my %queue;
3887 my @queue; 4108 my @queue;
3888 my $widget; 4109 my $widget;
3889 4110
3890 outer: 4111 outer:
… …
3937 } 4158 }
3938 } 4159 }
3939 4160
3940 delete $self->{realloc}{$widget+0}; 4161 delete $self->{realloc}{$widget+0};
3941 } 4162 }
3942 }
3943 4163
3944 while (my $size_alloc = delete $self->{size_alloc}) { 4164 while (my $size_alloc = delete $self->{size_alloc}) {
3945 my @queue = sort { $b->{visible} <=> $a->{visible} } 4165 my @queue = sort { $a->{visible} <=> $b->{visible} }
3946 values %$size_alloc; 4166 values %$size_alloc;
3947 4167
3948 while () { 4168 while () {
3949 my $widget = pop @queue || last; 4169 my $widget = pop @queue || last;
3950 4170
3951 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4171 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3952 4172
3953 $w = 0 if $w < 0;
3954 $h = 0 if $h < 0;
3955
3956 $w = max $widget->{min_w}, $w; 4173 $w = max $widget->{min_w}, $w;
3957 $h = max $widget->{min_h}, $h; 4174 $h = max $widget->{min_h}, $h;
3958 4175
3959# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4176# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3960# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4177# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3961 4178
3962 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4179 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3963 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4180 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3964 4181
3965 $w = int $w + 0.5; 4182 $w = int $w + 0.5;
3966 $h = int $h + 0.5; 4183 $h = int $h + 0.5;
3967 4184
3968 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3969 $widget->{old_w} = $widget->{w}; 4186 $widget->{old_w} = $widget->{w};
3970 $widget->{old_h} = $widget->{h}; 4187 $widget->{old_h} = $widget->{h};
3971 4188
3972 $widget->{w} = $w; 4189 $widget->{w} = $w;
3973 $widget->{h} = $h; 4190 $widget->{h} = $h;
3974 4191
3975 $widget->emit (size_allocate => $w, $h); 4192 $widget->emit (size_allocate => $w, $h);
4193 }
3976 } 4194 }
3977 } 4195 }
3978 } 4196 }
3979 4197
3980 while ($self->{post_alloc_hook}) { 4198 while ($self->{post_alloc_hook}) {
3981 $_->() 4199 $_->()
3982 for values %{delete $self->{post_alloc_hook}}; 4200 for values %{delete $self->{post_alloc_hook}};
3983 } 4201 }
3984
3985 4202
3986 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4203 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3987 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4204 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3988 glClear GL_COLOR_BUFFER_BIT; 4205 glClear GL_COLOR_BUFFER_BIT;
3989 4206

Diff Legend

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