ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.363 by root, Sun Dec 10 00:06:49 2006 UTC vs.
Revision 1.430 by root, Tue Aug 21 02:39:17 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 { __w_ => $_[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
612 local $@;
655 eval { $self->destroy }; 613 eval { $self->destroy };
656 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 614 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
657 615
658 delete $WIDGET{$self+0}; 616 delete $WIDGET{$self+0};
659} 617}
… …
667use strict; 625use strict;
668use CFPlus::OpenGL; 626use CFPlus::OpenGL;
669 627
670sub new { 628sub new {
671 my $class = shift; 629 my $class = shift;
672
673 # range [value, low, high, page]
674 630
675 $class->SUPER::new ( 631 $class->SUPER::new (
676 #bg => [0, 0, 0, 0.2], 632 #bg => [0, 0, 0, 0.2],
677 #active_bg => [1, 1, 1, 0.5], 633 #active_bg => [1, 1, 1, 0.5],
678 @_ 634 @_
… …
690 my ($w, $h) = @$self{qw(w h)}; 646 my ($w, $h) = @$self{qw(w h)};
691 647
692 glEnable GL_BLEND; 648 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 649 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glColor_premultiply @$color; 650 glColor_premultiply @$color;
695
696 glBegin GL_QUADS;
697 glVertex 0 , 0;
698 glVertex 0 , $h;
699 glVertex $w, $h; 651 glRect 0, 0, $w, $h;
700 glVertex $w, 0;
701 glEnd;
702
703 glDisable GL_BLEND; 652 glDisable GL_BLEND;
704 } 653 }
705} 654}
706 655
707############################################################################# 656#############################################################################
… …
739 can_events => 0, 688 can_events => 0,
740 %arg, 689 %arg,
741 ); 690 );
742 691
743 $self->add (@$children) 692 $self->add (@$children)
744 if $children; 693 if $children && @$children;
745 694
746 $self 695 $self
747} 696}
748 697
749sub realloc { 698sub realloc {
… …
758 my ($self, @widgets) = @_; 707 my ($self, @widgets) = @_;
759 708
760 $_->set_parent ($self) 709 $_->set_parent ($self)
761 for @widgets; 710 for @widgets;
762 711
712 # TODO: only do this in widgets that need it, e.g. root, fixed
763 use sort 'stable'; 713 use sort 'stable';
764 714
765 $self->{children} = [ 715 $self->{children} = [
766 sort { $a->{z} <=> $b->{z} } 716 sort { $a->{z} <=> $b->{z} }
767 @{$self->{children}}, @widgets 717 @{$self->{children}}, @widgets
768 ]; 718 ];
769 719
770 $self->realloc; 720 $self->realloc;
721
722 $self->emit (c_add => \@widgets);
723
724 map $_+0, @widgets
771} 725}
772 726
773sub children { 727sub children {
774 @{ $_[0]{children} } 728 @{ $_[0]{children} }
775} 729}
776 730
777sub remove { 731sub remove {
778 my ($self, $child) = @_; 732 my ($self, @widgets) = @_;
779 733
734 $self->emit (c_remove => \@widgets);
735
736 for my $child (@widgets) {
780 delete $child->{parent}; 737 delete $child->{parent};
781 $child->hide; 738 $child->hide;
782
783 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 739 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
740 }
784 741
785 $self->realloc; 742 $self->realloc;
786} 743}
787 744
788sub clear { 745sub clear {
789 my ($self) = @_; 746 my ($self) = @_;
790 747
791 my $children = delete $self->{children}; 748 my $children = $self->{children};
792 $self->{children} = []; 749 $self->{children} = [];
793 750
794 for (@$children) { 751 for (@$children) {
795 delete $_->{parent}; 752 delete $_->{parent};
796 $_->hide; 753 $_->hide;
… …
816} 773}
817 774
818sub _draw { 775sub _draw {
819 my ($self) = @_; 776 my ($self) = @_;
820 777
821 $_->draw for @{$self->{children}}; 778 $_->draw for $self->visible_children;
822} 779}
823 780
824############################################################################# 781#############################################################################
825 782
826package CFPlus::UI::Bin; 783package CFPlus::UI::Bin;
… …
836} 793}
837 794
838sub add { 795sub add {
839 my ($self, $child) = @_; 796 my ($self, $child) = @_;
840 797
841 $self->SUPER::remove ($_) for @{ $self->{children} }; 798 $self->clear;
842 $self->SUPER::add ($child); 799 $self->SUPER::add ($child);
843} 800}
844 801
845sub remove { 802sub remove {
846 my ($self, $widget) = @_; 803 my ($self, $widget) = @_;
… …
936} 893}
937 894
938############################################################################# 895#############################################################################
939 896
940package CFPlus::UI::ViewPort; 897package CFPlus::UI::ViewPort;
898
899use List::Util qw(min max);
941 900
942our @ISA = CFPlus::UI::Window::; 901our @ISA = CFPlus::UI::Window::;
943 902
944sub new { 903sub new {
945 my $class = shift; 904 my $class = shift;
… …
954sub size_request { 913sub size_request {
955 my ($self) = @_; 914 my ($self) = @_;
956 915
957 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 916 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
958 917
959 $w = 10 if $self->{scroll_x}; 918 $w = 1 if $self->{scroll_x};
960 $h = 10 if $self->{scroll_y}; 919 $h = 1 if $self->{scroll_y};
961 920
962 ($w, $h) 921 ($w, $h)
963} 922}
964 923
965sub invoke_size_allocate { 924sub invoke_size_allocate {
… …
977} 936}
978 937
979sub set_offset { 938sub set_offset {
980 my ($self, $x, $y) = @_; 939 my ($self, $x, $y) = @_;
981 940
941 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
942 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
943
944 if ($x != $self->{view_x} or $y != $self->{view_y}) {
982 $self->{view_x} = int $x; 945 $self->{view_x} = $x;
983 $self->{view_y} = int $y; 946 $self->{view_y} = $y;
984 947
948 $self->emit (changed => $x, $y);
985 $self->update; 949 $self->update;
950 }
951}
952
953sub set_center {
954 my ($self, $x, $y) = @_;
955
956 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
957}
958
959sub make_visible {
960 my ($self, $x, $y, $border) = @_;
961
962 if ( $x < $self->{view_x} + $self->{w} * $border
963 || $x > $self->{view_x} + $self->{w} * (1 - $border)
964 || $y < $self->{view_y} + $self->{h} * $border
965 || $y > $self->{view_y} + $self->{h} * (1 - $border)
966 ) {
967 $self->set_center ($x, $y);
968 }
986} 969}
987 970
988# hmm, this does not work for topleft of $self... but we should not ask for that 971# hmm, this does not work for topleft of $self... but we should not ask for that
989sub coord2local { 972sub coord2local {
990 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
… …
1005 my ($self, $x, $y) = @_; 988 my ($self, $x, $y) = @_;
1006 989
1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 990 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 991 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1009 ) { 992 ) {
1010 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 993 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1011 } else { 994 } else {
1012 $self->CFPlus::UI::Base::find_widget ($x, $y) 995 $self->CFPlus::UI::Base::find_widget ($x, $y)
1013 } 996 }
1014} 997}
1015 998
… …
1026 1009
1027############################################################################# 1010#############################################################################
1028 1011
1029package CFPlus::UI::ScrolledWindow; 1012package CFPlus::UI::ScrolledWindow;
1030 1013
1031our @ISA = CFPlus::UI::HBox::; 1014our @ISA = CFPlus::UI::Table::;
1032 1015
1033sub new { 1016sub new {
1034 my ($class, %arg) = @_; 1017 my ($class, %arg) = @_;
1035 1018
1036 my $child = delete $arg{child}; 1019 my $child = delete $arg{child};
1037 1020
1038 my $self; 1021 my $self;
1039 1022
1040 my $slider = new CFPlus::UI::Slider 1023 my $hslider = new CFPlus::UI::Slider
1024 c_col => 0,
1025 c_row => 1,
1026 vertical => 0,
1027 range => [0, 0, 1, 0.01], # HACK fix
1028 on_changed => sub {
1029 $self->{hpos} = $_[1];
1030 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1031 },
1032 ;
1033
1034 my $vslider = new CFPlus::UI::Slider
1035 c_col => 1,
1036 c_row => 0,
1041 vertical => 1, 1037 vertical => 1,
1042 range => [0, 0, 1, 0.01], # HACK fix 1038 range => [0, 0, 1, 0.01], # HACK fix
1043 on_changed => sub { 1039 on_changed => sub {
1044 $self->{vp}->set_offset (0, $_[1]); 1040 $self->{vpos} = $_[1];
1041 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1045 }, 1042 },
1046 ; 1043 ;
1047 1044
1048 $self = $class->SUPER::new ( 1045 $self = $class->SUPER::new (
1049 vp => (new CFPlus::UI::ViewPort expand => 1), 1046 scroll_x => 0,
1047 scroll_y => 1,
1050 can_events => 1, 1048 can_events => 1,
1051 slider => $slider, 1049 hslider => $hslider,
1050 vslider => $vslider,
1051 col_expand => [1, 0],
1052 row_expand => [1, 0],
1052 %arg, 1053 %arg,
1053 ); 1054 );
1054 1055
1056 $self->{vp} = new CFPlus::UI::ViewPort
1057 c_col => 0,
1058 c_row => 0,
1059 expand => 1,
1060 scroll_x => $self->{scroll_x},
1061 scroll_y => $self->{scroll_y},
1062 on_changed => sub {
1063 my ($vp, $x, $y) = @_;
1064
1065 $vp->{parent}{hslider}->set_value ($x);
1066 $vp->{parent}{vslider}->set_value ($y);
1067
1068 0
1069 },
1070 on_size_allocate => sub {
1071 my ($vp, $w, $h) = @_;
1072 $vp->{parent}->update_slider;
1073 0
1074 },
1075 ;
1076
1055 $self->SUPER::add ($self->{vp}, $self->{slider}); 1077 $self->SUPER::add ($self->{vp});
1078
1056 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
1057 1080
1058 $self 1081 $self
1059} 1082}
1060
1061#TODO# update range on size_allocate depending on child
1062 1083
1063sub add { 1084sub add {
1064 my ($self, $widget) = @_; 1085 my ($self, $widget) = @_;
1065 1086
1066 $self->{vp}->add ($self->{child} = $widget); 1087 $self->{vp}->add ($self->{child} = $widget);
1067} 1088}
1068 1089
1090sub set_offset { shift->{vp}->set_offset (@_) }
1091sub set_center { shift->{vp}->set_center (@_) }
1092sub make_visible { shift->{vp}->make_visible (@_) }
1093
1094sub update_slider {
1095 my ($self) = @_;
1096
1097 my $child = ($self->{vp} or return)->child;
1098
1099 if ($self->{scroll_x}) {
1100 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1101 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1102
1103 my $visible = $w1 > $w2;
1104 if ($visible != $self->{hslider_visible}) {
1105 $self->{hslider_visible} = $visible;
1106 $visible ? $self->SUPER::add ($self->{hslider})
1107 : $self->SUPER::remove ($self->{hslider});
1108 }
1109 }
1110
1111 if ($self->{scroll_y}) {
1112 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1113 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1114
1115 my $visible = $h1 > $h2;
1116 if ($visible != $self->{vslider_visible}) {
1117 $self->{vslider_visible} = $visible;
1118 $visible ? $self->SUPER::add ($self->{vslider})
1119 : $self->SUPER::remove ($self->{vslider});
1120 }
1121 }
1122}
1123
1124sub start_dragging {
1125 my ($self, $ev) = @_;
1126
1127 $self->grab_focus;
1128
1129 my $ox = $self->{vp}{view_x};
1130 my $oy = $self->{vp}{view_y};
1131
1132 $self->{motion} = sub {
1133 my ($ev, $x, $y) = @_;
1134
1135 $ox -= $ev->{xrel};
1136 $oy -= $ev->{yrel};
1137
1138 $self->{vp}->set_offset ($ox, $oy);
1139 };
1140}
1141
1069sub invoke_mouse_wheel { 1142sub invoke_mouse_wheel {
1070 my ($self, $ev) = @_; 1143 my ($self, $ev) = @_;
1071 1144
1072 return 0 unless $ev->{dy}; # only vertical movements
1073
1074 $self->{slider}->emit (mouse_wheel => $ev); 1145 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1146 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1075 1147
1076 1 1148 1
1077} 1149}
1078 1150
1079sub update_slider { 1151sub invoke_button_down {
1080 my ($self) = @_; 1152 my ($self, $ev, $x, $y) = @_;
1081 1153
1082 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1154 if ($ev->{button} == 2) {
1083} 1155 $self->start_dragging ($ev);
1156 return 1;
1157 }
1084 1158
1085sub update { 1159 0
1086 my ($self) = @_; 1160}
1087 1161
1088 $self->SUPER::update; 1162sub invoke_button_up {
1163 my ($self, $ev, $x, $y) = @_;
1089 1164
1090 $self->update_slider; 1165 if (delete $self->{motion}) {
1166 return 1;
1167 }
1168
1169 0
1170}
1171
1172sub invoke_mouse_motion {
1173 my ($self, $ev, $x, $y) = @_;
1174
1175 if ($self->{motion}) {
1176 $self->{motion}->($ev, $x, $y);
1177 return 1;
1178 }
1179
1180 0
1091} 1181}
1092 1182
1093sub invoke_size_allocate { 1183sub invoke_size_allocate {
1094 my ($self, $w, $h) = @_; 1184 my ($self, $w, $h) = @_;
1095 1185
1096 $self->update_slider; 1186 $self->update_slider;
1097
1098 $self->SUPER::invoke_size_allocate ($w, $h) 1187 $self->SUPER::invoke_size_allocate ($w, $h)
1099} 1188}
1100 1189
1101############################################################################# 1190#############################################################################
1102 1191
… …
1122 my ($w, $h) = @$self{qw(w h)}; 1211 my ($w, $h) = @$self{qw(w h)};
1123 1212
1124 glEnable GL_BLEND; 1213 glEnable GL_BLEND;
1125 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1214 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1126 glColor_premultiply @{ $self->{bg} }; 1215 glColor_premultiply @{ $self->{bg} };
1127
1128 glBegin GL_QUADS;
1129 glVertex 0 , 0;
1130 glVertex 0 , $h;
1131 glVertex $w, $h; 1216 glRect 0, 0, $w, $h;
1132 glVertex $w, 0;
1133 glEnd;
1134
1135 glDisable GL_BLEND; 1217 glDisable GL_BLEND;
1136 } 1218 }
1137 1219
1138 $self->SUPER::_draw; 1220 $self->SUPER::_draw;
1139} 1221}
… …
1252 1334
1253my @border = 1335my @border =
1254 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1336 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); 1337 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1256 1338
1339my @icon =
1340 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1341 qw(x1_move.png x1_resize.png);
1342
1257sub new { 1343sub new {
1258 my ($class, %arg) = @_; 1344 my ($class, %arg) = @_;
1259 1345
1260 my $self = $class->SUPER::new ( 1346 my $self = $class->SUPER::new (
1261 bg => [1, 1, 1, 1], 1347 bg => [1, 1, 1, 1],
… …
1429 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1430 1516
1431 my $border = $self->border; 1517 my $border = $self->border;
1432 1518
1433 glColor @{ $self->{border_bg} }; 1519 glColor @{ $self->{border_bg} };
1434 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1520 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1435 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1521 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1436 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1522 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1437 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1523 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1524
1525 # move
1526 my $w2 = ($w - $border) * .5;
1527 my $h2 = ($h - $border) * .5;
1528 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1529 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1530 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1531
1532 # resize
1533 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1534 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1535 unless $self->{has_close_button};
1536 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1537 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1438 1538
1439 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1539 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1440 glColor @{ $self->{bg} }; 1540 glColor @{ $self->{bg} };
1441 1541
1442 # TODO: repeat texture not scale 1542 # TODO: repeat texture not scale
… …
1463 1563
1464############################################################################# 1564#############################################################################
1465 1565
1466package CFPlus::UI::Table; 1566package CFPlus::UI::Table;
1467 1567
1468our @ISA = CFPlus::UI::Base::; 1568our @ISA = CFPlus::UI::Container::;
1469 1569
1470use List::Util qw(max sum); 1570use List::Util qw(max sum);
1471 1571
1472use CFPlus::OpenGL; 1572use CFPlus::OpenGL;
1473 1573
1474sub new { 1574sub new {
1475 my $class = shift; 1575 my $class = shift;
1476 1576
1477 $class->SUPER::new ( 1577 $class->SUPER::new (
1478 col_expand => [], 1578 col_expand => [],
1579 row_expand => [],
1479 @_, 1580 @_,
1480 ) 1581 )
1481} 1582}
1482 1583
1483sub children {
1484 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1485}
1486
1487sub add { 1584sub add {
1585 my ($self, @widgets) = @_;
1586
1587 for my $child (@widgets) {
1588 $child->{c_rowspan} ||= 1;
1589 $child->{c_colspan} ||= 1;
1590 }
1591
1592 $self->SUPER::add (@widgets);
1593}
1594
1595sub add_at {
1488 my ($self) = shift; 1596 my $self = shift;
1597
1598 my @widgets;
1489 1599
1490 while (@_) { 1600 while (@_) {
1491 my ($x, $y, $child) = splice @_, 0, 3, (); 1601 my ($col, $row, $child) = splice @_, 0, 3, ();
1492 $child->set_parent ($self);
1493 $self->{children}[$y][$x] = $child;
1494 }
1495 1602
1496 $self->{force_realloc} = 1; 1603 $child->{c_row} = $row;
1497 $self->{force_size_alloc} = 1; 1604 $child->{c_col} = $col;
1498 $self->realloc;
1499}
1500 1605
1501sub remove { 1606 push @widgets, $child;
1607 }
1608
1609 $self->add (@widgets);
1610}
1611
1612sub get_wh {
1502 my ($self, $child) = @_; 1613 my ($self) = @_;
1503 1614
1504 # TODO: not yet implemented 1615 my (@w, @h);
1505}
1506
1507# TODO: move to container class maybe? send children a signal on removal?
1508sub clear {
1509 my ($self) = @_;
1510 1616
1511 my @children = $self->children; 1617 my @children = $self->children;
1512 delete $self->{children}; 1618
1619 # first pass, columns
1620 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1621 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1622
1623 my $sw = sum @w[$c .. $c + $cs - 1];
1624
1625 if ($w > $sw) {
1626 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1627 }
1513 1628 }
1514 for (@children) {
1515 delete $_->{parent};
1516 $_->hide;
1517 }
1518 1629
1519 $self->realloc; 1630 # second pass, rows
1520} 1631 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_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)}; 1632 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1535 1633
1536 $w[$x] = max $w[$x], $w; 1634 my $sh = sum @h[$r .. $r + $rs - 1];
1537 $h[$y] = max $h[$y], $h; 1635
1636 if ($h > $sh) {
1637 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1538 } 1638 }
1539 } 1639 }
1540 1640
1541 (\@w, \@h) 1641 (\@w, \@h)
1542} 1642}
… …
1558 my ($ws, $hs) = $self->get_wh; 1658 my ($ws, $hs) = $self->get_wh;
1559 1659
1560 my $req_w = (sum @$ws) || 1; 1660 my $req_w = (sum @$ws) || 1;
1561 my $req_h = (sum @$hs) || 1; 1661 my $req_h = (sum @$hs) || 1;
1562 1662
1563 # TODO: nicer code && do row_expand 1663 # now linearly scale the rows/columns to the allocated size
1564 my @col_expand = @{$self->{col_expand}}; 1664 my @col_expand = @{$self->{col_expand}};
1565 @col_expand = (1) x @$ws unless @col_expand; 1665 @col_expand = (1) x @$ws unless @col_expand;
1566 my $col_expand = (sum @col_expand) || 1; 1666 my $col_expand = (sum @col_expand) || 1;
1567 1667
1568 # linearly scale sizes
1569 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1668 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1570 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1571 1669
1572 CFPlus::UI::harmonize $ws; 1670 CFPlus::UI::harmonize $ws;
1671
1672 my @row_expand = @{$self->{row_expand}};
1673 @row_expand = (1) x @$ws unless @row_expand;
1674 my $row_expand = (sum @row_expand) || 1;
1675
1676 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1677
1573 CFPlus::UI::harmonize $hs; 1678 CFPlus::UI::harmonize $hs;
1574 1679
1575 my $y; 1680 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1681 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1576 1682
1577 for my $r (0 .. $#{$self->{children}}) { 1683 for my $widget ($self->children) {
1578 my $row = $self->{children}[$r] 1684 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1579 or next;
1580 1685
1581 my $x = 0; 1686 $widget->configure (
1582 my $row_h = $hs->[$r]; 1687 $x[$c], $y[$r],
1688 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1583 1689 );
1584 for my $c (0 .. $#$row) { 1690 }
1585 my $col_w = $ws->[$c];
1586 1691
1587 if (my $widget = $row->[$c]) { 1692 1
1588 $widget->configure ($x, $y, $col_w, $row_h); 1693}
1589 }
1590 1694
1591 $x += $col_w; 1695#############################################################################
1696
1697package CFPlus::UI::Fixed;
1698
1699use List::Util qw(min max);
1700
1701our @ISA = CFPlus::UI::Container::;
1702
1703sub _scale($$$) {
1704 my ($rel, $val, $max) = @_;
1705
1706 $rel ? $val * $max : $val
1707}
1708
1709sub size_request {
1710 my ($self) = @_;
1711
1712 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1713
1714 # determine overall size by querying abs widgets
1715 for my $child ($self->visible_children) {
1716 unless ($child->{c_rel}) {
1717 my $x = $child->{c_x};
1718 my $y = $child->{c_y};
1719
1720 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1721 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1592 } 1722 }
1723 }
1593 1724
1594 $y += $row_h; 1725 my $W = $x2 - $x1;
1726 my $H = $y2 - $y1;
1727
1728 # now layout remaining widgets
1729 for my $child ($self->visible_children) {
1730 if ($child->{c_rel}) {
1731 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1732 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1736 }
1737 }
1738
1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 ($W, $H)
1743}
1744
1745sub invoke_size_allocate {
1746 my ($self, $W, $H) = @_;
1747
1748 for my $child ($self->visible_children) {
1749 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1750 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1751
1752 $x += $child->{c_halign} * $child->{req_w};
1753 $y += $child->{c_valign} * $child->{req_h};
1754
1755 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1595 } 1756 }
1596 1757
1597 1 1758 1
1598} 1759}
1599 1760
1600sub find_widget {
1601 my ($self, $x, $y) = @_;
1602
1603 $x -= $self->{x};
1604 $y -= $self->{y};
1605
1606 my $res;
1607
1608 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1609 $res = $_->find_widget ($x, $y)
1610 and return $res;
1611 }
1612
1613 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1614}
1615
1616sub _draw {
1617 my ($self) = @_;
1618
1619 for (grep $_, @{$self->{children}}) {
1620 $_->draw for grep $_, @$_;
1621 }
1622}
1623
1624############################################################################# 1761#############################################################################
1625 1762
1626package CFPlus::UI::Box; 1763package CFPlus::UI::Box;
1627 1764
1628our @ISA = CFPlus::UI::Container::; 1765our @ISA = CFPlus::UI::Container::;
1629 1766
1630sub size_request { 1767sub size_request {
1631 my ($self) = @_; 1768 my ($self) = @_;
1769
1770 my @children = $self->visible_children;
1632 1771
1633 $self->{vertical} 1772 $self->{vertical}
1634 ? ( 1773 ? (
1635 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::max map $_->{req_w}, @children),
1636 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::sum map $_->{req_h}, @children),
1637 ) 1776 )
1638 : ( 1777 : (
1639 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1778 (List::Util::sum map $_->{req_w}, @children),
1640 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1779 (List::Util::max map $_->{req_h}, @children),
1641 ) 1780 )
1642} 1781}
1643 1782
1644sub invoke_size_allocate { 1783sub invoke_size_allocate {
1645 my ($self, $w, $h) = @_; 1784 my ($self, $w, $h) = @_;
… …
1769 1908
1770 delete $self->{ox}; 1909 delete $self->{ox};
1771 $self->SUPER::realloc; 1910 $self->SUPER::realloc;
1772} 1911}
1773 1912
1913sub clear {
1914 my ($self) = @_;
1915
1916 $self->set_text ("");
1917}
1918
1774sub set_text { 1919sub set_text {
1775 my ($self, $text) = @_; 1920 my ($self, $text) = @_;
1776 1921
1777 return if $self->{text} eq "T$text"; 1922 return if $self->{text} eq "T$text";
1778 $self->{text} = "T$text"; 1923 $self->{text} = "T$text";
… …
1884 : ($self->{w} - $size->[0]) * 0.5); 2029 : ($self->{w} - $size->[0]) * 0.5);
1885 2030
1886 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2031 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1887 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2032 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1888 : ($self->{h} - $size->[1]) * 0.5); 2033 : ($self->{h} - $size->[1]) * 0.5);
2034
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1889 }; 2036 };
1890 2037
1891 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2038# unless ($self->{list}) {
1892 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2039# $self->{list} = CFPlus::OpenGL::glGenList;
1893 2040# CFPlus::OpenGL::glNewList $self->{list};
1894 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2041# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2042# CFPlus::OpenGL::glEndList;
2043# }
2044#
2045# CFPlus::OpenGL::glCallList $self->{list};
2046
2047 $self->{layout}->draw;
1895} 2048}
2049
2050#sub destroy {
2051# my ($self) = @_;
2052#
2053# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2054#
2055# $self->SUPER::destroy;
2056#}
1896 2057
1897############################################################################# 2058#############################################################################
1898 2059
1899package CFPlus::UI::EntryBase; 2060package CFPlus::UI::EntryBase;
1900 2061
… …
1906 my $class = shift; 2067 my $class = shift;
1907 2068
1908 $class->SUPER::new ( 2069 $class->SUPER::new (
1909 fg => [1, 1, 1], 2070 fg => [1, 1, 1],
1910 bg => [0, 0, 0, 0.2], 2071 bg => [0, 0, 0, 0.2],
2072 outline => [0.6, 0.3, 0.1],
1911 active_bg => [1, 1, 1, 0.5], 2073 active_bg => [0, 0, 1, .2],
1912 active_fg => [0, 0, 0], 2074 active_fg => [1, 1, 1],
2075 active_outline => [1, 1, 0],
1913 can_hover => 1, 2076 can_hover => 1,
1914 can_focus => 1, 2077 can_focus => 1,
1915 valign => 0, 2078 valign => 0,
1916 can_events => 1, 2079 can_events => 1,
1917 ellipsise => 0, 2080 ellipsise => 0,
… …
1966 my $mod = $ev->{mod}; 2129 my $mod = $ev->{mod};
1967 my $sym = $ev->{sym}; 2130 my $sym = $ev->{sym};
1968 my $uni = $ev->{unicode}; 2131 my $uni = $ev->{unicode};
1969 2132
1970 my $text = $self->get_text; 2133 my $text = $self->get_text;
2134
2135 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1971 2136
1972 if ($uni == 8) { 2137 if ($uni == 8) {
1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2138 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974 } elsif ($uni == 127) { 2139 } elsif ($uni == 127) {
1975 substr $text, $self->{cursor}, 1, ""; 2140 substr $text, $self->{cursor}, 1, "";
… …
2055 glColor_premultiply @{$self->{bg}}; 2220 glColor_premultiply @{$self->{bg}};
2056 } 2221 }
2057 2222
2058 glEnable GL_BLEND; 2223 glEnable GL_BLEND;
2059 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2224 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060 glBegin GL_QUADS;
2061 glVertex 0 , 0;
2062 glVertex 0 , $self->{h};
2063 glVertex $self->{w}, $self->{h}; 2225 glRect 0, 0, $self->{w}, $self->{h};
2064 glVertex $self->{w}, 0;
2065 glEnd;
2066 glDisable GL_BLEND; 2226 glDisable GL_BLEND;
2067 2227
2068 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
2069 2229
2070 #TODO: force update every cursor change :( 2230 #TODO: force update every cursor change :(
… …
2072 2232
2073 unless (exists $self->{cur_h}) { 2233 unless (exists $self->{cur_h}) {
2074 my $text = substr $self->{text}, 0, $self->{cursor}; 2234 my $text = substr $self->{text}, 0, $self->{cursor};
2075 utf8::encode $text; 2235 utf8::encode $text;
2076 2236
2077 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2237 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2078 } 2238 }
2079 2239
2240 glColor_premultiply @{$self->{active_fg}};
2080 glBegin GL_LINES; 2241 glBegin GL_LINES;
2081 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2242 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2082 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2243 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2244 glEnd;
2245
2246 glLineWidth 3;
2247 glColor @{$self->{active_outline}};
2248 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
2249 glLineWidth 1;
2250
2251 } else {
2252 glColor @{$self->{outline}};
2253 glTranslate .375, .375;
2254 glBegin GL_LINE_STRIP;
2255 glVertex 0, $self->{h} * .5;
2256 glVertex 0, $self->{h} - 3;
2257 glVertex $self->{w} - 1, $self->{h} - 3;
2258 glVertex $self->{w} - 1, $self->{h} * .5;
2083 glEnd; 2259 glEnd;
2084 } 2260 }
2085} 2261}
2086 2262
2087############################################################################# 2263#############################################################################
… …
2174 1 2350 1
2175} 2351}
2176 2352
2177############################################################################# 2353#############################################################################
2178 2354
2179package CFPlus::UI::Button; 2355package CFPlus::UI::ButtonBin;
2180 2356
2181our @ISA = CFPlus::UI::Label::; 2357our @ISA = CFPlus::UI::Bin::;
2182 2358
2183use CFPlus::OpenGL; 2359use CFPlus::OpenGL;
2184 2360
2185my @tex = 2361my @tex =
2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2362 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187 qw(b1_button_active.png); 2363 qw(b1_button_inactive.png b1_button_active.png);
2188 2364
2189sub new { 2365sub new {
2190 my $class = shift; 2366 my $class = shift;
2191 2367
2192 $class->SUPER::new ( 2368 $class->SUPER::new (
2193 padding_x => 4,
2194 padding_y => 4,
2195 fg => [1, 1, 1],
2196 active_fg => [0, 0, 1],
2197 can_hover => 1, 2369 can_hover => 1,
2198 align => 0, 2370 align => 0,
2199 valign => 0, 2371 valign => 0,
2200 can_events => 1, 2372 can_events => 1,
2201 @_ 2373 @_
… …
2213} 2385}
2214 2386
2215sub _draw { 2387sub _draw {
2216 my ($self) = @_; 2388 my ($self) = @_;
2217 2389
2218 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2219
2220 glEnable GL_TEXTURE_2D; 2390 glEnable GL_TEXTURE_2D;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222 glColor 0, 0, 0, 1; 2392 glColor 0, 0, 0, 1;
2223 2393
2394 my $tex = $tex[$GRAB == $self];
2224 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2395 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2396
2397 glDisable GL_TEXTURE_2D;
2398
2399 $self->SUPER::_draw;
2400}
2401
2402#############################################################################
2403
2404package CFPlus::UI::Button;
2405
2406our @ISA = CFPlus::UI::Label::;
2407
2408use CFPlus::OpenGL;
2409
2410my @tex =
2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2412 qw(b1_button_inactive.png b1_button_active.png);
2413
2414sub new {
2415 my $class = shift;
2416
2417 $class->SUPER::new (
2418 padding_x => 4,
2419 padding_y => 4,
2420 fg => [1.0, 1.0, 1.0],
2421 active_fg => [0.8, 0.8, 0.8],
2422 can_hover => 1,
2423 align => 0,
2424 valign => 0,
2425 can_events => 1,
2426 @_
2427 )
2428}
2429
2430sub invoke_button_up {
2431 my ($self, $ev, $x, $y) = @_;
2432
2433 $self->emit ("activate")
2434 if $x >= 0 && $x < $self->{w}
2435 && $y >= 0 && $y < $self->{h};
2436
2437 1
2438}
2439
2440sub _draw {
2441 my ($self) = @_;
2442
2443 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2444
2445 glEnable GL_TEXTURE_2D;
2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2447 glColor 0, 0, 0, 1;
2448
2449 my $tex = $tex[$GRAB == $self];
2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2225 2451
2226 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
2227 2453
2228 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
2229} 2455}
… …
2316sub new { 2542sub new {
2317 my $class = shift; 2543 my $class = shift;
2318 2544
2319 my $self = $class->SUPER::new ( 2545 my $self = $class->SUPER::new (
2320 can_events => 0, 2546 can_events => 0,
2547 scale => 1,
2321 @_, 2548 @_,
2322 ); 2549 );
2323 2550
2324 $self->{path} || $self->{tex} 2551 $self->{path} || $self->{tex}
2325 or Carp::croak "'path' or 'tex' attributes required"; 2552 or Carp::croak "'path' or 'tex' attributes required";
… …
2350} 2577}
2351 2578
2352sub size_request { 2579sub size_request {
2353 my ($self) = @_; 2580 my ($self) = @_;
2354 2581
2355 ($self->{tex}{w}, $self->{tex}{h}) 2582 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2356} 2583}
2357 2584
2358sub _draw { 2585sub _draw {
2359 my ($self) = @_; 2586 my ($self) = @_;
2360 2587
… …
2370 } 2597 }
2371 2598
2372 glEnable GL_TEXTURE_2D; 2599 glEnable GL_TEXTURE_2D;
2373 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2600 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2374 2601
2375 $tex->draw_quad (0, 0, $w, $h); 2602 $tex->draw_quad_alpha (0, 0, $w, $h);
2376 2603
2377 glDisable GL_TEXTURE_2D; 2604 glDisable GL_TEXTURE_2D;
2378} 2605}
2379 2606
2380############################################################################# 2607#############################################################################
… …
2399 align => 0, 2626 align => 0,
2400 valign => 0, 2627 valign => 0,
2401 can_events => 1, 2628 can_events => 1,
2402 @_ 2629 @_
2403 ); 2630 );
2631}
2632
2633sub invoke_button_down {
2634 my ($self, $ev, $x, $y) = @_;
2635
2636 1
2404} 2637}
2405 2638
2406sub invoke_button_up { 2639sub invoke_button_up {
2407 my ($self, $ev, $x, $y) = @_; 2640 my ($self, $ev, $x, $y) = @_;
2408 2641
… …
2548 glDisable GL_TEXTURE_2D; 2781 glDisable GL_TEXTURE_2D;
2549} 2782}
2550 2783
2551############################################################################# 2784#############################################################################
2552 2785
2786package CFPlus::UI::Progress;
2787
2788our @ISA = CFPlus::UI::Label::;
2789
2790use CFPlus::OpenGL;
2791
2792sub new {
2793 my ($class, %arg) = @_;
2794
2795 my $self = $class->SUPER::new (
2796 fg => [1, 1, 1],
2797 bg => [0, 0, 1, 0.2],
2798 bar => [0.7, 0.5, 0.1, 0.8],
2799 outline => [0.4, 0.3, 0],
2800 fontsize => 0.9,
2801 valign => 0,
2802 align => 0,
2803 can_events => 1,
2804 ellipsise => 1,
2805 %arg,
2806 text => "-",
2807 value => -1,
2808 );
2809
2810 $self->set_value ($arg{value}) if exists $arg{value};
2811
2812 $self
2813}
2814
2815sub set_value {
2816 my ($self, $value) = @_;
2817
2818 if ($self->{value} != $value) {
2819 $self->{value} = $value;
2820 $self->set_text (sprintf "%d%%", $value * 100);
2821 $self->update;
2822 }
2823}
2824
2825sub _draw {
2826 my ($self) = @_;
2827
2828 glEnable GL_BLEND;
2829 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2830
2831 if ($self->{value} >= 0) {
2832 my $s = 3 + ($self->{w} - 6) * $self->{value};
2833
2834 glColor_premultiply @{$self->{bar}};
2835 glRect 2, 2, $s, $self->{h} - 2;
2836 glColor_premultiply @{$self->{bg}};
2837 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2838 }
2839
2840 glColor_premultiply @{$self->{outline}};
2841 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2842
2843 glDisable GL_BLEND;
2844
2845 {
2846 local $self->{bg}; # do not draw background
2847 $self->SUPER::_draw;
2848 }
2849}
2850
2851#############################################################################
2852
2853package CFPlus::UI::ExperienceProgress;
2854
2855our @ISA = CFPlus::UI::Progress::;
2856
2857sub new {
2858 my ($class, %arg) = @_;
2859
2860 my $self = $class->SUPER::new (
2861 %arg
2862 );
2863
2864 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2865 if $::CONN;
2866
2867 $self
2868}
2869
2870sub DESTROY {
2871 my ($self) = @_;
2872
2873 delete $::CONN->{on_exp_update}{$self+0}
2874 if $::CONN;
2875
2876 $self->SUPER::DESTROY;
2877}
2878
2879sub set_value {
2880 my ($self, $lvl, $exp) = @_;
2881
2882 my $v = 0;
2883
2884 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2885 my $l0 = $table->[$lvl - 1];
2886 my $l1 = $table->[$lvl];
2887
2888 $v = ($exp - $l0) / ($l1 - $l0);
2889 }
2890
2891 $self->SUPER::set_value ($v);
2892}
2893
2894#############################################################################
2895
2553package CFPlus::UI::Gauge; 2896package CFPlus::UI::Gauge;
2554 2897
2555our @ISA = CFPlus::UI::VBox::; 2898our @ISA = CFPlus::UI::VBox::;
2556 2899
2557sub new { 2900sub new {
… …
2682 3025
2683 $self->SUPER::invoke_button_down ($ev, $x, $y); 3026 $self->SUPER::invoke_button_down ($ev, $x, $y);
2684 3027
2685 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3028 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2686 3029
2687 $self->invoke_mouse_motion ($ev, $x, $y) 3030 $self->invoke_mouse_motion ($ev, $x, $y);
3031
3032 1
2688} 3033}
2689 3034
2690sub invoke_mouse_motion { 3035sub invoke_mouse_motion {
2691 my ($self, $ev, $x, $y) = @_; 3036 my ($self, $ev, $x, $y) = @_;
2692 3037
… …
2708sub invoke_mouse_wheel { 3053sub invoke_mouse_wheel {
2709 my ($self, $ev) = @_; 3054 my ($self, $ev) = @_;
2710 3055
2711 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3056 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2712 3057
3058 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3059
2713 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3060 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2714 3061
2715 ! ! $delta 3062 1
2716} 3063}
2717 3064
2718sub update { 3065sub update {
2719 my ($self) = @_; 3066 my ($self) = @_;
2720 3067
… …
2828 #font => default_font 3175 #font => default_font
2829 @_, 3176 @_,
2830 3177
2831 layout => (new CFPlus::Layout), 3178 layout => (new CFPlus::Layout),
2832 par => [], 3179 par => [],
3180 max_par => 0,
2833 height => 0, 3181 height => 0,
2834 children => [ 3182 children => [
2835 (new CFPlus::UI::Empty expand => 1), 3183 (new CFPlus::UI::Empty expand => 1),
2836 (new CFPlus::UI::Slider vertical => 1), 3184 (new CFPlus::UI::Slider vertical => 1),
2837 ], 3185 ],
… …
2850} 3198}
2851 3199
2852sub size_request { 3200sub size_request {
2853 my ($self) = @_; 3201 my ($self) = @_;
2854 3202
2855 my ($empty, $slider) = @{ $self->{children} }; 3203 my ($empty, $slider) = $self->visible_children;
2856 3204
2857 local $self->{children} = [$empty, $slider]; 3205 local $self->{children} = [$empty, $slider];
2858 $self->SUPER::size_request 3206 $self->SUPER::size_request
2859} 3207}
2860 3208
… …
2962 3310
2963 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3311 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2964 push @{$self->{par}}, $para; 3312 push @{$self->{par}}, $para;
2965 } 3313 }
2966 3314
3315 if (my $max = $self->{max_par}) {
3316 shift @{$self->{par}} while @{$self->{par}} > $max;
3317 }
3318
2967 $self->{need_reflow}++; 3319 $self->{need_reflow}++;
2968 $self->update; 3320 $self->update;
2969} 3321}
2970 3322
2971sub scroll_to_bottom { 3323sub scroll_to_bottom {
… …
3045 3397
3046 if ($y0 < $y + $h && $y < $y1) { 3398 if ($y0 < $y + $h && $y < $y1) {
3047 my $layout = $self->get_layout ($para); 3399 my $layout = $self->get_layout ($para);
3048 3400
3049 $layout->render ($para->{indent}, $y - $y0); 3401 $layout->render ($para->{indent}, $y - $y0);
3402 $layout->draw;
3050 3403
3051 if (my @w = @{ $para->{widget} }) { 3404 if (my @w = @{ $para->{widget} }) {
3052 my @s = $layout->get_shapes; 3405 my @s = $layout->get_shapes;
3053 3406
3054 for (@w) { 3407 for (@w) {
… …
3245 glTranslate 0.375, 0.375; 3598 glTranslate 0.375, 0.375;
3246 3599
3247 my ($w, $h) = @$self{qw(w h)}; 3600 my ($w, $h) = @$self{qw(w h)};
3248 3601
3249 glColor 1, 0.8, 0.4; 3602 glColor 1, 0.8, 0.4;
3250 glBegin GL_QUADS; 3603 glRect 0, 0, $w, $h;
3251 glVertex 0 , 0;
3252 glVertex 0 , $h;
3253 glVertex $w, $h;
3254 glVertex $w, 0;
3255 glEnd;
3256 3604
3257 glColor 0, 0, 0; 3605 glColor 0, 0, 0;
3258 glBegin GL_LINE_LOOP; 3606 glRect_lineloop 0, 0, $w, $h;
3259 glVertex 0 , 0;
3260 glVertex 0 , $h;
3261 glVertex $w, $h;
3262 glVertex $w, 0;
3263 glEnd;
3264 3607
3265 glTranslate 2 - 0.375, 2 - 0.375; 3608 glTranslate 2 - 0.375, 2 - 0.375;
3266 3609
3267 $self->SUPER::_draw; 3610 $self->SUPER::_draw;
3268} 3611}
… …
3277 3620
3278sub new { 3621sub new {
3279 my $class = shift; 3622 my $class = shift;
3280 3623
3281 my $self = $class->SUPER::new ( 3624 my $self = $class->SUPER::new (
3625 size_w => 32,
3626 size_h => 8,
3282 aspect => 1, 3627 aspect => 1,
3283 can_events => 0, 3628 can_events => 0,
3284 @_, 3629 @_,
3285 ); 3630 );
3286 3631
3287 if ($self->{anim} && $self->{animspeed}) { 3632 if ($self->{anim} && $self->{animspeed}) {
3288 CFPlus::weaken (my $widget = $self); 3633 CFPlus::weaken (my $widget = $self);
3289 3634
3635 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3636 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3290 $self->{timer} = Event->timer ( 3637 $self->{timer} = Event->timer (
3291 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3292 hard => 1, 3638 parked => 1,
3293 interval => $self->{animspeed},
3294 cb => sub { 3639 cb => sub {
3640 return unless $::CONN;
3641
3642 my $w = $widget
3643 or return;
3644
3295 ++$widget->{frame}; 3645 ++$w->{frame};
3646 $w->update_face;
3647
3648 # somehow, $widget can go away
3296 $widget->update; 3649 $w->update;
3650 $w->update_timer;
3297 }, 3651 },
3298 ); 3652 );
3653
3654 $self->update_face;
3655 $self->update_timer;
3299 } 3656 }
3300 3657
3301 $self 3658 $self
3302} 3659}
3303 3660
3661sub update_timer {
3662 my ($self) = @_;
3663
3664 return unless $self->{timer};
3665
3666 if ($self->{visible}) {
3667 $self->{timer}->at (
3668 $self->{anim_start}
3669 + $self->{animspeed}
3670 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3671 );
3672 $self->{timer}->start;
3673 } else {
3674 $self->{timer}->stop;
3675 }
3676}
3677
3678sub update_face {
3679 my ($self) = @_;
3680
3681 if ($::CONN) {
3682 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3683 if ($anim && @$anim) {
3684 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3685 delete $self->{face_change_cb};
3686
3687 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3688 unless ($tex->{name} || $tex->{loading}) {
3689 $tex->upload (sub { $self->reconfigure });
3690 }
3691 }
3692 }
3693 }
3694 }
3695}
3696
3304sub size_request { 3697sub size_request {
3305 (32, 8) 3698 my ($self) = @_;
3699
3700 if ($::CONN) {
3701 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3702 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3703 if ($tex->{name}) {
3704 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3705 } elsif (!$tex->{loading}) {
3706 $tex->upload (sub { $self->reconfigure });
3707 }
3708 }
3709
3710 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3711 }
3712 }
3713
3714 ($self->{size_w} || 8, $self->{size_h} || 8)
3306} 3715}
3307 3716
3308sub update { 3717sub update {
3309 my ($self) = @_; 3718 my ($self) = @_;
3310 3719
3311 return unless $self->{visible}; 3720 return unless $self->{visible};
3312 3721
3313 $self->SUPER::update; 3722 $self->SUPER::update;
3314} 3723}
3315 3724
3725sub invoke_visibility_change {
3726 my ($self) = @_;
3727
3728 $self->update_timer;
3729
3730 0
3731}
3732
3316sub _draw { 3733sub _draw {
3317 my ($self) = @_; 3734 my ($self) = @_;
3318 3735
3319 return unless $::CONN;
3320
3321 $self->SUPER::_draw; 3736 $self->SUPER::_draw;
3322 3737
3323 my $face; 3738 if (my $tex = $self->{tex}) {
3324
3325 if ($self->{frame}) {
3326 my $anim = $::CONN->{anim}[$self->{anim}];
3327
3328 $face = $anim->[ $self->{frame} % @$anim ]
3329 if $anim && @$anim;
3330 }
3331
3332 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3333
3334 if ($tex) {
3335 glEnable GL_TEXTURE_2D; 3739 glEnable GL_TEXTURE_2D;
3336 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3740 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3337 glColor 0, 0, 0, 1; 3741 glColor 0, 0, 0, 1;
3338 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3742 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3339 glDisable GL_TEXTURE_2D; 3743 glDisable GL_TEXTURE_2D;
… …
3341} 3745}
3342 3746
3343sub destroy { 3747sub destroy {
3344 my ($self) = @_; 3748 my ($self) = @_;
3345 3749
3346 $self->{timer}->cancel 3750 (delete $self->{timer})->cancel
3347 if $self->{timer}; 3751 if $self->{timer};
3348 3752
3349 $self->SUPER::destroy; 3753 $self->SUPER::destroy;
3350} 3754}
3351 3755
… …
3391 children => [ 3795 children => [
3392 (new CFPlus::UI::Label markup => $left, expand => 1), 3796 (new CFPlus::UI::Label markup => $left, expand => 1),
3393 (new CFPlus::UI::Label markup => $right, align => +1), 3797 (new CFPlus::UI::Label markup => $right, align => +1),
3394 ], 3798 ],
3395 ; 3799 ;
3396 3800
3397 } else { 3801 } else {
3398 $widget = new CFPlus::UI::Label 3802 $widget = new CFPlus::UI::Label
3399 can_hover => 1, 3803 can_hover => 1,
3400 can_events => 1, 3804 can_events => 1,
3401 markup => $widget, 3805 markup => $widget,
… …
3537 buttonbar => (new CFPlus::UI::Buttonbar), 3941 buttonbar => (new CFPlus::UI::Buttonbar),
3538 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3942 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3539 # filter => # will be put between multiplexer and $self 3943 # filter => # will be put between multiplexer and $self
3540 @_, 3944 @_,
3541 ); 3945 );
3542 3946
3543 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3947 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3544 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3948 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3545 3949
3950 {
3951 Scalar::Util::weaken (my $wself = $self);
3952
3953 $self->{multiplexer}->connect (c_add => sub {
3954 my ($mplex, $widgets) = @_;
3955
3956 for my $child (@$widgets) {
3957 Scalar::Util::weaken $child;
3958 $child->{c_tab_} ||= do {
3959 my $tab =
3960 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3961 ? $child->{c_tab}
3962 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3963
3964 $tab->connect (activate => sub {
3965 $wself->set_current_page ($child);
3966 });
3967
3968 $tab
3969 };
3970
3971 $self->{buttonbar}->add ($child->{c_tab_});
3972 }
3973 });
3974
3975 $self->{multiplexer}->connect (c_remove => sub {
3976 my ($mplex, $widgets) = @_;
3977
3978 for my $child (@$widgets) {
3979 $wself->{buttonbar}->remove ($child->{c_tab_});
3980 }
3981 });
3982 }
3983
3546 $self 3984 $self
3547} 3985}
3548 3986
3549sub add { 3987sub add {
3988 my ($self, @widgets) = @_;
3989
3990 $self->{multiplexer}->add (@widgets)
3991}
3992
3993sub remove {
3994 my ($self, @widgets) = @_;
3995
3996 $self->{multiplexer}->remove (@widgets)
3997}
3998
3999sub pages {
4000 my ($self) = @_;
4001 $self->{multiplexer}->children
4002}
4003
4004sub add_tab {
3550 my ($self, $title, $widget, $tooltip) = @_; 4005 my ($self, $title, $widget, $tooltip) = @_;
3551 4006
3552 CFPlus::weaken $self; 4007 $title = [$title, $tooltip] unless ref $title;
4008 $widget->{c_tab} = $title;
3553 4009
3554 $self->{buttonbar}->add (new CFPlus::UI::Button
3555 markup => $title,
3556 tooltip => $tooltip,
3557 on_activate => sub { $self->set_current_page ($widget) },
3558 );
3559
3560 $self->{multiplexer}->add ($widget); 4010 $self->add ($widget);
3561} 4011}
3562 4012
3563sub get_current_page { 4013sub get_current_page {
3564 my ($self) = @_; 4014 my ($self) = @_;
3565 4015
… …
3848} 4298}
3849 4299
3850sub update { 4300sub update {
3851 my ($self) = @_; 4301 my ($self) = @_;
3852 4302
3853 $::WANT_REFRESH++; 4303 $::WANT_REFRESH->start;
3854} 4304}
3855 4305
3856sub add { 4306sub add {
3857 my ($self, @children) = @_; 4307 my ($self, @children) = @_;
3858 4308
… …
3895 while ($self->{refresh_hook}) { 4345 while ($self->{refresh_hook}) {
3896 $_->() 4346 $_->()
3897 for values %{delete $self->{refresh_hook}}; 4347 for values %{delete $self->{refresh_hook}};
3898 } 4348 }
3899 4349
3900 if ($self->{realloc}) { 4350 while ($self->{realloc}) {
3901 my %queue; 4351 my %queue;
3902 my @queue; 4352 my @queue;
3903 my $widget; 4353 my $widget;
3904 4354
3905 outer: 4355 outer:
… …
3952 } 4402 }
3953 } 4403 }
3954 4404
3955 delete $self->{realloc}{$widget+0}; 4405 delete $self->{realloc}{$widget+0};
3956 } 4406 }
3957 }
3958 4407
3959 while (my $size_alloc = delete $self->{size_alloc}) { 4408 while (my $size_alloc = delete $self->{size_alloc}) {
3960 my @queue = sort { $b->{visible} <=> $a->{visible} } 4409 my @queue = sort { $a->{visible} <=> $b->{visible} }
3961 values %$size_alloc; 4410 values %$size_alloc;
3962 4411
3963 while () { 4412 while () {
3964 my $widget = pop @queue || last; 4413 my $widget = pop @queue || last;
3965 4414
3966 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4415 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3967 4416
3968 $w = 0 if $w < 0;
3969 $h = 0 if $h < 0;
3970
3971 $w = max $widget->{min_w}, $w; 4417 $w = max $widget->{min_w}, $w;
3972 $h = max $widget->{min_h}, $h; 4418 $h = max $widget->{min_h}, $h;
3973 4419
3974# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4420# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3975# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4421# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3976 4422
3977 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4423 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3978 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4424 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3979 4425
3980 $w = int $w + 0.5; 4426 $w = int $w + 0.5;
3981 $h = int $h + 0.5; 4427 $h = int $h + 0.5;
3982 4428
3983 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4429 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3984 $widget->{old_w} = $widget->{w}; 4430 $widget->{old_w} = $widget->{w};
3985 $widget->{old_h} = $widget->{h}; 4431 $widget->{old_h} = $widget->{h};
3986 4432
3987 $widget->{w} = $w; 4433 $widget->{w} = $w;
3988 $widget->{h} = $h; 4434 $widget->{h} = $h;
3989 4435
3990 $widget->emit (size_allocate => $w, $h); 4436 $widget->emit (size_allocate => $w, $h);
4437 }
3991 } 4438 }
3992 } 4439 }
3993 } 4440 }
3994 4441
3995 while ($self->{post_alloc_hook}) { 4442 while ($self->{post_alloc_hook}) {
3996 $_->() 4443 $_->()
3997 for values %{delete $self->{post_alloc_hook}}; 4444 for values %{delete $self->{post_alloc_hook}};
3998 } 4445 }
3999
4000 4446
4001 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4447 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4002 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4448 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4003 glClear GL_COLOR_BUFFER_BIT; 4449 glClear GL_COLOR_BUFFER_BIT;
4004 4450

Diff Legend

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