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.340 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.406 by root, Sat Jul 21 23:17:35 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;
		10	use CFPlus::Pod;
11	use CFPlus::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
110	}	113	}
111		114
112	if ($GRAB) {	115	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	116	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	117	# mousewheel
115	$ev->{dx} = 0;
116	$ev->{dy} = $ev->{button} * 2 - 9;	118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		120
		121	$ev->{dx} = $shift ? $delta : 0;
		122	$ev->{dy} = $shift ? 0 : $delta;
		123
117	$GRAB->emit (mouse_wheel => $ev);	124	$GRAB->emit (mouse_wheel => $ev);
118	} else {	125	} else {
119	$GRAB->emit (button_down => $ev)	126	$GRAB->emit (button_down => $ev)
120	}	127	}
121	}	128	}
…		…
234	h => undef,	241	h => undef,
235	can_events => 1,	242	can_events => 1,
236	@_	243	@_
237	}, $class;	244	}, $class;
238		245
239	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		247
241	for (keys %$self) {	248	for (keys %$self) {
242	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
244	}	251	}
…		…
261		268
262	sub destroy {	269	sub destroy {
263	my ($self) = @_;	270	my ($self) = @_;
264		271
265	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
266	%$self = ();	274	%$self = ();
		275	}
		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
267	}	279	}
268		280
269	sub show {	281	sub show {
270	my ($self) = @_;	282	my ($self) = @_;
271		283
…		…
312	sub set_visibility {	324	sub set_visibility {
313	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
314		326
315	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
316		328
317	$visible ? $self->hide	329	$visible ? $self->show
318	: $self->show;	330	: $self->hide;
319	}	331	}
320		332
321	sub toggle_visibility {	333	sub toggle_visibility {
322	my ($self) = @_;	334	my ($self) = @_;
323		335
…		…
501		513
502	defined wantarray and CFPlus::guard {	514	defined wantarray and CFPlus::guard {
503	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504	@{ $self->{signal_cb}{$signal} };	516	@{ $self->{signal_cb}{$signal} };
505	}	517	}
		518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
506	}	524	}
507		525
508	my %has_coords = (	526	my %has_coords = (
509	button_down => 1,	527	button_down => 1,
510	button_up => 1,	528	button_up => 1,
…		…
513	);	531	);
514		532
515	sub emit {	533	sub emit {
516	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
517		535
518	# 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
519	# and needlessly verbose code, too.	537	# and needlessly verbose code, either.
520	my @append	538	my @append
521	= $has_coords{$signal}	539	= $has_coords{$signal}
522	? $args[0]->xy ($self)	540	? $args[0]->xy ($self)
523	: ();	541	: ();
524		542
525	#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#
526		544
527	#d##TODO# stop propagating at first true, do not use sum	545	for my $cb (
528	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	546	@{$self->{signal_cb}{$signal} || []}, # before
529	|| ($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
530	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
531	}	554	}
532		555
533	sub find_widget {	556	#sub find_widget {
534	my ($self, $x, $y) = @_;	557	# in .xs
535
536	return () unless $self->{can_events};
537
538	return $self
539	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
540	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
541
542	()
543	}
544		558
545	sub set_parent {	559	sub set_parent {
546	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
547		561
548	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
549	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
550	}	564	}
551		565
552	sub realloc {	566	sub realloc {
553	my ($self) = @_;	567	my ($self) = @_;
…		…
579		593
580	# 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
581	# functions seems pointless.	595	# functions seems pointless.
582	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
583		597
584	sub draw {	598	#sub draw {
585	my ($self) = @_;	599	#CFPlus.xs
586
587	return unless $self->{h} && $self->{w};
588
589	# update screen rectangle
590	local $draw_x = $draw_x + $self->{x};
591	local $draw_y = $draw_y + $self->{y};
592
593	# skip widgets that are entirely outside the drawing area
594	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
595	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
596
597	glPushMatrix;
598	glTranslate $self->{x}, $self->{y}, 0;
599
600	if ($self == $HOVER && $self->{can_hover}) {
601	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
602	glEnable GL_BLEND;
603	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
604	glBegin GL_QUADS;
605	glVertex 0 , 0;
606	glVertex $self->{w}, 0;
607	glVertex $self->{w}, $self->{h};
608	glVertex 0 , $self->{h};
609	glEnd;
610	glDisable GL_BLEND;
611	}
612
613	if ($ENV{CFPLUS_DEBUG} & 1) {
614	glPushMatrix;
615	glColor 1, 1, 0, 1;
616	glTranslate 0.375, 0.375;
617	glBegin GL_LINE_LOOP;
618	glVertex 0 , 0;
619	glVertex $self->{w} - 1, 0;
620	glVertex $self->{w} - 1, $self->{h} - 1;
621	glVertex 0 , $self->{h} - 1;
622	glEnd;
623	glPopMatrix;
624	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625	}
626
627	$self->_draw;
628	glPopMatrix;
629	}
630		600
631	sub _draw {	601	sub _draw {
632	my ($self) = @_;	602	my ($self) = @_;
633		603
634	warn "no draw defined for $self\n";	604	warn "no draw defined for $self\n";
…		…
636		606
637	sub DESTROY {	607	sub DESTROY {
638	my ($self) = @_;	608	my ($self) = @_;
639		609
640	return if CFPlus::in_destruct;	610	return if CFPlus::in_destruct;
641
642	delete $WIDGET{$self+0};
643		611
644	eval { $self->destroy };	612	eval { $self->destroy };
645	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};
646	}	616	}
647		617
648	#############################################################################	618	#############################################################################
649		619
650	package CFPlus::UI::DrawBG;	620	package CFPlus::UI::DrawBG;
…		…
726	can_events => 0,	696	can_events => 0,
727	%arg,	697	%arg,
728	);	698	);
729		699
730	$self->add (@$children)	700	$self->add (@$children)
731	if $children;	701	if $children && @$children;
732		702
733	$self	703	$self
734	}	704	}
735		705
736	sub realloc {	706	sub realloc {
…		…
745	my ($self, @widgets) = @_;	715	my ($self, @widgets) = @_;
746		716
747	$_->set_parent ($self)	717	$_->set_parent ($self)
748	for @widgets;	718	for @widgets;
749		719
		720	# TODO: only do this in widgets that need it, e.g. root, fixed
750	use sort 'stable';	721	use sort 'stable';
751		722
752	$self->{children} = [	723	$self->{children} = [
753	sort { $a->{z} <=> $b->{z} }	724	sort { $a->{z} <=> $b->{z} }
754	@{$self->{children}}, @widgets	725	@{$self->{children}}, @widgets
755	];	726	];
756		727
757	$self->realloc;	728	$self->realloc;
		729
		730	map $_+0, @widgets
758	}	731	}
759		732
760	sub children {	733	sub children {
761	@{ $_[0]{children} }	734	@{ $_[0]{children} }
762	}	735	}
…		…
773	}	746	}
774		747
775	sub clear {	748	sub clear {
776	my ($self) = @_;	749	my ($self) = @_;
777		750
778	my $children = delete $self->{children};	751	my $children = $self->{children};
779	$self->{children} = [];	752	$self->{children} = [];
780		753
781	for (@$children) {	754	for (@$children) {
782	delete $_->{parent};	755	delete $_->{parent};
783	$_->hide;	756	$_->hide;
…		…
897	glClear GL_COLOR_BUFFER_BIT;	870	glClear GL_COLOR_BUFFER_BIT;
898		871
899	{	872	{
900	package CFPlus::UI::Base;	873	package CFPlus::UI::Base;
901		874
902	($draw_x, $draw_y, $draw_w, $draw_h) =	875	local ($draw_x, $draw_y, $draw_w, $draw_h) =
903	(0, 0, $self->{w}, $self->{h});	876	(0, 0, $self->{w}, $self->{h});
		877
		878	$self->_render;
904	}	879	}
905
906	$self->_render;
907	};	880	};
908	}	881	}
909		882
910	sub _draw {	883	sub _draw {
911	my ($self) = @_;	884	my ($self) = @_;
912
913	my ($w, $h) = @$self{qw(w h)};
914		885
915	my $tex = $self->{texture}	886	my $tex = $self->{texture}
916	or return;	887	or return;
917		888
918	glEnable GL_TEXTURE_2D;	889	glEnable GL_TEXTURE_2D;
919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	890	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920	glColor 0, 0, 0, 1;	891	glColor 0, 0, 0, 1;
921		892
922	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	893	$tex->draw_quad_alpha_premultiplied (0, 0);
923		894
924	glDisable GL_TEXTURE_2D;	895	glDisable GL_TEXTURE_2D;
925	}	896	}
926		897
927	#############################################################################	898	#############################################################################
928		899
929	package CFPlus::UI::ViewPort;	900	package CFPlus::UI::ViewPort;
		901
		902	use List::Util qw(min max);
930		903
931	our @ISA = CFPlus::UI::Window::;	904	our @ISA = CFPlus::UI::Window::;
932		905
933	sub new {	906	sub new {
934	my $class = shift;	907	my $class = shift;
…		…
943	sub size_request {	916	sub size_request {
944	my ($self) = @_;	917	my ($self) = @_;
945		918
946	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	919	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
947		920
948	$w = 10 if $self->{scroll_x};	921	$w = 1 if $self->{scroll_x};
949	$h = 10 if $self->{scroll_y};	922	$h = 1 if $self->{scroll_y};
950		923
951	($w, $h)	924	($w, $h)
952	}	925	}
953		926
954	sub invoke_size_allocate {	927	sub invoke_size_allocate {
…		…
966	}	939	}
967		940
968	sub set_offset {	941	sub set_offset {
969	my ($self, $x, $y) = @_;	942	my ($self, $x, $y) = @_;
970		943
		944	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		945	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		946
		947	if ($x != $self->{view_x} or $y != $self->{view_y}) {
971	$self->{view_x} = int $x;	948	$self->{view_x} = $x;
972	$self->{view_y} = int $y;	949	$self->{view_y} = $y;
973		950
		951	$self->emit (changed => $x, $y);
974	$self->update;	952	$self->update;
		953	}
975	}	954	}
976		955
977	# hmm, this does not work for topleft of $self... but we should not ask for that	956	# hmm, this does not work for topleft of $self... but we should not ask for that
978	sub coord2local {	957	sub coord2local {
979	my ($self, $x, $y) = @_;	958	my ($self, $x, $y) = @_;
…		…
994	my ($self, $x, $y) = @_;	973	my ($self, $x, $y) = @_;
995		974
996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	975	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	976	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
998	) {	977	) {
999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	978	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000	} else {	979	} else {
1001	$self->CFPlus::UI::Base::find_widget ($x, $y)	980	$self->CFPlus::UI::Base::find_widget ($x, $y)
1002	}	981	}
1003	}	982	}
1004		983
…		…
1015		994
1016	#############################################################################	995	#############################################################################
1017		996
1018	package CFPlus::UI::ScrolledWindow;	997	package CFPlus::UI::ScrolledWindow;
1019		998
1020	our @ISA = CFPlus::UI::HBox::;	999	our @ISA = CFPlus::UI::Table::;
1021		1000
1022	sub new {	1001	sub new {
1023	my ($class, %arg) = @_;	1002	my ($class, %arg) = @_;
1024		1003
1025	my $child = delete $arg{child};	1004	my $child = delete $arg{child};
1026		1005
1027	my $self;	1006	my $self;
1028		1007
1029	my $slider = new CFPlus::UI::Slider	1008	my $hslider = new CFPlus::UI::Slider
		1009	col => 0,
		1010	row => 1,
		1011	vertical => 0,
		1012	range => [0, 0, 1, 0.01], # HACK fix
		1013	on_changed => sub {
		1014	$self->{hpos} = $_[1];
		1015	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1016	},
		1017	;
		1018
		1019	my $vslider = new CFPlus::UI::Slider
		1020	col => 1,
		1021	row => 0,
1030	vertical => 1,	1022	vertical => 1,
1031	range => [0, 0, 1, 0.01], # HACK fix	1023	range => [0, 0, 1, 0.01], # HACK fix
1032	on_changed => sub {	1024	on_changed => sub {
1033	$self->{vp}->set_offset (0, $_[1]);	1025	$self->{vpos} = $_[1];
		1026	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034	},	1027	},
1035	;	1028	;
1036		1029
1037	$self = $class->SUPER::new (	1030	$self = $class->SUPER::new (
1038	vp => (new CFPlus::UI::ViewPort expand => 1),	1031	scroll_x => 0,
		1032	scroll_y => 1,
1039	can_events => 1,	1033	can_events => 1,
1040	slider => $slider,	1034	hslider => $hslider,
		1035	vslider => $vslider,
		1036	col_expand => [1, 0],
		1037	row_expand => [1, 0],
1041	%arg,	1038	%arg,
1042	);	1039	);
1043		1040
		1041	$self->{vp} = new CFPlus::UI::ViewPort
		1042	col => 0,
		1043	row => 0,
		1044	expand => 1,
		1045	scroll_x => $self->{scroll_x},
		1046	scroll_y => $self->{scroll_y},
		1047	on_changed => sub {
		1048	my ($vp, $x, $y) = @_;
		1049
		1050	$vp->{parent}{hslider}->set_value ($x);
		1051	$vp->{parent}{vslider}->set_value ($y);
		1052
		1053	0
		1054	},
		1055	on_size_allocate => sub {
		1056	my ($vp, $w, $h) = @_;
		1057	$vp->{parent}->update_slider;
		1058	0
		1059	},
		1060	;
		1061
1044	$self->SUPER::add ($self->{vp}, $self->{slider});	1062	$self->SUPER::add ($self->{vp});
		1063
1045	$self->add ($child) if $child;	1064	$self->add ($child) if $child;
1046		1065
1047	$self	1066	$self
1048	}	1067	}
1049
1050	#TODO# update range on size_allocate depending on child
1051		1068
1052	sub add {	1069	sub add {
1053	my ($self, $widget) = @_;	1070	my ($self, $widget) = @_;
1054		1071
1055	$self->{vp}->add ($self->{child} = $widget);	1072	$self->{vp}->add ($self->{child} = $widget);
1056	}	1073	}
1057		1074
		1075	sub update_slider {
		1076	my ($self) = @_;
		1077
		1078	my $child = ($self->{vp} or return)->child;
		1079
		1080	if ($self->{scroll_x}) {
		1081	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1082	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1083
		1084	my $visible = $w1 > $w2;
		1085	if ($visible != $self->{hslider_visible}) {
		1086	$self->{hslider_visible} = $visible;
		1087	$visible ? $self->SUPER::add ($self->{hslider})
		1088	: $self->SUPER::remove ($self->{hslider});
		1089	}
		1090	}
		1091
		1092	if ($self->{scroll_y}) {
		1093	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1094	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1095
		1096	my $visible = $h1 > $h2;
		1097	if ($visible != $self->{vslider_visible}) {
		1098	$self->{vslider_visible} = $visible;
		1099	$visible ? $self->SUPER::add ($self->{vslider})
		1100	: $self->SUPER::remove ($self->{vslider});
		1101	}
		1102	}
		1103	}
		1104
		1105	sub start_dragging {
		1106	my ($self, $ev) = @_;
		1107
		1108	$self->grab_focus;
		1109
		1110	my $ox = $self->{vp}{view_x};
		1111	my $oy = $self->{vp}{view_y};
		1112
		1113	$self->{motion} = sub {
		1114	my ($ev, $x, $y) = @_;
		1115
		1116	$ox -= $ev->{xrel};
		1117	$oy -= $ev->{yrel};
		1118
		1119	$self->{vp}->set_offset ($ox, $oy);
		1120	};
		1121	}
		1122
1058	sub invoke_mouse_wheel {	1123	sub invoke_mouse_wheel {
1059	my ($self, $ev) = @_;	1124	my ($self, $ev) = @_;
1060		1125
1061	return 0 unless $ev->{dy}; # only vertical movements
1062
1063	$self->{slider}->emit (mouse_wheel => $ev);	1126	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1127	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1064		1128
1065	1	1129	1
1066	}	1130	}
1067		1131
1068	sub update_slider {	1132	sub invoke_button_down {
1069	my ($self) = @_;	1133	my ($self, $ev, $x, $y) = @_;
1070		1134
1071	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1135	if ($ev->{button} == 2) {
1072	}	1136	$self->start_dragging ($ev);
		1137	return 1;
		1138	}
1073		1139
1074	sub update {	1140	0
1075	my ($self) = @_;	1141	}
1076		1142
1077	$self->SUPER::update;	1143	sub invoke_button_up {
		1144	my ($self, $ev, $x, $y) = @_;
1078		1145
1079	$self->update_slider;	1146	if (delete $self->{motion}) {
		1147	return 1;
		1148	}
		1149
		1150	0
		1151	}
		1152
		1153	sub invoke_mouse_motion {
		1154	my ($self, $ev, $x, $y) = @_;
		1155
		1156	if ($self->{motion}) {
		1157	$self->{motion}->($ev, $x, $y);
		1158	return 1;
		1159	}
		1160
		1161	0
1080	}	1162	}
1081		1163
1082	sub invoke_size_allocate {	1164	sub invoke_size_allocate {
1083	my ($self, $w, $h) = @_;	1165	my ($self, $w, $h) = @_;
1084		1166
1085	$self->update_slider;	1167	$self->update_slider;
1086
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1168	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1169	}
1089		1170
1090	#############################################################################	1171	#############################################################################
1091		1172
…		…
1133		1214
1134	our @ISA = CFPlus::UI::Bin::;	1215	our @ISA = CFPlus::UI::Bin::;
1135		1216
1136	use CFPlus::OpenGL;	1217	use CFPlus::OpenGL;
1137		1218
		1219	sub new {
		1220	my ($class, %arg) = @_;
		1221
		1222	if ((exists $arg{label}) && !ref $arg{label}) {
		1223	$arg{label} = new CFPlus::UI::Label
		1224	align => 1,
		1225	valign => 0,
		1226	text => $arg{label},
		1227	fontsize => ($arg{border} || 0.8) * 0.75;
		1228	}
		1229
		1230	my $self = $class->SUPER::new (
		1231	# label => "",
		1232	fg => [0.6, 0.3, 0.1],
		1233	border => 0.8,
		1234	style => 'single',
		1235	%arg,
		1236	);
		1237
		1238	$self
		1239	}
		1240
		1241	sub add {
		1242	my ($self, @widgets) = @_;
		1243
		1244	$self->SUPER::add (@widgets);
		1245	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1246	}
		1247
		1248	sub border {
		1249	int $_[0]{border} * $::FONTSIZE
		1250	}
		1251
		1252	sub size_request {
		1253	my ($self) = @_;
		1254
		1255	($self->{label_w}, undef) = $self->{label}->size_request
		1256	if $self->{label};
		1257
		1258	my ($w, $h) = $self->SUPER::size_request;
		1259
		1260	(
		1261	$w + $self->border * 2,
		1262	$h + $self->border * 2,
		1263	)
		1264	}
		1265
		1266	sub invoke_size_allocate {
		1267	my ($self, $w, $h) = @_;
		1268
		1269	my $border = $self->border;
		1270
		1271	$w -= List::Util::max 0, $border * 2;
		1272	$h -= List::Util::max 0, $border * 2;
		1273
		1274	if (my $label = $self->{label}) {
		1275	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1276	$label->{h} = List::Util::min $h, $border;
		1277	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1278	}
		1279
		1280	$self->child->configure ($border, $border, $w, $h);
		1281
		1282	1
		1283	}
		1284
		1285	sub _draw {
		1286	my ($self) = @_;
		1287
		1288	my $child = $self->{children}[0];
		1289
		1290	my $border = $self->border;
		1291	my ($w, $h) = ($self->{w}, $self->{h});
		1292
		1293	$child->draw;
		1294
		1295	glColor @{$self->{fg}};
		1296	glBegin GL_LINE_STRIP;
		1297	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1298	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1299	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1300	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1301	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1302	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1303	glEnd;
		1304
		1305	if ($self->{label}) {
		1306	glTranslate $border * 2, 0;
		1307	$self->{label}->_draw;
		1308	}
		1309	}
		1310
		1311	#############################################################################
		1312
		1313	package CFPlus::UI::Toplevel;
		1314
		1315	our @ISA = CFPlus::UI::Bin::;
		1316
		1317	use CFPlus::OpenGL;
		1318
1138	my $bg =	1319	my $bg =
1139	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",	1320	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1321	mipmap => 1, wrap => 1;
1141		1322
1142	my @border =	1323	my @border =
1143	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1324	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1144	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1325	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1326
		1327	my @icon =
		1328	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1329	qw(x1_move.png x1_resize.png);
1145		1330
1146	sub new {	1331	sub new {
1147	my ($class, %arg) = @_;	1332	my ($class, %arg) = @_;
1148		1333
1149	my $self = $class->SUPER::new (	1334	my $self = $class->SUPER::new (
…		…
1318	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1503	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1319		1504
1320	my $border = $self->border;	1505	my $border = $self->border;
1321		1506
1322	glColor @{ $self->{border_bg} };	1507	glColor @{ $self->{border_bg} };
1323	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1508	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1324	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1509	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1325	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1510	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1326	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1511	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1512
		1513	# move
		1514	my $w2 = ($w - $border) * .5;
		1515	my $h2 = ($h - $border) * .5;
		1516	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1517	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1518	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1519
		1520	# resize
		1521	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1522	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1523	unless $self->{has_close_button};
		1524	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1525	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1327		1526
1328	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1527	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1329	glColor @{ $self->{bg} };	1528	glColor @{ $self->{bg} };
1330		1529
1331	# TODO: repeat texture not scale	1530	# TODO: repeat texture not scale
…		…
1352		1551
1353	#############################################################################	1552	#############################################################################
1354		1553
1355	package CFPlus::UI::Table;	1554	package CFPlus::UI::Table;
1356		1555
1357	our @ISA = CFPlus::UI::Base::;	1556	our @ISA = CFPlus::UI::Container::;
1358		1557
1359	use List::Util qw(max sum);	1558	use List::Util qw(max sum);
1360		1559
1361	use CFPlus::OpenGL;	1560	use CFPlus::OpenGL;
1362		1561
1363	sub new {	1562	sub new {
1364	my $class = shift;	1563	my $class = shift;
1365		1564
1366	$class->SUPER::new (	1565	$class->SUPER::new (
1367	col_expand => [],	1566	col_expand => [],
		1567	row_expand => [],
1368	@_,	1568	@_,
1369	)	1569	)
1370	}	1570	}
1371		1571
1372	sub children {
1373	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1374	}
1375
1376	sub add {	1572	sub add {
		1573	my ($self, @widgets) = @_;
		1574
		1575	for my $child (@widgets) {
		1576	$child->{rowspan} ||= 1;
		1577	$child->{colspan} ||= 1;
		1578	}
		1579
		1580	$self->SUPER::add (@widgets);
		1581	}
		1582
		1583	sub add_at {
1377	my ($self) = shift;	1584	my $self = shift;
		1585
		1586	my @widgets;
1378		1587
1379	while (@_) {	1588	while (@_) {
1380	my ($x, $y, $child) = splice @_, 0, 3, ();	1589	my ($col, $row, $child) = splice @_, 0, 3, ();
1381	$child->set_parent ($self);
1382	$self->{children}[$y][$x] = $child;
1383	}
1384		1590
1385	$self->{force_realloc} = 1;	1591	$child->{row} = $row;
1386	$self->{force_size_alloc} = 1;	1592	$child->{col} = $col;
1387	$self->realloc;
1388	}
1389		1593
1390	sub remove {	1594	push @widgets, $child;
		1595	}
		1596
		1597	$self->add (@widgets);
		1598	}
		1599
		1600	sub get_wh {
1391	my ($self, $child) = @_;	1601	my ($self) = @_;
1392		1602
1393	# TODO: not yet implemented	1603	my (@w, @h);
1394	}
1395
1396	# TODO: move to container class maybe? send children a signal on removal?
1397	sub clear {
1398	my ($self) = @_;
1399		1604
1400	my @children = $self->children;	1605	my @children = $self->children;
1401	delete $self->{children};	1606
		1607	# first pass, columns
		1608	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1609	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1610
		1611	my $sw = sum @w[$c .. $c + $cs - 1];
		1612
		1613	if ($w > $sw) {
		1614	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1615	}
1402		1616	}
1403	for (@children) {
1404	delete $_->{parent};
1405	$_->hide;
1406	}
1407		1617
1408	$self->realloc;	1618	# second pass, rows
1409	}	1619	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1410
1411	sub get_wh {
1412	my ($self) = @_;
1413
1414	my (@w, @h);
1415
1416	for my $y (0 .. $#{$self->{children}}) {
1417	my $row = $self->{children}[$y]
1418	or next;
1419
1420	for my $x (0 .. $#$row) {
1421	my $widget = $row->[$x]
1422	or next;
1423	my ($w, $h) = @$widget{qw(req_w req_h)};	1620	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1424		1621
1425	$w[$x] = max $w[$x], $w;	1622	my $sh = sum @h[$r .. $r + $rs - 1];
1426	$h[$y] = max $h[$y], $h;	1623
		1624	if ($h > $sh) {
		1625	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1427	}	1626	}
1428	}	1627	}
1429		1628
1430	(\@w, \@h)	1629	(\@w, \@h)
1431	}	1630	}
…		…
1447	my ($ws, $hs) = $self->get_wh;	1646	my ($ws, $hs) = $self->get_wh;
1448		1647
1449	my $req_w = (sum @$ws) || 1;	1648	my $req_w = (sum @$ws) || 1;
1450	my $req_h = (sum @$hs) || 1;	1649	my $req_h = (sum @$hs) || 1;
1451		1650
1452	# TODO: nicer code && do row_expand	1651	# now linearly scale the rows/columns to the allocated size
1453	my @col_expand = @{$self->{col_expand}};	1652	my @col_expand = @{$self->{col_expand}};
1454	@col_expand = (1) x @$ws unless @col_expand;	1653	@col_expand = (1) x @$ws unless @col_expand;
1455	my $col_expand = (sum @col_expand) || 1;	1654	my $col_expand = (sum @col_expand) || 1;
1456		1655
1457	# linearly scale sizes
1458	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1656	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1459	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1460		1657
1461	CFPlus::UI::harmonize $ws;	1658	CFPlus::UI::harmonize $ws;
		1659
		1660	my @row_expand = @{$self->{row_expand}};
		1661	@row_expand = (1) x @$ws unless @row_expand;
		1662	my $row_expand = (sum @row_expand) || 1;
		1663
		1664	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1665
1462	CFPlus::UI::harmonize $hs;	1666	CFPlus::UI::harmonize $hs;
1463		1667
1464	my $y;	1668	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1669	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1465		1670
1466	for my $r (0 .. $#{$self->{children}}) {	1671	for my $widget ($self->children) {
1467	my $row = $self->{children}[$r]	1672	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1468	or next;
1469		1673
1470	my $x = 0;	1674	$widget->configure (
1471	my $row_h = $hs->[$r];	1675	$x[$c], $y[$r],
		1676	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1472		1677	);
1473	for my $c (0 .. $#$row) {	1678	}
1474	my $col_w = $ws->[$c];
1475		1679
1476	if (my $widget = $row->[$c]) {	1680	1
1477	$widget->configure ($x, $y, $col_w, $row_h);	1681	}
1478	}
1479		1682
1480	$x += $col_w;	1683	#############################################################################
		1684
		1685	package CFPlus::UI::Fixed;
		1686
		1687	use List::Util qw(min max);
		1688
		1689	our @ISA = CFPlus::UI::Container::;
		1690
		1691	sub add_fixed {
		1692	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1693
		1694	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1695	$self->SUPER::add ($child);
		1696	}
		1697
		1698	sub _scale($$$) {
		1699	my ($mode, $val, $max) = @_;
		1700
		1701	$mode eq "abs" ? $val
		1702	: $mode eq "rel" ? $val * $max
		1703	: 0
		1704	}
		1705
		1706	sub size_request {
		1707	my ($self) = @_;
		1708
		1709	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1710
		1711	# determine overall size by querying abs widgets
		1712	for my $child ($self->visible_children) {
		1713	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1714
		1715	if ($pos eq "abs") {
		1716	$w = _scale $size, $w, $child->{req_w};
		1717	$h = _scale $size, $h, $child->{req_h};
		1718
		1719	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1720	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1481	}	1721	}
		1722	}
1482		1723
1483	$y += $row_h;	1724	my $W = $x2 - $x1;
		1725	my $H = $y2 - $y1;
		1726
		1727	# now layout remaining widgets
		1728	for my $child ($self->visible_children) {
		1729	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1730
		1731	if ($pos ne "abs") {
		1732	$x = _scale $pos, $x, $W;
		1733	$y = _scale $pos, $x, $H;
		1734	$w = _scale $size, $w, $child->{req_w};
		1735	$h = _scale $size, $h, $child->{req_h};
		1736
		1737	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1738	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1739	}
		1740	}
		1741
		1742	my $W = $x2 - $x1;
		1743	my $H = $y2 - $y1;
		1744
		1745	($W, $H)
		1746	}
		1747
		1748	sub invoke_size_allocate {
		1749	my ($self, $W, $H) = @_;
		1750
		1751	for my $child ($self->visible_children) {
		1752	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1753
		1754	$x = _scale $pos, $x, $W;
		1755	$y = _scale $pos, $x, $H;
		1756	$w = _scale $size, $w, $W;
		1757	$h = _scale $size, $h, $H;
		1758
		1759	$child->configure ($x, $y, $w, $h);
1484	}	1760	}
1485		1761
1486	1	1762	1
1487	}
1488
1489	sub find_widget {
1490	my ($self, $x, $y) = @_;
1491
1492	$x -= $self->{x};
1493	$y -= $self->{y};
1494
1495	my $res;
1496
1497	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1498	$res = $_->find_widget ($x, $y)
1499	and return $res;
1500	}
1501
1502	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1503	}
1504
1505	sub _draw {
1506	my ($self) = @_;
1507
1508	for (grep $_, @{$self->{children}}) {
1509	$_->draw for grep $_, @$_;
1510	}
1511	}	1763	}
1512		1764
1513	#############################################################################	1765	#############################################################################
1514		1766
1515	package CFPlus::UI::Box;	1767	package CFPlus::UI::Box;
…		…
1617	#active_bg => none	1869	#active_bg => none
1618	#font => default_font	1870	#font => default_font
1619	#text => initial text	1871	#text => initial text
1620	#markup => initial narkup	1872	#markup => initial narkup
1621	#max_w => maximum pixel width	1873	#max_w => maximum pixel width
		1874	#style => 0, # render flags
1622	ellipsise => 3, # end	1875	ellipsise => 3, # end
1623	layout => (new CFPlus::Layout),	1876	layout => (new CFPlus::Layout),
1624	fontsize => 1,	1877	fontsize => 1,
1625	align => -1,	1878	align => -1,
1626	valign => -1,	1879	valign => -1,
…		…
1774	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2027	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1775	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2028	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1776	: ($self->{h} - $size->[1]) * 0.5);	2029	: ($self->{h} - $size->[1]) * 0.5);
1777	};	2030	};
1778		2031
1779	my $w = List::Util::min $self->{w} + 4, $size->[0];
1780	my $h = List::Util::min $self->{h} + 2, $size->[1];
1781
1782	$self->{layout}->render ($self->{ox}, $self->{oy});	2032	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1783	}	2033	}
1784		2034
1785	#############################################################################	2035	#############################################################################
1786		2036
1787	package CFPlus::UI::EntryBase;	2037	package CFPlus::UI::EntryBase;
…		…
1800	active_fg => [0, 0, 0],	2050	active_fg => [0, 0, 0],
1801	can_hover => 1,	2051	can_hover => 1,
1802	can_focus => 1,	2052	can_focus => 1,
1803	valign => 0,	2053	valign => 0,
1804	can_events => 1,	2054	can_events => 1,
		2055	ellipsise => 0,
1805	#text => ...	2056	#text => ...
1806	#hidden => "*",	2057	#hidden => "*",
1807	@_	2058	@_
1808	)	2059	)
1809	}	2060	}
…		…
1853	my $mod = $ev->{mod};	2104	my $mod = $ev->{mod};
1854	my $sym = $ev->{sym};	2105	my $sym = $ev->{sym};
1855	my $uni = $ev->{unicode};	2106	my $uni = $ev->{unicode};
1856		2107
1857	my $text = $self->get_text;	2108	my $text = $self->get_text;
		2109
		2110	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1858		2111
1859	if ($uni == 8) {	2112	if ($uni == 8) {
1860	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2113	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861	} elsif ($uni == 127) {	2114	} elsif ($uni == 127) {
1862	substr $text, $self->{cursor}, 1, "";	2115	substr $text, $self->{cursor}, 1, "";
1863	} elsif ($sym == CFPlus::SDLK_LEFT) {	2116	} elsif ($sym == CFPlus::SDLK_LEFT) {
1864	--$self->{cursor} if $self->{cursor};	2117	--$self->{cursor} if $self->{cursor};
1865	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2118	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1866	++$self->{cursor} if $self->{cursor} < length $self->{text};	2119	++$self->{cursor} if $self->{cursor} < length $self->{text};
1867	} elsif ($sym == CFPlus::SDLK_HOME) {	2120	} elsif ($sym == CFPlus::SDLK_HOME) {
		2121	# what a hack
		2122	$self->{cursor} =
		2123	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2124	? length $1
		2125	: 0;
		2126	} elsif ($sym == CFPlus::SDLK_END) {
		2127	# uh, again
		2128	$self->{cursor} =
		2129	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2130	? $self->{cursor} + length $1
		2131	: length $self->{text};
		2132	} elsif ($uni == 21) { # ctrl-u
		2133	$text = "";
1868	$self->{cursor} = 0;	2134	$self->{cursor} = 0;
1869	} elsif ($sym == CFPlus::SDLK_END) {
1870	$self->{cursor} = length $text;
1871	} elsif ($uni == 27) {	2135	} elsif ($uni == 27) {
1872	$self->emit ('escape');	2136	$self->emit ('escape');
1873	} elsif ($uni) {	2137	} elsif ($uni == 0x0d) {
		2138	substr $text, $self->{cursor}++, 0, "\012";
		2139	} elsif ($uni >= 0x20) {
1874	substr $text, $self->{cursor}++, 0, chr $uni;	2140	substr $text, $self->{cursor}++, 0, chr $uni;
1875	} else {	2141	} else {
1876	return 0;	2142	return 0;
1877	}	2143	}
1878		2144
1879	$self->_set_text ($text);	2145	$self->_set_text ($text);
1880		2146
1881	$self->realloc;	2147	$self->realloc;
		2148	$self->update;
1882		2149
1883	1	2150	1
1884	}	2151	}
1885		2152
1886	sub invoke_focus_in {	2153	sub invoke_focus_in {
…		…
1948	utf8::encode $text;	2215	utf8::encode $text;
1949		2216
1950	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2217	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1951	}	2218	}
1952		2219
1953	glColor @{$self->{fg}};
1954	glBegin GL_LINES;	2220	glBegin GL_LINES;
1955	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2221	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1956	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2222	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1957	glEnd;	2223	glEnd;
1958	}	2224	}
1959	}	2225	}
		2226
		2227	#############################################################################
1960		2228
1961	package CFPlus::UI::Entry;	2229	package CFPlus::UI::Entry;
1962		2230
1963	our @ISA = CFPlus::UI::EntryBase::;	2231	our @ISA = CFPlus::UI::EntryBase::;
1964		2232
…		…
1967	sub invoke_key_down {	2235	sub invoke_key_down {
1968	my ($self, $ev) = @_;	2236	my ($self, $ev) = @_;
1969		2237
1970	my $sym = $ev->{sym};	2238	my $sym = $ev->{sym};
1971		2239
1972	if ($sym == 13) {	2240	if ($ev->{uni} == 0x0d || $sym == 13) {
1973	unshift @{$self->{history}},	2241	unshift @{$self->{history}},
1974	my $txt = $self->get_text;	2242	my $txt = $self->get_text;
1975		2243
1976	$self->{history_pointer} = -1;	2244	$self->{history_pointer} = -1;
1977	$self->{history_saveback} = '';	2245	$self->{history_saveback} = '';
…		…
2007	1	2275	1
2008	}	2276	}
2009		2277
2010	#############################################################################	2278	#############################################################################
2011		2279
		2280	package CFPlus::UI::TextEdit;
		2281
		2282	our @ISA = CFPlus::UI::EntryBase::;
		2283
		2284	use CFPlus::OpenGL;
		2285
		2286	sub move_cursor_ver {
		2287	my ($self, $dy) = @_;
		2288
		2289	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2290
		2291	$y += $dy;
		2292
		2293	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2294	$self->{cursor} = $index;
		2295	delete $self->{cur_h};
		2296	$self->update;
		2297	return;
		2298	}
		2299	}
		2300
		2301	sub invoke_key_down {
		2302	my ($self, $ev) = @_;
		2303
		2304	my $sym = $ev->{sym};
		2305
		2306	if ($sym == CFPlus::SDLK_UP) {
		2307	$self->move_cursor_ver (-1);
		2308	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2309	$self->move_cursor_ver (+1);
		2310	} else {
		2311	return $self->SUPER::invoke_key_down ($ev)
		2312	}
		2313
		2314	1
		2315	}
		2316
		2317	#############################################################################
		2318
2012	package CFPlus::UI::Button;	2319	package CFPlus::UI::Button;
2013		2320
2014	our @ISA = CFPlus::UI::Label::;	2321	our @ISA = CFPlus::UI::Label::;
2015		2322
2016	use CFPlus::OpenGL;	2323	use CFPlus::OpenGL;
2017		2324
2018	my @tex =	2325	my @tex =
2019	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2326	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2020	qw(b1_button_active.png);	2327	qw(b1_button_inactive.png b1_button_active.png);
2021		2328
2022	sub new {	2329	sub new {
2023	my $class = shift;	2330	my $class = shift;
2024		2331
2025	$class->SUPER::new (	2332	$class->SUPER::new (
2026	padding_x => 4,	2333	padding_x => 4,
2027	padding_y => 4,	2334	padding_y => 4,
2028	fg => [1, 1, 1],	2335	fg => [1.0, 1.0, 1.0],
2029	active_fg => [0, 0, 1],	2336	active_fg => [0.8, 0.8, 0.8],
2030	can_hover => 1,	2337	can_hover => 1,
2031	align => 0,	2338	align => 0,
2032	valign => 0,	2339	valign => 0,
2033	can_events => 1,	2340	can_events => 1,
2034	@_	2341	@_
…		…
2052		2359
2053	glEnable GL_TEXTURE_2D;	2360	glEnable GL_TEXTURE_2D;
2054	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2361	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055	glColor 0, 0, 0, 1;	2362	glColor 0, 0, 0, 1;
2056		2363
		2364	my $tex = $tex[$GRAB == $self];
2057	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2365	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2058		2366
2059	glDisable GL_TEXTURE_2D;	2367	glDisable GL_TEXTURE_2D;
2060		2368
2061	$self->SUPER::_draw;	2369	$self->SUPER::_draw;
2062	}	2370	}
…		…
2158	or Carp::croak "'path' or 'tex' attributes required";	2466	or Carp::croak "'path' or 'tex' attributes required";
2159		2467
2160	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2468	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2161	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2469	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2162		2470
2163	Scalar::Util::weaken $texture_cache{$self->{path}};	2471	CFPlus::weaken $texture_cache{$self->{path}};
2164		2472
2165	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2473	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166		2474
2167	$self	2475	$self
2168	}	2476	}
…		…
2541	sub invoke_mouse_wheel {	2849	sub invoke_mouse_wheel {
2542	my ($self, $ev) = @_;	2850	my ($self, $ev) = @_;
2543		2851
2544	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2852	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545		2853
		2854	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2855
2546	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2856	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2547		2857
2548	! ! $delta	2858	! ! $delta
2549	}	2859	}
2550		2860
2551	sub update {	2861	sub update {
…		…
2661	#font => default_font	2971	#font => default_font
2662	@_,	2972	@_,
2663		2973
2664	layout => (new CFPlus::Layout),	2974	layout => (new CFPlus::Layout),
2665	par => [],	2975	par => [],
		2976	max_par => 0,
2666	height => 0,	2977	height => 0,
2667	children => [	2978	children => [
2668	(new CFPlus::UI::Empty expand => 1),	2979	(new CFPlus::UI::Empty expand => 1),
2669	(new CFPlus::UI::Slider vertical => 1),	2980	(new CFPlus::UI::Slider vertical => 1),
2670	],	2981	],
…		…
2749	sub set_offset {	3060	sub set_offset {
2750	my ($self, $offset) = @_;	3061	my ($self, $offset) = @_;
2751		3062
2752	# todo: base offset on lines or so, not on pixels	3063	# todo: base offset on lines or so, not on pixels
2753	$self->{children}[1]->set_value ($offset);	3064	$self->{children}[1]->set_value ($offset);
		3065	}
		3066
		3067	sub current_paragraph {
		3068	my ($self) = @_;
		3069
		3070	$self->{top_paragraph} - 1
		3071	}
		3072
		3073	sub scroll_to {
		3074	my ($self, $para) = @_;
		3075
		3076	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3077
		3078	$self->{scroll_to} = $para;
		3079	$self->update;
2754	}	3080	}
2755		3081
2756	sub clear {	3082	sub clear {
2757	my ($self) = @_;	3083	my ($self) = @_;
2758		3084
…		…
2780		3106
2781	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3107	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782	push @{$self->{par}}, $para;	3108	push @{$self->{par}}, $para;
2783	}	3109	}
2784		3110
		3111	if (my $max = $self->{max_par}) {
		3112	shift @{$self->{par}} while @{$self->{par}} > $max;
		3113	}
		3114
2785	$self->{need_reflow}++;	3115	$self->{need_reflow}++;
2786	$self->update;	3116	$self->update;
2787	}	3117	}
2788		3118
2789	sub scroll_to_bottom {	3119	sub scroll_to_bottom {
2790	my ($self) = @_;	3120	my ($self) = @_;
2791		3121
2792	$self->{scroll_to_bottom} = 1;	3122	$self->{scroll_to} = $#{$self->{par}};
2793	$self->update;	3123	$self->update;
2794	}	3124	}
2795		3125
		3126	sub force_uptodate {
		3127	my ($self) = @_;
		3128
		3129	if (delete $self->{need_reflow}) {
		3130	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3131
		3132	my $height = 0;
		3133
		3134	for my $para (@{$self->{par}}) {
		3135	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3136	my $layout = $self->get_layout ($para);
		3137	my ($w, $h) = $layout->size;
		3138
		3139	$para->{w} = $w + $para->{indent};
		3140	$para->{h} = $h;
		3141	$para->{wrapped} = $layout->has_wrapped;
		3142	}
		3143
		3144	$para->{y} = $height;
		3145	$height += $para->{h};
		3146	}
		3147
		3148	$self->{height} = $height;
		3149	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3150
		3151	delete $self->{texture};
		3152	}
		3153
		3154	if (my $paridx = delete $self->{scroll_to}) {
		3155	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3156	}
		3157	}
		3158
2796	sub update {	3159	sub update {
2797	my ($self) = @_;	3160	my ($self) = @_;
2798		3161
2799	$self->SUPER::update;	3162	$self->SUPER::update;
2800		3163
2801	return unless $self->{h} > 0;	3164	return unless $self->{h} > 0;
2802		3165
2803	delete $self->{texture};	3166	delete $self->{texture};
2804		3167
2805	$ROOT->on_post_alloc ($self => sub {	3168	$ROOT->on_post_alloc ($self => sub {
		3169	$self->force_uptodate;
		3170
2806	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3171	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2807
2808	if (delete $self->{need_reflow}) {
2809	my $height = 0;
2810
2811	for my $para (@{$self->{par}}) {
2812	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2813	my $layout = $self->get_layout ($para);
2814	my ($w, $h) = $layout->size;
2815
2816	$para->{w} = $w + $para->{indent};
2817	$para->{h} = $h;
2818	$para->{wrapped} = $layout->has_wrapped;
2819	}
2820
2821	$height += $para->{h};
2822	}
2823
2824	$self->{height} = $height;
2825
2826	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2827
2828	delete $self->{texture};
2829	}
2830
2831	if (delete $self->{scroll_to_bottom}) {
2832	$self->{children}[1]->set_value (1e10);
2833	}
2834		3172
2835	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {	3173	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2836	glClearColor 0, 0, 0, 0;	3174	glClearColor 0, 0, 0, 0;
2837	glClear GL_COLOR_BUFFER_BIT;	3175	glClear GL_COLOR_BUFFER_BIT;
2838		3176
		3177	package CFPlus::UI::Base;
		3178	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3179	(0, 0, $self->{w}, $self->{h});
		3180
		3181	my $top = int $self->{children}[1]{range}[0];
		3182
		3183	my $paridx = 0;
		3184	my $top_paragraph;
2839	my $top = int $self->{children}[1]{range}[0];	3185	my $top = int $self->{children}[1]{range}[0];
2840		3186
2841	my $y0 = $top;	3187	my $y0 = $top;
2842	my $y1 = $top + $H;	3188	my $y1 = $top + $H;
2843		3189
2844	my $y = 0;
2845
2846	for my $para (@{$self->{par}}) {	3190	for my $para (@{$self->{par}}) {
2847	my $h = $para->{h};	3191	my $h = $para->{h};
		3192	my $y = $para->{y};
2848		3193
2849	if ($y0 < $y + $h && $y < $y1) {	3194	if ($y0 < $y + $h && $y < $y1) {
2850
2851	my $layout = $self->get_layout ($para);	3195	my $layout = $self->get_layout ($para);
2852		3196
2853	$layout->render ($para->{indent}, $y - $y0);	3197	$layout->render ($para->{indent}, $y - $y0);
2854		3198
2855	if (my @w = @{ $para->{widget} }) {	3199	if (my @w = @{ $para->{widget} }) {
…		…
2864	$_->draw;	3208	$_->draw;
2865	}	3209	}
2866	}	3210	}
2867	}	3211	}
2868		3212
2869	$y += $h;	3213	$paridx++;
		3214	$top_paragraph ||= $paridx if $y >= $top;
2870	}	3215	}
		3216
		3217	$self->{top_paragraph} = $top_paragraph;
2871	};	3218	};
2872	});	3219	});
2873	}	3220	}
2874		3221
2875	sub reconfigure {	3222	sub reconfigure {
…		…
2977	}	3324	}
2978		3325
2979	sub set_tooltip_from {	3326	sub set_tooltip_from {
2980	my ($self, $widget) = @_;	3327	my ($self, $widget) = @_;
2981		3328
		3329	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3330	if $widget->{tooltip} =~ /^#(.*)$/;
		3331
2982	my $tooltip = $widget->{tooltip};	3332	my $tooltip = $widget->{tooltip};
2983		3333
2984	if ($ENV{CFPLUS_DEBUG} & 2) {	3334	if ($ENV{CFPLUS_DEBUG} & 2) {
2985	$tooltip .= "\n\n" . (ref $widget) . "\n"	3335	$tooltip .= "\n\n" . (ref $widget) . "\n"
2986	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3336	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
…		…
2993		3343
2994	$self->add (new CFPlus::UI::Label	3344	$self->add (new CFPlus::UI::Label
2995	markup => $tooltip,	3345	markup => $tooltip,
2996	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3346	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2997	fontsize => 0.8,	3347	fontsize => 0.8,
2998	fg => [0, 0, 0, 1],	3348	style => 1, # FLAG_INVERSE
2999	ellipsise => 0,	3349	ellipsise => 0,
3000	font => ($widget->{tooltip_font} || $::FONT_PROP),	3350	font => ($widget->{tooltip_font} || $::FONT_PROP),
3001	);	3351	);
3002	}	3352	}
3003		3353
…		…
3075		3425
3076	sub new {	3426	sub new {
3077	my $class = shift;	3427	my $class = shift;
3078		3428
3079	my $self = $class->SUPER::new (	3429	my $self = $class->SUPER::new (
		3430	size_w => 32,
		3431	size_h => 8,
3080	aspect => 1,	3432	aspect => 1,
3081	can_events => 0,	3433	can_events => 0,
3082	@_,	3434	@_,
3083	);	3435	);
3084		3436
3085	if ($self->{anim} && $self->{animspeed}) {	3437	if ($self->{anim} && $self->{animspeed}) {
3086	Scalar::Util::weaken (my $widget = $self);	3438	CFPlus::weaken (my $widget = $self);
3087		3439
		3440	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3441	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3088	$self->{timer} = Event->timer (	3442	$self->{timer} = Event->timer (
3089	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3090	hard => 1,	3443	parked => 1,
3091	interval => $self->{animspeed},
3092	cb => sub {	3444	cb => sub {
		3445	return unless $::CONN && $widget;
		3446
3093	++$widget->{frame};	3447	++$widget->{frame};
		3448	$widget->update_face;
3094	$widget->update;	3449	$widget->update;
		3450
		3451	$widget->update_timer;
3095	},	3452	},
3096	);	3453	);
		3454
		3455	$self->update_face;
		3456	$self->update_timer;
3097	}	3457	}
3098		3458
3099	$self	3459	$self
3100	}	3460	}
3101		3461
		3462	sub update_timer {
		3463	my ($self) = @_;
		3464
		3465	return unless $self->{timer};
		3466
		3467	if ($self->{visible}) {
		3468	$self->{timer}->at (
		3469	$self->{anim_start}
		3470	+ $self->{animspeed}
		3471	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3472	);
		3473	$self->{timer}->start;
		3474	} else {
		3475	$self->{timer}->stop;
		3476	}
		3477	}
		3478
		3479	sub update_face {
		3480	my ($self) = @_;
		3481
		3482	return unless $::CONN;
		3483
		3484	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3485	if ($anim && @$anim) {
		3486	delete $self->{wait_face};
		3487	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3488	$self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
		3489	}
		3490	}
		3491	}
		3492
3102	sub size_request {	3493	sub size_request {
3103	(32, 8)	3494	my ($self) = @_;
		3495
		3496	if ($::CONN) {
		3497	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3498	if (my $tex = $::CONN->{texture}[$faceid]) {
		3499	$self->{tex} = $tex;
		3500	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3501	} else {
		3502	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3503	$self->realloc;
		3504	});
		3505	}
		3506	}
		3507	}
		3508
		3509	($self->{size_w} || 8, $self->{size_h} || 8)
3104	}	3510	}
3105		3511
3106	sub update {	3512	sub update {
3107	my ($self) = @_;	3513	my ($self) = @_;
3108		3514
3109	return unless $self->{visible};	3515	return unless $self->{visible};
3110		3516
3111	$self->SUPER::update;	3517	$self->SUPER::update;
3112	}	3518	}
3113		3519
		3520	sub invoke_visibility_change {
		3521	my ($self) = @_;
		3522
		3523	$self->update_timer;
		3524
		3525	0
		3526	}
		3527
3114	sub _draw {	3528	sub _draw {
3115	my ($self) = @_;	3529	my ($self) = @_;
3116		3530
3117	return unless $::CONN;
3118
3119	$self->SUPER::_draw;	3531	$self->SUPER::_draw;
3120		3532
3121	my $face;	3533	if (my $tex = $self->{tex}) {
3122
3123	if ($self->{frame}) {
3124	my $anim = $::CONN->{anim}[$self->{anim}];
3125
3126	$face = $anim->[ $self->{frame} % @$anim ]
3127	if $anim && @$anim;
3128	}
3129
3130	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3131
3132	if ($tex) {
3133	glEnable GL_TEXTURE_2D;	3534	glEnable GL_TEXTURE_2D;
3134	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3535	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3135	glColor 0, 0, 0, 1;	3536	glColor 0, 0, 0, 1;
3136	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3537	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3137	glDisable GL_TEXTURE_2D;	3538	glDisable GL_TEXTURE_2D;
…		…
3139	}	3540	}
3140		3541
3141	sub destroy {	3542	sub destroy {
3142	my ($self) = @_;	3543	my ($self) = @_;
3143		3544
3144	$self->{timer}->cancel	3545	(delete $self->{timer})->cancel
3145	if $self->{timer};	3546	if $self->{timer};
3146		3547
3147	$self->SUPER::destroy;	3548	$self->SUPER::destroy;
3148	}	3549	}
3149		3550
…		…
3151		3552
3152	package CFPlus::UI::Buttonbar;	3553	package CFPlus::UI::Buttonbar;
3153		3554
3154	our @ISA = CFPlus::UI::HBox::;	3555	our @ISA = CFPlus::UI::HBox::;
3155		3556
3156	# TODO: should actualyl wrap buttons and other goodies.	3557	# TODO: should actually wrap buttons and other goodies.
3157		3558
3158	#############################################################################	3559	#############################################################################
3159		3560
3160	package CFPlus::UI::Menu;	3561	package CFPlus::UI::Menu;
3161		3562
3162	our @ISA = CFPlus::UI::FancyFrame::;	3563	our @ISA = CFPlus::UI::Toplevel::;
3163		3564
3164	use CFPlus::OpenGL;	3565	use CFPlus::OpenGL;
3165		3566
3166	sub new {	3567	sub new {
3167	my $class = shift;	3568	my $class = shift;
…		…
3345	}	3746	}
3346		3747
3347	sub add {	3748	sub add {
3348	my ($self, $title, $widget, $tooltip) = @_;	3749	my ($self, $title, $widget, $tooltip) = @_;
3349		3750
3350	Scalar::Util::weaken $self;	3751	CFPlus::weaken $self;
3351		3752
3352	$self->{buttonbar}->add (new CFPlus::UI::Button	3753	$self->{buttonbar}->add (new CFPlus::UI::Button
3353	markup => $title,	3754	markup => $title,
3354	tooltip => $tooltip,	3755	tooltip => $tooltip,
3355	on_activate => sub { $self->set_current_page ($widget) },	3756	on_activate => sub { $self->set_current_page ($widget) },
…		…
3439	my $self = $class->SUPER::new (	3840	my $self = $class->SUPER::new (
3440	fontsize => 0.8,	3841	fontsize => 0.8,
3441	@_,	3842	@_,
3442	);	3843	);
3443		3844
3444	Scalar::Util::weaken (my $this = $self);	3845	CFPlus::weaken (my $this = $self);
3445		3846
3446	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3847	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3447		3848
3448	$self	3849	$self
3449	}	3850	}
…		…
3572	$self->SUPER::destroy;	3973	$self->SUPER::destroy;
3573	}	3974	}
3574		3975
3575	#############################################################################	3976	#############################################################################
3576		3977
3577	package CFPlus::UI::Inventory;
3578
3579	our @ISA = CFPlus::UI::Table::;
3580
3581	sub new {
3582	my $class = shift;
3583
3584	my $self = $class->SUPER::new (
3585	col_expand => [0, 1, 0],
3586	items => [],
3587	@_,
3588	);
3589
3590	$self->set_sort_order (undef);
3591
3592	$self
3593	}
3594
3595	sub update_items {
3596	my ($self) = @_;
3597
3598	$self->clear;
3599
3600	my @item = $self->{sort}->(@{ $self->{items} });
3601
3602	my @adds;
3603	my $row = 0;
3604	for my $item ($self->{sort}->(@{ $self->{items} })) {
3605	CFPlus::Item::update_widgets $item;
3606
3607	push @adds, 0, $row, $item->{face_widget};
3608	push @adds, 1, $row, $item->{desc_widget};
3609	push @adds, 2, $row, $item->{weight_widget};
3610
3611	$row++;
3612	}
3613
3614	$self->add (@adds);
3615	}
3616
3617	sub set_sort_order {
3618	my ($self, $order) = @_;
3619
3620	$self->{sort} = $order ||= sub {
3621	sort {
3622	$a->{type} <=> $b->{type}
3623	or $a->{name} cmp $b->{name}
3624	} @_
3625	};
3626
3627	$self->update_items;
3628	}
3629
3630	sub set_items {
3631	my ($self, $items) = @_;
3632
3633	$self->{items} = [$items ? values %$items : ()];
3634	$self->update_items;
3635	}
3636
3637	#############################################################################
3638
3639	package CFPlus::UI::SpellList;
3640
3641	our @ISA = CFPlus::UI::Table::;
3642
3643	sub new {
3644	my $class = shift;
3645
3646	my $self = $class->SUPER::new (
3647	binding => [],
3648	commands => [],
3649	@_,
3650	)
3651	}
3652
3653	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3654
3655	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3656	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3657	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3659	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3660	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3661	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3663	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3665
3666	sub rebuild_spell_list {
3667	my ($self) = @_;
3668
3669	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3670	$self->clear;
3671
3672	return unless $::CONN;
3673
3674	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3675	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3676	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3677	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3678	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3679
3680	my $row = 0;
3681
3682	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3683	my $spell = $self->{spell}{$_};
3684
3685	$row++;
3686
3687	my $spell_cb = sub {
3688	my ($widget, $ev) = @_;
3689
3690	if ($ev->{button} == 1) {
3691	$::CONN->user_send ("cast $spell->{name}");
3692	} elsif ($ev->{button} == 2) {
3693	$::CONN->user_send ("invoke $spell->{name}");
3694	} elsif ($ev->{button} == 3) {
3695	(new CFPlus::UI::Menu
3696	items => [
3697	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3698	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3699	],
3700	)->popup ($ev);
3701	} else {
3702	return 0;
3703	}
3704
3705	1
3706	};
3707
3708	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3709
3710	#TODO: add path info to tooltip
3711	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3712
3713	$self->add (0, $row, new CFPlus::UI::Face
3714	face => $spell->{face},
3715	can_hover => 1,
3716	can_events => 1,
3717	tooltip => $tooltip,
3718	on_button_down => $spell_cb,
3719	);
3720
3721	$self->add (1, $row, new CFPlus::UI::Label
3722	expand => 1,
3723	text => $spell->{name},
3724	can_hover => 1,
3725	can_events => 1,
3726	tooltip => $tooltip,
3727	on_button_down => $spell_cb,
3728	);
3729
3730	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3731	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3732	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3733	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3734	}
3735	});
3736	}
3737
3738	sub add_spell {
3739	my ($self, $spell) = @_;
3740
3741	$self->{spell}->{$spell->{name}} = $spell;
3742	$self->rebuild_spell_list;
3743	}
3744
3745	sub remove_spell {
3746	my ($self, $spell) = @_;
3747
3748	delete $self->{spell}->{$spell->{name}};
3749	$self->rebuild_spell_list;
3750	}
3751
3752	sub clear_spells {
3753	my ($self) = @_;
3754
3755	$self->{spell} = {};
3756	$self->rebuild_spell_list;
3757	}
3758
3759	#############################################################################
3760
3761	package CFPlus::UI::Root;	3978	package CFPlus::UI::Root;
3762		3979
3763	our @ISA = CFPlus::UI::Container::;	3980	our @ISA = CFPlus::UI::Container::;
3764		3981
3765	use List::Util qw(min max);	3982	use List::Util qw(min max);
…		…
3772	my $self = $class->SUPER::new (	3989	my $self = $class->SUPER::new (
3773	visible => 1,	3990	visible => 1,
3774	@_,	3991	@_,
3775	);	3992	);
3776		3993
3777	Scalar::Util::weaken ($self->{root} = $self);	3994	CFPlus::weaken ($self->{root} = $self);
3778		3995
3779	$self	3996	$self
3780	}	3997	}
3781		3998
3782	sub size_request {	3999	sub size_request {
…		…
3877	while ($self->{refresh_hook}) {	4094	while ($self->{refresh_hook}) {
3878	$_->()	4095	$_->()
3879	for values %{delete $self->{refresh_hook}};	4096	for values %{delete $self->{refresh_hook}};
3880	}	4097	}
3881		4098
3882	if ($self->{realloc}) {	4099	while ($self->{realloc}) {
3883	my %queue;	4100	my %queue;
3884	my @queue;	4101	my @queue;
3885	my $widget;	4102	my $widget;
3886		4103
3887	outer:	4104	outer:
…		…
3934	}	4151	}
3935	}	4152	}
3936		4153
3937	delete $self->{realloc}{$widget+0};	4154	delete $self->{realloc}{$widget+0};
3938	}	4155	}
3939	}
3940		4156
3941	while (my $size_alloc = delete $self->{size_alloc}) {	4157	while (my $size_alloc = delete $self->{size_alloc}) {
3942	my @queue = sort { $b->{visible} <=> $a->{visible} }	4158	my @queue = sort { $a->{visible} <=> $b->{visible} }
3943	values %$size_alloc;	4159	values %$size_alloc;
3944		4160
3945	while () {	4161	while () {
3946	my $widget = pop @queue || last;	4162	my $widget = pop @queue || last;
3947		4163
3948	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4164	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3949		4165
3950	$w = 0 if $w < 0;
3951	$h = 0 if $h < 0;
3952
3953	$w = max $widget->{min_w}, $w;	4166	$w = max $widget->{min_w}, $w;
3954	$h = max $widget->{min_h}, $h;	4167	$h = max $widget->{min_h}, $h;
3955		4168
3956	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4169	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3957	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4170	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3958		4171
3959	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4172	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4173	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3961		4174
3962	$w = int $w + 0.5;	4175	$w = int $w + 0.5;
3963	$h = int $h + 0.5;	4176	$h = int $h + 0.5;
3964		4177
3965	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4178	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3966	$widget->{old_w} = $widget->{w};	4179	$widget->{old_w} = $widget->{w};
3967	$widget->{old_h} = $widget->{h};	4180	$widget->{old_h} = $widget->{h};
3968		4181
3969	$widget->{w} = $w;	4182	$widget->{w} = $w;
3970	$widget->{h} = $h;	4183	$widget->{h} = $h;
3971		4184
3972	$widget->emit (size_allocate => $w, $h);	4185	$widget->emit (size_allocate => $w, $h);
		4186	}
3973	}	4187	}
3974	}	4188	}
3975	}	4189	}
3976		4190
3977	while ($self->{post_alloc_hook}) {	4191	while ($self->{post_alloc_hook}) {
3978	$_->()	4192	$_->()
3979	for values %{delete $self->{post_alloc_hook}};	4193	for values %{delete $self->{post_alloc_hook}};
3980	}	4194	}
3981
3982		4195
3983	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4196	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3984	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4197	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3985	glClear GL_COLOR_BUFFER_BIT;	4198	glClear GL_COLOR_BUFFER_BIT;
3986		4199
…		…
3991	glLoadIdentity;	4204	glLoadIdentity;
3992		4205
3993	{	4206	{
3994	package CFPlus::UI::Base;	4207	package CFPlus::UI::Base;
3995		4208
3996	($draw_x, $draw_y, $draw_w, $draw_h) =	4209	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3997	(0, 0, $self->{w}, $self->{h});	4210	(0, 0, $self->{w}, $self->{h});
3998	}
3999		4211
4000	$self->_draw;	4212	$self->_draw;
		4213	}
4001	}	4214	}
4002		4215
4003	#############################################################################	4216	#############################################################################
4004		4217
4005	package CFPlus::UI;	4218	package CFPlus::UI;

Diff Legend

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