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.356 by root, Wed Dec 6 00:15:12 2006 UTC vs.
Revision 1.436 by root, Wed Aug 22 21:40:57 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
36	$tip = $tip->($widget) if CODE:: eq ref $tip;
37
38	$TOOLTIP->set_tooltip_from ($widget);	35	$TOOLTIP->set_tooltip_from ($widget);
39	$TOOLTIP->show;	36	$TOOLTIP->show;
40	}	37	}
41		38
42	return;	39	return;
43	}	40	}
44	}	41	}
45	}	42	}
46		43
47	$TOOLTIP->hide;	44	$TOOLTIP->hide;
		45	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48	delete $TOOLTIP->{owner};	46	delete $TOOLTIP->{owner};
49	});	47	});
50		48
51	sub get_layout {	49	sub get_layout {
52	my $layout;	50	my $layout;
…		…
111	}	109	}
112		110
113	if ($GRAB) {	111	if ($GRAB) {
114	if ($ev->{button} == 4 || $ev->{button} == 5) {	112	if ($ev->{button} == 4 || $ev->{button} == 5) {
115	# mousewheel	113	# mousewheel
116	$ev->{dx} = 0;
117	$ev->{dy} = $ev->{button} * 2 - 9;	114	my $delta = $ev->{button} * 2 - 9;
		115	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		116
		117	$ev->{dx} = $shift ? $delta : 0;
		118	$ev->{dy} = $shift ? 0 : $delta;
		119
118	$GRAB->emit (mouse_wheel => $ev);	120	$GRAB->emit (mouse_wheel => $ev);
119	} else {	121	} else {
120	$GRAB->emit (button_down => $ev)	122	$GRAB->emit (button_down => $ev)
121	}	123	}
122	}	124	}
…		…
235	h => undef,	237	h => undef,
236	can_events => 1,	238	can_events => 1,
237	@_	239	@_
238	}, $class;	240	}, $class;
239		241
240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241		243
242	for (keys %$self) {	244	for (keys %$self) {
243	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
244	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
245	}	247	}
…		…
262		264
263	sub destroy {	265	sub destroy {
264	my ($self) = @_;	266	my ($self) = @_;
265		267
266	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
267	%$self = ();	270	%$self = ();
		271	}
		272
		273	sub TO_JSON {
		274	{ __w_ => $_[0]{s_id} }
268	}	275	}
269		276
270	sub show {	277	sub show {
271	my ($self) = @_;	278	my ($self) = @_;
272		279
…		…
313	sub set_visibility {	320	sub set_visibility {
314	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
315		322
316	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
317		324
318	$visible ? $self->hide	325	$visible ? $self->show
319	: $self->show;	326	: $self->hide;
320	}	327	}
321		328
322	sub toggle_visibility {	329	sub toggle_visibility {
323	my ($self) = @_;	330	my ($self) = @_;
324		331
…		…
502		509
503	defined wantarray and CFPlus::guard {	510	defined wantarray and CFPlus::guard {
504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	511	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505	@{ $self->{signal_cb}{$signal} };	512	@{ $self->{signal_cb}{$signal} };
506	}	513	}
		514	}
		515
		516	sub disconnect_all {
		517	my ($self, $signal) = @_;
		518
		519	delete $self->{signal_cb}{$signal};
507	}	520	}
508		521
509	my %has_coords = (	522	my %has_coords = (
510	button_down => 1,	523	button_down => 1,
511	button_up => 1,	524	button_up => 1,
…		…
523	? $args[0]->xy ($self)	536	? $args[0]->xy ($self)
524	: ();	537	: ();
525		538
526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527		540
528	#d##TODO# stop propagating at first true, do not use sum	541	for my $cb (
529	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	542	@{$self->{signal_cb}{$signal} || []}, # before
530	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	543	($self->can ("invoke_$signal") || sub { 1 }), # closure
		544	) {
		545	return $cb->($self, @args, @append) || next;
		546	}
		547
		548	# parent
531	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
532	}	550	}
533		551
534	sub find_widget {	552	#sub find_widget {
535	my ($self, $x, $y) = @_;	553	# in .xs
536
537	return () unless $self->{can_events};
538
539	return $self
540	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
541	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
542
543	()
544	}
545		554
546	sub set_parent {	555	sub set_parent {
547	my ($self, $parent) = @_;	556	my ($self, $parent) = @_;
548		557
549	Scalar::Util::weaken ($self->{parent} = $parent);	558	CFPlus::weaken ($self->{parent} = $parent);
550	$self->set_visible if $parent->{visible};	559	$self->set_visible if $parent->{visible};
551	}	560	}
552		561
553	sub realloc {	562	sub realloc {
554	my ($self) = @_;	563	my ($self) = @_;
…		…
580		589
581	# using global variables seems a bit hacky, but passing through all drawing	590	# using global variables seems a bit hacky, but passing through all drawing
582	# functions seems pointless.	591	# functions seems pointless.
583	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	592	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
584		593
585	sub draw {	594	#sub draw {
586	my ($self) = @_;	595	#CFPlus.xs
587
588	return unless $self->{h} && $self->{w};
589
590	# update screen rectangle
591	local $draw_x = $draw_x + $self->{x};
592	local $draw_y = $draw_y + $self->{y};
593
594	# skip widgets that are entirely outside the drawing area
595	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
596	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
597
598	glPushMatrix;
599	glTranslate $self->{x}, $self->{y}, 0;
600
601	if ($self == $HOVER && $self->{can_hover}) {
602	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
603	glEnable GL_BLEND;
604	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605	glBegin GL_QUADS;
606	glVertex 0 , 0;
607	glVertex $self->{w}, 0;
608	glVertex $self->{w}, $self->{h};
609	glVertex 0 , $self->{h};
610	glEnd;
611	glDisable GL_BLEND;
612	}
613
614	if ($ENV{CFPLUS_DEBUG} & 1) {
615	glPushMatrix;
616	glColor 1, 1, 0, 1;
617	glTranslate 0.375, 0.375;
618	glBegin GL_LINE_LOOP;
619	glVertex 0 , 0;
620	glVertex $self->{w} - 1, 0;
621	glVertex $self->{w} - 1, $self->{h} - 1;
622	glVertex 0 , $self->{h} - 1;
623	glEnd;
624	glPopMatrix;
625	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
626	}
627
628	$self->_draw;
629	glPopMatrix;
630	}
631		596
632	sub _draw {	597	sub _draw {
633	my ($self) = @_;	598	my ($self) = @_;
634		599
635	warn "no draw defined for $self\n";	600	warn "no draw defined for $self\n";
…		…
638	sub DESTROY {	603	sub DESTROY {
639	my ($self) = @_;	604	my ($self) = @_;
640		605
641	return if CFPlus::in_destruct;	606	return if CFPlus::in_destruct;
642		607
643	delete $WIDGET{$self+0};	608	local $@;
644
645	eval { $self->destroy };	609	eval { $self->destroy };
646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	610	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		611
		612	delete $WIDGET{$self+0};
647	}	613	}
648		614
649	#############################################################################	615	#############################################################################
650		616
651	package CFPlus::UI::DrawBG;	617	package CFPlus::UI::DrawBG;
…		…
655	use strict;	621	use strict;
656	use CFPlus::OpenGL;	622	use CFPlus::OpenGL;
657		623
658	sub new {	624	sub new {
659	my $class = shift;	625	my $class = shift;
660
661	# range [value, low, high, page]
662		626
663	$class->SUPER::new (	627	$class->SUPER::new (
664	#bg => [0, 0, 0, 0.2],	628	#bg => [0, 0, 0, 0.2],
665	#active_bg => [1, 1, 1, 0.5],	629	#active_bg => [1, 1, 1, 0.5],
666	@_	630	@_
…		…
678	my ($w, $h) = @$self{qw(w h)};	642	my ($w, $h) = @$self{qw(w h)};
679		643
680	glEnable GL_BLEND;	644	glEnable GL_BLEND;
681	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	645	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
682	glColor_premultiply @$color;	646	glColor_premultiply @$color;
683
684	glBegin GL_QUADS;
685	glVertex 0 , 0;
686	glVertex 0 , $h;
687	glVertex $w, $h;	647	glRect 0, 0, $w, $h;
688	glVertex $w, 0;
689	glEnd;
690
691	glDisable GL_BLEND;	648	glDisable GL_BLEND;
692	}	649	}
693	}	650	}
694		651
695	#############################################################################	652	#############################################################################
…		…
727	can_events => 0,	684	can_events => 0,
728	%arg,	685	%arg,
729	);	686	);
730		687
731	$self->add (@$children)	688	$self->add (@$children)
732	if $children;	689	if $children && @$children;
733		690
734	$self	691	$self
735	}	692	}
736		693
737	sub realloc {	694	sub realloc {
…		…
746	my ($self, @widgets) = @_;	703	my ($self, @widgets) = @_;
747		704
748	$_->set_parent ($self)	705	$_->set_parent ($self)
749	for @widgets;	706	for @widgets;
750		707
		708	# TODO: only do this in widgets that need it, e.g. root, fixed
751	use sort 'stable';	709	use sort 'stable';
752		710
753	$self->{children} = [	711	$self->{children} = [
754	sort { $a->{z} <=> $b->{z} }	712	sort { $a->{z} <=> $b->{z} }
755	@{$self->{children}}, @widgets	713	@{$self->{children}}, @widgets
756	];	714	];
757		715
758	$self->realloc;	716	$self->realloc;
		717
		718	$self->emit (c_add => \@widgets);
		719
		720	map $_+0, @widgets
759	}	721	}
760		722
761	sub children {	723	sub children {
762	@{ $_[0]{children} }	724	@{ $_[0]{children} }
763	}	725	}
764		726
765	sub remove {	727	sub remove {
766	my ($self, $child) = @_;	728	my ($self, @widgets) = @_;
767		729
		730	$self->emit (c_remove => \@widgets);
		731
		732	for my $child (@widgets) {
768	delete $child->{parent};	733	delete $child->{parent};
769	$child->hide;	734	$child->hide;
770
771	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	735	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		736	}
772		737
773	$self->realloc;	738	$self->realloc;
774	}	739	}
775		740
776	sub clear {	741	sub clear {
777	my ($self) = @_;	742	my ($self) = @_;
778		743
779	my $children = delete $self->{children};	744	my $children = $self->{children};
780	$self->{children} = [];	745	$self->{children} = [];
781		746
782	for (@$children) {	747	for (@$children) {
783	delete $_->{parent};	748	delete $_->{parent};
784	$_->hide;	749	$_->hide;
…		…
804	}	769	}
805		770
806	sub _draw {	771	sub _draw {
807	my ($self) = @_;	772	my ($self) = @_;
808		773
809	$_->draw for @{$self->{children}};	774	$_->draw for $self->visible_children;
810	}	775	}
811		776
812	#############################################################################	777	#############################################################################
813		778
814	package CFPlus::UI::Bin;	779	package CFPlus::UI::Bin;
…		…
824	}	789	}
825		790
826	sub add {	791	sub add {
827	my ($self, $child) = @_;	792	my ($self, $child) = @_;
828		793
829	$self->SUPER::remove ($_) for @{ $self->{children} };	794	$self->clear;
830	$self->SUPER::add ($child);	795	$self->SUPER::add ($child);
831	}	796	}
832		797
833	sub remove {	798	sub remove {
834	my ($self, $widget) = @_;	799	my ($self, $widget) = @_;
…		…
924	}	889	}
925		890
926	#############################################################################	891	#############################################################################
927		892
928	package CFPlus::UI::ViewPort;	893	package CFPlus::UI::ViewPort;
		894
		895	use List::Util qw(min max);
929		896
930	our @ISA = CFPlus::UI::Window::;	897	our @ISA = CFPlus::UI::Window::;
931		898
932	sub new {	899	sub new {
933	my $class = shift;	900	my $class = shift;
…		…
942	sub size_request {	909	sub size_request {
943	my ($self) = @_;	910	my ($self) = @_;
944		911
945	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	912	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946		913
947	$w = 10 if $self->{scroll_x};	914	$w = 1 if $self->{scroll_x};
948	$h = 10 if $self->{scroll_y};	915	$h = 1 if $self->{scroll_y};
949		916
950	($w, $h)	917	($w, $h)
951	}	918	}
952		919
953	sub invoke_size_allocate {	920	sub invoke_size_allocate {
…		…
965	}	932	}
966		933
967	sub set_offset {	934	sub set_offset {
968	my ($self, $x, $y) = @_;	935	my ($self, $x, $y) = @_;
969		936
		937	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		938	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		939
		940	if ($x != $self->{view_x} or $y != $self->{view_y}) {
970	$self->{view_x} = int $x;	941	$self->{view_x} = $x;
971	$self->{view_y} = int $y;	942	$self->{view_y} = $y;
972		943
		944	$self->emit (changed => $x, $y);
973	$self->update;	945	$self->update;
		946	}
		947	}
		948
		949	sub set_center {
		950	my ($self, $x, $y) = @_;
		951
		952	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		953	}
		954
		955	sub make_visible {
		956	my ($self, $x, $y, $border) = @_;
		957
		958	if ( $x < $self->{view_x} + $self->{w} * $border
		959	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		960	|| $y < $self->{view_y} + $self->{h} * $border
		961	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		962	) {
		963	$self->set_center ($x, $y);
		964	}
974	}	965	}
975		966
976	# hmm, this does not work for topleft of $self... but we should not ask for that	967	# hmm, this does not work for topleft of $self... but we should not ask for that
977	sub coord2local {	968	sub coord2local {
978	my ($self, $x, $y) = @_;	969	my ($self, $x, $y) = @_;
…		…
993	my ($self, $x, $y) = @_;	984	my ($self, $x, $y) = @_;
994		985
995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	986	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	987	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
997	) {	988	) {
998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	989	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
999	} else {	990	} else {
1000	$self->CFPlus::UI::Base::find_widget ($x, $y)	991	$self->CFPlus::UI::Base::find_widget ($x, $y)
1001	}	992	}
1002	}	993	}
1003		994
…		…
1014		1005
1015	#############################################################################	1006	#############################################################################
1016		1007
1017	package CFPlus::UI::ScrolledWindow;	1008	package CFPlus::UI::ScrolledWindow;
1018		1009
1019	our @ISA = CFPlus::UI::HBox::;	1010	our @ISA = CFPlus::UI::Table::;
1020		1011
1021	sub new {	1012	sub new {
1022	my ($class, %arg) = @_;	1013	my ($class, %arg) = @_;
1023		1014
1024	my $child = delete $arg{child};	1015	my $child = delete $arg{child};
1025		1016
1026	my $self;	1017	my $self;
1027		1018
1028	my $slider = new CFPlus::UI::Slider	1019	my $hslider = new CFPlus::UI::Slider
		1020	c_col => 0,
		1021	c_row => 1,
		1022	vertical => 0,
		1023	range => [0, 0, 1, 0.01], # HACK fix
		1024	on_changed => sub {
		1025	$self->{hpos} = $_[1];
		1026	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1027	},
		1028	;
		1029
		1030	my $vslider = new CFPlus::UI::Slider
		1031	c_col => 1,
		1032	c_row => 0,
1029	vertical => 1,	1033	vertical => 1,
1030	range => [0, 0, 1, 0.01], # HACK fix	1034	range => [0, 0, 1, 0.01], # HACK fix
1031	on_changed => sub {	1035	on_changed => sub {
1032	$self->{vp}->set_offset (0, $_[1]);	1036	$self->{vpos} = $_[1];
		1037	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033	},	1038	},
1034	;	1039	;
1035		1040
1036	$self = $class->SUPER::new (	1041	$self = $class->SUPER::new (
1037	vp => (new CFPlus::UI::ViewPort expand => 1),	1042	scroll_x => 0,
		1043	scroll_y => 1,
1038	can_events => 1,	1044	can_events => 1,
1039	slider => $slider,	1045	hslider => $hslider,
		1046	vslider => $vslider,
		1047	col_expand => [1, 0],
		1048	row_expand => [1, 0],
1040	%arg,	1049	%arg,
1041	);	1050	);
1042		1051
		1052	$self->{vp} = new CFPlus::UI::ViewPort
		1053	c_col => 0,
		1054	c_row => 0,
		1055	expand => 1,
		1056	scroll_x => $self->{scroll_x},
		1057	scroll_y => $self->{scroll_y},
		1058	on_changed => sub {
		1059	my ($vp, $x, $y) = @_;
		1060
		1061	$vp->{parent}{hslider}->set_value ($x);
		1062	$vp->{parent}{vslider}->set_value ($y);
		1063
		1064	0
		1065	},
		1066	on_size_allocate => sub {
		1067	my ($vp, $w, $h) = @_;
		1068	$vp->{parent}->update_slider;
		1069	0
		1070	},
		1071	;
		1072
1043	$self->SUPER::add ($self->{vp}, $self->{slider});	1073	$self->SUPER::add ($self->{vp});
		1074
1044	$self->add ($child) if $child;	1075	$self->add ($child) if $child;
1045		1076
1046	$self	1077	$self
1047	}	1078	}
1048
1049	#TODO# update range on size_allocate depending on child
1050		1079
1051	sub add {	1080	sub add {
1052	my ($self, $widget) = @_;	1081	my ($self, $widget) = @_;
1053		1082
1054	$self->{vp}->add ($self->{child} = $widget);	1083	$self->{vp}->add ($self->{child} = $widget);
1055	}	1084	}
1056		1085
		1086	sub set_offset { shift->{vp}->set_offset (@_) }
		1087	sub set_center { shift->{vp}->set_center (@_) }
		1088	sub make_visible { shift->{vp}->make_visible (@_) }
		1089
		1090	sub update_slider {
		1091	my ($self) = @_;
		1092
		1093	my $child = ($self->{vp} or return)->child;
		1094
		1095	if ($self->{scroll_x}) {
		1096	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1097	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1098
		1099	my $visible = $w1 > $w2;
		1100	if ($visible != $self->{hslider_visible}) {
		1101	$self->{hslider_visible} = $visible;
		1102	$visible ? $self->SUPER::add ($self->{hslider})
		1103	: $self->SUPER::remove ($self->{hslider});
		1104	}
		1105	}
		1106
		1107	if ($self->{scroll_y}) {
		1108	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1109	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1110
		1111	my $visible = $h1 > $h2;
		1112	if ($visible != $self->{vslider_visible}) {
		1113	$self->{vslider_visible} = $visible;
		1114	$visible ? $self->SUPER::add ($self->{vslider})
		1115	: $self->SUPER::remove ($self->{vslider});
		1116	}
		1117	}
		1118	}
		1119
		1120	sub start_dragging {
		1121	my ($self, $ev) = @_;
		1122
		1123	$self->grab_focus;
		1124
		1125	my $ox = $self->{vp}{view_x};
		1126	my $oy = $self->{vp}{view_y};
		1127
		1128	$self->{motion} = sub {
		1129	my ($ev, $x, $y) = @_;
		1130
		1131	$ox -= $ev->{xrel};
		1132	$oy -= $ev->{yrel};
		1133
		1134	$self->{vp}->set_offset ($ox, $oy);
		1135	};
		1136	}
		1137
1057	sub invoke_mouse_wheel {	1138	sub invoke_mouse_wheel {
1058	my ($self, $ev) = @_;	1139	my ($self, $ev) = @_;
1059		1140
1060	return 0 unless $ev->{dy}; # only vertical movements
1061
1062	$self->{slider}->emit (mouse_wheel => $ev);	1141	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1142	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1063		1143
1064	1	1144	1
1065	}	1145	}
1066		1146
1067	sub update_slider {	1147	sub invoke_button_down {
1068	my ($self) = @_;	1148	my ($self, $ev, $x, $y) = @_;
1069		1149
1070	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1150	if ($ev->{button} == 2) {
1071	}	1151	$self->start_dragging ($ev);
		1152	return 1;
		1153	}
1072		1154
1073	sub update {	1155	0
1074	my ($self) = @_;	1156	}
1075		1157
1076	$self->SUPER::update;	1158	sub invoke_button_up {
		1159	my ($self, $ev, $x, $y) = @_;
1077		1160
1078	$self->update_slider;	1161	if (delete $self->{motion}) {
		1162	return 1;
		1163	}
		1164
		1165	0
		1166	}
		1167
		1168	sub invoke_mouse_motion {
		1169	my ($self, $ev, $x, $y) = @_;
		1170
		1171	if ($self->{motion}) {
		1172	$self->{motion}->($ev, $x, $y);
		1173	return 1;
		1174	}
		1175
		1176	0
1079	}	1177	}
1080		1178
1081	sub invoke_size_allocate {	1179	sub invoke_size_allocate {
1082	my ($self, $w, $h) = @_;	1180	my ($self, $w, $h) = @_;
1083		1181
1084	$self->update_slider;	1182	$self->update_slider;
1085
1086	$self->SUPER::invoke_size_allocate ($w, $h)	1183	$self->SUPER::invoke_size_allocate ($w, $h)
1087	}	1184	}
1088		1185
1089	#############################################################################	1186	#############################################################################
1090		1187
…		…
1110	my ($w, $h) = @$self{qw(w h)};	1207	my ($w, $h) = @$self{qw(w h)};
1111		1208
1112	glEnable GL_BLEND;	1209	glEnable GL_BLEND;
1113	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1210	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1114	glColor_premultiply @{ $self->{bg} };	1211	glColor_premultiply @{ $self->{bg} };
1115
1116	glBegin GL_QUADS;
1117	glVertex 0 , 0;
1118	glVertex 0 , $h;
1119	glVertex $w, $h;	1212	glRect 0, 0, $w, $h;
1120	glVertex $w, 0;
1121	glEnd;
1122
1123	glDisable GL_BLEND;	1213	glDisable GL_BLEND;
1124	}	1214	}
1125		1215
1126	$self->SUPER::_draw;	1216	$self->SUPER::_draw;
1127	}	1217	}
…		…
1240		1330
1241	my @border =	1331	my @border =
1242	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1332	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1243	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1333	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244		1334
		1335	my @icon =
		1336	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1337	qw(x1_move.png x1_resize.png);
		1338
1245	sub new {	1339	sub new {
1246	my ($class, %arg) = @_;	1340	my ($class, %arg) = @_;
1247		1341
1248	my $self = $class->SUPER::new (	1342	my $self = $class->SUPER::new (
1249	bg => [1, 1, 1, 1],	1343	bg => [1, 1, 1, 1],
…		…
1417	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1511	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1418		1512
1419	my $border = $self->border;	1513	my $border = $self->border;
1420		1514
1421	glColor @{ $self->{border_bg} };	1515	glColor @{ $self->{border_bg} };
1422	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1516	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1423	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1517	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1424	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1518	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1425	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1519	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1520
		1521	# move
		1522	my $w2 = ($w - $border) * .5;
		1523	my $h2 = ($h - $border) * .5;
		1524	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1525	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1526	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1527
		1528	# resize
		1529	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1530	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1531	unless $self->{has_close_button};
		1532	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1533	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1426		1534
1427	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1535	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1428	glColor @{ $self->{bg} };	1536	glColor @{ $self->{bg} };
1429		1537
1430	# TODO: repeat texture not scale	1538	# TODO: repeat texture not scale
…		…
1451		1559
1452	#############################################################################	1560	#############################################################################
1453		1561
1454	package CFPlus::UI::Table;	1562	package CFPlus::UI::Table;
1455		1563
1456	our @ISA = CFPlus::UI::Base::;	1564	our @ISA = CFPlus::UI::Container::;
1457		1565
1458	use List::Util qw(max sum);	1566	use List::Util qw(max sum);
1459		1567
1460	use CFPlus::OpenGL;	1568	use CFPlus::OpenGL;
1461		1569
1462	sub new {	1570	sub new {
1463	my $class = shift;	1571	my $class = shift;
1464		1572
1465	$class->SUPER::new (	1573	$class->SUPER::new (
1466	col_expand => [],	1574	col_expand => [],
		1575	row_expand => [],
1467	@_,	1576	@_,
1468	)	1577	)
1469	}	1578	}
1470		1579
1471	sub children {
1472	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473	}
1474
1475	sub add {	1580	sub add {
		1581	my ($self, @widgets) = @_;
		1582
		1583	for my $child (@widgets) {
		1584	$child->{c_rowspan} ||= 1;
		1585	$child->{c_colspan} ||= 1;
		1586	}
		1587
		1588	$self->SUPER::add (@widgets);
		1589	}
		1590
		1591	sub add_at {
1476	my ($self) = shift;	1592	my $self = shift;
		1593
		1594	my @widgets;
1477		1595
1478	while (@_) {	1596	while (@_) {
1479	my ($x, $y, $child) = splice @_, 0, 3, ();	1597	my ($col, $row, $child) = splice @_, 0, 3, ();
1480	$child->set_parent ($self);
1481	$self->{children}[$y][$x] = $child;
1482	}
1483		1598
1484	$self->{force_realloc} = 1;	1599	$child->{c_row} = $row;
1485	$self->{force_size_alloc} = 1;	1600	$child->{c_col} = $col;
1486	$self->realloc;
1487	}
1488		1601
1489	sub remove {	1602	push @widgets, $child;
		1603	}
		1604
		1605	$self->add (@widgets);
		1606	}
		1607
		1608	sub get_wh {
1490	my ($self, $child) = @_;	1609	my ($self) = @_;
1491		1610
1492	# TODO: not yet implemented	1611	my (@w, @h);
1493	}
1494
1495	# TODO: move to container class maybe? send children a signal on removal?
1496	sub clear {
1497	my ($self) = @_;
1498		1612
1499	my @children = $self->children;	1613	my @children = $self->children;
1500	delete $self->{children};	1614
		1615	# first pass, columns
		1616	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1617	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1618
		1619	my $sw = sum @w[$c .. $c + $cs - 1];
		1620
		1621	if ($w > $sw) {
		1622	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1623	}
1501		1624	}
1502	for (@children) {
1503	delete $_->{parent};
1504	$_->hide;
1505	}
1506		1625
1507	$self->realloc;	1626	# second pass, rows
1508	}	1627	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1509
1510	sub get_wh {
1511	my ($self) = @_;
1512
1513	my (@w, @h);
1514
1515	for my $y (0 .. $#{$self->{children}}) {
1516	my $row = $self->{children}[$y]
1517	or next;
1518
1519	for my $x (0 .. $#$row) {
1520	my $widget = $row->[$x]
1521	or next;
1522	my ($w, $h) = @$widget{qw(req_w req_h)};	1628	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1523		1629
1524	$w[$x] = max $w[$x], $w;	1630	my $sh = sum @h[$r .. $r + $rs - 1];
1525	$h[$y] = max $h[$y], $h;	1631
		1632	if ($h > $sh) {
		1633	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1526	}	1634	}
1527	}	1635	}
1528		1636
1529	(\@w, \@h)	1637	(\@w, \@h)
1530	}	1638	}
…		…
1546	my ($ws, $hs) = $self->get_wh;	1654	my ($ws, $hs) = $self->get_wh;
1547		1655
1548	my $req_w = (sum @$ws) || 1;	1656	my $req_w = (sum @$ws) || 1;
1549	my $req_h = (sum @$hs) || 1;	1657	my $req_h = (sum @$hs) || 1;
1550		1658
1551	# TODO: nicer code && do row_expand	1659	# now linearly scale the rows/columns to the allocated size
1552	my @col_expand = @{$self->{col_expand}};	1660	my @col_expand = @{$self->{col_expand}};
1553	@col_expand = (1) x @$ws unless @col_expand;	1661	@col_expand = (1) x @$ws unless @col_expand;
1554	my $col_expand = (sum @col_expand) || 1;	1662	my $col_expand = (sum @col_expand) || 1;
1555		1663
1556	# linearly scale sizes
1557	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1664	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559		1665
1560	CFPlus::UI::harmonize $ws;	1666	CFPlus::UI::harmonize $ws;
		1667
		1668	my @row_expand = @{$self->{row_expand}};
		1669	@row_expand = (1) x @$ws unless @row_expand;
		1670	my $row_expand = (sum @row_expand) || 1;
		1671
		1672	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1673
1561	CFPlus::UI::harmonize $hs;	1674	CFPlus::UI::harmonize $hs;
1562		1675
1563	my $y;	1676	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1677	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1564		1678
1565	for my $r (0 .. $#{$self->{children}}) {	1679	for my $widget ($self->children) {
1566	my $row = $self->{children}[$r]	1680	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1567	or next;
1568		1681
1569	my $x = 0;	1682	$widget->configure (
1570	my $row_h = $hs->[$r];	1683	$x[$c], $y[$r],
		1684	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1571		1685	);
1572	for my $c (0 .. $#$row) {	1686	}
1573	my $col_w = $ws->[$c];
1574		1687
1575	if (my $widget = $row->[$c]) {	1688	1
1576	$widget->configure ($x, $y, $col_w, $row_h);	1689	}
1577	}
1578		1690
1579	$x += $col_w;	1691	#############################################################################
		1692
		1693	package CFPlus::UI::Fixed;
		1694
		1695	use List::Util qw(min max);
		1696
		1697	our @ISA = CFPlus::UI::Container::;
		1698
		1699	sub _scale($$$) {
		1700	my ($rel, $val, $max) = @_;
		1701
		1702	$rel ? $val * $max : $val
		1703	}
		1704
		1705	sub size_request {
		1706	my ($self) = @_;
		1707
		1708	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1709
		1710	# determine overall size by querying abs widgets
		1711	for my $child ($self->visible_children) {
		1712	unless ($child->{c_rel}) {
		1713	my $x = $child->{c_x};
		1714	my $y = $child->{c_y};
		1715
		1716	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1717	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1580	}	1718	}
		1719	}
1581		1720
1582	$y += $row_h;	1721	my $W = $x2 - $x1;
		1722	my $H = $y2 - $y1;
		1723
		1724	# now layout remaining widgets
		1725	for my $child ($self->visible_children) {
		1726	if ($child->{c_rel}) {
		1727	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1728	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1729
		1730	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1731	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1732	}
		1733	}
		1734
		1735	my $W = $x2 - $x1;
		1736	my $H = $y2 - $y1;
		1737
		1738	($W, $H)
		1739	}
		1740
		1741	sub invoke_size_allocate {
		1742	my ($self, $W, $H) = @_;
		1743
		1744	for my $child ($self->visible_children) {
		1745	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1746	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1747
		1748	$x += $child->{c_halign} * $child->{req_w};
		1749	$y += $child->{c_valign} * $child->{req_h};
		1750
		1751	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1583	}	1752	}
1584		1753
1585	1	1754	1
1586	}	1755	}
1587		1756
1588	sub find_widget {
1589	my ($self, $x, $y) = @_;
1590
1591	$x -= $self->{x};
1592	$y -= $self->{y};
1593
1594	my $res;
1595
1596	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1597	$res = $_->find_widget ($x, $y)
1598	and return $res;
1599	}
1600
1601	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1602	}
1603
1604	sub _draw {
1605	my ($self) = @_;
1606
1607	for (grep $_, @{$self->{children}}) {
1608	$_->draw for grep $_, @$_;
1609	}
1610	}
1611
1612	#############################################################################	1757	#############################################################################
1613		1758
1614	package CFPlus::UI::Box;	1759	package CFPlus::UI::Box;
1615		1760
1616	our @ISA = CFPlus::UI::Container::;	1761	our @ISA = CFPlus::UI::Container::;
1617		1762
1618	sub size_request {	1763	sub size_request {
1619	my ($self) = @_;	1764	my ($self) = @_;
		1765
		1766	my @children = $self->visible_children;
1620		1767
1621	$self->{vertical}	1768	$self->{vertical}
1622	? (	1769	? (
1623	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1770	(List::Util::max map $_->{req_w}, @children),
1624	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1771	(List::Util::sum map $_->{req_h}, @children),
1625	)	1772	)
1626	: (	1773	: (
1627	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1774	(List::Util::sum map $_->{req_w}, @children),
1628	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1775	(List::Util::max map $_->{req_h}, @children),
1629	)	1776	)
1630	}	1777	}
1631		1778
1632	sub invoke_size_allocate {	1779	sub invoke_size_allocate {
1633	my ($self, $w, $h) = @_;	1780	my ($self, $w, $h) = @_;
…		…
1757		1904
1758	delete $self->{ox};	1905	delete $self->{ox};
1759	$self->SUPER::realloc;	1906	$self->SUPER::realloc;
1760	}	1907	}
1761		1908
		1909	sub clear {
		1910	my ($self) = @_;
		1911
		1912	$self->set_text ("");
		1913	}
		1914
1762	sub set_text {	1915	sub set_text {
1763	my ($self, $text) = @_;	1916	my ($self, $text) = @_;
1764		1917
1765	return if $self->{text} eq "T$text";	1918	return if $self->{text} eq "T$text";
1766	$self->{text} = "T$text";	1919	$self->{text} = "T$text";
…		…
1872	: ($self->{w} - $size->[0]) * 0.5);	2025	: ($self->{w} - $size->[0]) * 0.5);
1873		2026
1874	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2027	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1875	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2028	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1876	: ($self->{h} - $size->[1]) * 0.5);	2029	: ($self->{h} - $size->[1]) * 0.5);
		2030
		2031	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1877	};	2032	};
1878		2033
1879	my $w = List::Util::min $self->{w} + 4, $size->[0];	2034	# unless ($self->{list}) {
1880	my $h = List::Util::min $self->{h} + 2, $size->[1];	2035	# $self->{list} = CFPlus::OpenGL::glGenList;
1881		2036	# CFPlus::OpenGL::glNewList $self->{list};
1882	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2037	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2038	# CFPlus::OpenGL::glEndList;
		2039	# }
		2040	#
		2041	# CFPlus::OpenGL::glCallList $self->{list};
		2042
		2043	$self->{layout}->draw;
1883	}	2044	}
		2045
		2046	#sub destroy {
		2047	# my ($self) = @_;
		2048	#
		2049	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2050	#
		2051	# $self->SUPER::destroy;
		2052	#}
1884		2053
1885	#############################################################################	2054	#############################################################################
1886		2055
1887	package CFPlus::UI::EntryBase;	2056	package CFPlus::UI::EntryBase;
1888		2057
…		…
1894	my $class = shift;	2063	my $class = shift;
1895		2064
1896	$class->SUPER::new (	2065	$class->SUPER::new (
1897	fg => [1, 1, 1],	2066	fg => [1, 1, 1],
1898	bg => [0, 0, 0, 0.2],	2067	bg => [0, 0, 0, 0.2],
		2068	outline => [0.6, 0.3, 0.1],
1899	active_bg => [1, 1, 1, 0.5],	2069	active_bg => [0, 0, 1, .2],
1900	active_fg => [0, 0, 0],	2070	active_fg => [1, 1, 1],
		2071	active_outline => [1, 1, 0],
1901	can_hover => 1,	2072	can_hover => 1,
1902	can_focus => 1,	2073	can_focus => 1,
1903	valign => 0,	2074	valign => 0,
1904	can_events => 1,	2075	can_events => 1,
		2076	ellipsise => 0,
1905	#text => ...	2077	#text => ...
1906	#hidden => "*",	2078	#hidden => "*",
1907	@_	2079	@_
1908	)	2080	)
1909	}	2081	}
…		…
1953	my $mod = $ev->{mod};	2125	my $mod = $ev->{mod};
1954	my $sym = $ev->{sym};	2126	my $sym = $ev->{sym};
1955	my $uni = $ev->{unicode};	2127	my $uni = $ev->{unicode};
1956		2128
1957	my $text = $self->get_text;	2129	my $text = $self->get_text;
		2130
		2131	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1958		2132
1959	if ($uni == 8) {	2133	if ($uni == 8) {
1960	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2134	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1961	} elsif ($uni == 127) {	2135	} elsif ($uni == 127) {
1962	substr $text, $self->{cursor}, 1, "";	2136	substr $text, $self->{cursor}, 1, "";
1963	} elsif ($sym == CFPlus::SDLK_LEFT) {	2137	} elsif ($sym == CFPlus::SDLK_LEFT) {
1964	--$self->{cursor} if $self->{cursor};	2138	--$self->{cursor} if $self->{cursor};
1965	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2139	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1966	++$self->{cursor} if $self->{cursor} < length $self->{text};	2140	++$self->{cursor} if $self->{cursor} < length $self->{text};
1967	} elsif ($sym == CFPlus::SDLK_HOME) {	2141	} elsif ($sym == CFPlus::SDLK_HOME) {
		2142	# what a hack
1968	$self->{cursor} = 0;	2143	$self->{cursor} =
		2144	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2145	? length $1
		2146	: 0;
1969	} elsif ($sym == CFPlus::SDLK_END) {	2147	} elsif ($sym == CFPlus::SDLK_END) {
		2148	# uh, again
		2149	$self->{cursor} =
		2150	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1970	$self->{cursor} = length $text;	2151	? $self->{cursor} + length $1
		2152	: length $self->{text};
1971	} elsif ($uni == 21) { # ctrl-u	2153	} elsif ($uni == 21) { # ctrl-u
1972	$text = "";	2154	$text = "";
1973	$self->{cursor} = 0;	2155	$self->{cursor} = 0;
1974	} elsif ($uni == 27) {	2156	} elsif ($uni == 27) {
1975	$self->emit ('escape');	2157	$self->emit ('escape');
1976	} elsif ($uni) {	2158	} elsif ($uni == 0x0d) {
		2159	substr $text, $self->{cursor}++, 0, "\012";
		2160	} elsif ($uni >= 0x20) {
1977	substr $text, $self->{cursor}++, 0, chr $uni;	2161	substr $text, $self->{cursor}++, 0, chr $uni;
1978	} else {	2162	} else {
1979	return 0;	2163	return 0;
1980	}	2164	}
1981		2165
1982	$self->_set_text ($text);	2166	$self->_set_text ($text);
1983		2167
1984	$self->realloc;	2168	$self->realloc;
		2169	$self->update;
1985		2170
1986	1	2171	1
1987	}	2172	}
1988		2173
1989	sub invoke_focus_in {	2174	sub invoke_focus_in {
…		…
2031	glColor_premultiply @{$self->{bg}};	2216	glColor_premultiply @{$self->{bg}};
2032	}	2217	}
2033		2218
2034	glEnable GL_BLEND;	2219	glEnable GL_BLEND;
2035	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2220	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2036	glBegin GL_QUADS;
2037	glVertex 0 , 0;
2038	glVertex 0 , $self->{h};
2039	glVertex $self->{w}, $self->{h};	2221	glRect 0, 0, $self->{w}, $self->{h};
2040	glVertex $self->{w}, 0;
2041	glEnd;
2042	glDisable GL_BLEND;	2222	glDisable GL_BLEND;
2043		2223
2044	$self->SUPER::_draw;	2224	$self->SUPER::_draw;
2045		2225
2046	#TODO: force update every cursor change :(	2226	#TODO: force update every cursor change :(
…		…
2048		2228
2049	unless (exists $self->{cur_h}) {	2229	unless (exists $self->{cur_h}) {
2050	my $text = substr $self->{text}, 0, $self->{cursor};	2230	my $text = substr $self->{text}, 0, $self->{cursor};
2051	utf8::encode $text;	2231	utf8::encode $text;
2052		2232
2053	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2233	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2054	}	2234	}
2055		2235
		2236	glColor_premultiply @{$self->{active_fg}};
2056	glBegin GL_LINES;	2237	glBegin GL_LINES;
2057	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2238	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2058	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2239	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2059	glEnd;	2240	glEnd;
		2241
		2242	glLineWidth 3;
		2243	glColor @{$self->{active_outline}};
		2244	glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
		2245	glLineWidth 1;
		2246
		2247	} else {
		2248	glColor @{$self->{outline}};
		2249	glTranslate .375, .375;
		2250	glBegin GL_LINE_STRIP;
		2251	glVertex 0, $self->{h} * .5;
		2252	glVertex 0, $self->{h} - 3;
		2253	glVertex $self->{w} - 1, $self->{h} - 3;
		2254	glVertex $self->{w} - 1, $self->{h} * .5;
		2255	glEnd;
2060	}	2256	}
2061	}	2257	}
		2258
		2259	#############################################################################
2062		2260
2063	package CFPlus::UI::Entry;	2261	package CFPlus::UI::Entry;
2064		2262
2065	our @ISA = CFPlus::UI::EntryBase::;	2263	our @ISA = CFPlus::UI::EntryBase::;
2066		2264
…		…
2069	sub invoke_key_down {	2267	sub invoke_key_down {
2070	my ($self, $ev) = @_;	2268	my ($self, $ev) = @_;
2071		2269
2072	my $sym = $ev->{sym};	2270	my $sym = $ev->{sym};
2073		2271
2074	if ($sym == 13) {	2272	if ($ev->{uni} == 0x0d || $sym == 13) {
2075	unshift @{$self->{history}},	2273	unshift @{$self->{history}},
2076	my $txt = $self->get_text;	2274	my $txt = $self->get_text;
2077		2275
2078	$self->{history_pointer} = -1;	2276	$self->{history_pointer} = -1;
2079	$self->{history_saveback} = '';	2277	$self->{history_saveback} = '';
…		…
2109	1	2307	1
2110	}	2308	}
2111		2309
2112	#############################################################################	2310	#############################################################################
2113		2311
		2312	package CFPlus::UI::TextEdit;
		2313
		2314	our @ISA = CFPlus::UI::EntryBase::;
		2315
		2316	use CFPlus::OpenGL;
		2317
		2318	sub move_cursor_ver {
		2319	my ($self, $dy) = @_;
		2320
		2321	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2322
		2323	$y += $dy;
		2324
		2325	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2326	$self->{cursor} = $index;
		2327	delete $self->{cur_h};
		2328	$self->update;
		2329	return;
		2330	}
		2331	}
		2332
		2333	sub invoke_key_down {
		2334	my ($self, $ev) = @_;
		2335
		2336	my $sym = $ev->{sym};
		2337
		2338	if ($sym == CFPlus::SDLK_UP) {
		2339	$self->move_cursor_ver (-1);
		2340	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2341	$self->move_cursor_ver (+1);
		2342	} else {
		2343	return $self->SUPER::invoke_key_down ($ev)
		2344	}
		2345
		2346	1
		2347	}
		2348
		2349	#############################################################################
		2350
2114	package CFPlus::UI::Button;	2351	package CFPlus::UI::ButtonBin;
2115		2352
2116	our @ISA = CFPlus::UI::Label::;	2353	our @ISA = CFPlus::UI::Bin::;
2117		2354
2118	use CFPlus::OpenGL;	2355	use CFPlus::OpenGL;
2119		2356
2120	my @tex =	2357	my @tex =
2121	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2122	qw(b1_button_active.png);	2359	qw(b1_button_inactive.png b1_button_active.png);
2123		2360
2124	sub new {	2361	sub new {
2125	my $class = shift;	2362	my $class = shift;
2126		2363
2127	$class->SUPER::new (	2364	$class->SUPER::new (
2128	padding_x => 4,
2129	padding_y => 4,
2130	fg => [1, 1, 1],
2131	active_fg => [0, 0, 1],
2132	can_hover => 1,	2365	can_hover => 1,
2133	align => 0,	2366	align => 0,
2134	valign => 0,	2367	valign => 0,
2135	can_events => 1,	2368	can_events => 1,
2136	@_	2369	@_
…		…
2148	}	2381	}
2149		2382
2150	sub _draw {	2383	sub _draw {
2151	my ($self) = @_;	2384	my ($self) = @_;
2152		2385
2153	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2154
2155	glEnable GL_TEXTURE_2D;	2386	glEnable GL_TEXTURE_2D;
2156	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2387	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2157	glColor 0, 0, 0, 1;	2388	glColor 0, 0, 0, 1;
2158		2389
		2390	my $tex = $tex[$GRAB == $self];
2159	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2391	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2392
		2393	glDisable GL_TEXTURE_2D;
		2394
		2395	$self->SUPER::_draw;
		2396	}
		2397
		2398	#############################################################################
		2399
		2400	package CFPlus::UI::Button;
		2401
		2402	our @ISA = CFPlus::UI::Label::;
		2403
		2404	use CFPlus::OpenGL;
		2405
		2406	my @tex =
		2407	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2408	qw(b1_button_inactive.png b1_button_active.png);
		2409
		2410	sub new {
		2411	my $class = shift;
		2412
		2413	$class->SUPER::new (
		2414	padding_x => 4,
		2415	padding_y => 4,
		2416	fg => [1.0, 1.0, 1.0],
		2417	active_fg => [0.8, 0.8, 0.8],
		2418	can_hover => 1,
		2419	align => 0,
		2420	valign => 0,
		2421	can_events => 1,
		2422	@_
		2423	)
		2424	}
		2425
		2426	sub invoke_button_up {
		2427	my ($self, $ev, $x, $y) = @_;
		2428
		2429	$self->emit ("activate")
		2430	if $x >= 0 && $x < $self->{w}
		2431	&& $y >= 0 && $y < $self->{h};
		2432
		2433	1
		2434	}
		2435
		2436	sub _draw {
		2437	my ($self) = @_;
		2438
		2439	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2440
		2441	glEnable GL_TEXTURE_2D;
		2442	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2443	glColor 0, 0, 0, 1;
		2444
		2445	my $tex = $tex[$GRAB == $self];
		2446	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2160		2447
2161	glDisable GL_TEXTURE_2D;	2448	glDisable GL_TEXTURE_2D;
2162		2449
2163	$self->SUPER::_draw;	2450	$self->SUPER::_draw;
2164	}	2451	}
…		…
2251	sub new {	2538	sub new {
2252	my $class = shift;	2539	my $class = shift;
2253		2540
2254	my $self = $class->SUPER::new (	2541	my $self = $class->SUPER::new (
2255	can_events => 0,	2542	can_events => 0,
		2543	scale => 1,
2256	@_,	2544	@_,
2257	);	2545	);
2258		2546
2259	$self->{path} || $self->{tex}	2547	$self->{path} || $self->{tex}
2260	or Carp::croak "'path' or 'tex' attributes required";	2548	or Carp::croak "'path' or 'tex' attributes required";
2261		2549
2262	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2550	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2263	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2551	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2264		2552
2265	Scalar::Util::weaken $texture_cache{$self->{path}};	2553	CFPlus::weaken $texture_cache{$self->{path}};
2266		2554
2267	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2555	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2268		2556
2269	$self	2557	$self
2270	}	2558	}
…		…
2285	}	2573	}
2286		2574
2287	sub size_request {	2575	sub size_request {
2288	my ($self) = @_;	2576	my ($self) = @_;
2289		2577
2290	($self->{tex}{w}, $self->{tex}{h})	2578	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2291	}	2579	}
2292		2580
2293	sub _draw {	2581	sub _draw {
2294	my ($self) = @_;	2582	my ($self) = @_;
2295		2583
…		…
2305	}	2593	}
2306		2594
2307	glEnable GL_TEXTURE_2D;	2595	glEnable GL_TEXTURE_2D;
2308	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2596	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2309		2597
2310	$tex->draw_quad (0, 0, $w, $h);	2598	$tex->draw_quad_alpha (0, 0, $w, $h);
2311		2599
2312	glDisable GL_TEXTURE_2D;	2600	glDisable GL_TEXTURE_2D;
2313	}	2601	}
2314		2602
2315	#############################################################################	2603	#############################################################################
…		…
2334	align => 0,	2622	align => 0,
2335	valign => 0,	2623	valign => 0,
2336	can_events => 1,	2624	can_events => 1,
2337	@_	2625	@_
2338	);	2626	);
		2627	}
		2628
		2629	sub invoke_button_down {
		2630	my ($self, $ev, $x, $y) = @_;
		2631
		2632	1
2339	}	2633	}
2340		2634
2341	sub invoke_button_up {	2635	sub invoke_button_up {
2342	my ($self, $ev, $x, $y) = @_;	2636	my ($self, $ev, $x, $y) = @_;
2343		2637
…		…
2483	glDisable GL_TEXTURE_2D;	2777	glDisable GL_TEXTURE_2D;
2484	}	2778	}
2485		2779
2486	#############################################################################	2780	#############################################################################
2487		2781
		2782	package CFPlus::UI::Progress;
		2783
		2784	our @ISA = CFPlus::UI::Label::;
		2785
		2786	use CFPlus::OpenGL;
		2787
		2788	sub new {
		2789	my ($class, %arg) = @_;
		2790
		2791	my $self = $class->SUPER::new (
		2792	fg => [1, 1, 1],
		2793	bg => [0, 0, 1, 0.2],
		2794	bar => [0.7, 0.5, 0.1, 0.8],
		2795	outline => [0.4, 0.3, 0],
		2796	fontsize => 0.9,
		2797	valign => 0,
		2798	align => 0,
		2799	can_events => 1,
		2800	ellipsise => 1,
		2801	label => "%d%%",
		2802	%arg,
		2803	);
		2804
		2805	$self->set_value ($arg{value} || -1);
		2806
		2807	$self
		2808	}
		2809
		2810	sub set_label {
		2811	my ($self, $label) = @_;
		2812
		2813	return if $self->{label} eq $label;
		2814	$self->{label} = $label;
		2815
		2816	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2817	}
		2818
		2819	sub set_value {
		2820	my ($self, $value) = @_;
		2821
		2822	if ($self->{value} ne $value) {
		2823	$self->{value} = $value;
		2824
		2825	if ($value < 0) {
		2826	$self->set_text ("-");
		2827	} else {
		2828	$self->set_text (sprintf $self->{label}, $value * 100);
		2829	}
		2830
		2831	$self->update;
		2832	}
		2833	}
		2834
		2835	sub _draw {
		2836	my ($self) = @_;
		2837
		2838	glEnable GL_BLEND;
		2839	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2840
		2841	if ($self->{value} >= 0) {
		2842	my $s = 3 + ($self->{w} - 6) * $self->{value};
		2843
		2844	glColor_premultiply @{$self->{bar}};
		2845	glRect 2, 2, $s, $self->{h} - 2;
		2846	glColor_premultiply @{$self->{bg}};
		2847	glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
		2848	}
		2849
		2850	glColor_premultiply @{$self->{outline}};
		2851	glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
		2852
		2853	glDisable GL_BLEND;
		2854
		2855	{
		2856	local $self->{bg}; # do not draw background
		2857	$self->SUPER::_draw;
		2858	}
		2859	}
		2860
		2861	#############################################################################
		2862
		2863	package CFPlus::UI::ExperienceProgress;
		2864
		2865	our @ISA = CFPlus::UI::Progress::;
		2866
		2867	sub new {
		2868	my ($class, %arg) = @_;
		2869
		2870	my $self = $class->SUPER::new (
		2871	tooltip => sub {
		2872	my ($self) = @_;
		2873
		2874	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2875	$self->{lvl},
		2876	::formsep ($self->{exp}),
		2877	::formsep ($self->{nxt}),
		2878	::formsep ($self->{nxt} - $self->{exp}),
		2879	},
		2880	%arg
		2881	);
		2882
		2883	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2884	if $::CONN;
		2885
		2886	$self
		2887	}
		2888
		2889	sub DESTROY {
		2890	my ($self) = @_;
		2891
		2892	delete $::CONN->{on_exp_update}{$self+0}
		2893	if $::CONN;
		2894
		2895	$self->SUPER::DESTROY;
		2896	}
		2897
		2898	sub set_value {
		2899	my ($self, $lvl, $exp) = @_;
		2900
		2901	$self->{lvl} = $lvl;
		2902	$self->{exp} = $exp;
		2903
		2904	my $v = -1;
		2905
		2906	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2907	my $l0 = $table->[$lvl - 1];
		2908	my $l1 = $table->[$lvl];
		2909
		2910	$self->{nxt} = $l1;
		2911
		2912	$v = ($exp - $l0) / ($l1 - $l0);
		2913	}
		2914
		2915	$self->SUPER::set_value ($v);
		2916	}
		2917
		2918	#############################################################################
		2919
2488	package CFPlus::UI::Gauge;	2920	package CFPlus::UI::Gauge;
2489		2921
2490	our @ISA = CFPlus::UI::VBox::;	2922	our @ISA = CFPlus::UI::VBox::;
2491		2923
2492	sub new {	2924	sub new {
…		…
2617		3049
2618	$self->SUPER::invoke_button_down ($ev, $x, $y);	3050	$self->SUPER::invoke_button_down ($ev, $x, $y);
2619		3051
2620	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3052	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2621		3053
2622	$self->invoke_mouse_motion ($ev, $x, $y)	3054	$self->invoke_mouse_motion ($ev, $x, $y);
		3055
		3056	1
2623	}	3057	}
2624		3058
2625	sub invoke_mouse_motion {	3059	sub invoke_mouse_motion {
2626	my ($self, $ev, $x, $y) = @_;	3060	my ($self, $ev, $x, $y) = @_;
2627		3061
…		…
2643	sub invoke_mouse_wheel {	3077	sub invoke_mouse_wheel {
2644	my ($self, $ev) = @_;	3078	my ($self, $ev) = @_;
2645		3079
2646	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3080	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2647		3081
		3082	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3083
2648	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	3084	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2649		3085
2650	! ! $delta	3086	1
2651	}	3087	}
2652		3088
2653	sub update {	3089	sub update {
2654	my ($self) = @_;	3090	my ($self) = @_;
2655		3091
…		…
2763	#font => default_font	3199	#font => default_font
2764	@_,	3200	@_,
2765		3201
2766	layout => (new CFPlus::Layout),	3202	layout => (new CFPlus::Layout),
2767	par => [],	3203	par => [],
		3204	max_par => 0,
2768	height => 0,	3205	height => 0,
2769	children => [	3206	children => [
2770	(new CFPlus::UI::Empty expand => 1),	3207	(new CFPlus::UI::Empty expand => 1),
2771	(new CFPlus::UI::Slider vertical => 1),	3208	(new CFPlus::UI::Slider vertical => 1),
2772	],	3209	],
…		…
2785	}	3222	}
2786		3223
2787	sub size_request {	3224	sub size_request {
2788	my ($self) = @_;	3225	my ($self) = @_;
2789		3226
2790	my ($empty, $slider) = @{ $self->{children} };	3227	my ($empty, $slider) = $self->visible_children;
2791		3228
2792	local $self->{children} = [$empty, $slider];	3229	local $self->{children} = [$empty, $slider];
2793	$self->SUPER::size_request	3230	$self->SUPER::size_request
2794	}	3231	}
2795		3232
…		…
2897		3334
2898	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3335	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2899	push @{$self->{par}}, $para;	3336	push @{$self->{par}}, $para;
2900	}	3337	}
2901		3338
		3339	if (my $max = $self->{max_par}) {
		3340	shift @{$self->{par}} while @{$self->{par}} > $max;
		3341	}
		3342
2902	$self->{need_reflow}++;	3343	$self->{need_reflow}++;
2903	$self->update;	3344	$self->update;
2904	}	3345	}
2905		3346
2906	sub scroll_to_bottom {	3347	sub scroll_to_bottom {
…		…
2980		3421
2981	if ($y0 < $y + $h && $y < $y1) {	3422	if ($y0 < $y + $h && $y < $y1) {
2982	my $layout = $self->get_layout ($para);	3423	my $layout = $self->get_layout ($para);
2983		3424
2984	$layout->render ($para->{indent}, $y - $y0);	3425	$layout->render ($para->{indent}, $y - $y0);
		3426	$layout->draw;
2985		3427
2986	if (my @w = @{ $para->{widget} }) {	3428	if (my @w = @{ $para->{widget} }) {
2987	my @s = $layout->get_shapes;	3429	my @s = $layout->get_shapes;
2988		3430
2989	for (@w) {	3431	for (@w) {
…		…
3111	}	3553	}
3112		3554
3113	sub set_tooltip_from {	3555	sub set_tooltip_from {
3114	my ($self, $widget) = @_;	3556	my ($self, $widget) = @_;
3115		3557
3116	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3117	if $widget->{tooltip} =~ /^#(.*)$/;
3118
3119	my $tooltip = $widget->{tooltip};	3558	my $tip = $widget->{tooltip};
		3559	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3560
		3561	$tip = CFPlus::Pod::section_label tooltip => $1
		3562	if $tip =~ /^#(.*)$/;
3120		3563
3121	if ($ENV{CFPLUS_DEBUG} & 2) {	3564	if ($ENV{CFPLUS_DEBUG} & 2) {
3122	$tooltip .= "\n\n" . (ref $widget) . "\n"	3565	$tip .= "\n\n" . (ref $widget) . "\n"
3123	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3566	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3124	. "req $widget->{req_w} $widget->{req_h}\n"	3567	. "req $widget->{req_w} $widget->{req_h}\n"
3125	. "visible $widget->{visible}";	3568	. "visible $widget->{visible}";
3126	}	3569	}
3127		3570
3128	$tooltip =~ s/^\n+//;	3571	$tip =~ s/^\n+//;
3129	$tooltip =~ s/\n+$//;	3572	$tip =~ s/\n+$//;
3130		3573
3131	$self->add (new CFPlus::UI::Label	3574	$self->add (new CFPlus::UI::Label
3132	markup => $tooltip,	3575	markup => $tip,
3133	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3576	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3134	fontsize => 0.8,	3577	fontsize => 0.8,
3135	style => 1, # FLAG_INVERSE	3578	style => 1, # FLAG_INVERSE
3136	ellipsise => 0,	3579	ellipsise => 0,
3137	font => ($widget->{tooltip_font} || $::FONT_PROP),	3580	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
3180	glTranslate 0.375, 0.375;	3623	glTranslate 0.375, 0.375;
3181		3624
3182	my ($w, $h) = @$self{qw(w h)};	3625	my ($w, $h) = @$self{qw(w h)};
3183		3626
3184	glColor 1, 0.8, 0.4;	3627	glColor 1, 0.8, 0.4;
3185	glBegin GL_QUADS;	3628	glRect 0, 0, $w, $h;
3186	glVertex 0 , 0;
3187	glVertex 0 , $h;
3188	glVertex $w, $h;
3189	glVertex $w, 0;
3190	glEnd;
3191		3629
3192	glColor 0, 0, 0;	3630	glColor 0, 0, 0;
3193	glBegin GL_LINE_LOOP;	3631	glRect_lineloop 0, 0, $w, $h;
3194	glVertex 0 , 0;
3195	glVertex 0 , $h;
3196	glVertex $w, $h;
3197	glVertex $w, 0;
3198	glEnd;
3199		3632
3200	glTranslate 2 - 0.375, 2 - 0.375;	3633	glTranslate 2 - 0.375, 2 - 0.375;
3201		3634
3202	$self->SUPER::_draw;	3635	$self->SUPER::_draw;
3203	}	3636	}
…		…
3212		3645
3213	sub new {	3646	sub new {
3214	my $class = shift;	3647	my $class = shift;
3215		3648
3216	my $self = $class->SUPER::new (	3649	my $self = $class->SUPER::new (
		3650	size_w => 32,
		3651	size_h => 8,
3217	aspect => 1,	3652	aspect => 1,
3218	can_events => 0,	3653	can_events => 0,
3219	@_,	3654	@_,
3220	);	3655	);
3221		3656
3222	if ($self->{anim} && $self->{animspeed}) {	3657	if ($self->{anim} && $self->{animspeed}) {
3223	Scalar::Util::weaken (my $widget = $self);	3658	CFPlus::weaken (my $widget = $self);
3224		3659
		3660	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3661	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3225	$self->{timer} = Event->timer (	3662	$self->{timer} = Event->timer (
3226	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3227	hard => 1,	3663	parked => 1,
3228	interval => $self->{animspeed},
3229	cb => sub {	3664	cb => sub {
		3665	return unless $::CONN;
		3666
		3667	my $w = $widget
		3668	or return;
		3669
3230	++$widget->{frame};	3670	++$w->{frame};
		3671	$w->update_face;
		3672
		3673	# somehow, $widget can go away
3231	$widget->update;	3674	$w->update;
		3675	$w->update_timer;
3232	},	3676	},
3233	);	3677	);
		3678
		3679	$self->update_face;
		3680	$self->update_timer;
3234	}	3681	}
3235		3682
3236	$self	3683	$self
3237	}	3684	}
3238		3685
		3686	sub update_timer {
		3687	my ($self) = @_;
		3688
		3689	return unless $self->{timer};
		3690
		3691	if ($self->{visible}) {
		3692	$self->{timer}->at (
		3693	$self->{anim_start}
		3694	+ $self->{animspeed}
		3695	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3696	);
		3697	$self->{timer}->start;
		3698	} else {
		3699	$self->{timer}->stop;
		3700	}
		3701	}
		3702
		3703	sub update_face {
		3704	my ($self) = @_;
		3705
		3706	if ($::CONN) {
		3707	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3708	if ($anim && @$anim) {
		3709	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3710	delete $self->{face_change_cb};
		3711
		3712	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3713	unless ($tex->{name} || $tex->{loading}) {
		3714	$tex->upload (sub { $self->reconfigure });
		3715	}
		3716	}
		3717	}
		3718	}
		3719	}
		3720	}
		3721
3239	sub size_request {	3722	sub size_request {
3240	(32, 8)	3723	my ($self) = @_;
		3724
		3725	if ($::CONN) {
		3726	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3727	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3728	if ($tex->{name}) {
		3729	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3730	} elsif (!$tex->{loading}) {
		3731	$tex->upload (sub { $self->reconfigure });
		3732	}
		3733	}
		3734
		3735	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3736	}
		3737	}
		3738
		3739	($self->{size_w} || 8, $self->{size_h} || 8)
3241	}	3740	}
3242		3741
3243	sub update {	3742	sub update {
3244	my ($self) = @_;	3743	my ($self) = @_;
3245		3744
3246	return unless $self->{visible};	3745	return unless $self->{visible};
3247		3746
3248	$self->SUPER::update;	3747	$self->SUPER::update;
3249	}	3748	}
3250		3749
		3750	sub invoke_visibility_change {
		3751	my ($self) = @_;
		3752
		3753	$self->update_timer;
		3754
		3755	0
		3756	}
		3757
3251	sub _draw {	3758	sub _draw {
3252	my ($self) = @_;	3759	my ($self) = @_;
3253		3760
3254	return unless $::CONN;
3255
3256	$self->SUPER::_draw;	3761	$self->SUPER::_draw;
3257		3762
3258	my $face;	3763	if (my $tex = $self->{tex}) {
3259
3260	if ($self->{frame}) {
3261	my $anim = $::CONN->{anim}[$self->{anim}];
3262
3263	$face = $anim->[ $self->{frame} % @$anim ]
3264	if $anim && @$anim;
3265	}
3266
3267	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3268
3269	if ($tex) {
3270	glEnable GL_TEXTURE_2D;	3764	glEnable GL_TEXTURE_2D;
3271	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3765	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3272	glColor 0, 0, 0, 1;	3766	glColor 0, 0, 0, 1;
3273	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3767	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3274	glDisable GL_TEXTURE_2D;	3768	glDisable GL_TEXTURE_2D;
…		…
3276	}	3770	}
3277		3771
3278	sub destroy {	3772	sub destroy {
3279	my ($self) = @_;	3773	my ($self) = @_;
3280		3774
3281	$self->{timer}->cancel	3775	(delete $self->{timer})->cancel
3282	if $self->{timer};	3776	if $self->{timer};
3283		3777
3284	$self->SUPER::destroy;	3778	$self->SUPER::destroy;
3285	}	3779	}
3286		3780
…		…
3326	children => [	3820	children => [
3327	(new CFPlus::UI::Label markup => $left, expand => 1),	3821	(new CFPlus::UI::Label markup => $left, expand => 1),
3328	(new CFPlus::UI::Label markup => $right, align => +1),	3822	(new CFPlus::UI::Label markup => $right, align => +1),
3329	],	3823	],
3330	;	3824	;
3331		3825
3332	} else {	3826	} else {
3333	$widget = new CFPlus::UI::Label	3827	$widget = new CFPlus::UI::Label
3334	can_hover => 1,	3828	can_hover => 1,
3335	can_events => 1,	3829	can_events => 1,
3336	markup => $widget,	3830	markup => $widget,
…		…
3461		3955
3462	#############################################################################	3956	#############################################################################
3463		3957
3464	package CFPlus::UI::Notebook;	3958	package CFPlus::UI::Notebook;
3465		3959
		3960	use CFPlus::OpenGL;
		3961
3466	our @ISA = CFPlus::UI::VBox::;	3962	our @ISA = CFPlus::UI::VBox::;
3467		3963
3468	sub new {	3964	sub new {
3469	my $class = shift;	3965	my $class = shift;
3470		3966
3471	my $self = $class->SUPER::new (	3967	my $self = $class->SUPER::new (
3472	buttonbar => (new CFPlus::UI::Buttonbar),	3968	buttonbar => (new CFPlus::UI::Buttonbar),
3473	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3969	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3970	active_outline => [1, 1, 0],
3474	# filter => # will be put between multiplexer and $self	3971	# filter => # will be put between multiplexer and $self
3475	@_,	3972	@_,
3476	);	3973	);
3477		3974
3478	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3975	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3479	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3976	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3480		3977
		3978	{
		3979	Scalar::Util::weaken (my $wself = $self);
		3980
		3981	$self->{multiplexer}->connect (c_add => sub {
		3982	my ($mplex, $widgets) = @_;
		3983
		3984	for my $child (@$widgets) {
		3985	Scalar::Util::weaken $child;
		3986	$child->{c_tab_} ||= do {
		3987	my $tab =
		3988	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3989	? $child->{c_tab}
		3990	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3991
		3992	$tab->connect (activate => sub {
		3993	$wself->set_current_page ($child);
		3994	});
		3995
		3996	$tab
		3997	};
		3998
		3999	$self->{buttonbar}->add ($child->{c_tab_});
		4000	}
		4001	});
		4002
		4003	$self->{multiplexer}->connect (c_remove => sub {
		4004	my ($mplex, $widgets) = @_;
		4005
		4006	for my $child (@$widgets) {
		4007	$wself->{buttonbar}->remove ($child->{c_tab_});
		4008	}
		4009	});
		4010	}
		4011
3481	$self	4012	$self
3482	}	4013	}
3483		4014
3484	sub add {	4015	sub add {
		4016	my ($self, @widgets) = @_;
		4017
		4018	$self->{multiplexer}->add (@widgets)
		4019	}
		4020
		4021	sub remove {
		4022	my ($self, @widgets) = @_;
		4023
		4024	$self->{multiplexer}->remove (@widgets)
		4025	}
		4026
		4027	sub pages {
		4028	my ($self) = @_;
		4029	$self->{multiplexer}->children
		4030	}
		4031
		4032	sub add_tab {
3485	my ($self, $title, $widget, $tooltip) = @_;	4033	my ($self, $title, $widget, $tooltip) = @_;
3486		4034
3487	Scalar::Util::weaken $self;	4035	$title = [$title, $tooltip] unless ref $title;
		4036	$widget->{c_tab} = $title;
3488		4037
3489	$self->{buttonbar}->add (new CFPlus::UI::Button
3490	markup => $title,
3491	tooltip => $tooltip,
3492	on_activate => sub { $self->set_current_page ($widget) },
3493	);
3494
3495	$self->{multiplexer}->add ($widget);	4038	$self->add ($widget);
3496	}	4039	}
3497		4040
3498	sub get_current_page {	4041	sub get_current_page {
3499	my ($self) = @_;	4042	my ($self) = @_;
3500		4043
…		…
3504	sub set_current_page {	4047	sub set_current_page {
3505	my ($self, $page) = @_;	4048	my ($self, $page) = @_;
3506		4049
3507	$self->{multiplexer}->set_current_page ($page);	4050	$self->{multiplexer}->set_current_page ($page);
3508	$self->emit (page_changed => $self->{multiplexer}{current});	4051	$self->emit (page_changed => $self->{multiplexer}{current});
		4052	}
		4053
		4054	sub _draw {
		4055	my ($self) = @_;
		4056
		4057	$self->SUPER::_draw ();
		4058
		4059	if (my $cur = $self->{multiplexer}{current}) {
		4060	if ($cur = $cur->{c_tab_}) {
		4061	glTranslate $cur->{x}, $cur->{y};
		4062	glLineWidth 3;
		4063	glColor @{$self->{active_outline}};
		4064	glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
		4065	glLineWidth 1;
		4066	}
		4067	}
3509	}	4068	}
3510		4069
3511	#############################################################################	4070	#############################################################################
3512		4071
3513	package CFPlus::UI::Selector;	4072	package CFPlus::UI::Selector;
…		…
3576	my $self = $class->SUPER::new (	4135	my $self = $class->SUPER::new (
3577	fontsize => 0.8,	4136	fontsize => 0.8,
3578	@_,	4137	@_,
3579	);	4138	);
3580		4139
3581	Scalar::Util::weaken (my $this = $self);	4140	CFPlus::weaken (my $this = $self);
3582		4141
3583	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4142	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3584		4143
3585	$self	4144	$self
3586	}	4145	}
…		…
3709	$self->SUPER::destroy;	4268	$self->SUPER::destroy;
3710	}	4269	}
3711		4270
3712	#############################################################################	4271	#############################################################################
3713		4272
3714	package CFPlus::UI::Inventory;
3715
3716	our @ISA = CFPlus::UI::Table::;
3717
3718	sub new {
3719	my $class = shift;
3720
3721	my $self = $class->SUPER::new (
3722	col_expand => [0, 1, 0],
3723	items => [],
3724	@_,
3725	);
3726
3727	$self->set_sort_order (undef);
3728
3729	$self
3730	}
3731
3732	sub update_items {
3733	my ($self) = @_;
3734
3735	$self->clear;
3736
3737	my @item = $self->{sort}->(@{ $self->{items} });
3738
3739	my @adds;
3740	my $row = 0;
3741	for my $item ($self->{sort}->(@{ $self->{items} })) {
3742	CFPlus::Item::update_widgets $item;
3743
3744	push @adds, 0, $row, $item->{face_widget};
3745	push @adds, 1, $row, $item->{desc_widget};
3746	push @adds, 2, $row, $item->{weight_widget};
3747
3748	$row++;
3749	}
3750
3751	$self->add (@adds);
3752	}
3753
3754	sub set_sort_order {
3755	my ($self, $order) = @_;
3756
3757	$self->{sort} = $order ||= sub {
3758	sort {
3759	$a->{type} <=> $b->{type}
3760	or $a->{name} cmp $b->{name}
3761	} @_
3762	};
3763
3764	$self->update_items;
3765	}
3766
3767	sub set_items {
3768	my ($self, $items) = @_;
3769
3770	$self->{items} = [$items ? values %$items : ()];
3771	$self->update_items;
3772	}
3773
3774	#############################################################################
3775
3776	package CFPlus::UI::SpellList;
3777
3778	our @ISA = CFPlus::UI::Table::;
3779
3780	sub new {
3781	my $class = shift;
3782
3783	my $self = $class->SUPER::new (
3784	binding => [],
3785	commands => [],
3786	@_,
3787	)
3788	}
3789
3790	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3791
3792	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3793	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3794	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3795	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3796	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3797	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3798	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3799	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3800	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3801	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3802
3803	sub rebuild_spell_list {
3804	my ($self) = @_;
3805
3806	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3807	$self->clear;
3808
3809	return unless $::CONN;
3810
3811	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3812	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3813	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3814	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3815	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3816
3817	my $row = 0;
3818
3819	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3820	my $spell = $self->{spell}{$_};
3821
3822	$row++;
3823
3824	my $spell_cb = sub {
3825	my ($widget, $ev) = @_;
3826
3827	if ($ev->{button} == 1) {
3828	$::CONN->user_send ("cast $spell->{name}");
3829	} elsif ($ev->{button} == 2) {
3830	$::CONN->user_send ("invoke $spell->{name}");
3831	} elsif ($ev->{button} == 3) {
3832	my $shortname = CFPlus::shorten $spell->{name}, 14;
3833	(new CFPlus::UI::Menu
3834	items => [
3835	["bind <i>cast $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3836	["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3837	],
3838	)->popup ($ev);
3839	} else {
3840	return 0;
3841	}
3842
3843	1
3844	};
3845
3846	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3847
3848	#TODO: add path info to tooltip
3849	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3850
3851	$self->add (0, $row, new CFPlus::UI::Face
3852	face => $spell->{face},
3853	can_hover => 1,
3854	can_events => 1,
3855	tooltip => $tooltip,
3856	on_button_down => $spell_cb,
3857	);
3858
3859	$self->add (1, $row, new CFPlus::UI::Label
3860	expand => 1,
3861	text => $spell->{name},
3862	can_hover => 1,
3863	can_events => 1,
3864	tooltip => $tooltip,
3865	on_button_down => $spell_cb,
3866	);
3867
3868	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3869	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3870	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3871	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3872	}
3873	});
3874	}
3875
3876	sub add_spell {
3877	my ($self, $spell) = @_;
3878
3879	$self->{spell}->{$spell->{name}} = $spell;
3880	$self->rebuild_spell_list;
3881	}
3882
3883	sub remove_spell {
3884	my ($self, $spell) = @_;
3885
3886	delete $self->{spell}->{$spell->{name}};
3887	$self->rebuild_spell_list;
3888	}
3889
3890	sub clear_spells {
3891	my ($self) = @_;
3892
3893	$self->{spell} = {};
3894	$self->rebuild_spell_list;
3895	}
3896
3897	#############################################################################
3898
3899	package CFPlus::UI::Root;	4273	package CFPlus::UI::Root;
3900		4274
3901	our @ISA = CFPlus::UI::Container::;	4275	our @ISA = CFPlus::UI::Container::;
3902		4276
3903	use List::Util qw(min max);	4277	use List::Util qw(min max);
…		…
3910	my $self = $class->SUPER::new (	4284	my $self = $class->SUPER::new (
3911	visible => 1,	4285	visible => 1,
3912	@_,	4286	@_,
3913	);	4287	);
3914		4288
3915	Scalar::Util::weaken ($self->{root} = $self);	4289	CFPlus::weaken ($self->{root} = $self);
3916		4290
3917	$self	4291	$self
3918	}	4292	}
3919		4293
3920	sub size_request {	4294	sub size_request {
…		…
3968	}	4342	}
3969		4343
3970	sub update {	4344	sub update {
3971	my ($self) = @_;	4345	my ($self) = @_;
3972		4346
3973	$::WANT_REFRESH++;	4347	$::WANT_REFRESH->start;
3974	}	4348	}
3975		4349
3976	sub add {	4350	sub add {
3977	my ($self, @children) = @_;	4351	my ($self, @children) = @_;
3978		4352
…		…
4015	while ($self->{refresh_hook}) {	4389	while ($self->{refresh_hook}) {
4016	$_->()	4390	$_->()
4017	for values %{delete $self->{refresh_hook}};	4391	for values %{delete $self->{refresh_hook}};
4018	}	4392	}
4019		4393
4020	if ($self->{realloc}) {	4394	while ($self->{realloc}) {
4021	my %queue;	4395	my %queue;
4022	my @queue;	4396	my @queue;
4023	my $widget;	4397	my $widget;
4024		4398
4025	outer:	4399	outer:
…		…
4072	}	4446	}
4073	}	4447	}
4074		4448
4075	delete $self->{realloc}{$widget+0};	4449	delete $self->{realloc}{$widget+0};
4076	}	4450	}
4077	}
4078		4451
4079	while (my $size_alloc = delete $self->{size_alloc}) {	4452	while (my $size_alloc = delete $self->{size_alloc}) {
4080	my @queue = sort { $b->{visible} <=> $a->{visible} }	4453	my @queue = sort { $a->{visible} <=> $b->{visible} }
4081	values %$size_alloc;	4454	values %$size_alloc;
4082		4455
4083	while () {	4456	while () {
4084	my $widget = pop @queue || last;	4457	my $widget = pop @queue || last;
4085		4458
4086	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4459	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4087		4460
4088	$w = 0 if $w < 0;
4089	$h = 0 if $h < 0;
4090
4091	$w = max $widget->{min_w}, $w;	4461	$w = max $widget->{min_w}, $w;
4092	$h = max $widget->{min_h}, $h;	4462	$h = max $widget->{min_h}, $h;
4093		4463
4094	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4464	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4095	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4465	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4096		4466
4097	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4467	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4098	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4468	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4099		4469
4100	$w = int $w + 0.5;	4470	$w = int $w + 0.5;
4101	$h = int $h + 0.5;	4471	$h = int $h + 0.5;
4102		4472
4103	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4473	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4104	$widget->{old_w} = $widget->{w};	4474	$widget->{old_w} = $widget->{w};
4105	$widget->{old_h} = $widget->{h};	4475	$widget->{old_h} = $widget->{h};
4106		4476
4107	$widget->{w} = $w;	4477	$widget->{w} = $w;
4108	$widget->{h} = $h;	4478	$widget->{h} = $h;
4109		4479
4110	$widget->emit (size_allocate => $w, $h);	4480	$widget->emit (size_allocate => $w, $h);
		4481	}
4111	}	4482	}
4112	}	4483	}
4113	}	4484	}
4114		4485
4115	while ($self->{post_alloc_hook}) {	4486	while ($self->{post_alloc_hook}) {
4116	$_->()	4487	$_->()
4117	for values %{delete $self->{post_alloc_hook}};	4488	for values %{delete $self->{post_alloc_hook}};
4118	}	4489	}
4119
4120		4490
4121	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4491	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4122	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4492	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4123	glClear GL_COLOR_BUFFER_BIT;	4493	glClear GL_COLOR_BUFFER_BIT;
4124		4494

Diff Legend

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