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.342 by root, Sun Aug 13 14:38:35 2006 UTC vs.
Revision 1.425 by root, Fri Aug 10 04:02: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";
…		…
637		606
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
643	delete $WIDGET{$self+0};
644		611
645	eval { $self->destroy };	612	eval { $self->destroy };
646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	613	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		614
		615	delete $WIDGET{$self+0};
647	}	616	}
648		617
649	#############################################################################	618	#############################################################################
650		619
651	package CFPlus::UI::DrawBG;	620	package CFPlus::UI::DrawBG;
…		…
727	can_events => 0,	696	can_events => 0,
728	%arg,	697	%arg,
729	);	698	);
730		699
731	$self->add (@$children)	700	$self->add (@$children)
732	if $children;	701	if $children && @$children;
733		702
734	$self	703	$self
735	}	704	}
736		705
737	sub realloc {	706	sub realloc {
…		…
746	my ($self, @widgets) = @_;	715	my ($self, @widgets) = @_;
747		716
748	$_->set_parent ($self)	717	$_->set_parent ($self)
749	for @widgets;	718	for @widgets;
750		719
		720	# TODO: only do this in widgets that need it, e.g. root, fixed
751	use sort 'stable';	721	use sort 'stable';
752		722
753	$self->{children} = [	723	$self->{children} = [
754	sort { $a->{z} <=> $b->{z} }	724	sort { $a->{z} <=> $b->{z} }
755	@{$self->{children}}, @widgets	725	@{$self->{children}}, @widgets
756	];	726	];
757		727
758	$self->realloc;	728	$self->realloc;
		729
		730	$self->emit (c_add => \@widgets);
		731
		732	map $_+0, @widgets
759	}	733	}
760		734
761	sub children {	735	sub children {
762	@{ $_[0]{children} }	736	@{ $_[0]{children} }
763	}	737	}
764		738
765	sub remove {	739	sub remove {
766	my ($self, $child) = @_;	740	my ($self, @widgets) = @_;
767		741
		742	$self->emit (c_remove => \@widgets);
		743
		744	for my $child (@widgets) {
768	delete $child->{parent};	745	delete $child->{parent};
769	$child->hide;	746	$child->hide;
770
771	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	747	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		748	}
772		749
773	$self->realloc;	750	$self->realloc;
774	}	751	}
775		752
776	sub clear {	753	sub clear {
777	my ($self) = @_;	754	my ($self) = @_;
778		755
779	my $children = delete $self->{children};	756	my $children = $self->{children};
780	$self->{children} = [];	757	$self->{children} = [];
781		758
782	for (@$children) {	759	for (@$children) {
783	delete $_->{parent};	760	delete $_->{parent};
784	$_->hide;	761	$_->hide;
…		…
804	}	781	}
805		782
806	sub _draw {	783	sub _draw {
807	my ($self) = @_;	784	my ($self) = @_;
808		785
809	$_->draw for @{$self->{children}};	786	$_->draw for $self->visible_children;
810	}	787	}
811		788
812	#############################################################################	789	#############################################################################
813		790
814	package CFPlus::UI::Bin;	791	package CFPlus::UI::Bin;
…		…
824	}	801	}
825		802
826	sub add {	803	sub add {
827	my ($self, $child) = @_;	804	my ($self, $child) = @_;
828		805
829	$self->SUPER::remove ($_) for @{ $self->{children} };	806	$self->clear;
830	$self->SUPER::add ($child);	807	$self->SUPER::add ($child);
831	}	808	}
832		809
833	sub remove {	810	sub remove {
834	my ($self, $widget) = @_;	811	my ($self, $widget) = @_;
…		…
898	glClear GL_COLOR_BUFFER_BIT;	875	glClear GL_COLOR_BUFFER_BIT;
899		876
900	{	877	{
901	package CFPlus::UI::Base;	878	package CFPlus::UI::Base;
902		879
903	($draw_x, $draw_y, $draw_w, $draw_h) =	880	local ($draw_x, $draw_y, $draw_w, $draw_h) =
904	(0, 0, $self->{w}, $self->{h});	881	(0, 0, $self->{w}, $self->{h});
		882
		883	$self->_render;
905	}	884	}
906
907	$self->_render;
908	};	885	};
909	}	886	}
910		887
911	sub _draw {	888	sub _draw {
912	my ($self) = @_;	889	my ($self) = @_;
913
914	my ($w, $h) = @$self{qw(w h)};
915		890
916	my $tex = $self->{texture}	891	my $tex = $self->{texture}
917	or return;	892	or return;
918		893
919	glEnable GL_TEXTURE_2D;	894	glEnable GL_TEXTURE_2D;
920	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	895	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
921	glColor 0, 0, 0, 1;	896	glColor 0, 0, 0, 1;
922		897
923	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	898	$tex->draw_quad_alpha_premultiplied (0, 0);
924		899
925	glDisable GL_TEXTURE_2D;	900	glDisable GL_TEXTURE_2D;
926	}	901	}
927		902
928	#############################################################################	903	#############################################################################
929		904
930	package CFPlus::UI::ViewPort;	905	package CFPlus::UI::ViewPort;
		906
		907	use List::Util qw(min max);
931		908
932	our @ISA = CFPlus::UI::Window::;	909	our @ISA = CFPlus::UI::Window::;
933		910
934	sub new {	911	sub new {
935	my $class = shift;	912	my $class = shift;
…		…
944	sub size_request {	921	sub size_request {
945	my ($self) = @_;	922	my ($self) = @_;
946		923
947	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	924	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
948		925
949	$w = 10 if $self->{scroll_x};	926	$w = 1 if $self->{scroll_x};
950	$h = 10 if $self->{scroll_y};	927	$h = 1 if $self->{scroll_y};
951		928
952	($w, $h)	929	($w, $h)
953	}	930	}
954		931
955	sub invoke_size_allocate {	932	sub invoke_size_allocate {
…		…
967	}	944	}
968		945
969	sub set_offset {	946	sub set_offset {
970	my ($self, $x, $y) = @_;	947	my ($self, $x, $y) = @_;
971		948
		949	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		950	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		951
		952	if ($x != $self->{view_x} or $y != $self->{view_y}) {
972	$self->{view_x} = int $x;	953	$self->{view_x} = $x;
973	$self->{view_y} = int $y;	954	$self->{view_y} = $y;
974		955
		956	$self->emit (changed => $x, $y);
975	$self->update;	957	$self->update;
		958	}
		959	}
		960
		961	sub set_center {
		962	my ($self, $x, $y) = @_;
		963
		964	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		965	}
		966
		967	sub make_visible {
		968	my ($self, $x, $y, $border) = @_;
		969
		970	if ( $x < $self->{view_x} + $self->{w} * $border
		971	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		972	|| $y < $self->{view_y} + $self->{h} * $border
		973	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		974	) {
		975	$self->set_center ($x, $y);
		976	}
976	}	977	}
977		978
978	# hmm, this does not work for topleft of $self... but we should not ask for that	979	# hmm, this does not work for topleft of $self... but we should not ask for that
979	sub coord2local {	980	sub coord2local {
980	my ($self, $x, $y) = @_;	981	my ($self, $x, $y) = @_;
…		…
995	my ($self, $x, $y) = @_;	996	my ($self, $x, $y) = @_;
996		997
997	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	998	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
998	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	999	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
999	) {	1000	) {
1000	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1001	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1001	} else {	1002	} else {
1002	$self->CFPlus::UI::Base::find_widget ($x, $y)	1003	$self->CFPlus::UI::Base::find_widget ($x, $y)
1003	}	1004	}
1004	}	1005	}
1005		1006
…		…
1016		1017
1017	#############################################################################	1018	#############################################################################
1018		1019
1019	package CFPlus::UI::ScrolledWindow;	1020	package CFPlus::UI::ScrolledWindow;
1020		1021
1021	our @ISA = CFPlus::UI::HBox::;	1022	our @ISA = CFPlus::UI::Table::;
1022		1023
1023	sub new {	1024	sub new {
1024	my ($class, %arg) = @_;	1025	my ($class, %arg) = @_;
1025		1026
1026	my $child = delete $arg{child};	1027	my $child = delete $arg{child};
1027		1028
1028	my $self;	1029	my $self;
1029		1030
1030	my $slider = new CFPlus::UI::Slider	1031	my $hslider = new CFPlus::UI::Slider
		1032	c_col => 0,
		1033	c_row => 1,
		1034	vertical => 0,
		1035	range => [0, 0, 1, 0.01], # HACK fix
		1036	on_changed => sub {
		1037	$self->{hpos} = $_[1];
		1038	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1039	},
		1040	;
		1041
		1042	my $vslider = new CFPlus::UI::Slider
		1043	c_col => 1,
		1044	c_row => 0,
1031	vertical => 1,	1045	vertical => 1,
1032	range => [0, 0, 1, 0.01], # HACK fix	1046	range => [0, 0, 1, 0.01], # HACK fix
1033	on_changed => sub {	1047	on_changed => sub {
1034	$self->{vp}->set_offset (0, $_[1]);	1048	$self->{vpos} = $_[1];
		1049	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1035	},	1050	},
1036	;	1051	;
1037		1052
1038	$self = $class->SUPER::new (	1053	$self = $class->SUPER::new (
1039	vp => (new CFPlus::UI::ViewPort expand => 1),	1054	scroll_x => 0,
		1055	scroll_y => 1,
1040	can_events => 1,	1056	can_events => 1,
1041	slider => $slider,	1057	hslider => $hslider,
		1058	vslider => $vslider,
		1059	col_expand => [1, 0],
		1060	row_expand => [1, 0],
1042	%arg,	1061	%arg,
1043	);	1062	);
1044		1063
		1064	$self->{vp} = new CFPlus::UI::ViewPort
		1065	c_col => 0,
		1066	c_row => 0,
		1067	expand => 1,
		1068	scroll_x => $self->{scroll_x},
		1069	scroll_y => $self->{scroll_y},
		1070	on_changed => sub {
		1071	my ($vp, $x, $y) = @_;
		1072
		1073	$vp->{parent}{hslider}->set_value ($x);
		1074	$vp->{parent}{vslider}->set_value ($y);
		1075
		1076	0
		1077	},
		1078	on_size_allocate => sub {
		1079	my ($vp, $w, $h) = @_;
		1080	$vp->{parent}->update_slider;
		1081	0
		1082	},
		1083	;
		1084
1045	$self->SUPER::add ($self->{vp}, $self->{slider});	1085	$self->SUPER::add ($self->{vp});
		1086
1046	$self->add ($child) if $child;	1087	$self->add ($child) if $child;
1047		1088
1048	$self	1089	$self
1049	}	1090	}
1050
1051	#TODO# update range on size_allocate depending on child
1052		1091
1053	sub add {	1092	sub add {
1054	my ($self, $widget) = @_;	1093	my ($self, $widget) = @_;
1055		1094
1056	$self->{vp}->add ($self->{child} = $widget);	1095	$self->{vp}->add ($self->{child} = $widget);
1057	}	1096	}
1058		1097
		1098	sub set_offset { shift->{vp}->set_offset (@_) }
		1099	sub set_center { shift->{vp}->set_center (@_) }
		1100	sub make_visible { shift->{vp}->make_visible (@_) }
		1101
		1102	sub update_slider {
		1103	my ($self) = @_;
		1104
		1105	my $child = ($self->{vp} or return)->child;
		1106
		1107	if ($self->{scroll_x}) {
		1108	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1109	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1110
		1111	my $visible = $w1 > $w2;
		1112	if ($visible != $self->{hslider_visible}) {
		1113	$self->{hslider_visible} = $visible;
		1114	$visible ? $self->SUPER::add ($self->{hslider})
		1115	: $self->SUPER::remove ($self->{hslider});
		1116	}
		1117	}
		1118
		1119	if ($self->{scroll_y}) {
		1120	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1121	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1122
		1123	my $visible = $h1 > $h2;
		1124	if ($visible != $self->{vslider_visible}) {
		1125	$self->{vslider_visible} = $visible;
		1126	$visible ? $self->SUPER::add ($self->{vslider})
		1127	: $self->SUPER::remove ($self->{vslider});
		1128	}
		1129	}
		1130	}
		1131
		1132	sub start_dragging {
		1133	my ($self, $ev) = @_;
		1134
		1135	$self->grab_focus;
		1136
		1137	my $ox = $self->{vp}{view_x};
		1138	my $oy = $self->{vp}{view_y};
		1139
		1140	$self->{motion} = sub {
		1141	my ($ev, $x, $y) = @_;
		1142
		1143	$ox -= $ev->{xrel};
		1144	$oy -= $ev->{yrel};
		1145
		1146	$self->{vp}->set_offset ($ox, $oy);
		1147	};
		1148	}
		1149
1059	sub invoke_mouse_wheel {	1150	sub invoke_mouse_wheel {
1060	my ($self, $ev) = @_;	1151	my ($self, $ev) = @_;
1061		1152
1062	return 0 unless $ev->{dy}; # only vertical movements
1063
1064	$self->{slider}->emit (mouse_wheel => $ev);	1153	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1154	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1065		1155
1066	1	1156	1
1067	}	1157	}
1068		1158
1069	sub update_slider {	1159	sub invoke_button_down {
1070	my ($self) = @_;	1160	my ($self, $ev, $x, $y) = @_;
1071		1161
1072	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1162	if ($ev->{button} == 2) {
1073	}	1163	$self->start_dragging ($ev);
		1164	return 1;
		1165	}
1074		1166
1075	sub update {	1167	0
1076	my ($self) = @_;	1168	}
1077		1169
1078	$self->SUPER::update;	1170	sub invoke_button_up {
		1171	my ($self, $ev, $x, $y) = @_;
1079		1172
1080	$self->update_slider;	1173	if (delete $self->{motion}) {
		1174	return 1;
		1175	}
		1176
		1177	0
		1178	}
		1179
		1180	sub invoke_mouse_motion {
		1181	my ($self, $ev, $x, $y) = @_;
		1182
		1183	if ($self->{motion}) {
		1184	$self->{motion}->($ev, $x, $y);
		1185	return 1;
		1186	}
		1187
		1188	0
1081	}	1189	}
1082		1190
1083	sub invoke_size_allocate {	1191	sub invoke_size_allocate {
1084	my ($self, $w, $h) = @_;	1192	my ($self, $w, $h) = @_;
1085		1193
1086	$self->update_slider;	1194	$self->update_slider;
1087
1088	$self->SUPER::invoke_size_allocate ($w, $h)	1195	$self->SUPER::invoke_size_allocate ($w, $h)
1089	}	1196	}
1090		1197
1091	#############################################################################	1198	#############################################################################
1092		1199
…		…
1134		1241
1135	our @ISA = CFPlus::UI::Bin::;	1242	our @ISA = CFPlus::UI::Bin::;
1136		1243
1137	use CFPlus::OpenGL;	1244	use CFPlus::OpenGL;
1138		1245
		1246	sub new {
		1247	my ($class, %arg) = @_;
		1248
		1249	if ((exists $arg{label}) && !ref $arg{label}) {
		1250	$arg{label} = new CFPlus::UI::Label
		1251	align => 1,
		1252	valign => 0,
		1253	text => $arg{label},
		1254	fontsize => ($arg{border} || 0.8) * 0.75;
		1255	}
		1256
		1257	my $self = $class->SUPER::new (
		1258	# label => "",
		1259	fg => [0.6, 0.3, 0.1],
		1260	border => 0.8,
		1261	style => 'single',
		1262	%arg,
		1263	);
		1264
		1265	$self
		1266	}
		1267
		1268	sub add {
		1269	my ($self, @widgets) = @_;
		1270
		1271	$self->SUPER::add (@widgets);
		1272	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1273	}
		1274
		1275	sub border {
		1276	int $_[0]{border} * $::FONTSIZE
		1277	}
		1278
		1279	sub size_request {
		1280	my ($self) = @_;
		1281
		1282	($self->{label_w}, undef) = $self->{label}->size_request
		1283	if $self->{label};
		1284
		1285	my ($w, $h) = $self->SUPER::size_request;
		1286
		1287	(
		1288	$w + $self->border * 2,
		1289	$h + $self->border * 2,
		1290	)
		1291	}
		1292
		1293	sub invoke_size_allocate {
		1294	my ($self, $w, $h) = @_;
		1295
		1296	my $border = $self->border;
		1297
		1298	$w -= List::Util::max 0, $border * 2;
		1299	$h -= List::Util::max 0, $border * 2;
		1300
		1301	if (my $label = $self->{label}) {
		1302	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1303	$label->{h} = List::Util::min $h, $border;
		1304	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1305	}
		1306
		1307	$self->child->configure ($border, $border, $w, $h);
		1308
		1309	1
		1310	}
		1311
		1312	sub _draw {
		1313	my ($self) = @_;
		1314
		1315	my $child = $self->{children}[0];
		1316
		1317	my $border = $self->border;
		1318	my ($w, $h) = ($self->{w}, $self->{h});
		1319
		1320	$child->draw;
		1321
		1322	glColor @{$self->{fg}};
		1323	glBegin GL_LINE_STRIP;
		1324	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1325	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1326	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1327	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1328	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1329	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1330	glEnd;
		1331
		1332	if ($self->{label}) {
		1333	glTranslate $border * 2, 0;
		1334	$self->{label}->_draw;
		1335	}
		1336	}
		1337
		1338	#############################################################################
		1339
		1340	package CFPlus::UI::Toplevel;
		1341
		1342	our @ISA = CFPlus::UI::Bin::;
		1343
		1344	use CFPlus::OpenGL;
		1345
1139	my $bg =	1346	my $bg =
1140	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",	1347	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1141	mipmap => 1, wrap => 1;	1348	mipmap => 1, wrap => 1;
1142		1349
1143	my @border =	1350	my @border =
1144	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1351	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1145	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1352	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1353
		1354	my @icon =
		1355	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1356	qw(x1_move.png x1_resize.png);
1146		1357
1147	sub new {	1358	sub new {
1148	my ($class, %arg) = @_;	1359	my ($class, %arg) = @_;
1149		1360
1150	my $self = $class->SUPER::new (	1361	my $self = $class->SUPER::new (
…		…
1319	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1320		1531
1321	my $border = $self->border;	1532	my $border = $self->border;
1322		1533
1323	glColor @{ $self->{border_bg} };	1534	glColor @{ $self->{border_bg} };
1324	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1535	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1325	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1536	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1326	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1537	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1327	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1538	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1539
		1540	# move
		1541	my $w2 = ($w - $border) * .5;
		1542	my $h2 = ($h - $border) * .5;
		1543	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1544	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1545	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1546
		1547	# resize
		1548	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1549	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1550	unless $self->{has_close_button};
		1551	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1328		1553
1329	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1554	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1330	glColor @{ $self->{bg} };	1555	glColor @{ $self->{bg} };
1331		1556
1332	# TODO: repeat texture not scale	1557	# TODO: repeat texture not scale
…		…
1353		1578
1354	#############################################################################	1579	#############################################################################
1355		1580
1356	package CFPlus::UI::Table;	1581	package CFPlus::UI::Table;
1357		1582
1358	our @ISA = CFPlus::UI::Base::;	1583	our @ISA = CFPlus::UI::Container::;
1359		1584
1360	use List::Util qw(max sum);	1585	use List::Util qw(max sum);
1361		1586
1362	use CFPlus::OpenGL;	1587	use CFPlus::OpenGL;
1363		1588
1364	sub new {	1589	sub new {
1365	my $class = shift;	1590	my $class = shift;
1366		1591
1367	$class->SUPER::new (	1592	$class->SUPER::new (
1368	col_expand => [],	1593	col_expand => [],
		1594	row_expand => [],
1369	@_,	1595	@_,
1370	)	1596	)
1371	}	1597	}
1372		1598
1373	sub children {
1374	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1375	}
1376
1377	sub add {	1599	sub add {
		1600	my ($self, @widgets) = @_;
		1601
		1602	for my $child (@widgets) {
		1603	$child->{c_rowspan} ||= 1;
		1604	$child->{c_colspan} ||= 1;
		1605	}
		1606
		1607	$self->SUPER::add (@widgets);
		1608	}
		1609
		1610	sub add_at {
1378	my ($self) = shift;	1611	my $self = shift;
		1612
		1613	my @widgets;
1379		1614
1380	while (@_) {	1615	while (@_) {
1381	my ($x, $y, $child) = splice @_, 0, 3, ();	1616	my ($col, $row, $child) = splice @_, 0, 3, ();
1382	$child->set_parent ($self);
1383	$self->{children}[$y][$x] = $child;
1384	}
1385		1617
1386	$self->{force_realloc} = 1;	1618	$child->{c_row} = $row;
1387	$self->{force_size_alloc} = 1;	1619	$child->{c_col} = $col;
1388	$self->realloc;
1389	}
1390		1620
1391	sub remove {	1621	push @widgets, $child;
		1622	}
		1623
		1624	$self->add (@widgets);
		1625	}
		1626
		1627	sub get_wh {
1392	my ($self, $child) = @_;	1628	my ($self) = @_;
1393		1629
1394	# TODO: not yet implemented	1630	my (@w, @h);
1395	}
1396
1397	# TODO: move to container class maybe? send children a signal on removal?
1398	sub clear {
1399	my ($self) = @_;
1400		1631
1401	my @children = $self->children;	1632	my @children = $self->children;
1402	delete $self->{children};	1633
		1634	# first pass, columns
		1635	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1636	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1637
		1638	my $sw = sum @w[$c .. $c + $cs - 1];
		1639
		1640	if ($w > $sw) {
		1641	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1642	}
1403		1643	}
1404	for (@children) {
1405	delete $_->{parent};
1406	$_->hide;
1407	}
1408		1644
1409	$self->realloc;	1645	# second pass, rows
1410	}	1646	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1411
1412	sub get_wh {
1413	my ($self) = @_;
1414
1415	my (@w, @h);
1416
1417	for my $y (0 .. $#{$self->{children}}) {
1418	my $row = $self->{children}[$y]
1419	or next;
1420
1421	for my $x (0 .. $#$row) {
1422	my $widget = $row->[$x]
1423	or next;
1424	my ($w, $h) = @$widget{qw(req_w req_h)};	1647	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1425		1648
1426	$w[$x] = max $w[$x], $w;	1649	my $sh = sum @h[$r .. $r + $rs - 1];
1427	$h[$y] = max $h[$y], $h;	1650
		1651	if ($h > $sh) {
		1652	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1428	}	1653	}
1429	}	1654	}
1430		1655
1431	(\@w, \@h)	1656	(\@w, \@h)
1432	}	1657	}
…		…
1448	my ($ws, $hs) = $self->get_wh;	1673	my ($ws, $hs) = $self->get_wh;
1449		1674
1450	my $req_w = (sum @$ws) || 1;	1675	my $req_w = (sum @$ws) || 1;
1451	my $req_h = (sum @$hs) || 1;	1676	my $req_h = (sum @$hs) || 1;
1452		1677
1453	# TODO: nicer code && do row_expand	1678	# now linearly scale the rows/columns to the allocated size
1454	my @col_expand = @{$self->{col_expand}};	1679	my @col_expand = @{$self->{col_expand}};
1455	@col_expand = (1) x @$ws unless @col_expand;	1680	@col_expand = (1) x @$ws unless @col_expand;
1456	my $col_expand = (sum @col_expand) || 1;	1681	my $col_expand = (sum @col_expand) || 1;
1457		1682
1458	# linearly scale sizes
1459	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1683	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1460	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1461		1684
1462	CFPlus::UI::harmonize $ws;	1685	CFPlus::UI::harmonize $ws;
		1686
		1687	my @row_expand = @{$self->{row_expand}};
		1688	@row_expand = (1) x @$ws unless @row_expand;
		1689	my $row_expand = (sum @row_expand) || 1;
		1690
		1691	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1692
1463	CFPlus::UI::harmonize $hs;	1693	CFPlus::UI::harmonize $hs;
1464		1694
1465	my $y;	1695	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1696	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1466		1697
1467	for my $r (0 .. $#{$self->{children}}) {	1698	for my $widget ($self->children) {
1468	my $row = $self->{children}[$r]	1699	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1469	or next;
1470		1700
1471	my $x = 0;	1701	$widget->configure (
1472	my $row_h = $hs->[$r];	1702	$x[$c], $y[$r],
		1703	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1473		1704	);
1474	for my $c (0 .. $#$row) {	1705	}
1475	my $col_w = $ws->[$c];
1476		1706
1477	if (my $widget = $row->[$c]) {	1707	1
1478	$widget->configure ($x, $y, $col_w, $row_h);	1708	}
1479	}
1480		1709
1481	$x += $col_w;	1710	#############################################################################
		1711
		1712	package CFPlus::UI::Fixed;
		1713
		1714	use List::Util qw(min max);
		1715
		1716	our @ISA = CFPlus::UI::Container::;
		1717
		1718	sub _scale($$$) {
		1719	my ($rel, $val, $max) = @_;
		1720
		1721	$rel ? $val * $max : $val
		1722	}
		1723
		1724	sub size_request {
		1725	my ($self) = @_;
		1726
		1727	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1728
		1729	# determine overall size by querying abs widgets
		1730	for my $child ($self->visible_children) {
		1731	unless ($child->{c_rel}) {
		1732	my $x = $child->{c_x};
		1733	my $y = $child->{c_y};
		1734
		1735	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1736	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1482	}	1737	}
		1738	}
1483		1739
1484	$y += $row_h;	1740	my $W = $x2 - $x1;
		1741	my $H = $y2 - $y1;
		1742
		1743	# now layout remaining widgets
		1744	for my $child ($self->visible_children) {
		1745	if ($child->{c_rel}) {
		1746	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1747	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1748
		1749	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1750	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1751	}
		1752	}
		1753
		1754	my $W = $x2 - $x1;
		1755	my $H = $y2 - $y1;
		1756
		1757	($W, $H)
		1758	}
		1759
		1760	sub invoke_size_allocate {
		1761	my ($self, $W, $H) = @_;
		1762
		1763	for my $child ($self->visible_children) {
		1764	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1765	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1766
		1767	$x += $child->{c_halign} * $child->{req_w};
		1768	$y += $child->{c_valign} * $child->{req_h};
		1769
		1770	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1485	}	1771	}
1486		1772
1487	1	1773	1
1488	}	1774	}
1489		1775
1490	sub find_widget {
1491	my ($self, $x, $y) = @_;
1492
1493	$x -= $self->{x};
1494	$y -= $self->{y};
1495
1496	my $res;
1497
1498	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1499	$res = $_->find_widget ($x, $y)
1500	and return $res;
1501	}
1502
1503	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1504	}
1505
1506	sub _draw {
1507	my ($self) = @_;
1508
1509	for (grep $_, @{$self->{children}}) {
1510	$_->draw for grep $_, @$_;
1511	}
1512	}
1513
1514	#############################################################################	1776	#############################################################################
1515		1777
1516	package CFPlus::UI::Box;	1778	package CFPlus::UI::Box;
1517		1779
1518	our @ISA = CFPlus::UI::Container::;	1780	our @ISA = CFPlus::UI::Container::;
1519		1781
1520	sub size_request {	1782	sub size_request {
1521	my ($self) = @_;	1783	my ($self) = @_;
		1784
		1785	my @children = $self->visible_children;
1522		1786
1523	$self->{vertical}	1787	$self->{vertical}
1524	? (	1788	? (
1525	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1789	(List::Util::max map $_->{req_w}, @children),
1526	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1790	(List::Util::sum map $_->{req_h}, @children),
1527	)	1791	)
1528	: (	1792	: (
1529	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_w}, @children),
1530	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1794	(List::Util::max map $_->{req_h}, @children),
1531	)	1795	)
1532	}	1796	}
1533		1797
1534	sub invoke_size_allocate {	1798	sub invoke_size_allocate {
1535	my ($self, $w, $h) = @_;	1799	my ($self, $w, $h) = @_;
…		…
1618	#active_bg => none	1882	#active_bg => none
1619	#font => default_font	1883	#font => default_font
1620	#text => initial text	1884	#text => initial text
1621	#markup => initial narkup	1885	#markup => initial narkup
1622	#max_w => maximum pixel width	1886	#max_w => maximum pixel width
		1887	#style => 0, # render flags
1623	ellipsise => 3, # end	1888	ellipsise => 3, # end
1624	layout => (new CFPlus::Layout),	1889	layout => (new CFPlus::Layout),
1625	fontsize => 1,	1890	fontsize => 1,
1626	align => -1,	1891	align => -1,
1627	valign => -1,	1892	valign => -1,
…		…
1658		1923
1659	delete $self->{ox};	1924	delete $self->{ox};
1660	$self->SUPER::realloc;	1925	$self->SUPER::realloc;
1661	}	1926	}
1662		1927
		1928	sub clear {
		1929	my ($self) = @_;
		1930
		1931	$self->set_text ("");
		1932	}
		1933
1663	sub set_text {	1934	sub set_text {
1664	my ($self, $text) = @_;	1935	my ($self, $text) = @_;
1665		1936
1666	return if $self->{text} eq "T$text";	1937	return if $self->{text} eq "T$text";
1667	$self->{text} = "T$text";	1938	$self->{text} = "T$text";
…		…
1775	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2046	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1776	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2047	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1777	: ($self->{h} - $size->[1]) * 0.5);	2048	: ($self->{h} - $size->[1]) * 0.5);
1778	};	2049	};
1779		2050
1780	my $w = List::Util::min $self->{w} + 4, $size->[0];	2051	# unless ($self->{list}) {
1781	my $h = List::Util::min $self->{h} + 2, $size->[1];	2052	# $self->{list} = CFPlus::OpenGL::glGenList;
		2053	# CFPlus::OpenGL::glNewList $self->{list};
		2054	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2055	# CFPlus::OpenGL::glEndList;
		2056	# }
		2057	#
		2058	# CFPlus::OpenGL::glCallList $self->{list};
1782		2059
1783	$self->{layout}->render ($self->{ox}, $self->{oy});	2060	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1784	}	2061	}
		2062
		2063	#sub destroy {
		2064	# my ($self) = @_;
		2065	#
		2066	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2067	#
		2068	# $self->SUPER::destroy;
		2069	#}
1785		2070
1786	#############################################################################	2071	#############################################################################
1787		2072
1788	package CFPlus::UI::EntryBase;	2073	package CFPlus::UI::EntryBase;
1789		2074
…		…
1795	my $class = shift;	2080	my $class = shift;
1796		2081
1797	$class->SUPER::new (	2082	$class->SUPER::new (
1798	fg => [1, 1, 1],	2083	fg => [1, 1, 1],
1799	bg => [0, 0, 0, 0.2],	2084	bg => [0, 0, 0, 0.2],
		2085	outline => [0.6, 0.3, 0.1],
1800	active_bg => [1, 1, 1, 0.5],	2086	active_bg => [0, 0, 1, .2],
1801	active_fg => [0, 0, 0],	2087	active_fg => [1, 1, 1],
		2088	active_outline => [1, 1, 0],
1802	can_hover => 1,	2089	can_hover => 1,
1803	can_focus => 1,	2090	can_focus => 1,
1804	valign => 0,	2091	valign => 0,
1805	can_events => 1,	2092	can_events => 1,
		2093	ellipsise => 0,
1806	#text => ...	2094	#text => ...
1807	#hidden => "*",	2095	#hidden => "*",
1808	@_	2096	@_
1809	)	2097	)
1810	}	2098	}
…		…
1854	my $mod = $ev->{mod};	2142	my $mod = $ev->{mod};
1855	my $sym = $ev->{sym};	2143	my $sym = $ev->{sym};
1856	my $uni = $ev->{unicode};	2144	my $uni = $ev->{unicode};
1857		2145
1858	my $text = $self->get_text;	2146	my $text = $self->get_text;
		2147
		2148	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1859		2149
1860	if ($uni == 8) {	2150	if ($uni == 8) {
1861	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2151	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1862	} elsif ($uni == 127) {	2152	} elsif ($uni == 127) {
1863	substr $text, $self->{cursor}, 1, "";	2153	substr $text, $self->{cursor}, 1, "";
1864	} elsif ($sym == CFPlus::SDLK_LEFT) {	2154	} elsif ($sym == CFPlus::SDLK_LEFT) {
1865	--$self->{cursor} if $self->{cursor};	2155	--$self->{cursor} if $self->{cursor};
1866	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2156	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1867	++$self->{cursor} if $self->{cursor} < length $self->{text};	2157	++$self->{cursor} if $self->{cursor} < length $self->{text};
1868	} elsif ($sym == CFPlus::SDLK_HOME) {	2158	} elsif ($sym == CFPlus::SDLK_HOME) {
		2159	# what a hack
		2160	$self->{cursor} =
		2161	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2162	? length $1
		2163	: 0;
		2164	} elsif ($sym == CFPlus::SDLK_END) {
		2165	# uh, again
		2166	$self->{cursor} =
		2167	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2168	? $self->{cursor} + length $1
		2169	: length $self->{text};
		2170	} elsif ($uni == 21) { # ctrl-u
		2171	$text = "";
1869	$self->{cursor} = 0;	2172	$self->{cursor} = 0;
1870	} elsif ($sym == CFPlus::SDLK_END) {
1871	$self->{cursor} = length $text;
1872	} elsif ($uni == 27) {	2173	} elsif ($uni == 27) {
1873	$self->emit ('escape');	2174	$self->emit ('escape');
1874	} elsif ($uni) {	2175	} elsif ($uni == 0x0d) {
		2176	substr $text, $self->{cursor}++, 0, "\012";
		2177	} elsif ($uni >= 0x20) {
1875	substr $text, $self->{cursor}++, 0, chr $uni;	2178	substr $text, $self->{cursor}++, 0, chr $uni;
1876	} else {	2179	} else {
1877	return 0;	2180	return 0;
1878	}	2181	}
1879		2182
1880	$self->_set_text ($text);	2183	$self->_set_text ($text);
1881		2184
1882	$self->realloc;	2185	$self->realloc;
		2186	$self->update;
1883		2187
1884	1	2188	1
1885	}	2189	}
1886		2190
1887	sub invoke_focus_in {	2191	sub invoke_focus_in {
…		…
1946		2250
1947	unless (exists $self->{cur_h}) {	2251	unless (exists $self->{cur_h}) {
1948	my $text = substr $self->{text}, 0, $self->{cursor};	2252	my $text = substr $self->{text}, 0, $self->{cursor};
1949	utf8::encode $text;	2253	utf8::encode $text;
1950		2254
1951	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2255	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1952	}	2256	}
1953		2257
1954	glColor @{$self->{fg}};	2258	glColor_premultiply @{$self->{active_fg}};
1955	glBegin GL_LINES;	2259	glBegin GL_LINES;
1956	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2260	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1957	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2261	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1958	glEnd;	2262	glEnd;
		2263
		2264	glLineWidth 3;
		2265	glColor @{$self->{active_outline}};
		2266	glBegin GL_LINE_LOOP;
		2267	glVertex 0, 0;
		2268	glVertex $self->{w} - 1, 0;
		2269	glVertex $self->{w} - 1, $self->{h} - 1;
		2270	glVertex 0, $self->{h} - 1;
		2271	glEnd;
		2272	glLineWidth 1;
		2273
		2274	} else {
		2275	glColor @{$self->{outline}};
		2276	glTranslate .375, .375;
		2277	glBegin GL_LINE_STRIP;
		2278	glVertex 0, $self->{h} * .5;
		2279	glVertex 0, $self->{h} - 3;
		2280	glVertex $self->{w} - 1, $self->{h} - 3;
		2281	glVertex $self->{w} - 1, $self->{h} * .5;
		2282	glEnd;
1959	}	2283	}
1960	}	2284	}
		2285
		2286	#############################################################################
1961		2287
1962	package CFPlus::UI::Entry;	2288	package CFPlus::UI::Entry;
1963		2289
1964	our @ISA = CFPlus::UI::EntryBase::;	2290	our @ISA = CFPlus::UI::EntryBase::;
1965		2291
…		…
1968	sub invoke_key_down {	2294	sub invoke_key_down {
1969	my ($self, $ev) = @_;	2295	my ($self, $ev) = @_;
1970		2296
1971	my $sym = $ev->{sym};	2297	my $sym = $ev->{sym};
1972		2298
1973	if ($sym == 13) {	2299	if ($ev->{uni} == 0x0d || $sym == 13) {
1974	unshift @{$self->{history}},	2300	unshift @{$self->{history}},
1975	my $txt = $self->get_text;	2301	my $txt = $self->get_text;
1976		2302
1977	$self->{history_pointer} = -1;	2303	$self->{history_pointer} = -1;
1978	$self->{history_saveback} = '';	2304	$self->{history_saveback} = '';
…		…
2008	1	2334	1
2009	}	2335	}
2010		2336
2011	#############################################################################	2337	#############################################################################
2012		2338
		2339	package CFPlus::UI::TextEdit;
		2340
		2341	our @ISA = CFPlus::UI::EntryBase::;
		2342
		2343	use CFPlus::OpenGL;
		2344
		2345	sub move_cursor_ver {
		2346	my ($self, $dy) = @_;
		2347
		2348	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2349
		2350	$y += $dy;
		2351
		2352	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2353	$self->{cursor} = $index;
		2354	delete $self->{cur_h};
		2355	$self->update;
		2356	return;
		2357	}
		2358	}
		2359
		2360	sub invoke_key_down {
		2361	my ($self, $ev) = @_;
		2362
		2363	my $sym = $ev->{sym};
		2364
		2365	if ($sym == CFPlus::SDLK_UP) {
		2366	$self->move_cursor_ver (-1);
		2367	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2368	$self->move_cursor_ver (+1);
		2369	} else {
		2370	return $self->SUPER::invoke_key_down ($ev)
		2371	}
		2372
		2373	1
		2374	}
		2375
		2376	#############################################################################
		2377
2013	package CFPlus::UI::Button;	2378	package CFPlus::UI::ButtonBin;
2014		2379
2015	our @ISA = CFPlus::UI::Label::;	2380	our @ISA = CFPlus::UI::Bin::;
2016		2381
2017	use CFPlus::OpenGL;	2382	use CFPlus::OpenGL;
2018		2383
2019	my @tex =	2384	my @tex =
2020	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2385	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2021	qw(b1_button_active.png);	2386	qw(b1_button_inactive.png b1_button_active.png);
2022		2387
2023	sub new {	2388	sub new {
2024	my $class = shift;	2389	my $class = shift;
2025		2390
2026	$class->SUPER::new (	2391	$class->SUPER::new (
2027	padding_x => 4,
2028	padding_y => 4,
2029	fg => [1, 1, 1],
2030	active_fg => [0, 0, 1],
2031	can_hover => 1,	2392	can_hover => 1,
2032	align => 0,	2393	align => 0,
2033	valign => 0,	2394	valign => 0,
2034	can_events => 1,	2395	can_events => 1,
2035	@_	2396	@_
…		…
2047	}	2408	}
2048		2409
2049	sub _draw {	2410	sub _draw {
2050	my ($self) = @_;	2411	my ($self) = @_;
2051		2412
2052	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2053
2054	glEnable GL_TEXTURE_2D;	2413	glEnable GL_TEXTURE_2D;
2055	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2414	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2056	glColor 0, 0, 0, 1;	2415	glColor 0, 0, 0, 1;
2057		2416
		2417	my $tex = $tex[$GRAB == $self];
2058	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2418	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2419
		2420	glDisable GL_TEXTURE_2D;
		2421
		2422	$self->SUPER::_draw;
		2423	}
		2424
		2425	#############################################################################
		2426
		2427	package CFPlus::UI::Button;
		2428
		2429	our @ISA = CFPlus::UI::Label::;
		2430
		2431	use CFPlus::OpenGL;
		2432
		2433	my @tex =
		2434	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2435	qw(b1_button_inactive.png b1_button_active.png);
		2436
		2437	sub new {
		2438	my $class = shift;
		2439
		2440	$class->SUPER::new (
		2441	padding_x => 4,
		2442	padding_y => 4,
		2443	fg => [1.0, 1.0, 1.0],
		2444	active_fg => [0.8, 0.8, 0.8],
		2445	can_hover => 1,
		2446	align => 0,
		2447	valign => 0,
		2448	can_events => 1,
		2449	@_
		2450	)
		2451	}
		2452
		2453	sub invoke_button_up {
		2454	my ($self, $ev, $x, $y) = @_;
		2455
		2456	$self->emit ("activate")
		2457	if $x >= 0 && $x < $self->{w}
		2458	&& $y >= 0 && $y < $self->{h};
		2459
		2460	1
		2461	}
		2462
		2463	sub _draw {
		2464	my ($self) = @_;
		2465
		2466	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2467
		2468	glEnable GL_TEXTURE_2D;
		2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2470	glColor 0, 0, 0, 1;
		2471
		2472	my $tex = $tex[$GRAB == $self];
		2473	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2059		2474
2060	glDisable GL_TEXTURE_2D;	2475	glDisable GL_TEXTURE_2D;
2061		2476
2062	$self->SUPER::_draw;	2477	$self->SUPER::_draw;
2063	}	2478	}
…		…
2150	sub new {	2565	sub new {
2151	my $class = shift;	2566	my $class = shift;
2152		2567
2153	my $self = $class->SUPER::new (	2568	my $self = $class->SUPER::new (
2154	can_events => 0,	2569	can_events => 0,
		2570	scale => 1,
2155	@_,	2571	@_,
2156	);	2572	);
2157		2573
2158	$self->{path} || $self->{tex}	2574	$self->{path} || $self->{tex}
2159	or Carp::croak "'path' or 'tex' attributes required";	2575	or Carp::croak "'path' or 'tex' attributes required";
2160		2576
2161	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2577	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2162	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2578	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2163		2579
2164	Scalar::Util::weaken $texture_cache{$self->{path}};	2580	CFPlus::weaken $texture_cache{$self->{path}};
2165		2581
2166	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2582	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2167		2583
2168	$self	2584	$self
2169	}	2585	}
…		…
2184	}	2600	}
2185		2601
2186	sub size_request {	2602	sub size_request {
2187	my ($self) = @_;	2603	my ($self) = @_;
2188		2604
2189	($self->{tex}{w}, $self->{tex}{h})	2605	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2190	}	2606	}
2191		2607
2192	sub _draw {	2608	sub _draw {
2193	my ($self) = @_;	2609	my ($self) = @_;
2194		2610
…		…
2204	}	2620	}
2205		2621
2206	glEnable GL_TEXTURE_2D;	2622	glEnable GL_TEXTURE_2D;
2207	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2623	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2208		2624
2209	$tex->draw_quad (0, 0, $w, $h);	2625	$tex->draw_quad_alpha (0, 0, $w, $h);
2210		2626
2211	glDisable GL_TEXTURE_2D;	2627	glDisable GL_TEXTURE_2D;
2212	}	2628	}
2213		2629
2214	#############################################################################	2630	#############################################################################
…		…
2516		2932
2517	$self->SUPER::invoke_button_down ($ev, $x, $y);	2933	$self->SUPER::invoke_button_down ($ev, $x, $y);
2518		2934
2519	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2935	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2520		2936
2521	$self->invoke_mouse_motion ($ev, $x, $y)	2937	$self->invoke_mouse_motion ($ev, $x, $y);
		2938
		2939	1
2522	}	2940	}
2523		2941
2524	sub invoke_mouse_motion {	2942	sub invoke_mouse_motion {
2525	my ($self, $ev, $x, $y) = @_;	2943	my ($self, $ev, $x, $y) = @_;
2526		2944
…		…
2542	sub invoke_mouse_wheel {	2960	sub invoke_mouse_wheel {
2543	my ($self, $ev) = @_;	2961	my ($self, $ev) = @_;
2544		2962
2545	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2963	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2546		2964
		2965	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2966
2547	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2967	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2548		2968
2549	! ! $delta	2969	1
2550	}	2970	}
2551		2971
2552	sub update {	2972	sub update {
2553	my ($self) = @_;	2973	my ($self) = @_;
2554		2974
…		…
2662	#font => default_font	3082	#font => default_font
2663	@_,	3083	@_,
2664		3084
2665	layout => (new CFPlus::Layout),	3085	layout => (new CFPlus::Layout),
2666	par => [],	3086	par => [],
		3087	max_par => 0,
2667	height => 0,	3088	height => 0,
2668	children => [	3089	children => [
2669	(new CFPlus::UI::Empty expand => 1),	3090	(new CFPlus::UI::Empty expand => 1),
2670	(new CFPlus::UI::Slider vertical => 1),	3091	(new CFPlus::UI::Slider vertical => 1),
2671	],	3092	],
…		…
2684	}	3105	}
2685		3106
2686	sub size_request {	3107	sub size_request {
2687	my ($self) = @_;	3108	my ($self) = @_;
2688		3109
2689	my ($empty, $slider) = @{ $self->{children} };	3110	my ($empty, $slider) = $self->visible_children;
2690		3111
2691	local $self->{children} = [$empty, $slider];	3112	local $self->{children} = [$empty, $slider];
2692	$self->SUPER::size_request	3113	$self->SUPER::size_request
2693	}	3114	}
2694		3115
…		…
2750	sub set_offset {	3171	sub set_offset {
2751	my ($self, $offset) = @_;	3172	my ($self, $offset) = @_;
2752		3173
2753	# todo: base offset on lines or so, not on pixels	3174	# todo: base offset on lines or so, not on pixels
2754	$self->{children}[1]->set_value ($offset);	3175	$self->{children}[1]->set_value ($offset);
		3176	}
		3177
		3178	sub current_paragraph {
		3179	my ($self) = @_;
		3180
		3181	$self->{top_paragraph} - 1
		3182	}
		3183
		3184	sub scroll_to {
		3185	my ($self, $para) = @_;
		3186
		3187	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3188
		3189	$self->{scroll_to} = $para;
		3190	$self->update;
2755	}	3191	}
2756		3192
2757	sub clear {	3193	sub clear {
2758	my ($self) = @_;	3194	my ($self) = @_;
2759		3195
…		…
2781		3217
2782	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3218	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2783	push @{$self->{par}}, $para;	3219	push @{$self->{par}}, $para;
2784	}	3220	}
2785		3221
		3222	if (my $max = $self->{max_par}) {
		3223	shift @{$self->{par}} while @{$self->{par}} > $max;
		3224	}
		3225
2786	$self->{need_reflow}++;	3226	$self->{need_reflow}++;
2787	$self->update;	3227	$self->update;
2788	}	3228	}
2789		3229
2790	sub scroll_to_bottom {	3230	sub scroll_to_bottom {
2791	my ($self) = @_;	3231	my ($self) = @_;
2792		3232
2793	$self->{scroll_to_bottom} = 1;	3233	$self->{scroll_to} = $#{$self->{par}};
2794	$self->update;	3234	$self->update;
2795	}	3235	}
2796		3236
		3237	sub force_uptodate {
		3238	my ($self) = @_;
		3239
		3240	if (delete $self->{need_reflow}) {
		3241	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3242
		3243	my $height = 0;
		3244
		3245	for my $para (@{$self->{par}}) {
		3246	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3247	my $layout = $self->get_layout ($para);
		3248	my ($w, $h) = $layout->size;
		3249
		3250	$para->{w} = $w + $para->{indent};
		3251	$para->{h} = $h;
		3252	$para->{wrapped} = $layout->has_wrapped;
		3253	}
		3254
		3255	$para->{y} = $height;
		3256	$height += $para->{h};
		3257	}
		3258
		3259	$self->{height} = $height;
		3260	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3261
		3262	delete $self->{texture};
		3263	}
		3264
		3265	if (my $paridx = delete $self->{scroll_to}) {
		3266	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3267	}
		3268	}
		3269
2797	sub update {	3270	sub update {
2798	my ($self) = @_;	3271	my ($self) = @_;
2799		3272
2800	$self->SUPER::update;	3273	$self->SUPER::update;
2801		3274
2802	return unless $self->{h} > 0;	3275	return unless $self->{h} > 0;
2803		3276
2804	delete $self->{texture};	3277	delete $self->{texture};
2805		3278
2806	$ROOT->on_post_alloc ($self => sub {	3279	$ROOT->on_post_alloc ($self => sub {
		3280	$self->force_uptodate;
		3281
2807	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3282	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2808
2809	if (delete $self->{need_reflow}) {
2810	my $height = 0;
2811
2812	for my $para (@{$self->{par}}) {
2813	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2814	my $layout = $self->get_layout ($para);
2815	my ($w, $h) = $layout->size;
2816
2817	$para->{w} = $w + $para->{indent};
2818	$para->{h} = $h;
2819	$para->{wrapped} = $layout->has_wrapped;
2820	}
2821
2822	$height += $para->{h};
2823	}
2824
2825	$self->{height} = $height;
2826
2827	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2828
2829	delete $self->{texture};
2830	}
2831
2832	if (delete $self->{scroll_to_bottom}) {
2833	$self->{children}[1]->set_value (1e10);
2834	}
2835		3283
2836	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {	3284	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2837	glClearColor 0, 0, 0, 0;	3285	glClearColor 0, 0, 0, 0;
2838	glClear GL_COLOR_BUFFER_BIT;	3286	glClear GL_COLOR_BUFFER_BIT;
2839		3287
		3288	package CFPlus::UI::Base;
		3289	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3290	(0, 0, $self->{w}, $self->{h});
		3291
		3292	my $top = int $self->{children}[1]{range}[0];
		3293
		3294	my $paridx = 0;
		3295	my $top_paragraph;
2840	my $top = int $self->{children}[1]{range}[0];	3296	my $top = int $self->{children}[1]{range}[0];
2841		3297
2842	my $y0 = $top;	3298	my $y0 = $top;
2843	my $y1 = $top + $H;	3299	my $y1 = $top + $H;
2844		3300
2845	my $y = 0;
2846
2847	for my $para (@{$self->{par}}) {	3301	for my $para (@{$self->{par}}) {
2848	my $h = $para->{h};	3302	my $h = $para->{h};
		3303	my $y = $para->{y};
2849		3304
2850	if ($y0 < $y + $h && $y < $y1) {	3305	if ($y0 < $y + $h && $y < $y1) {
2851
2852	my $layout = $self->get_layout ($para);	3306	my $layout = $self->get_layout ($para);
2853		3307
2854	$layout->render ($para->{indent}, $y - $y0);	3308	$layout->render ($para->{indent}, $y - $y0);
2855		3309
2856	if (my @w = @{ $para->{widget} }) {	3310	if (my @w = @{ $para->{widget} }) {
…		…
2865	$_->draw;	3319	$_->draw;
2866	}	3320	}
2867	}	3321	}
2868	}	3322	}
2869		3323
2870	$y += $h;	3324	$paridx++;
		3325	$top_paragraph ||= $paridx if $y >= $top;
2871	}	3326	}
		3327
		3328	$self->{top_paragraph} = $top_paragraph;
2872	};	3329	};
2873	});	3330	});
2874	}	3331	}
2875		3332
2876	sub reconfigure {	3333	sub reconfigure {
…		…
2997		3454
2998	$self->add (new CFPlus::UI::Label	3455	$self->add (new CFPlus::UI::Label
2999	markup => $tooltip,	3456	markup => $tooltip,
3000	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3457	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3001	fontsize => 0.8,	3458	fontsize => 0.8,
3002	fg => [0, 0, 0, 1],	3459	style => 1, # FLAG_INVERSE
3003	ellipsise => 0,	3460	ellipsise => 0,
3004	font => ($widget->{tooltip_font} || $::FONT_PROP),	3461	font => ($widget->{tooltip_font} || $::FONT_PROP),
3005	);	3462	);
3006	}	3463	}
3007		3464
…		…
3047	glTranslate 0.375, 0.375;	3504	glTranslate 0.375, 0.375;
3048		3505
3049	my ($w, $h) = @$self{qw(w h)};	3506	my ($w, $h) = @$self{qw(w h)};
3050		3507
3051	glColor 1, 0.8, 0.4;	3508	glColor 1, 0.8, 0.4;
3052	glBegin GL_QUADS;	3509	glRect 0, 0, $w, $h;
3053	glVertex 0 , 0;
3054	glVertex 0 , $h;
3055	glVertex $w, $h;
3056	glVertex $w, 0;
3057	glEnd;
3058		3510
3059	glColor 0, 0, 0;	3511	glColor 0, 0, 0;
3060	glBegin GL_LINE_LOOP;	3512	glBegin GL_LINE_LOOP;
3061	glVertex 0 , 0;	3513	glVertex 0 , 0;
3062	glVertex 0 , $h;	3514	glVertex 0 , $h;
…		…
3079		3531
3080	sub new {	3532	sub new {
3081	my $class = shift;	3533	my $class = shift;
3082		3534
3083	my $self = $class->SUPER::new (	3535	my $self = $class->SUPER::new (
		3536	size_w => 32,
		3537	size_h => 8,
3084	aspect => 1,	3538	aspect => 1,
3085	can_events => 0,	3539	can_events => 0,
3086	@_,	3540	@_,
3087	);	3541	);
3088		3542
3089	if ($self->{anim} && $self->{animspeed}) {	3543	if ($self->{anim} && $self->{animspeed}) {
3090	Scalar::Util::weaken (my $widget = $self);	3544	CFPlus::weaken (my $widget = $self);
3091		3545
		3546	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3547	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3092	$self->{timer} = Event->timer (	3548	$self->{timer} = Event->timer (
3093	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3094	hard => 1,	3549	parked => 1,
3095	interval => $self->{animspeed},
3096	cb => sub {	3550	cb => sub {
		3551	return unless $::CONN && $widget;
		3552
3097	++$widget->{frame};	3553	++$widget->{frame};
		3554	$widget->update_face;
3098	$widget->update;	3555	$widget->update;
		3556
		3557	$widget->update_timer;
3099	},	3558	},
3100	);	3559	);
		3560
		3561	$self->update_face;
		3562	$self->update_timer;
3101	}	3563	}
3102		3564
3103	$self	3565	$self
3104	}	3566	}
3105		3567
		3568	sub update_timer {
		3569	my ($self) = @_;
		3570
		3571	return unless $self->{timer};
		3572
		3573	if ($self->{visible}) {
		3574	$self->{timer}->at (
		3575	$self->{anim_start}
		3576	+ $self->{animspeed}
		3577	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3578	);
		3579	$self->{timer}->start;
		3580	} else {
		3581	$self->{timer}->stop;
		3582	}
		3583	}
		3584
		3585	sub update_face {
		3586	my ($self) = @_;
		3587
		3588	return unless $::CONN;
		3589
		3590	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3591	if ($anim && @$anim) {
		3592	delete $self->{wait_face};
		3593	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3594	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]) {
		3595	unless ($tex->{name} || $tex->{loading}) {
		3596	$tex->upload (sub { $self->reconfigure });
		3597	}
		3598	}
		3599	}
		3600	}
		3601	}
		3602
3106	sub size_request {	3603	sub size_request {
3107	(32, 8)	3604	my ($self) = @_;
		3605
		3606	if ($::CONN) {
		3607	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3608	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3609	if ($tex->{name}) {
		3610	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3611	} elsif (!$tex->{loading}) {
		3612	$tex->upload (sub { $self->reconfigure });
		3613	}
		3614	} else {
		3615	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3616	$self->reconfigure;
		3617	});
		3618	}
		3619	}
		3620	}
		3621
		3622	($self->{size_w} || 8, $self->{size_h} || 8)
3108	}	3623	}
3109		3624
3110	sub update {	3625	sub update {
3111	my ($self) = @_;	3626	my ($self) = @_;
3112		3627
3113	return unless $self->{visible};	3628	return unless $self->{visible};
3114		3629
3115	$self->SUPER::update;	3630	$self->SUPER::update;
3116	}	3631	}
3117		3632
		3633	sub invoke_visibility_change {
		3634	my ($self) = @_;
		3635
		3636	$self->update_timer;
		3637
		3638	0
		3639	}
		3640
3118	sub _draw {	3641	sub _draw {
3119	my ($self) = @_;	3642	my ($self) = @_;
3120		3643
3121	return unless $::CONN;
3122
3123	$self->SUPER::_draw;	3644	$self->SUPER::_draw;
3124		3645
3125	my $face;	3646	if (my $tex = $self->{tex}) {
3126
3127	if ($self->{frame}) {
3128	my $anim = $::CONN->{anim}[$self->{anim}];
3129
3130	$face = $anim->[ $self->{frame} % @$anim ]
3131	if $anim && @$anim;
3132	}
3133
3134	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3135
3136	if ($tex) {
3137	glEnable GL_TEXTURE_2D;	3647	glEnable GL_TEXTURE_2D;
3138	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3648	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3139	glColor 0, 0, 0, 1;	3649	glColor 0, 0, 0, 1;
3140	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3650	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3141	glDisable GL_TEXTURE_2D;	3651	glDisable GL_TEXTURE_2D;
…		…
3143	}	3653	}
3144		3654
3145	sub destroy {	3655	sub destroy {
3146	my ($self) = @_;	3656	my ($self) = @_;
3147		3657
3148	$self->{timer}->cancel	3658	(delete $self->{timer})->cancel
3149	if $self->{timer};	3659	if $self->{timer};
3150		3660
3151	$self->SUPER::destroy;	3661	$self->SUPER::destroy;
3152	}	3662	}
3153		3663
…		…
3155		3665
3156	package CFPlus::UI::Buttonbar;	3666	package CFPlus::UI::Buttonbar;
3157		3667
3158	our @ISA = CFPlus::UI::HBox::;	3668	our @ISA = CFPlus::UI::HBox::;
3159		3669
3160	# TODO: should actualyl wrap buttons and other goodies.	3670	# TODO: should actually wrap buttons and other goodies.
3161		3671
3162	#############################################################################	3672	#############################################################################
3163		3673
3164	package CFPlus::UI::Menu;	3674	package CFPlus::UI::Menu;
3165		3675
3166	our @ISA = CFPlus::UI::FancyFrame::;	3676	our @ISA = CFPlus::UI::Toplevel::;
3167		3677
3168	use CFPlus::OpenGL;	3678	use CFPlus::OpenGL;
3169		3679
3170	sub new {	3680	sub new {
3171	my $class = shift;	3681	my $class = shift;
…		…
3193	children => [	3703	children => [
3194	(new CFPlus::UI::Label markup => $left, expand => 1),	3704	(new CFPlus::UI::Label markup => $left, expand => 1),
3195	(new CFPlus::UI::Label markup => $right, align => +1),	3705	(new CFPlus::UI::Label markup => $right, align => +1),
3196	],	3706	],
3197	;	3707	;
3198		3708
3199	} else {	3709	} else {
3200	$widget = new CFPlus::UI::Label	3710	$widget = new CFPlus::UI::Label
3201	can_hover => 1,	3711	can_hover => 1,
3202	can_events => 1,	3712	can_events => 1,
3203	markup => $widget,	3713	markup => $widget,
…		…
3339	buttonbar => (new CFPlus::UI::Buttonbar),	3849	buttonbar => (new CFPlus::UI::Buttonbar),
3340	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3850	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3341	# filter => # will be put between multiplexer and $self	3851	# filter => # will be put between multiplexer and $self
3342	@_,	3852	@_,
3343	);	3853	);
3344		3854
3345	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3855	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3346	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3856	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3347		3857
		3858	{
		3859	Scalar::Util::weaken (my $wself = $self);
		3860
		3861	$self->{multiplexer}->connect (c_add => sub {
		3862	my ($mplex, $widgets) = @_;
		3863
		3864	for my $child (@$widgets) {
		3865	Scalar::Util::weaken $child;
		3866	$child->{c_tab_} ||= do {
		3867	my $tab =
		3868	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3869	? $child->{c_tab}
		3870	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3871
		3872	$tab->connect (activate => sub {
		3873	$wself->set_current_page ($child);
		3874	});
		3875
		3876	$tab
		3877	};
		3878
		3879	$self->{buttonbar}->add ($child->{c_tab_});
		3880	}
		3881	});
		3882
		3883	$self->{multiplexer}->connect (c_remove => sub {
		3884	my ($mplex, $widgets) = @_;
		3885
		3886	for my $child (@$widgets) {
		3887	$wself->{buttonbar}->remove ($child->{c_tab_});
		3888	}
		3889	});
		3890	}
		3891
3348	$self	3892	$self
3349	}	3893	}
3350		3894
3351	sub add {	3895	sub add {
		3896	my ($self, @widgets) = @_;
		3897
		3898	$self->{multiplexer}->add (@widgets)
		3899	}
		3900
		3901	sub remove {
		3902	my ($self, @widgets) = @_;
		3903
		3904	$self->{multiplexer}->remove (@widgets)
		3905	}
		3906
		3907	sub pages {
		3908	my ($self) = @_;
		3909	$self->{multiplexer}->children
		3910	}
		3911
		3912	sub add_tab {
3352	my ($self, $title, $widget, $tooltip) = @_;	3913	my ($self, $title, $widget, $tooltip) = @_;
3353		3914
3354	Scalar::Util::weaken $self;	3915	$title = [$title, $tooltip] unless ref $title;
		3916	$widget->{c_tab} = $title;
3355		3917
3356	$self->{buttonbar}->add (new CFPlus::UI::Button
3357	markup => $title,
3358	tooltip => $tooltip,
3359	on_activate => sub { $self->set_current_page ($widget) },
3360	);
3361
3362	$self->{multiplexer}->add ($widget);	3918	$self->add ($widget);
3363	}	3919	}
3364		3920
3365	sub get_current_page {	3921	sub get_current_page {
3366	my ($self) = @_;	3922	my ($self) = @_;
3367		3923
…		…
3443	my $self = $class->SUPER::new (	3999	my $self = $class->SUPER::new (
3444	fontsize => 0.8,	4000	fontsize => 0.8,
3445	@_,	4001	@_,
3446	);	4002	);
3447		4003
3448	Scalar::Util::weaken (my $this = $self);	4004	CFPlus::weaken (my $this = $self);
3449		4005
3450	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4006	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3451		4007
3452	$self	4008	$self
3453	}	4009	}
…		…
3576	$self->SUPER::destroy;	4132	$self->SUPER::destroy;
3577	}	4133	}
3578		4134
3579	#############################################################################	4135	#############################################################################
3580		4136
3581	package CFPlus::UI::Inventory;
3582
3583	our @ISA = CFPlus::UI::Table::;
3584
3585	sub new {
3586	my $class = shift;
3587
3588	my $self = $class->SUPER::new (
3589	col_expand => [0, 1, 0],
3590	items => [],
3591	@_,
3592	);
3593
3594	$self->set_sort_order (undef);
3595
3596	$self
3597	}
3598
3599	sub update_items {
3600	my ($self) = @_;
3601
3602	$self->clear;
3603
3604	my @item = $self->{sort}->(@{ $self->{items} });
3605
3606	my @adds;
3607	my $row = 0;
3608	for my $item ($self->{sort}->(@{ $self->{items} })) {
3609	CFPlus::Item::update_widgets $item;
3610
3611	push @adds, 0, $row, $item->{face_widget};
3612	push @adds, 1, $row, $item->{desc_widget};
3613	push @adds, 2, $row, $item->{weight_widget};
3614
3615	$row++;
3616	}
3617
3618	$self->add (@adds);
3619	}
3620
3621	sub set_sort_order {
3622	my ($self, $order) = @_;
3623
3624	$self->{sort} = $order ||= sub {
3625	sort {
3626	$a->{type} <=> $b->{type}
3627	or $a->{name} cmp $b->{name}
3628	} @_
3629	};
3630
3631	$self->update_items;
3632	}
3633
3634	sub set_items {
3635	my ($self, $items) = @_;
3636
3637	$self->{items} = [$items ? values %$items : ()];
3638	$self->update_items;
3639	}
3640
3641	#############################################################################
3642
3643	package CFPlus::UI::SpellList;
3644
3645	our @ISA = CFPlus::UI::Table::;
3646
3647	sub new {
3648	my $class = shift;
3649
3650	my $self = $class->SUPER::new (
3651	binding => [],
3652	commands => [],
3653	@_,
3654	)
3655	}
3656
3657	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3658
3659	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3660	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3661	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3662	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3663	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3665	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3666	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3667	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3668	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3669
3670	sub rebuild_spell_list {
3671	my ($self) = @_;
3672
3673	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3674	$self->clear;
3675
3676	return unless $::CONN;
3677
3678	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3679	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3680	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3681	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3682	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3683
3684	my $row = 0;
3685
3686	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3687	my $spell = $self->{spell}{$_};
3688
3689	$row++;
3690
3691	my $spell_cb = sub {
3692	my ($widget, $ev) = @_;
3693
3694	if ($ev->{button} == 1) {
3695	$::CONN->user_send ("cast $spell->{name}");
3696	} elsif ($ev->{button} == 2) {
3697	$::CONN->user_send ("invoke $spell->{name}");
3698	} elsif ($ev->{button} == 3) {
3699	(new CFPlus::UI::Menu
3700	items => [
3701	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3702	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3703	],
3704	)->popup ($ev);
3705	} else {
3706	return 0;
3707	}
3708
3709	1
3710	};
3711
3712	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3713
3714	#TODO: add path info to tooltip
3715	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3716
3717	$self->add (0, $row, new CFPlus::UI::Face
3718	face => $spell->{face},
3719	can_hover => 1,
3720	can_events => 1,
3721	tooltip => $tooltip,
3722	on_button_down => $spell_cb,
3723	);
3724
3725	$self->add (1, $row, new CFPlus::UI::Label
3726	expand => 1,
3727	text => $spell->{name},
3728	can_hover => 1,
3729	can_events => 1,
3730	tooltip => $tooltip,
3731	on_button_down => $spell_cb,
3732	);
3733
3734	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3735	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3736	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3737	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3738	}
3739	});
3740	}
3741
3742	sub add_spell {
3743	my ($self, $spell) = @_;
3744
3745	$self->{spell}->{$spell->{name}} = $spell;
3746	$self->rebuild_spell_list;
3747	}
3748
3749	sub remove_spell {
3750	my ($self, $spell) = @_;
3751
3752	delete $self->{spell}->{$spell->{name}};
3753	$self->rebuild_spell_list;
3754	}
3755
3756	sub clear_spells {
3757	my ($self) = @_;
3758
3759	$self->{spell} = {};
3760	$self->rebuild_spell_list;
3761	}
3762
3763	#############################################################################
3764
3765	package CFPlus::UI::Root;	4137	package CFPlus::UI::Root;
3766		4138
3767	our @ISA = CFPlus::UI::Container::;	4139	our @ISA = CFPlus::UI::Container::;
3768		4140
3769	use List::Util qw(min max);	4141	use List::Util qw(min max);
…		…
3776	my $self = $class->SUPER::new (	4148	my $self = $class->SUPER::new (
3777	visible => 1,	4149	visible => 1,
3778	@_,	4150	@_,
3779	);	4151	);
3780		4152
3781	Scalar::Util::weaken ($self->{root} = $self);	4153	CFPlus::weaken ($self->{root} = $self);
3782		4154
3783	$self	4155	$self
3784	}	4156	}
3785		4157
3786	sub size_request {	4158	sub size_request {
…		…
3834	}	4206	}
3835		4207
3836	sub update {	4208	sub update {
3837	my ($self) = @_;	4209	my ($self) = @_;
3838		4210
3839	$::WANT_REFRESH++;	4211	$::WANT_REFRESH->start;
3840	}	4212	}
3841		4213
3842	sub add {	4214	sub add {
3843	my ($self, @children) = @_;	4215	my ($self, @children) = @_;
3844		4216
…		…
3881	while ($self->{refresh_hook}) {	4253	while ($self->{refresh_hook}) {
3882	$_->()	4254	$_->()
3883	for values %{delete $self->{refresh_hook}};	4255	for values %{delete $self->{refresh_hook}};
3884	}	4256	}
3885		4257
3886	if ($self->{realloc}) {	4258	while ($self->{realloc}) {
3887	my %queue;	4259	my %queue;
3888	my @queue;	4260	my @queue;
3889	my $widget;	4261	my $widget;
3890		4262
3891	outer:	4263	outer:
…		…
3938	}	4310	}
3939	}	4311	}
3940		4312
3941	delete $self->{realloc}{$widget+0};	4313	delete $self->{realloc}{$widget+0};
3942	}	4314	}
3943	}
3944		4315
3945	while (my $size_alloc = delete $self->{size_alloc}) {	4316	while (my $size_alloc = delete $self->{size_alloc}) {
3946	my @queue = sort { $b->{visible} <=> $a->{visible} }	4317	my @queue = sort { $a->{visible} <=> $b->{visible} }
3947	values %$size_alloc;	4318	values %$size_alloc;
3948		4319
3949	while () {	4320	while () {
3950	my $widget = pop @queue || last;	4321	my $widget = pop @queue || last;
3951		4322
3952	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4323	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3953		4324
3954	$w = 0 if $w < 0;
3955	$h = 0 if $h < 0;
3956
3957	$w = max $widget->{min_w}, $w;	4325	$w = max $widget->{min_w}, $w;
3958	$h = max $widget->{min_h}, $h;	4326	$h = max $widget->{min_h}, $h;
3959		4327
3960	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4328	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3961	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4329	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3962		4330
3963	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4331	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3964	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4332	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3965		4333
3966	$w = int $w + 0.5;	4334	$w = int $w + 0.5;
3967	$h = int $h + 0.5;	4335	$h = int $h + 0.5;
3968		4336
3969	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4337	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3970	$widget->{old_w} = $widget->{w};	4338	$widget->{old_w} = $widget->{w};
3971	$widget->{old_h} = $widget->{h};	4339	$widget->{old_h} = $widget->{h};
3972		4340
3973	$widget->{w} = $w;	4341	$widget->{w} = $w;
3974	$widget->{h} = $h;	4342	$widget->{h} = $h;
3975		4343
3976	$widget->emit (size_allocate => $w, $h);	4344	$widget->emit (size_allocate => $w, $h);
		4345	}
3977	}	4346	}
3978	}	4347	}
3979	}	4348	}
3980		4349
3981	while ($self->{post_alloc_hook}) {	4350	while ($self->{post_alloc_hook}) {
3982	$_->()	4351	$_->()
3983	for values %{delete $self->{post_alloc_hook}};	4352	for values %{delete $self->{post_alloc_hook}};
3984	}	4353	}
3985
3986		4354
3987	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4355	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3988	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4356	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3989	glClear GL_COLOR_BUFFER_BIT;	4357	glClear GL_COLOR_BUFFER_BIT;
3990		4358
…		…
3995	glLoadIdentity;	4363	glLoadIdentity;
3996		4364
3997	{	4365	{
3998	package CFPlus::UI::Base;	4366	package CFPlus::UI::Base;
3999		4367
4000	($draw_x, $draw_y, $draw_w, $draw_h) =	4368	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4001	(0, 0, $self->{w}, $self->{h});	4369	(0, 0, $self->{w}, $self->{h});
4002	}
4003		4370
4004	$self->_draw;	4371	$self->_draw;
		4372	}
4005	}	4373	}
4006		4374
4007	#############################################################################	4375	#############################################################################
4008		4376
4009	package CFPlus::UI;	4377	package CFPlus::UI;

Diff Legend

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