ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.354 by root, Sat Nov 18 23:31:23 2006 UTC vs.
Revision 1.413 by root, Mon Jul 23 15:30:45 2007 UTC

1	package CFPlus::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFPlus;	9	use CFPlus;
11	use CFPlus::Pod;	10	use CFPlus::Pod;
…		…
23	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24	if (!$GRAB) {	23	if (!$GRAB) {
25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
27	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28	$TOOLTIP->hide;	28	$TOOLTIP->hide;
29		29
30	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31		32
32	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
33		34
34	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
35		36
…		…
43	}	44	}
44	}	45	}
45	}	46	}
46		47
47	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
49	});	51	});
50		52
51	sub get_layout {	53	sub get_layout {
52	my $layout;	54	my $layout;
…		…
111	}	113	}
112		114
113	if ($GRAB) {	115	if ($GRAB) {
114	if ($ev->{button} == 4 || $ev->{button} == 5) {	116	if ($ev->{button} == 4 || $ev->{button} == 5) {
115	# mousewheel	117	# mousewheel
116	$ev->{dx} = 0;
117	$ev->{dy} = $ev->{button} * 2 - 9;	118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		120
		121	$ev->{dx} = $shift ? $delta : 0;
		122	$ev->{dy} = $shift ? 0 : $delta;
		123
118	$GRAB->emit (mouse_wheel => $ev);	124	$GRAB->emit (mouse_wheel => $ev);
119	} else {	125	} else {
120	$GRAB->emit (button_down => $ev)	126	$GRAB->emit (button_down => $ev)
121	}	127	}
122	}	128	}
…		…
235	h => undef,	241	h => undef,
236	can_events => 1,	242	can_events => 1,
237	@_	243	@_
238	}, $class;	244	}, $class;
239		245
240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241		247
242	for (keys %$self) {	248	for (keys %$self) {
243	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
244	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
245	}	251	}
…		…
262		268
263	sub destroy {	269	sub destroy {
264	my ($self) = @_;	270	my ($self) = @_;
265		271
266	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
267	%$self = ();	274	%$self = ();
		275	}
		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
268	}	279	}
269		280
270	sub show {	281	sub show {
271	my ($self) = @_;	282	my ($self) = @_;
272		283
…		…
313	sub set_visibility {	324	sub 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
322	sub toggle_visibility {	333	sub toggle_visibility {
323	my ($self) = @_;	334	my ($self) = @_;
324		335
…		…
502		513
503	defined wantarray and CFPlus::guard {	514	defined wantarray and CFPlus::guard {
504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505	@{ $self->{signal_cb}{$signal} };	516	@{ $self->{signal_cb}{$signal} };
506	}	517	}
		518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
507	}	524	}
508		525
509	my %has_coords = (	526	my %has_coords = (
510	button_down => 1,	527	button_down => 1,
511	button_up => 1,	528	button_up => 1,
…		…
523	? $args[0]->xy ($self)	540	? $args[0]->xy ($self)
524	: ();	541	: ();
525		542
526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527		544
528	if ($self->{tooltip} =~ /Apply.*audio/) {	545	for my $cb (
529	warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#	546	@{$self->{signal_cb}{$signal} || []}, # before
530	warn "3 $self->{parent}\n";#d#	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
531	}	550	}
532		551
533	#d##TODO# stop propagating at first true, do not use sum	552	# parent
534	my $res =
535	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
536	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
537	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
538	;
539	if ($self->{tooltip} =~ /Apply.*audio/) {
540	warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
541	warn "5 $self->{parent}\n";#d#
542	}
543
544	$res
545	}	554	}
546		555
547	sub find_widget {	556	#sub find_widget {
548	my ($self, $x, $y) = @_;	557	# in .xs
549
550	return () unless $self->{can_events};
551
552	return $self
553	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
554	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
555
556	()
557	}
558		558
559	sub set_parent {	559	sub set_parent {
560	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
561		561
562	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
563	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
564	}	564	}
565		565
566	sub realloc {	566	sub realloc {
567	my ($self) = @_;	567	my ($self) = @_;
…		…
593		593
594	# 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
595	# functions seems pointless.	595	# functions seems pointless.
596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597		597
598	sub draw {	598	#sub draw {
599	my ($self) = @_;	599	#CFPlus.xs
600
601	return unless $self->{h} && $self->{w};
602
603	# update screen rectangle
604	local $draw_x = $draw_x + $self->{x};
605	local $draw_y = $draw_y + $self->{y};
606
607	# skip widgets that are entirely outside the drawing area
608	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
610
611	glPushMatrix;
612	glTranslate $self->{x}, $self->{y}, 0;
613
614	if ($self == $HOVER && $self->{can_hover}) {
615	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
616	glEnable GL_BLEND;
617	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
618	glBegin GL_QUADS;
619	glVertex 0 , 0;
620	glVertex $self->{w}, 0;
621	glVertex $self->{w}, $self->{h};
622	glVertex 0 , $self->{h};
623	glEnd;
624	glDisable GL_BLEND;
625	}
626
627	if ($ENV{CFPLUS_DEBUG} & 1) {
628	glPushMatrix;
629	glColor 1, 1, 0, 1;
630	glTranslate 0.375, 0.375;
631	glBegin GL_LINE_LOOP;
632	glVertex 0 , 0;
633	glVertex $self->{w} - 1, 0;
634	glVertex $self->{w} - 1, $self->{h} - 1;
635	glVertex 0 , $self->{h} - 1;
636	glEnd;
637	glPopMatrix;
638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
639	}
640
641	$self->_draw;
642	glPopMatrix;
643	}
644		600
645	sub _draw {	601	sub _draw {
646	my ($self) = @_;	602	my ($self) = @_;
647		603
648	warn "no draw defined for $self\n";	604	warn "no draw defined for $self\n";
…		…
650		606
651	sub DESTROY {	607	sub DESTROY {
652	my ($self) = @_;	608	my ($self) = @_;
653		609
654	return if CFPlus::in_destruct;	610	return if CFPlus::in_destruct;
655
656	delete $WIDGET{$self+0};
657		611
658	eval { $self->destroy };	612	eval { $self->destroy };
659	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	613	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		614
		615	delete $WIDGET{$self+0};
660	}	616	}
661		617
662	#############################################################################	618	#############################################################################
663		619
664	package CFPlus::UI::DrawBG;	620	package CFPlus::UI::DrawBG;
…		…
740	can_events => 0,	696	can_events => 0,
741	%arg,	697	%arg,
742	);	698	);
743		699
744	$self->add (@$children)	700	$self->add (@$children)
745	if $children;	701	if $children && @$children;
746		702
747	$self	703	$self
748	}	704	}
749		705
750	sub realloc {	706	sub realloc {
…		…
759	my ($self, @widgets) = @_;	715	my ($self, @widgets) = @_;
760		716
761	$_->set_parent ($self)	717	$_->set_parent ($self)
762	for @widgets;	718	for @widgets;
763		719
		720	# TODO: only do this in widgets that need it, e.g. root, fixed
764	use sort 'stable';	721	use sort 'stable';
765		722
766	$self->{children} = [	723	$self->{children} = [
767	sort { $a->{z} <=> $b->{z} }	724	sort { $a->{z} <=> $b->{z} }
768	@{$self->{children}}, @widgets	725	@{$self->{children}}, @widgets
769	];	726	];
770		727
771	$self->realloc;	728	$self->realloc;
		729
		730	$self->emit (c_add => \@widgets);
		731
		732	map $_+0, @widgets
772	}	733	}
773		734
774	sub children {	735	sub children {
775	@{ $_[0]{children} }	736	@{ $_[0]{children} }
776	}	737	}
777		738
778	sub remove {	739	sub remove {
779	my ($self, $child) = @_;	740	my ($self, @widgets) = @_;
780		741
		742	$self->emit (c_remove => \@widgets);
		743
		744	for my $child (@widgets) {
781	delete $child->{parent};	745	delete $child->{parent};
782	$child->hide;	746	$child->hide;
783
784	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	747	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		748	}
785		749
786	$self->realloc;	750	$self->realloc;
787	}	751	}
788		752
789	sub clear {	753	sub clear {
790	my ($self) = @_;	754	my ($self) = @_;
791		755
792	my $children = delete $self->{children};	756	my $children = $self->{children};
793	$self->{children} = [];	757	$self->{children} = [];
794		758
795	for (@$children) {	759	for (@$children) {
796	delete $_->{parent};	760	delete $_->{parent};
797	$_->hide;	761	$_->hide;
…		…
817	}	781	}
818		782
819	sub _draw {	783	sub _draw {
820	my ($self) = @_;	784	my ($self) = @_;
821		785
822	$_->draw for @{$self->{children}};	786	$_->draw for $self->visible_children;
823	}	787	}
824		788
825	#############################################################################	789	#############################################################################
826		790
827	package CFPlus::UI::Bin;	791	package CFPlus::UI::Bin;
…		…
837	}	801	}
838		802
839	sub add {	803	sub add {
840	my ($self, $child) = @_;	804	my ($self, $child) = @_;
841		805
842	$self->SUPER::remove ($_) for @{ $self->{children} };	806	$self->clear;
843	$self->SUPER::add ($child);	807	$self->SUPER::add ($child);
844	}	808	}
845		809
846	sub remove {	810	sub remove {
847	my ($self, $widget) = @_;	811	my ($self, $widget) = @_;
…		…
937	}	901	}
938		902
939	#############################################################################	903	#############################################################################
940		904
941	package CFPlus::UI::ViewPort;	905	package CFPlus::UI::ViewPort;
		906
		907	use List::Util qw(min max);
942		908
943	our @ISA = CFPlus::UI::Window::;	909	our @ISA = CFPlus::UI::Window::;
944		910
945	sub new {	911	sub new {
946	my $class = shift;	912	my $class = shift;
…		…
955	sub size_request {	921	sub size_request {
956	my ($self) = @_;	922	my ($self) = @_;
957		923
958	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	924	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
959		925
960	$w = 10 if $self->{scroll_x};	926	$w = 1 if $self->{scroll_x};
961	$h = 10 if $self->{scroll_y};	927	$h = 1 if $self->{scroll_y};
962		928
963	($w, $h)	929	($w, $h)
964	}	930	}
965		931
966	sub invoke_size_allocate {	932	sub invoke_size_allocate {
…		…
978	}	944	}
979		945
980	sub set_offset {	946	sub set_offset {
981	my ($self, $x, $y) = @_;	947	my ($self, $x, $y) = @_;
982		948
		949	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		950	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		951
		952	if ($x != $self->{view_x} or $y != $self->{view_y}) {
983	$self->{view_x} = int $x;	953	$self->{view_x} = $x;
984	$self->{view_y} = int $y;	954	$self->{view_y} = $y;
985		955
		956	$self->emit (changed => $x, $y);
986	$self->update;	957	$self->update;
		958	}
987	}	959	}
988		960
989	# hmm, this does not work for topleft of $self... but we should not ask for that	961	# hmm, this does not work for topleft of $self... but we should not ask for that
990	sub coord2local {	962	sub coord2local {
991	my ($self, $x, $y) = @_;	963	my ($self, $x, $y) = @_;
…		…
1006	my ($self, $x, $y) = @_;	978	my ($self, $x, $y) = @_;
1007		979
1008	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	980	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1009	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	981	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1010	) {	982	) {
1011	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	983	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1012	} else {	984	} else {
1013	$self->CFPlus::UI::Base::find_widget ($x, $y)	985	$self->CFPlus::UI::Base::find_widget ($x, $y)
1014	}	986	}
1015	}	987	}
1016		988
…		…
1027		999
1028	#############################################################################	1000	#############################################################################
1029		1001
1030	package CFPlus::UI::ScrolledWindow;	1002	package CFPlus::UI::ScrolledWindow;
1031		1003
1032	our @ISA = CFPlus::UI::HBox::;	1004	our @ISA = CFPlus::UI::Table::;
1033		1005
1034	sub new {	1006	sub new {
1035	my ($class, %arg) = @_;	1007	my ($class, %arg) = @_;
1036		1008
1037	my $child = delete $arg{child};	1009	my $child = delete $arg{child};
1038		1010
1039	my $self;	1011	my $self;
1040		1012
1041	my $slider = new CFPlus::UI::Slider	1013	my $hslider = new CFPlus::UI::Slider
		1014	col => 0,
		1015	row => 1,
		1016	vertical => 0,
		1017	range => [0, 0, 1, 0.01], # HACK fix
		1018	on_changed => sub {
		1019	$self->{hpos} = $_[1];
		1020	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1021	},
		1022	;
		1023
		1024	my $vslider = new CFPlus::UI::Slider
		1025	col => 1,
		1026	row => 0,
1042	vertical => 1,	1027	vertical => 1,
1043	range => [0, 0, 1, 0.01], # HACK fix	1028	range => [0, 0, 1, 0.01], # HACK fix
1044	on_changed => sub {	1029	on_changed => sub {
1045	$self->{vp}->set_offset (0, $_[1]);	1030	$self->{vpos} = $_[1];
		1031	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1046	},	1032	},
1047	;	1033	;
1048		1034
1049	$self = $class->SUPER::new (	1035	$self = $class->SUPER::new (
1050	vp => (new CFPlus::UI::ViewPort expand => 1),	1036	scroll_x => 0,
		1037	scroll_y => 1,
1051	can_events => 1,	1038	can_events => 1,
1052	slider => $slider,	1039	hslider => $hslider,
		1040	vslider => $vslider,
		1041	col_expand => [1, 0],
		1042	row_expand => [1, 0],
1053	%arg,	1043	%arg,
1054	);	1044	);
1055		1045
		1046	$self->{vp} = new CFPlus::UI::ViewPort
		1047	col => 0,
		1048	row => 0,
		1049	expand => 1,
		1050	scroll_x => $self->{scroll_x},
		1051	scroll_y => $self->{scroll_y},
		1052	on_changed => sub {
		1053	my ($vp, $x, $y) = @_;
		1054
		1055	$vp->{parent}{hslider}->set_value ($x);
		1056	$vp->{parent}{vslider}->set_value ($y);
		1057
		1058	0
		1059	},
		1060	on_size_allocate => sub {
		1061	my ($vp, $w, $h) = @_;
		1062	$vp->{parent}->update_slider;
		1063	0
		1064	},
		1065	;
		1066
1056	$self->SUPER::add ($self->{vp}, $self->{slider});	1067	$self->SUPER::add ($self->{vp});
		1068
1057	$self->add ($child) if $child;	1069	$self->add ($child) if $child;
1058		1070
1059	$self	1071	$self
1060	}	1072	}
1061
1062	#TODO# update range on size_allocate depending on child
1063		1073
1064	sub add {	1074	sub add {
1065	my ($self, $widget) = @_;	1075	my ($self, $widget) = @_;
1066		1076
1067	$self->{vp}->add ($self->{child} = $widget);	1077	$self->{vp}->add ($self->{child} = $widget);
1068	}	1078	}
1069		1079
		1080	sub update_slider {
		1081	my ($self) = @_;
		1082
		1083	my $child = ($self->{vp} or return)->child;
		1084
		1085	if ($self->{scroll_x}) {
		1086	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1087	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1088
		1089	my $visible = $w1 > $w2;
		1090	if ($visible != $self->{hslider_visible}) {
		1091	$self->{hslider_visible} = $visible;
		1092	$visible ? $self->SUPER::add ($self->{hslider})
		1093	: $self->SUPER::remove ($self->{hslider});
		1094	}
		1095	}
		1096
		1097	if ($self->{scroll_y}) {
		1098	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1099	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1100
		1101	my $visible = $h1 > $h2;
		1102	if ($visible != $self->{vslider_visible}) {
		1103	$self->{vslider_visible} = $visible;
		1104	$visible ? $self->SUPER::add ($self->{vslider})
		1105	: $self->SUPER::remove ($self->{vslider});
		1106	}
		1107	}
		1108	}
		1109
		1110	sub start_dragging {
		1111	my ($self, $ev) = @_;
		1112
		1113	$self->grab_focus;
		1114
		1115	my $ox = $self->{vp}{view_x};
		1116	my $oy = $self->{vp}{view_y};
		1117
		1118	$self->{motion} = sub {
		1119	my ($ev, $x, $y) = @_;
		1120
		1121	$ox -= $ev->{xrel};
		1122	$oy -= $ev->{yrel};
		1123
		1124	$self->{vp}->set_offset ($ox, $oy);
		1125	};
		1126	}
		1127
1070	sub invoke_mouse_wheel {	1128	sub invoke_mouse_wheel {
1071	my ($self, $ev) = @_;	1129	my ($self, $ev) = @_;
1072		1130
1073	return 0 unless $ev->{dy}; # only vertical movements
1074
1075	$self->{slider}->emit (mouse_wheel => $ev);	1131	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1132	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1076		1133
1077	1	1134	1
1078	}	1135	}
1079		1136
1080	sub update_slider {	1137	sub invoke_button_down {
1081	my ($self) = @_;	1138	my ($self, $ev, $x, $y) = @_;
1082		1139
1083	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1140	if ($ev->{button} == 2) {
1084	}	1141	$self->start_dragging ($ev);
		1142	return 1;
		1143	}
1085		1144
1086	sub update {	1145	0
1087	my ($self) = @_;	1146	}
1088		1147
1089	$self->SUPER::update;	1148	sub invoke_button_up {
		1149	my ($self, $ev, $x, $y) = @_;
1090		1150
1091	$self->update_slider;	1151	if (delete $self->{motion}) {
		1152	return 1;
		1153	}
		1154
		1155	0
		1156	}
		1157
		1158	sub invoke_mouse_motion {
		1159	my ($self, $ev, $x, $y) = @_;
		1160
		1161	if ($self->{motion}) {
		1162	$self->{motion}->($ev, $x, $y);
		1163	return 1;
		1164	}
		1165
		1166	0
1092	}	1167	}
1093		1168
1094	sub invoke_size_allocate {	1169	sub invoke_size_allocate {
1095	my ($self, $w, $h) = @_;	1170	my ($self, $w, $h) = @_;
1096		1171
1097	$self->update_slider;	1172	$self->update_slider;
1098
1099	$self->SUPER::invoke_size_allocate ($w, $h)	1173	$self->SUPER::invoke_size_allocate ($w, $h)
1100	}	1174	}
1101		1175
1102	#############################################################################	1176	#############################################################################
1103		1177
…		…
1253		1327
1254	my @border =	1328	my @border =
1255	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1329	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1256	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1330	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1257		1331
		1332	my @icon =
		1333	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1334	qw(x1_move.png x1_resize.png);
		1335
1258	sub new {	1336	sub new {
1259	my ($class, %arg) = @_;	1337	my ($class, %arg) = @_;
1260		1338
1261	my $self = $class->SUPER::new (	1339	my $self = $class->SUPER::new (
1262	bg => [1, 1, 1, 1],	1340	bg => [1, 1, 1, 1],
…		…
1430	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1508	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1431		1509
1432	my $border = $self->border;	1510	my $border = $self->border;
1433		1511
1434	glColor @{ $self->{border_bg} };	1512	glColor @{ $self->{border_bg} };
1435	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1513	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1436	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1514	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1437	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1515	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1438	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1516	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1517
		1518	# move
		1519	my $w2 = ($w - $border) * .5;
		1520	my $h2 = ($h - $border) * .5;
		1521	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1522	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1523	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1524
		1525	# resize
		1526	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1527	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1528	unless $self->{has_close_button};
		1529	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1530	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1439		1531
1440	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1532	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1441	glColor @{ $self->{bg} };	1533	glColor @{ $self->{bg} };
1442		1534
1443	# TODO: repeat texture not scale	1535	# TODO: repeat texture not scale
…		…
1464		1556
1465	#############################################################################	1557	#############################################################################
1466		1558
1467	package CFPlus::UI::Table;	1559	package CFPlus::UI::Table;
1468		1560
1469	our @ISA = CFPlus::UI::Base::;	1561	our @ISA = CFPlus::UI::Container::;
1470		1562
1471	use List::Util qw(max sum);	1563	use List::Util qw(max sum);
1472		1564
1473	use CFPlus::OpenGL;	1565	use CFPlus::OpenGL;
1474		1566
1475	sub new {	1567	sub new {
1476	my $class = shift;	1568	my $class = shift;
1477		1569
1478	$class->SUPER::new (	1570	$class->SUPER::new (
1479	col_expand => [],	1571	col_expand => [],
		1572	row_expand => [],
1480	@_,	1573	@_,
1481	)	1574	)
1482	}	1575	}
1483		1576
1484	sub children {
1485	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1486	}
1487
1488	sub add {	1577	sub add {
		1578	my ($self, @widgets) = @_;
		1579
		1580	for my $child (@widgets) {
		1581	$child->{rowspan} ||= 1;
		1582	$child->{colspan} ||= 1;
		1583	}
		1584
		1585	$self->SUPER::add (@widgets);
		1586	}
		1587
		1588	sub add_at {
1489	my ($self) = shift;	1589	my $self = shift;
		1590
		1591	my @widgets;
1490		1592
1491	while (@_) {	1593	while (@_) {
1492	my ($x, $y, $child) = splice @_, 0, 3, ();	1594	my ($col, $row, $child) = splice @_, 0, 3, ();
1493	$child->set_parent ($self);
1494	$self->{children}[$y][$x] = $child;
1495	}
1496		1595
1497	$self->{force_realloc} = 1;	1596	$child->{row} = $row;
1498	$self->{force_size_alloc} = 1;	1597	$child->{col} = $col;
1499	$self->realloc;
1500	}
1501		1598
1502	sub remove {	1599	push @widgets, $child;
		1600	}
		1601
		1602	$self->add (@widgets);
		1603	}
		1604
		1605	sub get_wh {
1503	my ($self, $child) = @_;	1606	my ($self) = @_;
1504		1607
1505	# TODO: not yet implemented	1608	my (@w, @h);
1506	}
1507
1508	# TODO: move to container class maybe? send children a signal on removal?
1509	sub clear {
1510	my ($self) = @_;
1511		1609
1512	my @children = $self->children;	1610	my @children = $self->children;
1513	delete $self->{children};	1611
		1612	# first pass, columns
		1613	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1614	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1615
		1616	my $sw = sum @w[$c .. $c + $cs - 1];
		1617
		1618	if ($w > $sw) {
		1619	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1620	}
1514		1621	}
1515	for (@children) {
1516	delete $_->{parent};
1517	$_->hide;
1518	}
1519		1622
1520	$self->realloc;	1623	# second pass, rows
1521	}	1624	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1522
1523	sub get_wh {
1524	my ($self) = @_;
1525
1526	my (@w, @h);
1527
1528	for my $y (0 .. $#{$self->{children}}) {
1529	my $row = $self->{children}[$y]
1530	or next;
1531
1532	for my $x (0 .. $#$row) {
1533	my $widget = $row->[$x]
1534	or next;
1535	my ($w, $h) = @$widget{qw(req_w req_h)};	1625	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1536		1626
1537	$w[$x] = max $w[$x], $w;	1627	my $sh = sum @h[$r .. $r + $rs - 1];
1538	$h[$y] = max $h[$y], $h;	1628
		1629	if ($h > $sh) {
		1630	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1539	}	1631	}
1540	}	1632	}
1541		1633
1542	(\@w, \@h)	1634	(\@w, \@h)
1543	}	1635	}
…		…
1559	my ($ws, $hs) = $self->get_wh;	1651	my ($ws, $hs) = $self->get_wh;
1560		1652
1561	my $req_w = (sum @$ws) || 1;	1653	my $req_w = (sum @$ws) || 1;
1562	my $req_h = (sum @$hs) || 1;	1654	my $req_h = (sum @$hs) || 1;
1563		1655
1564	# TODO: nicer code && do row_expand	1656	# now linearly scale the rows/columns to the allocated size
1565	my @col_expand = @{$self->{col_expand}};	1657	my @col_expand = @{$self->{col_expand}};
1566	@col_expand = (1) x @$ws unless @col_expand;	1658	@col_expand = (1) x @$ws unless @col_expand;
1567	my $col_expand = (sum @col_expand) || 1;	1659	my $col_expand = (sum @col_expand) || 1;
1568		1660
1569	# linearly scale sizes
1570	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1661	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1571	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1572		1662
1573	CFPlus::UI::harmonize $ws;	1663	CFPlus::UI::harmonize $ws;
		1664
		1665	my @row_expand = @{$self->{row_expand}};
		1666	@row_expand = (1) x @$ws unless @row_expand;
		1667	my $row_expand = (sum @row_expand) || 1;
		1668
		1669	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1670
1574	CFPlus::UI::harmonize $hs;	1671	CFPlus::UI::harmonize $hs;
1575		1672
1576	my $y;	1673	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1674	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1577		1675
1578	for my $r (0 .. $#{$self->{children}}) {	1676	for my $widget ($self->children) {
1579	my $row = $self->{children}[$r]	1677	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1580	or next;
1581		1678
1582	my $x = 0;	1679	$widget->configure (
1583	my $row_h = $hs->[$r];	1680	$x[$c], $y[$r],
		1681	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1584		1682	);
1585	for my $c (0 .. $#$row) {	1683	}
1586	my $col_w = $ws->[$c];
1587		1684
1588	if (my $widget = $row->[$c]) {	1685	1
1589	$widget->configure ($x, $y, $col_w, $row_h);	1686	}
1590	}
1591		1687
1592	$x += $col_w;	1688	#############################################################################
		1689
		1690	package CFPlus::UI::Fixed;
		1691
		1692	use List::Util qw(min max);
		1693
		1694	our @ISA = CFPlus::UI::Container::;
		1695
		1696	sub _scale($$$) {
		1697	my ($rel, $val, $max) = @_;
		1698
		1699	$rel ? $val * $max : $val
		1700	}
		1701
		1702	sub size_request {
		1703	my ($self) = @_;
		1704
		1705	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1706
		1707	# determine overall size by querying abs widgets
		1708	for my $child ($self->visible_children) {
		1709	unless ($child->{c_rel}) {
		1710	my $x = $child->{c_x};
		1711	my $y = $child->{c_y};
		1712
		1713	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1714	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1593	}	1715	}
		1716	}
1594		1717
1595	$y += $row_h;	1718	my $W = $x2 - $x1;
		1719	my $H = $y2 - $y1;
		1720
		1721	# now layout remaining widgets
		1722	for my $child ($self->visible_children) {
		1723	if ($child->{c_rel}) {
		1724	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1725	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1726
		1727	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1728	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1729	}
		1730	}
		1731
		1732	my $W = $x2 - $x1;
		1733	my $H = $y2 - $y1;
		1734
		1735	($W, $H)
		1736	}
		1737
		1738	sub invoke_size_allocate {
		1739	my ($self, $W, $H) = @_;
		1740
		1741	for my $child ($self->visible_children) {
		1742	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1743	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1744
		1745	$x += $child->{c_halign} * $child->{req_w};
		1746	$y += $child->{c_valign} * $child->{req_h};
		1747
		1748	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1596	}	1749	}
1597		1750
1598	1	1751	1
1599	}	1752	}
1600		1753
1601	sub find_widget {
1602	my ($self, $x, $y) = @_;
1603
1604	$x -= $self->{x};
1605	$y -= $self->{y};
1606
1607	my $res;
1608
1609	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1610	$res = $_->find_widget ($x, $y)
1611	and return $res;
1612	}
1613
1614	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1615	}
1616
1617	sub _draw {
1618	my ($self) = @_;
1619
1620	for (grep $_, @{$self->{children}}) {
1621	$_->draw for grep $_, @$_;
1622	}
1623	}
1624
1625	#############################################################################	1754	#############################################################################
1626		1755
1627	package CFPlus::UI::Box;	1756	package CFPlus::UI::Box;
1628		1757
1629	our @ISA = CFPlus::UI::Container::;	1758	our @ISA = CFPlus::UI::Container::;
1630		1759
1631	sub size_request {	1760	sub size_request {
1632	my ($self) = @_;	1761	my ($self) = @_;
		1762
		1763	my @children = $self->visible_children;
1633		1764
1634	$self->{vertical}	1765	$self->{vertical}
1635	? (	1766	? (
1636	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1767	(List::Util::max map $_->{req_w}, @children),
1637	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1768	(List::Util::sum map $_->{req_h}, @children),
1638	)	1769	)
1639	: (	1770	: (
1640	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1771	(List::Util::sum map $_->{req_w}, @children),
1641	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1772	(List::Util::max map $_->{req_h}, @children),
1642	)	1773	)
1643	}	1774	}
1644		1775
1645	sub invoke_size_allocate {	1776	sub invoke_size_allocate {
1646	my ($self, $w, $h) = @_;	1777	my ($self, $w, $h) = @_;
…		…
1887	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2018	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1888	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2019	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1889	: ($self->{h} - $size->[1]) * 0.5);	2020	: ($self->{h} - $size->[1]) * 0.5);
1890	};	2021	};
1891		2022
1892	my $w = List::Util::min $self->{w} + 4, $size->[0];	2023	# unless ($self->{list}) {
1893	my $h = List::Util::min $self->{h} + 2, $size->[1];	2024	# $self->{list} = CFPlus::OpenGL::glGenList;
		2025	# CFPlus::OpenGL::glNewList $self->{list};
		2026	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2027	# CFPlus::OpenGL::glEndList;
		2028	# }
		2029	#
		2030	# CFPlus::OpenGL::glCallList $self->{list};
1894		2031
1895	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2032	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1896	}	2033	}
		2034
		2035	#sub destroy {
		2036	# my ($self) = @_;
		2037	#
		2038	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2039	#
		2040	# $self->SUPER::destroy;
		2041	#}
1897		2042
1898	#############################################################################	2043	#############################################################################
1899		2044
1900	package CFPlus::UI::EntryBase;	2045	package CFPlus::UI::EntryBase;
1901		2046
…		…
1913	active_fg => [0, 0, 0],	2058	active_fg => [0, 0, 0],
1914	can_hover => 1,	2059	can_hover => 1,
1915	can_focus => 1,	2060	can_focus => 1,
1916	valign => 0,	2061	valign => 0,
1917	can_events => 1,	2062	can_events => 1,
		2063	ellipsise => 0,
1918	#text => ...	2064	#text => ...
1919	#hidden => "*",	2065	#hidden => "*",
1920	@_	2066	@_
1921	)	2067	)
1922	}	2068	}
…		…
1966	my $mod = $ev->{mod};	2112	my $mod = $ev->{mod};
1967	my $sym = $ev->{sym};	2113	my $sym = $ev->{sym};
1968	my $uni = $ev->{unicode};	2114	my $uni = $ev->{unicode};
1969		2115
1970	my $text = $self->get_text;	2116	my $text = $self->get_text;
		2117
		2118	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1971		2119
1972	if ($uni == 8) {	2120	if ($uni == 8) {
1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2121	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974	} elsif ($uni == 127) {	2122	} elsif ($uni == 127) {
1975	substr $text, $self->{cursor}, 1, "";	2123	substr $text, $self->{cursor}, 1, "";
1976	} elsif ($sym == CFPlus::SDLK_LEFT) {	2124	} elsif ($sym == CFPlus::SDLK_LEFT) {
1977	--$self->{cursor} if $self->{cursor};	2125	--$self->{cursor} if $self->{cursor};
1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2126	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1979	++$self->{cursor} if $self->{cursor} < length $self->{text};	2127	++$self->{cursor} if $self->{cursor} < length $self->{text};
1980	} elsif ($sym == CFPlus::SDLK_HOME) {	2128	} elsif ($sym == CFPlus::SDLK_HOME) {
		2129	# what a hack
1981	$self->{cursor} = 0;	2130	$self->{cursor} =
		2131	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2132	? length $1
		2133	: 0;
1982	} elsif ($sym == CFPlus::SDLK_END) {	2134	} elsif ($sym == CFPlus::SDLK_END) {
		2135	# uh, again
		2136	$self->{cursor} =
		2137	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1983	$self->{cursor} = length $text;	2138	? $self->{cursor} + length $1
		2139	: length $self->{text};
1984	} elsif ($uni == 21) { # ctrl-u	2140	} elsif ($uni == 21) { # ctrl-u
1985	$text = "";	2141	$text = "";
1986	$self->{cursor} = 0;	2142	$self->{cursor} = 0;
1987	} elsif ($uni == 27) {	2143	} elsif ($uni == 27) {
1988	$self->emit ('escape');	2144	$self->emit ('escape');
1989	} elsif ($uni) {	2145	} elsif ($uni == 0x0d) {
		2146	substr $text, $self->{cursor}++, 0, "\012";
		2147	} elsif ($uni >= 0x20) {
1990	substr $text, $self->{cursor}++, 0, chr $uni;	2148	substr $text, $self->{cursor}++, 0, chr $uni;
1991	} else {	2149	} else {
1992	return 0;	2150	return 0;
1993	}	2151	}
1994		2152
1995	$self->_set_text ($text);	2153	$self->_set_text ($text);
1996		2154
1997	$self->realloc;	2155	$self->realloc;
		2156	$self->update;
1998		2157
1999	1	2158	1
2000	}	2159	}
2001		2160
2002	sub invoke_focus_in {	2161	sub invoke_focus_in {
…		…
2071	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2230	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2072	glEnd;	2231	glEnd;
2073	}	2232	}
2074	}	2233	}
2075		2234
		2235	#############################################################################
		2236
2076	package CFPlus::UI::Entry;	2237	package CFPlus::UI::Entry;
2077		2238
2078	our @ISA = CFPlus::UI::EntryBase::;	2239	our @ISA = CFPlus::UI::EntryBase::;
2079		2240
2080	use CFPlus::OpenGL;	2241	use CFPlus::OpenGL;
…		…
2082	sub invoke_key_down {	2243	sub invoke_key_down {
2083	my ($self, $ev) = @_;	2244	my ($self, $ev) = @_;
2084		2245
2085	my $sym = $ev->{sym};	2246	my $sym = $ev->{sym};
2086		2247
2087	if ($sym == 13) {	2248	if ($ev->{uni} == 0x0d || $sym == 13) {
2088	unshift @{$self->{history}},	2249	unshift @{$self->{history}},
2089	my $txt = $self->get_text;	2250	my $txt = $self->get_text;
2090		2251
2091	$self->{history_pointer} = -1;	2252	$self->{history_pointer} = -1;
2092	$self->{history_saveback} = '';	2253	$self->{history_saveback} = '';
…		…
2122	1	2283	1
2123	}	2284	}
2124		2285
2125	#############################################################################	2286	#############################################################################
2126		2287
		2288	package CFPlus::UI::TextEdit;
		2289
		2290	our @ISA = CFPlus::UI::EntryBase::;
		2291
		2292	use CFPlus::OpenGL;
		2293
		2294	sub move_cursor_ver {
		2295	my ($self, $dy) = @_;
		2296
		2297	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2298
		2299	$y += $dy;
		2300
		2301	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2302	$self->{cursor} = $index;
		2303	delete $self->{cur_h};
		2304	$self->update;
		2305	return;
		2306	}
		2307	}
		2308
		2309	sub invoke_key_down {
		2310	my ($self, $ev) = @_;
		2311
		2312	my $sym = $ev->{sym};
		2313
		2314	if ($sym == CFPlus::SDLK_UP) {
		2315	$self->move_cursor_ver (-1);
		2316	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2317	$self->move_cursor_ver (+1);
		2318	} else {
		2319	return $self->SUPER::invoke_key_down ($ev)
		2320	}
		2321
		2322	1
		2323	}
		2324
		2325	#############################################################################
		2326
2127	package CFPlus::UI::Button;	2327	package CFPlus::UI::Button;
2128		2328
2129	our @ISA = CFPlus::UI::Label::;	2329	our @ISA = CFPlus::UI::Label::;
2130		2330
2131	use CFPlus::OpenGL;	2331	use CFPlus::OpenGL;
2132		2332
2133	my @tex =	2333	my @tex =
2134	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2334	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2135	qw(b1_button_active.png);	2335	qw(b1_button_inactive.png b1_button_active.png);
2136		2336
2137	sub new {	2337	sub new {
2138	my $class = shift;	2338	my $class = shift;
2139		2339
2140	$class->SUPER::new (	2340	$class->SUPER::new (
2141	padding_x => 4,	2341	padding_x => 4,
2142	padding_y => 4,	2342	padding_y => 4,
2143	fg => [1, 1, 1],	2343	fg => [1.0, 1.0, 1.0],
2144	active_fg => [0, 0, 1],	2344	active_fg => [0.8, 0.8, 0.8],
2145	can_hover => 1,	2345	can_hover => 1,
2146	align => 0,	2346	align => 0,
2147	valign => 0,	2347	valign => 0,
2148	can_events => 1,	2348	can_events => 1,
2149	@_	2349	@_
…		…
2167		2367
2168	glEnable GL_TEXTURE_2D;	2368	glEnable GL_TEXTURE_2D;
2169	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2369	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170	glColor 0, 0, 0, 1;	2370	glColor 0, 0, 0, 1;
2171		2371
		2372	my $tex = $tex[$GRAB == $self];
2172	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2373	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2173		2374
2174	glDisable GL_TEXTURE_2D;	2375	glDisable GL_TEXTURE_2D;
2175		2376
2176	$self->SUPER::_draw;	2377	$self->SUPER::_draw;
2177	}	2378	}
…		…
2273	or Carp::croak "'path' or 'tex' attributes required";	2474	or Carp::croak "'path' or 'tex' attributes required";
2274		2475
2275	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2476	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2276	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2477	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2277		2478
2278	Scalar::Util::weaken $texture_cache{$self->{path}};	2479	CFPlus::weaken $texture_cache{$self->{path}};
2279		2480
2280	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2481	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2281		2482
2282	$self	2483	$self
2283	}	2484	}
…		…
2630		2831
2631	$self->SUPER::invoke_button_down ($ev, $x, $y);	2832	$self->SUPER::invoke_button_down ($ev, $x, $y);
2632		2833
2633	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2834	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2634		2835
2635	$self->invoke_mouse_motion ($ev, $x, $y)	2836	$self->invoke_mouse_motion ($ev, $x, $y);
		2837
		2838	1
2636	}	2839	}
2637		2840
2638	sub invoke_mouse_motion {	2841	sub invoke_mouse_motion {
2639	my ($self, $ev, $x, $y) = @_;	2842	my ($self, $ev, $x, $y) = @_;
2640		2843
…		…
2656	sub invoke_mouse_wheel {	2859	sub invoke_mouse_wheel {
2657	my ($self, $ev) = @_;	2860	my ($self, $ev) = @_;
2658		2861
2659	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2862	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2660		2863
		2864	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2865
2661	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2866	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2662		2867
2663	! ! $delta	2868	1
2664	}	2869	}
2665		2870
2666	sub update {	2871	sub update {
2667	my ($self) = @_;	2872	my ($self) = @_;
2668		2873
…		…
2776	#font => default_font	2981	#font => default_font
2777	@_,	2982	@_,
2778		2983
2779	layout => (new CFPlus::Layout),	2984	layout => (new CFPlus::Layout),
2780	par => [],	2985	par => [],
		2986	max_par => 0,
2781	height => 0,	2987	height => 0,
2782	children => [	2988	children => [
2783	(new CFPlus::UI::Empty expand => 1),	2989	(new CFPlus::UI::Empty expand => 1),
2784	(new CFPlus::UI::Slider vertical => 1),	2990	(new CFPlus::UI::Slider vertical => 1),
2785	],	2991	],
…		…
2798	}	3004	}
2799		3005
2800	sub size_request {	3006	sub size_request {
2801	my ($self) = @_;	3007	my ($self) = @_;
2802		3008
2803	my ($empty, $slider) = @{ $self->{children} };	3009	my ($empty, $slider) = $self->visible_children;
2804		3010
2805	local $self->{children} = [$empty, $slider];	3011	local $self->{children} = [$empty, $slider];
2806	$self->SUPER::size_request	3012	$self->SUPER::size_request
2807	}	3013	}
2808		3014
…		…
2908	wrapped => 1,	3114	wrapped => 1,
2909	};	3115	};
2910		3116
2911	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3117	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2912	push @{$self->{par}}, $para;	3118	push @{$self->{par}}, $para;
		3119	}
		3120
		3121	if (my $max = $self->{max_par}) {
		3122	shift @{$self->{par}} while @{$self->{par}} > $max;
2913	}	3123	}
2914		3124
2915	$self->{need_reflow}++;	3125	$self->{need_reflow}++;
2916	$self->update;	3126	$self->update;
2917	}	3127	}
…		…
3225		3435
3226	sub new {	3436	sub new {
3227	my $class = shift;	3437	my $class = shift;
3228		3438
3229	my $self = $class->SUPER::new (	3439	my $self = $class->SUPER::new (
		3440	size_w => 32,
		3441	size_h => 8,
3230	aspect => 1,	3442	aspect => 1,
3231	can_events => 0,	3443	can_events => 0,
3232	@_,	3444	@_,
3233	);	3445	);
3234		3446
3235	if ($self->{anim} && $self->{animspeed}) {	3447	if ($self->{anim} && $self->{animspeed}) {
3236	Scalar::Util::weaken (my $widget = $self);	3448	CFPlus::weaken (my $widget = $self);
3237		3449
		3450	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3451	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3238	$self->{timer} = Event->timer (	3452	$self->{timer} = Event->timer (
3239	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3240	hard => 1,	3453	parked => 1,
3241	interval => $self->{animspeed},
3242	cb => sub {	3454	cb => sub {
		3455	return unless $::CONN && $widget;
		3456
3243	++$widget->{frame};	3457	++$widget->{frame};
		3458	$widget->update_face;
3244	$widget->update;	3459	$widget->update;
		3460
		3461	$widget->update_timer;
3245	},	3462	},
3246	);	3463	);
		3464
		3465	$self->update_face;
		3466	$self->update_timer;
3247	}	3467	}
3248		3468
3249	$self	3469	$self
3250	}	3470	}
3251		3471
		3472	sub update_timer {
		3473	my ($self) = @_;
		3474
		3475	return unless $self->{timer};
		3476
		3477	if ($self->{visible}) {
		3478	$self->{timer}->at (
		3479	$self->{anim_start}
		3480	+ $self->{animspeed}
		3481	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3482	);
		3483	$self->{timer}->start;
		3484	} else {
		3485	$self->{timer}->stop;
		3486	}
		3487	}
		3488
		3489	sub update_face {
		3490	my ($self) = @_;
		3491
		3492	return unless $::CONN;
		3493
		3494	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3495	if ($anim && @$anim) {
		3496	delete $self->{wait_face};
		3497	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3498	$self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
		3499	}
		3500	}
		3501	}
		3502
3252	sub size_request {	3503	sub size_request {
3253	(32, 8)	3504	my ($self) = @_;
		3505
		3506	if ($::CONN) {
		3507	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3508	if (my $tex = $::CONN->{texture}[$faceid]) {
		3509	$self->{tex} = $tex;
		3510	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3511	} else {
		3512	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3513	$self->realloc;
		3514	});
		3515	}
		3516	}
		3517	}
		3518
		3519	($self->{size_w} || 8, $self->{size_h} || 8)
3254	}	3520	}
3255		3521
3256	sub update {	3522	sub update {
3257	my ($self) = @_;	3523	my ($self) = @_;
3258		3524
3259	return unless $self->{visible};	3525	return unless $self->{visible};
3260		3526
3261	$self->SUPER::update;	3527	$self->SUPER::update;
3262	}	3528	}
3263		3529
		3530	sub invoke_visibility_change {
		3531	my ($self) = @_;
		3532
		3533	$self->update_timer;
		3534
		3535	0
		3536	}
		3537
3264	sub _draw {	3538	sub _draw {
3265	my ($self) = @_;	3539	my ($self) = @_;
3266		3540
3267	return unless $::CONN;
3268
3269	$self->SUPER::_draw;	3541	$self->SUPER::_draw;
3270		3542
3271	my $face;	3543	if (my $tex = $self->{tex}) {
3272
3273	if ($self->{frame}) {
3274	my $anim = $::CONN->{anim}[$self->{anim}];
3275
3276	$face = $anim->[ $self->{frame} % @$anim ]
3277	if $anim && @$anim;
3278	}
3279
3280	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3281
3282	if ($tex) {
3283	glEnable GL_TEXTURE_2D;	3544	glEnable GL_TEXTURE_2D;
3284	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3545	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3285	glColor 0, 0, 0, 1;	3546	glColor 0, 0, 0, 1;
3286	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3547	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3287	glDisable GL_TEXTURE_2D;	3548	glDisable GL_TEXTURE_2D;
…		…
3289	}	3550	}
3290		3551
3291	sub destroy {	3552	sub destroy {
3292	my ($self) = @_;	3553	my ($self) = @_;
3293		3554
3294	$self->{timer}->cancel	3555	(delete $self->{timer})->cancel
3295	if $self->{timer};	3556	if $self->{timer};
3296		3557
3297	$self->SUPER::destroy;	3558	$self->SUPER::destroy;
3298	}	3559	}
3299		3560
…		…
3489	);	3750	);
3490		3751
3491	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3752	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3492	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3753	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3493		3754
		3755	{
		3756	Scalar::Util::weaken (my $wself = $self);
		3757
		3758	$self->{multiplexer}->connect (c_add => sub {
		3759	my ($mplex, $widgets) = @_;
		3760
		3761	for my $child (@$widgets) {
		3762	Scalar::Util::weaken $child;
		3763	$child->{c_tab_} ||= do {
		3764	my $tab =
		3765	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3766	? $child->{c_tab}
		3767	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3768
		3769	$tab->connect (activate => sub {
		3770	$wself->set_current_page ($child);
		3771	});
		3772
		3773	$tab
		3774	};
		3775
		3776	$self->{buttonbar}->add ($child->{c_tab_});
		3777	}
		3778	});
		3779
		3780	$self->{multiplexer}->connect (c_remove => sub {
		3781	my ($mplex, $widgets) = @_;
		3782
		3783	for my $child (@$widgets) {
		3784	$wself->{buttonbar}->remove ($child->{c_tab_});
		3785	}
		3786	});
		3787	}
		3788
3494	$self	3789	$self
3495	}	3790	}
3496		3791
3497	sub add {	3792	sub add {
		3793	my ($self, @widgets) = @_;
		3794
		3795	$self->{multiplexer}->add (@widgets)
		3796	}
		3797
		3798	sub remove {
		3799	my ($self, @widgets) = @_;
		3800
		3801	$self->{multiplexer}->remove (@widgets)
		3802	}
		3803
		3804	sub add_tab {
3498	my ($self, $title, $widget, $tooltip) = @_;	3805	my ($self, $title, $widget, $tooltip) = @_;
3499		3806
3500	Scalar::Util::weaken $self;	3807	$title = [$title, $tooltip] unless ref $title;
		3808	$widget->{c_tab} = $title;
3501		3809
3502	$self->{buttonbar}->add (new CFPlus::UI::Button
3503	markup => $title,
3504	tooltip => $tooltip,
3505	on_activate => sub { $self->set_current_page ($widget) },
3506	);
3507
3508	$self->{multiplexer}->add ($widget);	3810	$self->add ($widget);
3509	}	3811	}
3510		3812
3511	sub get_current_page {	3813	sub get_current_page {
3512	my ($self) = @_;	3814	my ($self) = @_;
3513		3815
…		…
3589	my $self = $class->SUPER::new (	3891	my $self = $class->SUPER::new (
3590	fontsize => 0.8,	3892	fontsize => 0.8,
3591	@_,	3893	@_,
3592	);	3894	);
3593		3895
3594	Scalar::Util::weaken (my $this = $self);	3896	CFPlus::weaken (my $this = $self);
3595		3897
3596	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3898	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3597		3899
3598	$self	3900	$self
3599	}	3901	}
…		…
3722	$self->SUPER::destroy;	4024	$self->SUPER::destroy;
3723	}	4025	}
3724		4026
3725	#############################################################################	4027	#############################################################################
3726		4028
3727	package CFPlus::UI::Inventory;
3728
3729	our @ISA = CFPlus::UI::Table::;
3730
3731	sub new {
3732	my $class = shift;
3733
3734	my $self = $class->SUPER::new (
3735	col_expand => [0, 1, 0],
3736	items => [],
3737	@_,
3738	);
3739
3740	$self->set_sort_order (undef);
3741
3742	$self
3743	}
3744
3745	sub update_items {
3746	my ($self) = @_;
3747
3748	$self->clear;
3749
3750	my @item = $self->{sort}->(@{ $self->{items} });
3751
3752	my @adds;
3753	my $row = 0;
3754	for my $item ($self->{sort}->(@{ $self->{items} })) {
3755	CFPlus::Item::update_widgets $item;
3756
3757	push @adds, 0, $row, $item->{face_widget};
3758	push @adds, 1, $row, $item->{desc_widget};
3759	push @adds, 2, $row, $item->{weight_widget};
3760
3761	$row++;
3762	}
3763
3764	$self->add (@adds);
3765	}
3766
3767	sub set_sort_order {
3768	my ($self, $order) = @_;
3769
3770	$self->{sort} = $order ||= sub {
3771	sort {
3772	$a->{type} <=> $b->{type}
3773	or $a->{name} cmp $b->{name}
3774	} @_
3775	};
3776
3777	$self->update_items;
3778	}
3779
3780	sub set_items {
3781	my ($self, $items) = @_;
3782
3783	$self->{items} = [$items ? values %$items : ()];
3784	$self->update_items;
3785	}
3786
3787	#############################################################################
3788
3789	package CFPlus::UI::SpellList;
3790
3791	our @ISA = CFPlus::UI::Table::;
3792
3793	sub new {
3794	my $class = shift;
3795
3796	my $self = $class->SUPER::new (
3797	binding => [],
3798	commands => [],
3799	@_,
3800	)
3801	}
3802
3803	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3804
3805	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3806	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3807	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3808	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3809	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3810	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3811	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3812	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3813	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3814	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3815
3816	sub rebuild_spell_list {
3817	my ($self) = @_;
3818
3819	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3820	$self->clear;
3821
3822	return unless $::CONN;
3823
3824	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3825	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3826	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3827	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3828	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3829
3830	my $row = 0;
3831
3832	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3833	my $spell = $self->{spell}{$_};
3834
3835	$row++;
3836
3837	my $spell_cb = sub {
3838	my ($widget, $ev) = @_;
3839
3840	if ($ev->{button} == 1) {
3841	$::CONN->user_send ("cast $spell->{name}");
3842	} elsif ($ev->{button} == 2) {
3843	$::CONN->user_send ("invoke $spell->{name}");
3844	} elsif ($ev->{button} == 3) {
3845	(new CFPlus::UI::Menu
3846	items => [
3847	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3848	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3849	],
3850	)->popup ($ev);
3851	} else {
3852	return 0;
3853	}
3854
3855	1
3856	};
3857
3858	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3859
3860	#TODO: add path info to tooltip
3861	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3862
3863	$self->add (0, $row, new CFPlus::UI::Face
3864	face => $spell->{face},
3865	can_hover => 1,
3866	can_events => 1,
3867	tooltip => $tooltip,
3868	on_button_down => $spell_cb,
3869	);
3870
3871	$self->add (1, $row, new CFPlus::UI::Label
3872	expand => 1,
3873	text => $spell->{name},
3874	can_hover => 1,
3875	can_events => 1,
3876	tooltip => $tooltip,
3877	on_button_down => $spell_cb,
3878	);
3879
3880	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3881	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3882	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3883	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3884	}
3885	});
3886	}
3887
3888	sub add_spell {
3889	my ($self, $spell) = @_;
3890
3891	$self->{spell}->{$spell->{name}} = $spell;
3892	$self->rebuild_spell_list;
3893	}
3894
3895	sub remove_spell {
3896	my ($self, $spell) = @_;
3897
3898	delete $self->{spell}->{$spell->{name}};
3899	$self->rebuild_spell_list;
3900	}
3901
3902	sub clear_spells {
3903	my ($self) = @_;
3904
3905	$self->{spell} = {};
3906	$self->rebuild_spell_list;
3907	}
3908
3909	#############################################################################
3910
3911	package CFPlus::UI::Root;	4029	package CFPlus::UI::Root;
3912		4030
3913	our @ISA = CFPlus::UI::Container::;	4031	our @ISA = CFPlus::UI::Container::;
3914		4032
3915	use List::Util qw(min max);	4033	use List::Util qw(min max);
…		…
3922	my $self = $class->SUPER::new (	4040	my $self = $class->SUPER::new (
3923	visible => 1,	4041	visible => 1,
3924	@_,	4042	@_,
3925	);	4043	);
3926		4044
3927	Scalar::Util::weaken ($self->{root} = $self);	4045	CFPlus::weaken ($self->{root} = $self);
3928		4046
3929	$self	4047	$self
3930	}	4048	}
3931		4049
3932	sub size_request {	4050	sub size_request {
…		…
4027	while ($self->{refresh_hook}) {	4145	while ($self->{refresh_hook}) {
4028	$_->()	4146	$_->()
4029	for values %{delete $self->{refresh_hook}};	4147	for values %{delete $self->{refresh_hook}};
4030	}	4148	}
4031		4149
4032	if ($self->{realloc}) {	4150	while ($self->{realloc}) {
4033	my %queue;	4151	my %queue;
4034	my @queue;	4152	my @queue;
4035	my $widget;	4153	my $widget;
4036		4154
4037	outer:	4155	outer:
…		…
4084	}	4202	}
4085	}	4203	}
4086		4204
4087	delete $self->{realloc}{$widget+0};	4205	delete $self->{realloc}{$widget+0};
4088	}	4206	}
4089	}
4090		4207
4091	while (my $size_alloc = delete $self->{size_alloc}) {	4208	while (my $size_alloc = delete $self->{size_alloc}) {
4092	my @queue = sort { $b->{visible} <=> $a->{visible} }	4209	my @queue = sort { $a->{visible} <=> $b->{visible} }
4093	values %$size_alloc;	4210	values %$size_alloc;
4094		4211
4095	while () {	4212	while () {
4096	my $widget = pop @queue || last;	4213	my $widget = pop @queue || last;
4097		4214
4098	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4215	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4099		4216
4100	$w = 0 if $w < 0;
4101	$h = 0 if $h < 0;
4102
4103	$w = max $widget->{min_w}, $w;	4217	$w = max $widget->{min_w}, $w;
4104	$h = max $widget->{min_h}, $h;	4218	$h = max $widget->{min_h}, $h;
4105		4219
4106	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4220	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4107	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4221	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4108		4222
4109	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4223	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4110	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4224	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4111		4225
4112	$w = int $w + 0.5;	4226	$w = int $w + 0.5;
4113	$h = int $h + 0.5;	4227	$h = int $h + 0.5;
4114		4228
4115	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4229	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4116	$widget->{old_w} = $widget->{w};	4230	$widget->{old_w} = $widget->{w};
4117	$widget->{old_h} = $widget->{h};	4231	$widget->{old_h} = $widget->{h};
4118		4232
4119	$widget->{w} = $w;	4233	$widget->{w} = $w;
4120	$widget->{h} = $h;	4234	$widget->{h} = $h;
4121		4235
4122	$widget->emit (size_allocate => $w, $h);	4236	$widget->emit (size_allocate => $w, $h);
		4237	}
4123	}	4238	}
4124	}	4239	}
4125	}	4240	}
4126		4241
4127	while ($self->{post_alloc_hook}) {	4242	while ($self->{post_alloc_hook}) {
4128	$_->()	4243	$_->()
4129	for values %{delete $self->{post_alloc_hook}};	4244	for values %{delete $self->{post_alloc_hook}};
4130	}	4245	}
4131
4132		4246
4133	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4247	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4134	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4248	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4135	glClear GL_COLOR_BUFFER_BIT;	4249	glClear GL_COLOR_BUFFER_BIT;
4136		4250

Diff Legend

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