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.362 by root, Sat Dec 9 21:26:46 2006 UTC vs.
Revision 1.410 by root, Sun Jul 22 16:37:19 2007 UTC

… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
110 } 113 }
111 114
112 if ($GRAB) { 115 if ($GRAB) {
113 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel 117 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9; 118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
117 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
118 } else { 125 } else {
119 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
120 } 127 }
121 } 128 }
… …
265 $self->hide; 272 $self->hide;
266 $self->emit ("destroy"); 273 $self->emit ("destroy");
267 %$self = (); 274 %$self = ();
268} 275}
269 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
270sub show { 281sub show {
271 my ($self) = @_; 282 my ($self) = @_;
272 283
273 return if $self->{parent}; 284 return if $self->{parent};
274 285
… …
313sub set_visibility { 324sub set_visibility {
314 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
315 326
316 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
317 328
318 $visible ? $self->hide 329 $visible ? $self->show
319 : $self->show; 330 : $self->hide;
320} 331}
321 332
322sub toggle_visibility { 333sub toggle_visibility {
323 my ($self) = @_; 334 my ($self) = @_;
324 335
… …
540 551
541 # parent 552 # parent
542 $self->{parent} && $self->{parent}->emit ($signal, @args) 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
543} 554}
544 555
545sub find_widget { 556#sub find_widget {
546 my ($self, $x, $y) = @_; 557# in .xs
547
548 return () unless $self->{can_events};
549
550 return $self
551 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
552 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
553
554 ()
555}
556 558
557sub set_parent { 559sub set_parent {
558 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
559 561
560 CFPlus::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
… …
591 593
592# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
593# functions seems pointless. 595# functions seems pointless.
594our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
595 597
596sub draw { 598#sub draw {
597 my ($self) = @_; 599#CFPlus.xs
598
599 return unless $self->{h} && $self->{w};
600
601 # update screen rectangle
602 local $draw_x = $draw_x + $self->{x};
603 local $draw_y = $draw_y + $self->{y};
604
605 # skip widgets that are entirely outside the drawing area
606 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
607 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
608
609 glPushMatrix;
610 glTranslate $self->{x}, $self->{y}, 0;
611
612 if ($self == $HOVER && $self->{can_hover}) {
613 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
614 glEnable GL_BLEND;
615 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616 glBegin GL_QUADS;
617 glVertex 0 , 0;
618 glVertex $self->{w}, 0;
619 glVertex $self->{w}, $self->{h};
620 glVertex 0 , $self->{h};
621 glEnd;
622 glDisable GL_BLEND;
623 }
624
625 if ($ENV{CFPLUS_DEBUG} & 1) {
626 glPushMatrix;
627 glColor 1, 1, 0, 1;
628 glTranslate 0.375, 0.375;
629 glBegin GL_LINE_LOOP;
630 glVertex 0 , 0;
631 glVertex $self->{w} - 1, 0;
632 glVertex $self->{w} - 1, $self->{h} - 1;
633 glVertex 0 , $self->{h} - 1;
634 glEnd;
635 glPopMatrix;
636 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
637 }
638
639 $self->_draw;
640 glPopMatrix;
641}
642 600
643sub _draw { 601sub _draw {
644 my ($self) = @_; 602 my ($self) = @_;
645 603
646 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
647} 605}
648 606
649my $cntx;#d#
650sub DESTROY { 607sub DESTROY {
651 my ($self) = @_; 608 my ($self) = @_;
652 609
653 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
654 611
… …
739 can_events => 0, 696 can_events => 0,
740 %arg, 697 %arg,
741 ); 698 );
742 699
743 $self->add (@$children) 700 $self->add (@$children)
744 if $children; 701 if $children && @$children;
745 702
746 $self 703 $self
747} 704}
748 705
749sub realloc { 706sub realloc {
… …
758 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
759 716
760 $_->set_parent ($self) 717 $_->set_parent ($self)
761 for @widgets; 718 for @widgets;
762 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
763 use sort 'stable'; 721 use sort 'stable';
764 722
765 $self->{children} = [ 723 $self->{children} = [
766 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
767 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
768 ]; 726 ];
769 727
770 $self->realloc; 728 $self->realloc;
729
730 map $_+0, @widgets
771} 731}
772 732
773sub children { 733sub children {
774 @{ $_[0]{children} } 734 @{ $_[0]{children} }
775} 735}
… …
786} 746}
787 747
788sub clear { 748sub clear {
789 my ($self) = @_; 749 my ($self) = @_;
790 750
791 my $children = delete $self->{children}; 751 my $children = $self->{children};
792 $self->{children} = []; 752 $self->{children} = [];
793 753
794 for (@$children) { 754 for (@$children) {
795 delete $_->{parent}; 755 delete $_->{parent};
796 $_->hide; 756 $_->hide;
… …
936} 896}
937 897
938############################################################################# 898#############################################################################
939 899
940package CFPlus::UI::ViewPort; 900package CFPlus::UI::ViewPort;
901
902use List::Util qw(min max);
941 903
942our @ISA = CFPlus::UI::Window::; 904our @ISA = CFPlus::UI::Window::;
943 905
944sub new { 906sub new {
945 my $class = shift; 907 my $class = shift;
… …
954sub size_request { 916sub size_request {
955 my ($self) = @_; 917 my ($self) = @_;
956 918
957 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 919 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
958 920
959 $w = 10 if $self->{scroll_x}; 921 $w = 1 if $self->{scroll_x};
960 $h = 10 if $self->{scroll_y}; 922 $h = 1 if $self->{scroll_y};
961 923
962 ($w, $h) 924 ($w, $h)
963} 925}
964 926
965sub invoke_size_allocate { 927sub invoke_size_allocate {
… …
977} 939}
978 940
979sub set_offset { 941sub set_offset {
980 my ($self, $x, $y) = @_; 942 my ($self, $x, $y) = @_;
981 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}) {
982 $self->{view_x} = int $x; 948 $self->{view_x} = $x;
983 $self->{view_y} = int $y; 949 $self->{view_y} = $y;
984 950
951 $self->emit (changed => $x, $y);
985 $self->update; 952 $self->update;
953 }
986} 954}
987 955
988# 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
989sub coord2local { 957sub coord2local {
990 my ($self, $x, $y) = @_; 958 my ($self, $x, $y) = @_;
… …
1005 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
1006 974
1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 976 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1009 ) { 977 ) {
1010 $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})
1011 } else { 979 } else {
1012 $self->CFPlus::UI::Base::find_widget ($x, $y) 980 $self->CFPlus::UI::Base::find_widget ($x, $y)
1013 } 981 }
1014} 982}
1015 983
… …
1026 994
1027############################################################################# 995#############################################################################
1028 996
1029package CFPlus::UI::ScrolledWindow; 997package CFPlus::UI::ScrolledWindow;
1030 998
1031our @ISA = CFPlus::UI::HBox::; 999our @ISA = CFPlus::UI::Table::;
1032 1000
1033sub new { 1001sub new {
1034 my ($class, %arg) = @_; 1002 my ($class, %arg) = @_;
1035 1003
1036 my $child = delete $arg{child}; 1004 my $child = delete $arg{child};
1037 1005
1038 my $self; 1006 my $self;
1039 1007
1040 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,
1041 vertical => 1, 1022 vertical => 1,
1042 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
1043 on_changed => sub { 1024 on_changed => sub {
1044 $self->{vp}->set_offset (0, $_[1]); 1025 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1045 }, 1027 },
1046 ; 1028 ;
1047 1029
1048 $self = $class->SUPER::new ( 1030 $self = $class->SUPER::new (
1049 vp => (new CFPlus::UI::ViewPort expand => 1), 1031 scroll_x => 0,
1032 scroll_y => 1,
1050 can_events => 1, 1033 can_events => 1,
1051 slider => $slider, 1034 hslider => $hslider,
1035 vslider => $vslider,
1036 col_expand => [1, 0],
1037 row_expand => [1, 0],
1052 %arg, 1038 %arg,
1053 ); 1039 );
1054 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
1055 $self->SUPER::add ($self->{vp}, $self->{slider}); 1062 $self->SUPER::add ($self->{vp});
1063
1056 $self->add ($child) if $child; 1064 $self->add ($child) if $child;
1057 1065
1058 $self 1066 $self
1059} 1067}
1060
1061#TODO# update range on size_allocate depending on child
1062 1068
1063sub add { 1069sub add {
1064 my ($self, $widget) = @_; 1070 my ($self, $widget) = @_;
1065 1071
1066 $self->{vp}->add ($self->{child} = $widget); 1072 $self->{vp}->add ($self->{child} = $widget);
1067} 1073}
1068 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
1069sub invoke_mouse_wheel { 1123sub invoke_mouse_wheel {
1070 my ($self, $ev) = @_; 1124 my ($self, $ev) = @_;
1071 1125
1072 return 0 unless $ev->{dy}; # only vertical movements
1073
1074 $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};
1075 1128
1076 1 1129 1
1077} 1130}
1078 1131
1079sub update_slider { 1132sub invoke_button_down {
1080 my ($self) = @_; 1133 my ($self, $ev, $x, $y) = @_;
1081 1134
1082 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1135 if ($ev->{button} == 2) {
1083} 1136 $self->start_dragging ($ev);
1137 return 1;
1138 }
1084 1139
1085sub update { 1140 0
1086 my ($self) = @_; 1141}
1087 1142
1088 $self->SUPER::update; 1143sub invoke_button_up {
1144 my ($self, $ev, $x, $y) = @_;
1089 1145
1090 $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
1091} 1162}
1092 1163
1093sub invoke_size_allocate { 1164sub invoke_size_allocate {
1094 my ($self, $w, $h) = @_; 1165 my ($self, $w, $h) = @_;
1095 1166
1096 $self->update_slider; 1167 $self->update_slider;
1097
1098 $self->SUPER::invoke_size_allocate ($w, $h) 1168 $self->SUPER::invoke_size_allocate ($w, $h)
1099} 1169}
1100 1170
1101############################################################################# 1171#############################################################################
1102 1172
… …
1252 1322
1253my @border = 1323my @border =
1254 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1324 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1255 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1256 1326
1327my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png);
1330
1257sub new { 1331sub new {
1258 my ($class, %arg) = @_; 1332 my ($class, %arg) = @_;
1259 1333
1260 my $self = $class->SUPER::new ( 1334 my $self = $class->SUPER::new (
1261 bg => [1, 1, 1, 1], 1335 bg => [1, 1, 1, 1],
… …
1429 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1430 1504
1431 my $border = $self->border; 1505 my $border = $self->border;
1432 1506
1433 glColor @{ $self->{border_bg} }; 1507 glColor @{ $self->{border_bg} };
1434 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1435 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1436 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1437 $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);
1438 1526
1439 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1440 glColor @{ $self->{bg} }; 1528 glColor @{ $self->{bg} };
1441 1529
1442 # TODO: repeat texture not scale 1530 # TODO: repeat texture not scale
… …
1463 1551
1464############################################################################# 1552#############################################################################
1465 1553
1466package CFPlus::UI::Table; 1554package CFPlus::UI::Table;
1467 1555
1468our @ISA = CFPlus::UI::Base::; 1556our @ISA = CFPlus::UI::Container::;
1469 1557
1470use List::Util qw(max sum); 1558use List::Util qw(max sum);
1471 1559
1472use CFPlus::OpenGL; 1560use CFPlus::OpenGL;
1473 1561
1474sub new { 1562sub new {
1475 my $class = shift; 1563 my $class = shift;
1476 1564
1477 $class->SUPER::new ( 1565 $class->SUPER::new (
1478 col_expand => [], 1566 col_expand => [],
1567 row_expand => [],
1479 @_, 1568 @_,
1480 ) 1569 )
1481} 1570}
1482 1571
1483sub children {
1484 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1485}
1486
1487sub 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 {
1488 my ($self) = shift; 1584 my $self = shift;
1585
1586 my @widgets;
1489 1587
1490 while (@_) { 1588 while (@_) {
1491 my ($x, $y, $child) = splice @_, 0, 3, (); 1589 my ($col, $row, $child) = splice @_, 0, 3, ();
1492 $child->set_parent ($self);
1493 $self->{children}[$y][$x] = $child;
1494 }
1495 1590
1496 $self->{force_realloc} = 1; 1591 $child->{row} = $row;
1497 $self->{force_size_alloc} = 1; 1592 $child->{col} = $col;
1498 $self->realloc;
1499}
1500 1593
1501sub remove { 1594 push @widgets, $child;
1595 }
1596
1597 $self->add (@widgets);
1598}
1599
1600sub get_wh {
1502 my ($self, $child) = @_; 1601 my ($self) = @_;
1503 1602
1504 # TODO: not yet implemented 1603 my (@w, @h);
1505}
1506
1507# TODO: move to container class maybe? send children a signal on removal?
1508sub clear {
1509 my ($self) = @_;
1510 1604
1511 my @children = $self->children; 1605 my @children = $self->children;
1512 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 }
1513 1616 }
1514 for (@children) {
1515 delete $_->{parent};
1516 $_->hide;
1517 }
1518 1617
1519 $self->realloc; 1618 # second pass, rows
1520} 1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1521
1522sub get_wh {
1523 my ($self) = @_;
1524
1525 my (@w, @h);
1526
1527 for my $y (0 .. $#{$self->{children}}) {
1528 my $row = $self->{children}[$y]
1529 or next;
1530
1531 for my $x (0 .. $#$row) {
1532 my $widget = $row->[$x]
1533 or next;
1534 my ($w, $h) = @$widget{qw(req_w req_h)}; 1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1535 1621
1536 $w[$x] = max $w[$x], $w; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1537 $h[$y] = max $h[$y], $h; 1623
1624 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1538 } 1626 }
1539 } 1627 }
1540 1628
1541 (\@w, \@h) 1629 (\@w, \@h)
1542} 1630}
… …
1558 my ($ws, $hs) = $self->get_wh; 1646 my ($ws, $hs) = $self->get_wh;
1559 1647
1560 my $req_w = (sum @$ws) || 1; 1648 my $req_w = (sum @$ws) || 1;
1561 my $req_h = (sum @$hs) || 1; 1649 my $req_h = (sum @$hs) || 1;
1562 1650
1563 # TODO: nicer code && do row_expand 1651 # now linearly scale the rows/columns to the allocated size
1564 my @col_expand = @{$self->{col_expand}}; 1652 my @col_expand = @{$self->{col_expand}};
1565 @col_expand = (1) x @$ws unless @col_expand; 1653 @col_expand = (1) x @$ws unless @col_expand;
1566 my $col_expand = (sum @col_expand) || 1; 1654 my $col_expand = (sum @col_expand) || 1;
1567 1655
1568 # linearly scale sizes
1569 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1570 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1571 1657
1572 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
1573 CFPlus::UI::harmonize $hs; 1666 CFPlus::UI::harmonize $hs;
1574 1667
1575 my $y; 1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1576 1670
1577 for my $r (0 .. $#{$self->{children}}) { 1671 for my $widget ($self->children) {
1578 my $row = $self->{children}[$r] 1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1579 or next;
1580 1673
1581 my $x = 0; 1674 $widget->configure (
1582 my $row_h = $hs->[$r]; 1675 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1583 1677 );
1584 for my $c (0 .. $#$row) { 1678 }
1585 my $col_w = $ws->[$c];
1586 1679
1587 if (my $widget = $row->[$c]) { 1680 1
1588 $widget->configure ($x, $y, $col_w, $row_h); 1681}
1589 }
1590 1682
1591 $x += $col_w; 1683#############################################################################
1684
1685package CFPlus::UI::Fixed;
1686
1687use List::Util qw(min max);
1688
1689our @ISA = CFPlus::UI::Container::;
1690
1691sub add_fixed {
1692 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1693
1694 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1695 $self->SUPER::add ($child);
1696}
1697
1698sub _scale($$$) {
1699 my ($mode, $val, $max) = @_;
1700
1701 $mode eq "abs" ? $val
1702 : $mode eq "rel" ? $val * $max
1703 : 0
1704}
1705
1706sub size_request {
1707 my ($self) = @_;
1708
1709 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710
1711 # determine overall size by querying abs widgets
1712 for my $child ($self->visible_children) {
1713 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1714
1715 if ($pos eq "abs") {
1716 $w = _scale $size, $w, $child->{req_w};
1717 $h = _scale $size, $h, $child->{req_h};
1718
1719 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1720 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1592 } 1721 }
1722 }
1593 1723
1594 $y += $row_h; 1724 my $W = $x2 - $x1;
1725 my $H = $y2 - $y1;
1726
1727 # now layout remaining widgets
1728 for my $child ($self->visible_children) {
1729 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1730
1731 if ($pos ne "abs") {
1732 $x = _scale $pos, $x, $W;
1733 $y = _scale $pos, $x, $H;
1734 $w = _scale $size, $w, $child->{req_w};
1735 $h = _scale $size, $h, $child->{req_h};
1736
1737 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1738 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1739 }
1740 }
1741
1742 my $W = $x2 - $x1;
1743 my $H = $y2 - $y1;
1744
1745 ($W, $H)
1746}
1747
1748sub invoke_size_allocate {
1749 my ($self, $W, $H) = @_;
1750
1751 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1753
1754 $x = _scale $pos, $x, $W;
1755 $y = _scale $pos, $x, $H;
1756 $w = _scale $size, $w, $W;
1757 $h = _scale $size, $h, $H;
1758
1759 $child->configure ($x, $y, $w, $h);
1595 } 1760 }
1596 1761
1597 1 1762 1
1598}
1599
1600sub find_widget {
1601 my ($self, $x, $y) = @_;
1602
1603 $x -= $self->{x};
1604 $y -= $self->{y};
1605
1606 my $res;
1607
1608 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1609 $res = $_->find_widget ($x, $y)
1610 and return $res;
1611 }
1612
1613 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1614}
1615
1616sub _draw {
1617 my ($self) = @_;
1618
1619 for (grep $_, @{$self->{children}}) {
1620 $_->draw for grep $_, @$_;
1621 }
1622} 1763}
1623 1764
1624############################################################################# 1765#############################################################################
1625 1766
1626package CFPlus::UI::Box; 1767package CFPlus::UI::Box;
… …
1886 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1887 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1888 : ($self->{h} - $size->[1]) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
1889 }; 2030 };
1890 2031
1891 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2032# unless ($self->{list}) {
1892 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2033# $self->{list} = CFPlus::OpenGL::glGenList;
2034# CFPlus::OpenGL::glNewList $self->{list};
2035# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2036# CFPlus::OpenGL::glEndList;
2037# }
2038#
2039# CFPlus::OpenGL::glCallList $self->{list};
1893 2040
1894 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2041 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1895} 2042}
2043
2044#sub destroy {
2045# my ($self) = @_;
2046#
2047# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2048#
2049# $self->SUPER::destroy;
2050#}
1896 2051
1897############################################################################# 2052#############################################################################
1898 2053
1899package CFPlus::UI::EntryBase; 2054package CFPlus::UI::EntryBase;
1900 2055
… …
1967 my $sym = $ev->{sym}; 2122 my $sym = $ev->{sym};
1968 my $uni = $ev->{unicode}; 2123 my $uni = $ev->{unicode};
1969 2124
1970 my $text = $self->get_text; 2125 my $text = $self->get_text;
1971 2126
2127 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2128
1972 if ($uni == 8) { 2129 if ($uni == 8) {
1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2130 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974 } elsif ($uni == 127) { 2131 } elsif ($uni == 127) {
1975 substr $text, $self->{cursor}, 1, ""; 2132 substr $text, $self->{cursor}, 1, "";
1976 } elsif ($sym == CFPlus::SDLK_LEFT) { 2133 } elsif ($sym == CFPlus::SDLK_LEFT) {
1977 --$self->{cursor} if $self->{cursor}; 2134 --$self->{cursor} if $self->{cursor};
1978 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2135 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1979 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2136 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1980 } elsif ($sym == CFPlus::SDLK_HOME) { 2137 } elsif ($sym == CFPlus::SDLK_HOME) {
2138 # what a hack
1981 $self->{cursor} = 0; 2139 $self->{cursor} =
2140 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2141 ? length $1
2142 : 0;
1982 } elsif ($sym == CFPlus::SDLK_END) { 2143 } elsif ($sym == CFPlus::SDLK_END) {
2144 # uh, again
2145 $self->{cursor} =
2146 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1983 $self->{cursor} = length $text; 2147 ? $self->{cursor} + length $1
2148 : length $self->{text};
1984 } elsif ($uni == 21) { # ctrl-u 2149 } elsif ($uni == 21) { # ctrl-u
1985 $text = ""; 2150 $text = "";
1986 $self->{cursor} = 0; 2151 $self->{cursor} = 0;
1987 } elsif ($uni == 27) { 2152 } elsif ($uni == 27) {
1988 $self->emit ('escape'); 2153 $self->emit ('escape');
1989 } elsif ($uni >= 0x20 || $uni == 0x0d) { 2154 } elsif ($uni == 0x0d) {
2155 substr $text, $self->{cursor}++, 0, "\012";
2156 } elsif ($uni >= 0x20) {
1990 substr $text, $self->{cursor}++, 0, chr $uni; 2157 substr $text, $self->{cursor}++, 0, chr $uni;
1991 } else { 2158 } else {
1992 return 0; 2159 return 0;
1993 } 2160 }
1994 2161
… …
2172 2339
2173use CFPlus::OpenGL; 2340use CFPlus::OpenGL;
2174 2341
2175my @tex = 2342my @tex =
2176 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2343 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2177 qw(b1_button_active.png); 2344 qw(b1_button_inactive.png b1_button_active.png);
2178 2345
2179sub new { 2346sub new {
2180 my $class = shift; 2347 my $class = shift;
2181 2348
2182 $class->SUPER::new ( 2349 $class->SUPER::new (
2183 padding_x => 4, 2350 padding_x => 4,
2184 padding_y => 4, 2351 padding_y => 4,
2185 fg => [1, 1, 1], 2352 fg => [1.0, 1.0, 1.0],
2186 active_fg => [0, 0, 1], 2353 active_fg => [0.8, 0.8, 0.8],
2187 can_hover => 1, 2354 can_hover => 1,
2188 align => 0, 2355 align => 0,
2189 valign => 0, 2356 valign => 0,
2190 can_events => 1, 2357 can_events => 1,
2191 @_ 2358 @_
… …
2209 2376
2210 glEnable GL_TEXTURE_2D; 2377 glEnable GL_TEXTURE_2D;
2211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2378 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2212 glColor 0, 0, 0, 1; 2379 glColor 0, 0, 0, 1;
2213 2380
2381 my $tex = $tex[$GRAB == $self];
2214 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2382 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2215 2383
2216 glDisable GL_TEXTURE_2D; 2384 glDisable GL_TEXTURE_2D;
2217 2385
2218 $self->SUPER::_draw; 2386 $self->SUPER::_draw;
2219} 2387}
… …
2672 2840
2673 $self->SUPER::invoke_button_down ($ev, $x, $y); 2841 $self->SUPER::invoke_button_down ($ev, $x, $y);
2674 2842
2675 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2843 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2676 2844
2677 $self->invoke_mouse_motion ($ev, $x, $y) 2845 $self->invoke_mouse_motion ($ev, $x, $y);
2846
2847 1
2678} 2848}
2679 2849
2680sub invoke_mouse_motion { 2850sub invoke_mouse_motion {
2681 my ($self, $ev, $x, $y) = @_; 2851 my ($self, $ev, $x, $y) = @_;
2682 2852
… …
2698sub invoke_mouse_wheel { 2868sub invoke_mouse_wheel {
2699 my ($self, $ev) = @_; 2869 my ($self, $ev) = @_;
2700 2870
2701 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2871 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2702 2872
2873 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2874
2703 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2875 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2704 2876
2705 ! ! $delta 2877 1
2706} 2878}
2707 2879
2708sub update { 2880sub update {
2709 my ($self) = @_; 2881 my ($self) = @_;
2710 2882
… …
2818 #font => default_font 2990 #font => default_font
2819 @_, 2991 @_,
2820 2992
2821 layout => (new CFPlus::Layout), 2993 layout => (new CFPlus::Layout),
2822 par => [], 2994 par => [],
2995 max_par => 0,
2823 height => 0, 2996 height => 0,
2824 children => [ 2997 children => [
2825 (new CFPlus::UI::Empty expand => 1), 2998 (new CFPlus::UI::Empty expand => 1),
2826 (new CFPlus::UI::Slider vertical => 1), 2999 (new CFPlus::UI::Slider vertical => 1),
2827 ], 3000 ],
… …
2950 wrapped => 1, 3123 wrapped => 1,
2951 }; 3124 };
2952 3125
2953 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3126 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2954 push @{$self->{par}}, $para; 3127 push @{$self->{par}}, $para;
3128 }
3129
3130 if (my $max = $self->{max_par}) {
3131 shift @{$self->{par}} while @{$self->{par}} > $max;
2955 } 3132 }
2956 3133
2957 $self->{need_reflow}++; 3134 $self->{need_reflow}++;
2958 $self->update; 3135 $self->update;
2959} 3136}
… …
3267 3444
3268sub new { 3445sub new {
3269 my $class = shift; 3446 my $class = shift;
3270 3447
3271 my $self = $class->SUPER::new ( 3448 my $self = $class->SUPER::new (
3449 size_w => 32,
3450 size_h => 8,
3272 aspect => 1, 3451 aspect => 1,
3273 can_events => 0, 3452 can_events => 0,
3274 @_, 3453 @_,
3275 ); 3454 );
3276 3455
3277 if ($self->{anim} && $self->{animspeed}) { 3456 if ($self->{anim} && $self->{animspeed}) {
3278 CFPlus::weaken (my $widget = $self); 3457 CFPlus::weaken (my $widget = $self);
3279 3458
3459 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3460 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3280 $self->{timer} = Event->timer ( 3461 $self->{timer} = Event->timer (
3281 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3282 hard => 1, 3462 parked => 1,
3283 interval => $self->{animspeed},
3284 cb => sub { 3463 cb => sub {
3464 return unless $::CONN && $widget;
3465
3285 ++$widget->{frame}; 3466 ++$widget->{frame};
3467 $widget->update_face;
3286 $widget->update; 3468 $widget->update;
3469
3470 $widget->update_timer;
3287 }, 3471 },
3288 ); 3472 );
3473
3474 $self->update_face;
3475 $self->update_timer;
3289 } 3476 }
3290 3477
3291 $self 3478 $self
3292} 3479}
3293 3480
3481sub update_timer {
3482 my ($self) = @_;
3483
3484 return unless $self->{timer};
3485
3486 if ($self->{visible}) {
3487 $self->{timer}->at (
3488 $self->{anim_start}
3489 + $self->{animspeed}
3490 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3491 );
3492 $self->{timer}->start;
3493 } else {
3494 $self->{timer}->stop;
3495 }
3496}
3497
3498sub update_face {
3499 my ($self) = @_;
3500
3501 return unless $::CONN;
3502
3503 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3504 if ($anim && @$anim) {
3505 delete $self->{wait_face};
3506 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3507 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3508 }
3509 }
3510}
3511
3294sub size_request { 3512sub size_request {
3295 (32, 8) 3513 my ($self) = @_;
3514
3515 if ($::CONN) {
3516 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3517 if (my $tex = $::CONN->{texture}[$faceid]) {
3518 $self->{tex} = $tex;
3519 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3520 } else {
3521 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3522 $self->realloc;
3523 });
3524 }
3525 }
3526 }
3527
3528 ($self->{size_w} || 8, $self->{size_h} || 8)
3296} 3529}
3297 3530
3298sub update { 3531sub update {
3299 my ($self) = @_; 3532 my ($self) = @_;
3300 3533
3301 return unless $self->{visible}; 3534 return unless $self->{visible};
3302 3535
3303 $self->SUPER::update; 3536 $self->SUPER::update;
3304} 3537}
3305 3538
3539sub invoke_visibility_change {
3540 my ($self) = @_;
3541
3542 $self->update_timer;
3543
3544 0
3545}
3546
3306sub _draw { 3547sub _draw {
3307 my ($self) = @_; 3548 my ($self) = @_;
3308 3549
3309 return unless $::CONN;
3310
3311 $self->SUPER::_draw; 3550 $self->SUPER::_draw;
3312 3551
3313 my $face; 3552 if (my $tex = $self->{tex}) {
3314
3315 if ($self->{frame}) {
3316 my $anim = $::CONN->{anim}[$self->{anim}];
3317
3318 $face = $anim->[ $self->{frame} % @$anim ]
3319 if $anim && @$anim;
3320 }
3321
3322 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3323
3324 if ($tex) {
3325 glEnable GL_TEXTURE_2D; 3553 glEnable GL_TEXTURE_2D;
3326 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3327 glColor 0, 0, 0, 1; 3555 glColor 0, 0, 0, 1;
3328 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3556 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3329 glDisable GL_TEXTURE_2D; 3557 glDisable GL_TEXTURE_2D;
… …
3331} 3559}
3332 3560
3333sub destroy { 3561sub destroy {
3334 my ($self) = @_; 3562 my ($self) = @_;
3335 3563
3336 $self->{timer}->cancel 3564 (delete $self->{timer})->cancel
3337 if $self->{timer}; 3565 if $self->{timer};
3338 3566
3339 $self->SUPER::destroy; 3567 $self->SUPER::destroy;
3340} 3568}
3341 3569
… …
3539sub add { 3767sub add {
3540 my ($self, $title, $widget, $tooltip) = @_; 3768 my ($self, $title, $widget, $tooltip) = @_;
3541 3769
3542 CFPlus::weaken $self; 3770 CFPlus::weaken $self;
3543 3771
3544 $self->{buttonbar}->add (new CFPlus::UI::Button 3772 unless (ref $title) {
3773 $title = new CFPlus::UI::Button
3545 markup => $title, 3774 markup => $title,
3546 tooltip => $tooltip, 3775 tooltip => $tooltip,
3776 ;
3777 }
3778
3547 on_activate => sub { $self->set_current_page ($widget) }, 3779 $title->connect (activate => sub { $self->set_current_page ($widget) });
3548 ); 3780 $self->{buttonbar}->add ($title);
3549 3781
3550 $self->{multiplexer}->add ($widget); 3782 $self->{multiplexer}->add ($widget);
3551} 3783}
3552 3784
3553sub get_current_page { 3785sub get_current_page {
… …
3885 while ($self->{refresh_hook}) { 4117 while ($self->{refresh_hook}) {
3886 $_->() 4118 $_->()
3887 for values %{delete $self->{refresh_hook}}; 4119 for values %{delete $self->{refresh_hook}};
3888 } 4120 }
3889 4121
3890 if ($self->{realloc}) { 4122 while ($self->{realloc}) {
3891 my %queue; 4123 my %queue;
3892 my @queue; 4124 my @queue;
3893 my $widget; 4125 my $widget;
3894 4126
3895 outer: 4127 outer:
… …
3942 } 4174 }
3943 } 4175 }
3944 4176
3945 delete $self->{realloc}{$widget+0}; 4177 delete $self->{realloc}{$widget+0};
3946 } 4178 }
3947 }
3948 4179
3949 while (my $size_alloc = delete $self->{size_alloc}) { 4180 while (my $size_alloc = delete $self->{size_alloc}) {
3950 my @queue = sort { $b->{visible} <=> $a->{visible} } 4181 my @queue = sort { $a->{visible} <=> $b->{visible} }
3951 values %$size_alloc; 4182 values %$size_alloc;
3952 4183
3953 while () { 4184 while () {
3954 my $widget = pop @queue || last; 4185 my $widget = pop @queue || last;
3955 4186
3956 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4187 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3957 4188
3958 $w = 0 if $w < 0;
3959 $h = 0 if $h < 0;
3960
3961 $w = max $widget->{min_w}, $w; 4189 $w = max $widget->{min_w}, $w;
3962 $h = max $widget->{min_h}, $h; 4190 $h = max $widget->{min_h}, $h;
3963 4191
3964# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4192# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3965# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4193# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3966 4194
3967 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4195 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3968 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4196 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3969 4197
3970 $w = int $w + 0.5; 4198 $w = int $w + 0.5;
3971 $h = int $h + 0.5; 4199 $h = int $h + 0.5;
3972 4200
3973 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4201 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3974 $widget->{old_w} = $widget->{w}; 4202 $widget->{old_w} = $widget->{w};
3975 $widget->{old_h} = $widget->{h}; 4203 $widget->{old_h} = $widget->{h};
3976 4204
3977 $widget->{w} = $w; 4205 $widget->{w} = $w;
3978 $widget->{h} = $h; 4206 $widget->{h} = $h;
3979 4207
3980 $widget->emit (size_allocate => $w, $h); 4208 $widget->emit (size_allocate => $w, $h);
4209 }
3981 } 4210 }
3982 } 4211 }
3983 } 4212 }
3984 4213
3985 while ($self->{post_alloc_hook}) { 4214 while ($self->{post_alloc_hook}) {
3986 $_->() 4215 $_->()
3987 for values %{delete $self->{post_alloc_hook}}; 4216 for values %{delete $self->{post_alloc_hook}};
3988 } 4217 }
3989
3990 4218
3991 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4219 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3992 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4220 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3993 glClear GL_COLOR_BUFFER_BIT; 4221 glClear GL_COLOR_BUFFER_BIT;
3994 4222

Diff Legend

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