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.413 by root, Mon Jul 23 15:30:45 2007 UTC

1	package CFPlus::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFPlus;	9	use CFPlus;
11	use CFPlus::Pod;	10	use CFPlus::Pod;
…		…
23	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24	if (!$GRAB) {	23	if (!$GRAB) {
25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
27	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28	$TOOLTIP->hide;	28	$TOOLTIP->hide;
29		29
30	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31		32
32	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
33		34
34	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
35		36
…		…
43	}	44	}
44	}	45	}
45	}	46	}
46		47
47	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
49	});	51	});
50		52
51	sub get_layout {	53	sub get_layout {
52	my $layout;	54	my $layout;
…		…
111	}	113	}
112		114
113	if ($GRAB) {	115	if ($GRAB) {
114	if ($ev->{button} == 4 || $ev->{button} == 5) {	116	if ($ev->{button} == 4 || $ev->{button} == 5) {
115	# mousewheel	117	# mousewheel
116	$ev->{dx} = 0;
117	$ev->{dy} = $ev->{button} * 2 - 9;	118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		120
		121	$ev->{dx} = $shift ? $delta : 0;
		122	$ev->{dy} = $shift ? 0 : $delta;
		123
118	$GRAB->emit (mouse_wheel => $ev);	124	$GRAB->emit (mouse_wheel => $ev);
119	} else {	125	} else {
120	$GRAB->emit (button_down => $ev)	126	$GRAB->emit (button_down => $ev)
121	}	127	}
122	}	128	}
…		…
235	h => undef,	241	h => undef,
236	can_events => 1,	242	can_events => 1,
237	@_	243	@_
238	}, $class;	244	}, $class;
239		245
240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241		247
242	for (keys %$self) {	248	for (keys %$self) {
243	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
244	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
245	}	251	}
…		…
262		268
263	sub destroy {	269	sub destroy {
264	my ($self) = @_;	270	my ($self) = @_;
265		271
266	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
267	%$self = ();	274	%$self = ();
		275	}
		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
268	}	279	}
269		280
270	sub show {	281	sub show {
271	my ($self) = @_;	282	my ($self) = @_;
272		283
…		…
313	sub set_visibility {	324	sub set_visibility {
314	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
315		326
316	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
317		328
318	$visible ? $self->hide	329	$visible ? $self->show
319	: $self->show;	330	: $self->hide;
320	}	331	}
321		332
322	sub toggle_visibility {	333	sub toggle_visibility {
323	my ($self) = @_;	334	my ($self) = @_;
324		335
…		…
502		513
503	defined wantarray and CFPlus::guard {	514	defined wantarray and CFPlus::guard {
504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505	@{ $self->{signal_cb}{$signal} };	516	@{ $self->{signal_cb}{$signal} };
506	}	517	}
		518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
507	}	524	}
508		525
509	my %has_coords = (	526	my %has_coords = (
510	button_down => 1,	527	button_down => 1,
511	button_up => 1,	528	button_up => 1,
…		…
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	}
976	}	959	}
977		960
978	# hmm, this does not work for topleft of $self... but we should not ask for that	961	# hmm, this does not work for topleft of $self... but we should not ask for that
979	sub coord2local {	962	sub coord2local {
980	my ($self, $x, $y) = @_;	963	my ($self, $x, $y) = @_;
…		…
995	my ($self, $x, $y) = @_;	978	my ($self, $x, $y) = @_;
996		979
997	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	980	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
998	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	981	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
999	) {	982	) {
1000	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	983	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1001	} else {	984	} else {
1002	$self->CFPlus::UI::Base::find_widget ($x, $y)	985	$self->CFPlus::UI::Base::find_widget ($x, $y)
1003	}	986	}
1004	}	987	}
1005		988
…		…
1016		999
1017	#############################################################################	1000	#############################################################################
1018		1001
1019	package CFPlus::UI::ScrolledWindow;	1002	package CFPlus::UI::ScrolledWindow;
1020		1003
1021	our @ISA = CFPlus::UI::HBox::;	1004	our @ISA = CFPlus::UI::Table::;
1022		1005
1023	sub new {	1006	sub new {
1024	my ($class, %arg) = @_;	1007	my ($class, %arg) = @_;
1025		1008
1026	my $child = delete $arg{child};	1009	my $child = delete $arg{child};
1027		1010
1028	my $self;	1011	my $self;
1029		1012
1030	my $slider = new CFPlus::UI::Slider	1013	my $hslider = new CFPlus::UI::Slider
		1014	col => 0,
		1015	row => 1,
		1016	vertical => 0,
		1017	range => [0, 0, 1, 0.01], # HACK fix
		1018	on_changed => sub {
		1019	$self->{hpos} = $_[1];
		1020	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1021	},
		1022	;
		1023
		1024	my $vslider = new CFPlus::UI::Slider
		1025	col => 1,
		1026	row => 0,
1031	vertical => 1,	1027	vertical => 1,
1032	range => [0, 0, 1, 0.01], # HACK fix	1028	range => [0, 0, 1, 0.01], # HACK fix
1033	on_changed => sub {	1029	on_changed => sub {
1034	$self->{vp}->set_offset (0, $_[1]);	1030	$self->{vpos} = $_[1];
		1031	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1035	},	1032	},
1036	;	1033	;
1037		1034
1038	$self = $class->SUPER::new (	1035	$self = $class->SUPER::new (
1039	vp => (new CFPlus::UI::ViewPort expand => 1),	1036	scroll_x => 0,
		1037	scroll_y => 1,
1040	can_events => 1,	1038	can_events => 1,
1041	slider => $slider,	1039	hslider => $hslider,
		1040	vslider => $vslider,
		1041	col_expand => [1, 0],
		1042	row_expand => [1, 0],
1042	%arg,	1043	%arg,
1043	);	1044	);
1044		1045
		1046	$self->{vp} = new CFPlus::UI::ViewPort
		1047	col => 0,
		1048	row => 0,
		1049	expand => 1,
		1050	scroll_x => $self->{scroll_x},
		1051	scroll_y => $self->{scroll_y},
		1052	on_changed => sub {
		1053	my ($vp, $x, $y) = @_;
		1054
		1055	$vp->{parent}{hslider}->set_value ($x);
		1056	$vp->{parent}{vslider}->set_value ($y);
		1057
		1058	0
		1059	},
		1060	on_size_allocate => sub {
		1061	my ($vp, $w, $h) = @_;
		1062	$vp->{parent}->update_slider;
		1063	0
		1064	},
		1065	;
		1066
1045	$self->SUPER::add ($self->{vp}, $self->{slider});	1067	$self->SUPER::add ($self->{vp});
		1068
1046	$self->add ($child) if $child;	1069	$self->add ($child) if $child;
1047		1070
1048	$self	1071	$self
1049	}	1072	}
1050
1051	#TODO# update range on size_allocate depending on child
1052		1073
1053	sub add {	1074	sub add {
1054	my ($self, $widget) = @_;	1075	my ($self, $widget) = @_;
1055		1076
1056	$self->{vp}->add ($self->{child} = $widget);	1077	$self->{vp}->add ($self->{child} = $widget);
1057	}	1078	}
1058		1079
		1080	sub update_slider {
		1081	my ($self) = @_;
		1082
		1083	my $child = ($self->{vp} or return)->child;
		1084
		1085	if ($self->{scroll_x}) {
		1086	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1087	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1088
		1089	my $visible = $w1 > $w2;
		1090	if ($visible != $self->{hslider_visible}) {
		1091	$self->{hslider_visible} = $visible;
		1092	$visible ? $self->SUPER::add ($self->{hslider})
		1093	: $self->SUPER::remove ($self->{hslider});
		1094	}
		1095	}
		1096
		1097	if ($self->{scroll_y}) {
		1098	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1099	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1100
		1101	my $visible = $h1 > $h2;
		1102	if ($visible != $self->{vslider_visible}) {
		1103	$self->{vslider_visible} = $visible;
		1104	$visible ? $self->SUPER::add ($self->{vslider})
		1105	: $self->SUPER::remove ($self->{vslider});
		1106	}
		1107	}
		1108	}
		1109
		1110	sub start_dragging {
		1111	my ($self, $ev) = @_;
		1112
		1113	$self->grab_focus;
		1114
		1115	my $ox = $self->{vp}{view_x};
		1116	my $oy = $self->{vp}{view_y};
		1117
		1118	$self->{motion} = sub {
		1119	my ($ev, $x, $y) = @_;
		1120
		1121	$ox -= $ev->{xrel};
		1122	$oy -= $ev->{yrel};
		1123
		1124	$self->{vp}->set_offset ($ox, $oy);
		1125	};
		1126	}
		1127
1059	sub invoke_mouse_wheel {	1128	sub invoke_mouse_wheel {
1060	my ($self, $ev) = @_;	1129	my ($self, $ev) = @_;
1061		1130
1062	return 0 unless $ev->{dy}; # only vertical movements
1063
1064	$self->{slider}->emit (mouse_wheel => $ev);	1131	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1132	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1065		1133
1066	1	1134	1
1067	}	1135	}
1068		1136
1069	sub update_slider {	1137	sub invoke_button_down {
1070	my ($self) = @_;	1138	my ($self, $ev, $x, $y) = @_;
1071		1139
1072	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1140	if ($ev->{button} == 2) {
1073	}	1141	$self->start_dragging ($ev);
		1142	return 1;
		1143	}
1074		1144
1075	sub update {	1145	0
1076	my ($self) = @_;	1146	}
1077		1147
1078	$self->SUPER::update;	1148	sub invoke_button_up {
		1149	my ($self, $ev, $x, $y) = @_;
1079		1150
1080	$self->update_slider;	1151	if (delete $self->{motion}) {
		1152	return 1;
		1153	}
		1154
		1155	0
		1156	}
		1157
		1158	sub invoke_mouse_motion {
		1159	my ($self, $ev, $x, $y) = @_;
		1160
		1161	if ($self->{motion}) {
		1162	$self->{motion}->($ev, $x, $y);
		1163	return 1;
		1164	}
		1165
		1166	0
1081	}	1167	}
1082		1168
1083	sub invoke_size_allocate {	1169	sub invoke_size_allocate {
1084	my ($self, $w, $h) = @_;	1170	my ($self, $w, $h) = @_;
1085		1171
1086	$self->update_slider;	1172	$self->update_slider;
1087
1088	$self->SUPER::invoke_size_allocate ($w, $h)	1173	$self->SUPER::invoke_size_allocate ($w, $h)
1089	}	1174	}
1090		1175
1091	#############################################################################	1176	#############################################################################
1092		1177
…		…
1134		1219
1135	our @ISA = CFPlus::UI::Bin::;	1220	our @ISA = CFPlus::UI::Bin::;
1136		1221
1137	use CFPlus::OpenGL;	1222	use CFPlus::OpenGL;
1138		1223
		1224	sub new {
		1225	my ($class, %arg) = @_;
		1226
		1227	if ((exists $arg{label}) && !ref $arg{label}) {
		1228	$arg{label} = new CFPlus::UI::Label
		1229	align => 1,
		1230	valign => 0,
		1231	text => $arg{label},
		1232	fontsize => ($arg{border} || 0.8) * 0.75;
		1233	}
		1234
		1235	my $self = $class->SUPER::new (
		1236	# label => "",
		1237	fg => [0.6, 0.3, 0.1],
		1238	border => 0.8,
		1239	style => 'single',
		1240	%arg,
		1241	);
		1242
		1243	$self
		1244	}
		1245
		1246	sub add {
		1247	my ($self, @widgets) = @_;
		1248
		1249	$self->SUPER::add (@widgets);
		1250	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1251	}
		1252
		1253	sub border {
		1254	int $_[0]{border} * $::FONTSIZE
		1255	}
		1256
		1257	sub size_request {
		1258	my ($self) = @_;
		1259
		1260	($self->{label_w}, undef) = $self->{label}->size_request
		1261	if $self->{label};
		1262
		1263	my ($w, $h) = $self->SUPER::size_request;
		1264
		1265	(
		1266	$w + $self->border * 2,
		1267	$h + $self->border * 2,
		1268	)
		1269	}
		1270
		1271	sub invoke_size_allocate {
		1272	my ($self, $w, $h) = @_;
		1273
		1274	my $border = $self->border;
		1275
		1276	$w -= List::Util::max 0, $border * 2;
		1277	$h -= List::Util::max 0, $border * 2;
		1278
		1279	if (my $label = $self->{label}) {
		1280	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1281	$label->{h} = List::Util::min $h, $border;
		1282	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1283	}
		1284
		1285	$self->child->configure ($border, $border, $w, $h);
		1286
		1287	1
		1288	}
		1289
		1290	sub _draw {
		1291	my ($self) = @_;
		1292
		1293	my $child = $self->{children}[0];
		1294
		1295	my $border = $self->border;
		1296	my ($w, $h) = ($self->{w}, $self->{h});
		1297
		1298	$child->draw;
		1299
		1300	glColor @{$self->{fg}};
		1301	glBegin GL_LINE_STRIP;
		1302	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1303	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1304	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1305	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1306	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1307	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1308	glEnd;
		1309
		1310	if ($self->{label}) {
		1311	glTranslate $border * 2, 0;
		1312	$self->{label}->_draw;
		1313	}
		1314	}
		1315
		1316	#############################################################################
		1317
		1318	package CFPlus::UI::Toplevel;
		1319
		1320	our @ISA = CFPlus::UI::Bin::;
		1321
		1322	use CFPlus::OpenGL;
		1323
1139	my $bg =	1324	my $bg =
1140	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",	1325	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1141	mipmap => 1, wrap => 1;	1326	mipmap => 1, wrap => 1;
1142		1327
1143	my @border =	1328	my @border =
1144	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1329	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);	1330	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1331
		1332	my @icon =
		1333	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1334	qw(x1_move.png x1_resize.png);
1146		1335
1147	sub new {	1336	sub new {
1148	my ($class, %arg) = @_;	1337	my ($class, %arg) = @_;
1149		1338
1150	my $self = $class->SUPER::new (	1339	my $self = $class->SUPER::new (
…		…
1319	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1508	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1320		1509
1321	my $border = $self->border;	1510	my $border = $self->border;
1322		1511
1323	glColor @{ $self->{border_bg} };	1512	glColor @{ $self->{border_bg} };
1324	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1513	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1325	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1514	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1326	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1515	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1327	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1516	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1517
		1518	# move
		1519	my $w2 = ($w - $border) * .5;
		1520	my $h2 = ($h - $border) * .5;
		1521	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1522	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1523	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1524
		1525	# resize
		1526	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1527	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1528	unless $self->{has_close_button};
		1529	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1530	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1328		1531
1329	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1532	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1330	glColor @{ $self->{bg} };	1533	glColor @{ $self->{bg} };
1331		1534
1332	# TODO: repeat texture not scale	1535	# TODO: repeat texture not scale
…		…
1353		1556
1354	#############################################################################	1557	#############################################################################
1355		1558
1356	package CFPlus::UI::Table;	1559	package CFPlus::UI::Table;
1357		1560
1358	our @ISA = CFPlus::UI::Base::;	1561	our @ISA = CFPlus::UI::Container::;
1359		1562
1360	use List::Util qw(max sum);	1563	use List::Util qw(max sum);
1361		1564
1362	use CFPlus::OpenGL;	1565	use CFPlus::OpenGL;
1363		1566
1364	sub new {	1567	sub new {
1365	my $class = shift;	1568	my $class = shift;
1366		1569
1367	$class->SUPER::new (	1570	$class->SUPER::new (
1368	col_expand => [],	1571	col_expand => [],
		1572	row_expand => [],
1369	@_,	1573	@_,
1370	)	1574	)
1371	}	1575	}
1372		1576
1373	sub children {
1374	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1375	}
1376
1377	sub add {	1577	sub add {
		1578	my ($self, @widgets) = @_;
		1579
		1580	for my $child (@widgets) {
		1581	$child->{rowspan} ||= 1;
		1582	$child->{colspan} ||= 1;
		1583	}
		1584
		1585	$self->SUPER::add (@widgets);
		1586	}
		1587
		1588	sub add_at {
1378	my ($self) = shift;	1589	my $self = shift;
		1590
		1591	my @widgets;
1379		1592
1380	while (@_) {	1593	while (@_) {
1381	my ($x, $y, $child) = splice @_, 0, 3, ();	1594	my ($col, $row, $child) = splice @_, 0, 3, ();
1382	$child->set_parent ($self);
1383	$self->{children}[$y][$x] = $child;
1384	}
1385		1595
1386	$self->{force_realloc} = 1;	1596	$child->{row} = $row;
1387	$self->{force_size_alloc} = 1;	1597	$child->{col} = $col;
1388	$self->realloc;
1389	}
1390		1598
1391	sub remove {	1599	push @widgets, $child;
		1600	}
		1601
		1602	$self->add (@widgets);
		1603	}
		1604
		1605	sub get_wh {
1392	my ($self, $child) = @_;	1606	my ($self) = @_;
1393		1607
1394	# TODO: not yet implemented	1608	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		1609
1401	my @children = $self->children;	1610	my @children = $self->children;
1402	delete $self->{children};	1611
		1612	# first pass, columns
		1613	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1614	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1615
		1616	my $sw = sum @w[$c .. $c + $cs - 1];
		1617
		1618	if ($w > $sw) {
		1619	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1620	}
1403		1621	}
1404	for (@children) {
1405	delete $_->{parent};
1406	$_->hide;
1407	}
1408		1622
1409	$self->realloc;	1623	# second pass, rows
1410	}	1624	for my $widget (sort { $a->{rowspan} <=> $b->{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)};	1625	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1425		1626
1426	$w[$x] = max $w[$x], $w;	1627	my $sh = sum @h[$r .. $r + $rs - 1];
1427	$h[$y] = max $h[$y], $h;	1628
		1629	if ($h > $sh) {
		1630	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1428	}	1631	}
1429	}	1632	}
1430		1633
1431	(\@w, \@h)	1634	(\@w, \@h)
1432	}	1635	}
…		…
1448	my ($ws, $hs) = $self->get_wh;	1651	my ($ws, $hs) = $self->get_wh;
1449		1652
1450	my $req_w = (sum @$ws) || 1;	1653	my $req_w = (sum @$ws) || 1;
1451	my $req_h = (sum @$hs) || 1;	1654	my $req_h = (sum @$hs) || 1;
1452		1655
1453	# TODO: nicer code && do row_expand	1656	# now linearly scale the rows/columns to the allocated size
1454	my @col_expand = @{$self->{col_expand}};	1657	my @col_expand = @{$self->{col_expand}};
1455	@col_expand = (1) x @$ws unless @col_expand;	1658	@col_expand = (1) x @$ws unless @col_expand;
1456	my $col_expand = (sum @col_expand) || 1;	1659	my $col_expand = (sum @col_expand) || 1;
1457		1660
1458	# linearly scale sizes
1459	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1661	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1460	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1461		1662
1462	CFPlus::UI::harmonize $ws;	1663	CFPlus::UI::harmonize $ws;
		1664
		1665	my @row_expand = @{$self->{row_expand}};
		1666	@row_expand = (1) x @$ws unless @row_expand;
		1667	my $row_expand = (sum @row_expand) || 1;
		1668
		1669	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1670
1463	CFPlus::UI::harmonize $hs;	1671	CFPlus::UI::harmonize $hs;
1464		1672
1465	my $y;	1673	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1674	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1466		1675
1467	for my $r (0 .. $#{$self->{children}}) {	1676	for my $widget ($self->children) {
1468	my $row = $self->{children}[$r]	1677	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1469	or next;
1470		1678
1471	my $x = 0;	1679	$widget->configure (
1472	my $row_h = $hs->[$r];	1680	$x[$c], $y[$r],
		1681	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1473		1682	);
1474	for my $c (0 .. $#$row) {	1683	}
1475	my $col_w = $ws->[$c];
1476		1684
1477	if (my $widget = $row->[$c]) {	1685	1
1478	$widget->configure ($x, $y, $col_w, $row_h);	1686	}
1479	}
1480		1687
1481	$x += $col_w;	1688	#############################################################################
		1689
		1690	package CFPlus::UI::Fixed;
		1691
		1692	use List::Util qw(min max);
		1693
		1694	our @ISA = CFPlus::UI::Container::;
		1695
		1696	sub _scale($$$) {
		1697	my ($rel, $val, $max) = @_;
		1698
		1699	$rel ? $val * $max : $val
		1700	}
		1701
		1702	sub size_request {
		1703	my ($self) = @_;
		1704
		1705	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1706
		1707	# determine overall size by querying abs widgets
		1708	for my $child ($self->visible_children) {
		1709	unless ($child->{c_rel}) {
		1710	my $x = $child->{c_x};
		1711	my $y = $child->{c_y};
		1712
		1713	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1714	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1482	}	1715	}
		1716	}
1483		1717
1484	$y += $row_h;	1718	my $W = $x2 - $x1;
		1719	my $H = $y2 - $y1;
		1720
		1721	# now layout remaining widgets
		1722	for my $child ($self->visible_children) {
		1723	if ($child->{c_rel}) {
		1724	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1725	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1726
		1727	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1728	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1729	}
		1730	}
		1731
		1732	my $W = $x2 - $x1;
		1733	my $H = $y2 - $y1;
		1734
		1735	($W, $H)
		1736	}
		1737
		1738	sub invoke_size_allocate {
		1739	my ($self, $W, $H) = @_;
		1740
		1741	for my $child ($self->visible_children) {
		1742	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1743	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1744
		1745	$x += $child->{c_halign} * $child->{req_w};
		1746	$y += $child->{c_valign} * $child->{req_h};
		1747
		1748	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1485	}	1749	}
1486		1750
1487	1	1751	1
1488	}	1752	}
1489		1753
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	#############################################################################	1754	#############################################################################
1515		1755
1516	package CFPlus::UI::Box;	1756	package CFPlus::UI::Box;
1517		1757
1518	our @ISA = CFPlus::UI::Container::;	1758	our @ISA = CFPlus::UI::Container::;
1519		1759
1520	sub size_request {	1760	sub size_request {
1521	my ($self) = @_;	1761	my ($self) = @_;
		1762
		1763	my @children = $self->visible_children;
1522		1764
1523	$self->{vertical}	1765	$self->{vertical}
1524	? (	1766	? (
1525	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1767	(List::Util::max map $_->{req_w}, @children),
1526	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1768	(List::Util::sum map $_->{req_h}, @children),
1527	)	1769	)
1528	: (	1770	: (
1529	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1771	(List::Util::sum map $_->{req_w}, @children),
1530	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1772	(List::Util::max map $_->{req_h}, @children),
1531	)	1773	)
1532	}	1774	}
1533		1775
1534	sub invoke_size_allocate {	1776	sub invoke_size_allocate {
1535	my ($self, $w, $h) = @_;	1777	my ($self, $w, $h) = @_;
…		…
1618	#active_bg => none	1860	#active_bg => none
1619	#font => default_font	1861	#font => default_font
1620	#text => initial text	1862	#text => initial text
1621	#markup => initial narkup	1863	#markup => initial narkup
1622	#max_w => maximum pixel width	1864	#max_w => maximum pixel width
		1865	#style => 0, # render flags
1623	ellipsise => 3, # end	1866	ellipsise => 3, # end
1624	layout => (new CFPlus::Layout),	1867	layout => (new CFPlus::Layout),
1625	fontsize => 1,	1868	fontsize => 1,
1626	align => -1,	1869	align => -1,
1627	valign => -1,	1870	valign => -1,
…		…
1775	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2018	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1776	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2019	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1777	: ($self->{h} - $size->[1]) * 0.5);	2020	: ($self->{h} - $size->[1]) * 0.5);
1778	};	2021	};
1779		2022
1780	my $w = List::Util::min $self->{w} + 4, $size->[0];	2023	# unless ($self->{list}) {
1781	my $h = List::Util::min $self->{h} + 2, $size->[1];	2024	# $self->{list} = CFPlus::OpenGL::glGenList;
		2025	# CFPlus::OpenGL::glNewList $self->{list};
		2026	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2027	# CFPlus::OpenGL::glEndList;
		2028	# }
		2029	#
		2030	# CFPlus::OpenGL::glCallList $self->{list};
1782		2031
1783	$self->{layout}->render ($self->{ox}, $self->{oy});	2032	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1784	}	2033	}
		2034
		2035	#sub destroy {
		2036	# my ($self) = @_;
		2037	#
		2038	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2039	#
		2040	# $self->SUPER::destroy;
		2041	#}
1785		2042
1786	#############################################################################	2043	#############################################################################
1787		2044
1788	package CFPlus::UI::EntryBase;	2045	package CFPlus::UI::EntryBase;
1789		2046
…		…
1801	active_fg => [0, 0, 0],	2058	active_fg => [0, 0, 0],
1802	can_hover => 1,	2059	can_hover => 1,
1803	can_focus => 1,	2060	can_focus => 1,
1804	valign => 0,	2061	valign => 0,
1805	can_events => 1,	2062	can_events => 1,
		2063	ellipsise => 0,
1806	#text => ...	2064	#text => ...
1807	#hidden => "*",	2065	#hidden => "*",
1808	@_	2066	@_
1809	)	2067	)
1810	}	2068	}
…		…
1854	my $mod = $ev->{mod};	2112	my $mod = $ev->{mod};
1855	my $sym = $ev->{sym};	2113	my $sym = $ev->{sym};
1856	my $uni = $ev->{unicode};	2114	my $uni = $ev->{unicode};
1857		2115
1858	my $text = $self->get_text;	2116	my $text = $self->get_text;
		2117
		2118	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1859		2119
1860	if ($uni == 8) {	2120	if ($uni == 8) {
1861	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2121	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1862	} elsif ($uni == 127) {	2122	} elsif ($uni == 127) {
1863	substr $text, $self->{cursor}, 1, "";	2123	substr $text, $self->{cursor}, 1, "";
1864	} elsif ($sym == CFPlus::SDLK_LEFT) {	2124	} elsif ($sym == CFPlus::SDLK_LEFT) {
1865	--$self->{cursor} if $self->{cursor};	2125	--$self->{cursor} if $self->{cursor};
1866	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2126	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1867	++$self->{cursor} if $self->{cursor} < length $self->{text};	2127	++$self->{cursor} if $self->{cursor} < length $self->{text};
1868	} elsif ($sym == CFPlus::SDLK_HOME) {	2128	} elsif ($sym == CFPlus::SDLK_HOME) {
		2129	# what a hack
		2130	$self->{cursor} =
		2131	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2132	? length $1
		2133	: 0;
		2134	} elsif ($sym == CFPlus::SDLK_END) {
		2135	# uh, again
		2136	$self->{cursor} =
		2137	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2138	? $self->{cursor} + length $1
		2139	: length $self->{text};
		2140	} elsif ($uni == 21) { # ctrl-u
		2141	$text = "";
1869	$self->{cursor} = 0;	2142	$self->{cursor} = 0;
1870	} elsif ($sym == CFPlus::SDLK_END) {
1871	$self->{cursor} = length $text;
1872	} elsif ($uni == 27) {	2143	} elsif ($uni == 27) {
1873	$self->emit ('escape');	2144	$self->emit ('escape');
1874	} elsif ($uni) {	2145	} elsif ($uni == 0x0d) {
		2146	substr $text, $self->{cursor}++, 0, "\012";
		2147	} elsif ($uni >= 0x20) {
1875	substr $text, $self->{cursor}++, 0, chr $uni;	2148	substr $text, $self->{cursor}++, 0, chr $uni;
1876	} else {	2149	} else {
1877	return 0;	2150	return 0;
1878	}	2151	}
1879		2152
1880	$self->_set_text ($text);	2153	$self->_set_text ($text);
1881		2154
1882	$self->realloc;	2155	$self->realloc;
		2156	$self->update;
1883		2157
1884	1	2158	1
1885	}	2159	}
1886		2160
1887	sub invoke_focus_in {	2161	sub invoke_focus_in {
…		…
1949	utf8::encode $text;	2223	utf8::encode $text;
1950		2224
1951	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2225	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1952	}	2226	}
1953		2227
1954	glColor @{$self->{fg}};
1955	glBegin GL_LINES;	2228	glBegin GL_LINES;
1956	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2229	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};	2230	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1958	glEnd;	2231	glEnd;
1959	}	2232	}
1960	}	2233	}
		2234
		2235	#############################################################################
1961		2236
1962	package CFPlus::UI::Entry;	2237	package CFPlus::UI::Entry;
1963		2238
1964	our @ISA = CFPlus::UI::EntryBase::;	2239	our @ISA = CFPlus::UI::EntryBase::;
1965		2240
…		…
1968	sub invoke_key_down {	2243	sub invoke_key_down {
1969	my ($self, $ev) = @_;	2244	my ($self, $ev) = @_;
1970		2245
1971	my $sym = $ev->{sym};	2246	my $sym = $ev->{sym};
1972		2247
1973	if ($sym == 13) {	2248	if ($ev->{uni} == 0x0d || $sym == 13) {
1974	unshift @{$self->{history}},	2249	unshift @{$self->{history}},
1975	my $txt = $self->get_text;	2250	my $txt = $self->get_text;
1976		2251
1977	$self->{history_pointer} = -1;	2252	$self->{history_pointer} = -1;
1978	$self->{history_saveback} = '';	2253	$self->{history_saveback} = '';
…		…
2008	1	2283	1
2009	}	2284	}
2010		2285
2011	#############################################################################	2286	#############################################################################
2012		2287
		2288	package CFPlus::UI::TextEdit;
		2289
		2290	our @ISA = CFPlus::UI::EntryBase::;
		2291
		2292	use CFPlus::OpenGL;
		2293
		2294	sub move_cursor_ver {
		2295	my ($self, $dy) = @_;
		2296
		2297	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2298
		2299	$y += $dy;
		2300
		2301	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2302	$self->{cursor} = $index;
		2303	delete $self->{cur_h};
		2304	$self->update;
		2305	return;
		2306	}
		2307	}
		2308
		2309	sub invoke_key_down {
		2310	my ($self, $ev) = @_;
		2311
		2312	my $sym = $ev->{sym};
		2313
		2314	if ($sym == CFPlus::SDLK_UP) {
		2315	$self->move_cursor_ver (-1);
		2316	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2317	$self->move_cursor_ver (+1);
		2318	} else {
		2319	return $self->SUPER::invoke_key_down ($ev)
		2320	}
		2321
		2322	1
		2323	}
		2324
		2325	#############################################################################
		2326
2013	package CFPlus::UI::Button;	2327	package CFPlus::UI::Button;
2014		2328
2015	our @ISA = CFPlus::UI::Label::;	2329	our @ISA = CFPlus::UI::Label::;
2016		2330
2017	use CFPlus::OpenGL;	2331	use CFPlus::OpenGL;
2018		2332
2019	my @tex =	2333	my @tex =
2020	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2334	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2021	qw(b1_button_active.png);	2335	qw(b1_button_inactive.png b1_button_active.png);
2022		2336
2023	sub new {	2337	sub new {
2024	my $class = shift;	2338	my $class = shift;
2025		2339
2026	$class->SUPER::new (	2340	$class->SUPER::new (
2027	padding_x => 4,	2341	padding_x => 4,
2028	padding_y => 4,	2342	padding_y => 4,
2029	fg => [1, 1, 1],	2343	fg => [1.0, 1.0, 1.0],
2030	active_fg => [0, 0, 1],	2344	active_fg => [0.8, 0.8, 0.8],
2031	can_hover => 1,	2345	can_hover => 1,
2032	align => 0,	2346	align => 0,
2033	valign => 0,	2347	valign => 0,
2034	can_events => 1,	2348	can_events => 1,
2035	@_	2349	@_
…		…
2053		2367
2054	glEnable GL_TEXTURE_2D;	2368	glEnable GL_TEXTURE_2D;
2055	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2369	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2056	glColor 0, 0, 0, 1;	2370	glColor 0, 0, 0, 1;
2057		2371
		2372	my $tex = $tex[$GRAB == $self];
2058	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2373	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2059		2374
2060	glDisable GL_TEXTURE_2D;	2375	glDisable GL_TEXTURE_2D;
2061		2376
2062	$self->SUPER::_draw;	2377	$self->SUPER::_draw;
2063	}	2378	}
…		…
2159	or Carp::croak "'path' or 'tex' attributes required";	2474	or Carp::croak "'path' or 'tex' attributes required";
2160		2475
2161	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2476	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2162	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2477	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2163		2478
2164	Scalar::Util::weaken $texture_cache{$self->{path}};	2479	CFPlus::weaken $texture_cache{$self->{path}};
2165		2480
2166	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2481	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2167		2482
2168	$self	2483	$self
2169	}	2484	}
…		…
2516		2831
2517	$self->SUPER::invoke_button_down ($ev, $x, $y);	2832	$self->SUPER::invoke_button_down ($ev, $x, $y);
2518		2833
2519	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2834	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2520		2835
2521	$self->invoke_mouse_motion ($ev, $x, $y)	2836	$self->invoke_mouse_motion ($ev, $x, $y);
		2837
		2838	1
2522	}	2839	}
2523		2840
2524	sub invoke_mouse_motion {	2841	sub invoke_mouse_motion {
2525	my ($self, $ev, $x, $y) = @_;	2842	my ($self, $ev, $x, $y) = @_;
2526		2843
…		…
2542	sub invoke_mouse_wheel {	2859	sub invoke_mouse_wheel {
2543	my ($self, $ev) = @_;	2860	my ($self, $ev) = @_;
2544		2861
2545	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2862	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2546		2863
		2864	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2865
2547	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2866	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2548		2867
2549	! ! $delta	2868	1
2550	}	2869	}
2551		2870
2552	sub update {	2871	sub update {
2553	my ($self) = @_;	2872	my ($self) = @_;
2554		2873
…		…
2662	#font => default_font	2981	#font => default_font
2663	@_,	2982	@_,
2664		2983
2665	layout => (new CFPlus::Layout),	2984	layout => (new CFPlus::Layout),
2666	par => [],	2985	par => [],
		2986	max_par => 0,
2667	height => 0,	2987	height => 0,
2668	children => [	2988	children => [
2669	(new CFPlus::UI::Empty expand => 1),	2989	(new CFPlus::UI::Empty expand => 1),
2670	(new CFPlus::UI::Slider vertical => 1),	2990	(new CFPlus::UI::Slider vertical => 1),
2671	],	2991	],
…		…
2684	}	3004	}
2685		3005
2686	sub size_request {	3006	sub size_request {
2687	my ($self) = @_;	3007	my ($self) = @_;
2688		3008
2689	my ($empty, $slider) = @{ $self->{children} };	3009	my ($empty, $slider) = $self->visible_children;
2690		3010
2691	local $self->{children} = [$empty, $slider];	3011	local $self->{children} = [$empty, $slider];
2692	$self->SUPER::size_request	3012	$self->SUPER::size_request
2693	}	3013	}
2694		3014
…		…
2750	sub set_offset {	3070	sub set_offset {
2751	my ($self, $offset) = @_;	3071	my ($self, $offset) = @_;
2752		3072
2753	# todo: base offset on lines or so, not on pixels	3073	# todo: base offset on lines or so, not on pixels
2754	$self->{children}[1]->set_value ($offset);	3074	$self->{children}[1]->set_value ($offset);
		3075	}
		3076
		3077	sub current_paragraph {
		3078	my ($self) = @_;
		3079
		3080	$self->{top_paragraph} - 1
		3081	}
		3082
		3083	sub scroll_to {
		3084	my ($self, $para) = @_;
		3085
		3086	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3087
		3088	$self->{scroll_to} = $para;
		3089	$self->update;
2755	}	3090	}
2756		3091
2757	sub clear {	3092	sub clear {
2758	my ($self) = @_;	3093	my ($self) = @_;
2759		3094
…		…
2781		3116
2782	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3117	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2783	push @{$self->{par}}, $para;	3118	push @{$self->{par}}, $para;
2784	}	3119	}
2785		3120
		3121	if (my $max = $self->{max_par}) {
		3122	shift @{$self->{par}} while @{$self->{par}} > $max;
		3123	}
		3124
2786	$self->{need_reflow}++;	3125	$self->{need_reflow}++;
2787	$self->update;	3126	$self->update;
2788	}	3127	}
2789		3128
2790	sub scroll_to_bottom {	3129	sub scroll_to_bottom {
2791	my ($self) = @_;	3130	my ($self) = @_;
2792		3131
2793	$self->{scroll_to_bottom} = 1;	3132	$self->{scroll_to} = $#{$self->{par}};
2794	$self->update;	3133	$self->update;
2795	}	3134	}
2796		3135
		3136	sub force_uptodate {
		3137	my ($self) = @_;
		3138
		3139	if (delete $self->{need_reflow}) {
		3140	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3141
		3142	my $height = 0;
		3143
		3144	for my $para (@{$self->{par}}) {
		3145	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3146	my $layout = $self->get_layout ($para);
		3147	my ($w, $h) = $layout->size;
		3148
		3149	$para->{w} = $w + $para->{indent};
		3150	$para->{h} = $h;
		3151	$para->{wrapped} = $layout->has_wrapped;
		3152	}
		3153
		3154	$para->{y} = $height;
		3155	$height += $para->{h};
		3156	}
		3157
		3158	$self->{height} = $height;
		3159	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3160
		3161	delete $self->{texture};
		3162	}
		3163
		3164	if (my $paridx = delete $self->{scroll_to}) {
		3165	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3166	}
		3167	}
		3168
2797	sub update {	3169	sub update {
2798	my ($self) = @_;	3170	my ($self) = @_;
2799		3171
2800	$self->SUPER::update;	3172	$self->SUPER::update;
2801		3173
2802	return unless $self->{h} > 0;	3174	return unless $self->{h} > 0;
2803		3175
2804	delete $self->{texture};	3176	delete $self->{texture};
2805		3177
2806	$ROOT->on_post_alloc ($self => sub {	3178	$ROOT->on_post_alloc ($self => sub {
		3179	$self->force_uptodate;
		3180
2807	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3181	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		3182
2836	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {	3183	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2837	glClearColor 0, 0, 0, 0;	3184	glClearColor 0, 0, 0, 0;
2838	glClear GL_COLOR_BUFFER_BIT;	3185	glClear GL_COLOR_BUFFER_BIT;
2839		3186
		3187	package CFPlus::UI::Base;
		3188	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3189	(0, 0, $self->{w}, $self->{h});
		3190
		3191	my $top = int $self->{children}[1]{range}[0];
		3192
		3193	my $paridx = 0;
		3194	my $top_paragraph;
2840	my $top = int $self->{children}[1]{range}[0];	3195	my $top = int $self->{children}[1]{range}[0];
2841		3196
2842	my $y0 = $top;	3197	my $y0 = $top;
2843	my $y1 = $top + $H;	3198	my $y1 = $top + $H;
2844		3199
2845	my $y = 0;
2846
2847	for my $para (@{$self->{par}}) {	3200	for my $para (@{$self->{par}}) {
2848	my $h = $para->{h};	3201	my $h = $para->{h};
		3202	my $y = $para->{y};
2849		3203
2850	if ($y0 < $y + $h && $y < $y1) {	3204	if ($y0 < $y + $h && $y < $y1) {
2851
2852	my $layout = $self->get_layout ($para);	3205	my $layout = $self->get_layout ($para);
2853		3206
2854	$layout->render ($para->{indent}, $y - $y0);	3207	$layout->render ($para->{indent}, $y - $y0);
2855		3208
2856	if (my @w = @{ $para->{widget} }) {	3209	if (my @w = @{ $para->{widget} }) {
…		…
2865	$_->draw;	3218	$_->draw;
2866	}	3219	}
2867	}	3220	}
2868	}	3221	}
2869		3222
2870	$y += $h;	3223	$paridx++;
		3224	$top_paragraph ||= $paridx if $y >= $top;
2871	}	3225	}
		3226
		3227	$self->{top_paragraph} = $top_paragraph;
2872	};	3228	};
2873	});	3229	});
2874	}	3230	}
2875		3231
2876	sub reconfigure {	3232	sub reconfigure {
…		…
2997		3353
2998	$self->add (new CFPlus::UI::Label	3354	$self->add (new CFPlus::UI::Label
2999	markup => $tooltip,	3355	markup => $tooltip,
3000	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3356	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3001	fontsize => 0.8,	3357	fontsize => 0.8,
3002	fg => [0, 0, 0, 1],	3358	style => 1, # FLAG_INVERSE
3003	ellipsise => 0,	3359	ellipsise => 0,
3004	font => ($widget->{tooltip_font} || $::FONT_PROP),	3360	font => ($widget->{tooltip_font} || $::FONT_PROP),
3005	);	3361	);
3006	}	3362	}
3007		3363
…		…
3079		3435
3080	sub new {	3436	sub new {
3081	my $class = shift;	3437	my $class = shift;
3082		3438
3083	my $self = $class->SUPER::new (	3439	my $self = $class->SUPER::new (
		3440	size_w => 32,
		3441	size_h => 8,
3084	aspect => 1,	3442	aspect => 1,
3085	can_events => 0,	3443	can_events => 0,
3086	@_,	3444	@_,
3087	);	3445	);
3088		3446
3089	if ($self->{anim} && $self->{animspeed}) {	3447	if ($self->{anim} && $self->{animspeed}) {
3090	Scalar::Util::weaken (my $widget = $self);	3448	CFPlus::weaken (my $widget = $self);
3091		3449
		3450	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3451	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3092	$self->{timer} = Event->timer (	3452	$self->{timer} = Event->timer (
3093	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3094	hard => 1,	3453	parked => 1,
3095	interval => $self->{animspeed},
3096	cb => sub {	3454	cb => sub {
		3455	return unless $::CONN && $widget;
		3456
3097	++$widget->{frame};	3457	++$widget->{frame};
		3458	$widget->update_face;
3098	$widget->update;	3459	$widget->update;
		3460
		3461	$widget->update_timer;
3099	},	3462	},
3100	);	3463	);
		3464
		3465	$self->update_face;
		3466	$self->update_timer;
3101	}	3467	}
3102		3468
3103	$self	3469	$self
3104	}	3470	}
3105		3471
		3472	sub update_timer {
		3473	my ($self) = @_;
		3474
		3475	return unless $self->{timer};
		3476
		3477	if ($self->{visible}) {
		3478	$self->{timer}->at (
		3479	$self->{anim_start}
		3480	+ $self->{animspeed}
		3481	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3482	);
		3483	$self->{timer}->start;
		3484	} else {
		3485	$self->{timer}->stop;
		3486	}
		3487	}
		3488
		3489	sub update_face {
		3490	my ($self) = @_;
		3491
		3492	return unless $::CONN;
		3493
		3494	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3495	if ($anim && @$anim) {
		3496	delete $self->{wait_face};
		3497	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3498	$self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
		3499	}
		3500	}
		3501	}
		3502
3106	sub size_request {	3503	sub size_request {
3107	(32, 8)	3504	my ($self) = @_;
		3505
		3506	if ($::CONN) {
		3507	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3508	if (my $tex = $::CONN->{texture}[$faceid]) {
		3509	$self->{tex} = $tex;
		3510	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3511	} else {
		3512	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3513	$self->realloc;
		3514	});
		3515	}
		3516	}
		3517	}
		3518
		3519	($self->{size_w} || 8, $self->{size_h} || 8)
3108	}	3520	}
3109		3521
3110	sub update {	3522	sub update {
3111	my ($self) = @_;	3523	my ($self) = @_;
3112		3524
3113	return unless $self->{visible};	3525	return unless $self->{visible};
3114		3526
3115	$self->SUPER::update;	3527	$self->SUPER::update;
3116	}	3528	}
3117		3529
		3530	sub invoke_visibility_change {
		3531	my ($self) = @_;
		3532
		3533	$self->update_timer;
		3534
		3535	0
		3536	}
		3537
3118	sub _draw {	3538	sub _draw {
3119	my ($self) = @_;	3539	my ($self) = @_;
3120		3540
3121	return unless $::CONN;
3122
3123	$self->SUPER::_draw;	3541	$self->SUPER::_draw;
3124		3542
3125	my $face;	3543	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;	3544	glEnable GL_TEXTURE_2D;
3138	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3545	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3139	glColor 0, 0, 0, 1;	3546	glColor 0, 0, 0, 1;
3140	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3547	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3141	glDisable GL_TEXTURE_2D;	3548	glDisable GL_TEXTURE_2D;
…		…
3143	}	3550	}
3144		3551
3145	sub destroy {	3552	sub destroy {
3146	my ($self) = @_;	3553	my ($self) = @_;
3147		3554
3148	$self->{timer}->cancel	3555	(delete $self->{timer})->cancel
3149	if $self->{timer};	3556	if $self->{timer};
3150		3557
3151	$self->SUPER::destroy;	3558	$self->SUPER::destroy;
3152	}	3559	}
3153		3560
…		…
3155		3562
3156	package CFPlus::UI::Buttonbar;	3563	package CFPlus::UI::Buttonbar;
3157		3564
3158	our @ISA = CFPlus::UI::HBox::;	3565	our @ISA = CFPlus::UI::HBox::;
3159		3566
3160	# TODO: should actualyl wrap buttons and other goodies.	3567	# TODO: should actually wrap buttons and other goodies.
3161		3568
3162	#############################################################################	3569	#############################################################################
3163		3570
3164	package CFPlus::UI::Menu;	3571	package CFPlus::UI::Menu;
3165		3572
3166	our @ISA = CFPlus::UI::FancyFrame::;	3573	our @ISA = CFPlus::UI::Toplevel::;
3167		3574
3168	use CFPlus::OpenGL;	3575	use CFPlus::OpenGL;
3169		3576
3170	sub new {	3577	sub new {
3171	my $class = shift;	3578	my $class = shift;
…		…
3343	);	3750	);
3344		3751
3345	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3752	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3346	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3753	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3347		3754
		3755	{
		3756	Scalar::Util::weaken (my $wself = $self);
		3757
		3758	$self->{multiplexer}->connect (c_add => sub {
		3759	my ($mplex, $widgets) = @_;
		3760
		3761	for my $child (@$widgets) {
		3762	Scalar::Util::weaken $child;
		3763	$child->{c_tab_} ||= do {
		3764	my $tab =
		3765	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3766	? $child->{c_tab}
		3767	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3768
		3769	$tab->connect (activate => sub {
		3770	$wself->set_current_page ($child);
		3771	});
		3772
		3773	$tab
		3774	};
		3775
		3776	$self->{buttonbar}->add ($child->{c_tab_});
		3777	}
		3778	});
		3779
		3780	$self->{multiplexer}->connect (c_remove => sub {
		3781	my ($mplex, $widgets) = @_;
		3782
		3783	for my $child (@$widgets) {
		3784	$wself->{buttonbar}->remove ($child->{c_tab_});
		3785	}
		3786	});
		3787	}
		3788
3348	$self	3789	$self
3349	}	3790	}
3350		3791
3351	sub add {	3792	sub add {
		3793	my ($self, @widgets) = @_;
		3794
		3795	$self->{multiplexer}->add (@widgets)
		3796	}
		3797
		3798	sub remove {
		3799	my ($self, @widgets) = @_;
		3800
		3801	$self->{multiplexer}->remove (@widgets)
		3802	}
		3803
		3804	sub add_tab {
3352	my ($self, $title, $widget, $tooltip) = @_;	3805	my ($self, $title, $widget, $tooltip) = @_;
3353		3806
3354	Scalar::Util::weaken $self;	3807	$title = [$title, $tooltip] unless ref $title;
		3808	$widget->{c_tab} = $title;
3355		3809
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);	3810	$self->add ($widget);
3363	}	3811	}
3364		3812
3365	sub get_current_page {	3813	sub get_current_page {
3366	my ($self) = @_;	3814	my ($self) = @_;
3367		3815
…		…
3443	my $self = $class->SUPER::new (	3891	my $self = $class->SUPER::new (
3444	fontsize => 0.8,	3892	fontsize => 0.8,
3445	@_,	3893	@_,
3446	);	3894	);
3447		3895
3448	Scalar::Util::weaken (my $this = $self);	3896	CFPlus::weaken (my $this = $self);
3449		3897
3450	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3898	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3451		3899
3452	$self	3900	$self
3453	}	3901	}
…		…
3576	$self->SUPER::destroy;	4024	$self->SUPER::destroy;
3577	}	4025	}
3578		4026
3579	#############################################################################	4027	#############################################################################
3580		4028
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;	4029	package CFPlus::UI::Root;
3766		4030
3767	our @ISA = CFPlus::UI::Container::;	4031	our @ISA = CFPlus::UI::Container::;
3768		4032
3769	use List::Util qw(min max);	4033	use List::Util qw(min max);
…		…
3776	my $self = $class->SUPER::new (	4040	my $self = $class->SUPER::new (
3777	visible => 1,	4041	visible => 1,
3778	@_,	4042	@_,
3779	);	4043	);
3780		4044
3781	Scalar::Util::weaken ($self->{root} = $self);	4045	CFPlus::weaken ($self->{root} = $self);
3782		4046
3783	$self	4047	$self
3784	}	4048	}
3785		4049
3786	sub size_request {	4050	sub size_request {
…		…
3881	while ($self->{refresh_hook}) {	4145	while ($self->{refresh_hook}) {
3882	$_->()	4146	$_->()
3883	for values %{delete $self->{refresh_hook}};	4147	for values %{delete $self->{refresh_hook}};
3884	}	4148	}
3885		4149
3886	if ($self->{realloc}) {	4150	while ($self->{realloc}) {
3887	my %queue;	4151	my %queue;
3888	my @queue;	4152	my @queue;
3889	my $widget;	4153	my $widget;
3890		4154
3891	outer:	4155	outer:
…		…
3938	}	4202	}
3939	}	4203	}
3940		4204
3941	delete $self->{realloc}{$widget+0};	4205	delete $self->{realloc}{$widget+0};
3942	}	4206	}
3943	}
3944		4207
3945	while (my $size_alloc = delete $self->{size_alloc}) {	4208	while (my $size_alloc = delete $self->{size_alloc}) {
3946	my @queue = sort { $b->{visible} <=> $a->{visible} }	4209	my @queue = sort { $a->{visible} <=> $b->{visible} }
3947	values %$size_alloc;	4210	values %$size_alloc;
3948		4211
3949	while () {	4212	while () {
3950	my $widget = pop @queue || last;	4213	my $widget = pop @queue || last;
3951		4214
3952	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4215	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3953		4216
3954	$w = 0 if $w < 0;
3955	$h = 0 if $h < 0;
3956
3957	$w = max $widget->{min_w}, $w;	4217	$w = max $widget->{min_w}, $w;
3958	$h = max $widget->{min_h}, $h;	4218	$h = max $widget->{min_h}, $h;
3959		4219
3960	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4220	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3961	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4221	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3962		4222
3963	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4223	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3964	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4224	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3965		4225
3966	$w = int $w + 0.5;	4226	$w = int $w + 0.5;
3967	$h = int $h + 0.5;	4227	$h = int $h + 0.5;
3968		4228
3969	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4229	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3970	$widget->{old_w} = $widget->{w};	4230	$widget->{old_w} = $widget->{w};
3971	$widget->{old_h} = $widget->{h};	4231	$widget->{old_h} = $widget->{h};
3972		4232
3973	$widget->{w} = $w;	4233	$widget->{w} = $w;
3974	$widget->{h} = $h;	4234	$widget->{h} = $h;
3975		4235
3976	$widget->emit (size_allocate => $w, $h);	4236	$widget->emit (size_allocate => $w, $h);
		4237	}
3977	}	4238	}
3978	}	4239	}
3979	}	4240	}
3980		4241
3981	while ($self->{post_alloc_hook}) {	4242	while ($self->{post_alloc_hook}) {
3982	$_->()	4243	$_->()
3983	for values %{delete $self->{post_alloc_hook}};	4244	for values %{delete $self->{post_alloc_hook}};
3984	}	4245	}
3985
3986		4246
3987	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4247	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3988	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4248	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3989	glClear GL_COLOR_BUFFER_BIT;	4249	glClear GL_COLOR_BUFFER_BIT;
3990		4250
…		…
3995	glLoadIdentity;	4255	glLoadIdentity;
3996		4256
3997	{	4257	{
3998	package CFPlus::UI::Base;	4258	package CFPlus::UI::Base;
3999		4259
4000	($draw_x, $draw_y, $draw_w, $draw_h) =	4260	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4001	(0, 0, $self->{w}, $self->{h});	4261	(0, 0, $self->{w}, $self->{h});
4002	}
4003		4262
4004	$self->_draw;	4263	$self->_draw;
		4264	}
4005	}	4265	}
4006		4266
4007	#############################################################################	4267	#############################################################################
4008		4268
4009	package CFPlus::UI;	4269	package CFPlus::UI;

Diff Legend

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