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

Diff Legend

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

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.445 by root, Sat Dec 8 19:17:02 2007 UTC

Diff Legend

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.445 by root, Sat Dec 8 19:17:02 2007 UTC