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.351 by root, Sun Oct 1 12:08:58 2006 UTC vs.
Revision 1.433 by root, Wed Aug 22 21:27:13 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	{ __w_ => $_[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,
…		…
514	);	531	);
515		532
516	sub emit {	533	sub emit {
517	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
518		535
519	# I do not really like this solution, but I dislike duplication	536	# I do not really like this solution, but I do not like duplication
520	# and needlessly verbose code, too.	537	# and needlessly verbose code, either.
521	my @append	538	my @append
522	= $has_coords{$signal}	539	= $has_coords{$signal}
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	#d##TODO# stop propagating at first true, do not use sum	545	for my $cb (
529	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	546	@{$self->{signal_cb}{$signal} || []}, # before
530	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
531	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
532	}	554	}
533		555
534	sub find_widget {	556	#sub find_widget {
535	my ($self, $x, $y) = @_;	557	# 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		558
546	sub set_parent {	559	sub set_parent {
547	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
548		561
549	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
550	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
551	}	564	}
552		565
553	sub realloc {	566	sub realloc {
554	my ($self) = @_;	567	my ($self) = @_;
…		…
580		593
581	# 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
582	# functions seems pointless.	595	# functions seems pointless.
583	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
584		597
585	sub draw {	598	#sub draw {
586	my ($self) = @_;	599	#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		600
632	sub _draw {	601	sub _draw {
633	my ($self) = @_;	602	my ($self) = @_;
634		603
635	warn "no draw defined for $self\n";	604	warn "no draw defined for $self\n";
…		…
638	sub DESTROY {	607	sub DESTROY {
639	my ($self) = @_;	608	my ($self) = @_;
640		609
641	return if CFPlus::in_destruct;	610	return if CFPlus::in_destruct;
642		611
643	delete $WIDGET{$self+0};	612	local $@;
644
645	eval { $self->destroy };	613	eval { $self->destroy };
646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	614	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		615
		616	delete $WIDGET{$self+0};
647	}	617	}
648		618
649	#############################################################################	619	#############################################################################
650		620
651	package CFPlus::UI::DrawBG;	621	package CFPlus::UI::DrawBG;
…		…
655	use strict;	625	use strict;
656	use CFPlus::OpenGL;	626	use CFPlus::OpenGL;
657		627
658	sub new {	628	sub new {
659	my $class = shift;	629	my $class = shift;
660
661	# range [value, low, high, page]
662		630
663	$class->SUPER::new (	631	$class->SUPER::new (
664	#bg => [0, 0, 0, 0.2],	632	#bg => [0, 0, 0, 0.2],
665	#active_bg => [1, 1, 1, 0.5],	633	#active_bg => [1, 1, 1, 0.5],
666	@_	634	@_
…		…
678	my ($w, $h) = @$self{qw(w h)};	646	my ($w, $h) = @$self{qw(w h)};
679		647
680	glEnable GL_BLEND;	648	glEnable GL_BLEND;
681	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	649	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
682	glColor_premultiply @$color;	650	glColor_premultiply @$color;
683
684	glBegin GL_QUADS;
685	glVertex 0 , 0;
686	glVertex 0 , $h;
687	glVertex $w, $h;	651	glRect 0, 0, $w, $h;
688	glVertex $w, 0;
689	glEnd;
690
691	glDisable GL_BLEND;	652	glDisable GL_BLEND;
692	}	653	}
693	}	654	}
694		655
695	#############################################################################	656	#############################################################################
…		…
727	can_events => 0,	688	can_events => 0,
728	%arg,	689	%arg,
729	);	690	);
730		691
731	$self->add (@$children)	692	$self->add (@$children)
732	if $children;	693	if $children && @$children;
733		694
734	$self	695	$self
735	}	696	}
736		697
737	sub realloc {	698	sub realloc {
…		…
746	my ($self, @widgets) = @_;	707	my ($self, @widgets) = @_;
747		708
748	$_->set_parent ($self)	709	$_->set_parent ($self)
749	for @widgets;	710	for @widgets;
750		711
		712	# TODO: only do this in widgets that need it, e.g. root, fixed
751	use sort 'stable';	713	use sort 'stable';
752		714
753	$self->{children} = [	715	$self->{children} = [
754	sort { $a->{z} <=> $b->{z} }	716	sort { $a->{z} <=> $b->{z} }
755	@{$self->{children}}, @widgets	717	@{$self->{children}}, @widgets
756	];	718	];
757		719
758	$self->realloc;	720	$self->realloc;
		721
		722	$self->emit (c_add => \@widgets);
		723
		724	map $_+0, @widgets
759	}	725	}
760		726
761	sub children {	727	sub children {
762	@{ $_[0]{children} }	728	@{ $_[0]{children} }
763	}	729	}
764		730
765	sub remove {	731	sub remove {
766	my ($self, $child) = @_;	732	my ($self, @widgets) = @_;
767		733
		734	$self->emit (c_remove => \@widgets);
		735
		736	for my $child (@widgets) {
768	delete $child->{parent};	737	delete $child->{parent};
769	$child->hide;	738	$child->hide;
770
771	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	739	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		740	}
772		741
773	$self->realloc;	742	$self->realloc;
774	}	743	}
775		744
776	sub clear {	745	sub clear {
777	my ($self) = @_;	746	my ($self) = @_;
778		747
779	my $children = delete $self->{children};	748	my $children = $self->{children};
780	$self->{children} = [];	749	$self->{children} = [];
781		750
782	for (@$children) {	751	for (@$children) {
783	delete $_->{parent};	752	delete $_->{parent};
784	$_->hide;	753	$_->hide;
…		…
804	}	773	}
805		774
806	sub _draw {	775	sub _draw {
807	my ($self) = @_;	776	my ($self) = @_;
808		777
809	$_->draw for @{$self->{children}};	778	$_->draw for $self->visible_children;
810	}	779	}
811		780
812	#############################################################################	781	#############################################################################
813		782
814	package CFPlus::UI::Bin;	783	package CFPlus::UI::Bin;
…		…
824	}	793	}
825		794
826	sub add {	795	sub add {
827	my ($self, $child) = @_;	796	my ($self, $child) = @_;
828		797
829	$self->SUPER::remove ($_) for @{ $self->{children} };	798	$self->clear;
830	$self->SUPER::add ($child);	799	$self->SUPER::add ($child);
831	}	800	}
832		801
833	sub remove {	802	sub remove {
834	my ($self, $widget) = @_;	803	my ($self, $widget) = @_;
…		…
900	{	869	{
901	package CFPlus::UI::Base;	870	package CFPlus::UI::Base;
902		871
903	local ($draw_x, $draw_y, $draw_w, $draw_h) =	872	local ($draw_x, $draw_y, $draw_w, $draw_h) =
904	(0, 0, $self->{w}, $self->{h});	873	(0, 0, $self->{w}, $self->{h});
		874
		875	$self->_render;
905	}	876	}
906
907	$self->_render;
908	};	877	};
909	}	878	}
910		879
911	sub _draw {	880	sub _draw {
912	my ($self) = @_;	881	my ($self) = @_;
…		…
924	}	893	}
925		894
926	#############################################################################	895	#############################################################################
927		896
928	package CFPlus::UI::ViewPort;	897	package CFPlus::UI::ViewPort;
		898
		899	use List::Util qw(min max);
929		900
930	our @ISA = CFPlus::UI::Window::;	901	our @ISA = CFPlus::UI::Window::;
931		902
932	sub new {	903	sub new {
933	my $class = shift;	904	my $class = shift;
…		…
942	sub size_request {	913	sub size_request {
943	my ($self) = @_;	914	my ($self) = @_;
944		915
945	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	916	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946		917
947	$w = 10 if $self->{scroll_x};	918	$w = 1 if $self->{scroll_x};
948	$h = 10 if $self->{scroll_y};	919	$h = 1 if $self->{scroll_y};
949		920
950	($w, $h)	921	($w, $h)
951	}	922	}
952		923
953	sub invoke_size_allocate {	924	sub invoke_size_allocate {
…		…
965	}	936	}
966		937
967	sub set_offset {	938	sub set_offset {
968	my ($self, $x, $y) = @_;	939	my ($self, $x, $y) = @_;
969		940
		941	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		942	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		943
		944	if ($x != $self->{view_x} or $y != $self->{view_y}) {
970	$self->{view_x} = int $x;	945	$self->{view_x} = $x;
971	$self->{view_y} = int $y;	946	$self->{view_y} = $y;
972		947
		948	$self->emit (changed => $x, $y);
973	$self->update;	949	$self->update;
		950	}
		951	}
		952
		953	sub set_center {
		954	my ($self, $x, $y) = @_;
		955
		956	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		957	}
		958
		959	sub make_visible {
		960	my ($self, $x, $y, $border) = @_;
		961
		962	if ( $x < $self->{view_x} + $self->{w} * $border
		963	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		964	|| $y < $self->{view_y} + $self->{h} * $border
		965	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		966	) {
		967	$self->set_center ($x, $y);
		968	}
974	}	969	}
975		970
976	# hmm, this does not work for topleft of $self... but we should not ask for that	971	# hmm, this does not work for topleft of $self... but we should not ask for that
977	sub coord2local {	972	sub coord2local {
978	my ($self, $x, $y) = @_;	973	my ($self, $x, $y) = @_;
…		…
993	my ($self, $x, $y) = @_;	988	my ($self, $x, $y) = @_;
994		989
995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	990	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	991	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
997	) {	992	) {
998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	993	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
999	} else {	994	} else {
1000	$self->CFPlus::UI::Base::find_widget ($x, $y)	995	$self->CFPlus::UI::Base::find_widget ($x, $y)
1001	}	996	}
1002	}	997	}
1003		998
…		…
1014		1009
1015	#############################################################################	1010	#############################################################################
1016		1011
1017	package CFPlus::UI::ScrolledWindow;	1012	package CFPlus::UI::ScrolledWindow;
1018		1013
1019	our @ISA = CFPlus::UI::HBox::;	1014	our @ISA = CFPlus::UI::Table::;
1020		1015
1021	sub new {	1016	sub new {
1022	my ($class, %arg) = @_;	1017	my ($class, %arg) = @_;
1023		1018
1024	my $child = delete $arg{child};	1019	my $child = delete $arg{child};
1025		1020
1026	my $self;	1021	my $self;
1027		1022
1028	my $slider = new CFPlus::UI::Slider	1023	my $hslider = new CFPlus::UI::Slider
		1024	c_col => 0,
		1025	c_row => 1,
		1026	vertical => 0,
		1027	range => [0, 0, 1, 0.01], # HACK fix
		1028	on_changed => sub {
		1029	$self->{hpos} = $_[1];
		1030	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1031	},
		1032	;
		1033
		1034	my $vslider = new CFPlus::UI::Slider
		1035	c_col => 1,
		1036	c_row => 0,
1029	vertical => 1,	1037	vertical => 1,
1030	range => [0, 0, 1, 0.01], # HACK fix	1038	range => [0, 0, 1, 0.01], # HACK fix
1031	on_changed => sub {	1039	on_changed => sub {
1032	$self->{vp}->set_offset (0, $_[1]);	1040	$self->{vpos} = $_[1];
		1041	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033	},	1042	},
1034	;	1043	;
1035		1044
1036	$self = $class->SUPER::new (	1045	$self = $class->SUPER::new (
1037	vp => (new CFPlus::UI::ViewPort expand => 1),	1046	scroll_x => 0,
		1047	scroll_y => 1,
1038	can_events => 1,	1048	can_events => 1,
1039	slider => $slider,	1049	hslider => $hslider,
		1050	vslider => $vslider,
		1051	col_expand => [1, 0],
		1052	row_expand => [1, 0],
1040	%arg,	1053	%arg,
1041	);	1054	);
1042		1055
		1056	$self->{vp} = new CFPlus::UI::ViewPort
		1057	c_col => 0,
		1058	c_row => 0,
		1059	expand => 1,
		1060	scroll_x => $self->{scroll_x},
		1061	scroll_y => $self->{scroll_y},
		1062	on_changed => sub {
		1063	my ($vp, $x, $y) = @_;
		1064
		1065	$vp->{parent}{hslider}->set_value ($x);
		1066	$vp->{parent}{vslider}->set_value ($y);
		1067
		1068	0
		1069	},
		1070	on_size_allocate => sub {
		1071	my ($vp, $w, $h) = @_;
		1072	$vp->{parent}->update_slider;
		1073	0
		1074	},
		1075	;
		1076
1043	$self->SUPER::add ($self->{vp}, $self->{slider});	1077	$self->SUPER::add ($self->{vp});
		1078
1044	$self->add ($child) if $child;	1079	$self->add ($child) if $child;
1045		1080
1046	$self	1081	$self
1047	}	1082	}
1048
1049	#TODO# update range on size_allocate depending on child
1050		1083
1051	sub add {	1084	sub add {
1052	my ($self, $widget) = @_;	1085	my ($self, $widget) = @_;
1053		1086
1054	$self->{vp}->add ($self->{child} = $widget);	1087	$self->{vp}->add ($self->{child} = $widget);
1055	}	1088	}
1056		1089
		1090	sub set_offset { shift->{vp}->set_offset (@_) }
		1091	sub set_center { shift->{vp}->set_center (@_) }
		1092	sub make_visible { shift->{vp}->make_visible (@_) }
		1093
		1094	sub update_slider {
		1095	my ($self) = @_;
		1096
		1097	my $child = ($self->{vp} or return)->child;
		1098
		1099	if ($self->{scroll_x}) {
		1100	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1101	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1102
		1103	my $visible = $w1 > $w2;
		1104	if ($visible != $self->{hslider_visible}) {
		1105	$self->{hslider_visible} = $visible;
		1106	$visible ? $self->SUPER::add ($self->{hslider})
		1107	: $self->SUPER::remove ($self->{hslider});
		1108	}
		1109	}
		1110
		1111	if ($self->{scroll_y}) {
		1112	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1113	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1114
		1115	my $visible = $h1 > $h2;
		1116	if ($visible != $self->{vslider_visible}) {
		1117	$self->{vslider_visible} = $visible;
		1118	$visible ? $self->SUPER::add ($self->{vslider})
		1119	: $self->SUPER::remove ($self->{vslider});
		1120	}
		1121	}
		1122	}
		1123
		1124	sub start_dragging {
		1125	my ($self, $ev) = @_;
		1126
		1127	$self->grab_focus;
		1128
		1129	my $ox = $self->{vp}{view_x};
		1130	my $oy = $self->{vp}{view_y};
		1131
		1132	$self->{motion} = sub {
		1133	my ($ev, $x, $y) = @_;
		1134
		1135	$ox -= $ev->{xrel};
		1136	$oy -= $ev->{yrel};
		1137
		1138	$self->{vp}->set_offset ($ox, $oy);
		1139	};
		1140	}
		1141
1057	sub invoke_mouse_wheel {	1142	sub invoke_mouse_wheel {
1058	my ($self, $ev) = @_;	1143	my ($self, $ev) = @_;
1059		1144
1060	return 0 unless $ev->{dy}; # only vertical movements
1061
1062	$self->{slider}->emit (mouse_wheel => $ev);	1145	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1146	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1063		1147
1064	1	1148	1
1065	}	1149	}
1066		1150
1067	sub update_slider {	1151	sub invoke_button_down {
1068	my ($self) = @_;	1152	my ($self, $ev, $x, $y) = @_;
1069		1153
1070	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1154	if ($ev->{button} == 2) {
1071	}	1155	$self->start_dragging ($ev);
		1156	return 1;
		1157	}
1072		1158
1073	sub update {	1159	0
1074	my ($self) = @_;	1160	}
1075		1161
1076	$self->SUPER::update;	1162	sub invoke_button_up {
		1163	my ($self, $ev, $x, $y) = @_;
1077		1164
1078	$self->update_slider;	1165	if (delete $self->{motion}) {
		1166	return 1;
		1167	}
		1168
		1169	0
		1170	}
		1171
		1172	sub invoke_mouse_motion {
		1173	my ($self, $ev, $x, $y) = @_;
		1174
		1175	if ($self->{motion}) {
		1176	$self->{motion}->($ev, $x, $y);
		1177	return 1;
		1178	}
		1179
		1180	0
1079	}	1181	}
1080		1182
1081	sub invoke_size_allocate {	1183	sub invoke_size_allocate {
1082	my ($self, $w, $h) = @_;	1184	my ($self, $w, $h) = @_;
1083		1185
1084	$self->update_slider;	1186	$self->update_slider;
1085
1086	$self->SUPER::invoke_size_allocate ($w, $h)	1187	$self->SUPER::invoke_size_allocate ($w, $h)
1087	}	1188	}
1088		1189
1089	#############################################################################	1190	#############################################################################
1090		1191
…		…
1110	my ($w, $h) = @$self{qw(w h)};	1211	my ($w, $h) = @$self{qw(w h)};
1111		1212
1112	glEnable GL_BLEND;	1213	glEnable GL_BLEND;
1113	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1214	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1114	glColor_premultiply @{ $self->{bg} };	1215	glColor_premultiply @{ $self->{bg} };
1115
1116	glBegin GL_QUADS;
1117	glVertex 0 , 0;
1118	glVertex 0 , $h;
1119	glVertex $w, $h;	1216	glRect 0, 0, $w, $h;
1120	glVertex $w, 0;
1121	glEnd;
1122
1123	glDisable GL_BLEND;	1217	glDisable GL_BLEND;
1124	}	1218	}
1125		1219
1126	$self->SUPER::_draw;	1220	$self->SUPER::_draw;
1127	}	1221	}
…		…
1240		1334
1241	my @border =	1335	my @border =
1242	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1336	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);	1337	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244		1338
		1339	my @icon =
		1340	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1341	qw(x1_move.png x1_resize.png);
		1342
1245	sub new {	1343	sub new {
1246	my ($class, %arg) = @_;	1344	my ($class, %arg) = @_;
1247		1345
1248	my $self = $class->SUPER::new (	1346	my $self = $class->SUPER::new (
1249	bg => [1, 1, 1, 1],	1347	bg => [1, 1, 1, 1],
…		…
1417	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1515	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1418		1516
1419	my $border = $self->border;	1517	my $border = $self->border;
1420		1518
1421	glColor @{ $self->{border_bg} };	1519	glColor @{ $self->{border_bg} };
1422	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1520	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1423	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1521	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1424	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1522	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1425	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1523	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1524
		1525	# move
		1526	my $w2 = ($w - $border) * .5;
		1527	my $h2 = ($h - $border) * .5;
		1528	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1529	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1530	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1531
		1532	# resize
		1533	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1534	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1535	unless $self->{has_close_button};
		1536	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1537	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1426		1538
1427	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1539	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1428	glColor @{ $self->{bg} };	1540	glColor @{ $self->{bg} };
1429		1541
1430	# TODO: repeat texture not scale	1542	# TODO: repeat texture not scale
…		…
1451		1563
1452	#############################################################################	1564	#############################################################################
1453		1565
1454	package CFPlus::UI::Table;	1566	package CFPlus::UI::Table;
1455		1567
1456	our @ISA = CFPlus::UI::Base::;	1568	our @ISA = CFPlus::UI::Container::;
1457		1569
1458	use List::Util qw(max sum);	1570	use List::Util qw(max sum);
1459		1571
1460	use CFPlus::OpenGL;	1572	use CFPlus::OpenGL;
1461		1573
1462	sub new {	1574	sub new {
1463	my $class = shift;	1575	my $class = shift;
1464		1576
1465	$class->SUPER::new (	1577	$class->SUPER::new (
1466	col_expand => [],	1578	col_expand => [],
		1579	row_expand => [],
1467	@_,	1580	@_,
1468	)	1581	)
1469	}	1582	}
1470		1583
1471	sub children {
1472	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473	}
1474
1475	sub add {	1584	sub add {
		1585	my ($self, @widgets) = @_;
		1586
		1587	for my $child (@widgets) {
		1588	$child->{c_rowspan} ||= 1;
		1589	$child->{c_colspan} ||= 1;
		1590	}
		1591
		1592	$self->SUPER::add (@widgets);
		1593	}
		1594
		1595	sub add_at {
1476	my ($self) = shift;	1596	my $self = shift;
		1597
		1598	my @widgets;
1477		1599
1478	while (@_) {	1600	while (@_) {
1479	my ($x, $y, $child) = splice @_, 0, 3, ();	1601	my ($col, $row, $child) = splice @_, 0, 3, ();
1480	$child->set_parent ($self);
1481	$self->{children}[$y][$x] = $child;
1482	}
1483		1602
1484	$self->{force_realloc} = 1;	1603	$child->{c_row} = $row;
1485	$self->{force_size_alloc} = 1;	1604	$child->{c_col} = $col;
1486	$self->realloc;
1487	}
1488		1605
1489	sub remove {	1606	push @widgets, $child;
		1607	}
		1608
		1609	$self->add (@widgets);
		1610	}
		1611
		1612	sub get_wh {
1490	my ($self, $child) = @_;	1613	my ($self) = @_;
1491		1614
1492	# TODO: not yet implemented	1615	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		1616
1499	my @children = $self->children;	1617	my @children = $self->children;
1500	delete $self->{children};	1618
		1619	# first pass, columns
		1620	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1621	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1622
		1623	my $sw = sum @w[$c .. $c + $cs - 1];
		1624
		1625	if ($w > $sw) {
		1626	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1627	}
1501		1628	}
1502	for (@children) {
1503	delete $_->{parent};
1504	$_->hide;
1505	}
1506		1629
1507	$self->realloc;	1630	# second pass, rows
1508	}	1631	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)};	1632	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1523		1633
1524	$w[$x] = max $w[$x], $w;	1634	my $sh = sum @h[$r .. $r + $rs - 1];
1525	$h[$y] = max $h[$y], $h;	1635
		1636	if ($h > $sh) {
		1637	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1526	}	1638	}
1527	}	1639	}
1528		1640
1529	(\@w, \@h)	1641	(\@w, \@h)
1530	}	1642	}
…		…
1546	my ($ws, $hs) = $self->get_wh;	1658	my ($ws, $hs) = $self->get_wh;
1547		1659
1548	my $req_w = (sum @$ws) || 1;	1660	my $req_w = (sum @$ws) || 1;
1549	my $req_h = (sum @$hs) || 1;	1661	my $req_h = (sum @$hs) || 1;
1550		1662
1551	# TODO: nicer code && do row_expand	1663	# now linearly scale the rows/columns to the allocated size
1552	my @col_expand = @{$self->{col_expand}};	1664	my @col_expand = @{$self->{col_expand}};
1553	@col_expand = (1) x @$ws unless @col_expand;	1665	@col_expand = (1) x @$ws unless @col_expand;
1554	my $col_expand = (sum @col_expand) || 1;	1666	my $col_expand = (sum @col_expand) || 1;
1555		1667
1556	# linearly scale sizes
1557	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1668	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559		1669
1560	CFPlus::UI::harmonize $ws;	1670	CFPlus::UI::harmonize $ws;
		1671
		1672	my @row_expand = @{$self->{row_expand}};
		1673	@row_expand = (1) x @$ws unless @row_expand;
		1674	my $row_expand = (sum @row_expand) || 1;
		1675
		1676	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1677
1561	CFPlus::UI::harmonize $hs;	1678	CFPlus::UI::harmonize $hs;
1562		1679
1563	my $y;	1680	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1681	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1564		1682
1565	for my $r (0 .. $#{$self->{children}}) {	1683	for my $widget ($self->children) {
1566	my $row = $self->{children}[$r]	1684	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1567	or next;
1568		1685
1569	my $x = 0;	1686	$widget->configure (
1570	my $row_h = $hs->[$r];	1687	$x[$c], $y[$r],
		1688	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1571		1689	);
1572	for my $c (0 .. $#$row) {	1690	}
1573	my $col_w = $ws->[$c];
1574		1691
1575	if (my $widget = $row->[$c]) {	1692	1
1576	$widget->configure ($x, $y, $col_w, $row_h);	1693	}
1577	}
1578		1694
1579	$x += $col_w;	1695	#############################################################################
		1696
		1697	package CFPlus::UI::Fixed;
		1698
		1699	use List::Util qw(min max);
		1700
		1701	our @ISA = CFPlus::UI::Container::;
		1702
		1703	sub _scale($$$) {
		1704	my ($rel, $val, $max) = @_;
		1705
		1706	$rel ? $val * $max : $val
		1707	}
		1708
		1709	sub size_request {
		1710	my ($self) = @_;
		1711
		1712	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1713
		1714	# determine overall size by querying abs widgets
		1715	for my $child ($self->visible_children) {
		1716	unless ($child->{c_rel}) {
		1717	my $x = $child->{c_x};
		1718	my $y = $child->{c_y};
		1719
		1720	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1721	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1580	}	1722	}
		1723	}
1581		1724
1582	$y += $row_h;	1725	my $W = $x2 - $x1;
		1726	my $H = $y2 - $y1;
		1727
		1728	# now layout remaining widgets
		1729	for my $child ($self->visible_children) {
		1730	if ($child->{c_rel}) {
		1731	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1732	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1733
		1734	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1735	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1736	}
		1737	}
		1738
		1739	my $W = $x2 - $x1;
		1740	my $H = $y2 - $y1;
		1741
		1742	($W, $H)
		1743	}
		1744
		1745	sub invoke_size_allocate {
		1746	my ($self, $W, $H) = @_;
		1747
		1748	for my $child ($self->visible_children) {
		1749	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1750	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1751
		1752	$x += $child->{c_halign} * $child->{req_w};
		1753	$y += $child->{c_valign} * $child->{req_h};
		1754
		1755	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1583	}	1756	}
1584		1757
1585	1	1758	1
1586	}	1759	}
1587		1760
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	#############################################################################	1761	#############################################################################
1613		1762
1614	package CFPlus::UI::Box;	1763	package CFPlus::UI::Box;
1615		1764
1616	our @ISA = CFPlus::UI::Container::;	1765	our @ISA = CFPlus::UI::Container::;
1617		1766
1618	sub size_request {	1767	sub size_request {
1619	my ($self) = @_;	1768	my ($self) = @_;
		1769
		1770	my @children = $self->visible_children;
1620		1771
1621	$self->{vertical}	1772	$self->{vertical}
1622	? (	1773	? (
1623	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1774	(List::Util::max map $_->{req_w}, @children),
1624	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1775	(List::Util::sum map $_->{req_h}, @children),
1625	)	1776	)
1626	: (	1777	: (
1627	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1778	(List::Util::sum map $_->{req_w}, @children),
1628	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1779	(List::Util::max map $_->{req_h}, @children),
1629	)	1780	)
1630	}	1781	}
1631		1782
1632	sub invoke_size_allocate {	1783	sub invoke_size_allocate {
1633	my ($self, $w, $h) = @_;	1784	my ($self, $w, $h) = @_;
…		…
1757		1908
1758	delete $self->{ox};	1909	delete $self->{ox};
1759	$self->SUPER::realloc;	1910	$self->SUPER::realloc;
1760	}	1911	}
1761		1912
		1913	sub clear {
		1914	my ($self) = @_;
		1915
		1916	$self->set_text ("");
		1917	}
		1918
1762	sub set_text {	1919	sub set_text {
1763	my ($self, $text) = @_;	1920	my ($self, $text) = @_;
1764		1921
1765	return if $self->{text} eq "T$text";	1922	return if $self->{text} eq "T$text";
1766	$self->{text} = "T$text";	1923	$self->{text} = "T$text";
…		…
1872	: ($self->{w} - $size->[0]) * 0.5);	2029	: ($self->{w} - $size->[0]) * 0.5);
1873		2030
1874	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2031	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1875	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2032	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1876	: ($self->{h} - $size->[1]) * 0.5);	2033	: ($self->{h} - $size->[1]) * 0.5);
		2034
		2035	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1877	};	2036	};
1878		2037
1879	my $w = List::Util::min $self->{w} + 4, $size->[0];	2038	# unless ($self->{list}) {
1880	my $h = List::Util::min $self->{h} + 2, $size->[1];	2039	# $self->{list} = CFPlus::OpenGL::glGenList;
1881		2040	# CFPlus::OpenGL::glNewList $self->{list};
1882	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2041	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2042	# CFPlus::OpenGL::glEndList;
		2043	# }
		2044	#
		2045	# CFPlus::OpenGL::glCallList $self->{list};
		2046
		2047	$self->{layout}->draw;
1883	}	2048	}
		2049
		2050	#sub destroy {
		2051	# my ($self) = @_;
		2052	#
		2053	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2054	#
		2055	# $self->SUPER::destroy;
		2056	#}
1884		2057
1885	#############################################################################	2058	#############################################################################
1886		2059
1887	package CFPlus::UI::EntryBase;	2060	package CFPlus::UI::EntryBase;
1888		2061
…		…
1894	my $class = shift;	2067	my $class = shift;
1895		2068
1896	$class->SUPER::new (	2069	$class->SUPER::new (
1897	fg => [1, 1, 1],	2070	fg => [1, 1, 1],
1898	bg => [0, 0, 0, 0.2],	2071	bg => [0, 0, 0, 0.2],
		2072	outline => [0.6, 0.3, 0.1],
1899	active_bg => [1, 1, 1, 0.5],	2073	active_bg => [0, 0, 1, .2],
1900	active_fg => [0, 0, 0],	2074	active_fg => [1, 1, 1],
		2075	active_outline => [1, 1, 0],
1901	can_hover => 1,	2076	can_hover => 1,
1902	can_focus => 1,	2077	can_focus => 1,
1903	valign => 0,	2078	valign => 0,
1904	can_events => 1,	2079	can_events => 1,
		2080	ellipsise => 0,
1905	#text => ...	2081	#text => ...
1906	#hidden => "*",	2082	#hidden => "*",
1907	@_	2083	@_
1908	)	2084	)
1909	}	2085	}
…		…
1953	my $mod = $ev->{mod};	2129	my $mod = $ev->{mod};
1954	my $sym = $ev->{sym};	2130	my $sym = $ev->{sym};
1955	my $uni = $ev->{unicode};	2131	my $uni = $ev->{unicode};
1956		2132
1957	my $text = $self->get_text;	2133	my $text = $self->get_text;
		2134
		2135	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1958		2136
1959	if ($uni == 8) {	2137	if ($uni == 8) {
1960	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2138	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1961	} elsif ($uni == 127) {	2139	} elsif ($uni == 127) {
1962	substr $text, $self->{cursor}, 1, "";	2140	substr $text, $self->{cursor}, 1, "";
1963	} elsif ($sym == CFPlus::SDLK_LEFT) {	2141	} elsif ($sym == CFPlus::SDLK_LEFT) {
1964	--$self->{cursor} if $self->{cursor};	2142	--$self->{cursor} if $self->{cursor};
1965	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2143	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1966	++$self->{cursor} if $self->{cursor} < length $self->{text};	2144	++$self->{cursor} if $self->{cursor} < length $self->{text};
1967	} elsif ($sym == CFPlus::SDLK_HOME) {	2145	} elsif ($sym == CFPlus::SDLK_HOME) {
		2146	# what a hack
1968	$self->{cursor} = 0;	2147	$self->{cursor} =
		2148	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2149	? length $1
		2150	: 0;
1969	} elsif ($sym == CFPlus::SDLK_END) {	2151	} elsif ($sym == CFPlus::SDLK_END) {
		2152	# uh, again
		2153	$self->{cursor} =
		2154	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1970	$self->{cursor} = length $text;	2155	? $self->{cursor} + length $1
		2156	: length $self->{text};
1971	} elsif ($uni == 21) { # ctrl-u	2157	} elsif ($uni == 21) { # ctrl-u
1972	$text = "";	2158	$text = "";
1973	$self->{cursor} = 0;	2159	$self->{cursor} = 0;
1974	} elsif ($uni == 27) {	2160	} elsif ($uni == 27) {
1975	$self->emit ('escape');	2161	$self->emit ('escape');
1976	} elsif ($uni) {	2162	} elsif ($uni == 0x0d) {
		2163	substr $text, $self->{cursor}++, 0, "\012";
		2164	} elsif ($uni >= 0x20) {
1977	substr $text, $self->{cursor}++, 0, chr $uni;	2165	substr $text, $self->{cursor}++, 0, chr $uni;
1978	} else {	2166	} else {
1979	return 0;	2167	return 0;
1980	}	2168	}
1981		2169
1982	$self->_set_text ($text);	2170	$self->_set_text ($text);
1983		2171
1984	$self->realloc;	2172	$self->realloc;
		2173	$self->update;
1985		2174
1986	1	2175	1
1987	}	2176	}
1988		2177
1989	sub invoke_focus_in {	2178	sub invoke_focus_in {
…		…
2031	glColor_premultiply @{$self->{bg}};	2220	glColor_premultiply @{$self->{bg}};
2032	}	2221	}
2033		2222
2034	glEnable GL_BLEND;	2223	glEnable GL_BLEND;
2035	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2224	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};	2225	glRect 0, 0, $self->{w}, $self->{h};
2040	glVertex $self->{w}, 0;
2041	glEnd;
2042	glDisable GL_BLEND;	2226	glDisable GL_BLEND;
2043		2227
2044	$self->SUPER::_draw;	2228	$self->SUPER::_draw;
2045		2229
2046	#TODO: force update every cursor change :(	2230	#TODO: force update every cursor change :(
…		…
2048		2232
2049	unless (exists $self->{cur_h}) {	2233	unless (exists $self->{cur_h}) {
2050	my $text = substr $self->{text}, 0, $self->{cursor};	2234	my $text = substr $self->{text}, 0, $self->{cursor};
2051	utf8::encode $text;	2235	utf8::encode $text;
2052		2236
2053	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2237	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2054	}	2238	}
2055		2239
		2240	glColor_premultiply @{$self->{active_fg}};
2056	glBegin GL_LINES;	2241	glBegin GL_LINES;
2057	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2242	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2058	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2243	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2059	glEnd;	2244	glEnd;
		2245
		2246	glLineWidth 3;
		2247	glColor @{$self->{active_outline}};
		2248	glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
		2249	glLineWidth 1;
		2250
		2251	} else {
		2252	glColor @{$self->{outline}};
		2253	glTranslate .375, .375;
		2254	glBegin GL_LINE_STRIP;
		2255	glVertex 0, $self->{h} * .5;
		2256	glVertex 0, $self->{h} - 3;
		2257	glVertex $self->{w} - 1, $self->{h} - 3;
		2258	glVertex $self->{w} - 1, $self->{h} * .5;
		2259	glEnd;
2060	}	2260	}
2061	}	2261	}
		2262
		2263	#############################################################################
2062		2264
2063	package CFPlus::UI::Entry;	2265	package CFPlus::UI::Entry;
2064		2266
2065	our @ISA = CFPlus::UI::EntryBase::;	2267	our @ISA = CFPlus::UI::EntryBase::;
2066		2268
…		…
2069	sub invoke_key_down {	2271	sub invoke_key_down {
2070	my ($self, $ev) = @_;	2272	my ($self, $ev) = @_;
2071		2273
2072	my $sym = $ev->{sym};	2274	my $sym = $ev->{sym};
2073		2275
2074	if ($sym == 13) {	2276	if ($ev->{uni} == 0x0d || $sym == 13) {
2075	unshift @{$self->{history}},	2277	unshift @{$self->{history}},
2076	my $txt = $self->get_text;	2278	my $txt = $self->get_text;
2077		2279
2078	$self->{history_pointer} = -1;	2280	$self->{history_pointer} = -1;
2079	$self->{history_saveback} = '';	2281	$self->{history_saveback} = '';
…		…
2109	1	2311	1
2110	}	2312	}
2111		2313
2112	#############################################################################	2314	#############################################################################
2113		2315
		2316	package CFPlus::UI::TextEdit;
		2317
		2318	our @ISA = CFPlus::UI::EntryBase::;
		2319
		2320	use CFPlus::OpenGL;
		2321
		2322	sub move_cursor_ver {
		2323	my ($self, $dy) = @_;
		2324
		2325	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2326
		2327	$y += $dy;
		2328
		2329	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2330	$self->{cursor} = $index;
		2331	delete $self->{cur_h};
		2332	$self->update;
		2333	return;
		2334	}
		2335	}
		2336
		2337	sub invoke_key_down {
		2338	my ($self, $ev) = @_;
		2339
		2340	my $sym = $ev->{sym};
		2341
		2342	if ($sym == CFPlus::SDLK_UP) {
		2343	$self->move_cursor_ver (-1);
		2344	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2345	$self->move_cursor_ver (+1);
		2346	} else {
		2347	return $self->SUPER::invoke_key_down ($ev)
		2348	}
		2349
		2350	1
		2351	}
		2352
		2353	#############################################################################
		2354
2114	package CFPlus::UI::Button;	2355	package CFPlus::UI::ButtonBin;
2115		2356
2116	our @ISA = CFPlus::UI::Label::;	2357	our @ISA = CFPlus::UI::Bin::;
2117		2358
2118	use CFPlus::OpenGL;	2359	use CFPlus::OpenGL;
2119		2360
2120	my @tex =	2361	my @tex =
2121	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2122	qw(b1_button_active.png);	2363	qw(b1_button_inactive.png b1_button_active.png);
2123		2364
2124	sub new {	2365	sub new {
2125	my $class = shift;	2366	my $class = shift;
2126		2367
2127	$class->SUPER::new (	2368	$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,	2369	can_hover => 1,
2133	align => 0,	2370	align => 0,
2134	valign => 0,	2371	valign => 0,
2135	can_events => 1,	2372	can_events => 1,
2136	@_	2373	@_
…		…
2148	}	2385	}
2149		2386
2150	sub _draw {	2387	sub _draw {
2151	my ($self) = @_;	2388	my ($self) = @_;
2152		2389
2153	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2154
2155	glEnable GL_TEXTURE_2D;	2390	glEnable GL_TEXTURE_2D;
2156	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2391	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2157	glColor 0, 0, 0, 1;	2392	glColor 0, 0, 0, 1;
2158		2393
		2394	my $tex = $tex[$GRAB == $self];
2159	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2395	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2396
		2397	glDisable GL_TEXTURE_2D;
		2398
		2399	$self->SUPER::_draw;
		2400	}
		2401
		2402	#############################################################################
		2403
		2404	package CFPlus::UI::Button;
		2405
		2406	our @ISA = CFPlus::UI::Label::;
		2407
		2408	use CFPlus::OpenGL;
		2409
		2410	my @tex =
		2411	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2412	qw(b1_button_inactive.png b1_button_active.png);
		2413
		2414	sub new {
		2415	my $class = shift;
		2416
		2417	$class->SUPER::new (
		2418	padding_x => 4,
		2419	padding_y => 4,
		2420	fg => [1.0, 1.0, 1.0],
		2421	active_fg => [0.8, 0.8, 0.8],
		2422	can_hover => 1,
		2423	align => 0,
		2424	valign => 0,
		2425	can_events => 1,
		2426	@_
		2427	)
		2428	}
		2429
		2430	sub invoke_button_up {
		2431	my ($self, $ev, $x, $y) = @_;
		2432
		2433	$self->emit ("activate")
		2434	if $x >= 0 && $x < $self->{w}
		2435	&& $y >= 0 && $y < $self->{h};
		2436
		2437	1
		2438	}
		2439
		2440	sub _draw {
		2441	my ($self) = @_;
		2442
		2443	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2444
		2445	glEnable GL_TEXTURE_2D;
		2446	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2447	glColor 0, 0, 0, 1;
		2448
		2449	my $tex = $tex[$GRAB == $self];
		2450	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2160		2451
2161	glDisable GL_TEXTURE_2D;	2452	glDisable GL_TEXTURE_2D;
2162		2453
2163	$self->SUPER::_draw;	2454	$self->SUPER::_draw;
2164	}	2455	}
…		…
2251	sub new {	2542	sub new {
2252	my $class = shift;	2543	my $class = shift;
2253		2544
2254	my $self = $class->SUPER::new (	2545	my $self = $class->SUPER::new (
2255	can_events => 0,	2546	can_events => 0,
		2547	scale => 1,
2256	@_,	2548	@_,
2257	);	2549	);
2258		2550
2259	$self->{path} || $self->{tex}	2551	$self->{path} || $self->{tex}
2260	or Carp::croak "'path' or 'tex' attributes required";	2552	or Carp::croak "'path' or 'tex' attributes required";
2261		2553
2262	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2554	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2263	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2555	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2264		2556
2265	Scalar::Util::weaken $texture_cache{$self->{path}};	2557	CFPlus::weaken $texture_cache{$self->{path}};
2266		2558
2267	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2559	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2268		2560
2269	$self	2561	$self
2270	}	2562	}
…		…
2285	}	2577	}
2286		2578
2287	sub size_request {	2579	sub size_request {
2288	my ($self) = @_;	2580	my ($self) = @_;
2289		2581
2290	($self->{tex}{w}, $self->{tex}{h})	2582	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2291	}	2583	}
2292		2584
2293	sub _draw {	2585	sub _draw {
2294	my ($self) = @_;	2586	my ($self) = @_;
2295		2587
…		…
2305	}	2597	}
2306		2598
2307	glEnable GL_TEXTURE_2D;	2599	glEnable GL_TEXTURE_2D;
2308	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2600	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2309		2601
2310	$tex->draw_quad (0, 0, $w, $h);	2602	$tex->draw_quad_alpha (0, 0, $w, $h);
2311		2603
2312	glDisable GL_TEXTURE_2D;	2604	glDisable GL_TEXTURE_2D;
2313	}	2605	}
2314		2606
2315	#############################################################################	2607	#############################################################################
…		…
2334	align => 0,	2626	align => 0,
2335	valign => 0,	2627	valign => 0,
2336	can_events => 1,	2628	can_events => 1,
2337	@_	2629	@_
2338	);	2630	);
		2631	}
		2632
		2633	sub invoke_button_down {
		2634	my ($self, $ev, $x, $y) = @_;
		2635
		2636	1
2339	}	2637	}
2340		2638
2341	sub invoke_button_up {	2639	sub invoke_button_up {
2342	my ($self, $ev, $x, $y) = @_;	2640	my ($self, $ev, $x, $y) = @_;
2343		2641
…		…
2483	glDisable GL_TEXTURE_2D;	2781	glDisable GL_TEXTURE_2D;
2484	}	2782	}
2485		2783
2486	#############################################################################	2784	#############################################################################
2487		2785
		2786	package CFPlus::UI::Progress;
		2787
		2788	our @ISA = CFPlus::UI::Label::;
		2789
		2790	use CFPlus::OpenGL;
		2791
		2792	sub new {
		2793	my ($class, %arg) = @_;
		2794
		2795	my $self = $class->SUPER::new (
		2796	fg => [1, 1, 1],
		2797	bg => [0, 0, 1, 0.2],
		2798	bar => [0.7, 0.5, 0.1, 0.8],
		2799	outline => [0.4, 0.3, 0],
		2800	fontsize => 0.9,
		2801	valign => 0,
		2802	align => 0,
		2803	can_events => 1,
		2804	ellipsise => 1,
		2805	label => "%d%%",
		2806	%arg,
		2807	);
		2808
		2809	$self->set_value ($arg{value} || -1);
		2810
		2811	$self
		2812	}
		2813
		2814	sub set_label {
		2815	my ($self, $label) = @_;
		2816
		2817	return if $self->{label} eq $label;
		2818	$self->{label} = $label;
		2819
		2820	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2821	}
		2822
		2823	sub set_value {
		2824	my ($self, $value) = @_;
		2825
		2826	if ($self->{value} ne $value) {
		2827	$self->{value} = $value;
		2828
		2829	if ($value < 0) {
		2830	$self->set_text ("-");
		2831	} else {
		2832	$self->set_text (sprintf $self->{label}, $value * 100);
		2833	}
		2834
		2835	$self->update;
		2836	}
		2837	}
		2838
		2839	sub _draw {
		2840	my ($self) = @_;
		2841
		2842	glEnable GL_BLEND;
		2843	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2844
		2845	if ($self->{value} >= 0) {
		2846	my $s = 3 + ($self->{w} - 6) * $self->{value};
		2847
		2848	glColor_premultiply @{$self->{bar}};
		2849	glRect 2, 2, $s, $self->{h} - 2;
		2850	glColor_premultiply @{$self->{bg}};
		2851	glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
		2852	}
		2853
		2854	glColor_premultiply @{$self->{outline}};
		2855	glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
		2856
		2857	glDisable GL_BLEND;
		2858
		2859	{
		2860	local $self->{bg}; # do not draw background
		2861	$self->SUPER::_draw;
		2862	}
		2863	}
		2864
		2865	#############################################################################
		2866
		2867	package CFPlus::UI::ExperienceProgress;
		2868
		2869	our @ISA = CFPlus::UI::Progress::;
		2870
		2871	sub new {
		2872	my ($class, %arg) = @_;
		2873
		2874	my $self = $class->SUPER::new (
		2875	%arg
		2876	);
		2877
		2878	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2879	if $::CONN;
		2880
		2881	$self
		2882	}
		2883
		2884	sub DESTROY {
		2885	my ($self) = @_;
		2886
		2887	delete $::CONN->{on_exp_update}{$self+0}
		2888	if $::CONN;
		2889
		2890	$self->SUPER::DESTROY;
		2891	}
		2892
		2893	sub set_value {
		2894	my ($self, $lvl, $exp) = @_;
		2895
		2896	my $v = -1;
		2897
		2898	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2899	my $l0 = $table->[$lvl - 1];
		2900	my $l1 = $table->[$lvl];
		2901
		2902	$v = ($exp - $l0) / ($l1 - $l0);
		2903	}
		2904
		2905	$self->SUPER::set_value ($v);
		2906	}
		2907
		2908	#############################################################################
		2909
2488	package CFPlus::UI::Gauge;	2910	package CFPlus::UI::Gauge;
2489		2911
2490	our @ISA = CFPlus::UI::VBox::;	2912	our @ISA = CFPlus::UI::VBox::;
2491		2913
2492	sub new {	2914	sub new {
…		…
2617		3039
2618	$self->SUPER::invoke_button_down ($ev, $x, $y);	3040	$self->SUPER::invoke_button_down ($ev, $x, $y);
2619		3041
2620	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3042	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2621		3043
2622	$self->invoke_mouse_motion ($ev, $x, $y)	3044	$self->invoke_mouse_motion ($ev, $x, $y);
		3045
		3046	1
2623	}	3047	}
2624		3048
2625	sub invoke_mouse_motion {	3049	sub invoke_mouse_motion {
2626	my ($self, $ev, $x, $y) = @_;	3050	my ($self, $ev, $x, $y) = @_;
2627		3051
…		…
2643	sub invoke_mouse_wheel {	3067	sub invoke_mouse_wheel {
2644	my ($self, $ev) = @_;	3068	my ($self, $ev) = @_;
2645		3069
2646	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3070	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2647		3071
		3072	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3073
2648	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	3074	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2649		3075
2650	! ! $delta	3076	1
2651	}	3077	}
2652		3078
2653	sub update {	3079	sub update {
2654	my ($self) = @_;	3080	my ($self) = @_;
2655		3081
…		…
2763	#font => default_font	3189	#font => default_font
2764	@_,	3190	@_,
2765		3191
2766	layout => (new CFPlus::Layout),	3192	layout => (new CFPlus::Layout),
2767	par => [],	3193	par => [],
		3194	max_par => 0,
2768	height => 0,	3195	height => 0,
2769	children => [	3196	children => [
2770	(new CFPlus::UI::Empty expand => 1),	3197	(new CFPlus::UI::Empty expand => 1),
2771	(new CFPlus::UI::Slider vertical => 1),	3198	(new CFPlus::UI::Slider vertical => 1),
2772	],	3199	],
…		…
2785	}	3212	}
2786		3213
2787	sub size_request {	3214	sub size_request {
2788	my ($self) = @_;	3215	my ($self) = @_;
2789		3216
2790	my ($empty, $slider) = @{ $self->{children} };	3217	my ($empty, $slider) = $self->visible_children;
2791		3218
2792	local $self->{children} = [$empty, $slider];	3219	local $self->{children} = [$empty, $slider];
2793	$self->SUPER::size_request	3220	$self->SUPER::size_request
2794	}	3221	}
2795		3222
…		…
2897		3324
2898	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3325	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2899	push @{$self->{par}}, $para;	3326	push @{$self->{par}}, $para;
2900	}	3327	}
2901		3328
		3329	if (my $max = $self->{max_par}) {
		3330	shift @{$self->{par}} while @{$self->{par}} > $max;
		3331	}
		3332
2902	$self->{need_reflow}++;	3333	$self->{need_reflow}++;
2903	$self->update;	3334	$self->update;
2904	}	3335	}
2905		3336
2906	sub scroll_to_bottom {	3337	sub scroll_to_bottom {
…		…
2959		3390
2960	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {	3391	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2961	glClearColor 0, 0, 0, 0;	3392	glClearColor 0, 0, 0, 0;
2962	glClear GL_COLOR_BUFFER_BIT;	3393	glClear GL_COLOR_BUFFER_BIT;
2963		3394
2964	{
2965	package CFPlus::UI::Base;	3395	package CFPlus::UI::Base;
2966
2967	local ($draw_x, $draw_y, $draw_w, $draw_h) =	3396	local ($draw_x, $draw_y, $draw_w, $draw_h) =
2968	(0, 0, $self->{w}, $self->{h});	3397	(0, 0, $self->{w}, $self->{h});
2969	}
2970		3398
2971	my $top = int $self->{children}[1]{range}[0];	3399	my $top = int $self->{children}[1]{range}[0];
2972		3400
2973	my $paridx = 0;	3401	my $paridx = 0;
2974	my $top_paragraph;	3402	my $top_paragraph;
…		…
2983		3411
2984	if ($y0 < $y + $h && $y < $y1) {	3412	if ($y0 < $y + $h && $y < $y1) {
2985	my $layout = $self->get_layout ($para);	3413	my $layout = $self->get_layout ($para);
2986		3414
2987	$layout->render ($para->{indent}, $y - $y0);	3415	$layout->render ($para->{indent}, $y - $y0);
		3416	$layout->draw;
2988		3417
2989	if (my @w = @{ $para->{widget} }) {	3418	if (my @w = @{ $para->{widget} }) {
2990	my @s = $layout->get_shapes;	3419	my @s = $layout->get_shapes;
2991		3420
2992	for (@w) {	3421	for (@w) {
…		…
3183	glTranslate 0.375, 0.375;	3612	glTranslate 0.375, 0.375;
3184		3613
3185	my ($w, $h) = @$self{qw(w h)};	3614	my ($w, $h) = @$self{qw(w h)};
3186		3615
3187	glColor 1, 0.8, 0.4;	3616	glColor 1, 0.8, 0.4;
3188	glBegin GL_QUADS;	3617	glRect 0, 0, $w, $h;
3189	glVertex 0 , 0;
3190	glVertex 0 , $h;
3191	glVertex $w, $h;
3192	glVertex $w, 0;
3193	glEnd;
3194		3618
3195	glColor 0, 0, 0;	3619	glColor 0, 0, 0;
3196	glBegin GL_LINE_LOOP;	3620	glRect_lineloop 0, 0, $w, $h;
3197	glVertex 0 , 0;
3198	glVertex 0 , $h;
3199	glVertex $w, $h;
3200	glVertex $w, 0;
3201	glEnd;
3202		3621
3203	glTranslate 2 - 0.375, 2 - 0.375;	3622	glTranslate 2 - 0.375, 2 - 0.375;
3204		3623
3205	$self->SUPER::_draw;	3624	$self->SUPER::_draw;
3206	}	3625	}
…		…
3215		3634
3216	sub new {	3635	sub new {
3217	my $class = shift;	3636	my $class = shift;
3218		3637
3219	my $self = $class->SUPER::new (	3638	my $self = $class->SUPER::new (
		3639	size_w => 32,
		3640	size_h => 8,
3220	aspect => 1,	3641	aspect => 1,
3221	can_events => 0,	3642	can_events => 0,
3222	@_,	3643	@_,
3223	);	3644	);
3224		3645
3225	if ($self->{anim} && $self->{animspeed}) {	3646	if ($self->{anim} && $self->{animspeed}) {
3226	Scalar::Util::weaken (my $widget = $self);	3647	CFPlus::weaken (my $widget = $self);
3227		3648
		3649	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3650	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3228	$self->{timer} = Event->timer (	3651	$self->{timer} = Event->timer (
3229	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3230	hard => 1,	3652	parked => 1,
3231	interval => $self->{animspeed},
3232	cb => sub {	3653	cb => sub {
		3654	return unless $::CONN;
		3655
		3656	my $w = $widget
		3657	or return;
		3658
3233	++$widget->{frame};	3659	++$w->{frame};
		3660	$w->update_face;
		3661
		3662	# somehow, $widget can go away
3234	$widget->update;	3663	$w->update;
		3664	$w->update_timer;
3235	},	3665	},
3236	);	3666	);
		3667
		3668	$self->update_face;
		3669	$self->update_timer;
3237	}	3670	}
3238		3671
3239	$self	3672	$self
3240	}	3673	}
3241		3674
		3675	sub update_timer {
		3676	my ($self) = @_;
		3677
		3678	return unless $self->{timer};
		3679
		3680	if ($self->{visible}) {
		3681	$self->{timer}->at (
		3682	$self->{anim_start}
		3683	+ $self->{animspeed}
		3684	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3685	);
		3686	$self->{timer}->start;
		3687	} else {
		3688	$self->{timer}->stop;
		3689	}
		3690	}
		3691
		3692	sub update_face {
		3693	my ($self) = @_;
		3694
		3695	if ($::CONN) {
		3696	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3697	if ($anim && @$anim) {
		3698	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3699	delete $self->{face_change_cb};
		3700
		3701	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3702	unless ($tex->{name} || $tex->{loading}) {
		3703	$tex->upload (sub { $self->reconfigure });
		3704	}
		3705	}
		3706	}
		3707	}
		3708	}
		3709	}
		3710
3242	sub size_request {	3711	sub size_request {
3243	(32, 8)	3712	my ($self) = @_;
		3713
		3714	if ($::CONN) {
		3715	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3716	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3717	if ($tex->{name}) {
		3718	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3719	} elsif (!$tex->{loading}) {
		3720	$tex->upload (sub { $self->reconfigure });
		3721	}
		3722	}
		3723
		3724	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3725	}
		3726	}
		3727
		3728	($self->{size_w} || 8, $self->{size_h} || 8)
3244	}	3729	}
3245		3730
3246	sub update {	3731	sub update {
3247	my ($self) = @_;	3732	my ($self) = @_;
3248		3733
3249	return unless $self->{visible};	3734	return unless $self->{visible};
3250		3735
3251	$self->SUPER::update;	3736	$self->SUPER::update;
3252	}	3737	}
3253		3738
		3739	sub invoke_visibility_change {
		3740	my ($self) = @_;
		3741
		3742	$self->update_timer;
		3743
		3744	0
		3745	}
		3746
3254	sub _draw {	3747	sub _draw {
3255	my ($self) = @_;	3748	my ($self) = @_;
3256		3749
3257	return unless $::CONN;
3258
3259	$self->SUPER::_draw;	3750	$self->SUPER::_draw;
3260		3751
3261	my $face;	3752	if (my $tex = $self->{tex}) {
3262
3263	if ($self->{frame}) {
3264	my $anim = $::CONN->{anim}[$self->{anim}];
3265
3266	$face = $anim->[ $self->{frame} % @$anim ]
3267	if $anim && @$anim;
3268	}
3269
3270	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3271
3272	if ($tex) {
3273	glEnable GL_TEXTURE_2D;	3753	glEnable GL_TEXTURE_2D;
3274	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3754	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3275	glColor 0, 0, 0, 1;	3755	glColor 0, 0, 0, 1;
3276	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3756	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3277	glDisable GL_TEXTURE_2D;	3757	glDisable GL_TEXTURE_2D;
…		…
3279	}	3759	}
3280		3760
3281	sub destroy {	3761	sub destroy {
3282	my ($self) = @_;	3762	my ($self) = @_;
3283		3763
3284	$self->{timer}->cancel	3764	(delete $self->{timer})->cancel
3285	if $self->{timer};	3765	if $self->{timer};
3286		3766
3287	$self->SUPER::destroy;	3767	$self->SUPER::destroy;
3288	}	3768	}
3289		3769
…		…
3291		3771
3292	package CFPlus::UI::Buttonbar;	3772	package CFPlus::UI::Buttonbar;
3293		3773
3294	our @ISA = CFPlus::UI::HBox::;	3774	our @ISA = CFPlus::UI::HBox::;
3295		3775
3296	# TODO: should actualyl wrap buttons and other goodies.	3776	# TODO: should actually wrap buttons and other goodies.
3297		3777
3298	#############################################################################	3778	#############################################################################
3299		3779
3300	package CFPlus::UI::Menu;	3780	package CFPlus::UI::Menu;
3301		3781
…		…
3329	children => [	3809	children => [
3330	(new CFPlus::UI::Label markup => $left, expand => 1),	3810	(new CFPlus::UI::Label markup => $left, expand => 1),
3331	(new CFPlus::UI::Label markup => $right, align => +1),	3811	(new CFPlus::UI::Label markup => $right, align => +1),
3332	],	3812	],
3333	;	3813	;
3334		3814
3335	} else {	3815	} else {
3336	$widget = new CFPlus::UI::Label	3816	$widget = new CFPlus::UI::Label
3337	can_hover => 1,	3817	can_hover => 1,
3338	can_events => 1,	3818	can_events => 1,
3339	markup => $widget,	3819	markup => $widget,
…		…
3464		3944
3465	#############################################################################	3945	#############################################################################
3466		3946
3467	package CFPlus::UI::Notebook;	3947	package CFPlus::UI::Notebook;
3468		3948
		3949	use CFPlus::OpenGL;
		3950
3469	our @ISA = CFPlus::UI::VBox::;	3951	our @ISA = CFPlus::UI::VBox::;
3470		3952
3471	sub new {	3953	sub new {
3472	my $class = shift;	3954	my $class = shift;
3473		3955
3474	my $self = $class->SUPER::new (	3956	my $self = $class->SUPER::new (
3475	buttonbar => (new CFPlus::UI::Buttonbar),	3957	buttonbar => (new CFPlus::UI::Buttonbar),
3476	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3958	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3959	active_outline => [1, 1, 0],
3477	# filter => # will be put between multiplexer and $self	3960	# filter => # will be put between multiplexer and $self
3478	@_,	3961	@_,
3479	);	3962	);
3480		3963
3481	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3964	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3482	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3965	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3483		3966
		3967	{
		3968	Scalar::Util::weaken (my $wself = $self);
		3969
		3970	$self->{multiplexer}->connect (c_add => sub {
		3971	my ($mplex, $widgets) = @_;
		3972
		3973	for my $child (@$widgets) {
		3974	Scalar::Util::weaken $child;
		3975	$child->{c_tab_} ||= do {
		3976	my $tab =
		3977	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3978	? $child->{c_tab}
		3979	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3980
		3981	$tab->connect (activate => sub {
		3982	$wself->set_current_page ($child);
		3983	});
		3984
		3985	$tab
		3986	};
		3987
		3988	$self->{buttonbar}->add ($child->{c_tab_});
		3989	}
		3990	});
		3991
		3992	$self->{multiplexer}->connect (c_remove => sub {
		3993	my ($mplex, $widgets) = @_;
		3994
		3995	for my $child (@$widgets) {
		3996	$wself->{buttonbar}->remove ($child->{c_tab_});
		3997	}
		3998	});
		3999	}
		4000
3484	$self	4001	$self
3485	}	4002	}
3486		4003
3487	sub add {	4004	sub add {
		4005	my ($self, @widgets) = @_;
		4006
		4007	$self->{multiplexer}->add (@widgets)
		4008	}
		4009
		4010	sub remove {
		4011	my ($self, @widgets) = @_;
		4012
		4013	$self->{multiplexer}->remove (@widgets)
		4014	}
		4015
		4016	sub pages {
		4017	my ($self) = @_;
		4018	$self->{multiplexer}->children
		4019	}
		4020
		4021	sub add_tab {
3488	my ($self, $title, $widget, $tooltip) = @_;	4022	my ($self, $title, $widget, $tooltip) = @_;
3489		4023
3490	Scalar::Util::weaken $self;	4024	$title = [$title, $tooltip] unless ref $title;
		4025	$widget->{c_tab} = $title;
3491		4026
3492	$self->{buttonbar}->add (new CFPlus::UI::Button
3493	markup => $title,
3494	tooltip => $tooltip,
3495	on_activate => sub { $self->set_current_page ($widget) },
3496	);
3497
3498	$self->{multiplexer}->add ($widget);	4027	$self->add ($widget);
3499	}	4028	}
3500		4029
3501	sub get_current_page {	4030	sub get_current_page {
3502	my ($self) = @_;	4031	my ($self) = @_;
3503		4032
…		…
3507	sub set_current_page {	4036	sub set_current_page {
3508	my ($self, $page) = @_;	4037	my ($self, $page) = @_;
3509		4038
3510	$self->{multiplexer}->set_current_page ($page);	4039	$self->{multiplexer}->set_current_page ($page);
3511	$self->emit (page_changed => $self->{multiplexer}{current});	4040	$self->emit (page_changed => $self->{multiplexer}{current});
		4041	}
		4042
		4043	sub _draw {
		4044	my ($self) = @_;
		4045
		4046	$self->SUPER::_draw ();
		4047
		4048	if (my $cur = $self->{multiplexer}{current}) {
		4049	if ($cur = $cur->{c_tab_}) {
		4050	glTranslate $cur->{x}, $cur->{y};
		4051	glLineWidth 3;
		4052	glColor @{$self->{active_outline}};
		4053	glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
		4054	glLineWidth 1;
		4055	}
		4056	}
3512	}	4057	}
3513		4058
3514	#############################################################################	4059	#############################################################################
3515		4060
3516	package CFPlus::UI::Selector;	4061	package CFPlus::UI::Selector;
…		…
3579	my $self = $class->SUPER::new (	4124	my $self = $class->SUPER::new (
3580	fontsize => 0.8,	4125	fontsize => 0.8,
3581	@_,	4126	@_,
3582	);	4127	);
3583		4128
3584	Scalar::Util::weaken (my $this = $self);	4129	CFPlus::weaken (my $this = $self);
3585		4130
3586	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4131	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3587		4132
3588	$self	4133	$self
3589	}	4134	}
…		…
3712	$self->SUPER::destroy;	4257	$self->SUPER::destroy;
3713	}	4258	}
3714		4259
3715	#############################################################################	4260	#############################################################################
3716		4261
3717	package CFPlus::UI::Inventory;
3718
3719	our @ISA = CFPlus::UI::Table::;
3720
3721	sub new {
3722	my $class = shift;
3723
3724	my $self = $class->SUPER::new (
3725	col_expand => [0, 1, 0],
3726	items => [],
3727	@_,
3728	);
3729
3730	$self->set_sort_order (undef);
3731
3732	$self
3733	}
3734
3735	sub update_items {
3736	my ($self) = @_;
3737
3738	$self->clear;
3739
3740	my @item = $self->{sort}->(@{ $self->{items} });
3741
3742	my @adds;
3743	my $row = 0;
3744	for my $item ($self->{sort}->(@{ $self->{items} })) {
3745	CFPlus::Item::update_widgets $item;
3746
3747	push @adds, 0, $row, $item->{face_widget};
3748	push @adds, 1, $row, $item->{desc_widget};
3749	push @adds, 2, $row, $item->{weight_widget};
3750
3751	$row++;
3752	}
3753
3754	$self->add (@adds);
3755	}
3756
3757	sub set_sort_order {
3758	my ($self, $order) = @_;
3759
3760	$self->{sort} = $order ||= sub {
3761	sort {
3762	$a->{type} <=> $b->{type}
3763	or $a->{name} cmp $b->{name}
3764	} @_
3765	};
3766
3767	$self->update_items;
3768	}
3769
3770	sub set_items {
3771	my ($self, $items) = @_;
3772
3773	$self->{items} = [$items ? values %$items : ()];
3774	$self->update_items;
3775	}
3776
3777	#############################################################################
3778
3779	package CFPlus::UI::SpellList;
3780
3781	our @ISA = CFPlus::UI::Table::;
3782
3783	sub new {
3784	my $class = shift;
3785
3786	my $self = $class->SUPER::new (
3787	binding => [],
3788	commands => [],
3789	@_,
3790	)
3791	}
3792
3793	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3794
3795	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3796	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3797	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3798	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3799	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3800	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3801	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3802	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3803	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3804	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3805
3806	sub rebuild_spell_list {
3807	my ($self) = @_;
3808
3809	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3810	$self->clear;
3811
3812	return unless $::CONN;
3813
3814	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3815	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3816	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3817	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3818	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3819
3820	my $row = 0;
3821
3822	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3823	my $spell = $self->{spell}{$_};
3824
3825	$row++;
3826
3827	my $spell_cb = sub {
3828	my ($widget, $ev) = @_;
3829
3830	if ($ev->{button} == 1) {
3831	$::CONN->user_send ("cast $spell->{name}");
3832	} elsif ($ev->{button} == 2) {
3833	$::CONN->user_send ("invoke $spell->{name}");
3834	} elsif ($ev->{button} == 3) {
3835	(new CFPlus::UI::Menu
3836	items => [
3837	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3838	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3839	],
3840	)->popup ($ev);
3841	} else {
3842	return 0;
3843	}
3844
3845	1
3846	};
3847
3848	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3849
3850	#TODO: add path info to tooltip
3851	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3852
3853	$self->add (0, $row, new CFPlus::UI::Face
3854	face => $spell->{face},
3855	can_hover => 1,
3856	can_events => 1,
3857	tooltip => $tooltip,
3858	on_button_down => $spell_cb,
3859	);
3860
3861	$self->add (1, $row, new CFPlus::UI::Label
3862	expand => 1,
3863	text => $spell->{name},
3864	can_hover => 1,
3865	can_events => 1,
3866	tooltip => $tooltip,
3867	on_button_down => $spell_cb,
3868	);
3869
3870	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3871	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3872	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3873	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3874	}
3875	});
3876	}
3877
3878	sub add_spell {
3879	my ($self, $spell) = @_;
3880
3881	$self->{spell}->{$spell->{name}} = $spell;
3882	$self->rebuild_spell_list;
3883	}
3884
3885	sub remove_spell {
3886	my ($self, $spell) = @_;
3887
3888	delete $self->{spell}->{$spell->{name}};
3889	$self->rebuild_spell_list;
3890	}
3891
3892	sub clear_spells {
3893	my ($self) = @_;
3894
3895	$self->{spell} = {};
3896	$self->rebuild_spell_list;
3897	}
3898
3899	#############################################################################
3900
3901	package CFPlus::UI::Root;	4262	package CFPlus::UI::Root;
3902		4263
3903	our @ISA = CFPlus::UI::Container::;	4264	our @ISA = CFPlus::UI::Container::;
3904		4265
3905	use List::Util qw(min max);	4266	use List::Util qw(min max);
…		…
3912	my $self = $class->SUPER::new (	4273	my $self = $class->SUPER::new (
3913	visible => 1,	4274	visible => 1,
3914	@_,	4275	@_,
3915	);	4276	);
3916		4277
3917	Scalar::Util::weaken ($self->{root} = $self);	4278	CFPlus::weaken ($self->{root} = $self);
3918		4279
3919	$self	4280	$self
3920	}	4281	}
3921		4282
3922	sub size_request {	4283	sub size_request {
…		…
3970	}	4331	}
3971		4332
3972	sub update {	4333	sub update {
3973	my ($self) = @_;	4334	my ($self) = @_;
3974		4335
3975	$::WANT_REFRESH++;	4336	$::WANT_REFRESH->start;
3976	}	4337	}
3977		4338
3978	sub add {	4339	sub add {
3979	my ($self, @children) = @_;	4340	my ($self, @children) = @_;
3980		4341
…		…
4017	while ($self->{refresh_hook}) {	4378	while ($self->{refresh_hook}) {
4018	$_->()	4379	$_->()
4019	for values %{delete $self->{refresh_hook}};	4380	for values %{delete $self->{refresh_hook}};
4020	}	4381	}
4021		4382
4022	if ($self->{realloc}) {	4383	while ($self->{realloc}) {
4023	my %queue;	4384	my %queue;
4024	my @queue;	4385	my @queue;
4025	my $widget;	4386	my $widget;
4026		4387
4027	outer:	4388	outer:
…		…
4074	}	4435	}
4075	}	4436	}
4076		4437
4077	delete $self->{realloc}{$widget+0};	4438	delete $self->{realloc}{$widget+0};
4078	}	4439	}
4079	}
4080		4440
4081	while (my $size_alloc = delete $self->{size_alloc}) {	4441	while (my $size_alloc = delete $self->{size_alloc}) {
4082	my @queue = sort { $b->{visible} <=> $a->{visible} }	4442	my @queue = sort { $a->{visible} <=> $b->{visible} }
4083	values %$size_alloc;	4443	values %$size_alloc;
4084		4444
4085	while () {	4445	while () {
4086	my $widget = pop @queue || last;	4446	my $widget = pop @queue || last;
4087		4447
4088	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4448	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4089		4449
4090	$w = 0 if $w < 0;
4091	$h = 0 if $h < 0;
4092
4093	$w = max $widget->{min_w}, $w;	4450	$w = max $widget->{min_w}, $w;
4094	$h = max $widget->{min_h}, $h;	4451	$h = max $widget->{min_h}, $h;
4095		4452
4096	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4453	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4097	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4454	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4098		4455
4099	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4456	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4100	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4457	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4101		4458
4102	$w = int $w + 0.5;	4459	$w = int $w + 0.5;
4103	$h = int $h + 0.5;	4460	$h = int $h + 0.5;
4104		4461
4105	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4462	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4106	$widget->{old_w} = $widget->{w};	4463	$widget->{old_w} = $widget->{w};
4107	$widget->{old_h} = $widget->{h};	4464	$widget->{old_h} = $widget->{h};
4108		4465
4109	$widget->{w} = $w;	4466	$widget->{w} = $w;
4110	$widget->{h} = $h;	4467	$widget->{h} = $h;
4111		4468
4112	$widget->emit (size_allocate => $w, $h);	4469	$widget->emit (size_allocate => $w, $h);
		4470	}
4113	}	4471	}
4114	}	4472	}
4115	}	4473	}
4116		4474
4117	while ($self->{post_alloc_hook}) {	4475	while ($self->{post_alloc_hook}) {
4118	$_->()	4476	$_->()
4119	for values %{delete $self->{post_alloc_hook}};	4477	for values %{delete $self->{post_alloc_hook}};
4120	}	4478	}
4121
4122		4479
4123	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4480	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4124	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4481	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4125	glClear GL_COLOR_BUFFER_BIT;	4482	glClear GL_COLOR_BUFFER_BIT;
4126		4483
…		…
4133	{	4490	{
4134	package CFPlus::UI::Base;	4491	package CFPlus::UI::Base;
4135		4492
4136	local ($draw_x, $draw_y, $draw_w, $draw_h) =	4493	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4137	(0, 0, $self->{w}, $self->{h});	4494	(0, 0, $self->{w}, $self->{h});
4138	}
4139		4495
4140	$self->_draw;	4496	$self->_draw;
		4497	}
4141	}	4498	}
4142		4499
4143	#############################################################################	4500	#############################################################################
4144		4501
4145	package CFPlus::UI;	4502	package CFPlus::UI;

Diff Legend

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