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.438 by root, Sat Sep 1 07:22:21 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
…		…
502		509
503	defined wantarray and CFPlus::guard {	510	defined wantarray and CFPlus::guard {
504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	511	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505	@{ $self->{signal_cb}{$signal} };	512	@{ $self->{signal_cb}{$signal} };
506	}	513	}
		514	}
		515
		516	sub disconnect_all {
		517	my ($self, $signal) = @_;
		518
		519	delete $self->{signal_cb}{$signal};
507	}	520	}
508		521
509	my %has_coords = (	522	my %has_coords = (
510	button_down => 1,	523	button_down => 1,
511	button_up => 1,	524	button_up => 1,
…		…
523	? $args[0]->xy ($self)	536	? $args[0]->xy ($self)
524	: ();	537	: ();
525		538
526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527		540
528	if ($self->{tooltip} =~ /Apply.*audio/) {	541	for my $cb (
529	warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#	542	@{$self->{signal_cb}{$signal} || []}, # before
530	warn "3 $self->{parent}\n";#d#	543	($self->can ("invoke_$signal") || sub { 1 }), # closure
		544	) {
		545	return $cb->($self, @args, @append) || next;
531	}	546	}
532		547
533	#d##TODO# stop propagating at first true, do not use sum	548	# 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	549	$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	}	550	}
546		551
547	sub find_widget {	552	#sub find_widget {
548	my ($self, $x, $y) = @_;	553	# 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		554
559	sub set_parent {	555	sub set_parent {
560	my ($self, $parent) = @_;	556	my ($self, $parent) = @_;
561		557
562	Scalar::Util::weaken ($self->{parent} = $parent);	558	CFPlus::weaken ($self->{parent} = $parent);
563	$self->set_visible if $parent->{visible};	559	$self->set_visible if $parent->{visible};
564	}	560	}
565		561
566	sub realloc {	562	sub realloc {
567	my ($self) = @_;	563	my ($self) = @_;
…		…
593		589
594	# using global variables seems a bit hacky, but passing through all drawing	590	# using global variables seems a bit hacky, but passing through all drawing
595	# functions seems pointless.	591	# functions seems pointless.
596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	592	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597		593
598	sub draw {	594	#sub draw {
599	my ($self) = @_;	595	#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		596
645	sub _draw {	597	sub _draw {
646	my ($self) = @_;	598	my ($self) = @_;
647		599
648	warn "no draw defined for $self\n";	600	warn "no draw defined for $self\n";
…		…
651	sub DESTROY {	603	sub DESTROY {
652	my ($self) = @_;	604	my ($self) = @_;
653		605
654	return if CFPlus::in_destruct;	606	return if CFPlus::in_destruct;
655		607
656	delete $WIDGET{$self+0};	608	local $@;
657
658	eval { $self->destroy };	609	eval { $self->destroy };
659	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	610	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		611
		612	delete $WIDGET{$self+0};
660	}	613	}
661		614
662	#############################################################################	615	#############################################################################
663		616
664	package CFPlus::UI::DrawBG;	617	package CFPlus::UI::DrawBG;
…		…
668	use strict;	621	use strict;
669	use CFPlus::OpenGL;	622	use CFPlus::OpenGL;
670		623
671	sub new {	624	sub new {
672	my $class = shift;	625	my $class = shift;
673
674	# range [value, low, high, page]
675		626
676	$class->SUPER::new (	627	$class->SUPER::new (
677	#bg => [0, 0, 0, 0.2],	628	#bg => [0, 0, 0, 0.2],
678	#active_bg => [1, 1, 1, 0.5],	629	#active_bg => [1, 1, 1, 0.5],
679	@_	630	@_
…		…
691	my ($w, $h) = @$self{qw(w h)};	642	my ($w, $h) = @$self{qw(w h)};
692		643
693	glEnable GL_BLEND;	644	glEnable GL_BLEND;
694	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	645	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
695	glColor_premultiply @$color;	646	glColor_premultiply @$color;
696
697	glBegin GL_QUADS;
698	glVertex 0 , 0;
699	glVertex 0 , $h;
700	glVertex $w, $h;	647	glRect 0, 0, $w, $h;
701	glVertex $w, 0;
702	glEnd;
703
704	glDisable GL_BLEND;	648	glDisable GL_BLEND;
705	}	649	}
706	}	650	}
707		651
708	#############################################################################	652	#############################################################################
…		…
740	can_events => 0,	684	can_events => 0,
741	%arg,	685	%arg,
742	);	686	);
743		687
744	$self->add (@$children)	688	$self->add (@$children)
745	if $children;	689	if $children && @$children;
746		690
747	$self	691	$self
748	}	692	}
749		693
750	sub realloc {	694	sub realloc {
…		…
759	my ($self, @widgets) = @_;	703	my ($self, @widgets) = @_;
760		704
761	$_->set_parent ($self)	705	$_->set_parent ($self)
762	for @widgets;	706	for @widgets;
763		707
		708	# TODO: only do this in widgets that need it, e.g. root, fixed
764	use sort 'stable';	709	use sort 'stable';
765		710
766	$self->{children} = [	711	$self->{children} = [
767	sort { $a->{z} <=> $b->{z} }	712	sort { $a->{z} <=> $b->{z} }
768	@{$self->{children}}, @widgets	713	@{$self->{children}}, @widgets
769	];	714	];
770		715
771	$self->realloc;	716	$self->realloc;
		717
		718	$self->emit (c_add => \@widgets);
		719
		720	map $_+0, @widgets
772	}	721	}
773		722
774	sub children {	723	sub children {
775	@{ $_[0]{children} }	724	@{ $_[0]{children} }
776	}	725	}
777		726
778	sub remove {	727	sub remove {
779	my ($self, $child) = @_;	728	my ($self, @widgets) = @_;
780		729
		730	$self->emit (c_remove => \@widgets);
		731
		732	for my $child (@widgets) {
781	delete $child->{parent};	733	delete $child->{parent};
782	$child->hide;	734	$child->hide;
783
784	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	735	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		736	}
785		737
786	$self->realloc;	738	$self->realloc;
787	}	739	}
788		740
789	sub clear {	741	sub clear {
790	my ($self) = @_;	742	my ($self) = @_;
791		743
792	my $children = delete $self->{children};	744	my $children = $self->{children};
793	$self->{children} = [];	745	$self->{children} = [];
794		746
795	for (@$children) {	747	for (@$children) {
796	delete $_->{parent};	748	delete $_->{parent};
797	$_->hide;	749	$_->hide;
…		…
817	}	769	}
818		770
819	sub _draw {	771	sub _draw {
820	my ($self) = @_;	772	my ($self) = @_;
821		773
822	$_->draw for @{$self->{children}};	774	$_->draw for $self->visible_children;
823	}	775	}
824		776
825	#############################################################################	777	#############################################################################
826		778
827	package CFPlus::UI::Bin;	779	package CFPlus::UI::Bin;
…		…
837	}	789	}
838		790
839	sub add {	791	sub add {
840	my ($self, $child) = @_;	792	my ($self, $child) = @_;
841		793
842	$self->SUPER::remove ($_) for @{ $self->{children} };	794	$self->clear;
843	$self->SUPER::add ($child);	795	$self->SUPER::add ($child);
844	}	796	}
845		797
846	sub remove {	798	sub remove {
847	my ($self, $widget) = @_;	799	my ($self, $widget) = @_;
…		…
937	}	889	}
938		890
939	#############################################################################	891	#############################################################################
940		892
941	package CFPlus::UI::ViewPort;	893	package CFPlus::UI::ViewPort;
		894
		895	use List::Util qw(min max);
942		896
943	our @ISA = CFPlus::UI::Window::;	897	our @ISA = CFPlus::UI::Window::;
944		898
945	sub new {	899	sub new {
946	my $class = shift;	900	my $class = shift;
…		…
955	sub size_request {	909	sub size_request {
956	my ($self) = @_;	910	my ($self) = @_;
957		911
958	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	912	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
959		913
960	$w = 10 if $self->{scroll_x};	914	$w = 1 if $self->{scroll_x};
961	$h = 10 if $self->{scroll_y};	915	$h = 1 if $self->{scroll_y};
962		916
963	($w, $h)	917	($w, $h)
964	}	918	}
965		919
966	sub invoke_size_allocate {	920	sub invoke_size_allocate {
…		…
978	}	932	}
979		933
980	sub set_offset {	934	sub set_offset {
981	my ($self, $x, $y) = @_;	935	my ($self, $x, $y) = @_;
982		936
		937	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		938	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		939
		940	if ($x != $self->{view_x} or $y != $self->{view_y}) {
983	$self->{view_x} = int $x;	941	$self->{view_x} = $x;
984	$self->{view_y} = int $y;	942	$self->{view_y} = $y;
985		943
		944	$self->emit (changed => $x, $y);
986	$self->update;	945	$self->update;
		946	}
		947	}
		948
		949	sub set_center {
		950	my ($self, $x, $y) = @_;
		951
		952	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		953	}
		954
		955	sub make_visible {
		956	my ($self, $x, $y, $border) = @_;
		957
		958	if ( $x < $self->{view_x} + $self->{w} * $border
		959	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		960	|| $y < $self->{view_y} + $self->{h} * $border
		961	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		962	) {
		963	$self->set_center ($x, $y);
		964	}
987	}	965	}
988		966
989	# hmm, this does not work for topleft of $self... but we should not ask for that	967	# hmm, this does not work for topleft of $self... but we should not ask for that
990	sub coord2local {	968	sub coord2local {
991	my ($self, $x, $y) = @_;	969	my ($self, $x, $y) = @_;
…		…
1006	my ($self, $x, $y) = @_;	984	my ($self, $x, $y) = @_;
1007		985
1008	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	986	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1009	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	987	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1010	) {	988	) {
1011	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	989	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1012	} else {	990	} else {
1013	$self->CFPlus::UI::Base::find_widget ($x, $y)	991	$self->CFPlus::UI::Base::find_widget ($x, $y)
1014	}	992	}
1015	}	993	}
1016		994
…		…
1027		1005
1028	#############################################################################	1006	#############################################################################
1029		1007
1030	package CFPlus::UI::ScrolledWindow;	1008	package CFPlus::UI::ScrolledWindow;
1031		1009
1032	our @ISA = CFPlus::UI::HBox::;	1010	our @ISA = CFPlus::UI::Table::;
1033		1011
1034	sub new {	1012	sub new {
1035	my ($class, %arg) = @_;	1013	my ($class, %arg) = @_;
1036		1014
1037	my $child = delete $arg{child};	1015	my $child = delete $arg{child};
1038		1016
1039	my $self;	1017	my $self;
1040		1018
1041	my $slider = new CFPlus::UI::Slider	1019	my $hslider = new CFPlus::UI::Slider
		1020	c_col => 0,
		1021	c_row => 1,
		1022	vertical => 0,
		1023	range => [0, 0, 1, 0.01], # HACK fix
		1024	on_changed => sub {
		1025	$self->{hpos} = $_[1];
		1026	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1027	},
		1028	;
		1029
		1030	my $vslider = new CFPlus::UI::Slider
		1031	c_col => 1,
		1032	c_row => 0,
1042	vertical => 1,	1033	vertical => 1,
1043	range => [0, 0, 1, 0.01], # HACK fix	1034	range => [0, 0, 1, 0.01], # HACK fix
1044	on_changed => sub {	1035	on_changed => sub {
1045	$self->{vp}->set_offset (0, $_[1]);	1036	$self->{vpos} = $_[1];
		1037	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1046	},	1038	},
1047	;	1039	;
1048		1040
1049	$self = $class->SUPER::new (	1041	$self = $class->SUPER::new (
1050	vp => (new CFPlus::UI::ViewPort expand => 1),	1042	scroll_x => 0,
		1043	scroll_y => 1,
1051	can_events => 1,	1044	can_events => 1,
1052	slider => $slider,	1045	hslider => $hslider,
		1046	vslider => $vslider,
		1047	col_expand => [1, 0],
		1048	row_expand => [1, 0],
1053	%arg,	1049	%arg,
1054	);	1050	);
1055		1051
		1052	$self->{vp} = new CFPlus::UI::ViewPort
		1053	c_col => 0,
		1054	c_row => 0,
		1055	expand => 1,
		1056	scroll_x => $self->{scroll_x},
		1057	scroll_y => $self->{scroll_y},
		1058	on_changed => sub {
		1059	my ($vp, $x, $y) = @_;
		1060
		1061	$vp->{parent}{hslider}->set_value ($x);
		1062	$vp->{parent}{vslider}->set_value ($y);
		1063
		1064	0
		1065	},
		1066	on_size_allocate => sub {
		1067	my ($vp, $w, $h) = @_;
		1068	$vp->{parent}->update_slider;
		1069	0
		1070	},
		1071	;
		1072
1056	$self->SUPER::add ($self->{vp}, $self->{slider});	1073	$self->SUPER::add ($self->{vp});
		1074
1057	$self->add ($child) if $child;	1075	$self->add ($child) if $child;
1058		1076
1059	$self	1077	$self
1060	}	1078	}
1061
1062	#TODO# update range on size_allocate depending on child
1063		1079
1064	sub add {	1080	sub add {
1065	my ($self, $widget) = @_;	1081	my ($self, $widget) = @_;
1066		1082
1067	$self->{vp}->add ($self->{child} = $widget);	1083	$self->{vp}->add ($self->{child} = $widget);
1068	}	1084	}
1069		1085
		1086	sub set_offset { shift->{vp}->set_offset (@_) }
		1087	sub set_center { shift->{vp}->set_center (@_) }
		1088	sub make_visible { shift->{vp}->make_visible (@_) }
		1089
		1090	sub update_slider {
		1091	my ($self) = @_;
		1092
		1093	my $child = ($self->{vp} or return)->child;
		1094
		1095	if ($self->{scroll_x}) {
		1096	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1097	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1098
		1099	my $visible = $w1 > $w2;
		1100	if ($visible != $self->{hslider_visible}) {
		1101	$self->{hslider_visible} = $visible;
		1102	$visible ? $self->SUPER::add ($self->{hslider})
		1103	: $self->SUPER::remove ($self->{hslider});
		1104	}
		1105	}
		1106
		1107	if ($self->{scroll_y}) {
		1108	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1109	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1110
		1111	my $visible = $h1 > $h2;
		1112	if ($visible != $self->{vslider_visible}) {
		1113	$self->{vslider_visible} = $visible;
		1114	$visible ? $self->SUPER::add ($self->{vslider})
		1115	: $self->SUPER::remove ($self->{vslider});
		1116	}
		1117	}
		1118	}
		1119
		1120	sub start_dragging {
		1121	my ($self, $ev) = @_;
		1122
		1123	$self->grab_focus;
		1124
		1125	my $ox = $self->{vp}{view_x};
		1126	my $oy = $self->{vp}{view_y};
		1127
		1128	$self->{motion} = sub {
		1129	my ($ev, $x, $y) = @_;
		1130
		1131	$ox -= $ev->{xrel};
		1132	$oy -= $ev->{yrel};
		1133
		1134	$self->{vp}->set_offset ($ox, $oy);
		1135	};
		1136	}
		1137
1070	sub invoke_mouse_wheel {	1138	sub invoke_mouse_wheel {
1071	my ($self, $ev) = @_;	1139	my ($self, $ev) = @_;
1072		1140
1073	return 0 unless $ev->{dy}; # only vertical movements
1074
1075	$self->{slider}->emit (mouse_wheel => $ev);	1141	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1142	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1076		1143
1077	1	1144	1
1078	}	1145	}
1079		1146
1080	sub update_slider {	1147	sub invoke_button_down {
1081	my ($self) = @_;	1148	my ($self, $ev, $x, $y) = @_;
1082		1149
1083	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1150	if ($ev->{button} == 2) {
1084	}	1151	$self->start_dragging ($ev);
		1152	return 1;
		1153	}
1085		1154
1086	sub update {	1155	0
1087	my ($self) = @_;	1156	}
1088		1157
1089	$self->SUPER::update;	1158	sub invoke_button_up {
		1159	my ($self, $ev, $x, $y) = @_;
1090		1160
1091	$self->update_slider;	1161	if (delete $self->{motion}) {
		1162	return 1;
		1163	}
		1164
		1165	0
		1166	}
		1167
		1168	sub invoke_mouse_motion {
		1169	my ($self, $ev, $x, $y) = @_;
		1170
		1171	if ($self->{motion}) {
		1172	$self->{motion}->($ev, $x, $y);
		1173	return 1;
		1174	}
		1175
		1176	0
1092	}	1177	}
1093		1178
1094	sub invoke_size_allocate {	1179	sub invoke_size_allocate {
1095	my ($self, $w, $h) = @_;	1180	my ($self, $w, $h) = @_;
1096		1181
1097	$self->update_slider;	1182	$self->update_slider;
1098
1099	$self->SUPER::invoke_size_allocate ($w, $h)	1183	$self->SUPER::invoke_size_allocate ($w, $h)
1100	}	1184	}
1101		1185
1102	#############################################################################	1186	#############################################################################
1103		1187
…		…
1123	my ($w, $h) = @$self{qw(w h)};	1207	my ($w, $h) = @$self{qw(w h)};
1124		1208
1125	glEnable GL_BLEND;	1209	glEnable GL_BLEND;
1126	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1210	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1127	glColor_premultiply @{ $self->{bg} };	1211	glColor_premultiply @{ $self->{bg} };
1128
1129	glBegin GL_QUADS;
1130	glVertex 0 , 0;
1131	glVertex 0 , $h;
1132	glVertex $w, $h;	1212	glRect 0, 0, $w, $h;
1133	glVertex $w, 0;
1134	glEnd;
1135
1136	glDisable GL_BLEND;	1213	glDisable GL_BLEND;
1137	}	1214	}
1138		1215
1139	$self->SUPER::_draw;	1216	$self->SUPER::_draw;
1140	}	1217	}
…		…
1253		1330
1254	my @border =	1331	my @border =
1255	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1332	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);	1333	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1257		1334
		1335	my @icon =
		1336	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1337	qw(x1_move.png x1_resize.png);
		1338
1258	sub new {	1339	sub new {
1259	my ($class, %arg) = @_;	1340	my ($class, %arg) = @_;
1260		1341
1261	my $self = $class->SUPER::new (	1342	my $self = $class->SUPER::new (
1262	bg => [1, 1, 1, 1],	1343	bg => [1, 1, 1, 1],
…		…
1430	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1511	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1431		1512
1432	my $border = $self->border;	1513	my $border = $self->border;
1433		1514
1434	glColor @{ $self->{border_bg} };	1515	glColor @{ $self->{border_bg} };
1435	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1516	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1436	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1517	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1437	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1518	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1438	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1519	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1520
		1521	# move
		1522	my $w2 = ($w - $border) * .5;
		1523	my $h2 = ($h - $border) * .5;
		1524	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1525	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1526	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1527
		1528	# resize
		1529	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1530	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1531	unless $self->{has_close_button};
		1532	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1533	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1439		1534
1440	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1535	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1441	glColor @{ $self->{bg} };	1536	glColor @{ $self->{bg} };
1442		1537
1443	# TODO: repeat texture not scale	1538	# TODO: repeat texture not scale
…		…
1464		1559
1465	#############################################################################	1560	#############################################################################
1466		1561
1467	package CFPlus::UI::Table;	1562	package CFPlus::UI::Table;
1468		1563
1469	our @ISA = CFPlus::UI::Base::;	1564	our @ISA = CFPlus::UI::Container::;
1470		1565
1471	use List::Util qw(max sum);	1566	use List::Util qw(max sum);
1472		1567
1473	use CFPlus::OpenGL;	1568	use CFPlus::OpenGL;
1474		1569
1475	sub new {	1570	sub new {
1476	my $class = shift;	1571	my $class = shift;
1477		1572
1478	$class->SUPER::new (	1573	$class->SUPER::new (
1479	col_expand => [],	1574	col_expand => [],
		1575	row_expand => [],
1480	@_,	1576	@_,
1481	)	1577	)
1482	}	1578	}
1483		1579
1484	sub children {
1485	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1486	}
1487
1488	sub add {	1580	sub add {
		1581	my ($self, @widgets) = @_;
		1582
		1583	for my $child (@widgets) {
		1584	$child->{c_rowspan} ||= 1;
		1585	$child->{c_colspan} ||= 1;
		1586	}
		1587
		1588	$self->SUPER::add (@widgets);
		1589	}
		1590
		1591	sub add_at {
1489	my ($self) = shift;	1592	my $self = shift;
		1593
		1594	my @widgets;
1490		1595
1491	while (@_) {	1596	while (@_) {
1492	my ($x, $y, $child) = splice @_, 0, 3, ();	1597	my ($col, $row, $child) = splice @_, 0, 3, ();
1493	$child->set_parent ($self);
1494	$self->{children}[$y][$x] = $child;
1495	}
1496		1598
1497	$self->{force_realloc} = 1;	1599	$child->{c_row} = $row;
1498	$self->{force_size_alloc} = 1;	1600	$child->{c_col} = $col;
1499	$self->realloc;
1500	}
1501		1601
1502	sub remove {	1602	push @widgets, $child;
		1603	}
		1604
		1605	$self->add (@widgets);
		1606	}
		1607
		1608	sub get_wh {
1503	my ($self, $child) = @_;	1609	my ($self) = @_;
1504		1610
1505	# TODO: not yet implemented	1611	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		1612
1512	my @children = $self->children;	1613	my @children = $self->children;
1513	delete $self->{children};	1614
		1615	# first pass, columns
		1616	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1617	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1618
		1619	my $sw = sum @w[$c .. $c + $cs - 1];
		1620
		1621	if ($w > $sw) {
		1622	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1623	}
1514		1624	}
1515	for (@children) {
1516	delete $_->{parent};
1517	$_->hide;
1518	}
1519		1625
1520	$self->realloc;	1626	# second pass, rows
1521	}	1627	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)};	1628	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1536		1629
1537	$w[$x] = max $w[$x], $w;	1630	my $sh = sum @h[$r .. $r + $rs - 1];
1538	$h[$y] = max $h[$y], $h;	1631
		1632	if ($h > $sh) {
		1633	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1539	}	1634	}
1540	}	1635	}
1541		1636
1542	(\@w, \@h)	1637	(\@w, \@h)
1543	}	1638	}
…		…
1559	my ($ws, $hs) = $self->get_wh;	1654	my ($ws, $hs) = $self->get_wh;
1560		1655
1561	my $req_w = (sum @$ws) || 1;	1656	my $req_w = (sum @$ws) || 1;
1562	my $req_h = (sum @$hs) || 1;	1657	my $req_h = (sum @$hs) || 1;
1563		1658
1564	# TODO: nicer code && do row_expand	1659	# now linearly scale the rows/columns to the allocated size
1565	my @col_expand = @{$self->{col_expand}};	1660	my @col_expand = @{$self->{col_expand}};
1566	@col_expand = (1) x @$ws unless @col_expand;	1661	@col_expand = (1) x @$ws unless @col_expand;
1567	my $col_expand = (sum @col_expand) || 1;	1662	my $col_expand = (sum @col_expand) || 1;
1568		1663
1569	# linearly scale sizes
1570	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1664	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1571	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1572		1665
1573	CFPlus::UI::harmonize $ws;	1666	CFPlus::UI::harmonize $ws;
		1667
		1668	my @row_expand = @{$self->{row_expand}};
		1669	@row_expand = (1) x @$ws unless @row_expand;
		1670	my $row_expand = (sum @row_expand) || 1;
		1671
		1672	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1673
1574	CFPlus::UI::harmonize $hs;	1674	CFPlus::UI::harmonize $hs;
1575		1675
1576	my $y;	1676	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1677	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1577		1678
1578	for my $r (0 .. $#{$self->{children}}) {	1679	for my $widget ($self->children) {
1579	my $row = $self->{children}[$r]	1680	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		1681
1582	my $x = 0;	1682	$widget->configure (
1583	my $row_h = $hs->[$r];	1683	$x[$c], $y[$r],
		1684	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1584		1685	);
1585	for my $c (0 .. $#$row) {	1686	}
1586	my $col_w = $ws->[$c];
1587		1687
1588	if (my $widget = $row->[$c]) {	1688	1
1589	$widget->configure ($x, $y, $col_w, $row_h);	1689	}
1590	}
1591		1690
1592	$x += $col_w;	1691	#############################################################################
		1692
		1693	package CFPlus::UI::Fixed;
		1694
		1695	use List::Util qw(min max);
		1696
		1697	our @ISA = CFPlus::UI::Container::;
		1698
		1699	sub _scale($$$) {
		1700	my ($rel, $val, $max) = @_;
		1701
		1702	$rel ? $val * $max : $val
		1703	}
		1704
		1705	sub size_request {
		1706	my ($self) = @_;
		1707
		1708	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1709
		1710	# determine overall size by querying abs widgets
		1711	for my $child ($self->visible_children) {
		1712	unless ($child->{c_rel}) {
		1713	my $x = $child->{c_x};
		1714	my $y = $child->{c_y};
		1715
		1716	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1717	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1593	}	1718	}
		1719	}
1594		1720
1595	$y += $row_h;	1721	my $W = $x2 - $x1;
		1722	my $H = $y2 - $y1;
		1723
		1724	# now layout remaining widgets
		1725	for my $child ($self->visible_children) {
		1726	if ($child->{c_rel}) {
		1727	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1728	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1729
		1730	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1731	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1732	}
		1733	}
		1734
		1735	my $W = $x2 - $x1;
		1736	my $H = $y2 - $y1;
		1737
		1738	($W, $H)
		1739	}
		1740
		1741	sub invoke_size_allocate {
		1742	my ($self, $W, $H) = @_;
		1743
		1744	for my $child ($self->visible_children) {
		1745	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1746	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1747
		1748	$x += $child->{c_halign} * $child->{req_w};
		1749	$y += $child->{c_valign} * $child->{req_h};
		1750
		1751	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1596	}	1752	}
1597		1753
1598	1	1754	1
1599	}	1755	}
1600		1756
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	#############################################################################	1757	#############################################################################
1626		1758
1627	package CFPlus::UI::Box;	1759	package CFPlus::UI::Box;
1628		1760
1629	our @ISA = CFPlus::UI::Container::;	1761	our @ISA = CFPlus::UI::Container::;
1630		1762
1631	sub size_request {	1763	sub size_request {
1632	my ($self) = @_;	1764	my ($self) = @_;
		1765
		1766	my @children = $self->visible_children;
1633		1767
1634	$self->{vertical}	1768	$self->{vertical}
1635	? (	1769	? (
1636	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1770	(List::Util::max map $_->{req_w}, @children),
1637	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1771	(List::Util::sum map $_->{req_h}, @children),
1638	)	1772	)
1639	: (	1773	: (
1640	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1774	(List::Util::sum map $_->{req_w}, @children),
1641	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1775	(List::Util::max map $_->{req_h}, @children),
1642	)	1776	)
1643	}	1777	}
1644		1778
1645	sub invoke_size_allocate {	1779	sub invoke_size_allocate {
1646	my ($self, $w, $h) = @_;	1780	my ($self, $w, $h) = @_;
…		…
1770		1904
1771	delete $self->{ox};	1905	delete $self->{ox};
1772	$self->SUPER::realloc;	1906	$self->SUPER::realloc;
1773	}	1907	}
1774		1908
		1909	sub clear {
		1910	my ($self) = @_;
		1911
		1912	$self->set_text ("");
		1913	}
		1914
1775	sub set_text {	1915	sub set_text {
1776	my ($self, $text) = @_;	1916	my ($self, $text) = @_;
1777		1917
1778	return if $self->{text} eq "T$text";	1918	return if $self->{text} eq "T$text";
1779	$self->{text} = "T$text";	1919	$self->{text} = "T$text";
…		…
1885	: ($self->{w} - $size->[0]) * 0.5);	2025	: ($self->{w} - $size->[0]) * 0.5);
1886		2026
1887	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2027	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1888	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2028	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1889	: ($self->{h} - $size->[1]) * 0.5);	2029	: ($self->{h} - $size->[1]) * 0.5);
		2030
		2031	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1890	};	2032	};
1891		2033
1892	my $w = List::Util::min $self->{w} + 4, $size->[0];	2034	# unless ($self->{list}) {
1893	my $h = List::Util::min $self->{h} + 2, $size->[1];	2035	# $self->{list} = CFPlus::OpenGL::glGenList;
1894		2036	# CFPlus::OpenGL::glNewList $self->{list};
1895	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2037	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2038	# CFPlus::OpenGL::glEndList;
		2039	# }
		2040	#
		2041	# CFPlus::OpenGL::glCallList $self->{list};
		2042
		2043	$self->{layout}->draw;
1896	}	2044	}
		2045
		2046	#sub destroy {
		2047	# my ($self) = @_;
		2048	#
		2049	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2050	#
		2051	# $self->SUPER::destroy;
		2052	#}
1897		2053
1898	#############################################################################	2054	#############################################################################
1899		2055
1900	package CFPlus::UI::EntryBase;	2056	package CFPlus::UI::EntryBase;
1901		2057
…		…
1907	my $class = shift;	2063	my $class = shift;
1908		2064
1909	$class->SUPER::new (	2065	$class->SUPER::new (
1910	fg => [1, 1, 1],	2066	fg => [1, 1, 1],
1911	bg => [0, 0, 0, 0.2],	2067	bg => [0, 0, 0, 0.2],
		2068	outline => [0.6, 0.3, 0.1],
1912	active_bg => [1, 1, 1, 0.5],	2069	active_bg => [0, 0, 1, .2],
1913	active_fg => [0, 0, 0],	2070	active_fg => [1, 1, 1],
		2071	active_outline => [1, 1, 0],
1914	can_hover => 1,	2072	can_hover => 1,
1915	can_focus => 1,	2073	can_focus => 1,
1916	valign => 0,	2074	valign => 0,
1917	can_events => 1,	2075	can_events => 1,
		2076	ellipsise => 0,
1918	#text => ...	2077	#text => ...
1919	#hidden => "*",	2078	#hidden => "*",
1920	@_	2079	@_
1921	)	2080	)
1922	}	2081	}
…		…
1966	my $mod = $ev->{mod};	2125	my $mod = $ev->{mod};
1967	my $sym = $ev->{sym};	2126	my $sym = $ev->{sym};
1968	my $uni = $ev->{unicode};	2127	my $uni = $ev->{unicode};
1969		2128
1970	my $text = $self->get_text;	2129	my $text = $self->get_text;
		2130
		2131	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1971		2132
1972	if ($uni == 8) {	2133	if ($uni == 8) {
1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2134	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974	} elsif ($uni == 127) {	2135	} elsif ($uni == 127) {
1975	substr $text, $self->{cursor}, 1, "";	2136	substr $text, $self->{cursor}, 1, "";
1976	} elsif ($sym == CFPlus::SDLK_LEFT) {	2137	} elsif ($sym == CFPlus::SDLK_LEFT) {
1977	--$self->{cursor} if $self->{cursor};	2138	--$self->{cursor} if $self->{cursor};
1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2139	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1979	++$self->{cursor} if $self->{cursor} < length $self->{text};	2140	++$self->{cursor} if $self->{cursor} < length $self->{text};
1980	} elsif ($sym == CFPlus::SDLK_HOME) {	2141	} elsif ($sym == CFPlus::SDLK_HOME) {
		2142	# what a hack
1981	$self->{cursor} = 0;	2143	$self->{cursor} =
		2144	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2145	? length $1
		2146	: 0;
1982	} elsif ($sym == CFPlus::SDLK_END) {	2147	} elsif ($sym == CFPlus::SDLK_END) {
		2148	# uh, again
		2149	$self->{cursor} =
		2150	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1983	$self->{cursor} = length $text;	2151	? $self->{cursor} + length $1
		2152	: length $self->{text};
1984	} elsif ($uni == 21) { # ctrl-u	2153	} elsif ($uni == 21) { # ctrl-u
1985	$text = "";	2154	$text = "";
1986	$self->{cursor} = 0;	2155	$self->{cursor} = 0;
1987	} elsif ($uni == 27) {	2156	} elsif ($uni == 27) {
1988	$self->emit ('escape');	2157	$self->emit ('escape');
1989	} elsif ($uni) {	2158	} elsif ($uni == 0x0d) {
		2159	substr $text, $self->{cursor}++, 0, "\012";
		2160	} elsif ($uni >= 0x20) {
1990	substr $text, $self->{cursor}++, 0, chr $uni;	2161	substr $text, $self->{cursor}++, 0, chr $uni;
1991	} else {	2162	} else {
1992	return 0;	2163	return 0;
1993	}	2164	}
1994		2165
1995	$self->_set_text ($text);	2166	$self->_set_text ($text);
1996		2167
1997	$self->realloc;	2168	$self->realloc;
		2169	$self->update;
1998		2170
1999	1	2171	1
2000	}	2172	}
2001		2173
2002	sub invoke_focus_in {	2174	sub invoke_focus_in {
…		…
2044	glColor_premultiply @{$self->{bg}};	2216	glColor_premultiply @{$self->{bg}};
2045	}	2217	}
2046		2218
2047	glEnable GL_BLEND;	2219	glEnable GL_BLEND;
2048	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2220	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};	2221	glRect 0, 0, $self->{w}, $self->{h};
2053	glVertex $self->{w}, 0;
2054	glEnd;
2055	glDisable GL_BLEND;	2222	glDisable GL_BLEND;
2056		2223
2057	$self->SUPER::_draw;	2224	$self->SUPER::_draw;
2058		2225
2059	#TODO: force update every cursor change :(	2226	#TODO: force update every cursor change :(
…		…
2061		2228
2062	unless (exists $self->{cur_h}) {	2229	unless (exists $self->{cur_h}) {
2063	my $text = substr $self->{text}, 0, $self->{cursor};	2230	my $text = substr $self->{text}, 0, $self->{cursor};
2064	utf8::encode $text;	2231	utf8::encode $text;
2065		2232
2066	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2233	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2067	}	2234	}
2068		2235
		2236	glColor_premultiply @{$self->{active_fg}};
2069	glBegin GL_LINES;	2237	glBegin GL_LINES;
2070	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2238	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};	2239	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2072	glEnd;	2240	glEnd;
		2241
		2242	glLineWidth 3;
		2243	glColor @{$self->{active_outline}};
		2244	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2245	glLineWidth 1;
		2246
		2247	} else {
		2248	glColor @{$self->{outline}};
		2249	glBegin GL_LINE_STRIP;
		2250	glVertex .5, $self->{h} * .5;
		2251	glVertex .5, $self->{h} - 2.5;
		2252	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2253	glVertex $self->{w} - .5, $self->{h} * .5;
		2254	glEnd;
2073	}	2255	}
2074	}	2256	}
		2257
		2258	#############################################################################
2075		2259
2076	package CFPlus::UI::Entry;	2260	package CFPlus::UI::Entry;
2077		2261
2078	our @ISA = CFPlus::UI::EntryBase::;	2262	our @ISA = CFPlus::UI::EntryBase::;
2079		2263
…		…
2082	sub invoke_key_down {	2266	sub invoke_key_down {
2083	my ($self, $ev) = @_;	2267	my ($self, $ev) = @_;
2084		2268
2085	my $sym = $ev->{sym};	2269	my $sym = $ev->{sym};
2086		2270
2087	if ($sym == 13) {	2271	if ($ev->{uni} == 0x0d || $sym == 13) {
2088	unshift @{$self->{history}},	2272	unshift @{$self->{history}},
2089	my $txt = $self->get_text;	2273	my $txt = $self->get_text;
2090		2274
2091	$self->{history_pointer} = -1;	2275	$self->{history_pointer} = -1;
2092	$self->{history_saveback} = '';	2276	$self->{history_saveback} = '';
…		…
2122	1	2306	1
2123	}	2307	}
2124		2308
2125	#############################################################################	2309	#############################################################################
2126		2310
		2311	package CFPlus::UI::TextEdit;
		2312
		2313	our @ISA = CFPlus::UI::EntryBase::;
		2314
		2315	use CFPlus::OpenGL;
		2316
		2317	sub move_cursor_ver {
		2318	my ($self, $dy) = @_;
		2319
		2320	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2321
		2322	$y += $dy;
		2323
		2324	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2325	$self->{cursor} = $index;
		2326	delete $self->{cur_h};
		2327	$self->update;
		2328	return;
		2329	}
		2330	}
		2331
		2332	sub invoke_key_down {
		2333	my ($self, $ev) = @_;
		2334
		2335	my $sym = $ev->{sym};
		2336
		2337	if ($sym == CFPlus::SDLK_UP) {
		2338	$self->move_cursor_ver (-1);
		2339	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2340	$self->move_cursor_ver (+1);
		2341	} else {
		2342	return $self->SUPER::invoke_key_down ($ev)
		2343	}
		2344
		2345	1
		2346	}
		2347
		2348	#############################################################################
		2349
2127	package CFPlus::UI::Button;	2350	package CFPlus::UI::ButtonBin;
2128		2351
2129	our @ISA = CFPlus::UI::Label::;	2352	our @ISA = CFPlus::UI::Bin::;
2130		2353
2131	use CFPlus::OpenGL;	2354	use CFPlus::OpenGL;
2132		2355
2133	my @tex =	2356	my @tex =
2134	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2357	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2135	qw(b1_button_active.png);	2358	qw(b1_button_inactive.png b1_button_active.png);
2136		2359
2137	sub new {	2360	sub new {
2138	my $class = shift;	2361	my $class = shift;
2139		2362
2140	$class->SUPER::new (	2363	$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,	2364	can_hover => 1,
2146	align => 0,	2365	align => 0,
2147	valign => 0,	2366	valign => 0,
2148	can_events => 1,	2367	can_events => 1,
2149	@_	2368	@_
…		…
2161	}	2380	}
2162		2381
2163	sub _draw {	2382	sub _draw {
2164	my ($self) = @_;	2383	my ($self) = @_;
2165		2384
2166	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2167
2168	glEnable GL_TEXTURE_2D;	2385	glEnable GL_TEXTURE_2D;
2169	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2386	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170	glColor 0, 0, 0, 1;	2387	glColor 0, 0, 0, 1;
2171		2388
		2389	my $tex = $tex[$GRAB == $self];
2172	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2390	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2391
		2392	glDisable GL_TEXTURE_2D;
		2393
		2394	$self->SUPER::_draw;
		2395	}
		2396
		2397	#############################################################################
		2398
		2399	package CFPlus::UI::Button;
		2400
		2401	our @ISA = CFPlus::UI::Label::;
		2402
		2403	use CFPlus::OpenGL;
		2404
		2405	my @tex =
		2406	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2407	qw(b1_button_inactive.png b1_button_active.png);
		2408
		2409	sub new {
		2410	my $class = shift;
		2411
		2412	$class->SUPER::new (
		2413	padding_x => 4,
		2414	padding_y => 4,
		2415	fg => [1.0, 1.0, 1.0],
		2416	active_fg => [0.8, 0.8, 0.8],
		2417	can_hover => 1,
		2418	align => 0,
		2419	valign => 0,
		2420	can_events => 1,
		2421	@_
		2422	)
		2423	}
		2424
		2425	sub invoke_button_up {
		2426	my ($self, $ev, $x, $y) = @_;
		2427
		2428	$self->emit ("activate")
		2429	if $x >= 0 && $x < $self->{w}
		2430	&& $y >= 0 && $y < $self->{h};
		2431
		2432	1
		2433	}
		2434
		2435	sub _draw {
		2436	my ($self) = @_;
		2437
		2438	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2439
		2440	glEnable GL_TEXTURE_2D;
		2441	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2442	glColor 0, 0, 0, 1;
		2443
		2444	my $tex = $tex[$GRAB == $self];
		2445	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2173		2446
2174	glDisable GL_TEXTURE_2D;	2447	glDisable GL_TEXTURE_2D;
2175		2448
2176	$self->SUPER::_draw;	2449	$self->SUPER::_draw;
2177	}	2450	}
…		…
2234	sub _draw {	2507	sub _draw {
2235	my ($self) = @_;	2508	my ($self) = @_;
2236		2509
2237	$self->SUPER::_draw;	2510	$self->SUPER::_draw;
2238		2511
2239	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2512	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2240		2513
2241	my ($w, $h) = @$self{qw(w h)};	2514	my ($w, $h) = @$self{qw(w h)};
2242		2515
2243	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;	2516	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2244		2517
…		…
2264	sub new {	2537	sub new {
2265	my $class = shift;	2538	my $class = shift;
2266		2539
2267	my $self = $class->SUPER::new (	2540	my $self = $class->SUPER::new (
2268	can_events => 0,	2541	can_events => 0,
		2542	scale => 1,
2269	@_,	2543	@_,
2270	);	2544	);
2271		2545
2272	$self->{path} || $self->{tex}	2546	$self->{path} || $self->{tex}
2273	or Carp::croak "'path' or 'tex' attributes required";	2547	or Carp::croak "'path' or 'tex' attributes required";
2274		2548
2275	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2549	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2276	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2550	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2277		2551
2278	Scalar::Util::weaken $texture_cache{$self->{path}};	2552	CFPlus::weaken $texture_cache{$self->{path}};
2279		2553
2280	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2554	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2281		2555
2282	$self	2556	$self
2283	}	2557	}
…		…
2298	}	2572	}
2299		2573
2300	sub size_request {	2574	sub size_request {
2301	my ($self) = @_;	2575	my ($self) = @_;
2302		2576
2303	($self->{tex}{w}, $self->{tex}{h})	2577	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2304	}	2578	}
2305		2579
2306	sub _draw {	2580	sub _draw {
2307	my ($self) = @_;	2581	my ($self) = @_;
2308		2582
…		…
2318	}	2592	}
2319		2593
2320	glEnable GL_TEXTURE_2D;	2594	glEnable GL_TEXTURE_2D;
2321	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2595	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2322		2596
2323	$tex->draw_quad (0, 0, $w, $h);	2597	$tex->draw_quad_alpha (0, 0, $w, $h);
2324		2598
2325	glDisable GL_TEXTURE_2D;	2599	glDisable GL_TEXTURE_2D;
2326	}	2600	}
2327		2601
2328	#############################################################################	2602	#############################################################################
…		…
2347	align => 0,	2621	align => 0,
2348	valign => 0,	2622	valign => 0,
2349	can_events => 1,	2623	can_events => 1,
2350	@_	2624	@_
2351	);	2625	);
		2626	}
		2627
		2628	sub invoke_button_down {
		2629	my ($self, $ev, $x, $y) = @_;
		2630
		2631	1
2352	}	2632	}
2353		2633
2354	sub invoke_button_up {	2634	sub invoke_button_up {
2355	my ($self, $ev, $x, $y) = @_;	2635	my ($self, $ev, $x, $y) = @_;
2356		2636
…		…
2496	glDisable GL_TEXTURE_2D;	2776	glDisable GL_TEXTURE_2D;
2497	}	2777	}
2498		2778
2499	#############################################################################	2779	#############################################################################
2500		2780
		2781	package CFPlus::UI::Progress;
		2782
		2783	our @ISA = CFPlus::UI::Label::;
		2784
		2785	use CFPlus::OpenGL;
		2786
		2787	sub new {
		2788	my ($class, %arg) = @_;
		2789
		2790	my $self = $class->SUPER::new (
		2791	fg => [1, 1, 1],
		2792	bg => [0, 0, 1, 0.2],
		2793	bar => [0.7, 0.5, 0.1, 0.8],
		2794	outline => [0.4, 0.3, 0],
		2795	fontsize => 0.9,
		2796	valign => 0,
		2797	align => 0,
		2798	can_events => 1,
		2799	ellipsise => 1,
		2800	label => "%d%%",
		2801	%arg,
		2802	);
		2803
		2804	$self->set_value ($arg{value} || -1);
		2805
		2806	$self
		2807	}
		2808
		2809	sub set_label {
		2810	my ($self, $label) = @_;
		2811
		2812	return if $self->{label} eq $label;
		2813	$self->{label} = $label;
		2814
		2815	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2816	}
		2817
		2818	sub set_value {
		2819	my ($self, $value) = @_;
		2820
		2821	if ($self->{value} ne $value) {
		2822	$self->{value} = $value;
		2823
		2824	if ($value < 0) {
		2825	$self->set_text ("-");
		2826	} else {
		2827	$self->set_text (sprintf $self->{label}, $value * 100);
		2828	}
		2829
		2830	$self->update;
		2831	}
		2832	}
		2833
		2834	sub _draw {
		2835	my ($self) = @_;
		2836
		2837	glEnable GL_BLEND;
		2838	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2839
		2840	if ($self->{value} >= 0) {
		2841	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2842
		2843	glColor_premultiply @{$self->{bar}};
		2844	glRect 2, 2, $s, $self->{h} - 2;
		2845	glColor_premultiply @{$self->{bg}};
		2846	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2847	}
		2848
		2849	glColor_premultiply @{$self->{outline}};
		2850	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2851
		2852	glDisable GL_BLEND;
		2853
		2854	{
		2855	local $self->{bg}; # do not draw background
		2856	$self->SUPER::_draw;
		2857	}
		2858	}
		2859
		2860	#############################################################################
		2861
		2862	package CFPlus::UI::ExperienceProgress;
		2863
		2864	our @ISA = CFPlus::UI::Progress::;
		2865
		2866	sub new {
		2867	my ($class, %arg) = @_;
		2868
		2869	my $self = $class->SUPER::new (
		2870	tooltip => sub {
		2871	my ($self) = @_;
		2872
		2873	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2874	$self->{lvl},
		2875	::formsep ($self->{exp}),
		2876	::formsep ($self->{nxt}),
		2877	::formsep ($self->{nxt} - $self->{exp}),
		2878	},
		2879	%arg
		2880	);
		2881
		2882	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2883	if $::CONN;
		2884
		2885	$self
		2886	}
		2887
		2888	sub DESTROY {
		2889	my ($self) = @_;
		2890
		2891	delete $::CONN->{on_exp_update}{$self+0}
		2892	if $::CONN;
		2893
		2894	$self->SUPER::DESTROY;
		2895	}
		2896
		2897	sub set_value {
		2898	my ($self, $lvl, $exp) = @_;
		2899
		2900	$self->{lvl} = $lvl;
		2901	$self->{exp} = $exp;
		2902
		2903	my $v = -1;
		2904
		2905	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2906	my $l0 = $table->[$lvl - 1];
		2907	my $l1 = $table->[$lvl];
		2908
		2909	$self->{nxt} = $l1;
		2910
		2911	$v = ($exp - $l0) / ($l1 - $l0);
		2912	}
		2913
		2914	$self->SUPER::set_value ($v);
		2915	}
		2916
		2917	#############################################################################
		2918
2501	package CFPlus::UI::Gauge;	2919	package CFPlus::UI::Gauge;
2502		2920
2503	our @ISA = CFPlus::UI::VBox::;	2921	our @ISA = CFPlus::UI::VBox::;
2504		2922
2505	sub new {	2923	sub new {
…		…
2630		3048
2631	$self->SUPER::invoke_button_down ($ev, $x, $y);	3049	$self->SUPER::invoke_button_down ($ev, $x, $y);
2632		3050
2633	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3051	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2634		3052
2635	$self->invoke_mouse_motion ($ev, $x, $y)	3053	$self->invoke_mouse_motion ($ev, $x, $y);
		3054
		3055	1
2636	}	3056	}
2637		3057
2638	sub invoke_mouse_motion {	3058	sub invoke_mouse_motion {
2639	my ($self, $ev, $x, $y) = @_;	3059	my ($self, $ev, $x, $y) = @_;
2640		3060
…		…
2656	sub invoke_mouse_wheel {	3076	sub invoke_mouse_wheel {
2657	my ($self, $ev) = @_;	3077	my ($self, $ev) = @_;
2658		3078
2659	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3079	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2660		3080
		3081	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3082
2661	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	3083	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2662		3084
2663	! ! $delta	3085	1
2664	}	3086	}
2665		3087
2666	sub update {	3088	sub update {
2667	my ($self) = @_;	3089	my ($self) = @_;
2668		3090
…		…
2776	#font => default_font	3198	#font => default_font
2777	@_,	3199	@_,
2778		3200
2779	layout => (new CFPlus::Layout),	3201	layout => (new CFPlus::Layout),
2780	par => [],	3202	par => [],
		3203	max_par => 0,
2781	height => 0,	3204	height => 0,
2782	children => [	3205	children => [
2783	(new CFPlus::UI::Empty expand => 1),	3206	(new CFPlus::UI::Empty expand => 1),
2784	(new CFPlus::UI::Slider vertical => 1),	3207	(new CFPlus::UI::Slider vertical => 1),
2785	],	3208	],
…		…
2798	}	3221	}
2799		3222
2800	sub size_request {	3223	sub size_request {
2801	my ($self) = @_;	3224	my ($self) = @_;
2802		3225
2803	my ($empty, $slider) = @{ $self->{children} };	3226	my ($empty, $slider) = $self->visible_children;
2804		3227
2805	local $self->{children} = [$empty, $slider];	3228	local $self->{children} = [$empty, $slider];
2806	$self->SUPER::size_request	3229	$self->SUPER::size_request
2807	}	3230	}
2808		3231
…		…
2910		3333
2911	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3334	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2912	push @{$self->{par}}, $para;	3335	push @{$self->{par}}, $para;
2913	}	3336	}
2914		3337
		3338	if (my $max = $self->{max_par}) {
		3339	shift @{$self->{par}} while @{$self->{par}} > $max;
		3340	}
		3341
2915	$self->{need_reflow}++;	3342	$self->{need_reflow}++;
2916	$self->update;	3343	$self->update;
2917	}	3344	}
2918		3345
2919	sub scroll_to_bottom {	3346	sub scroll_to_bottom {
…		…
2993		3420
2994	if ($y0 < $y + $h && $y < $y1) {	3421	if ($y0 < $y + $h && $y < $y1) {
2995	my $layout = $self->get_layout ($para);	3422	my $layout = $self->get_layout ($para);
2996		3423
2997	$layout->render ($para->{indent}, $y - $y0);	3424	$layout->render ($para->{indent}, $y - $y0);
		3425	$layout->draw;
2998		3426
2999	if (my @w = @{ $para->{widget} }) {	3427	if (my @w = @{ $para->{widget} }) {
3000	my @s = $layout->get_shapes;	3428	my @s = $layout->get_shapes;
3001		3429
3002	for (@w) {	3430	for (@w) {
…		…
3124	}	3552	}
3125		3553
3126	sub set_tooltip_from {	3554	sub set_tooltip_from {
3127	my ($self, $widget) = @_;	3555	my ($self, $widget) = @_;
3128		3556
3129	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3130	if $widget->{tooltip} =~ /^#(.*)$/;
3131
3132	my $tooltip = $widget->{tooltip};	3557	my $tip = $widget->{tooltip};
		3558	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3559
		3560	$tip = CFPlus::Pod::section_label tooltip => $1
		3561	if $tip =~ /^#(.*)$/;
3133		3562
3134	if ($ENV{CFPLUS_DEBUG} & 2) {	3563	if ($ENV{CFPLUS_DEBUG} & 2) {
3135	$tooltip .= "\n\n" . (ref $widget) . "\n"	3564	$tip .= "\n\n" . (ref $widget) . "\n"
3136	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3565	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3137	. "req $widget->{req_w} $widget->{req_h}\n"	3566	. "req $widget->{req_w} $widget->{req_h}\n"
3138	. "visible $widget->{visible}";	3567	. "visible $widget->{visible}";
3139	}	3568	}
3140		3569
3141	$tooltip =~ s/^\n+//;	3570	$tip =~ s/^\n+//;
3142	$tooltip =~ s/\n+$//;	3571	$tip =~ s/\n+$//;
3143		3572
3144	$self->add (new CFPlus::UI::Label	3573	$self->add (new CFPlus::UI::Label
3145	markup => $tooltip,	3574	markup => $tip,
3146	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3575	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3147	fontsize => 0.8,	3576	fontsize => 0.8,
3148	style => 1, # FLAG_INVERSE	3577	style => 1, # FLAG_INVERSE
3149	ellipsise => 0,	3578	ellipsise => 0,
3150	font => ($widget->{tooltip_font} || $::FONT_PROP),	3579	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
3188	}	3617	}
3189		3618
3190	sub _draw {	3619	sub _draw {
3191	my ($self) = @_;	3620	my ($self) = @_;
3192		3621
3193	glTranslate 0.375, 0.375;
3194
3195	my ($w, $h) = @$self{qw(w h)};	3622	my ($w, $h) = @$self{qw(w h)};
3196		3623
3197	glColor 1, 0.8, 0.4;	3624	glColor 1, 0.8, 0.4;
3198	glBegin GL_QUADS;	3625	glRect 0, 0, $w, $h;
3199	glVertex 0 , 0;
3200	glVertex 0 , $h;
3201	glVertex $w, $h;
3202	glVertex $w, 0;
3203	glEnd;
3204		3626
3205	glColor 0, 0, 0;	3627	glColor 0, 0, 0;
3206	glBegin GL_LINE_LOOP;	3628	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		3629
3213	glTranslate 2 - 0.375, 2 - 0.375;	3630	glTranslate 2, 2;
3214		3631
3215	$self->SUPER::_draw;	3632	$self->SUPER::_draw;
3216	}	3633	}
3217		3634
3218	#############################################################################	3635	#############################################################################
…		…
3225		3642
3226	sub new {	3643	sub new {
3227	my $class = shift;	3644	my $class = shift;
3228		3645
3229	my $self = $class->SUPER::new (	3646	my $self = $class->SUPER::new (
		3647	size_w => 32,
		3648	size_h => 8,
3230	aspect => 1,	3649	aspect => 1,
3231	can_events => 0,	3650	can_events => 0,
3232	@_,	3651	@_,
3233	);	3652	);
3234		3653
3235	if ($self->{anim} && $self->{animspeed}) {	3654	if ($self->{anim} && $self->{animspeed}) {
3236	Scalar::Util::weaken (my $widget = $self);	3655	CFPlus::weaken (my $widget = $self);
3237		3656
		3657	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3658	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3238	$self->{timer} = Event->timer (	3659	$self->{timer} = Event->timer (
3239	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3240	hard => 1,	3660	parked => 1,
3241	interval => $self->{animspeed},
3242	cb => sub {	3661	cb => sub {
		3662	return unless $::CONN;
		3663
		3664	my $w = $widget
		3665	or return;
		3666
3243	++$widget->{frame};	3667	++$w->{frame};
		3668	$w->update_face;
		3669
		3670	# somehow, $widget can go away
3244	$widget->update;	3671	$w->update;
		3672	$w->update_timer;
3245	},	3673	},
3246	);	3674	);
		3675
		3676	$self->update_face;
		3677	$self->update_timer;
3247	}	3678	}
3248		3679
3249	$self	3680	$self
3250	}	3681	}
3251		3682
		3683	sub update_timer {
		3684	my ($self) = @_;
		3685
		3686	return unless $self->{timer};
		3687
		3688	if ($self->{visible}) {
		3689	$self->{timer}->at (
		3690	$self->{anim_start}
		3691	+ $self->{animspeed}
		3692	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3693	);
		3694	$self->{timer}->start;
		3695	} else {
		3696	$self->{timer}->stop;
		3697	}
		3698	}
		3699
		3700	sub update_face {
		3701	my ($self) = @_;
		3702
		3703	if ($::CONN) {
		3704	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3705	if ($anim && @$anim) {
		3706	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3707	delete $self->{face_change_cb};
		3708
		3709	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3710	unless ($tex->{name} || $tex->{loading}) {
		3711	$tex->upload (sub { $self->reconfigure });
		3712	}
		3713	}
		3714	}
		3715	}
		3716	}
		3717	}
		3718
3252	sub size_request {	3719	sub size_request {
3253	(32, 8)	3720	my ($self) = @_;
		3721
		3722	if ($::CONN) {
		3723	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3724	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3725	if ($tex->{name}) {
		3726	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3727	} elsif (!$tex->{loading}) {
		3728	$tex->upload (sub { $self->reconfigure });
		3729	}
		3730	}
		3731
		3732	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3733	}
		3734	}
		3735
		3736	($self->{size_w} || 8, $self->{size_h} || 8)
3254	}	3737	}
3255		3738
3256	sub update {	3739	sub update {
3257	my ($self) = @_;	3740	my ($self) = @_;
3258		3741
3259	return unless $self->{visible};	3742	return unless $self->{visible};
3260		3743
3261	$self->SUPER::update;	3744	$self->SUPER::update;
3262	}	3745	}
3263		3746
		3747	sub invoke_visibility_change {
		3748	my ($self) = @_;
		3749
		3750	$self->update_timer;
		3751
		3752	0
		3753	}
		3754
3264	sub _draw {	3755	sub _draw {
3265	my ($self) = @_;	3756	my ($self) = @_;
3266		3757
3267	return unless $::CONN;
3268
3269	$self->SUPER::_draw;	3758	$self->SUPER::_draw;
3270		3759
3271	my $face;	3760	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;	3761	glEnable GL_TEXTURE_2D;
3284	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3762	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3285	glColor 0, 0, 0, 1;	3763	glColor 0, 0, 0, 1;
3286	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3764	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3287	glDisable GL_TEXTURE_2D;	3765	glDisable GL_TEXTURE_2D;
…		…
3289	}	3767	}
3290		3768
3291	sub destroy {	3769	sub destroy {
3292	my ($self) = @_;	3770	my ($self) = @_;
3293		3771
3294	$self->{timer}->cancel	3772	(delete $self->{timer})->cancel
3295	if $self->{timer};	3773	if $self->{timer};
3296		3774
3297	$self->SUPER::destroy;	3775	$self->SUPER::destroy;
3298	}	3776	}
3299		3777
…		…
3339	children => [	3817	children => [
3340	(new CFPlus::UI::Label markup => $left, expand => 1),	3818	(new CFPlus::UI::Label markup => $left, expand => 1),
3341	(new CFPlus::UI::Label markup => $right, align => +1),	3819	(new CFPlus::UI::Label markup => $right, align => +1),
3342	],	3820	],
3343	;	3821	;
3344		3822
3345	} else {	3823	} else {
3346	$widget = new CFPlus::UI::Label	3824	$widget = new CFPlus::UI::Label
3347	can_hover => 1,	3825	can_hover => 1,
3348	can_events => 1,	3826	can_events => 1,
3349	markup => $widget,	3827	markup => $widget,
…		…
3474		3952
3475	#############################################################################	3953	#############################################################################
3476		3954
3477	package CFPlus::UI::Notebook;	3955	package CFPlus::UI::Notebook;
3478		3956
		3957	use CFPlus::OpenGL;
		3958
3479	our @ISA = CFPlus::UI::VBox::;	3959	our @ISA = CFPlus::UI::VBox::;
3480		3960
3481	sub new {	3961	sub new {
3482	my $class = shift;	3962	my $class = shift;
3483		3963
3484	my $self = $class->SUPER::new (	3964	my $self = $class->SUPER::new (
3485	buttonbar => (new CFPlus::UI::Buttonbar),	3965	buttonbar => (new CFPlus::UI::Buttonbar),
3486	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3966	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3967	active_outline => [.7, .7, 0.2],
3487	# filter => # will be put between multiplexer and $self	3968	# filter => # will be put between multiplexer and $self
3488	@_,	3969	@_,
3489	);	3970	);
3490		3971
3491	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3972	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3492	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3973	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3493		3974
		3975	{
		3976	Scalar::Util::weaken (my $wself = $self);
		3977
		3978	$self->{multiplexer}->connect (c_add => sub {
		3979	my ($mplex, $widgets) = @_;
		3980
		3981	for my $child (@$widgets) {
		3982	Scalar::Util::weaken $child;
		3983	$child->{c_tab_} ||= do {
		3984	my $tab =
		3985	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3986	? $child->{c_tab}
		3987	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3988
		3989	$tab->connect (activate => sub {
		3990	$wself->set_current_page ($child);
		3991	});
		3992
		3993	$tab
		3994	};
		3995
		3996	$self->{buttonbar}->add ($child->{c_tab_});
		3997	}
		3998	});
		3999
		4000	$self->{multiplexer}->connect (c_remove => sub {
		4001	my ($mplex, $widgets) = @_;
		4002
		4003	for my $child (@$widgets) {
		4004	$wself->{buttonbar}->remove ($child->{c_tab_});
		4005	}
		4006	});
		4007	}
		4008
3494	$self	4009	$self
3495	}	4010	}
3496		4011
3497	sub add {	4012	sub add {
		4013	my ($self, @widgets) = @_;
		4014
		4015	$self->{multiplexer}->add (@widgets)
		4016	}
		4017
		4018	sub remove {
		4019	my ($self, @widgets) = @_;
		4020
		4021	$self->{multiplexer}->remove (@widgets)
		4022	}
		4023
		4024	sub pages {
		4025	my ($self) = @_;
		4026	$self->{multiplexer}->children
		4027	}
		4028
		4029	sub add_tab {
3498	my ($self, $title, $widget, $tooltip) = @_;	4030	my ($self, $title, $widget, $tooltip) = @_;
3499		4031
3500	Scalar::Util::weaken $self;	4032	$title = [$title, $tooltip] unless ref $title;
		4033	$widget->{c_tab} = $title;
3501		4034
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);	4035	$self->add ($widget);
3509	}	4036	}
3510		4037
3511	sub get_current_page {	4038	sub get_current_page {
3512	my ($self) = @_;	4039	my ($self) = @_;
3513		4040
…		…
3517	sub set_current_page {	4044	sub set_current_page {
3518	my ($self, $page) = @_;	4045	my ($self, $page) = @_;
3519		4046
3520	$self->{multiplexer}->set_current_page ($page);	4047	$self->{multiplexer}->set_current_page ($page);
3521	$self->emit (page_changed => $self->{multiplexer}{current});	4048	$self->emit (page_changed => $self->{multiplexer}{current});
		4049	}
		4050
		4051	sub _draw {
		4052	my ($self) = @_;
		4053
		4054	$self->SUPER::_draw ();
		4055
		4056	if (my $cur = $self->{multiplexer}{current}) {
		4057	if ($cur = $cur->{c_tab_}) {
		4058	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4059	$self->{buttonbar}{y} + $cur->{y};
		4060	glLineWidth 3;
		4061	#glEnable GL_BLEND;
		4062	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4063	glColor @{$self->{active_outline}};
		4064	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4065	glLineWidth 1;
		4066	#glDisable GL_BLEND;
		4067	}
		4068	}
3522	}	4069	}
3523		4070
3524	#############################################################################	4071	#############################################################################
3525		4072
3526	package CFPlus::UI::Selector;	4073	package CFPlus::UI::Selector;
…		…
3589	my $self = $class->SUPER::new (	4136	my $self = $class->SUPER::new (
3590	fontsize => 0.8,	4137	fontsize => 0.8,
3591	@_,	4138	@_,
3592	);	4139	);
3593		4140
3594	Scalar::Util::weaken (my $this = $self);	4141	CFPlus::weaken (my $this = $self);
3595		4142
3596	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4143	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3597		4144
3598	$self	4145	$self
3599	}	4146	}
…		…
3722	$self->SUPER::destroy;	4269	$self->SUPER::destroy;
3723	}	4270	}
3724		4271
3725	#############################################################################	4272	#############################################################################
3726		4273
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;	4274	package CFPlus::UI::Root;
3912		4275
3913	our @ISA = CFPlus::UI::Container::;	4276	our @ISA = CFPlus::UI::Container::;
3914		4277
3915	use List::Util qw(min max);	4278	use List::Util qw(min max);
…		…
3922	my $self = $class->SUPER::new (	4285	my $self = $class->SUPER::new (
3923	visible => 1,	4286	visible => 1,
3924	@_,	4287	@_,
3925	);	4288	);
3926		4289
3927	Scalar::Util::weaken ($self->{root} = $self);	4290	CFPlus::weaken ($self->{root} = $self);
3928		4291
3929	$self	4292	$self
3930	}	4293	}
3931		4294
3932	sub size_request {	4295	sub size_request {
…		…
3980	}	4343	}
3981		4344
3982	sub update {	4345	sub update {
3983	my ($self) = @_;	4346	my ($self) = @_;
3984		4347
3985	$::WANT_REFRESH++;	4348	$::WANT_REFRESH->start;
3986	}	4349	}
3987		4350
3988	sub add {	4351	sub add {
3989	my ($self, @children) = @_;	4352	my ($self, @children) = @_;
3990		4353
…		…
4027	while ($self->{refresh_hook}) {	4390	while ($self->{refresh_hook}) {
4028	$_->()	4391	$_->()
4029	for values %{delete $self->{refresh_hook}};	4392	for values %{delete $self->{refresh_hook}};
4030	}	4393	}
4031		4394
4032	if ($self->{realloc}) {	4395	while ($self->{realloc}) {
4033	my %queue;	4396	my %queue;
4034	my @queue;	4397	my @queue;
4035	my $widget;	4398	my $widget;
4036		4399
4037	outer:	4400	outer:
…		…
4084	}	4447	}
4085	}	4448	}
4086		4449
4087	delete $self->{realloc}{$widget+0};	4450	delete $self->{realloc}{$widget+0};
4088	}	4451	}
4089	}
4090		4452
4091	while (my $size_alloc = delete $self->{size_alloc}) {	4453	while (my $size_alloc = delete $self->{size_alloc}) {
4092	my @queue = sort { $b->{visible} <=> $a->{visible} }	4454	my @queue = sort { $a->{visible} <=> $b->{visible} }
4093	values %$size_alloc;	4455	values %$size_alloc;
4094		4456
4095	while () {	4457	while () {
4096	my $widget = pop @queue || last;	4458	my $widget = pop @queue || last;
4097		4459
4098	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4460	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4099		4461
4100	$w = 0 if $w < 0;
4101	$h = 0 if $h < 0;
4102
4103	$w = max $widget->{min_w}, $w;	4462	$w = max $widget->{min_w}, $w;
4104	$h = max $widget->{min_h}, $h;	4463	$h = max $widget->{min_h}, $h;
4105		4464
4106	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4465	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4107	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4466	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4108		4467
4109	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4468	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4110	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4469	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4111		4470
4112	$w = int $w + 0.5;	4471	$w = int $w + 0.5;
4113	$h = int $h + 0.5;	4472	$h = int $h + 0.5;
4114		4473
4115	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4474	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4116	$widget->{old_w} = $widget->{w};	4475	$widget->{old_w} = $widget->{w};
4117	$widget->{old_h} = $widget->{h};	4476	$widget->{old_h} = $widget->{h};
4118		4477
4119	$widget->{w} = $w;	4478	$widget->{w} = $w;
4120	$widget->{h} = $h;	4479	$widget->{h} = $h;
4121		4480
4122	$widget->emit (size_allocate => $w, $h);	4481	$widget->emit (size_allocate => $w, $h);
		4482	}
4123	}	4483	}
4124	}	4484	}
4125	}	4485	}
4126		4486
4127	while ($self->{post_alloc_hook}) {	4487	while ($self->{post_alloc_hook}) {
4128	$_->()	4488	$_->()
4129	for values %{delete $self->{post_alloc_hook}};	4489	for values %{delete $self->{post_alloc_hook}};
4130	}	4490	}
4131
4132		4491
4133	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4492	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4134	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4493	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4135	glClear GL_COLOR_BUFFER_BIT;	4494	glClear GL_COLOR_BUFFER_BIT;
4136		4495

Diff Legend

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