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.366 by root, Mon Apr 23 19:17:41 2007 UTC vs.
Revision 1.452 by root, Wed Dec 26 20:09:38 2007 UTC

…		…
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use List::Util ();	6	use List::Util ();
7	use Event;
8		7
9	use CFPlus;	8	use CFPlus;
10	use CFPlus::Pod;	9	use CFPlus::Pod;
11	use CFPlus::Texture;	10	use CFPlus::Texture;
12		11
…		…
17	our $TOOLTIP;	16	our $TOOLTIP;
18	our $BUTTON_STATE;	17	our $BUTTON_STATE;
19		18
20	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
21		20
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	21	our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
		22	$_[0]->stop;
		23
23	if (!$GRAB) {	24	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	26	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	27	if ($TOOLTIP->{owner} != $widget) {
27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};	28	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
…		…
30	$TOOLTIP->{owner} = $widget;	31	$TOOLTIP->{owner} = $widget;
31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};	32	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32		33
33	return if $ENV{CFPLUS_DEBUG} & 8;	34	return if $ENV{CFPLUS_DEBUG} & 8;
34		35
35	my $tip = $widget->{tooltip};
36
37	$tip = $tip->($widget) if CODE:: eq ref $tip;
38
39	$TOOLTIP->set_tooltip_from ($widget);	36	$TOOLTIP->set_tooltip_from ($widget);
40	$TOOLTIP->show;	37	$TOOLTIP->show;
41	}	38	}
42		39
43	return;	40	return;
…		…
46	}	43	}
47		44
48	$TOOLTIP->hide;	45	$TOOLTIP->hide;
49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};	46	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50	delete $TOOLTIP->{owner};	47	delete $TOOLTIP->{owner};
51	});	48	};
52		49
53	sub get_layout {	50	sub get_layout {
54	my $layout;	51	my $layout;
55		52
56	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
91	my $hover = $HOVER; $HOVER = $widget;	88	my $hover = $HOVER; $HOVER = $widget;
92		89
93	$hover->update if $hover && $hover->{can_hover};	90	$hover->update if $hover && $hover->{can_hover};
94	$HOVER->update if $HOVER && $HOVER->{can_hover};	91	$HOVER->update if $HOVER && $HOVER->{can_hover};
95		92
96	$TOOLTIP_WATCHER->start;	93	$TOOLTIP_WATCHER->again;
97	}	94	}
98	}	95	}
99		96
100	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
101	my ($ev) = @_;	98	my ($ev) = @_;
…		…
107	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
108		105
109	$GRAB = $widget;	106	$GRAB = $widget;
110	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
111		108
112	$TOOLTIP_WATCHER->cb->();	109	$TOOLTIP_WATCHER->invoke;
113	}	110	}
114		111
115	if ($GRAB) {	112	if ($GRAB) {
116	if ($ev->{button} == 4 || $ev->{button} == 5) {	113	if ($ev->{button} == 4 || $ev->{button} == 5) {
117	# mousewheel	114	# mousewheel
118	$ev->{dx} = 0;
119	$ev->{dy} = $ev->{button} * 2 - 9;	115	my $delta = $ev->{button} * 2 - 9;
		116	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		117
		118	$ev->{dx} = $shift ? $delta : 0;
		119	$ev->{dy} = $shift ? 0 : $delta;
		120
120	$GRAB->emit (mouse_wheel => $ev);	121	$GRAB->emit (mouse_wheel => $ev);
121	} else {	122	} else {
122	$GRAB->emit (button_down => $ev)	123	$GRAB->emit (button_down => $ev)
123	}	124	}
124	}	125	}
…		…
138	my $grab = $GRAB; undef $GRAB;	139	my $grab = $GRAB; undef $GRAB;
139	$grab->update if $grab;	140	$grab->update if $grab;
140	$GRAB->update if $GRAB;	141	$GRAB->update if $GRAB;
141		142
142	check_hover $widget;	143	check_hover $widget;
143	$TOOLTIP_WATCHER->cb->();	144	$TOOLTIP_WATCHER->invoke;
144	}	145	}
145	}	146	}
146		147
147	sub feed_sdl_motion_event {	148	sub feed_sdl_motion_event {
148	my ($ev) = @_;	149	my ($ev) = @_;
…		…
268	$self->hide;	269	$self->hide;
269	$self->emit ("destroy");	270	$self->emit ("destroy");
270	%$self = ();	271	%$self = ();
271	}	272	}
272		273
		274	sub TO_JSON {
		275	{ "\fw" => $_[0]{s_id} }
		276	}
		277
273	sub show {	278	sub show {
274	my ($self) = @_;	279	my ($self) = @_;
275		280
276	return if $self->{parent};	281	return if $self->{parent};
277		282
…		…
304	delete $self->{root};	309	delete $self->{root};
305		310
306	undef $GRAB if $GRAB == $self;	311	undef $GRAB if $GRAB == $self;
307	undef $HOVER if $HOVER == $self;	312	undef $HOVER if $HOVER == $self;
308		313
309	$CFPlus::UI::TOOLTIP_WATCHER->cb->()	314	$CFPlus::UI::TOOLTIP_WATCHER->invoke
310	if $TOOLTIP->{owner} == $self;	315	if $TOOLTIP->{owner} == $self;
311		316
312	$self->emit ("focus_out");	317	$self->emit ("focus_out");
313	$self->emit (visibility_change => 0);	318	$self->emit (visibility_change => 0);
314	}	319	}
…		…
316	sub set_visibility {	321	sub set_visibility {
317	my ($self, $visible) = @_;	322	my ($self, $visible) = @_;
318		323
319	return if $self->{visible} == $visible;	324	return if $self->{visible} == $visible;
320		325
321	$visible ? $self->hide	326	$visible ? $self->show
322	: $self->show;	327	: $self->hide;
323	}	328	}
324		329
325	sub toggle_visibility {	330	sub toggle_visibility {
326	my ($self) = @_;	331	my ($self) = @_;
327		332
…		…
333	sub hide {	338	sub hide {
334	my ($self) = @_;	339	my ($self) = @_;
335		340
336	$self->set_invisible;	341	$self->set_invisible;
337		342
		343	# extra $parent copy for 5.8.8+ bug workaround
		344	# (otherwise $_[0] in remove gets freed
		345	if (my $parent = $self->{parent}) {
338	$self->{parent}->remove ($self)	346	$parent->remove ($self);
339	if $self->{parent};	347	}
340	}	348	}
341		349
342	sub move_abs {	350	sub move_abs {
343	my ($self, $x, $y, $z) = @_;	351	my ($self, $x, $y, $z) = @_;
344		352
…		…
354		362
355	$self->{force_w} = $w;	363	$self->{force_w} = $w;
356	$self->{force_h} = $h;	364	$self->{force_h} = $h;
357		365
358	$self->realloc;	366	$self->realloc;
		367	}
		368
		369	# traverse the widget chain up to find the maximum "physical" size constraints
		370	sub get_max_wh {
		371	my ($self) = @_;
		372
		373	return $self->{parent}->get_max_wh
		374	if $self->{parent};
		375
		376	($::WIDTH, $::HEIGHT)
359	}	377	}
360		378
361	sub size_request {	379	sub size_request {
362	require Carp;	380	require Carp;
363	Carp::confess "size_request is abstract";	381	Carp::confess "size_request is abstract";
…		…
425		443
426	$self->{tooltip} = $tooltip;	444	$self->{tooltip} = $tooltip;
427		445
428	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {	446	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
429	delete $CFPlus::UI::TOOLTIP->{owner};	447	delete $CFPlus::UI::TOOLTIP->{owner};
430	$CFPlus::UI::TOOLTIP_WATCHER->cb->();	448	$CFPlus::UI::TOOLTIP_WATCHER->invoke;
431	}	449	}
432	}	450	}
433		451
434	# translate global coordinates to local coordinate system	452	# translate global coordinates to local coordinate system
435	sub coord2local {	453	sub coord2local {
436	my ($self, $x, $y) = @_;	454	my ($self, $x, $y) = @_;
437		455
438	Carp::confess unless $self->{parent};#d#	456	return (undef, undef) unless $self->{parent};
439		457
440	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	458	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
441	}	459	}
442		460
443	# translate local coordinates to global coordinate system	461	# translate local coordinates to global coordinate system
444	sub coord2global {	462	sub coord2global {
445	my ($self, $x, $y) = @_;	463	my ($self, $x, $y) = @_;
446		464
447	Carp::confess unless $self->{parent};#d#	465	return (undef, undef) unless $self->{parent};
448		466
449	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	467	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
450	}	468	}
451		469
452	sub invoke_focus_in {	470	sub invoke_focus_in {
…		…
543		561
544	# parent	562	# parent
545	$self->{parent} && $self->{parent}->emit ($signal, @args)	563	$self->{parent} && $self->{parent}->emit ($signal, @args)
546	}	564	}
547		565
548	sub find_widget {	566	#sub find_widget {
549	my ($self, $x, $y) = @_;	567	# in .xs
550
551	return () unless $self->{can_events};
552
553	return $self
554	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
555	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
556
557	()
558	}
559		568
560	sub set_parent {	569	sub set_parent {
561	my ($self, $parent) = @_;	570	my ($self, $parent) = @_;
562		571
563	CFPlus::weaken ($self->{parent} = $parent);	572	CFPlus::weaken ($self->{parent} = $parent);
…		…
594		603
595	# using global variables seems a bit hacky, but passing through all drawing	604	# using global variables seems a bit hacky, but passing through all drawing
596	# functions seems pointless.	605	# functions seems pointless.
597	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	606	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
598		607
599	sub draw {	608	#sub draw {
600	my ($self) = @_;	609	#CFPlus.xs
601
602	return unless $self->{h} && $self->{w};
603
604	# update screen rectangle
605	local $draw_x = $draw_x + $self->{x};
606	local $draw_y = $draw_y + $self->{y};
607
608	# skip widgets that are entirely outside the drawing area
609	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
610	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
611
612	glPushMatrix;
613	glTranslate $self->{x}, $self->{y}, 0;
614
615	if ($self == $HOVER && $self->{can_hover}) {
616	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
617	glEnable GL_BLEND;
618	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
619	glBegin GL_QUADS;
620	glVertex 0 , 0;
621	glVertex $self->{w}, 0;
622	glVertex $self->{w}, $self->{h};
623	glVertex 0 , $self->{h};
624	glEnd;
625	glDisable GL_BLEND;
626	}
627
628	if ($ENV{CFPLUS_DEBUG} & 1) {
629	glPushMatrix;
630	glColor 1, 1, 0, 1;
631	glTranslate 0.375, 0.375;
632	glBegin GL_LINE_LOOP;
633	glVertex 0 , 0;
634	glVertex $self->{w} - 1, 0;
635	glVertex $self->{w} - 1, $self->{h} - 1;
636	glVertex 0 , $self->{h} - 1;
637	glEnd;
638	glPopMatrix;
639	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
640	}
641
642	$self->_draw;
643	glPopMatrix;
644	}
645		610
646	sub _draw {	611	sub _draw {
647	my ($self) = @_;	612	my ($self) = @_;
648		613
649	warn "no draw defined for $self\n";	614	warn "no draw defined for $self\n";
650	}	615	}
651		616
652	my $cntx;#d#
653	sub DESTROY {	617	sub DESTROY {
654	my ($self) = @_;	618	my ($self) = @_;
655		619
656	return if CFPlus::in_destruct;	620	return if CFPlus::in_destruct;
657		621
		622	local $@;
658	eval { $self->destroy };	623	eval { $self->destroy };
659	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	624	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
660		625
661	delete $WIDGET{$self+0};	626	delete $WIDGET{$self+0};
662	}	627	}
…		…
670	use strict;	635	use strict;
671	use CFPlus::OpenGL;	636	use CFPlus::OpenGL;
672		637
673	sub new {	638	sub new {
674	my $class = shift;	639	my $class = shift;
675
676	# range [value, low, high, page]
677		640
678	$class->SUPER::new (	641	$class->SUPER::new (
679	#bg => [0, 0, 0, 0.2],	642	#bg => [0, 0, 0, 0.2],
680	#active_bg => [1, 1, 1, 0.5],	643	#active_bg => [1, 1, 1, 0.5],
681	@_	644	@_
…		…
693	my ($w, $h) = @$self{qw(w h)};	656	my ($w, $h) = @$self{qw(w h)};
694		657
695	glEnable GL_BLEND;	658	glEnable GL_BLEND;
696	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	659	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
697	glColor_premultiply @$color;	660	glColor_premultiply @$color;
698
699	glBegin GL_QUADS;
700	glVertex 0 , 0;
701	glVertex 0 , $h;
702	glVertex $w, $h;	661	glRect 0, 0, $w, $h;
703	glVertex $w, 0;
704	glEnd;
705
706	glDisable GL_BLEND;	662	glDisable GL_BLEND;
707	}	663	}
708	}	664	}
709		665
710	#############################################################################	666	#############################################################################
…		…
742	can_events => 0,	698	can_events => 0,
743	%arg,	699	%arg,
744	);	700	);
745		701
746	$self->add (@$children)	702	$self->add (@$children)
747	if $children;	703	if $children && @$children;
748		704
749	$self	705	$self
750	}	706	}
751		707
752	sub realloc {	708	sub realloc {
…		…
761	my ($self, @widgets) = @_;	717	my ($self, @widgets) = @_;
762		718
763	$_->set_parent ($self)	719	$_->set_parent ($self)
764	for @widgets;	720	for @widgets;
765		721
		722	# TODO: only do this in widgets that need it, e.g. root, fixed
766	use sort 'stable';	723	use sort 'stable';
767		724
768	$self->{children} = [	725	$self->{children} = [
769	sort { $a->{z} <=> $b->{z} }	726	sort { $a->{z} <=> $b->{z} }
770	@{$self->{children}}, @widgets	727	@{$self->{children}}, @widgets
771	];	728	];
772		729
773	$self->realloc;	730	$self->realloc;
		731
		732	$self->emit (c_add => \@widgets);
		733
		734	map $_+0, @widgets
774	}	735	}
775		736
776	sub children {	737	sub children {
777	@{ $_[0]{children} }	738	@{ $_[0]{children} }
778	}	739	}
779		740
780	sub remove {	741	sub remove {
781	my ($self, $child) = @_;	742	my ($self, @widgets) = @_;
782		743
		744	$self->emit (c_remove => \@widgets);
		745
		746	for my $child (@widgets) {
783	delete $child->{parent};	747	delete $child->{parent};
784	$child->hide;	748	$child->hide;
785
786	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	749	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		750	}
787		751
788	$self->realloc;	752	$self->realloc;
789	}	753	}
790		754
791	sub clear {	755	sub clear {
792	my ($self) = @_;	756	my ($self) = @_;
793		757
794	my $children = delete $self->{children};	758	my $children = $self->{children};
795	$self->{children} = [];	759	$self->{children} = [];
796		760
797	for (@$children) {	761	for (@$children) {
798	delete $_->{parent};	762	delete $_->{parent};
799	$_->hide;	763	$_->hide;
…		…
819	}	783	}
820		784
821	sub _draw {	785	sub _draw {
822	my ($self) = @_;	786	my ($self) = @_;
823		787
824	$_->draw for @{$self->{children}};	788	$_->draw for $self->visible_children;
825	}	789	}
826		790
827	#############################################################################	791	#############################################################################
828		792
829	package CFPlus::UI::Bin;	793	package CFPlus::UI::Bin;
…		…
839	}	803	}
840		804
841	sub add {	805	sub add {
842	my ($self, $child) = @_;	806	my ($self, $child) = @_;
843		807
844	$self->SUPER::remove ($_) for @{ $self->{children} };	808	$self->clear;
845	$self->SUPER::add ($child);	809	$self->SUPER::add ($child);
846	}	810	}
847		811
848	sub remove {	812	sub remove {
849	my ($self, $widget) = @_;	813	my ($self, $widget) = @_;
…		…
867		831
868	1	832	1
869	}	833	}
870		834
871	#############################################################################	835	#############################################################################
872
873	# back-buffered drawing area	836	# back-buffered drawing area
874		837
875	package CFPlus::UI::Window;	838	package CFPlus::UI::Window;
876		839
877	our @ISA = CFPlus::UI::Bin::;	840	our @ISA = CFPlus::UI::Bin::;
…		…
939	}	902	}
940		903
941	#############################################################################	904	#############################################################################
942		905
943	package CFPlus::UI::ViewPort;	906	package CFPlus::UI::ViewPort;
		907
		908	use List::Util qw(min max);
944		909
945	our @ISA = CFPlus::UI::Window::;	910	our @ISA = CFPlus::UI::Window::;
946		911
947	sub new {	912	sub new {
948	my $class = shift;	913	my $class = shift;
…		…
957	sub size_request {	922	sub size_request {
958	my ($self) = @_;	923	my ($self) = @_;
959		924
960	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	925	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
961		926
962	$w = 10 if $self->{scroll_x};	927	$w = 1 if $self->{scroll_x};
963	$h = 10 if $self->{scroll_y};	928	$h = 1 if $self->{scroll_y};
964		929
965	($w, $h)	930	($w, $h)
966	}	931	}
967		932
968	sub invoke_size_allocate {	933	sub invoke_size_allocate {
…		…
980	}	945	}
981		946
982	sub set_offset {	947	sub set_offset {
983	my ($self, $x, $y) = @_;	948	my ($self, $x, $y) = @_;
984		949
		950	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		951	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		952
		953	if ($x != $self->{view_x} or $y != $self->{view_y}) {
985	$self->{view_x} = int $x;	954	$self->{view_x} = $x;
986	$self->{view_y} = int $y;	955	$self->{view_y} = $y;
987		956
		957	$self->emit (changed => $x, $y);
988	$self->update;	958	$self->update;
		959	}
		960	}
		961
		962	sub set_center {
		963	my ($self, $x, $y) = @_;
		964
		965	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		966	}
		967
		968	sub make_visible {
		969	my ($self, $x, $y, $border) = @_;
		970
		971	if ( $x < $self->{view_x} + $self->{w} * $border
		972	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		973	|| $y < $self->{view_y} + $self->{h} * $border
		974	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		975	) {
		976	$self->set_center ($x, $y);
		977	}
989	}	978	}
990		979
991	# hmm, this does not work for topleft of $self... but we should not ask for that	980	# hmm, this does not work for topleft of $self... but we should not ask for that
992	sub coord2local {	981	sub coord2local {
993	my ($self, $x, $y) = @_;	982	my ($self, $x, $y) = @_;
…		…
1008	my ($self, $x, $y) = @_;	997	my ($self, $x, $y) = @_;
1009		998
1010	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	999	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1011	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1000	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1012	) {	1001	) {
1013	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1002	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1014	} else {	1003	} else {
1015	$self->CFPlus::UI::Base::find_widget ($x, $y)	1004	$self->CFPlus::UI::Base::find_widget ($x, $y)
1016	}	1005	}
1017	}	1006	}
1018		1007
…		…
1029		1018
1030	#############################################################################	1019	#############################################################################
1031		1020
1032	package CFPlus::UI::ScrolledWindow;	1021	package CFPlus::UI::ScrolledWindow;
1033		1022
1034	our @ISA = CFPlus::UI::HBox::;	1023	our @ISA = CFPlus::UI::Table::;
1035		1024
1036	sub new {	1025	sub new {
1037	my ($class, %arg) = @_;	1026	my ($class, %arg) = @_;
1038		1027
1039	my $child = delete $arg{child};	1028	my $child = delete $arg{child};
1040		1029
1041	my $self;	1030	my $self;
1042		1031
1043	my $slider = new CFPlus::UI::Slider	1032	my $hslider = new CFPlus::UI::Slider
		1033	c_col => 0,
		1034	c_row => 1,
		1035	vertical => 0,
		1036	range => [0, 0, 1, 0.01], # HACK fix
		1037	on_changed => sub {
		1038	$self->{hpos} = $_[1];
		1039	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1040	},
		1041	;
		1042
		1043	my $vslider = new CFPlus::UI::Slider
		1044	c_col => 1,
		1045	c_row => 0,
1044	vertical => 1,	1046	vertical => 1,
1045	range => [0, 0, 1, 0.01], # HACK fix	1047	range => [0, 0, 1, 0.01], # HACK fix
1046	on_changed => sub {	1048	on_changed => sub {
1047	$self->{vp}->set_offset (0, $_[1]);	1049	$self->{vpos} = $_[1];
		1050	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1048	},	1051	},
1049	;	1052	;
1050		1053
1051	$self = $class->SUPER::new (	1054	$self = $class->SUPER::new (
1052	vp => (new CFPlus::UI::ViewPort expand => 1),	1055	scroll_x => 0,
		1056	scroll_y => 1,
1053	can_events => 1,	1057	can_events => 1,
1054	slider => $slider,	1058	hslider => $hslider,
		1059	vslider => $vslider,
		1060	col_expand => [1, 0],
		1061	row_expand => [1, 0],
1055	%arg,	1062	%arg,
1056	);	1063	);
1057		1064
		1065	$self->{vp} = new CFPlus::UI::ViewPort
		1066	c_col => 0,
		1067	c_row => 0,
		1068	expand => 1,
		1069	scroll_x => $self->{scroll_x},
		1070	scroll_y => $self->{scroll_y},
		1071	on_changed => sub {
		1072	my ($vp, $x, $y) = @_;
		1073
		1074	$vp->{parent}{hslider}->set_value ($x);
		1075	$vp->{parent}{vslider}->set_value ($y);
		1076
		1077	0
		1078	},
		1079	on_size_allocate => sub {
		1080	my ($vp, $w, $h) = @_;
		1081	$vp->{parent}->update_slider;
		1082	0
		1083	},
		1084	;
		1085
1058	$self->SUPER::add ($self->{vp}, $self->{slider});	1086	$self->SUPER::add ($self->{vp});
		1087
1059	$self->add ($child) if $child;	1088	$self->add ($child) if $child;
1060		1089
1061	$self	1090	$self
1062	}	1091	}
1063
1064	#TODO# update range on size_allocate depending on child
1065		1092
1066	sub add {	1093	sub add {
1067	my ($self, $widget) = @_;	1094	my ($self, $widget) = @_;
1068		1095
1069	$self->{vp}->add ($self->{child} = $widget);	1096	$self->{vp}->add ($self->{child} = $widget);
1070	}	1097	}
1071		1098
		1099	sub set_offset { shift->{vp}->set_offset (@_) }
		1100	sub set_center { shift->{vp}->set_center (@_) }
		1101	sub make_visible { shift->{vp}->make_visible (@_) }
		1102
		1103	sub update_slider {
		1104	my ($self) = @_;
		1105
		1106	my $child = ($self->{vp} or return)->child;
		1107
		1108	if ($self->{scroll_x}) {
		1109	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1110	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1111
		1112	my $visible = $w1 > $w2;
		1113	if ($visible != $self->{hslider_visible}) {
		1114	$self->{hslider_visible} = $visible;
		1115	$visible ? $self->SUPER::add ($self->{hslider})
		1116	: $self->SUPER::remove ($self->{hslider});
		1117	}
		1118	}
		1119
		1120	if ($self->{scroll_y}) {
		1121	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1122	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1123
		1124	my $visible = $h1 > $h2;
		1125	if ($visible != $self->{vslider_visible}) {
		1126	$self->{vslider_visible} = $visible;
		1127	$visible ? $self->SUPER::add ($self->{vslider})
		1128	: $self->SUPER::remove ($self->{vslider});
		1129	}
		1130	}
		1131	}
		1132
		1133	sub start_dragging {
		1134	my ($self, $ev) = @_;
		1135
		1136	$self->grab_focus;
		1137
		1138	my $ox = $self->{vp}{view_x};
		1139	my $oy = $self->{vp}{view_y};
		1140
		1141	$self->{motion} = sub {
		1142	my ($ev, $x, $y) = @_;
		1143
		1144	$ox -= $ev->{xrel};
		1145	$oy -= $ev->{yrel};
		1146
		1147	$self->{vp}->set_offset ($ox, $oy);
		1148	};
		1149	}
		1150
1072	sub invoke_mouse_wheel {	1151	sub invoke_mouse_wheel {
1073	my ($self, $ev) = @_;	1152	my ($self, $ev) = @_;
1074		1153
1075	return 0 unless $ev->{dy}; # only vertical movements
1076
1077	$self->{slider}->emit (mouse_wheel => $ev);	1154	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1155	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1078		1156
1079	1	1157	1
1080	}	1158	}
1081		1159
1082	sub update_slider {	1160	sub invoke_button_down {
1083	my ($self) = @_;	1161	my ($self, $ev, $x, $y) = @_;
1084		1162
1085	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1163	if ($ev->{button} == 2) {
1086	}	1164	$self->start_dragging ($ev);
		1165	return 1;
		1166	}
1087		1167
1088	sub update {	1168	0
1089	my ($self) = @_;	1169	}
1090		1170
1091	$self->SUPER::update;	1171	sub invoke_button_up {
		1172	my ($self, $ev, $x, $y) = @_;
1092		1173
1093	$self->update_slider;	1174	if (delete $self->{motion}) {
		1175	return 1;
		1176	}
		1177
		1178	0
		1179	}
		1180
		1181	sub invoke_mouse_motion {
		1182	my ($self, $ev, $x, $y) = @_;
		1183
		1184	if ($self->{motion}) {
		1185	$self->{motion}->($ev, $x, $y);
		1186	return 1;
		1187	}
		1188
		1189	0
1094	}	1190	}
1095		1191
1096	sub invoke_size_allocate {	1192	sub invoke_size_allocate {
1097	my ($self, $w, $h) = @_;	1193	my ($self, $w, $h) = @_;
1098		1194
1099	$self->update_slider;	1195	$self->update_slider;
1100
1101	$self->SUPER::invoke_size_allocate ($w, $h)	1196	$self->SUPER::invoke_size_allocate ($w, $h)
1102	}	1197	}
1103		1198
1104	#############################################################################	1199	#############################################################################
1105		1200
…		…
1125	my ($w, $h) = @$self{qw(w h)};	1220	my ($w, $h) = @$self{qw(w h)};
1126		1221
1127	glEnable GL_BLEND;	1222	glEnable GL_BLEND;
1128	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1223	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1129	glColor_premultiply @{ $self->{bg} };	1224	glColor_premultiply @{ $self->{bg} };
1130
1131	glBegin GL_QUADS;
1132	glVertex 0 , 0;
1133	glVertex 0 , $h;
1134	glVertex $w, $h;	1225	glRect 0, 0, $w, $h;
1135	glVertex $w, 0;
1136	glEnd;
1137
1138	glDisable GL_BLEND;	1226	glDisable GL_BLEND;
1139	}	1227	}
1140		1228
1141	$self->SUPER::_draw;	1229	$self->SUPER::_draw;
1142	}	1230	}
…		…
1255		1343
1256	my @border =	1344	my @border =
1257	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1345	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1258	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1346	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1259		1347
		1348	my @icon =
		1349	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1350	qw(x1_move.png x1_resize.png);
		1351
1260	sub new {	1352	sub new {
1261	my ($class, %arg) = @_;	1353	my ($class, %arg) = @_;
1262		1354
1263	my $self = $class->SUPER::new (	1355	my $self = $class->SUPER::new (
1264	bg => [1, 1, 1, 1],	1356	bg => [1, 1, 1, 1],
…		…
1299		1391
1300	sub border {	1392	sub border {
1301	int $_[0]{border} * $::FONTSIZE	1393	int $_[0]{border} * $::FONTSIZE
1302	}	1394	}
1303		1395
		1396	sub get_max_wh {
		1397	my ($self) = @_;
		1398
		1399	return ($self->{w}, $self->{h})
		1400	if $self->{visible} && $self->{w};
		1401
		1402	$self->SUPER::get_max_wh
		1403	}
		1404
1304	sub size_request {	1405	sub size_request {
1305	my ($self) = @_;	1406	my ($self) = @_;
1306		1407
1307	$self->{title_widget}->size_request	1408	$self->{title_widget}->size_request
1308	if $self->{title_widget};	1409	if $self->{title_widget};
…		…
1432	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1533	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1433		1534
1434	my $border = $self->border;	1535	my $border = $self->border;
1435		1536
1436	glColor @{ $self->{border_bg} };	1537	glColor @{ $self->{border_bg} };
1437	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1538	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1438	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1539	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1439	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1540	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1440	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1541	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1542
		1543	# move
		1544	my $w2 = ($w - $border) * .5;
		1545	my $h2 = ($h - $border) * .5;
		1546	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1547	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1548	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1549
		1550	# resize
		1551	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1553	unless $self->{has_close_button};
		1554	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1441		1556
1442	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1557	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1443	glColor @{ $self->{bg} };	1558	glColor @{ $self->{bg} };
1444		1559
1445	# TODO: repeat texture not scale	1560	# TODO: repeat texture not scale
…		…
1466		1581
1467	#############################################################################	1582	#############################################################################
1468		1583
1469	package CFPlus::UI::Table;	1584	package CFPlus::UI::Table;
1470		1585
1471	our @ISA = CFPlus::UI::Base::;	1586	our @ISA = CFPlus::UI::Container::;
1472		1587
1473	use List::Util qw(max sum);	1588	use List::Util qw(max sum);
1474		1589
1475	use CFPlus::OpenGL;	1590	use CFPlus::OpenGL;
1476		1591
1477	sub new {	1592	sub new {
1478	my $class = shift;	1593	my $class = shift;
1479		1594
1480	$class->SUPER::new (	1595	$class->SUPER::new (
1481	col_expand => [],	1596	col_expand => [],
		1597	row_expand => [],
1482	@_,	1598	@_,
1483	)	1599	)
1484	}	1600	}
1485		1601
1486	sub children {
1487	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1488	}
1489
1490	sub add {	1602	sub add {
		1603	my ($self, @widgets) = @_;
		1604
		1605	for my $child (@widgets) {
		1606	$child->{c_rowspan} ||= 1;
		1607	$child->{c_colspan} ||= 1;
		1608	}
		1609
		1610	$self->SUPER::add (@widgets);
		1611	}
		1612
		1613	sub add_at {
1491	my ($self) = shift;	1614	my $self = shift;
		1615
		1616	my @widgets;
1492		1617
1493	while (@_) {	1618	while (@_) {
1494	my ($x, $y, $child) = splice @_, 0, 3, ();	1619	my ($col, $row, $child) = splice @_, 0, 3, ();
1495	$child->set_parent ($self);
1496	$self->{children}[$y][$x] = $child;
1497	}
1498		1620
1499	$self->{force_realloc} = 1;	1621	$child->{c_row} = $row;
1500	$self->{force_size_alloc} = 1;	1622	$child->{c_col} = $col;
1501	$self->realloc;
1502	}
1503		1623
1504	sub remove {	1624	push @widgets, $child;
		1625	}
		1626
		1627	$self->add (@widgets);
		1628	}
		1629
		1630	sub get_wh {
1505	my ($self, $child) = @_;	1631	my ($self) = @_;
1506		1632
1507	# TODO: not yet implemented	1633	my (@w, @h);
1508	}
1509
1510	# TODO: move to container class maybe? send children a signal on removal?
1511	sub clear {
1512	my ($self) = @_;
1513		1634
1514	my @children = $self->children;	1635	my @children = $self->children;
1515	delete $self->{children};	1636
		1637	# first pass, columns
		1638	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1639	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1640
		1641	my $sw = sum @w[$c .. $c + $cs - 1];
		1642
		1643	if ($w > $sw) {
		1644	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1645	}
1516		1646	}
1517	for (@children) {
1518	delete $_->{parent};
1519	$_->hide;
1520	}
1521		1647
1522	$self->realloc;	1648	# second pass, rows
1523	}	1649	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1524
1525	sub get_wh {
1526	my ($self) = @_;
1527
1528	my (@w, @h);
1529
1530	for my $y (0 .. $#{$self->{children}}) {
1531	my $row = $self->{children}[$y]
1532	or next;
1533
1534	for my $x (0 .. $#$row) {
1535	my $widget = $row->[$x]
1536	or next;
1537	my ($w, $h) = @$widget{qw(req_w req_h)};	1650	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1538		1651
1539	$w[$x] = max $w[$x], $w;	1652	my $sh = sum @h[$r .. $r + $rs - 1];
1540	$h[$y] = max $h[$y], $h;	1653
		1654	if ($h > $sh) {
		1655	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1541	}	1656	}
1542	}	1657	}
1543		1658
1544	(\@w, \@h)	1659	(\@w, \@h)
1545	}	1660	}
…		…
1561	my ($ws, $hs) = $self->get_wh;	1676	my ($ws, $hs) = $self->get_wh;
1562		1677
1563	my $req_w = (sum @$ws) || 1;	1678	my $req_w = (sum @$ws) || 1;
1564	my $req_h = (sum @$hs) || 1;	1679	my $req_h = (sum @$hs) || 1;
1565		1680
1566	# TODO: nicer code && do row_expand	1681	# now linearly scale the rows/columns to the allocated size
1567	my @col_expand = @{$self->{col_expand}};	1682	my @col_expand = @{$self->{col_expand}};
1568	@col_expand = (1) x @$ws unless @col_expand;	1683	@col_expand = (1) x @$ws unless @col_expand;
1569	my $col_expand = (sum @col_expand) || 1;	1684	my $col_expand = (sum @col_expand) || 1;
1570		1685
1571	# linearly scale sizes
1572	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1686	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1573	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1574		1687
1575	CFPlus::UI::harmonize $ws;	1688	CFPlus::UI::harmonize $ws;
		1689
		1690	my @row_expand = @{$self->{row_expand}};
		1691	@row_expand = (1) x @$ws unless @row_expand;
		1692	my $row_expand = (sum @row_expand) || 1;
		1693
		1694	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1695
1576	CFPlus::UI::harmonize $hs;	1696	CFPlus::UI::harmonize $hs;
1577		1697
1578	my $y;	1698	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1699	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1579		1700
1580	for my $r (0 .. $#{$self->{children}}) {	1701	for my $widget ($self->children) {
1581	my $row = $self->{children}[$r]	1702	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1582	or next;
1583		1703
1584	my $x = 0;	1704	$widget->configure (
1585	my $row_h = $hs->[$r];	1705	$x[$c], $y[$r],
		1706	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1586		1707	);
1587	for my $c (0 .. $#$row) {	1708	}
1588	my $col_w = $ws->[$c];
1589		1709
1590	if (my $widget = $row->[$c]) {	1710	1
1591	$widget->configure ($x, $y, $col_w, $row_h);	1711	}
1592	}
1593		1712
1594	$x += $col_w;	1713	#############################################################################
		1714
		1715	package CFPlus::UI::Fixed;
		1716
		1717	use List::Util qw(min max);
		1718
		1719	our @ISA = CFPlus::UI::Container::;
		1720
		1721	sub _scale($$$) {
		1722	my ($rel, $val, $max) = @_;
		1723
		1724	$rel ? $val * $max : $val
		1725	}
		1726
		1727	sub size_request {
		1728	my ($self) = @_;
		1729
		1730	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1731
		1732	# determine overall size by querying abs widgets
		1733	for my $child ($self->visible_children) {
		1734	unless ($child->{c_rel}) {
		1735	my $x = $child->{c_x};
		1736	my $y = $child->{c_y};
		1737
		1738	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1739	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1595	}	1740	}
		1741	}
1596		1742
1597	$y += $row_h;	1743	my $W = $x2 - $x1;
		1744	my $H = $y2 - $y1;
		1745
		1746	# now layout remaining widgets
		1747	for my $child ($self->visible_children) {
		1748	if ($child->{c_rel}) {
		1749	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1750	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1751
		1752	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1753	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1754	}
		1755	}
		1756
		1757	my $W = $x2 - $x1;
		1758	my $H = $y2 - $y1;
		1759
		1760	($W, $H)
		1761	}
		1762
		1763	sub invoke_size_allocate {
		1764	my ($self, $W, $H) = @_;
		1765
		1766	for my $child ($self->visible_children) {
		1767	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1768	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1769
		1770	$x += $child->{c_halign} * $child->{req_w};
		1771	$y += $child->{c_valign} * $child->{req_h};
		1772
		1773	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1598	}	1774	}
1599		1775
1600	1	1776	1
1601	}	1777	}
1602		1778
1603	sub find_widget {
1604	my ($self, $x, $y) = @_;
1605
1606	$x -= $self->{x};
1607	$y -= $self->{y};
1608
1609	my $res;
1610
1611	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1612	$res = $_->find_widget ($x, $y)
1613	and return $res;
1614	}
1615
1616	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1617	}
1618
1619	sub _draw {
1620	my ($self) = @_;
1621
1622	for (grep $_, @{$self->{children}}) {
1623	$_->draw for grep $_, @$_;
1624	}
1625	}
1626
1627	#############################################################################	1779	#############################################################################
1628		1780
1629	package CFPlus::UI::Box;	1781	package CFPlus::UI::Box;
1630		1782
1631	our @ISA = CFPlus::UI::Container::;	1783	our @ISA = CFPlus::UI::Container::;
1632		1784
1633	sub size_request {	1785	sub size_request {
1634	my ($self) = @_;	1786	my ($self) = @_;
		1787
		1788	my @children = $self->visible_children;
1635		1789
1636	$self->{vertical}	1790	$self->{vertical}
1637	? (	1791	? (
1638	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1792	(List::Util::max map $_->{req_w}, @children),
1639	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_h}, @children),
1640	)	1794	)
1641	: (	1795	: (
1642	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1796	(List::Util::sum map $_->{req_w}, @children),
1643	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1797	(List::Util::max map $_->{req_h}, @children),
1644	)	1798	)
1645	}	1799	}
1646		1800
1647	sub invoke_size_allocate {	1801	sub invoke_size_allocate {
1648	my ($self, $w, $h) = @_;	1802	my ($self, $w, $h) = @_;
…		…
1772		1926
1773	delete $self->{ox};	1927	delete $self->{ox};
1774	$self->SUPER::realloc;	1928	$self->SUPER::realloc;
1775	}	1929	}
1776		1930
		1931	sub clear {
		1932	my ($self) = @_;
		1933
		1934	$self->set_text ("");
		1935	}
		1936
1777	sub set_text {	1937	sub set_text {
1778	my ($self, $text) = @_;	1938	my ($self, $text) = @_;
1779		1939
1780	return if $self->{text} eq "T$text";	1940	return if $self->{text} eq "T$text";
1781	$self->{text} = "T$text";	1941	$self->{text} = "T$text";
…		…
1804		1964
1805	sub size_request {	1965	sub size_request {
1806	my ($self) = @_;	1966	my ($self) = @_;
1807		1967
1808	$self->{size_req} ||= do {	1968	$self->{size_req} ||= do {
		1969	my ($max_w, $max_h) = $self->get_max_wh;
		1970
1809	$self->{layout}->set_font ($self->{font}) if $self->{font};	1971	$self->{layout}->set_font ($self->{font}) if $self->{font};
1810	$self->{layout}->set_width ($self->{max_w} || -1);	1972	$self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1811	$self->{layout}->set_ellipsise ($self->{ellipsise});	1973	$self->{layout}->set_ellipsise ($self->{ellipsise});
1812	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1974	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1813	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1975	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1814		1976
1815	my ($w, $h) = $self->{layout}->size;	1977	my ($w, $h) = $self->{layout}->size;
…		…
1887	: ($self->{w} - $size->[0]) * 0.5);	2049	: ($self->{w} - $size->[0]) * 0.5);
1888		2050
1889	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2051	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1890	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2052	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1891	: ($self->{h} - $size->[1]) * 0.5);	2053	: ($self->{h} - $size->[1]) * 0.5);
		2054
		2055	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1892	};	2056	};
1893		2057
1894	my $w = List::Util::min $self->{w} + 4, $size->[0];	2058	# unless ($self->{list}) {
1895	my $h = List::Util::min $self->{h} + 2, $size->[1];	2059	# $self->{list} = CFPlus::OpenGL::glGenList;
1896		2060	# CFPlus::OpenGL::glNewList $self->{list};
1897	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2061	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2062	# CFPlus::OpenGL::glEndList;
		2063	# }
		2064	#
		2065	# CFPlus::OpenGL::glCallList $self->{list};
		2066
		2067	$self->{layout}->draw;
1898	}	2068	}
		2069
		2070	#sub destroy {
		2071	# my ($self) = @_;
		2072	#
		2073	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2074	#
		2075	# $self->SUPER::destroy;
		2076	#}
1899		2077
1900	#############################################################################	2078	#############################################################################
1901		2079
1902	package CFPlus::UI::EntryBase;	2080	package CFPlus::UI::EntryBase;
1903		2081
…		…
1909	my $class = shift;	2087	my $class = shift;
1910		2088
1911	$class->SUPER::new (	2089	$class->SUPER::new (
1912	fg => [1, 1, 1],	2090	fg => [1, 1, 1],
1913	bg => [0, 0, 0, 0.2],	2091	bg => [0, 0, 0, 0.2],
		2092	outline => [0.6, 0.3, 0.1],
1914	active_bg => [1, 1, 1, 0.5],	2093	active_bg => [0, 0, 1, .2],
1915	active_fg => [0, 0, 0],	2094	active_fg => [1, 1, 1],
		2095	active_outline => [1, 1, 0],
1916	can_hover => 1,	2096	can_hover => 1,
1917	can_focus => 1,	2097	can_focus => 1,
1918	valign => 0,	2098	valign => 0,
1919	can_events => 1,	2099	can_events => 1,
1920	ellipsise => 0,	2100	ellipsise => 0,
…		…
1969	my $mod = $ev->{mod};	2149	my $mod = $ev->{mod};
1970	my $sym = $ev->{sym};	2150	my $sym = $ev->{sym};
1971	my $uni = $ev->{unicode};	2151	my $uni = $ev->{unicode};
1972		2152
1973	my $text = $self->get_text;	2153	my $text = $self->get_text;
		2154
		2155	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1974		2156
1975	if ($uni == 8) {	2157	if ($uni == 8) {
1976	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2158	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1977	} elsif ($uni == 127) {	2159	} elsif ($uni == 127) {
1978	substr $text, $self->{cursor}, 1, "";	2160	substr $text, $self->{cursor}, 1, "";
…		…
2058	glColor_premultiply @{$self->{bg}};	2240	glColor_premultiply @{$self->{bg}};
2059	}	2241	}
2060		2242
2061	glEnable GL_BLEND;	2243	glEnable GL_BLEND;
2062	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2244	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2063	glBegin GL_QUADS;
2064	glVertex 0 , 0;
2065	glVertex 0 , $self->{h};
2066	glVertex $self->{w}, $self->{h};	2245	glRect 0, 0, $self->{w}, $self->{h};
2067	glVertex $self->{w}, 0;
2068	glEnd;
2069	glDisable GL_BLEND;	2246	glDisable GL_BLEND;
2070		2247
2071	$self->SUPER::_draw;	2248	$self->SUPER::_draw;
2072		2249
2073	#TODO: force update every cursor change :(	2250	#TODO: force update every cursor change :(
…		…
2075		2252
2076	unless (exists $self->{cur_h}) {	2253	unless (exists $self->{cur_h}) {
2077	my $text = substr $self->{text}, 0, $self->{cursor};	2254	my $text = substr $self->{text}, 0, $self->{cursor};
2078	utf8::encode $text;	2255	utf8::encode $text;
2079		2256
2080	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2257	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2081	}	2258	}
2082		2259
		2260	glColor_premultiply @{$self->{active_fg}};
2083	glBegin GL_LINES;	2261	glBegin GL_LINES;
2084	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2262	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2085	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2263	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
		2264	glEnd;
		2265
		2266	glLineWidth 3;
		2267	glColor @{$self->{active_outline}};
		2268	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2269	glLineWidth 1;
		2270
		2271	} else {
		2272	glColor @{$self->{outline}};
		2273	glBegin GL_LINE_STRIP;
		2274	glVertex .5, $self->{h} * .5;
		2275	glVertex .5, $self->{h} - 2.5;
		2276	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2277	glVertex $self->{w} - .5, $self->{h} * .5;
2086	glEnd;	2278	glEnd;
2087	}	2279	}
2088	}	2280	}
2089		2281
2090	#############################################################################	2282	#############################################################################
…		…
2177	1	2369	1
2178	}	2370	}
2179		2371
2180	#############################################################################	2372	#############################################################################
2181		2373
2182	package CFPlus::UI::Button;	2374	package CFPlus::UI::ButtonBin;
2183		2375
2184	our @ISA = CFPlus::UI::Label::;	2376	our @ISA = CFPlus::UI::Bin::;
2185		2377
2186	use CFPlus::OpenGL;	2378	use CFPlus::OpenGL;
2187		2379
2188	my @tex =	2380	my @tex =
2189	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2381	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2190	qw(b1_button_active.png);	2382	qw(b1_button_inactive.png b1_button_active.png);
2191		2383
2192	sub new {	2384	sub new {
2193	my $class = shift;	2385	my $class = shift;
2194		2386
2195	$class->SUPER::new (	2387	$class->SUPER::new (
2196	padding_x => 4,
2197	padding_y => 4,
2198	fg => [1, 1, 1],
2199	active_fg => [0, 0, 1],
2200	can_hover => 1,	2388	can_hover => 1,
2201	align => 0,	2389	align => 0,
2202	valign => 0,	2390	valign => 0,
2203	can_events => 1,	2391	can_events => 1,
2204	@_	2392	@_
…		…
2216	}	2404	}
2217		2405
2218	sub _draw {	2406	sub _draw {
2219	my ($self) = @_;	2407	my ($self) = @_;
2220		2408
2221	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2222
2223	glEnable GL_TEXTURE_2D;	2409	glEnable GL_TEXTURE_2D;
2224	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2410	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225	glColor 0, 0, 0, 1;	2411	glColor 0, 0, 0, 1;
2226		2412
		2413	my $tex = $tex[$GRAB == $self];
2227	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2414	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2415
		2416	glDisable GL_TEXTURE_2D;
		2417
		2418	$self->SUPER::_draw;
		2419	}
		2420
		2421	#############################################################################
		2422
		2423	package CFPlus::UI::Button;
		2424
		2425	our @ISA = CFPlus::UI::Label::;
		2426
		2427	use CFPlus::OpenGL;
		2428
		2429	my @tex =
		2430	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2431	qw(b1_button_inactive.png b1_button_active.png);
		2432
		2433	sub new {
		2434	my $class = shift;
		2435
		2436	$class->SUPER::new (
		2437	padding_x => 4,
		2438	padding_y => 4,
		2439	fg => [1.0, 1.0, 1.0],
		2440	active_fg => [0.8, 0.8, 0.8],
		2441	can_hover => 1,
		2442	align => 0,
		2443	valign => 0,
		2444	can_events => 1,
		2445	@_
		2446	)
		2447	}
		2448
		2449	sub invoke_button_up {
		2450	my ($self, $ev, $x, $y) = @_;
		2451
		2452	$self->emit ("activate")
		2453	if $x >= 0 && $x < $self->{w}
		2454	&& $y >= 0 && $y < $self->{h};
		2455
		2456	1
		2457	}
		2458
		2459	sub _draw {
		2460	my ($self) = @_;
		2461
		2462	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2463
		2464	glEnable GL_TEXTURE_2D;
		2465	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2466	glColor 0, 0, 0, 1;
		2467
		2468	my $tex = $tex[$GRAB == $self];
		2469	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2228		2470
2229	glDisable GL_TEXTURE_2D;	2471	glDisable GL_TEXTURE_2D;
2230		2472
2231	$self->SUPER::_draw;	2473	$self->SUPER::_draw;
2232	}	2474	}
…		…
2289	sub _draw {	2531	sub _draw {
2290	my ($self) = @_;	2532	my ($self) = @_;
2291		2533
2292	$self->SUPER::_draw;	2534	$self->SUPER::_draw;
2293		2535
2294	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2536	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2295		2537
2296	my ($w, $h) = @$self{qw(w h)};	2538	my ($w, $h) = @$self{qw(w h)};
2297		2539
2298	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;	2540	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2299		2541
…		…
2319	sub new {	2561	sub new {
2320	my $class = shift;	2562	my $class = shift;
2321		2563
2322	my $self = $class->SUPER::new (	2564	my $self = $class->SUPER::new (
2323	can_events => 0,	2565	can_events => 0,
		2566	scale => 1,
2324	@_,	2567	@_,
2325	);	2568	);
2326		2569
2327	$self->{path} || $self->{tex}	2570	$self->{path} || $self->{tex}
2328	or Carp::croak "'path' or 'tex' attributes required";	2571	or Carp::croak "'path' or 'tex' attributes required";
…		…
2353	}	2596	}
2354		2597
2355	sub size_request {	2598	sub size_request {
2356	my ($self) = @_;	2599	my ($self) = @_;
2357		2600
2358	($self->{tex}{w}, $self->{tex}{h})	2601	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2359	}	2602	}
2360		2603
2361	sub _draw {	2604	sub _draw {
2362	my ($self) = @_;	2605	my ($self) = @_;
2363		2606
…		…
2373	}	2616	}
2374		2617
2375	glEnable GL_TEXTURE_2D;	2618	glEnable GL_TEXTURE_2D;
2376	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2619	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2377		2620
2378	$tex->draw_quad (0, 0, $w, $h);	2621	$tex->draw_quad_alpha (0, 0, $w, $h);
2379		2622
2380	glDisable GL_TEXTURE_2D;	2623	glDisable GL_TEXTURE_2D;
2381	}	2624	}
2382		2625
2383	#############################################################################	2626	#############################################################################
…		…
2402	align => 0,	2645	align => 0,
2403	valign => 0,	2646	valign => 0,
2404	can_events => 1,	2647	can_events => 1,
2405	@_	2648	@_
2406	);	2649	);
		2650	}
		2651
		2652	sub invoke_button_down {
		2653	my ($self, $ev, $x, $y) = @_;
		2654
		2655	1
2407	}	2656	}
2408		2657
2409	sub invoke_button_up {	2658	sub invoke_button_up {
2410	my ($self, $ev, $x, $y) = @_;	2659	my ($self, $ev, $x, $y) = @_;
2411		2660
…		…
2551	glDisable GL_TEXTURE_2D;	2800	glDisable GL_TEXTURE_2D;
2552	}	2801	}
2553		2802
2554	#############################################################################	2803	#############################################################################
2555		2804
		2805	package CFPlus::UI::Progress;
		2806
		2807	our @ISA = CFPlus::UI::Label::;
		2808
		2809	use CFPlus::OpenGL;
		2810
		2811	sub new {
		2812	my ($class, %arg) = @_;
		2813
		2814	my $self = $class->SUPER::new (
		2815	fg => [1, 1, 1],
		2816	bg => [0, 0, 1, 0.2],
		2817	bar => [0.7, 0.5, 0.1, 0.8],
		2818	outline => [0.4, 0.3, 0],
		2819	fontsize => 0.9,
		2820	valign => 0,
		2821	align => 0,
		2822	can_events => 1,
		2823	ellipsise => 1,
		2824	label => "%d%%",
		2825	%arg,
		2826	);
		2827
		2828	$self->set_value ($arg{value} || -1);
		2829
		2830	$self
		2831	}
		2832
		2833	sub set_label {
		2834	my ($self, $label) = @_;
		2835
		2836	return if $self->{label} eq $label;
		2837	$self->{label} = $label;
		2838
		2839	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2840	}
		2841
		2842	sub set_value {
		2843	my ($self, $value) = @_;
		2844
		2845	if ($self->{value} ne $value) {
		2846	$self->{value} = $value;
		2847
		2848	if ($value < 0) {
		2849	$self->set_text ("-");
		2850	} else {
		2851	$self->set_text (sprintf $self->{label}, $value * 100);
		2852	}
		2853
		2854	$self->update;
		2855	}
		2856	}
		2857
		2858	sub _draw {
		2859	my ($self) = @_;
		2860
		2861	glEnable GL_BLEND;
		2862	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2863
		2864	if ($self->{value} >= 0) {
		2865	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2866
		2867	glColor_premultiply @{$self->{bar}};
		2868	glRect 2, 2, $s, $self->{h} - 2;
		2869	glColor_premultiply @{$self->{bg}};
		2870	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2871	}
		2872
		2873	glColor_premultiply @{$self->{outline}};
		2874	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2875
		2876	glDisable GL_BLEND;
		2877
		2878	{
		2879	local $self->{bg}; # do not draw background
		2880	$self->SUPER::_draw;
		2881	}
		2882	}
		2883
		2884	#############################################################################
		2885
		2886	package CFPlus::UI::ExperienceProgress;
		2887
		2888	our @ISA = CFPlus::UI::Progress::;
		2889
		2890	sub new {
		2891	my ($class, %arg) = @_;
		2892
		2893	my $self = $class->SUPER::new (
		2894	tooltip => sub {
		2895	my ($self) = @_;
		2896
		2897	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2898	$self->{lvl},
		2899	::formsep ($self->{exp}),
		2900	::formsep ($self->{nxt}),
		2901	::formsep ($self->{nxt} - $self->{exp}),
		2902	},
		2903	%arg
		2904	);
		2905
		2906	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2907	if $::CONN;
		2908
		2909	$self
		2910	}
		2911
		2912	sub DESTROY {
		2913	my ($self) = @_;
		2914
		2915	delete $::CONN->{on_exp_update}{$self+0}
		2916	if $::CONN;
		2917
		2918	$self->SUPER::DESTROY;
		2919	}
		2920
		2921	sub set_value {
		2922	my ($self, $lvl, $exp) = @_;
		2923
		2924	$self->{lvl} = $lvl;
		2925	$self->{exp} = $exp;
		2926
		2927	my $v = -1;
		2928
		2929	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2930	my $l0 = $table->[$lvl - 1];
		2931	my $l1 = $table->[$lvl];
		2932
		2933	$self->{nxt} = $l1;
		2934
		2935	$v = ($exp - $l0) / ($l1 - $l0);
		2936	}
		2937
		2938	$self->SUPER::set_value ($v);
		2939	}
		2940
		2941	#############################################################################
		2942
2556	package CFPlus::UI::Gauge;	2943	package CFPlus::UI::Gauge;
2557		2944
2558	our @ISA = CFPlus::UI::VBox::;	2945	our @ISA = CFPlus::UI::VBox::;
2559		2946
2560	sub new {	2947	sub new {
…		…
2685		3072
2686	$self->SUPER::invoke_button_down ($ev, $x, $y);	3073	$self->SUPER::invoke_button_down ($ev, $x, $y);
2687		3074
2688	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3075	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2689		3076
2690	$self->invoke_mouse_motion ($ev, $x, $y)	3077	$self->invoke_mouse_motion ($ev, $x, $y);
		3078
		3079	1
2691	}	3080	}
2692		3081
2693	sub invoke_mouse_motion {	3082	sub invoke_mouse_motion {
2694	my ($self, $ev, $x, $y) = @_;	3083	my ($self, $ev, $x, $y) = @_;
2695		3084
…		…
2715		3104
2716	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3105	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2717		3106
2718	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3107	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2719		3108
2720	! ! $delta	3109	1
2721	}	3110	}
2722		3111
2723	sub update {	3112	sub update {
2724	my ($self) = @_;	3113	my ($self) = @_;
2725		3114
…		…
2856	}	3245	}
2857		3246
2858	sub size_request {	3247	sub size_request {
2859	my ($self) = @_;	3248	my ($self) = @_;
2860		3249
2861	my ($empty, $slider) = @{ $self->{children} };	3250	my ($empty, $slider) = $self->visible_children;
2862		3251
2863	local $self->{children} = [$empty, $slider];	3252	local $self->{children} = [$empty, $slider];
2864	$self->SUPER::size_request	3253	$self->SUPER::size_request
2865	}	3254	}
2866		3255
…		…
3055		3444
3056	if ($y0 < $y + $h && $y < $y1) {	3445	if ($y0 < $y + $h && $y < $y1) {
3057	my $layout = $self->get_layout ($para);	3446	my $layout = $self->get_layout ($para);
3058		3447
3059	$layout->render ($para->{indent}, $y - $y0);	3448	$layout->render ($para->{indent}, $y - $y0);
		3449	$layout->draw;
3060		3450
3061	if (my @w = @{ $para->{widget} }) {	3451	if (my @w = @{ $para->{widget} }) {
3062	my @s = $layout->get_shapes;	3452	my @s = $layout->get_shapes;
3063		3453
3064	for (@w) {	3454	for (@w) {
…		…
3186	}	3576	}
3187		3577
3188	sub set_tooltip_from {	3578	sub set_tooltip_from {
3189	my ($self, $widget) = @_;	3579	my ($self, $widget) = @_;
3190		3580
3191	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3192	if $widget->{tooltip} =~ /^#(.*)$/;
3193
3194	my $tooltip = $widget->{tooltip};	3581	my $tip = $widget->{tooltip};
		3582	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3583
		3584	$tip = CFPlus::Pod::section_label tooltip => $1
		3585	if $tip =~ /^#(.*)$/;
3195		3586
3196	if ($ENV{CFPLUS_DEBUG} & 2) {	3587	if ($ENV{CFPLUS_DEBUG} & 2) {
3197	$tooltip .= "\n\n" . (ref $widget) . "\n"	3588	$tip .= "\n\n" . (ref $widget) . "\n"
3198	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3589	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3199	. "req $widget->{req_w} $widget->{req_h}\n"	3590	. "req $widget->{req_w} $widget->{req_h}\n"
3200	. "visible $widget->{visible}";	3591	. "visible $widget->{visible}";
3201	}	3592	}
3202		3593
3203	$tooltip =~ s/^\n+//;	3594	$tip =~ s/^\n+//;
3204	$tooltip =~ s/\n+$//;	3595	$tip =~ s/\n+$//;
3205		3596
3206	$self->add (new CFPlus::UI::Label	3597	$self->add (new CFPlus::UI::Label
3207	markup => $tooltip,	3598	markup => $tip,
3208	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3599	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3209	fontsize => 0.8,	3600	fontsize => 0.8,
3210	style => 1, # FLAG_INVERSE	3601	style => 1, # FLAG_INVERSE
3211	ellipsise => 0,	3602	ellipsise => 0,
3212	font => ($widget->{tooltip_font} || $::FONT_PROP),	3603	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
3250	}	3641	}
3251		3642
3252	sub _draw {	3643	sub _draw {
3253	my ($self) = @_;	3644	my ($self) = @_;
3254		3645
3255	glTranslate 0.375, 0.375;
3256
3257	my ($w, $h) = @$self{qw(w h)};	3646	my ($w, $h) = @$self{qw(w h)};
3258		3647
3259	glColor 1, 0.8, 0.4;	3648	glColor 1, 0.8, 0.4;
3260	glBegin GL_QUADS;	3649	glRect 0, 0, $w, $h;
3261	glVertex 0 , 0;
3262	glVertex 0 , $h;
3263	glVertex $w, $h;
3264	glVertex $w, 0;
3265	glEnd;
3266		3650
3267	glColor 0, 0, 0;	3651	glColor 0, 0, 0;
3268	glBegin GL_LINE_LOOP;	3652	glRect_lineloop .5, .5, $w + .5, $h + .5;
3269	glVertex 0 , 0;
3270	glVertex 0 , $h;
3271	glVertex $w, $h;
3272	glVertex $w, 0;
3273	glEnd;
3274		3653
3275	glTranslate 2 - 0.375, 2 - 0.375;	3654	glTranslate 2, 2;
3276		3655
3277	$self->SUPER::_draw;	3656	$self->SUPER::_draw;
3278	}	3657	}
3279		3658
3280	#############################################################################	3659	#############################################################################
…		…
3287		3666
3288	sub new {	3667	sub new {
3289	my $class = shift;	3668	my $class = shift;
3290		3669
3291	my $self = $class->SUPER::new (	3670	my $self = $class->SUPER::new (
		3671	size_w => 32,
		3672	size_h => 8,
3292	aspect => 1,	3673	aspect => 1,
3293	can_events => 0,	3674	can_events => 0,
3294	@_,	3675	@_,
3295	);	3676	);
3296		3677
3297	if ($self->{anim} && $self->{animspeed}) {	3678	if ($self->{anim} && $self->{animspeed}) {
3298	CFPlus::weaken (my $widget = $self);	3679	CFPlus::weaken (my $widget = $self);
3299		3680
3300	$self->{timer} = Event->timer (	3681	$self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3301	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3682	$self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3302	hard => 1,	3683	return unless $::CONN;
3303	interval => $self->{animspeed},	3684
3304	cb => sub {	3685	my $w = $widget
		3686	or return;
		3687
3305	++$widget->{frame};	3688	++$w->{frame};
		3689	$w->update_face;
		3690
		3691	# somehow, $widget can go away
3306	$widget->update;	3692	$w->update;
3307	},	3693	$w->update_timer;
3308	);	3694	};
		3695
		3696	$self->update_face;
		3697	$self->update_timer;
3309	}	3698	}
3310		3699
3311	$self	3700	$self
3312	}	3701	}
3313		3702
		3703	sub update_timer {
		3704	my ($self) = @_;
		3705
		3706	return unless $self->{timer};
		3707
		3708	if ($self->{visible}) {
		3709	$self->{timer}->start;
		3710	} else {
		3711	$self->{timer}->stop;
		3712	}
		3713	}
		3714
		3715	sub update_face {
		3716	my ($self) = @_;
		3717
		3718	if ($::CONN) {
		3719	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3720	if ($anim && @$anim) {
		3721	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3722	delete $self->{face_change_cb};
		3723
		3724	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3725	unless ($tex->{name} || $tex->{loading}) {
		3726	$tex->upload (sub { $self->reconfigure });
		3727	}
		3728	}
		3729	}
		3730	}
		3731	}
		3732	}
		3733
3314	sub size_request {	3734	sub size_request {
3315	(32, 8)	3735	my ($self) = @_;
		3736
		3737	if ($::CONN) {
		3738	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3739	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3740	if ($tex->{name}) {
		3741	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3742	} elsif (!$tex->{loading}) {
		3743	$tex->upload (sub { $self->reconfigure });
		3744	}
		3745	}
		3746
		3747	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3748	}
		3749	}
		3750
		3751	($self->{size_w} || 8, $self->{size_h} || 8)
3316	}	3752	}
3317		3753
3318	sub update {	3754	sub update {
3319	my ($self) = @_;	3755	my ($self) = @_;
3320		3756
3321	return unless $self->{visible};	3757	return unless $self->{visible};
3322		3758
3323	$self->SUPER::update;	3759	$self->SUPER::update;
3324	}	3760	}
3325		3761
		3762	sub invoke_visibility_change {
		3763	my ($self) = @_;
		3764
		3765	$self->update_timer;
		3766
		3767	0
		3768	}
		3769
3326	sub _draw {	3770	sub _draw {
3327	my ($self) = @_;	3771	my ($self) = @_;
3328		3772
3329	return unless $::CONN;
3330
3331	$self->SUPER::_draw;	3773	$self->SUPER::_draw;
3332		3774
3333	my $face;	3775	if (my $tex = $self->{tex}) {
3334
3335	if ($self->{frame}) {
3336	my $anim = $::CONN->{anim}[$self->{anim}];
3337
3338	$face = $anim->[ $self->{frame} % @$anim ]
3339	if $anim && @$anim;
3340	}
3341
3342	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3343
3344	if ($tex) {
3345	glEnable GL_TEXTURE_2D;	3776	glEnable GL_TEXTURE_2D;
3346	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3777	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3347	glColor 0, 0, 0, 1;	3778	glColor 0, 0, 0, 1;
3348	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3779	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3349	glDisable GL_TEXTURE_2D;	3780	glDisable GL_TEXTURE_2D;
…		…
3351	}	3782	}
3352		3783
3353	sub destroy {	3784	sub destroy {
3354	my ($self) = @_;	3785	my ($self) = @_;
3355		3786
3356	$self->{timer}->cancel	3787	(delete $self->{timer})->cancel
3357	if $self->{timer};	3788	if $self->{timer};
3358		3789
3359	$self->SUPER::destroy;	3790	$self->SUPER::destroy;
3360	}	3791	}
3361		3792
…		…
3401	children => [	3832	children => [
3402	(new CFPlus::UI::Label markup => $left, expand => 1),	3833	(new CFPlus::UI::Label markup => $left, expand => 1),
3403	(new CFPlus::UI::Label markup => $right, align => +1),	3834	(new CFPlus::UI::Label markup => $right, align => +1),
3404	],	3835	],
3405	;	3836	;
3406		3837
3407	} else {	3838	} else {
3408	$widget = new CFPlus::UI::Label	3839	$widget = new CFPlus::UI::Label
3409	can_hover => 1,	3840	can_hover => 1,
3410	can_events => 1,	3841	can_events => 1,
3411	markup => $widget,	3842	markup => $widget,
…		…
3536		3967
3537	#############################################################################	3968	#############################################################################
3538		3969
3539	package CFPlus::UI::Notebook;	3970	package CFPlus::UI::Notebook;
3540		3971
		3972	use CFPlus::OpenGL;
		3973
3541	our @ISA = CFPlus::UI::VBox::;	3974	our @ISA = CFPlus::UI::VBox::;
3542		3975
3543	sub new {	3976	sub new {
3544	my $class = shift;	3977	my $class = shift;
3545		3978
3546	my $self = $class->SUPER::new (	3979	my $self = $class->SUPER::new (
3547	buttonbar => (new CFPlus::UI::Buttonbar),	3980	buttonbar => (new CFPlus::UI::Buttonbar),
3548	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3981	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3982	active_outline => [.7, .7, 0.2],
3549	# filter => # will be put between multiplexer and $self	3983	# filter => # will be put between multiplexer and $self
3550	@_,	3984	@_,
3551	);	3985	);
3552		3986
3553	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3987	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3554	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3988	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3555		3989
		3990	{
		3991	Scalar::Util::weaken (my $wself = $self);
		3992
		3993	$self->{multiplexer}->connect (c_add => sub {
		3994	my ($mplex, $widgets) = @_;
		3995
		3996	for my $child (@$widgets) {
		3997	Scalar::Util::weaken $child;
		3998	$child->{c_tab_} ||= do {
		3999	my $tab =
		4000	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		4001	? $child->{c_tab}
		4002	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4003
		4004	$tab->connect (activate => sub {
		4005	$wself->set_current_page ($child);
		4006	});
		4007
		4008	$tab
		4009	};
		4010
		4011	$self->{buttonbar}->add ($child->{c_tab_});
		4012	}
		4013	});
		4014
		4015	$self->{multiplexer}->connect (c_remove => sub {
		4016	my ($mplex, $widgets) = @_;
		4017
		4018	for my $child (@$widgets) {
		4019	$wself->{buttonbar}->remove ($child->{c_tab_});
		4020	}
		4021	});
		4022	}
		4023
3556	$self	4024	$self
3557	}	4025	}
3558		4026
3559	sub add {	4027	sub add {
		4028	my ($self, @widgets) = @_;
		4029
		4030	$self->{multiplexer}->add (@widgets)
		4031	}
		4032
		4033	sub remove {
		4034	my ($self, @widgets) = @_;
		4035
		4036	$self->{multiplexer}->remove (@widgets)
		4037	}
		4038
		4039	sub pages {
		4040	my ($self) = @_;
		4041	$self->{multiplexer}->children
		4042	}
		4043
		4044	sub add_tab {
3560	my ($self, $title, $widget, $tooltip) = @_;	4045	my ($self, $title, $widget, $tooltip) = @_;
3561		4046
3562	CFPlus::weaken $self;	4047	$title = [$title, $tooltip] unless ref $title;
		4048	$widget->{c_tab} = $title;
3563		4049
3564	$self->{buttonbar}->add (new CFPlus::UI::Button
3565	markup => $title,
3566	tooltip => $tooltip,
3567	on_activate => sub { $self->set_current_page ($widget) },
3568	);
3569
3570	$self->{multiplexer}->add ($widget);	4050	$self->add ($widget);
3571	}	4051	}
3572		4052
3573	sub get_current_page {	4053	sub get_current_page {
3574	my ($self) = @_;	4054	my ($self) = @_;
3575		4055
…		…
3579	sub set_current_page {	4059	sub set_current_page {
3580	my ($self, $page) = @_;	4060	my ($self, $page) = @_;
3581		4061
3582	$self->{multiplexer}->set_current_page ($page);	4062	$self->{multiplexer}->set_current_page ($page);
3583	$self->emit (page_changed => $self->{multiplexer}{current});	4063	$self->emit (page_changed => $self->{multiplexer}{current});
		4064	}
		4065
		4066	sub _draw {
		4067	my ($self) = @_;
		4068
		4069	$self->SUPER::_draw ();
		4070
		4071	if (my $cur = $self->{multiplexer}{current}) {
		4072	if ($cur = $cur->{c_tab_}) {
		4073	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4074	$self->{buttonbar}{y} + $cur->{y};
		4075	glLineWidth 3;
		4076	#glEnable GL_BLEND;
		4077	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4078	glColor @{$self->{active_outline}};
		4079	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4080	glLineWidth 1;
		4081	#glDisable GL_BLEND;
		4082	}
		4083	}
3584	}	4084	}
3585		4085
3586	#############################################################################	4086	#############################################################################
3587		4087
3588	package CFPlus::UI::Selector;	4088	package CFPlus::UI::Selector;
…		…
3620	}	4120	}
3621		4121
3622	sub _set_value {	4122	sub _set_value {
3623	my ($self, $value) = @_;	4123	my ($self, $value) = @_;
3624		4124
3625	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4125	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4126	$item ||= $self->{options}[0]
3626	or return;	4127	or return;
3627		4128
3628	$self->{value} = $item->[0];	4129	$self->{value} = $item->[0];
3629	$self->set_markup ("$item->[1] ⇓");	4130	$self->set_markup ("$item->[1] ⇓");
3630	$self->set_tooltip ($item->[2]);	4131	# $self->set_tooltip ($item->[2]);
3631	}	4132	}
3632		4133
3633	sub set_value {	4134	sub set_value {
3634	my ($self, $value) = @_;	4135	my ($self, $value) = @_;
3635		4136
3636	return unless $self->{value} ne $value;	4137	return unless $self->{value} ne $value;
3637		4138
3638	$self->_set_value ($value);	4139	$self->_set_value ($value);
3639	$self->emit (changed => $value);	4140	$self->emit (changed => $value);
		4141	}
		4142
		4143	sub set_options {
		4144	my ($self, $options) = @_;
		4145
		4146	$self->{options} = $options;
		4147	$self->_set_value ($self->{value});
3640	}	4148	}
3641		4149
3642	#############################################################################	4150	#############################################################################
3643		4151
3644	package CFPlus::UI::Statusbox;	4152	package CFPlus::UI::Statusbox;
…		…
3653	@_,	4161	@_,
3654	);	4162	);
3655		4163
3656	CFPlus::weaken (my $this = $self);	4164	CFPlus::weaken (my $this = $self);
3657		4165
3658	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4166	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3659		4167
3660	$self	4168	$self
3661	}	4169	}
3662		4170
3663	sub reorder {	4171	sub reorder {
…		…
3671		4179
3672	while (my ($k, $v) = each %{ $self->{item} }) {	4180	while (my ($k, $v) = each %{ $self->{item} }) {
3673	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4181	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3674	}	4182	}
3675		4183
		4184	$self->{timer}->set (1, 1);
		4185
3676	my @widgets;	4186	my @widgets;
3677		4187
3678	my @items = sort {	4188	my @items = sort {
3679	$a->{pri} <=> $b->{pri}	4189	$a->{pri} <=> $b->{pri}
3680	or $b->{id} <=> $a->{id}	4190	or $b->{id} <=> $a->{id}
3681	} values %{ $self->{item} };	4191	} values %{ $self->{item} };
3682
3683	$self->{timer}->interval (1);
3684		4192
3685	my $count = 10 + 1;	4193	my $count = 10 + 1;
3686	for my $item (@items) {	4194	for my $item (@items) {
3687	last unless --$count;	4195	last unless --$count;
3688		4196
…		…
3712	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4220	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3713	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4221	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3714	$label->update;	4222	$label->update;
3715	$label->set_max_size (undef, $label->{req_h} * $diff)	4223	$label->set_max_size (undef, $label->{req_h} * $diff)
3716	if $diff < 1;	4224	if $diff < 1;
3717	$self->{timer}->interval (1/30);	4225	$self->{timer}->set (1/30, 1/30);
3718	} else {	4226	} else {
3719	$label->{fg}[3] = $item->{fg}[3] || 1;	4227	$label->{fg}[3] = $item->{fg}[3] || 1;
3720	}	4228	}
3721		4229
3722	push @widgets, $label;	4230	push @widgets, $label;
…		…
3858	}	4366	}
3859		4367
3860	sub update {	4368	sub update {
3861	my ($self) = @_;	4369	my ($self) = @_;
3862		4370
3863	$::WANT_REFRESH++;	4371	$::WANT_REFRESH = 1;
3864	}	4372	}
3865		4373
3866	sub add {	4374	sub add {
3867	my ($self, @children) = @_;	4375	my ($self, @children) = @_;
3868		4376
…		…
3905	while ($self->{refresh_hook}) {	4413	while ($self->{refresh_hook}) {
3906	$_->()	4414	$_->()
3907	for values %{delete $self->{refresh_hook}};	4415	for values %{delete $self->{refresh_hook}};
3908	}	4416	}
3909		4417
3910	if ($self->{realloc}) {	4418	while ($self->{realloc}) {
3911	my %queue;	4419	my %queue;
3912	my @queue;	4420	my @queue;
3913	my $widget;	4421	my $widget;
3914		4422
3915	outer:	4423	outer:
…		…
3962	}	4470	}
3963	}	4471	}
3964		4472
3965	delete $self->{realloc}{$widget+0};	4473	delete $self->{realloc}{$widget+0};
3966	}	4474	}
3967	}
3968		4475
3969	while (my $size_alloc = delete $self->{size_alloc}) {	4476	while (my $size_alloc = delete $self->{size_alloc}) {
3970	my @queue = sort { $b->{visible} <=> $a->{visible} }	4477	my @queue = sort { $a->{visible} <=> $b->{visible} }
3971	values %$size_alloc;	4478	values %$size_alloc;
3972		4479
3973	while () {	4480	while () {
3974	my $widget = pop @queue || last;	4481	my $widget = pop @queue || last;
3975		4482
3976	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4483	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977		4484
3978	$w = 0 if $w < 0;
3979	$h = 0 if $h < 0;
3980
3981	$w = max $widget->{min_w}, $w;	4485	$w = max $widget->{min_w}, $w;
3982	$h = max $widget->{min_h}, $h;	4486	$h = max $widget->{min_h}, $h;
3983		4487
3984	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4488	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3985	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4489	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3986		4490
3987	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4491	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3988	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4492	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3989		4493
3990	$w = int $w + 0.5;	4494	$w = int $w + 0.5;
3991	$h = int $h + 0.5;	4495	$h = int $h + 0.5;
3992		4496
3993	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4497	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3994	$widget->{old_w} = $widget->{w};	4498	$widget->{old_w} = $widget->{w};
3995	$widget->{old_h} = $widget->{h};	4499	$widget->{old_h} = $widget->{h};
3996		4500
3997	$widget->{w} = $w;	4501	$widget->{w} = $w;
3998	$widget->{h} = $h;	4502	$widget->{h} = $h;
3999		4503
4000	$widget->emit (size_allocate => $w, $h);	4504	$widget->emit (size_allocate => $w, $h);
		4505	}
4001	}	4506	}
4002	}	4507	}
4003	}	4508	}
4004		4509
4005	while ($self->{post_alloc_hook}) {	4510	while ($self->{post_alloc_hook}) {
4006	$_->()	4511	$_->()
4007	for values %{delete $self->{post_alloc_hook}};	4512	for values %{delete $self->{post_alloc_hook}};
4008	}	4513	}
4009
4010		4514
4011	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4515	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4012	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4516	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4013	glClear GL_COLOR_BUFFER_BIT;	4517	glClear GL_COLOR_BUFFER_BIT;
4014		4518

Diff Legend

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