[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.395 by root, Sat Jul 21 13:56:00 2007 UTC vs.
Revision 1.447 by root, Sat Dec 22 06:50:45 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
…		…
142	my $grab = $GRAB; undef $GRAB;	139	my $grab = $GRAB; undef $GRAB;
143	$grab->update if $grab;	140	$grab->update if $grab;
144	$GRAB->update if $GRAB;	141	$GRAB->update if $GRAB;
145		142
146	check_hover $widget;	143	check_hover $widget;
147	$TOOLTIP_WATCHER->cb->();	144	$TOOLTIP_WATCHER->invoke;
148	}	145	}
149	}	146	}
150		147
151	sub feed_sdl_motion_event {	148	sub feed_sdl_motion_event {
152	my ($ev) = @_;	149	my ($ev) = @_;
…		…
273	$self->emit ("destroy");	270	$self->emit ("destroy");
274	%$self = ();	271	%$self = ();
275	}	272	}
276		273
277	sub TO_JSON {	274	sub TO_JSON {
278	{ __widget_ref__ => $_[0]{s_id} }	275	{ "\fw" => $_[0]{s_id} }
279	}	276	}
280		277
281	sub show {	278	sub show {
282	my ($self) = @_;	279	my ($self) = @_;
283		280
…		…
312	delete $self->{root};	309	delete $self->{root};
313		310
314	undef $GRAB if $GRAB == $self;	311	undef $GRAB if $GRAB == $self;
315	undef $HOVER if $HOVER == $self;	312	undef $HOVER if $HOVER == $self;
316		313
317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()	314	$CFPlus::UI::TOOLTIP_WATCHER->invoke
318	if $TOOLTIP->{owner} == $self;	315	if $TOOLTIP->{owner} == $self;
319		316
320	$self->emit ("focus_out");	317	$self->emit ("focus_out");
321	$self->emit (visibility_change => 0);	318	$self->emit (visibility_change => 0);
322	}	319	}
…		…
362		359
363	$self->{force_w} = $w;	360	$self->{force_w} = $w;
364	$self->{force_h} = $h;	361	$self->{force_h} = $h;
365		362
366	$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)
367	}	374	}
368		375
369	sub size_request {	376	sub size_request {
370	require Carp;	377	require Carp;
371	Carp::confess "size_request is abstract";	378	Carp::confess "size_request is abstract";
…		…
433		440
434	$self->{tooltip} = $tooltip;	441	$self->{tooltip} = $tooltip;
435		442
436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {	443	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
437	delete $CFPlus::UI::TOOLTIP->{owner};	444	delete $CFPlus::UI::TOOLTIP->{owner};
438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();	445	$CFPlus::UI::TOOLTIP_WATCHER->invoke;
439	}	446	}
440	}	447	}
441		448
442	# translate global coordinates to local coordinate system	449	# translate global coordinates to local coordinate system
443	sub coord2local {	450	sub coord2local {
444	my ($self, $x, $y) = @_;	451	my ($self, $x, $y) = @_;
445		452
446	Carp::confess unless $self->{parent};#d#	453	return (undef, undef) unless $self->{parent};
447		454
448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	455	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449	}	456	}
450		457
451	# translate local coordinates to global coordinate system	458	# translate local coordinates to global coordinate system
452	sub coord2global {	459	sub coord2global {
453	my ($self, $x, $y) = @_;	460	my ($self, $x, $y) = @_;
454		461
455	Carp::confess unless $self->{parent};#d#	462	return (undef, undef) unless $self->{parent};
456		463
457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	464	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458	}	465	}
459		466
460	sub invoke_focus_in {	467	sub invoke_focus_in {
…		…
593		600
594	# 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
595	# functions seems pointless.	602	# functions seems pointless.
596	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
597		604
598	sub draw {	605	#sub draw {
599	my ($self) = @_;	606	#CFPlus.xs
600
601	return unless $self->{h} && $self->{w};
602
603	# update screen rectangle
604	local $draw_x = $draw_x + $self->{x};
605	local $draw_y = $draw_y + $self->{y};
606
607	# skip widgets that are entirely outside the drawing area
608	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)
609	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);
610
611	glPushMatrix;
612	glTranslate $self->{x}, $self->{y}, 0;
613
614	if ($self == $HOVER && $self->{can_hover}) {
615	glColor 10.2, 0.80.2, 0.5*0.2, 0.2;
616	glEnable GL_BLEND;
617	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
618	glBegin GL_QUADS;
619	glVertex 0 , 0;
620	glVertex $self->{w}, 0;
621	glVertex $self->{w}, $self->{h};
622	glVertex 0 , $self->{h};
623	glEnd;
624	glDisable GL_BLEND;
625	}
626
627	if ($ENV{CFPLUS_DEBUG} & 1) {
628	glPushMatrix;
629	glColor 1, 1, 0, 1;
630	glTranslate 0.375, 0.375;
631	glBegin GL_LINE_LOOP;
632	glVertex 0 , 0;
633	glVertex $self->{w} - 1, 0;
634	glVertex $self->{w} - 1, $self->{h} - 1;
635	glVertex 0 , $self->{h} - 1;
636	glEnd;
637	glPopMatrix;
638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
639	}
640
641	$self->_draw;
642	glPopMatrix;
643	}
644		607
645	sub _draw {	608	sub _draw {
646	my ($self) = @_;	609	my ($self) = @_;
647		610
648	warn "no draw defined for $self\n";	611	warn "no draw defined for $self\n";
649	}	612	}
650		613
651	my $cntx;#d#
652	sub DESTROY {	614	sub DESTROY {
653	my ($self) = @_;	615	my ($self) = @_;
654		616
655	return if CFPlus::in_destruct;	617	return if CFPlus::in_destruct;
656		618
		619	local $@;
657	eval { $self->destroy };	620	eval { $self->destroy };
658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	621	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659		622
660	delete $WIDGET{$self+0};	623	delete $WIDGET{$self+0};
661	}	624	}
…		…
669	use strict;	632	use strict;
670	use CFPlus::OpenGL;	633	use CFPlus::OpenGL;
671		634
672	sub new {	635	sub new {
673	my $class = shift;	636	my $class = shift;
674
675	# range [value, low, high, page]
676		637
677	$class->SUPER::new (	638	$class->SUPER::new (
678	#bg => [0, 0, 0, 0.2],	639	#bg => [0, 0, 0, 0.2],
679	#active_bg => [1, 1, 1, 0.5],	640	#active_bg => [1, 1, 1, 0.5],
680	@_	641	@_
…		…
692	my ($w, $h) = @$self{qw(w h)};	653	my ($w, $h) = @$self{qw(w h)};
693		654
694	glEnable GL_BLEND;	655	glEnable GL_BLEND;
695	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	656	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
696	glColor_premultiply @$color;	657	glColor_premultiply @$color;
697
698	glBegin GL_QUADS;
699	glVertex 0 , 0;
700	glVertex 0 , $h;
701	glVertex $w, $h;	658	glRect 0, 0, $w, $h;
702	glVertex $w, 0;
703	glEnd;
704
705	glDisable GL_BLEND;	659	glDisable GL_BLEND;
706	}	660	}
707	}	661	}
708		662
709	#############################################################################	663	#############################################################################
…		…
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 {
…		…
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::;
…		…
991	$self->{view_x} = $x;	951	$self->{view_x} = $x;
992	$self->{view_y} = $y;	952	$self->{view_y} = $y;
993		953
994	$self->emit (changed => $x, $y);	954	$self->emit (changed => $x, $y);
995	$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);
996	}	974	}
997	}	975	}
998		976
999	# 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
1000	sub coord2local {	978	sub coord2local {
…		…
1047	my $child = delete $arg{child};	1025	my $child = delete $arg{child};
1048		1026
1049	my $self;	1027	my $self;
1050		1028
1051	my $hslider = new CFPlus::UI::Slider	1029	my $hslider = new CFPlus::UI::Slider
1052	col => 0,	1030	c_col => 0,
1053	row => 1,	1031	c_row => 1,
1054	vertical => 0,	1032	vertical => 0,
1055	range => [0, 0, 1, 0.01], # HACK fix	1033	range => [0, 0, 1, 0.01], # HACK fix
1056	on_changed => sub {	1034	on_changed => sub {
1057	$self->{hpos} = $_[1];	1035	$self->{hpos} = $_[1];
1058	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1036	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059	},	1037	},
1060	;	1038	;
1061		1039
1062	my $vslider = new CFPlus::UI::Slider	1040	my $vslider = new CFPlus::UI::Slider
1063	col => 1,	1041	c_col => 1,
1064	row => 0,	1042	c_row => 0,
1065	vertical => 1,	1043	vertical => 1,
1066	range => [0, 0, 1, 0.01], # HACK fix	1044	range => [0, 0, 1, 0.01], # HACK fix
1067	on_changed => sub {	1045	on_changed => sub {
1068	$self->{vpos} = $_[1];	1046	$self->{vpos} = $_[1];
1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1047	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
…		…
1080	row_expand => [1, 0],	1058	row_expand => [1, 0],
1081	%arg,	1059	%arg,
1082	);	1060	);
1083		1061
1084	$self->{vp} = new CFPlus::UI::ViewPort	1062	$self->{vp} = new CFPlus::UI::ViewPort
1085	col => 0,	1063	c_col => 0,
1086	row => 0,	1064	c_row => 0,
1087	expand => 1,	1065	expand => 1,
1088	scroll_x => $self->{scroll_x},	1066	scroll_x => $self->{scroll_x},
1089	scroll_y => $self->{scroll_y},	1067	scroll_y => $self->{scroll_y},
1090	on_changed => sub {	1068	on_changed => sub {
1091	my ($vp, $x, $y) = @_;	1069	my ($vp, $x, $y) = @_;
…		…
1093	$vp->{parent}{hslider}->set_value ($x);	1071	$vp->{parent}{hslider}->set_value ($x);
1094	$vp->{parent}{vslider}->set_value ($y);	1072	$vp->{parent}{vslider}->set_value ($y);
1095		1073
1096	0	1074	0
1097	},	1075	},
		1076	on_size_allocate => sub {
		1077	my ($vp, $w, $h) = @_;
		1078	$vp->{parent}->update_slider;
		1079	0
		1080	},
1098	;	1081	;
1099		1082
1100	$self->SUPER::add ($self->{vp});	1083	$self->SUPER::add ($self->{vp});
1101		1084
1102	$self->add ($child) if $child;	1085	$self->add ($child) if $child;
…		…
1108	my ($self, $widget) = @_;	1091	my ($self, $widget) = @_;
1109		1092
1110	$self->{vp}->add ($self->{child} = $widget);	1093	$self->{vp}->add ($self->{child} = $widget);
1111	}	1094	}
1112		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
1113	sub update_slider {	1100	sub update_slider {
1114	my ($self) = @_;	1101	my ($self) = @_;
1115		1102
1116	my $child = ($self->{vp} or return)->child;	1103	my $child = ($self->{vp} or return)->child;
1117		1104
		1105	if ($self->{scroll_x}) {
1118	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});	1106	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);	1107	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120		1108
1121	my $visible = $w1 > $w2;	1109	my $visible = $w1 > $w2;
1122	if ($visible != $self->{hslider_visible}) {	1110	if ($visible != $self->{hslider_visible}) {
1123	$self->{hslider_visible} = $visible;	1111	$self->{hslider_visible} = $visible;
1124	$visible ? $self->SUPER::add ($self->{hslider})	1112	$visible ? $self->SUPER::add ($self->{hslider})
1125	: $self->SUPER::remove ($self->{hslider});	1113	: $self->SUPER::remove ($self->{hslider});
		1114	}
1126	}	1115	}
1127		1116
		1117	if ($self->{scroll_y}) {
1128	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});	1118	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1129	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);	1119	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1130		1120
1131	my $visible = $h1 > $h2;	1121	my $visible = $h1 > $h2;
1132	if ($visible != $self->{vslider_visible}) {	1122	if ($visible != $self->{vslider_visible}) {
1133	$self->{vslider_visible} = $visible;	1123	$self->{vslider_visible} = $visible;
1134	$visible ? $self->SUPER::add ($self->{vslider})	1124	$visible ? $self->SUPER::add ($self->{vslider})
1135	: $self->SUPER::remove ($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);
1136	}	1145	};
1137	}	1146	}
1138		1147
1139	sub invoke_mouse_wheel {	1148	sub invoke_mouse_wheel {
1140	my ($self, $ev) = @_;	1149	my ($self, $ev) = @_;
1141		1150
1142	$self->{vslider}->emit (mouse_wheel => $ev)	1151	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1143	if $ev->{dy};
1144
1145	$self->{hslider}->emit (mouse_wheel => $ev)	1152	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1146	if $ev->{dx};
1147		1153
1148	1	1154	1
1149	}	1155	}
1150		1156
1151	sub invoke_button_down {	1157	sub invoke_button_down {
1152	my ($self, $ev, $x, $y) = @_;	1158	my ($self, $ev, $x, $y) = @_;
1153		1159
1154	if ($ev->{button} == 2) {	1160	if ($ev->{button} == 2) {
1155	$self->grab_focus;	1161	$self->start_dragging ($ev);
1156
1157	my $ox = $self->{vp}{view_x} + $ev->{x};
1158	my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160	$self->{motion} = sub {
1161	my ($ev, $x, $y) = @_;
1162
1163	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1164	$self->update;
1165	};
1166
1167	return 1;	1162	return 1;
1168	}	1163	}
1169		1164
1170	0	1165	0
1171	}	1166	}
…		…
1222	my ($w, $h) = @$self{qw(w h)};	1217	my ($w, $h) = @$self{qw(w h)};
1223		1218
1224	glEnable GL_BLEND;	1219	glEnable GL_BLEND;
1225	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1220	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1226	glColor_premultiply @{ $self->{bg} };	1221	glColor_premultiply @{ $self->{bg} };
1227
1228	glBegin GL_QUADS;
1229	glVertex 0 , 0;
1230	glVertex 0 , $h;
1231	glVertex $w, $h;	1222	glRect 0, 0, $w, $h;
1232	glVertex $w, 0;
1233	glEnd;
1234
1235	glDisable GL_BLEND;	1223	glDisable GL_BLEND;
1236	}	1224	}
1237		1225
1238	$self->SUPER::_draw;	1226	$self->SUPER::_draw;
1239	}	1227	}
…		…
1400		1388
1401	sub border {	1389	sub border {
1402	int $_[0]{border} * $::FONTSIZE	1390	int $_[0]{border} * $::FONTSIZE
1403	}	1391	}
1404		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
1405	sub size_request {	1402	sub size_request {
1406	my ($self) = @_;	1403	my ($self) = @_;
1407		1404
1408	$self->{title_widget}->size_request	1405	$self->{title_widget}->size_request
1409	if $self->{title_widget};	1406	if $self->{title_widget};
…		…
1601		1598
1602	sub add {	1599	sub add {
1603	my ($self, @widgets) = @_;	1600	my ($self, @widgets) = @_;
1604		1601
1605	for my $child (@widgets) {	1602	for my $child (@widgets) {
1606	$child->{rowspan} \|\|= 1;	1603	$child->{c_rowspan} \|\|= 1;
1607	$child->{colspan} \|\|= 1;	1604	$child->{c_colspan} \|\|= 1;
1608	}	1605	}
1609		1606
1610	$self->SUPER::add (@widgets);	1607	$self->SUPER::add (@widgets);
1611	}	1608	}
1612		1609
…		…
1616	my @widgets;	1613	my @widgets;
1617		1614
1618	while (@_) {	1615	while (@_) {
1619	my ($col, $row, $child) = splice @_, 0, 3, ();	1616	my ($col, $row, $child) = splice @_, 0, 3, ();
1620		1617
1621	$child->{row} = $row;	1618	$child->{c_row} = $row;
1622	$child->{col} = $col;	1619	$child->{c_col} = $col;
1623		1620
1624	push @widgets, $child;	1621	push @widgets, $child;
1625	}	1622	}
1626		1623
1627	$self->add (@widgets);	1624	$self->add (@widgets);
…		…
1633	my (@w, @h);	1630	my (@w, @h);
1634		1631
1635	my @children = $self->children;	1632	my @children = $self->children;
1636		1633
1637	# first pass, columns	1634	# first pass, columns
1638	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {	1635	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1639	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};	1636	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1640		1637
1641	my $sw = sum @w[$c .. $c + $cs - 1];	1638	my $sw = sum @w[$c .. $c + $cs - 1];
1642		1639
1643	if ($w > $sw) {	1640	if ($w > $sw) {
1644	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];	1641	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1645	}	1642	}
1646	}	1643	}
1647		1644
1648	# second pass, rows	1645	# second pass, rows
1649	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {	1646	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1650	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};	1647	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1651		1648
1652	my $sh = sum @h[$r .. $r + $rs - 1];	1649	my $sh = sum @h[$r .. $r + $rs - 1];
1653		1650
1654	if ($h > $sh) {	1651	if ($h > $sh) {
1655	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];	1652	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
…		…
1697		1694
1698	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }	1695	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }	1696	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1700		1697
1701	for my $widget ($self->children) {	1698	for my $widget ($self->children) {
1702	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};	1699	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1703		1700
1704	$widget->configure (	1701	$widget->configure (
1705	$x[$c], $y[$r],	1702	$x[$c], $y[$r],
1706	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],	1703	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1707	);	1704	);
…		…
1716		1713
1717	use List::Util qw(min max);	1714	use List::Util qw(min max);
1718		1715
1719	our @ISA = CFPlus::UI::Container::;	1716	our @ISA = CFPlus::UI::Container::;
1720		1717
1721	sub add {
1722	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1723
1724	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1725	$self->SUPER::add ($child);
1726	}
1727
1728	sub _scale($$$) {	1718	sub _scale($$$) {
1729	my ($mode, $val, $max) = @_;	1719	my ($rel, $val, $max) = @_;
1730		1720
1731	$mode eq "abs" ? $val	1721	$rel ? $val * $max : $val
1732	: $mode eq "rel" ? $val * $max
1733	: 0
1734	}	1722	}
1735		1723
1736	sub size_request {	1724	sub size_request {
1737	my ($self) = @_;	1725	my ($self) = @_;
1738		1726
1739	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);	1727	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1740		1728
1741	# determine overall size by querying abs widgets	1729	# determine overall size by querying abs widgets
1742	for my $child ($self->visible_children) {	1730	for my $child ($self->visible_children) {
1743	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1731	unless ($child->{c_rel}) {
		1732	my $x = $child->{c_x};
		1733	my $y = $child->{c_y};
1744		1734
1745	if ($pos eq "abs") {
1746	$w = _scale $size, $w, $child->{req_w};
1747	$h = _scale $size, $h, $child->{req_h};
1748
1749	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1735	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1736	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1751	}	1737	}
1752	}	1738	}
1753		1739
1754	my $W = $x2 - $x1;	1740	my $W = $x2 - $x1;
1755	my $H = $y2 - $y1;	1741	my $H = $y2 - $y1;
1756		1742
1757	# now layout remaining widgets	1743	# now layout remaining widgets
1758	for my $child ($self->visible_children) {	1744	for my $child ($self->visible_children) {
1759	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	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;
1760		1748
1761	if ($pos ne "abs") {
1762	$x = _scale $pos, $x, $W;
1763	$y = _scale $pos, $x, $H;
1764	$w = _scale $size, $w, $child->{req_w};
1765	$h = _scale $size, $h, $child->{req_h};
1766
1767	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1749	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1768	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1750	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1769	}	1751	}
1770	}	1752	}
1771		1753
1772	my $W = $x2 - $x1;	1754	my $W = $x2 - $x1;
1773	my $H = $y2 - $y1;	1755	my $H = $y2 - $y1;
…		…
1777		1759
1778	sub invoke_size_allocate {	1760	sub invoke_size_allocate {
1779	my ($self, $W, $H) = @_;	1761	my ($self, $W, $H) = @_;
1780		1762
1781	for my $child ($self->visible_children) {	1763	for my $child ($self->visible_children) {
1782	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1764	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1765	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1783		1766
1784	$x = _scale $pos, $x, $W;	1767	$x += $child->{c_halign} * $child->{req_w};
1785	$y = _scale $pos, $x, $H;	1768	$y += $child->{c_valign} * $child->{req_h};
1786	$w = _scale $size, $w, $child->{req_w};
1787	$h = _scale $size, $h, $child->{req_h};
1788		1769
1789	$child->configure ($x, $y, $w, $h);	1770	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1790	}	1771	}
1791		1772
1792	1	1773	1
1793	}	1774	}
1794		1775
…		…
1798		1779
1799	our @ISA = CFPlus::UI::Container::;	1780	our @ISA = CFPlus::UI::Container::;
1800		1781
1801	sub size_request {	1782	sub size_request {
1802	my ($self) = @_;	1783	my ($self) = @_;
		1784
		1785	my @children = $self->visible_children;
1803		1786
1804	$self->{vertical}	1787	$self->{vertical}
1805	? (	1788	? (
1806	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1789	(List::Util::max map $_->{req_w}, @children),
1807	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1790	(List::Util::sum map $_->{req_h}, @children),
1808	)	1791	)
1809	: (	1792	: (
1810	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_w}, @children),
1811	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1794	(List::Util::max map $_->{req_h}, @children),
1812	)	1795	)
1813	}	1796	}
1814		1797
1815	sub invoke_size_allocate {	1798	sub invoke_size_allocate {
1816	my ($self, $w, $h) = @_;	1799	my ($self, $w, $h) = @_;
…		…
1940		1923
1941	delete $self->{ox};	1924	delete $self->{ox};
1942	$self->SUPER::realloc;	1925	$self->SUPER::realloc;
1943	}	1926	}
1944		1927
		1928	sub clear {
		1929	my ($self) = @_;
		1930
		1931	$self->set_text ("");
		1932	}
		1933
1945	sub set_text {	1934	sub set_text {
1946	my ($self, $text) = @_;	1935	my ($self, $text) = @_;
1947		1936
1948	return if $self->{text} eq "T$text";	1937	return if $self->{text} eq "T$text";
1949	$self->{text} = "T$text";	1938	$self->{text} = "T$text";
…		…
1972		1961
1973	sub size_request {	1962	sub size_request {
1974	my ($self) = @_;	1963	my ($self) = @_;
1975		1964
1976	$self->{size_req} \|\|= do {	1965	$self->{size_req} \|\|= do {
		1966	my ($max_w, $max_h) = $self->get_max_wh;
		1967
1977	$self->{layout}->set_font ($self->{font}) if $self->{font};	1968	$self->{layout}->set_font ($self->{font}) if $self->{font};
1978	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1969	$self->{layout}->set_width ($self->{max_w} \|\| $max_w \|\| -1);
1979	$self->{layout}->set_ellipsise ($self->{ellipsise});	1970	$self->{layout}->set_ellipsise ($self->{ellipsise});
1980	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1971	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1981	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1972	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1982		1973
1983	my ($w, $h) = $self->{layout}->size;	1974	my ($w, $h) = $self->{layout}->size;
…		…
2055	: ($self->{w} - $size->[0]) * 0.5);	2046	: ($self->{w} - $size->[0]) * 0.5);
2056		2047
2057	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2048	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2058	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2049	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2059	: ($self->{h} - $size->[1]) * 0.5);	2050	: ($self->{h} - $size->[1]) * 0.5);
		2051
		2052	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2060	};	2053	};
2061		2054
2062	my $w = List::Util::min $self->{w} + 4, $size->[0];	2055	# unless ($self->{list}) {
2063	my $h = List::Util::min $self->{h} + 2, $size->[1];	2056	# $self->{list} = CFPlus::OpenGL::glGenList;
2064		2057	# CFPlus::OpenGL::glNewList $self->{list};
2065	$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;
2066	}	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	#}
2067		2074
2068	#############################################################################	2075	#############################################################################
2069		2076
2070	package CFPlus::UI::EntryBase;	2077	package CFPlus::UI::EntryBase;
2071		2078
…		…
2077	my $class = shift;	2084	my $class = shift;
2078		2085
2079	$class->SUPER::new (	2086	$class->SUPER::new (
2080	fg => [1, 1, 1],	2087	fg => [1, 1, 1],
2081	bg => [0, 0, 0, 0.2],	2088	bg => [0, 0, 0, 0.2],
		2089	outline => [0.6, 0.3, 0.1],
2082	active_bg => [1, 1, 1, 0.5],	2090	active_bg => [0, 0, 1, .2],
2083	active_fg => [0, 0, 0],	2091	active_fg => [1, 1, 1],
		2092	active_outline => [1, 1, 0],
2084	can_hover => 1,	2093	can_hover => 1,
2085	can_focus => 1,	2094	can_focus => 1,
2086	valign => 0,	2095	valign => 0,
2087	can_events => 1,	2096	can_events => 1,
2088	ellipsise => 0,	2097	ellipsise => 0,
…		…
2228	glColor_premultiply @{$self->{bg}};	2237	glColor_premultiply @{$self->{bg}};
2229	}	2238	}
2230		2239
2231	glEnable GL_BLEND;	2240	glEnable GL_BLEND;
2232	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2241	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2233	glBegin GL_QUADS;
2234	glVertex 0 , 0;
2235	glVertex 0 , $self->{h};
2236	glVertex $self->{w}, $self->{h};	2242	glRect 0, 0, $self->{w}, $self->{h};
2237	glVertex $self->{w}, 0;
2238	glEnd;
2239	glDisable GL_BLEND;	2243	glDisable GL_BLEND;
2240		2244
2241	$self->SUPER::_draw;	2245	$self->SUPER::_draw;
2242		2246
2243	#TODO: force update every cursor change :(	2247	#TODO: force update every cursor change :(
…		…
2245		2249
2246	unless (exists $self->{cur_h}) {	2250	unless (exists $self->{cur_h}) {
2247	my $text = substr $self->{text}, 0, $self->{cursor};	2251	my $text = substr $self->{text}, 0, $self->{cursor};
2248	utf8::encode $text;	2252	utf8::encode $text;
2249		2253
2250	@$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);
2251	}	2255	}
2252		2256
		2257	glColor_premultiply @{$self->{active_fg}};
2253	glBegin GL_LINES;	2258	glBegin GL_LINES;
2254	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};
2255	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;
2256	glEnd;	2275	glEnd;
2257	}	2276	}
2258	}	2277	}
2259		2278
2260	#############################################################################	2279	#############################################################################
…		…
2347	1	2366	1
2348	}	2367	}
2349		2368
2350	#############################################################################	2369	#############################################################################
2351		2370
		2371	package CFPlus::UI::ButtonBin;
		2372
		2373	our @ISA = CFPlus::UI::Bin::;
		2374
		2375	use CFPlus::OpenGL;
		2376
		2377	my @tex =
		2378	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2379	qw(b1_button_inactive.png b1_button_active.png);
		2380
		2381	sub new {
		2382	my $class = shift;
		2383
		2384	$class->SUPER::new (
		2385	can_hover => 1,
		2386	align => 0,
		2387	valign => 0,
		2388	can_events => 1,
		2389	@_
		2390	)
		2391	}
		2392
		2393	sub invoke_button_up {
		2394	my ($self, $ev, $x, $y) = @_;
		2395
		2396	$self->emit ("activate")
		2397	if $x >= 0 && $x < $self->{w}
		2398	&& $y >= 0 && $y < $self->{h};
		2399
		2400	1
		2401	}
		2402
		2403	sub _draw {
		2404	my ($self) = @_;
		2405
		2406	glEnable GL_TEXTURE_2D;
		2407	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2408	glColor 0, 0, 0, 1;
		2409
		2410	my $tex = $tex[$GRAB == $self];
		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
2352	package CFPlus::UI::Button;	2420	package CFPlus::UI::Button;
2353		2421
2354	our @ISA = CFPlus::UI::Label::;	2422	our @ISA = CFPlus::UI::Label::;
2355		2423
2356	use CFPlus::OpenGL;	2424	use CFPlus::OpenGL;
…		…
2460	sub _draw {	2528	sub _draw {
2461	my ($self) = @_;	2529	my ($self) = @_;
2462		2530
2463	$self->SUPER::_draw;	2531	$self->SUPER::_draw;
2464		2532
2465	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2533	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2466		2534
2467	my ($w, $h) = @$self{qw(w h)};	2535	my ($w, $h) = @$self{qw(w h)};
2468		2536
2469	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;
2470		2538
…		…
2490	sub new {	2558	sub new {
2491	my $class = shift;	2559	my $class = shift;
2492		2560
2493	my $self = $class->SUPER::new (	2561	my $self = $class->SUPER::new (
2494	can_events => 0,	2562	can_events => 0,
		2563	scale => 1,
2495	@_,	2564	@_,
2496	);	2565	);
2497		2566
2498	$self->{path} \|\| $self->{tex}	2567	$self->{path} \|\| $self->{tex}
2499	or Carp::croak "'path' or 'tex' attributes required";	2568	or Carp::croak "'path' or 'tex' attributes required";
…		…
2524	}	2593	}
2525		2594
2526	sub size_request {	2595	sub size_request {
2527	my ($self) = @_;	2596	my ($self) = @_;
2528		2597
2529	($self->{tex}{w}, $self->{tex}{h})	2598	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2530	}	2599	}
2531		2600
2532	sub _draw {	2601	sub _draw {
2533	my ($self) = @_;	2602	my ($self) = @_;
2534		2603
…		…
2544	}	2613	}
2545		2614
2546	glEnable GL_TEXTURE_2D;	2615	glEnable GL_TEXTURE_2D;
2547	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2616	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2548		2617
2549	$tex->draw_quad (0, 0, $w, $h);	2618	$tex->draw_quad_alpha (0, 0, $w, $h);
2550		2619
2551	glDisable GL_TEXTURE_2D;	2620	glDisable GL_TEXTURE_2D;
2552	}	2621	}
2553		2622
2554	#############################################################################	2623	#############################################################################
…		…
2573	align => 0,	2642	align => 0,
2574	valign => 0,	2643	valign => 0,
2575	can_events => 1,	2644	can_events => 1,
2576	@_	2645	@_
2577	);	2646	);
		2647	}
		2648
		2649	sub invoke_button_down {
		2650	my ($self, $ev, $x, $y) = @_;
		2651
		2652	1
2578	}	2653	}
2579		2654
2580	sub invoke_button_up {	2655	sub invoke_button_up {
2581	my ($self, $ev, $x, $y) = @_;	2656	my ($self, $ev, $x, $y) = @_;
2582		2657
…		…
2722	glDisable GL_TEXTURE_2D;	2797	glDisable GL_TEXTURE_2D;
2723	}	2798	}
2724		2799
2725	#############################################################################	2800	#############################################################################
2726		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
2727	package CFPlus::UI::Gauge;	2940	package CFPlus::UI::Gauge;
2728		2941
2729	our @ISA = CFPlus::UI::VBox::;	2942	our @ISA = CFPlus::UI::VBox::;
2730		2943
2731	sub new {	2944	sub new {
…		…
2856		3069
2857	$self->SUPER::invoke_button_down ($ev, $x, $y);	3070	$self->SUPER::invoke_button_down ($ev, $x, $y);
2858		3071
2859	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3072	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2860		3073
2861	$self->invoke_mouse_motion ($ev, $x, $y)	3074	$self->invoke_mouse_motion ($ev, $x, $y);
		3075
		3076	1
2862	}	3077	}
2863		3078
2864	sub invoke_mouse_motion {	3079	sub invoke_mouse_motion {
2865	my ($self, $ev, $x, $y) = @_;	3080	my ($self, $ev, $x, $y) = @_;
2866		3081
…		…
2886		3101
2887	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3102	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2888		3103
2889	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3104	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2890		3105
2891	! ! $delta	3106	1
2892	}	3107	}
2893		3108
2894	sub update {	3109	sub update {
2895	my ($self) = @_;	3110	my ($self) = @_;
2896		3111
…		…
3027	}	3242	}
3028		3243
3029	sub size_request {	3244	sub size_request {
3030	my ($self) = @_;	3245	my ($self) = @_;
3031		3246
3032	my ($empty, $slider) = @{ $self->{children} };	3247	my ($empty, $slider) = $self->visible_children;
3033		3248
3034	local $self->{children} = [$empty, $slider];	3249	local $self->{children} = [$empty, $slider];
3035	$self->SUPER::size_request	3250	$self->SUPER::size_request
3036	}	3251	}
3037		3252
…		…
3226		3441
3227	if ($y0 < $y + $h && $y < $y1) {	3442	if ($y0 < $y + $h && $y < $y1) {
3228	my $layout = $self->get_layout ($para);	3443	my $layout = $self->get_layout ($para);
3229		3444
3230	$layout->render ($para->{indent}, $y - $y0);	3445	$layout->render ($para->{indent}, $y - $y0);
		3446	$layout->draw;
3231		3447
3232	if (my @w = @{ $para->{widget} }) {	3448	if (my @w = @{ $para->{widget} }) {
3233	my @s = $layout->get_shapes;	3449	my @s = $layout->get_shapes;
3234		3450
3235	for (@w) {	3451	for (@w) {
…		…
3357	}	3573	}
3358		3574
3359	sub set_tooltip_from {	3575	sub set_tooltip_from {
3360	my ($self, $widget) = @_;	3576	my ($self, $widget) = @_;
3361		3577
3362	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3363	if $widget->{tooltip} =~ /^#(.*)$/;
3364
3365	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 =~ /^#(.*)$/;
3366		3583
3367	if ($ENV{CFPLUS_DEBUG} & 2) {	3584	if ($ENV{CFPLUS_DEBUG} & 2) {
3368	$tooltip .= "\n\n" . (ref $widget) . "\n"	3585	$tip .= "\n\n" . (ref $widget) . "\n"
3369	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3586	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3370	. "req $widget->{req_w} $widget->{req_h}\n"	3587	. "req $widget->{req_w} $widget->{req_h}\n"
3371	. "visible $widget->{visible}";	3588	. "visible $widget->{visible}";
3372	}	3589	}
3373		3590
3374	$tooltip =~ s/^\n+//;	3591	$tip =~ s/^\n+//;
3375	$tooltip =~ s/\n+$//;	3592	$tip =~ s/\n+$//;
3376		3593
3377	$self->add (new CFPlus::UI::Label	3594	$self->add (new CFPlus::UI::Label
3378	markup => $tooltip,	3595	markup => $tip,
3379	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,	3596	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
3380	fontsize => 0.8,	3597	fontsize => 0.8,
3381	style => 1, # FLAG_INVERSE	3598	style => 1, # FLAG_INVERSE
3382	ellipsise => 0,	3599	ellipsise => 0,
3383	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),	3600	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
…		…
3421	}	3638	}
3422		3639
3423	sub _draw {	3640	sub _draw {
3424	my ($self) = @_;	3641	my ($self) = @_;
3425		3642
3426	glTranslate 0.375, 0.375;
3427
3428	my ($w, $h) = @$self{qw(w h)};	3643	my ($w, $h) = @$self{qw(w h)};
3429		3644
3430	glColor 1, 0.8, 0.4;	3645	glColor 1, 0.8, 0.4;
3431	glBegin GL_QUADS;	3646	glRect 0, 0, $w, $h;
3432	glVertex 0 , 0;
3433	glVertex 0 , $h;
3434	glVertex $w, $h;
3435	glVertex $w, 0;
3436	glEnd;
3437		3647
3438	glColor 0, 0, 0;	3648	glColor 0, 0, 0;
3439	glBegin GL_LINE_LOOP;	3649	glRect_lineloop .5, .5, $w + .5, $h + .5;
3440	glVertex 0 , 0;
3441	glVertex 0 , $h;
3442	glVertex $w, $h;
3443	glVertex $w, 0;
3444	glEnd;
3445		3650
3446	glTranslate 2 - 0.375, 2 - 0.375;	3651	glTranslate 2, 2;
3447		3652
3448	$self->SUPER::_draw;	3653	$self->SUPER::_draw;
3449	}	3654	}
3450		3655
3451	#############################################################################	3656	#############################################################################
…		…
3469		3674
3470	if ($self->{anim} && $self->{animspeed}) {	3675	if ($self->{anim} && $self->{animspeed}) {
3471	CFPlus::weaken (my $widget = $self);	3676	CFPlus::weaken (my $widget = $self);
3472		3677
3473	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};	3678	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3474	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};	3679	$widget->{anim_start} = $self->{animspeed} * int EV::now / $self->{animspeed};
3475	$self->{timer} = Event->timer (	3680	$self->{timer} = EV::timer_ns 0, 0, sub {
3476	parked => 1,
3477	cb => sub {
3478	return unless $::CONN && $widget;	3681	return unless $::CONN;
3479		3682
		3683	my $w = $widget
		3684	or return;
		3685
3480	++$widget->{frame};	3686	++$w->{frame};
3481	$widget->update_face;	3687	$w->update_face;
		3688
		3689	# somehow, $widget can go away
3482	$widget->update;	3690	$w->update;
3483
3484	$widget->update_timer;	3691	$w->update_timer;
3485	},
3486	);	3692	};
3487		3693
3488	$self->update_face;	3694	$self->update_face;
3489	$self->update_timer;	3695	$self->update_timer;
3490	}	3696	}
3491		3697
…		…
3495	sub update_timer {	3701	sub update_timer {
3496	my ($self) = @_;	3702	my ($self) = @_;
3497		3703
3498	return unless $self->{timer};	3704	return unless $self->{timer};
3499		3705
		3706	$self->{timer}->stop;
3500	if ($self->{visible}) {	3707	if ($self->{visible}) {
3501	$self->{timer}->at (	3708	$self->{timer}->set (
3502	$self->{anim_start}	3709	$self->{anim_start}
3503	+ $self->{animspeed}	3710	+ $self->{animspeed}
3504	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}	3711	* int 1.5 + (EV::now - $self->{anim_start}) / $self->{animspeed}
3505	);	3712	);
3506	$self->{timer}->start;	3713	$self->{timer}->start;
3507	} else {
3508	$self->{timer}->stop;
3509	}	3714	}
3510	}	3715	}
3511		3716
3512	sub update_face {	3717	sub update_face {
3513	my ($self) = @_;	3718	my ($self) = @_;
3514		3719
3515	return unless $::CONN;
3516
3517	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3518	if ($anim && @$anim) {
3519	delete $self->{wait_face};
3520	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3521	}
3522	}
3523	}
3524
3525	sub size_request {
3526	my ($self) = @_;
3527
3528	if ($::CONN) {	3720	if ($::CONN) {
3529	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {	3721	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3530	if (my $tex = $::CONN->{texture}[$faceid]) {	3722	if ($anim && @$anim) {
3531	return ($self->{size_w} \|\| $tex->{w}, $self->{size_h} \|\| $tex->{h});	3723	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3532	} else {	3724	delete $self->{face_change_cb};
3533	$self->{wait_face} \|\|= $::CONN->connect_face_update ($faceid, sub {	3725
3534	$self->realloc;	3726	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3727	unless ($tex->{name} \|\| $tex->{loading}) {
		3728	$tex->upload (sub { $self->reconfigure });
		3729	}
3535	});	3730	}
3536	}	3731	}
3537	}	3732	}
3538	}	3733	}
		3734	}
		3735
		3736	sub size_request {
		3737	my ($self) = @_;
		3738
		3739	if ($::CONN) {
		3740	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3741	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3742	if ($tex->{name}) {
		3743	return ($self->{size_w} \|\| $tex->{w}, $self->{size_h} \|\| $tex->{h});
		3744	} elsif (!$tex->{loading}) {
		3745	$tex->upload (sub { $self->reconfigure });
		3746	}
		3747	}
		3748
		3749	$self->{face_change_cb} \|\|= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3750	}
		3751	}
3539		3752
3540	($self->{size_w} \|\| 8, $self->{size_h} \|\| 8)	3753	($self->{size_w} \|\| 8, $self->{size_h} \|\| 8)
3541	}	3754	}
3542		3755
3543	sub update {	3756	sub update {
…		…
3557	}	3770	}
3558		3771
3559	sub _draw {	3772	sub _draw {
3560	my ($self) = @_;	3773	my ($self) = @_;
3561		3774
3562	return unless $::CONN;
3563
3564	$self->SUPER::_draw;	3775	$self->SUPER::_draw;
3565		3776
3566	my $faceid = $::CONN->{faceid}[$self->{face}]	3777	if (my $tex = $self->{tex}) {
3567	or return;
3568
3569	my $tex = $::CONN->{texture}[$faceid];
3570
3571	if ($tex) {
3572	glEnable GL_TEXTURE_2D;	3778	glEnable GL_TEXTURE_2D;
3573	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3779	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3574	glColor 0, 0, 0, 1;	3780	glColor 0, 0, 0, 1;
3575	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3781	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3576	glDisable GL_TEXTURE_2D;	3782	glDisable GL_TEXTURE_2D;
…		…
3628	children => [	3834	children => [
3629	(new CFPlus::UI::Label markup => $left, expand => 1),	3835	(new CFPlus::UI::Label markup => $left, expand => 1),
3630	(new CFPlus::UI::Label markup => $right, align => +1),	3836	(new CFPlus::UI::Label markup => $right, align => +1),
3631	],	3837	],
3632	;	3838	;
3633		3839
3634	} else {	3840	} else {
3635	$widget = new CFPlus::UI::Label	3841	$widget = new CFPlus::UI::Label
3636	can_hover => 1,	3842	can_hover => 1,
3637	can_events => 1,	3843	can_events => 1,
3638	markup => $widget,	3844	markup => $widget,
…		…
3763		3969
3764	#############################################################################	3970	#############################################################################
3765		3971
3766	package CFPlus::UI::Notebook;	3972	package CFPlus::UI::Notebook;
3767		3973
		3974	use CFPlus::OpenGL;
		3975
3768	our @ISA = CFPlus::UI::VBox::;	3976	our @ISA = CFPlus::UI::VBox::;
3769		3977
3770	sub new {	3978	sub new {
3771	my $class = shift;	3979	my $class = shift;
3772		3980
3773	my $self = $class->SUPER::new (	3981	my $self = $class->SUPER::new (
3774	buttonbar => (new CFPlus::UI::Buttonbar),	3982	buttonbar => (new CFPlus::UI::Buttonbar),
3775	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3983	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3984	active_outline => [.7, .7, 0.2],
3776	# filter => # will be put between multiplexer and $self	3985	# filter => # will be put between multiplexer and $self
3777	@_,	3986	@_,
3778	);	3987	);
3779		3988
3780	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3989	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3781	$self->SUPER::add ($self->{buttonbar}, $self->{filter} \|\| $self->{multiplexer});	3990	$self->SUPER::add ($self->{buttonbar}, $self->{filter} \|\| $self->{multiplexer});
3782		3991
		3992	{
		3993	Scalar::Util::weaken (my $wself = $self);
		3994
		3995	$self->{multiplexer}->connect (c_add => sub {
		3996	my ($mplex, $widgets) = @_;
		3997
		3998	for my $child (@$widgets) {
		3999	Scalar::Util::weaken $child;
		4000	$child->{c_tab_} \|\|= do {
		4001	my $tab =
		4002	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		4003	? $child->{c_tab}
		4004	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4005
		4006	$tab->connect (activate => sub {
		4007	$wself->set_current_page ($child);
		4008	});
		4009
		4010	$tab
		4011	};
		4012
		4013	$self->{buttonbar}->add ($child->{c_tab_});
		4014	}
		4015	});
		4016
		4017	$self->{multiplexer}->connect (c_remove => sub {
		4018	my ($mplex, $widgets) = @_;
		4019
		4020	for my $child (@$widgets) {
		4021	$wself->{buttonbar}->remove ($child->{c_tab_});
		4022	}
		4023	});
		4024	}
		4025
3783	$self	4026	$self
3784	}	4027	}
3785		4028
3786	sub add {	4029	sub add {
		4030	my ($self, @widgets) = @_;
		4031
		4032	$self->{multiplexer}->add (@widgets)
		4033	}
		4034
		4035	sub remove {
		4036	my ($self, @widgets) = @_;
		4037
		4038	$self->{multiplexer}->remove (@widgets)
		4039	}
		4040
		4041	sub pages {
		4042	my ($self) = @_;
		4043	$self->{multiplexer}->children
		4044	}
		4045
		4046	sub add_tab {
3787	my ($self, $title, $widget, $tooltip) = @_;	4047	my ($self, $title, $widget, $tooltip) = @_;
3788		4048
3789	CFPlus::weaken $self;	4049	$title = [$title, $tooltip] unless ref $title;
		4050	$widget->{c_tab} = $title;
3790		4051
3791	$self->{buttonbar}->add (new CFPlus::UI::Button
3792	markup => $title,
3793	tooltip => $tooltip,
3794	on_activate => sub { $self->set_current_page ($widget) },
3795	);
3796
3797	$self->{multiplexer}->add ($widget);	4052	$self->add ($widget);
3798	}	4053	}
3799		4054
3800	sub get_current_page {	4055	sub get_current_page {
3801	my ($self) = @_;	4056	my ($self) = @_;
3802		4057
…		…
3806	sub set_current_page {	4061	sub set_current_page {
3807	my ($self, $page) = @_;	4062	my ($self, $page) = @_;
3808		4063
3809	$self->{multiplexer}->set_current_page ($page);	4064	$self->{multiplexer}->set_current_page ($page);
3810	$self->emit (page_changed => $self->{multiplexer}{current});	4065	$self->emit (page_changed => $self->{multiplexer}{current});
		4066	}
		4067
		4068	sub _draw {
		4069	my ($self) = @_;
		4070
		4071	$self->SUPER::_draw ();
		4072
		4073	if (my $cur = $self->{multiplexer}{current}) {
		4074	if ($cur = $cur->{c_tab_}) {
		4075	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4076	$self->{buttonbar}{y} + $cur->{y};
		4077	glLineWidth 3;
		4078	#glEnable GL_BLEND;
		4079	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4080	glColor @{$self->{active_outline}};
		4081	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4082	glLineWidth 1;
		4083	#glDisable GL_BLEND;
		4084	}
		4085	}
3811	}	4086	}
3812		4087
3813	#############################################################################	4088	#############################################################################
3814		4089
3815	package CFPlus::UI::Selector;	4090	package CFPlus::UI::Selector;
…		…
3847	}	4122	}
3848		4123
3849	sub _set_value {	4124	sub _set_value {
3850	my ($self, $value) = @_;	4125	my ($self, $value) = @_;
3851		4126
3852	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4127	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4128	$item \|\|= $self->{options}[0]
3853	or return;	4129	or return;
3854		4130
3855	$self->{value} = $item->[0];	4131	$self->{value} = $item->[0];
3856	$self->set_markup ("$item->[1] ⇓");	4132	$self->set_markup ("$item->[1] ⇓");
3857	$self->set_tooltip ($item->[2]);	4133	# $self->set_tooltip ($item->[2]);
3858	}	4134	}
3859		4135
3860	sub set_value {	4136	sub set_value {
3861	my ($self, $value) = @_;	4137	my ($self, $value) = @_;
3862		4138
3863	return unless $self->{value} ne $value;	4139	return unless $self->{value} ne $value;
3864		4140
3865	$self->_set_value ($value);	4141	$self->_set_value ($value);
3866	$self->emit (changed => $value);	4142	$self->emit (changed => $value);
		4143	}
		4144
		4145	sub set_options {
		4146	my ($self, $options) = @_;
		4147
		4148	$self->{options} = $options;
		4149	$self->_set_value ($self->{value});
3867	}	4150	}
3868		4151
3869	#############################################################################	4152	#############################################################################
3870		4153
3871	package CFPlus::UI::Statusbox;	4154	package CFPlus::UI::Statusbox;
…		…
3880	@_,	4163	@_,
3881	);	4164	);
3882		4165
3883	CFPlus::weaken (my $this = $self);	4166	CFPlus::weaken (my $this = $self);
3884		4167
3885	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4168	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3886		4169
3887	$self	4170	$self
3888	}	4171	}
3889		4172
3890	sub reorder {	4173	sub reorder {
…		…
3904		4187
3905	my @items = sort {	4188	my @items = sort {
3906	$a->{pri} <=> $b->{pri}	4189	$a->{pri} <=> $b->{pri}
3907	or $b->{id} <=> $a->{id}	4190	or $b->{id} <=> $a->{id}
3908	} values %{ $self->{item} };	4191	} values %{ $self->{item} };
3909
3910	$self->{timer}->interval (1);
3911		4192
3912	my $count = 10 + 1;	4193	my $count = 10 + 1;
3913	for my $item (@items) {	4194	for my $item (@items) {
3914	last unless --$count;	4195	last unless --$count;
3915		4196
…		…
3939	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4220	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3940	$label->{fg}[3] = ($item->{fg}[3] \|\| 1) * $diff / 2;	4221	$label->{fg}[3] = ($item->{fg}[3] \|\| 1) * $diff / 2;
3941	$label->update;	4222	$label->update;
3942	$label->set_max_size (undef, $label->{req_h} * $diff)	4223	$label->set_max_size (undef, $label->{req_h} * $diff)
3943	if $diff < 1;	4224	if $diff < 1;
3944	$self->{timer}->interval (1/30);	4225	$self->{timer}->set (1/30, 1/30);
3945	} else {	4226	} else {
3946	$label->{fg}[3] = $item->{fg}[3] \|\| 1;	4227	$label->{fg}[3] = $item->{fg}[3] \|\| 1;
3947	}	4228	}
3948		4229
3949	push @widgets, $label;	4230	push @widgets, $label;
…		…
4085	}	4366	}
4086		4367
4087	sub update {	4368	sub update {
4088	my ($self) = @_;	4369	my ($self) = @_;
4089		4370
4090	$::WANT_REFRESH++;	4371	$::WANT_REFRESH->start;
4091	}	4372	}
4092		4373
4093	sub add {	4374	sub add {
4094	my ($self, @children) = @_;	4375	my ($self, @children) = @_;
4095		4376
…		…
4132	while ($self->{refresh_hook}) {	4413	while ($self->{refresh_hook}) {
4133	$_->()	4414	$_->()
4134	for values %{delete $self->{refresh_hook}};	4415	for values %{delete $self->{refresh_hook}};
4135	}	4416	}
4136		4417
4137	if ($self->{realloc}) {	4418	while ($self->{realloc}) {
4138	my %queue;	4419	my %queue;
4139	my @queue;	4420	my @queue;
4140	my $widget;	4421	my $widget;
4141		4422
4142	outer:	4423	outer:
…		…
4189	}	4470	}
4190	}	4471	}
4191		4472
4192	delete $self->{realloc}{$widget+0};	4473	delete $self->{realloc}{$widget+0};
4193	}	4474	}
4194	}
4195		4475
4196	while (my $size_alloc = delete $self->{size_alloc}) {	4476	while (my $size_alloc = delete $self->{size_alloc}) {
4197	my @queue = sort { $b->{visible} <=> $a->{visible} }	4477	my @queue = sort { $a->{visible} <=> $b->{visible} }
4198	values %$size_alloc;	4478	values %$size_alloc;
4199		4479
4200	while () {	4480	while () {
4201	my $widget = pop @queue \|\| last;	4481	my $widget = pop @queue \|\| last;
4202		4482
4203	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4483	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4204		4484
4205	$w = 0 if $w < 0;
4206	$h = 0 if $h < 0;
4207
4208	$w = max $widget->{min_w}, $w;	4485	$w = max $widget->{min_w}, $w;
4209	$h = max $widget->{min_h}, $h;	4486	$h = max $widget->{min_h}, $h;
4210		4487
4211	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4488	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4212	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4489	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4213		4490
4214	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4491	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4215	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4492	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4216		4493
4217	$w = int $w + 0.5;	4494	$w = int $w + 0.5;
4218	$h = int $h + 0.5;	4495	$h = int $h + 0.5;
4219		4496
4220	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}) {
4221	$widget->{old_w} = $widget->{w};	4498	$widget->{old_w} = $widget->{w};
4222	$widget->{old_h} = $widget->{h};	4499	$widget->{old_h} = $widget->{h};
4223		4500
4224	$widget->{w} = $w;	4501	$widget->{w} = $w;
4225	$widget->{h} = $h;	4502	$widget->{h} = $h;
4226		4503
4227	$widget->emit (size_allocate => $w, $h);	4504	$widget->emit (size_allocate => $w, $h);
		4505	}
4228	}	4506	}
4229	}	4507	}
4230	}	4508	}
4231		4509
4232	while ($self->{post_alloc_hook}) {	4510	while ($self->{post_alloc_hook}) {

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.395 by root, Sat Jul 21 13:56:00 2007 UTC vs. Revision 1.447 by root, Sat Dec 22 06:50:45 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.395 by root, Sat Jul 21 13:56:00 2007 UTC vs.
Revision 1.447 by root, Sat Dec 22 06:50:45 2007 UTC