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.354 by root, Sat Nov 18 23:31:23 2006 UTC vs.
Revision 1.440 by root, Sun Sep 16 18:27:48 2007 UTC

1	package CFPlus::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFPlus;	9	use CFPlus;
11	use CFPlus::Pod;	10	use CFPlus::Pod;
…		…
23	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24	if (!$GRAB) {	23	if (!$GRAB) {
25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
27	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28	$TOOLTIP->hide;	28	$TOOLTIP->hide;
29		29
30	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31		32
32	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
33		34
34	my $tip = $widget->{tooltip};
35
36	$tip = $tip->($widget) if CODE:: eq ref $tip;
37
38	$TOOLTIP->set_tooltip_from ($widget);	35	$TOOLTIP->set_tooltip_from ($widget);
39	$TOOLTIP->show;	36	$TOOLTIP->show;
40	}	37	}
41		38
42	return;	39	return;
43	}	40	}
44	}	41	}
45	}	42	}
46		43
47	$TOOLTIP->hide;	44	$TOOLTIP->hide;
		45	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48	delete $TOOLTIP->{owner};	46	delete $TOOLTIP->{owner};
49	});	47	});
50		48
51	sub get_layout {	49	sub get_layout {
52	my $layout;	50	my $layout;
…		…
111	}	109	}
112		110
113	if ($GRAB) {	111	if ($GRAB) {
114	if ($ev->{button} == 4 || $ev->{button} == 5) {	112	if ($ev->{button} == 4 || $ev->{button} == 5) {
115	# mousewheel	113	# mousewheel
116	$ev->{dx} = 0;
117	$ev->{dy} = $ev->{button} * 2 - 9;	114	my $delta = $ev->{button} * 2 - 9;
		115	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		116
		117	$ev->{dx} = $shift ? $delta : 0;
		118	$ev->{dy} = $shift ? 0 : $delta;
		119
118	$GRAB->emit (mouse_wheel => $ev);	120	$GRAB->emit (mouse_wheel => $ev);
119	} else {	121	} else {
120	$GRAB->emit (button_down => $ev)	122	$GRAB->emit (button_down => $ev)
121	}	123	}
122	}	124	}
…		…
235	h => undef,	237	h => undef,
236	can_events => 1,	238	can_events => 1,
237	@_	239	@_
238	}, $class;	240	}, $class;
239		241
240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241		243
242	for (keys %$self) {	244	for (keys %$self) {
243	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
244	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
245	}	247	}
…		…
262		264
263	sub destroy {	265	sub destroy {
264	my ($self) = @_;	266	my ($self) = @_;
265		267
266	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
267	%$self = ();	270	%$self = ();
		271	}
		272
		273	sub TO_JSON {
		274	{ "\fw" => $_[0]{s_id} }
268	}	275	}
269		276
270	sub show {	277	sub show {
271	my ($self) = @_;	278	my ($self) = @_;
272		279
…		…
313	sub set_visibility {	320	sub set_visibility {
314	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
315		322
316	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
317		324
318	$visible ? $self->hide	325	$visible ? $self->show
319	: $self->show;	326	: $self->hide;
320	}	327	}
321		328
322	sub toggle_visibility {	329	sub toggle_visibility {
323	my ($self) = @_;	330	my ($self) = @_;
324		331
…		…
351		358
352	$self->{force_w} = $w;	359	$self->{force_w} = $w;
353	$self->{force_h} = $h;	360	$self->{force_h} = $h;
354		361
355	$self->realloc;	362	$self->realloc;
		363	}
		364
		365	# traverse the widget chain up to find the maximum "physical" size constraints
		366	sub get_max_wh {
		367	my ($self) = @_;
		368
		369	return $self->{parent}->get_max_wh
		370	if $self->{parent};
		371
		372	($::WIDTH, $::HEIGHT)
356	}	373	}
357		374
358	sub size_request {	375	sub size_request {
359	require Carp;	376	require Carp;
360	Carp::confess "size_request is abstract";	377	Carp::confess "size_request is abstract";
…		…
502		519
503	defined wantarray and CFPlus::guard {	520	defined wantarray and CFPlus::guard {
504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	521	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505	@{ $self->{signal_cb}{$signal} };	522	@{ $self->{signal_cb}{$signal} };
506	}	523	}
		524	}
		525
		526	sub disconnect_all {
		527	my ($self, $signal) = @_;
		528
		529	delete $self->{signal_cb}{$signal};
507	}	530	}
508		531
509	my %has_coords = (	532	my %has_coords = (
510	button_down => 1,	533	button_down => 1,
511	button_up => 1,	534	button_up => 1,
…		…
523	? $args[0]->xy ($self)	546	? $args[0]->xy ($self)
524	: ();	547	: ();
525		548
526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	549	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527		550
528	if ($self->{tooltip} =~ /Apply.*audio/) {	551	for my $cb (
529	warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#	552	@{$self->{signal_cb}{$signal} || []}, # before
530	warn "3 $self->{parent}\n";#d#	553	($self->can ("invoke_$signal") || sub { 1 }), # closure
		554	) {
		555	return $cb->($self, @args, @append) || next;
531	}	556	}
532		557
533	#d##TODO# stop propagating at first true, do not use sum	558	# parent
534	my $res =
535	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
536	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
537	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	559	$self->{parent} && $self->{parent}->emit ($signal, @args)
538	;
539	if ($self->{tooltip} =~ /Apply.*audio/) {
540	warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
541	warn "5 $self->{parent}\n";#d#
542	}
543
544	$res
545	}	560	}
546		561
547	sub find_widget {	562	#sub find_widget {
548	my ($self, $x, $y) = @_;	563	# in .xs
549
550	return () unless $self->{can_events};
551
552	return $self
553	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
554	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
555
556	()
557	}
558		564
559	sub set_parent {	565	sub set_parent {
560	my ($self, $parent) = @_;	566	my ($self, $parent) = @_;
561		567
562	Scalar::Util::weaken ($self->{parent} = $parent);	568	CFPlus::weaken ($self->{parent} = $parent);
563	$self->set_visible if $parent->{visible};	569	$self->set_visible if $parent->{visible};
564	}	570	}
565		571
566	sub realloc {	572	sub realloc {
567	my ($self) = @_;	573	my ($self) = @_;
…		…
593		599
594	# using global variables seems a bit hacky, but passing through all drawing	600	# using global variables seems a bit hacky, but passing through all drawing
595	# functions seems pointless.	601	# functions seems pointless.
596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	602	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597		603
598	sub draw {	604	#sub draw {
599	my ($self) = @_;	605	#CFPlus.xs
600
601	return unless $self->{h} && $self->{w};
602
603	# update screen rectangle
604	local $draw_x = $draw_x + $self->{x};
605	local $draw_y = $draw_y + $self->{y};
606
607	# skip widgets that are entirely outside the drawing area
608	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
610
611	glPushMatrix;
612	glTranslate $self->{x}, $self->{y}, 0;
613
614	if ($self == $HOVER && $self->{can_hover}) {
615	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
616	glEnable GL_BLEND;
617	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
618	glBegin GL_QUADS;
619	glVertex 0 , 0;
620	glVertex $self->{w}, 0;
621	glVertex $self->{w}, $self->{h};
622	glVertex 0 , $self->{h};
623	glEnd;
624	glDisable GL_BLEND;
625	}
626
627	if ($ENV{CFPLUS_DEBUG} & 1) {
628	glPushMatrix;
629	glColor 1, 1, 0, 1;
630	glTranslate 0.375, 0.375;
631	glBegin GL_LINE_LOOP;
632	glVertex 0 , 0;
633	glVertex $self->{w} - 1, 0;
634	glVertex $self->{w} - 1, $self->{h} - 1;
635	glVertex 0 , $self->{h} - 1;
636	glEnd;
637	glPopMatrix;
638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
639	}
640
641	$self->_draw;
642	glPopMatrix;
643	}
644		606
645	sub _draw {	607	sub _draw {
646	my ($self) = @_;	608	my ($self) = @_;
647		609
648	warn "no draw defined for $self\n";	610	warn "no draw defined for $self\n";
…		…
651	sub DESTROY {	613	sub DESTROY {
652	my ($self) = @_;	614	my ($self) = @_;
653		615
654	return if CFPlus::in_destruct;	616	return if CFPlus::in_destruct;
655		617
656	delete $WIDGET{$self+0};	618	local $@;
657
658	eval { $self->destroy };	619	eval { $self->destroy };
659	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	620	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		621
		622	delete $WIDGET{$self+0};
660	}	623	}
661		624
662	#############################################################################	625	#############################################################################
663		626
664	package CFPlus::UI::DrawBG;	627	package CFPlus::UI::DrawBG;
…		…
668	use strict;	631	use strict;
669	use CFPlus::OpenGL;	632	use CFPlus::OpenGL;
670		633
671	sub new {	634	sub new {
672	my $class = shift;	635	my $class = shift;
673
674	# range [value, low, high, page]
675		636
676	$class->SUPER::new (	637	$class->SUPER::new (
677	#bg => [0, 0, 0, 0.2],	638	#bg => [0, 0, 0, 0.2],
678	#active_bg => [1, 1, 1, 0.5],	639	#active_bg => [1, 1, 1, 0.5],
679	@_	640	@_
…		…
691	my ($w, $h) = @$self{qw(w h)};	652	my ($w, $h) = @$self{qw(w h)};
692		653
693	glEnable GL_BLEND;	654	glEnable GL_BLEND;
694	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	655	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
695	glColor_premultiply @$color;	656	glColor_premultiply @$color;
696
697	glBegin GL_QUADS;
698	glVertex 0 , 0;
699	glVertex 0 , $h;
700	glVertex $w, $h;	657	glRect 0, 0, $w, $h;
701	glVertex $w, 0;
702	glEnd;
703
704	glDisable GL_BLEND;	658	glDisable GL_BLEND;
705	}	659	}
706	}	660	}
707		661
708	#############################################################################	662	#############################################################################
…		…
740	can_events => 0,	694	can_events => 0,
741	%arg,	695	%arg,
742	);	696	);
743		697
744	$self->add (@$children)	698	$self->add (@$children)
745	if $children;	699	if $children && @$children;
746		700
747	$self	701	$self
748	}	702	}
749		703
750	sub realloc {	704	sub realloc {
…		…
759	my ($self, @widgets) = @_;	713	my ($self, @widgets) = @_;
760		714
761	$_->set_parent ($self)	715	$_->set_parent ($self)
762	for @widgets;	716	for @widgets;
763		717
		718	# TODO: only do this in widgets that need it, e.g. root, fixed
764	use sort 'stable';	719	use sort 'stable';
765		720
766	$self->{children} = [	721	$self->{children} = [
767	sort { $a->{z} <=> $b->{z} }	722	sort { $a->{z} <=> $b->{z} }
768	@{$self->{children}}, @widgets	723	@{$self->{children}}, @widgets
769	];	724	];
770		725
771	$self->realloc;	726	$self->realloc;
		727
		728	$self->emit (c_add => \@widgets);
		729
		730	map $_+0, @widgets
772	}	731	}
773		732
774	sub children {	733	sub children {
775	@{ $_[0]{children} }	734	@{ $_[0]{children} }
776	}	735	}
777		736
778	sub remove {	737	sub remove {
779	my ($self, $child) = @_;	738	my ($self, @widgets) = @_;
780		739
		740	$self->emit (c_remove => \@widgets);
		741
		742	for my $child (@widgets) {
781	delete $child->{parent};	743	delete $child->{parent};
782	$child->hide;	744	$child->hide;
783
784	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	745	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		746	}
785		747
786	$self->realloc;	748	$self->realloc;
787	}	749	}
788		750
789	sub clear {	751	sub clear {
790	my ($self) = @_;	752	my ($self) = @_;
791		753
792	my $children = delete $self->{children};	754	my $children = $self->{children};
793	$self->{children} = [];	755	$self->{children} = [];
794		756
795	for (@$children) {	757	for (@$children) {
796	delete $_->{parent};	758	delete $_->{parent};
797	$_->hide;	759	$_->hide;
…		…
817	}	779	}
818		780
819	sub _draw {	781	sub _draw {
820	my ($self) = @_;	782	my ($self) = @_;
821		783
822	$_->draw for @{$self->{children}};	784	$_->draw for $self->visible_children;
823	}	785	}
824		786
825	#############################################################################	787	#############################################################################
826		788
827	package CFPlus::UI::Bin;	789	package CFPlus::UI::Bin;
…		…
837	}	799	}
838		800
839	sub add {	801	sub add {
840	my ($self, $child) = @_;	802	my ($self, $child) = @_;
841		803
842	$self->SUPER::remove ($_) for @{ $self->{children} };	804	$self->clear;
843	$self->SUPER::add ($child);	805	$self->SUPER::add ($child);
844	}	806	}
845		807
846	sub remove {	808	sub remove {
847	my ($self, $widget) = @_;	809	my ($self, $widget) = @_;
…		…
865		827
866	1	828	1
867	}	829	}
868		830
869	#############################################################################	831	#############################################################################
870
871	# back-buffered drawing area	832	# back-buffered drawing area
872		833
873	package CFPlus::UI::Window;	834	package CFPlus::UI::Window;
874		835
875	our @ISA = CFPlus::UI::Bin::;	836	our @ISA = CFPlus::UI::Bin::;
…		…
937	}	898	}
938		899
939	#############################################################################	900	#############################################################################
940		901
941	package CFPlus::UI::ViewPort;	902	package CFPlus::UI::ViewPort;
		903
		904	use List::Util qw(min max);
942		905
943	our @ISA = CFPlus::UI::Window::;	906	our @ISA = CFPlus::UI::Window::;
944		907
945	sub new {	908	sub new {
946	my $class = shift;	909	my $class = shift;
…		…
955	sub size_request {	918	sub size_request {
956	my ($self) = @_;	919	my ($self) = @_;
957		920
958	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	921	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
959		922
960	$w = 10 if $self->{scroll_x};	923	$w = 1 if $self->{scroll_x};
961	$h = 10 if $self->{scroll_y};	924	$h = 1 if $self->{scroll_y};
962		925
963	($w, $h)	926	($w, $h)
964	}	927	}
965		928
966	sub invoke_size_allocate {	929	sub invoke_size_allocate {
…		…
978	}	941	}
979		942
980	sub set_offset {	943	sub set_offset {
981	my ($self, $x, $y) = @_;	944	my ($self, $x, $y) = @_;
982		945
		946	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		947	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		948
		949	if ($x != $self->{view_x} or $y != $self->{view_y}) {
983	$self->{view_x} = int $x;	950	$self->{view_x} = $x;
984	$self->{view_y} = int $y;	951	$self->{view_y} = $y;
985		952
		953	$self->emit (changed => $x, $y);
986	$self->update;	954	$self->update;
		955	}
		956	}
		957
		958	sub set_center {
		959	my ($self, $x, $y) = @_;
		960
		961	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		962	}
		963
		964	sub make_visible {
		965	my ($self, $x, $y, $border) = @_;
		966
		967	if ( $x < $self->{view_x} + $self->{w} * $border
		968	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		969	|| $y < $self->{view_y} + $self->{h} * $border
		970	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		971	) {
		972	$self->set_center ($x, $y);
		973	}
987	}	974	}
988		975
989	# hmm, this does not work for topleft of $self... but we should not ask for that	976	# hmm, this does not work for topleft of $self... but we should not ask for that
990	sub coord2local {	977	sub coord2local {
991	my ($self, $x, $y) = @_;	978	my ($self, $x, $y) = @_;
…		…
1006	my ($self, $x, $y) = @_;	993	my ($self, $x, $y) = @_;
1007		994
1008	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1009	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1010	) {	997	) {
1011	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1012	} else {	999	} else {
1013	$self->CFPlus::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
1014	}	1001	}
1015	}	1002	}
1016		1003
…		…
1027		1014
1028	#############################################################################	1015	#############################################################################
1029		1016
1030	package CFPlus::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
1031		1018
1032	our @ISA = CFPlus::UI::HBox::;	1019	our @ISA = CFPlus::UI::Table::;
1033		1020
1034	sub new {	1021	sub new {
1035	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
1036		1023
1037	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
1038		1025
1039	my $self;	1026	my $self;
1040		1027
1041	my $slider = new CFPlus::UI::Slider	1028	my $hslider = new CFPlus::UI::Slider
		1029	c_col => 0,
		1030	c_row => 1,
		1031	vertical => 0,
		1032	range => [0, 0, 1, 0.01], # HACK fix
		1033	on_changed => sub {
		1034	$self->{hpos} = $_[1];
		1035	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1036	},
		1037	;
		1038
		1039	my $vslider = new CFPlus::UI::Slider
		1040	c_col => 1,
		1041	c_row => 0,
1042	vertical => 1,	1042	vertical => 1,
1043	range => [0, 0, 1, 0.01], # HACK fix	1043	range => [0, 0, 1, 0.01], # HACK fix
1044	on_changed => sub {	1044	on_changed => sub {
1045	$self->{vp}->set_offset (0, $_[1]);	1045	$self->{vpos} = $_[1];
		1046	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1046	},	1047	},
1047	;	1048	;
1048		1049
1049	$self = $class->SUPER::new (	1050	$self = $class->SUPER::new (
1050	vp => (new CFPlus::UI::ViewPort expand => 1),	1051	scroll_x => 0,
		1052	scroll_y => 1,
1051	can_events => 1,	1053	can_events => 1,
1052	slider => $slider,	1054	hslider => $hslider,
		1055	vslider => $vslider,
		1056	col_expand => [1, 0],
		1057	row_expand => [1, 0],
1053	%arg,	1058	%arg,
1054	);	1059	);
1055		1060
		1061	$self->{vp} = new CFPlus::UI::ViewPort
		1062	c_col => 0,
		1063	c_row => 0,
		1064	expand => 1,
		1065	scroll_x => $self->{scroll_x},
		1066	scroll_y => $self->{scroll_y},
		1067	on_changed => sub {
		1068	my ($vp, $x, $y) = @_;
		1069
		1070	$vp->{parent}{hslider}->set_value ($x);
		1071	$vp->{parent}{vslider}->set_value ($y);
		1072
		1073	0
		1074	},
		1075	on_size_allocate => sub {
		1076	my ($vp, $w, $h) = @_;
		1077	$vp->{parent}->update_slider;
		1078	0
		1079	},
		1080	;
		1081
1056	$self->SUPER::add ($self->{vp}, $self->{slider});	1082	$self->SUPER::add ($self->{vp});
		1083
1057	$self->add ($child) if $child;	1084	$self->add ($child) if $child;
1058		1085
1059	$self	1086	$self
1060	}	1087	}
1061
1062	#TODO# update range on size_allocate depending on child
1063		1088
1064	sub add {	1089	sub add {
1065	my ($self, $widget) = @_;	1090	my ($self, $widget) = @_;
1066		1091
1067	$self->{vp}->add ($self->{child} = $widget);	1092	$self->{vp}->add ($self->{child} = $widget);
1068	}	1093	}
1069		1094
		1095	sub set_offset { shift->{vp}->set_offset (@_) }
		1096	sub set_center { shift->{vp}->set_center (@_) }
		1097	sub make_visible { shift->{vp}->make_visible (@_) }
		1098
		1099	sub update_slider {
		1100	my ($self) = @_;
		1101
		1102	my $child = ($self->{vp} or return)->child;
		1103
		1104	if ($self->{scroll_x}) {
		1105	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1106	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1107
		1108	my $visible = $w1 > $w2;
		1109	if ($visible != $self->{hslider_visible}) {
		1110	$self->{hslider_visible} = $visible;
		1111	$visible ? $self->SUPER::add ($self->{hslider})
		1112	: $self->SUPER::remove ($self->{hslider});
		1113	}
		1114	}
		1115
		1116	if ($self->{scroll_y}) {
		1117	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1118	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1119
		1120	my $visible = $h1 > $h2;
		1121	if ($visible != $self->{vslider_visible}) {
		1122	$self->{vslider_visible} = $visible;
		1123	$visible ? $self->SUPER::add ($self->{vslider})
		1124	: $self->SUPER::remove ($self->{vslider});
		1125	}
		1126	}
		1127	}
		1128
		1129	sub start_dragging {
		1130	my ($self, $ev) = @_;
		1131
		1132	$self->grab_focus;
		1133
		1134	my $ox = $self->{vp}{view_x};
		1135	my $oy = $self->{vp}{view_y};
		1136
		1137	$self->{motion} = sub {
		1138	my ($ev, $x, $y) = @_;
		1139
		1140	$ox -= $ev->{xrel};
		1141	$oy -= $ev->{yrel};
		1142
		1143	$self->{vp}->set_offset ($ox, $oy);
		1144	};
		1145	}
		1146
1070	sub invoke_mouse_wheel {	1147	sub invoke_mouse_wheel {
1071	my ($self, $ev) = @_;	1148	my ($self, $ev) = @_;
1072		1149
1073	return 0 unless $ev->{dy}; # only vertical movements
1074
1075	$self->{slider}->emit (mouse_wheel => $ev);	1150	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1151	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1076		1152
1077	1	1153	1
1078	}	1154	}
1079		1155
1080	sub update_slider {	1156	sub invoke_button_down {
1081	my ($self) = @_;	1157	my ($self, $ev, $x, $y) = @_;
1082		1158
1083	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1159	if ($ev->{button} == 2) {
1084	}	1160	$self->start_dragging ($ev);
		1161	return 1;
		1162	}
1085		1163
1086	sub update {	1164	0
1087	my ($self) = @_;	1165	}
1088		1166
1089	$self->SUPER::update;	1167	sub invoke_button_up {
		1168	my ($self, $ev, $x, $y) = @_;
1090		1169
1091	$self->update_slider;	1170	if (delete $self->{motion}) {
		1171	return 1;
		1172	}
		1173
		1174	0
		1175	}
		1176
		1177	sub invoke_mouse_motion {
		1178	my ($self, $ev, $x, $y) = @_;
		1179
		1180	if ($self->{motion}) {
		1181	$self->{motion}->($ev, $x, $y);
		1182	return 1;
		1183	}
		1184
		1185	0
1092	}	1186	}
1093		1187
1094	sub invoke_size_allocate {	1188	sub invoke_size_allocate {
1095	my ($self, $w, $h) = @_;	1189	my ($self, $w, $h) = @_;
1096		1190
1097	$self->update_slider;	1191	$self->update_slider;
1098
1099	$self->SUPER::invoke_size_allocate ($w, $h)	1192	$self->SUPER::invoke_size_allocate ($w, $h)
1100	}	1193	}
1101		1194
1102	#############################################################################	1195	#############################################################################
1103		1196
…		…
1123	my ($w, $h) = @$self{qw(w h)};	1216	my ($w, $h) = @$self{qw(w h)};
1124		1217
1125	glEnable GL_BLEND;	1218	glEnable GL_BLEND;
1126	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1219	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1127	glColor_premultiply @{ $self->{bg} };	1220	glColor_premultiply @{ $self->{bg} };
1128
1129	glBegin GL_QUADS;
1130	glVertex 0 , 0;
1131	glVertex 0 , $h;
1132	glVertex $w, $h;	1221	glRect 0, 0, $w, $h;
1133	glVertex $w, 0;
1134	glEnd;
1135
1136	glDisable GL_BLEND;	1222	glDisable GL_BLEND;
1137	}	1223	}
1138		1224
1139	$self->SUPER::_draw;	1225	$self->SUPER::_draw;
1140	}	1226	}
…		…
1253		1339
1254	my @border =	1340	my @border =
1255	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1341	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1256	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1342	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1257		1343
		1344	my @icon =
		1345	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1346	qw(x1_move.png x1_resize.png);
		1347
1258	sub new {	1348	sub new {
1259	my ($class, %arg) = @_;	1349	my ($class, %arg) = @_;
1260		1350
1261	my $self = $class->SUPER::new (	1351	my $self = $class->SUPER::new (
1262	bg => [1, 1, 1, 1],	1352	bg => [1, 1, 1, 1],
…		…
1297		1387
1298	sub border {	1388	sub border {
1299	int $_[0]{border} * $::FONTSIZE	1389	int $_[0]{border} * $::FONTSIZE
1300	}	1390	}
1301		1391
		1392	sub get_max_wh {
		1393	my ($self) = @_;
		1394
		1395	return ($self->{w}, $self->{h})
		1396	if $self->{visible} && $self->{w};
		1397
		1398	$self->SUPER::get_max_wh
		1399	}
		1400
1302	sub size_request {	1401	sub size_request {
1303	my ($self) = @_;	1402	my ($self) = @_;
1304		1403
1305	$self->{title_widget}->size_request	1404	$self->{title_widget}->size_request
1306	if $self->{title_widget};	1405	if $self->{title_widget};
…		…
1430	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1529	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1431		1530
1432	my $border = $self->border;	1531	my $border = $self->border;
1433		1532
1434	glColor @{ $self->{border_bg} };	1533	glColor @{ $self->{border_bg} };
1435	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1534	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1436	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1535	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1437	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1536	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1438	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1537	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1538
		1539	# move
		1540	my $w2 = ($w - $border) * .5;
		1541	my $h2 = ($h - $border) * .5;
		1542	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1543	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1544	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1545
		1546	# resize
		1547	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1548	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1549	unless $self->{has_close_button};
		1550	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1551	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1439		1552
1440	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1553	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1441	glColor @{ $self->{bg} };	1554	glColor @{ $self->{bg} };
1442		1555
1443	# TODO: repeat texture not scale	1556	# TODO: repeat texture not scale
…		…
1464		1577
1465	#############################################################################	1578	#############################################################################
1466		1579
1467	package CFPlus::UI::Table;	1580	package CFPlus::UI::Table;
1468		1581
1469	our @ISA = CFPlus::UI::Base::;	1582	our @ISA = CFPlus::UI::Container::;
1470		1583
1471	use List::Util qw(max sum);	1584	use List::Util qw(max sum);
1472		1585
1473	use CFPlus::OpenGL;	1586	use CFPlus::OpenGL;
1474		1587
1475	sub new {	1588	sub new {
1476	my $class = shift;	1589	my $class = shift;
1477		1590
1478	$class->SUPER::new (	1591	$class->SUPER::new (
1479	col_expand => [],	1592	col_expand => [],
		1593	row_expand => [],
1480	@_,	1594	@_,
1481	)	1595	)
1482	}	1596	}
1483		1597
1484	sub children {
1485	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1486	}
1487
1488	sub add {	1598	sub add {
		1599	my ($self, @widgets) = @_;
		1600
		1601	for my $child (@widgets) {
		1602	$child->{c_rowspan} ||= 1;
		1603	$child->{c_colspan} ||= 1;
		1604	}
		1605
		1606	$self->SUPER::add (@widgets);
		1607	}
		1608
		1609	sub add_at {
1489	my ($self) = shift;	1610	my $self = shift;
		1611
		1612	my @widgets;
1490		1613
1491	while (@_) {	1614	while (@_) {
1492	my ($x, $y, $child) = splice @_, 0, 3, ();	1615	my ($col, $row, $child) = splice @_, 0, 3, ();
1493	$child->set_parent ($self);
1494	$self->{children}[$y][$x] = $child;
1495	}
1496		1616
1497	$self->{force_realloc} = 1;	1617	$child->{c_row} = $row;
1498	$self->{force_size_alloc} = 1;	1618	$child->{c_col} = $col;
1499	$self->realloc;
1500	}
1501		1619
1502	sub remove {	1620	push @widgets, $child;
		1621	}
		1622
		1623	$self->add (@widgets);
		1624	}
		1625
		1626	sub get_wh {
1503	my ($self, $child) = @_;	1627	my ($self) = @_;
1504		1628
1505	# TODO: not yet implemented	1629	my (@w, @h);
1506	}
1507
1508	# TODO: move to container class maybe? send children a signal on removal?
1509	sub clear {
1510	my ($self) = @_;
1511		1630
1512	my @children = $self->children;	1631	my @children = $self->children;
1513	delete $self->{children};	1632
		1633	# first pass, columns
		1634	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1635	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1636
		1637	my $sw = sum @w[$c .. $c + $cs - 1];
		1638
		1639	if ($w > $sw) {
		1640	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1641	}
1514		1642	}
1515	for (@children) {
1516	delete $_->{parent};
1517	$_->hide;
1518	}
1519		1643
1520	$self->realloc;	1644	# second pass, rows
1521	}	1645	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1522
1523	sub get_wh {
1524	my ($self) = @_;
1525
1526	my (@w, @h);
1527
1528	for my $y (0 .. $#{$self->{children}}) {
1529	my $row = $self->{children}[$y]
1530	or next;
1531
1532	for my $x (0 .. $#$row) {
1533	my $widget = $row->[$x]
1534	or next;
1535	my ($w, $h) = @$widget{qw(req_w req_h)};	1646	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1536		1647
1537	$w[$x] = max $w[$x], $w;	1648	my $sh = sum @h[$r .. $r + $rs - 1];
1538	$h[$y] = max $h[$y], $h;	1649
		1650	if ($h > $sh) {
		1651	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1539	}	1652	}
1540	}	1653	}
1541		1654
1542	(\@w, \@h)	1655	(\@w, \@h)
1543	}	1656	}
…		…
1559	my ($ws, $hs) = $self->get_wh;	1672	my ($ws, $hs) = $self->get_wh;
1560		1673
1561	my $req_w = (sum @$ws) || 1;	1674	my $req_w = (sum @$ws) || 1;
1562	my $req_h = (sum @$hs) || 1;	1675	my $req_h = (sum @$hs) || 1;
1563		1676
1564	# TODO: nicer code && do row_expand	1677	# now linearly scale the rows/columns to the allocated size
1565	my @col_expand = @{$self->{col_expand}};	1678	my @col_expand = @{$self->{col_expand}};
1566	@col_expand = (1) x @$ws unless @col_expand;	1679	@col_expand = (1) x @$ws unless @col_expand;
1567	my $col_expand = (sum @col_expand) || 1;	1680	my $col_expand = (sum @col_expand) || 1;
1568		1681
1569	# linearly scale sizes
1570	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1682	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1571	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1572		1683
1573	CFPlus::UI::harmonize $ws;	1684	CFPlus::UI::harmonize $ws;
		1685
		1686	my @row_expand = @{$self->{row_expand}};
		1687	@row_expand = (1) x @$ws unless @row_expand;
		1688	my $row_expand = (sum @row_expand) || 1;
		1689
		1690	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1691
1574	CFPlus::UI::harmonize $hs;	1692	CFPlus::UI::harmonize $hs;
1575		1693
1576	my $y;	1694	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1695	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1577		1696
1578	for my $r (0 .. $#{$self->{children}}) {	1697	for my $widget ($self->children) {
1579	my $row = $self->{children}[$r]	1698	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1580	or next;
1581		1699
1582	my $x = 0;	1700	$widget->configure (
1583	my $row_h = $hs->[$r];	1701	$x[$c], $y[$r],
		1702	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1584		1703	);
1585	for my $c (0 .. $#$row) {	1704	}
1586	my $col_w = $ws->[$c];
1587		1705
1588	if (my $widget = $row->[$c]) {	1706	1
1589	$widget->configure ($x, $y, $col_w, $row_h);	1707	}
1590	}
1591		1708
1592	$x += $col_w;	1709	#############################################################################
		1710
		1711	package CFPlus::UI::Fixed;
		1712
		1713	use List::Util qw(min max);
		1714
		1715	our @ISA = CFPlus::UI::Container::;
		1716
		1717	sub _scale($$$) {
		1718	my ($rel, $val, $max) = @_;
		1719
		1720	$rel ? $val * $max : $val
		1721	}
		1722
		1723	sub size_request {
		1724	my ($self) = @_;
		1725
		1726	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1727
		1728	# determine overall size by querying abs widgets
		1729	for my $child ($self->visible_children) {
		1730	unless ($child->{c_rel}) {
		1731	my $x = $child->{c_x};
		1732	my $y = $child->{c_y};
		1733
		1734	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1735	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1593	}	1736	}
		1737	}
1594		1738
1595	$y += $row_h;	1739	my $W = $x2 - $x1;
		1740	my $H = $y2 - $y1;
		1741
		1742	# now layout remaining widgets
		1743	for my $child ($self->visible_children) {
		1744	if ($child->{c_rel}) {
		1745	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1746	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1747
		1748	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1749	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1750	}
		1751	}
		1752
		1753	my $W = $x2 - $x1;
		1754	my $H = $y2 - $y1;
		1755
		1756	($W, $H)
		1757	}
		1758
		1759	sub invoke_size_allocate {
		1760	my ($self, $W, $H) = @_;
		1761
		1762	for my $child ($self->visible_children) {
		1763	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1764	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1765
		1766	$x += $child->{c_halign} * $child->{req_w};
		1767	$y += $child->{c_valign} * $child->{req_h};
		1768
		1769	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1596	}	1770	}
1597		1771
1598	1	1772	1
1599	}	1773	}
1600		1774
1601	sub find_widget {
1602	my ($self, $x, $y) = @_;
1603
1604	$x -= $self->{x};
1605	$y -= $self->{y};
1606
1607	my $res;
1608
1609	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1610	$res = $_->find_widget ($x, $y)
1611	and return $res;
1612	}
1613
1614	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1615	}
1616
1617	sub _draw {
1618	my ($self) = @_;
1619
1620	for (grep $_, @{$self->{children}}) {
1621	$_->draw for grep $_, @$_;
1622	}
1623	}
1624
1625	#############################################################################	1775	#############################################################################
1626		1776
1627	package CFPlus::UI::Box;	1777	package CFPlus::UI::Box;
1628		1778
1629	our @ISA = CFPlus::UI::Container::;	1779	our @ISA = CFPlus::UI::Container::;
1630		1780
1631	sub size_request {	1781	sub size_request {
1632	my ($self) = @_;	1782	my ($self) = @_;
		1783
		1784	my @children = $self->visible_children;
1633		1785
1634	$self->{vertical}	1786	$self->{vertical}
1635	? (	1787	? (
1636	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1788	(List::Util::max map $_->{req_w}, @children),
1637	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1789	(List::Util::sum map $_->{req_h}, @children),
1638	)	1790	)
1639	: (	1791	: (
1640	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1792	(List::Util::sum map $_->{req_w}, @children),
1641	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1793	(List::Util::max map $_->{req_h}, @children),
1642	)	1794	)
1643	}	1795	}
1644		1796
1645	sub invoke_size_allocate {	1797	sub invoke_size_allocate {
1646	my ($self, $w, $h) = @_;	1798	my ($self, $w, $h) = @_;
…		…
1770		1922
1771	delete $self->{ox};	1923	delete $self->{ox};
1772	$self->SUPER::realloc;	1924	$self->SUPER::realloc;
1773	}	1925	}
1774		1926
		1927	sub clear {
		1928	my ($self) = @_;
		1929
		1930	$self->set_text ("");
		1931	}
		1932
1775	sub set_text {	1933	sub set_text {
1776	my ($self, $text) = @_;	1934	my ($self, $text) = @_;
1777		1935
1778	return if $self->{text} eq "T$text";	1936	return if $self->{text} eq "T$text";
1779	$self->{text} = "T$text";	1937	$self->{text} = "T$text";
…		…
1802		1960
1803	sub size_request {	1961	sub size_request {
1804	my ($self) = @_;	1962	my ($self) = @_;
1805		1963
1806	$self->{size_req} ||= do {	1964	$self->{size_req} ||= do {
		1965	my ($max_w, $max_h) = $self->get_max_wh;
		1966
1807	$self->{layout}->set_font ($self->{font}) if $self->{font};	1967	$self->{layout}->set_font ($self->{font}) if $self->{font};
1808	$self->{layout}->set_width ($self->{max_w} || -1);	1968	$self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1809	$self->{layout}->set_ellipsise ($self->{ellipsise});	1969	$self->{layout}->set_ellipsise ($self->{ellipsise});
1810	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1970	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1811	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1971	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1812		1972
1813	my ($w, $h) = $self->{layout}->size;	1973	my ($w, $h) = $self->{layout}->size;
…		…
1885	: ($self->{w} - $size->[0]) * 0.5);	2045	: ($self->{w} - $size->[0]) * 0.5);
1886		2046
1887	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2047	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1888	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2048	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1889	: ($self->{h} - $size->[1]) * 0.5);	2049	: ($self->{h} - $size->[1]) * 0.5);
		2050
		2051	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1890	};	2052	};
1891		2053
1892	my $w = List::Util::min $self->{w} + 4, $size->[0];	2054	# unless ($self->{list}) {
1893	my $h = List::Util::min $self->{h} + 2, $size->[1];	2055	# $self->{list} = CFPlus::OpenGL::glGenList;
1894		2056	# CFPlus::OpenGL::glNewList $self->{list};
1895	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2057	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2058	# CFPlus::OpenGL::glEndList;
		2059	# }
		2060	#
		2061	# CFPlus::OpenGL::glCallList $self->{list};
		2062
		2063	$self->{layout}->draw;
1896	}	2064	}
		2065
		2066	#sub destroy {
		2067	# my ($self) = @_;
		2068	#
		2069	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2070	#
		2071	# $self->SUPER::destroy;
		2072	#}
1897		2073
1898	#############################################################################	2074	#############################################################################
1899		2075
1900	package CFPlus::UI::EntryBase;	2076	package CFPlus::UI::EntryBase;
1901		2077
…		…
1907	my $class = shift;	2083	my $class = shift;
1908		2084
1909	$class->SUPER::new (	2085	$class->SUPER::new (
1910	fg => [1, 1, 1],	2086	fg => [1, 1, 1],
1911	bg => [0, 0, 0, 0.2],	2087	bg => [0, 0, 0, 0.2],
		2088	outline => [0.6, 0.3, 0.1],
1912	active_bg => [1, 1, 1, 0.5],	2089	active_bg => [0, 0, 1, .2],
1913	active_fg => [0, 0, 0],	2090	active_fg => [1, 1, 1],
		2091	active_outline => [1, 1, 0],
1914	can_hover => 1,	2092	can_hover => 1,
1915	can_focus => 1,	2093	can_focus => 1,
1916	valign => 0,	2094	valign => 0,
1917	can_events => 1,	2095	can_events => 1,
		2096	ellipsise => 0,
1918	#text => ...	2097	#text => ...
1919	#hidden => "*",	2098	#hidden => "*",
1920	@_	2099	@_
1921	)	2100	)
1922	}	2101	}
…		…
1966	my $mod = $ev->{mod};	2145	my $mod = $ev->{mod};
1967	my $sym = $ev->{sym};	2146	my $sym = $ev->{sym};
1968	my $uni = $ev->{unicode};	2147	my $uni = $ev->{unicode};
1969		2148
1970	my $text = $self->get_text;	2149	my $text = $self->get_text;
		2150
		2151	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1971		2152
1972	if ($uni == 8) {	2153	if ($uni == 8) {
1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2154	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974	} elsif ($uni == 127) {	2155	} elsif ($uni == 127) {
1975	substr $text, $self->{cursor}, 1, "";	2156	substr $text, $self->{cursor}, 1, "";
1976	} elsif ($sym == CFPlus::SDLK_LEFT) {	2157	} elsif ($sym == CFPlus::SDLK_LEFT) {
1977	--$self->{cursor} if $self->{cursor};	2158	--$self->{cursor} if $self->{cursor};
1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2159	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1979	++$self->{cursor} if $self->{cursor} < length $self->{text};	2160	++$self->{cursor} if $self->{cursor} < length $self->{text};
1980	} elsif ($sym == CFPlus::SDLK_HOME) {	2161	} elsif ($sym == CFPlus::SDLK_HOME) {
		2162	# what a hack
1981	$self->{cursor} = 0;	2163	$self->{cursor} =
		2164	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2165	? length $1
		2166	: 0;
1982	} elsif ($sym == CFPlus::SDLK_END) {	2167	} elsif ($sym == CFPlus::SDLK_END) {
		2168	# uh, again
		2169	$self->{cursor} =
		2170	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1983	$self->{cursor} = length $text;	2171	? $self->{cursor} + length $1
		2172	: length $self->{text};
1984	} elsif ($uni == 21) { # ctrl-u	2173	} elsif ($uni == 21) { # ctrl-u
1985	$text = "";	2174	$text = "";
1986	$self->{cursor} = 0;	2175	$self->{cursor} = 0;
1987	} elsif ($uni == 27) {	2176	} elsif ($uni == 27) {
1988	$self->emit ('escape');	2177	$self->emit ('escape');
1989	} elsif ($uni) {	2178	} elsif ($uni == 0x0d) {
		2179	substr $text, $self->{cursor}++, 0, "\012";
		2180	} elsif ($uni >= 0x20) {
1990	substr $text, $self->{cursor}++, 0, chr $uni;	2181	substr $text, $self->{cursor}++, 0, chr $uni;
1991	} else {	2182	} else {
1992	return 0;	2183	return 0;
1993	}	2184	}
1994		2185
1995	$self->_set_text ($text);	2186	$self->_set_text ($text);
1996		2187
1997	$self->realloc;	2188	$self->realloc;
		2189	$self->update;
1998		2190
1999	1	2191	1
2000	}	2192	}
2001		2193
2002	sub invoke_focus_in {	2194	sub invoke_focus_in {
…		…
2044	glColor_premultiply @{$self->{bg}};	2236	glColor_premultiply @{$self->{bg}};
2045	}	2237	}
2046		2238
2047	glEnable GL_BLEND;	2239	glEnable GL_BLEND;
2048	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2240	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2049	glBegin GL_QUADS;
2050	glVertex 0 , 0;
2051	glVertex 0 , $self->{h};
2052	glVertex $self->{w}, $self->{h};	2241	glRect 0, 0, $self->{w}, $self->{h};
2053	glVertex $self->{w}, 0;
2054	glEnd;
2055	glDisable GL_BLEND;	2242	glDisable GL_BLEND;
2056		2243
2057	$self->SUPER::_draw;	2244	$self->SUPER::_draw;
2058		2245
2059	#TODO: force update every cursor change :(	2246	#TODO: force update every cursor change :(
…		…
2061		2248
2062	unless (exists $self->{cur_h}) {	2249	unless (exists $self->{cur_h}) {
2063	my $text = substr $self->{text}, 0, $self->{cursor};	2250	my $text = substr $self->{text}, 0, $self->{cursor};
2064	utf8::encode $text;	2251	utf8::encode $text;
2065		2252
2066	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2253	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2067	}	2254	}
2068		2255
		2256	glColor_premultiply @{$self->{active_fg}};
2069	glBegin GL_LINES;	2257	glBegin GL_LINES;
2070	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2258	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2071	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2259	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2072	glEnd;	2260	glEnd;
		2261
		2262	glLineWidth 3;
		2263	glColor @{$self->{active_outline}};
		2264	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2265	glLineWidth 1;
		2266
		2267	} else {
		2268	glColor @{$self->{outline}};
		2269	glBegin GL_LINE_STRIP;
		2270	glVertex .5, $self->{h} * .5;
		2271	glVertex .5, $self->{h} - 2.5;
		2272	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2273	glVertex $self->{w} - .5, $self->{h} * .5;
		2274	glEnd;
2073	}	2275	}
2074	}	2276	}
		2277
		2278	#############################################################################
2075		2279
2076	package CFPlus::UI::Entry;	2280	package CFPlus::UI::Entry;
2077		2281
2078	our @ISA = CFPlus::UI::EntryBase::;	2282	our @ISA = CFPlus::UI::EntryBase::;
2079		2283
…		…
2082	sub invoke_key_down {	2286	sub invoke_key_down {
2083	my ($self, $ev) = @_;	2287	my ($self, $ev) = @_;
2084		2288
2085	my $sym = $ev->{sym};	2289	my $sym = $ev->{sym};
2086		2290
2087	if ($sym == 13) {	2291	if ($ev->{uni} == 0x0d || $sym == 13) {
2088	unshift @{$self->{history}},	2292	unshift @{$self->{history}},
2089	my $txt = $self->get_text;	2293	my $txt = $self->get_text;
2090		2294
2091	$self->{history_pointer} = -1;	2295	$self->{history_pointer} = -1;
2092	$self->{history_saveback} = '';	2296	$self->{history_saveback} = '';
…		…
2122	1	2326	1
2123	}	2327	}
2124		2328
2125	#############################################################################	2329	#############################################################################
2126		2330
		2331	package CFPlus::UI::TextEdit;
		2332
		2333	our @ISA = CFPlus::UI::EntryBase::;
		2334
		2335	use CFPlus::OpenGL;
		2336
		2337	sub move_cursor_ver {
		2338	my ($self, $dy) = @_;
		2339
		2340	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2341
		2342	$y += $dy;
		2343
		2344	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2345	$self->{cursor} = $index;
		2346	delete $self->{cur_h};
		2347	$self->update;
		2348	return;
		2349	}
		2350	}
		2351
		2352	sub invoke_key_down {
		2353	my ($self, $ev) = @_;
		2354
		2355	my $sym = $ev->{sym};
		2356
		2357	if ($sym == CFPlus::SDLK_UP) {
		2358	$self->move_cursor_ver (-1);
		2359	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2360	$self->move_cursor_ver (+1);
		2361	} else {
		2362	return $self->SUPER::invoke_key_down ($ev)
		2363	}
		2364
		2365	1
		2366	}
		2367
		2368	#############################################################################
		2369
2127	package CFPlus::UI::Button;	2370	package CFPlus::UI::ButtonBin;
2128		2371
2129	our @ISA = CFPlus::UI::Label::;	2372	our @ISA = CFPlus::UI::Bin::;
2130		2373
2131	use CFPlus::OpenGL;	2374	use CFPlus::OpenGL;
2132		2375
2133	my @tex =	2376	my @tex =
2134	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2377	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2135	qw(b1_button_active.png);	2378	qw(b1_button_inactive.png b1_button_active.png);
2136		2379
2137	sub new {	2380	sub new {
2138	my $class = shift;	2381	my $class = shift;
2139		2382
2140	$class->SUPER::new (	2383	$class->SUPER::new (
2141	padding_x => 4,
2142	padding_y => 4,
2143	fg => [1, 1, 1],
2144	active_fg => [0, 0, 1],
2145	can_hover => 1,	2384	can_hover => 1,
2146	align => 0,	2385	align => 0,
2147	valign => 0,	2386	valign => 0,
2148	can_events => 1,	2387	can_events => 1,
2149	@_	2388	@_
…		…
2161	}	2400	}
2162		2401
2163	sub _draw {	2402	sub _draw {
2164	my ($self) = @_;	2403	my ($self) = @_;
2165		2404
2166	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2167
2168	glEnable GL_TEXTURE_2D;	2405	glEnable GL_TEXTURE_2D;
2169	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2406	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170	glColor 0, 0, 0, 1;	2407	glColor 0, 0, 0, 1;
2171		2408
		2409	my $tex = $tex[$GRAB == $self];
2172	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2410	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2411
		2412	glDisable GL_TEXTURE_2D;
		2413
		2414	$self->SUPER::_draw;
		2415	}
		2416
		2417	#############################################################################
		2418
		2419	package CFPlus::UI::Button;
		2420
		2421	our @ISA = CFPlus::UI::Label::;
		2422
		2423	use CFPlus::OpenGL;
		2424
		2425	my @tex =
		2426	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2427	qw(b1_button_inactive.png b1_button_active.png);
		2428
		2429	sub new {
		2430	my $class = shift;
		2431
		2432	$class->SUPER::new (
		2433	padding_x => 4,
		2434	padding_y => 4,
		2435	fg => [1.0, 1.0, 1.0],
		2436	active_fg => [0.8, 0.8, 0.8],
		2437	can_hover => 1,
		2438	align => 0,
		2439	valign => 0,
		2440	can_events => 1,
		2441	@_
		2442	)
		2443	}
		2444
		2445	sub invoke_button_up {
		2446	my ($self, $ev, $x, $y) = @_;
		2447
		2448	$self->emit ("activate")
		2449	if $x >= 0 && $x < $self->{w}
		2450	&& $y >= 0 && $y < $self->{h};
		2451
		2452	1
		2453	}
		2454
		2455	sub _draw {
		2456	my ($self) = @_;
		2457
		2458	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2459
		2460	glEnable GL_TEXTURE_2D;
		2461	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2462	glColor 0, 0, 0, 1;
		2463
		2464	my $tex = $tex[$GRAB == $self];
		2465	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2173		2466
2174	glDisable GL_TEXTURE_2D;	2467	glDisable GL_TEXTURE_2D;
2175		2468
2176	$self->SUPER::_draw;	2469	$self->SUPER::_draw;
2177	}	2470	}
…		…
2234	sub _draw {	2527	sub _draw {
2235	my ($self) = @_;	2528	my ($self) = @_;
2236		2529
2237	$self->SUPER::_draw;	2530	$self->SUPER::_draw;
2238		2531
2239	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2532	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2240		2533
2241	my ($w, $h) = @$self{qw(w h)};	2534	my ($w, $h) = @$self{qw(w h)};
2242		2535
2243	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;	2536	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2244		2537
…		…
2264	sub new {	2557	sub new {
2265	my $class = shift;	2558	my $class = shift;
2266		2559
2267	my $self = $class->SUPER::new (	2560	my $self = $class->SUPER::new (
2268	can_events => 0,	2561	can_events => 0,
		2562	scale => 1,
2269	@_,	2563	@_,
2270	);	2564	);
2271		2565
2272	$self->{path} || $self->{tex}	2566	$self->{path} || $self->{tex}
2273	or Carp::croak "'path' or 'tex' attributes required";	2567	or Carp::croak "'path' or 'tex' attributes required";
2274		2568
2275	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2569	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2276	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2570	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2277		2571
2278	Scalar::Util::weaken $texture_cache{$self->{path}};	2572	CFPlus::weaken $texture_cache{$self->{path}};
2279		2573
2280	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2574	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2281		2575
2282	$self	2576	$self
2283	}	2577	}
…		…
2298	}	2592	}
2299		2593
2300	sub size_request {	2594	sub size_request {
2301	my ($self) = @_;	2595	my ($self) = @_;
2302		2596
2303	($self->{tex}{w}, $self->{tex}{h})	2597	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2304	}	2598	}
2305		2599
2306	sub _draw {	2600	sub _draw {
2307	my ($self) = @_;	2601	my ($self) = @_;
2308		2602
…		…
2318	}	2612	}
2319		2613
2320	glEnable GL_TEXTURE_2D;	2614	glEnable GL_TEXTURE_2D;
2321	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2615	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2322		2616
2323	$tex->draw_quad (0, 0, $w, $h);	2617	$tex->draw_quad_alpha (0, 0, $w, $h);
2324		2618
2325	glDisable GL_TEXTURE_2D;	2619	glDisable GL_TEXTURE_2D;
2326	}	2620	}
2327		2621
2328	#############################################################################	2622	#############################################################################
…		…
2347	align => 0,	2641	align => 0,
2348	valign => 0,	2642	valign => 0,
2349	can_events => 1,	2643	can_events => 1,
2350	@_	2644	@_
2351	);	2645	);
		2646	}
		2647
		2648	sub invoke_button_down {
		2649	my ($self, $ev, $x, $y) = @_;
		2650
		2651	1
2352	}	2652	}
2353		2653
2354	sub invoke_button_up {	2654	sub invoke_button_up {
2355	my ($self, $ev, $x, $y) = @_;	2655	my ($self, $ev, $x, $y) = @_;
2356		2656
…		…
2496	glDisable GL_TEXTURE_2D;	2796	glDisable GL_TEXTURE_2D;
2497	}	2797	}
2498		2798
2499	#############################################################################	2799	#############################################################################
2500		2800
		2801	package CFPlus::UI::Progress;
		2802
		2803	our @ISA = CFPlus::UI::Label::;
		2804
		2805	use CFPlus::OpenGL;
		2806
		2807	sub new {
		2808	my ($class, %arg) = @_;
		2809
		2810	my $self = $class->SUPER::new (
		2811	fg => [1, 1, 1],
		2812	bg => [0, 0, 1, 0.2],
		2813	bar => [0.7, 0.5, 0.1, 0.8],
		2814	outline => [0.4, 0.3, 0],
		2815	fontsize => 0.9,
		2816	valign => 0,
		2817	align => 0,
		2818	can_events => 1,
		2819	ellipsise => 1,
		2820	label => "%d%%",
		2821	%arg,
		2822	);
		2823
		2824	$self->set_value ($arg{value} || -1);
		2825
		2826	$self
		2827	}
		2828
		2829	sub set_label {
		2830	my ($self, $label) = @_;
		2831
		2832	return if $self->{label} eq $label;
		2833	$self->{label} = $label;
		2834
		2835	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2836	}
		2837
		2838	sub set_value {
		2839	my ($self, $value) = @_;
		2840
		2841	if ($self->{value} ne $value) {
		2842	$self->{value} = $value;
		2843
		2844	if ($value < 0) {
		2845	$self->set_text ("-");
		2846	} else {
		2847	$self->set_text (sprintf $self->{label}, $value * 100);
		2848	}
		2849
		2850	$self->update;
		2851	}
		2852	}
		2853
		2854	sub _draw {
		2855	my ($self) = @_;
		2856
		2857	glEnable GL_BLEND;
		2858	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2859
		2860	if ($self->{value} >= 0) {
		2861	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2862
		2863	glColor_premultiply @{$self->{bar}};
		2864	glRect 2, 2, $s, $self->{h} - 2;
		2865	glColor_premultiply @{$self->{bg}};
		2866	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2867	}
		2868
		2869	glColor_premultiply @{$self->{outline}};
		2870	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2871
		2872	glDisable GL_BLEND;
		2873
		2874	{
		2875	local $self->{bg}; # do not draw background
		2876	$self->SUPER::_draw;
		2877	}
		2878	}
		2879
		2880	#############################################################################
		2881
		2882	package CFPlus::UI::ExperienceProgress;
		2883
		2884	our @ISA = CFPlus::UI::Progress::;
		2885
		2886	sub new {
		2887	my ($class, %arg) = @_;
		2888
		2889	my $self = $class->SUPER::new (
		2890	tooltip => sub {
		2891	my ($self) = @_;
		2892
		2893	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2894	$self->{lvl},
		2895	::formsep ($self->{exp}),
		2896	::formsep ($self->{nxt}),
		2897	::formsep ($self->{nxt} - $self->{exp}),
		2898	},
		2899	%arg
		2900	);
		2901
		2902	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2903	if $::CONN;
		2904
		2905	$self
		2906	}
		2907
		2908	sub DESTROY {
		2909	my ($self) = @_;
		2910
		2911	delete $::CONN->{on_exp_update}{$self+0}
		2912	if $::CONN;
		2913
		2914	$self->SUPER::DESTROY;
		2915	}
		2916
		2917	sub set_value {
		2918	my ($self, $lvl, $exp) = @_;
		2919
		2920	$self->{lvl} = $lvl;
		2921	$self->{exp} = $exp;
		2922
		2923	my $v = -1;
		2924
		2925	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2926	my $l0 = $table->[$lvl - 1];
		2927	my $l1 = $table->[$lvl];
		2928
		2929	$self->{nxt} = $l1;
		2930
		2931	$v = ($exp - $l0) / ($l1 - $l0);
		2932	}
		2933
		2934	$self->SUPER::set_value ($v);
		2935	}
		2936
		2937	#############################################################################
		2938
2501	package CFPlus::UI::Gauge;	2939	package CFPlus::UI::Gauge;
2502		2940
2503	our @ISA = CFPlus::UI::VBox::;	2941	our @ISA = CFPlus::UI::VBox::;
2504		2942
2505	sub new {	2943	sub new {
…		…
2630		3068
2631	$self->SUPER::invoke_button_down ($ev, $x, $y);	3069	$self->SUPER::invoke_button_down ($ev, $x, $y);
2632		3070
2633	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3071	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2634		3072
2635	$self->invoke_mouse_motion ($ev, $x, $y)	3073	$self->invoke_mouse_motion ($ev, $x, $y);
		3074
		3075	1
2636	}	3076	}
2637		3077
2638	sub invoke_mouse_motion {	3078	sub invoke_mouse_motion {
2639	my ($self, $ev, $x, $y) = @_;	3079	my ($self, $ev, $x, $y) = @_;
2640		3080
…		…
2656	sub invoke_mouse_wheel {	3096	sub invoke_mouse_wheel {
2657	my ($self, $ev) = @_;	3097	my ($self, $ev) = @_;
2658		3098
2659	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3099	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2660		3100
		3101	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3102
2661	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	3103	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2662		3104
2663	! ! $delta	3105	1
2664	}	3106	}
2665		3107
2666	sub update {	3108	sub update {
2667	my ($self) = @_;	3109	my ($self) = @_;
2668		3110
…		…
2776	#font => default_font	3218	#font => default_font
2777	@_,	3219	@_,
2778		3220
2779	layout => (new CFPlus::Layout),	3221	layout => (new CFPlus::Layout),
2780	par => [],	3222	par => [],
		3223	max_par => 0,
2781	height => 0,	3224	height => 0,
2782	children => [	3225	children => [
2783	(new CFPlus::UI::Empty expand => 1),	3226	(new CFPlus::UI::Empty expand => 1),
2784	(new CFPlus::UI::Slider vertical => 1),	3227	(new CFPlus::UI::Slider vertical => 1),
2785	],	3228	],
…		…
2798	}	3241	}
2799		3242
2800	sub size_request {	3243	sub size_request {
2801	my ($self) = @_;	3244	my ($self) = @_;
2802		3245
2803	my ($empty, $slider) = @{ $self->{children} };	3246	my ($empty, $slider) = $self->visible_children;
2804		3247
2805	local $self->{children} = [$empty, $slider];	3248	local $self->{children} = [$empty, $slider];
2806	$self->SUPER::size_request	3249	$self->SUPER::size_request
2807	}	3250	}
2808		3251
…		…
2910		3353
2911	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3354	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2912	push @{$self->{par}}, $para;	3355	push @{$self->{par}}, $para;
2913	}	3356	}
2914		3357
		3358	if (my $max = $self->{max_par}) {
		3359	shift @{$self->{par}} while @{$self->{par}} > $max;
		3360	}
		3361
2915	$self->{need_reflow}++;	3362	$self->{need_reflow}++;
2916	$self->update;	3363	$self->update;
2917	}	3364	}
2918		3365
2919	sub scroll_to_bottom {	3366	sub scroll_to_bottom {
…		…
2993		3440
2994	if ($y0 < $y + $h && $y < $y1) {	3441	if ($y0 < $y + $h && $y < $y1) {
2995	my $layout = $self->get_layout ($para);	3442	my $layout = $self->get_layout ($para);
2996		3443
2997	$layout->render ($para->{indent}, $y - $y0);	3444	$layout->render ($para->{indent}, $y - $y0);
		3445	$layout->draw;
2998		3446
2999	if (my @w = @{ $para->{widget} }) {	3447	if (my @w = @{ $para->{widget} }) {
3000	my @s = $layout->get_shapes;	3448	my @s = $layout->get_shapes;
3001		3449
3002	for (@w) {	3450	for (@w) {
…		…
3124	}	3572	}
3125		3573
3126	sub set_tooltip_from {	3574	sub set_tooltip_from {
3127	my ($self, $widget) = @_;	3575	my ($self, $widget) = @_;
3128		3576
3129	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3130	if $widget->{tooltip} =~ /^#(.*)$/;
3131
3132	my $tooltip = $widget->{tooltip};	3577	my $tip = $widget->{tooltip};
		3578	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3579
		3580	$tip = CFPlus::Pod::section_label tooltip => $1
		3581	if $tip =~ /^#(.*)$/;
3133		3582
3134	if ($ENV{CFPLUS_DEBUG} & 2) {	3583	if ($ENV{CFPLUS_DEBUG} & 2) {
3135	$tooltip .= "\n\n" . (ref $widget) . "\n"	3584	$tip .= "\n\n" . (ref $widget) . "\n"
3136	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3585	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3137	. "req $widget->{req_w} $widget->{req_h}\n"	3586	. "req $widget->{req_w} $widget->{req_h}\n"
3138	. "visible $widget->{visible}";	3587	. "visible $widget->{visible}";
3139	}	3588	}
3140		3589
3141	$tooltip =~ s/^\n+//;	3590	$tip =~ s/^\n+//;
3142	$tooltip =~ s/\n+$//;	3591	$tip =~ s/\n+$//;
3143		3592
3144	$self->add (new CFPlus::UI::Label	3593	$self->add (new CFPlus::UI::Label
3145	markup => $tooltip,	3594	markup => $tip,
3146	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3595	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3147	fontsize => 0.8,	3596	fontsize => 0.8,
3148	style => 1, # FLAG_INVERSE	3597	style => 1, # FLAG_INVERSE
3149	ellipsise => 0,	3598	ellipsise => 0,
3150	font => ($widget->{tooltip_font} || $::FONT_PROP),	3599	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
3188	}	3637	}
3189		3638
3190	sub _draw {	3639	sub _draw {
3191	my ($self) = @_;	3640	my ($self) = @_;
3192		3641
3193	glTranslate 0.375, 0.375;
3194
3195	my ($w, $h) = @$self{qw(w h)};	3642	my ($w, $h) = @$self{qw(w h)};
3196		3643
3197	glColor 1, 0.8, 0.4;	3644	glColor 1, 0.8, 0.4;
3198	glBegin GL_QUADS;	3645	glRect 0, 0, $w, $h;
3199	glVertex 0 , 0;
3200	glVertex 0 , $h;
3201	glVertex $w, $h;
3202	glVertex $w, 0;
3203	glEnd;
3204		3646
3205	glColor 0, 0, 0;	3647	glColor 0, 0, 0;
3206	glBegin GL_LINE_LOOP;	3648	glRect_lineloop .5, .5, $w + .5, $h + .5;
3207	glVertex 0 , 0;
3208	glVertex 0 , $h;
3209	glVertex $w, $h;
3210	glVertex $w, 0;
3211	glEnd;
3212		3649
3213	glTranslate 2 - 0.375, 2 - 0.375;	3650	glTranslate 2, 2;
3214		3651
3215	$self->SUPER::_draw;	3652	$self->SUPER::_draw;
3216	}	3653	}
3217		3654
3218	#############################################################################	3655	#############################################################################
…		…
3225		3662
3226	sub new {	3663	sub new {
3227	my $class = shift;	3664	my $class = shift;
3228		3665
3229	my $self = $class->SUPER::new (	3666	my $self = $class->SUPER::new (
		3667	size_w => 32,
		3668	size_h => 8,
3230	aspect => 1,	3669	aspect => 1,
3231	can_events => 0,	3670	can_events => 0,
3232	@_,	3671	@_,
3233	);	3672	);
3234		3673
3235	if ($self->{anim} && $self->{animspeed}) {	3674	if ($self->{anim} && $self->{animspeed}) {
3236	Scalar::Util::weaken (my $widget = $self);	3675	CFPlus::weaken (my $widget = $self);
3237		3676
		3677	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3678	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3238	$self->{timer} = Event->timer (	3679	$self->{timer} = Event->timer (
3239	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3240	hard => 1,	3680	parked => 1,
3241	interval => $self->{animspeed},
3242	cb => sub {	3681	cb => sub {
		3682	return unless $::CONN;
		3683
		3684	my $w = $widget
		3685	or return;
		3686
3243	++$widget->{frame};	3687	++$w->{frame};
		3688	$w->update_face;
		3689
		3690	# somehow, $widget can go away
3244	$widget->update;	3691	$w->update;
		3692	$w->update_timer;
3245	},	3693	},
3246	);	3694	);
		3695
		3696	$self->update_face;
		3697	$self->update_timer;
3247	}	3698	}
3248		3699
3249	$self	3700	$self
3250	}	3701	}
3251		3702
		3703	sub update_timer {
		3704	my ($self) = @_;
		3705
		3706	return unless $self->{timer};
		3707
		3708	if ($self->{visible}) {
		3709	$self->{timer}->at (
		3710	$self->{anim_start}
		3711	+ $self->{animspeed}
		3712	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3713	);
		3714	$self->{timer}->start;
		3715	} else {
		3716	$self->{timer}->stop;
		3717	}
		3718	}
		3719
		3720	sub update_face {
		3721	my ($self) = @_;
		3722
		3723	if ($::CONN) {
		3724	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3725	if ($anim && @$anim) {
		3726	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3727	delete $self->{face_change_cb};
		3728
		3729	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3730	unless ($tex->{name} || $tex->{loading}) {
		3731	$tex->upload (sub { $self->reconfigure });
		3732	}
		3733	}
		3734	}
		3735	}
		3736	}
		3737	}
		3738
3252	sub size_request {	3739	sub size_request {
3253	(32, 8)	3740	my ($self) = @_;
		3741
		3742	if ($::CONN) {
		3743	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3744	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3745	if ($tex->{name}) {
		3746	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3747	} elsif (!$tex->{loading}) {
		3748	$tex->upload (sub { $self->reconfigure });
		3749	}
		3750	}
		3751
		3752	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3753	}
		3754	}
		3755
		3756	($self->{size_w} || 8, $self->{size_h} || 8)
3254	}	3757	}
3255		3758
3256	sub update {	3759	sub update {
3257	my ($self) = @_;	3760	my ($self) = @_;
3258		3761
3259	return unless $self->{visible};	3762	return unless $self->{visible};
3260		3763
3261	$self->SUPER::update;	3764	$self->SUPER::update;
3262	}	3765	}
3263		3766
		3767	sub invoke_visibility_change {
		3768	my ($self) = @_;
		3769
		3770	$self->update_timer;
		3771
		3772	0
		3773	}
		3774
3264	sub _draw {	3775	sub _draw {
3265	my ($self) = @_;	3776	my ($self) = @_;
3266		3777
3267	return unless $::CONN;
3268
3269	$self->SUPER::_draw;	3778	$self->SUPER::_draw;
3270		3779
3271	my $face;	3780	if (my $tex = $self->{tex}) {
3272
3273	if ($self->{frame}) {
3274	my $anim = $::CONN->{anim}[$self->{anim}];
3275
3276	$face = $anim->[ $self->{frame} % @$anim ]
3277	if $anim && @$anim;
3278	}
3279
3280	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3281
3282	if ($tex) {
3283	glEnable GL_TEXTURE_2D;	3781	glEnable GL_TEXTURE_2D;
3284	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3782	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3285	glColor 0, 0, 0, 1;	3783	glColor 0, 0, 0, 1;
3286	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3784	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3287	glDisable GL_TEXTURE_2D;	3785	glDisable GL_TEXTURE_2D;
…		…
3289	}	3787	}
3290		3788
3291	sub destroy {	3789	sub destroy {
3292	my ($self) = @_;	3790	my ($self) = @_;
3293		3791
3294	$self->{timer}->cancel	3792	(delete $self->{timer})->cancel
3295	if $self->{timer};	3793	if $self->{timer};
3296		3794
3297	$self->SUPER::destroy;	3795	$self->SUPER::destroy;
3298	}	3796	}
3299		3797
…		…
3339	children => [	3837	children => [
3340	(new CFPlus::UI::Label markup => $left, expand => 1),	3838	(new CFPlus::UI::Label markup => $left, expand => 1),
3341	(new CFPlus::UI::Label markup => $right, align => +1),	3839	(new CFPlus::UI::Label markup => $right, align => +1),
3342	],	3840	],
3343	;	3841	;
3344		3842
3345	} else {	3843	} else {
3346	$widget = new CFPlus::UI::Label	3844	$widget = new CFPlus::UI::Label
3347	can_hover => 1,	3845	can_hover => 1,
3348	can_events => 1,	3846	can_events => 1,
3349	markup => $widget,	3847	markup => $widget,
…		…
3474		3972
3475	#############################################################################	3973	#############################################################################
3476		3974
3477	package CFPlus::UI::Notebook;	3975	package CFPlus::UI::Notebook;
3478		3976
		3977	use CFPlus::OpenGL;
		3978
3479	our @ISA = CFPlus::UI::VBox::;	3979	our @ISA = CFPlus::UI::VBox::;
3480		3980
3481	sub new {	3981	sub new {
3482	my $class = shift;	3982	my $class = shift;
3483		3983
3484	my $self = $class->SUPER::new (	3984	my $self = $class->SUPER::new (
3485	buttonbar => (new CFPlus::UI::Buttonbar),	3985	buttonbar => (new CFPlus::UI::Buttonbar),
3486	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3986	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3987	active_outline => [.7, .7, 0.2],
3487	# filter => # will be put between multiplexer and $self	3988	# filter => # will be put between multiplexer and $self
3488	@_,	3989	@_,
3489	);	3990	);
3490		3991
3491	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3992	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3492	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3993	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3493		3994
		3995	{
		3996	Scalar::Util::weaken (my $wself = $self);
		3997
		3998	$self->{multiplexer}->connect (c_add => sub {
		3999	my ($mplex, $widgets) = @_;
		4000
		4001	for my $child (@$widgets) {
		4002	Scalar::Util::weaken $child;
		4003	$child->{c_tab_} ||= do {
		4004	my $tab =
		4005	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		4006	? $child->{c_tab}
		4007	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4008
		4009	$tab->connect (activate => sub {
		4010	$wself->set_current_page ($child);
		4011	});
		4012
		4013	$tab
		4014	};
		4015
		4016	$self->{buttonbar}->add ($child->{c_tab_});
		4017	}
		4018	});
		4019
		4020	$self->{multiplexer}->connect (c_remove => sub {
		4021	my ($mplex, $widgets) = @_;
		4022
		4023	for my $child (@$widgets) {
		4024	$wself->{buttonbar}->remove ($child->{c_tab_});
		4025	}
		4026	});
		4027	}
		4028
3494	$self	4029	$self
3495	}	4030	}
3496		4031
3497	sub add {	4032	sub add {
		4033	my ($self, @widgets) = @_;
		4034
		4035	$self->{multiplexer}->add (@widgets)
		4036	}
		4037
		4038	sub remove {
		4039	my ($self, @widgets) = @_;
		4040
		4041	$self->{multiplexer}->remove (@widgets)
		4042	}
		4043
		4044	sub pages {
		4045	my ($self) = @_;
		4046	$self->{multiplexer}->children
		4047	}
		4048
		4049	sub add_tab {
3498	my ($self, $title, $widget, $tooltip) = @_;	4050	my ($self, $title, $widget, $tooltip) = @_;
3499		4051
3500	Scalar::Util::weaken $self;	4052	$title = [$title, $tooltip] unless ref $title;
		4053	$widget->{c_tab} = $title;
3501		4054
3502	$self->{buttonbar}->add (new CFPlus::UI::Button
3503	markup => $title,
3504	tooltip => $tooltip,
3505	on_activate => sub { $self->set_current_page ($widget) },
3506	);
3507
3508	$self->{multiplexer}->add ($widget);	4055	$self->add ($widget);
3509	}	4056	}
3510		4057
3511	sub get_current_page {	4058	sub get_current_page {
3512	my ($self) = @_;	4059	my ($self) = @_;
3513		4060
…		…
3517	sub set_current_page {	4064	sub set_current_page {
3518	my ($self, $page) = @_;	4065	my ($self, $page) = @_;
3519		4066
3520	$self->{multiplexer}->set_current_page ($page);	4067	$self->{multiplexer}->set_current_page ($page);
3521	$self->emit (page_changed => $self->{multiplexer}{current});	4068	$self->emit (page_changed => $self->{multiplexer}{current});
		4069	}
		4070
		4071	sub _draw {
		4072	my ($self) = @_;
		4073
		4074	$self->SUPER::_draw ();
		4075
		4076	if (my $cur = $self->{multiplexer}{current}) {
		4077	if ($cur = $cur->{c_tab_}) {
		4078	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4079	$self->{buttonbar}{y} + $cur->{y};
		4080	glLineWidth 3;
		4081	#glEnable GL_BLEND;
		4082	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4083	glColor @{$self->{active_outline}};
		4084	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4085	glLineWidth 1;
		4086	#glDisable GL_BLEND;
		4087	}
		4088	}
3522	}	4089	}
3523		4090
3524	#############################################################################	4091	#############################################################################
3525		4092
3526	package CFPlus::UI::Selector;	4093	package CFPlus::UI::Selector;
…		…
3589	my $self = $class->SUPER::new (	4156	my $self = $class->SUPER::new (
3590	fontsize => 0.8,	4157	fontsize => 0.8,
3591	@_,	4158	@_,
3592	);	4159	);
3593		4160
3594	Scalar::Util::weaken (my $this = $self);	4161	CFPlus::weaken (my $this = $self);
3595		4162
3596	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4163	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3597		4164
3598	$self	4165	$self
3599	}	4166	}
…		…
3722	$self->SUPER::destroy;	4289	$self->SUPER::destroy;
3723	}	4290	}
3724		4291
3725	#############################################################################	4292	#############################################################################
3726		4293
3727	package CFPlus::UI::Inventory;
3728
3729	our @ISA = CFPlus::UI::Table::;
3730
3731	sub new {
3732	my $class = shift;
3733
3734	my $self = $class->SUPER::new (
3735	col_expand => [0, 1, 0],
3736	items => [],
3737	@_,
3738	);
3739
3740	$self->set_sort_order (undef);
3741
3742	$self
3743	}
3744
3745	sub update_items {
3746	my ($self) = @_;
3747
3748	$self->clear;
3749
3750	my @item = $self->{sort}->(@{ $self->{items} });
3751
3752	my @adds;
3753	my $row = 0;
3754	for my $item ($self->{sort}->(@{ $self->{items} })) {
3755	CFPlus::Item::update_widgets $item;
3756
3757	push @adds, 0, $row, $item->{face_widget};
3758	push @adds, 1, $row, $item->{desc_widget};
3759	push @adds, 2, $row, $item->{weight_widget};
3760
3761	$row++;
3762	}
3763
3764	$self->add (@adds);
3765	}
3766
3767	sub set_sort_order {
3768	my ($self, $order) = @_;
3769
3770	$self->{sort} = $order ||= sub {
3771	sort {
3772	$a->{type} <=> $b->{type}
3773	or $a->{name} cmp $b->{name}
3774	} @_
3775	};
3776
3777	$self->update_items;
3778	}
3779
3780	sub set_items {
3781	my ($self, $items) = @_;
3782
3783	$self->{items} = [$items ? values %$items : ()];
3784	$self->update_items;
3785	}
3786
3787	#############################################################################
3788
3789	package CFPlus::UI::SpellList;
3790
3791	our @ISA = CFPlus::UI::Table::;
3792
3793	sub new {
3794	my $class = shift;
3795
3796	my $self = $class->SUPER::new (
3797	binding => [],
3798	commands => [],
3799	@_,
3800	)
3801	}
3802
3803	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3804
3805	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3806	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3807	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3808	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3809	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3810	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3811	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3812	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3813	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3814	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3815
3816	sub rebuild_spell_list {
3817	my ($self) = @_;
3818
3819	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3820	$self->clear;
3821
3822	return unless $::CONN;
3823
3824	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3825	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3826	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3827	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3828	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3829
3830	my $row = 0;
3831
3832	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3833	my $spell = $self->{spell}{$_};
3834
3835	$row++;
3836
3837	my $spell_cb = sub {
3838	my ($widget, $ev) = @_;
3839
3840	if ($ev->{button} == 1) {
3841	$::CONN->user_send ("cast $spell->{name}");
3842	} elsif ($ev->{button} == 2) {
3843	$::CONN->user_send ("invoke $spell->{name}");
3844	} elsif ($ev->{button} == 3) {
3845	(new CFPlus::UI::Menu
3846	items => [
3847	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3848	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3849	],
3850	)->popup ($ev);
3851	} else {
3852	return 0;
3853	}
3854
3855	1
3856	};
3857
3858	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3859
3860	#TODO: add path info to tooltip
3861	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3862
3863	$self->add (0, $row, new CFPlus::UI::Face
3864	face => $spell->{face},
3865	can_hover => 1,
3866	can_events => 1,
3867	tooltip => $tooltip,
3868	on_button_down => $spell_cb,
3869	);
3870
3871	$self->add (1, $row, new CFPlus::UI::Label
3872	expand => 1,
3873	text => $spell->{name},
3874	can_hover => 1,
3875	can_events => 1,
3876	tooltip => $tooltip,
3877	on_button_down => $spell_cb,
3878	);
3879
3880	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3881	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3882	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3883	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3884	}
3885	});
3886	}
3887
3888	sub add_spell {
3889	my ($self, $spell) = @_;
3890
3891	$self->{spell}->{$spell->{name}} = $spell;
3892	$self->rebuild_spell_list;
3893	}
3894
3895	sub remove_spell {
3896	my ($self, $spell) = @_;
3897
3898	delete $self->{spell}->{$spell->{name}};
3899	$self->rebuild_spell_list;
3900	}
3901
3902	sub clear_spells {
3903	my ($self) = @_;
3904
3905	$self->{spell} = {};
3906	$self->rebuild_spell_list;
3907	}
3908
3909	#############################################################################
3910
3911	package CFPlus::UI::Root;	4294	package CFPlus::UI::Root;
3912		4295
3913	our @ISA = CFPlus::UI::Container::;	4296	our @ISA = CFPlus::UI::Container::;
3914		4297
3915	use List::Util qw(min max);	4298	use List::Util qw(min max);
…		…
3922	my $self = $class->SUPER::new (	4305	my $self = $class->SUPER::new (
3923	visible => 1,	4306	visible => 1,
3924	@_,	4307	@_,
3925	);	4308	);
3926		4309
3927	Scalar::Util::weaken ($self->{root} = $self);	4310	CFPlus::weaken ($self->{root} = $self);
3928		4311
3929	$self	4312	$self
3930	}	4313	}
3931		4314
3932	sub size_request {	4315	sub size_request {
…		…
3980	}	4363	}
3981		4364
3982	sub update {	4365	sub update {
3983	my ($self) = @_;	4366	my ($self) = @_;
3984		4367
3985	$::WANT_REFRESH++;	4368	$::WANT_REFRESH->start;
3986	}	4369	}
3987		4370
3988	sub add {	4371	sub add {
3989	my ($self, @children) = @_;	4372	my ($self, @children) = @_;
3990		4373
…		…
4027	while ($self->{refresh_hook}) {	4410	while ($self->{refresh_hook}) {
4028	$_->()	4411	$_->()
4029	for values %{delete $self->{refresh_hook}};	4412	for values %{delete $self->{refresh_hook}};
4030	}	4413	}
4031		4414
4032	if ($self->{realloc}) {	4415	while ($self->{realloc}) {
4033	my %queue;	4416	my %queue;
4034	my @queue;	4417	my @queue;
4035	my $widget;	4418	my $widget;
4036		4419
4037	outer:	4420	outer:
…		…
4084	}	4467	}
4085	}	4468	}
4086		4469
4087	delete $self->{realloc}{$widget+0};	4470	delete $self->{realloc}{$widget+0};
4088	}	4471	}
4089	}
4090		4472
4091	while (my $size_alloc = delete $self->{size_alloc}) {	4473	while (my $size_alloc = delete $self->{size_alloc}) {
4092	my @queue = sort { $b->{visible} <=> $a->{visible} }	4474	my @queue = sort { $a->{visible} <=> $b->{visible} }
4093	values %$size_alloc;	4475	values %$size_alloc;
4094		4476
4095	while () {	4477	while () {
4096	my $widget = pop @queue || last;	4478	my $widget = pop @queue || last;
4097		4479
4098	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4480	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4099		4481
4100	$w = 0 if $w < 0;
4101	$h = 0 if $h < 0;
4102
4103	$w = max $widget->{min_w}, $w;	4482	$w = max $widget->{min_w}, $w;
4104	$h = max $widget->{min_h}, $h;	4483	$h = max $widget->{min_h}, $h;
4105		4484
4106	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4485	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4107	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4486	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4108		4487
4109	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4488	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4110	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4489	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4111		4490
4112	$w = int $w + 0.5;	4491	$w = int $w + 0.5;
4113	$h = int $h + 0.5;	4492	$h = int $h + 0.5;
4114		4493
4115	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4494	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4116	$widget->{old_w} = $widget->{w};	4495	$widget->{old_w} = $widget->{w};
4117	$widget->{old_h} = $widget->{h};	4496	$widget->{old_h} = $widget->{h};
4118		4497
4119	$widget->{w} = $w;	4498	$widget->{w} = $w;
4120	$widget->{h} = $h;	4499	$widget->{h} = $h;
4121		4500
4122	$widget->emit (size_allocate => $w, $h);	4501	$widget->emit (size_allocate => $w, $h);
		4502	}
4123	}	4503	}
4124	}	4504	}
4125	}	4505	}
4126		4506
4127	while ($self->{post_alloc_hook}) {	4507	while ($self->{post_alloc_hook}) {
4128	$_->()	4508	$_->()
4129	for values %{delete $self->{post_alloc_hook}};	4509	for values %{delete $self->{post_alloc_hook}};
4130	}	4510	}
4131
4132		4511
4133	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4512	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4134	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4513	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4135	glClear GL_COLOR_BUFFER_BIT;	4514	glClear GL_COLOR_BUFFER_BIT;
4136		4515

Diff Legend

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