ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.157 by root, Sun Apr 23 21:47:32 2006 UTC vs.
Revision 1.202 by root, Sun May 14 20:51:19 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
…		…
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
15		16
		17	our %WIDGET; # all widgets, weak-referenced
		18
16	sub check_tooltip {	19	sub check_tooltip {
17	if (!$GRAB) {	20	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (exists $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
20		23
21	if ($TOOLTIP->{owner} != $widget) {	24	if ($TOOLTIP->{owner} != $widget) {
22	$TOOLTIP->{owner} = $widget;	25	$TOOLTIP->{owner} = $widget;
23		26
24	my $tip = $widget->{tooltip};	27	my $tip = $widget->{tooltip};
25		28
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	29	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		30
28	$TOOLTIP->set_text ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30	$TOOLTIP->show;	32	$TOOLTIP->show;
		33
		34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		35
		36	if ($x + $TOOLTIP->{w} > $::WIDTH) {
		37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
		38	}
		39
		40	$TOOLTIP->move ($x, $y);
		41	$TOOLTIP->check_size;
		42	$TOOLTIP->update;
31	}	43	}
32		44
33	return;	45	return;
34	}	46	}
35	}	47	}
…		…
39	delete $TOOLTIP->{owner};	51	delete $TOOLTIP->{owner};
40	}	52	}
41		53
42	# class methods for events	54	# class methods for events
43	sub feed_sdl_key_down_event {	55	sub feed_sdl_key_down_event {
44	$FOCUS->key_down ($_[0]) if $FOCUS;	56	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
		57	if $FOCUS;
45	}	58	}
46		59
47	sub feed_sdl_key_up_event {	60	sub feed_sdl_key_up_event {
48	$FOCUS->key_up ($_[0]) if $FOCUS;	61	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
		62	if $FOCUS;
49	}	63	}
50		64
51	sub feed_sdl_button_down_event {	65	sub feed_sdl_button_down_event {
52	my ($ev) = @_;	66	my ($ev) = @_;
53	my ($x, $y) = ($ev->{x}, $ev->{y});	67	my ($x, $y) = ($ev->{x}, $ev->{y});
…		…
61	check_tooltip;	75	check_tooltip;
62	}	76	}
63		77
64	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	78	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
65		79
66	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	80	if ($GRAB) {
		81	($x, $y) = $GRAB->coord2local ($x, $y);
		82	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
		83	}
67	}	84	}
68		85
69	sub feed_sdl_button_up_event {	86	sub feed_sdl_button_up_event {
70	my ($ev) = @_;	87	my ($ev) = @_;
71	my ($x, $y) = ($ev->{x}, $ev->{y});	88	my ($x, $y) = ($ev->{x}, $ev->{y});
72		89
73	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	90	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74		91
75	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	92	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76		93
77	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	94	if ($GRAB) {
		95	($x, $y) = $GRAB->coord2local ($x, $y);
		96	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
		97	}
78		98
79	if (!$BUTTON_STATE) {	99	if (!$BUTTON_STATE) {
80	my $grab = $GRAB; undef $GRAB;	100	my $grab = $GRAB; undef $GRAB;
81	$grab->update if $grab;	101	$grab->update if $grab;
82	$GRAB->update if $GRAB;	102	$GRAB->update if $GRAB;
…		…
98	$HOVER->update if $HOVER && $HOVER->{can_hover};	118	$HOVER->update if $HOVER && $HOVER->{can_hover};
99		119
100	check_tooltip;	120	check_tooltip;
101	}	121	}
102		122
103	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;	123	if ($HOVER) {
		124	($x, $y) = $HOVER->coord2local ($x, $y);
		125	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
		126	}
104	}	127	}
105		128
106	# convert position array to integers	129	# convert position array to integers
107	sub harmonize {	130	sub harmonize {
108	my ($vals) = @_;	131	my ($vals) = @_;
…		…
114	$rem += $_ - $i;	137	$rem += $_ - $i;
115	$_ = $i;	138	$_ = $i;
116	}	139	}
117	}	140	}
118		141
		142	# call when resolution changes etc.
		143	sub rescale_widgets {
		144	my ($sx, $sy) = @_;
		145
		146	for my $widget (values %WIDGET) {
		147	if ($widget->{toplevel}) {
		148	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		149	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		150	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		151	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		152	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		153	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		154	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		155	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		156	}
		157
		158	$widget->reconfigure;
		159	}
		160	}
		161
119	#############################################################################	162	#############################################################################
120		163
121	package CFClient::UI::Base;	164	package CFClient::UI::Base;
122		165
123	use strict;	166	use strict;
…		…
126		169
127	sub new {	170	sub new {
128	my $class = shift;	171	my $class = shift;
129		172
130	my $self = bless {	173	my $self = bless {
131	x => 0,	174	x => 0,
132	y => 0,	175	y => 0,
133	z => 0,	176	z => 0,
134	can_events => 1,	177	can_events => 1,
135	@_	178	@_
136	}, $class;	179	}, $class;
137		180
138	for (keys %$self) {	181	for (keys %$self) {
139	if (/^connect_(.*)$/) {	182	if (/^connect_(.*)$/) {
140	$self->connect ($1 => delete $self->{$_});	183	$self->connect ($1 => delete $self->{$_});
141	}	184	}
142	}	185	}
143		186
		187	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		188
144	$self	189	$self
145	}	190	}
146		191
		192	sub destroy {
		193	my ($self) = @_;
		194
		195	$self->hide;
		196	%$self = ();
		197	}
		198
147	sub show {	199	sub show {
148	my ($self) = @_;	200	my ($self) = @_;
149		201
150	return if $self->{parent};	202	return if $self->{parent};
151		203
		204	$self->{toplevel} = 1;
152	$CFClient::UI::ROOT->add ($self);	205	$CFClient::UI::ROOT->add ($self);
153	}	206	}
154		207
155	sub hide {	208	sub hide {
156	my ($self) = @_;	209	my ($self) = @_;
157		210
158	return unless $self->{parent};	211	undef $GRAB if $GRAB == $self;
		212	undef $HOVER if $HOVER == $self;
159		213
160	$self->{parent}->remove ($self);	214	$self->{parent}->remove ($self)
		215	if $self->{parent};
161	}	216	}
162		217
163	sub move {	218	sub move {
164	my ($self, $x, $y, $z) = @_;	219	my ($self, $x, $y, $z) = @_;
165		220
…		…
168	$self->{z} = $z if defined $z;	223	$self->{z} = $z if defined $z;
169		224
170	$self->update;	225	$self->update;
171	}	226	}
172		227
173	sub needs_redraw {	228	sub set_size {
174	0	229	my ($self, $w, $h) = @_;
		230
		231	$self->{user_w} = $w;
		232	$self->{user_h} = $h;
		233
		234	$self->check_size;
175	}	235	}
176		236
177	sub size_request {	237	sub size_request {
178	require Carp;	238	require Carp;
179	Carp::confess "size_request is abstract";	239	Carp::confess "size_request is abstract";
…		…
199	$self->{y} = $y;	259	$self->{y} = $y;
200	$self->update;	260	$self->update;
201	}	261	}
202		262
203	if ($self->{w} != $w || $self->{h} != $h) {	263	if ($self->{w} != $w || $self->{h} != $h) {
204	$self->{w} = $w;	264	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
205	$self->{h} = $h;
206
207	$self->size_allocate ($w, $h);
208	$self->update;
209	}	265	}
210	}	266	}
211		267
212	sub size_allocate {	268	sub size_allocate {
213	# nothing to be done	269	# nothing to be done
214	}	270	}
215		271
		272	sub reconfigure {
		273	my ($self) = @_;
		274
		275	$self->check_size (1);
		276	$self->update;
		277	}
		278
		279	sub children {
		280	}
		281
216	sub set_max_size {	282	sub set_max_size {
217	my ($self, $w, $h) = @_;	283	my ($self, $w, $h) = @_;
218		284
219	delete $self->{max_w}; $self->{max_w} = $w if $w;	285	delete $self->{max_w}; $self->{max_w} = $w if $w;
220	delete $self->{max_h}; $self->{max_h} = $h if $h;	286	delete $self->{max_h}; $self->{max_h} = $h if $h;
221	}
222
223	# return top left coordinates
224	sub _topleft {
225	my ($self, $x, $y) = @_;
226
227	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
228	}	287	}
229		288
230	# translate global coordinates to local coordinate system	289	# translate global coordinates to local coordinate system
231	sub coord2local {	290	sub coord2local {
232	my ($self, $x, $y) = @_;	291	my ($self, $x, $y) = @_;
233		292
234	my ($X, $Y) = $self->_topleft;	293	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
235	($x - $X, $y - $Y)
236	}	294	}
237		295
238	# translate local coordinates to global coordinate system	296	# translate local coordinates to global coordinate system
239	sub coord2global {	297	sub coord2global {
240	my ($self, $x, $y) = @_;	298	my ($self, $x, $y) = @_;
241		299
242	my ($X, $Y) = $self->_topleft;	300	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
243	($x + $X, $y + $Y)
244	}	301	}
245		302
246	sub focus_in {	303	sub focus_in {
247	my ($self) = @_;	304	my ($self) = @_;
248		305
…		…
308	glVertex $x + $self->{w}, $y + $self->{h};	365	glVertex $x + $self->{w}, $y + $self->{h};
309	glVertex $x , $y + $self->{h};	366	glVertex $x , $y + $self->{h};
310	glEnd;	367	glEnd;
311	glDisable GL_BLEND;	368	glDisable GL_BLEND;
312	}	369	}
		370
		371	if ($ENV{PCLIENT_DEBUG}) {
		372	glPushMatrix;
		373	glColor 1, 1, 0, 1;
		374	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
		375	glBegin GL_LINE_LOOP;
		376	glVertex 0 , 0;
		377	glVertex $self->{w}, 0;
		378	glVertex $self->{w}, $self->{h};
		379	glVertex 0 , $self->{h};
		380	glEnd;
		381	glPopMatrix;
		382	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		383	}
313	}	384	}
314		385
315	sub _draw {	386	sub _draw {
316	my ($self) = @_;	387	my ($self) = @_;
317		388
…		…
332		403
333	sub set_parent {	404	sub set_parent {
334	my ($self, $parent) = @_;	405	my ($self, $parent) = @_;
335		406
336	Scalar::Util::weaken ($self->{parent} = $parent);	407	Scalar::Util::weaken ($self->{parent} = $parent);
		408
		409	# TODO: req_w _does_change after ->reconfigure
		410	$self->check_size
		411	unless exists $self->{req_w};
337	}	412	}
338		413
339	sub check_size {	414	sub check_size {
340	my ($self) = @_;	415	my ($self, $forced) = @_;
341		416
342	return unless $self->{parent};	417	$self->{force_alloc} = 1 if $forced;
343		418	$CFClient::UI::ROOT->{check_size}{$self} = $self;
344	my ($w, $h) = $self->size_request;
345
346	if ($w != $self->{req_w} || $h != $self->{req_h}) {
347	$self->{req_w} = $w;
348	$self->{req_h} = $h;
349
350	$self->{parent}->check_size;
351	}
352	}	419	}
353		420
354	sub update {	421	sub update {
355	my ($self) = @_;	422	my ($self) = @_;
356		423
…		…
365	}	432	}
366		433
367	sub emit {	434	sub emit {
368	my ($self, $signal, @args) = @_;	435	my ($self, $signal, @args) = @_;
369		436
370	for my $cb (@{$self->{signal_cb}{$signal} || []}) {	437	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
371	$cb->($self, @args);
372	}
373	}	438	}
374		439
375	sub DESTROY {	440	sub DESTROY {
376	my ($self) = @_;	441	my ($self) = @_;
377		442
		443	delete $WIDGET{$self+0};
378	#$self->deactivate;	444	#$self->deactivate;
379	}	445	}
380		446
381	#############################################################################	447	#############################################################################
382		448
…		…
444	sub new {	510	sub new {
445	my ($class, %arg) = @_;	511	my ($class, %arg) = @_;
446		512
447	my $children = delete $arg{children} || [];	513	my $children = delete $arg{children} || [];
448		514
449	my $self = $class->SUPER::new (children => [], can_events => 0, %arg);	515	my $self = $class->SUPER::new (
		516	children => [],
		517	can_events => 0,
		518	%arg,
		519	);
450	$self->add ($_) for @$children;	520	$self->add ($_) for @$children;
451		521
452	$self	522	$self
453	}	523	}
454		524
455	sub add {	525	sub add {
456	my ($self, $child) = @_;	526	my ($self, @widgets) = @_;
457		527
458	$child->set_parent ($self);	528	$_->set_parent ($self)
		529	for @widgets;
459		530
460	use sort 'stable';	531	use sort 'stable';
461		532
462	$self->{children} = [	533	$self->{children} = [
463	sort { $a->{z} <=> $b->{z} }	534	sort { $a->{z} <=> $b->{z} }
464	@{$self->{children}}, $child	535	@{$self->{children}}, @widgets
465	];	536	];
466		537
467	$child->check_size;	538	$self->check_size (1);
		539	$self->update;
		540	}
		541
		542	sub children {
		543	@{ $_[0]{children} }
468	}	544	}
469		545
470	sub remove {	546	sub remove {
471	my ($self, $child) = @_;	547	my ($self, $child) = @_;
472		548
473	delete $child->{parent};	549	delete $child->{parent};
		550	$child->hide;
474		551
475	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	552	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		553
		554	$self->check_size;
		555	$self->update;
		556	}
		557
		558	sub clear {
		559	my ($self) = @_;
		560
		561	my $children = delete $self->{children};
		562	$self->{children} = [];
		563
		564	for (@$children) {
		565	delete $_->{parent};
		566	$_->hide;
		567	}
476		568
477	$self->check_size;	569	$self->check_size;
478	$self->update;	570	$self->update;
479	}	571	}
480		572
…		…
558	}	650	}
559		651
560	sub update {	652	sub update {
561	my ($self) = @_;	653	my ($self) = @_;
562		654
563	# we want to do this delayed...	655	$ROOT->on_post_alloc ($self => sub { $self->render_child });
564	$self->render_chld;
565	$self->SUPER::update;	656	$self->SUPER::update;
566	}
567
568	sub render_chld {
569	my ($self) = @_;
570
571	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
572	glClearColor 0, 0, 0, 1;
573	glClear GL_COLOR_BUFFER_BIT;
574	$self->child->draw;
575	};
576	}	657	}
577		658
578	sub size_allocate {	659	sub size_allocate {
579	my ($self, $w, $h) = @_;	660	my ($self, $w, $h) = @_;
580		661
581	$self->child->configure (0, 0, $w, $h);	662	$self->SUPER::size_allocate ($w, $h);
		663	$self->update;
		664	}
582		665
		666	sub _render {
		667	$_[0]{children}[0]->draw;
		668	}
		669
		670	sub render_child {
		671	my ($self) = @_;
		672
		673	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		674	glClearColor 0, 0, 0, 0;
		675	glClear GL_COLOR_BUFFER_BIT;
		676
583	$self->render_chld;	677	$self->_render;
		678	# glColorMask 1, 1, 1, 0;
		679	# glEnable GL_BLEND;
		680	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
		681	# glRasterPos 0, 0;
		682	# glCopyPixels 0, 0, $self->{w}, $self->{h};
		683	# glDisable GL_BLEND;
		684	# glColorMask 1, 1, 1, 1;
		685	};
584	}	686	}
585		687
586	sub _draw {	688	sub _draw {
587	my ($self) = @_;	689	my ($self) = @_;
588		690
589	my ($w, $h) = ($self->w, $self->h);	691	my ($w, $h) = ($self->w, $self->h);
590		692
591	my $tex = $self->{texture}	693	my $tex = $self->{texture}
592	or return;	694	or return;
593		695
594	glEnable GL_BLEND;
595	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
596	glEnable GL_TEXTURE_2D;	696	glEnable GL_TEXTURE_2D;
597	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	697	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		698	glColor 0, 0, 0, 1;
598		699
599	$tex->draw_quad (0, 0, $w, $h);	700	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
600		701
601	glDisable GL_BLEND;
602	glDisable GL_TEXTURE_2D;	702	glDisable GL_TEXTURE_2D;
603	}	703	}
604		704
605	#############################################################################	705	#############################################################################
606		706
607	package CFClient::UI::ViewPort;	707	package CFClient::UI::ViewPort;
608		708
609	our @ISA = CFClient::UI::Window::;	709	our @ISA = CFClient::UI::Window::;
610		710
611	sub new { die }
612
613	sub size_request {	711	sub size_request {
614	my ($self) = @_;	712	my ($self) = @_;
615		713
616	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	714	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
617	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	715	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
618		716
619	@$self{qw(child_w child_h)}	717	@$self{qw(child_w child_h)}
620	}	718	}
621		719
622	sub _draw {	720	sub size_allocate {
623	my ($self) = @_;	721	my ($self, $w, $h) = @_;
624		722
625	$self->{children}[1]->draw;	723	$self->update;
626	}	724	}
627		725
		726	sub set_offset {
		727	my ($self, $x, $y) = @_;
628		728
629	#############################################################################	729	$self->{view_x} = int $x;
		730	$self->{view_y} = int $y;
630		731
		732	$self->update;
		733	}
		734
		735	# hmm, this does not work for topleft of $self... but we should not ask for that
		736	sub coord2local {
		737	my ($self, $x, $y) = @_;
		738
		739	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		740	}
		741
		742	sub coord2global {
		743	my ($self, $x, $y) = @_;
		744
		745	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		746	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		747
		748	$self->SUPER::coord2global ($x, $y)
		749	}
		750
		751	sub find_widget {
		752	my ($self, $x, $y) = @_;
		753
		754	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		755	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		756	) {
		757	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		758	} else {
		759	$self->CFClient::UI::Base::find_widget ($x, $y)
		760	}
		761	}
		762
		763	sub _render {
		764	my ($self) = @_;
		765
		766	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		767
		768	$self->SUPER::_render;
		769	}
		770
		771	#############################################################################
		772
631	package CFClient::UI::Frame;	773	package CFClient::UI::ScrolledWindow;
632		774
633	our @ISA = CFClient::UI::Bin::;	775	our @ISA = CFClient::UI::HBox::;
634
635	use CFClient::OpenGL;
636		776
637	sub new {	777	sub new {
638	my $class = shift;	778	my $class = shift;
639		779
		780	my $self;
		781
		782	my $slider = new CFClient::UI::Slider
		783	vertical => 1,
		784	range => [0, 0, 1, 0.01], # HACK fix
		785	connect_changed => sub {
		786	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		787	},
		788	;
		789
640	my $self = $class->SUPER::new (	790	$self = $class->SUPER::new (
641	bg => [1, 1, 1, 1],	791	vp => (new CFClient::UI::ViewPort),
642	border_bg => [1, 1, 1, 1],	792	slider => $slider,
643	border => 0.8,
644	@_	793	@_,
645	);	794	);
646		795
		796	$self->{vp}->add ($self->{scrolled});
		797	$self->add ($self->{vp});
		798	$self->add ($self->{slider});
		799
647	$self	800	$self
648	}	801	}
649		802
650	sub set_size {	803	#TODO# update range on size_allocate depending on child
651	my ($self, $w, $h) = @_;	804	# update viewport offset on scroll
652	$self->{req_w} = $w;
653	$self->{req_h} = $h;
654	$self->check_size;
655	}
656		805
657	sub size_request {	806	#############################################################################
658	my ($self) = @_;
659	($self->{req_w}, $self->{req_h})
660	}
661		807
662	sub size_allocate {	808	package CFClient::UI::Frame;
663	my ($self, $w, $h) = @_;	809
664	$self->{w} = $w;	810	our @ISA = CFClient::UI::Bin::;
665	$self->{h} = $h;	811
666	$self->child->configure (0, 0, $w, $h);	812	use CFClient::OpenGL;
		813
		814	sub new {
		815	my $class = shift;
		816
		817	$class->SUPER::new (
		818	bg => undef,
		819	@_,
		820	)
667	}	821	}
668		822
669	sub _draw {	823	sub _draw {
670	my ($self) = @_;	824	my ($self) = @_;
671		825
672	my ($w, $h) = ($self->{w}, $self->{h});	826	if ($self->{bg}) {
		827	my ($w, $h) = @$self{qw(w h)};
673		828
674	glEnable GL_BLEND;	829	glEnable GL_BLEND;
675	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	830	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
676	glEnable GL_TEXTURE_2D;	831	glColor @{ $self->{bg} };
677	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
678		832
679	# glBegin GL_QUADS;	833	glBegin GL_QUADS;
680	# glColor 0, 0, 0, 0;
681	# glVertex 0 , 0;	834	glVertex 0 , 0;
682	# glVertex 0 , $h;	835	glVertex 0 , $h;
683	# glVertex $w, $h;	836	glVertex $w, $h;
684	# glVertex $w, 0;	837	glVertex $w, 0;
685	# glEnd;	838	glEnd;
686		839
687
688	$self->child->draw;
689	glDisable GL_BLEND;	840	glDisable GL_BLEND;
690	glDisable GL_TEXTURE_2D;	841	}
		842
		843	$self->SUPER::_draw;
691	}	844	}
692		845
693	#############################################################################	846	#############################################################################
694		847
695	package CFClient::UI::FancyFrame;	848	package CFClient::UI::FancyFrame;
…		…
706	my $class = shift;	859	my $class = shift;
707		860
708	# TODO: user_x, user_y, overwrite moveto?	861	# TODO: user_x, user_y, overwrite moveto?
709		862
710	my $self = $class->SUPER::new (	863	my $self = $class->SUPER::new (
711	bg => [1, 1, 1, 1],	864	bg => [1, 1, 1, 1],
712	border_bg => [1, 1, 1, 1],	865	border_bg => [1, 1, 1, 1],
713	border => 0.8,	866	border => 0.6,
		867	toplevel => 1,
714	can_events => 1,	868	can_events => 1,
715	@_	869	@_
716	);	870	);
717		871
718	$self->{title} &&= new CFClient::UI::Label	872	$self->{title} &&= new CFClient::UI::Label
719	align => 0,	873	align => 0,
720	valign => 1,	874	valign => 1,
721	text => $self->{title},	875	text => $self->{title},
722	fontsize => 1;	876	fontsize => $self->{border};
723		877
724	$self	878	$self
725	}	879	}
726		880
727	sub border {	881	sub border {
728	int $_[0]{border} * $::FONTSIZE	882	int $_[0]{border} * $::FONTSIZE
729	}	883	}
730		884
731	sub size_request {	885	sub size_request {
732	my ($self) = @_;	886	my ($self) = @_;
733
734	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
735		887
736	my ($w, $h) = $self->SUPER::size_request;	888	my ($w, $h) = $self->SUPER::size_request;
737		889
738	(	890	(
739	$w + $self->border * 2,	891	$w + $self->border * 2,
…		…
754	}	906	}
755		907
756	sub button_down {	908	sub button_down {
757	my ($self, $ev, $x, $y) = @_;	909	my ($self, $ev, $x, $y) = @_;
758		910
		911	my ($w, $h) = @$self{qw(w h)};
759	my $border = $self->border;	912	my $border = $self->border;
760		913
761	if ($x < $self->{w} && $x >= $self->{w} - $border	914	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
762	&& $y < $self->{h} && $y >= $self->{h} - $border) {	915	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
763		916
		917	if ($lr & $td) {
		918	my ($wx, $wy) = ($self->{x}, $self->{y});
764	my ($ox, $oy) = ($ev->{x}, $ev->{y});	919	my ($ox, $oy) = ($ev->{x}, $ev->{y});
765	my ($bw, $bh) = ($self->{w}, $self->{h});	920	my ($bw, $bh) = ($self->{w}, $self->{h});
766		921
		922	my $mx = $x < $border;
		923	my $my = $y < $border;
		924
767	$self->{motion} = sub {	925	$self->{motion} = sub {
768	my ($ev, $x, $y) = @_;	926	my ($ev, $x, $y) = @_;
769		927
770	($x, $y) = ($ev->{x}, $ev->{y});	928	my $dx = $ev->{x} - $ox;
		929	my $dy = $ev->{y} - $oy;
771		930
772	$self->{user_w} = $bw + $x - $ox;	931	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
773	$self->{user_h} = $bh + $y - $oy;	932	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		933	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
774	$self->check_size;	934	$self->check_size;
775	};	935	};
776		936
777	} elsif ($x >= 0 && $x < $self->{w}	937	} elsif ($lr ^ $td) {
778	&& $y >= 0 && $y < $border) {
779
780	my ($ox, $oy) = ($ev->{x}, $ev->{y});	938	my ($ox, $oy) = ($ev->{x}, $ev->{y});
781	my ($bx, $by) = ($self->{x}, $self->{y});	939	my ($bx, $by) = ($self->{x}, $self->{y});
782		940
783	$self->{motion} = sub {	941	$self->{motion} = sub {
784	my ($ev, $x, $y) = @_;	942	my ($ev, $x, $y) = @_;
…		…
807	my ($self) = @_;	965	my ($self) = @_;
808		966
809	my ($w, $h ) = ($self->{w}, $self->{h});	967	my ($w, $h ) = ($self->{w}, $self->{h});
810	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	968	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
811		969
812	glEnable GL_BLEND;
813	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
814	glEnable GL_TEXTURE_2D;	970	glEnable GL_TEXTURE_2D;
815	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	971	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
816		972
817	my $border = $self->border;	973	my $border = $self->border;
818		974
819	glColor @{ $self->{border_bg} };	975	glColor @{ $self->{border_bg} };
820	$tex[1]->draw_quad (0, 0, $w, $border);	976	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
821	$tex[3]->draw_quad (0, $border, $border, $ch);	977	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
822	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	978	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
823	$tex[4]->draw_quad (0, $h - $border, $w, $border);	979	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
824		980
		981	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
825	my $bg = $tex[0];	982	my $bg = $tex[0];
826		983
827	# TODO: repeat texture not scale	984	# TODO: repeat texture not scale
828	my $rep_x = $cw / $bg->{w};	985	my $rep_x = $cw / $bg->{w};
829	my $rep_y = $ch / $bg->{h};	986	my $rep_y = $ch / $bg->{h};
830		987
831	glColor @{ $self->{bg} };	988	glColor @{ $self->{bg} };
832		989
833	$bg->{s} = $rep_x;	990	$bg->{s} = $rep_x;
834	$bg->{t} = $rep_y;	991	$bg->{t} = $rep_y;
835	$bg->{wrap_mode} = 1;	992	$bg->{wrap_mode} = 1;
836	$bg->draw_quad ($border, $border, $cw, $ch);	993	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		994	}
837		995
838	glDisable GL_TEXTURE_2D;	996	glDisable GL_TEXTURE_2D;
839	glDisable GL_BLEND;
840		997
841	$self->{title}->draw if $self->{title};	998	$self->{title}->draw if $self->{title};
		999
842	$self->child->draw;	1000	$self->child->draw;
843	}	1001	}
844		1002
845	#############################################################################	1003	#############################################################################
846		1004
…		…
868	$self->{children}[$y][$x] = $child;	1026	$self->{children}[$y][$x] = $child;
869		1027
870	$child->check_size;	1028	$child->check_size;
871	}	1029	}
872		1030
		1031	sub children {
		1032	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1033	}
		1034
873	# TODO: move to container class maybe? send childs a signal on removal?	1035	# TODO: move to container class maybe? send childs a signal on removal?
874	sub clear {	1036	sub clear {
875	my ($self) = @_;	1037	my ($self) = @_;
876		1038
		1039	my @children = $self->children;
877	delete $self->{children};	1040	delete $self->{children};
		1041
		1042	for (@children) {
		1043	delete $_->{parent};
		1044	$_->hide;
		1045	}
		1046
878	$self->update;	1047	$self->update;
879	}	1048	}
880		1049
881	sub get_wh {	1050	sub get_wh {
882	my ($self) = @_;	1051	my ($self) = @_;
…		…
1059	}	1228	}
1060		1229
1061	sub size_allocate {	1230	sub size_allocate {
1062	my ($self, $w, $h) = @_;	1231	my ($self, $w, $h) = @_;
1063		1232
		1233	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1234
1064	my $children = $self->{children};	1235	my $children = $self->{children};
1065		1236
1066	my @h = map $_->{req_h}, @$children;	1237	my @h = map $_->{req_h}, @$children;
1067		1238
1068	my $req_h = List::Util::sum @h;	1239	my $req_h = List::Util::sum @h;
…		…
1105		1276
1106	sub new {	1277	sub new {
1107	my ($class, %arg) = @_;	1278	my ($class, %arg) = @_;
1108		1279
1109	my $self = $class->SUPER::new (	1280	my $self = $class->SUPER::new (
1110	fg => [1, 1, 1],	1281	fg => [1, 1, 1],
1111	#font => default_font	1282	#font => default_font
		1283	#text => initial text
		1284	#markup => initial narkup
		1285	layout => (new CFClient::Layout),
1112	fontsize => 1,	1286	fontsize => 1,
1113	text => "",
1114	align => -1,	1287	align => -1,
1115	valign => -1,	1288	valign => -1,
1116	padding => 2,	1289	padding => 2,
1117	layout => new CFClient::Layout,
1118	can_events => 0,	1290	can_events => 0,
1119	%arg	1291	%arg
1120	);	1292	);
1121		1293
1122	if (exists $self->{template}) {	1294	if (exists $self->{template}) {
1123	my $layout = new CFClient::Layout;	1295	my $layout = new CFClient::Layout;
1124	$layout->set_text (delete $self->{template});	1296	$layout->set_text (delete $self->{template});
1125	$self->{template} = $layout;	1297	$self->{template} = $layout;
1126	}	1298	}
1127		1299
1128	$self->set_text (delete $self->{text}) if exists $self->{text};	1300	if (exists $self->{markup}) {
1129	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1301	$self->set_markup (delete $self->{markup});
		1302	} else {
		1303	$self->set_text (delete $self->{text});
		1304	}
1130		1305
1131	$self	1306	$self
1132	}	1307	}
1133		1308
1134	sub escape_text {	1309	sub escape {
1135	local $_ = $_[1];	1310	local $_ = $_[1];
1136		1311
1137	s/&/&amp;/g;	1312	s/&/&amp;/g;
1138	s/>/&gt;/g;	1313	s/>/&gt;/g;
1139	s/</&lt;/g;	1314	s/</&lt;/g;
1140		1315
1141	$_[1]	1316	$_[1]
1142	}	1317	}
1143		1318
		1319	sub update {
		1320	my ($self) = @_;
		1321
		1322	delete $self->{texture};
		1323	$self->SUPER::update;
		1324	}
		1325
1144	sub set_text {	1326	sub set_text {
1145	my ($self, $text) = @_;	1327	my ($self, $text) = @_;
1146		1328
		1329	return if $self->{text} eq "T$text";
		1330	$self->{text} = "T$text";
		1331
		1332	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1147	$self->{layout}->set_text ($text);	1333	$self->{layout}->set_text ($text);
1148		1334
1149	delete $self->{texture};	1335	$self->update;
1150	$self->check_size;	1336	$self->check_size;
1151	$self->update;
1152	}	1337	}
1153		1338
1154	sub set_markup {	1339	sub set_markup {
1155	my ($self, $markup) = @_;	1340	my ($self, $markup) = @_;
1156		1341
		1342	return if $self->{text} eq "M$markup";
		1343	$self->{text} = "M$markup";
		1344
		1345	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1346
		1347	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1157	$self->{layout}->set_markup ($markup);	1348	$self->{layout}->set_markup ($markup);
1158		1349
1159	delete $self->{texture};	1350	$self->update;
1160	$self->check_size;	1351	$self->check_size;
1161	$self->update;
1162	}	1352	}
1163		1353
1164	sub size_request {	1354	sub size_request {
1165	my ($self) = @_;	1355	my ($self) = @_;
1166		1356
…		…
1195	sub set_fontsize {	1385	sub set_fontsize {
1196	my ($self, $fontsize) = @_;	1386	my ($self, $fontsize) = @_;
1197		1387
1198	$self->{fontsize} = $fontsize;	1388	$self->{fontsize} = $fontsize;
1199	delete $self->{texture};	1389	delete $self->{texture};
		1390
		1391	$self->update;
1200	$self->check_size;	1392	$self->check_size;
1201	$self->update;
1202	}	1393	}
1203		1394
1204	sub _draw {	1395	sub _draw {
1205	my ($self) = @_;	1396	my ($self) = @_;
1206		1397
1207	my $tex = $self->{texture} ||= do {	1398	my $tex = $self->{texture} ||= do {
		1399	$self->{layout}->set_foreground (@{$self->{fg}});
1208	$self->{layout}->set_font ($self->{font}) if $self->{font};	1400	$self->{layout}->set_font ($self->{font}) if $self->{font};
1209	$self->{layout}->set_width ($self->{w});	1401	$self->{layout}->set_width ($self->{w});
1210	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1402	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
		1403
1211	new_from_layout CFClient::Texture $self->{layout}	1404	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1405
		1406	$self->{ox} = int $self->{align} < 0 ? $self->{padding}
		1407	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1408	: ($self->{w} - $tex->{w}) * 0.5;
		1409
		1410	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}
		1411	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1412	: ($self->{h} - $tex->{h}) * 0.5;
		1413
		1414	$tex
1212	};	1415	};
1213		1416
1214	glEnable GL_BLEND;
1215	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1216	glEnable GL_TEXTURE_2D;	1417	glEnable GL_TEXTURE_2D;
1217	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1418	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1218		1419
		1420	if ($tex->{format} == GL_ALPHA) {
1219	glColor @{$self->{fg}};	1421	glColor @{$self->{fg}};
1220
1221	$self->{ox} = int (
1222	$self->{align} < 0 ? $self->{padding}
1223	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1224	: ($self->{w} - $tex->{w}) * 0.5
1225	);
1226
1227	$self->{oy} = int (
1228	$self->{valign} < 0 ? $self->{padding}
1229	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1230	: ($self->{h} - $tex->{h}) * 0.5
1231	);
1232
1233	$tex->draw_quad ($self->{ox}, $self->{oy});	1422	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1423	} else {
		1424	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1425	}
1234		1426
1235	glDisable GL_TEXTURE_2D;	1427	glDisable GL_TEXTURE_2D;
1236	glDisable GL_BLEND;
1237	}	1428	}
1238		1429
1239	#############################################################################	1430	#############################################################################
1240		1431
1241	package CFClient::UI::EntryBase;	1432	package CFClient::UI::EntryBase;
…		…
1246		1437
1247	sub new {	1438	sub new {
1248	my $class = shift;	1439	my $class = shift;
1249		1440
1250	$class->SUPER::new (	1441	$class->SUPER::new (
1251	fg => [1, 1, 1],	1442	fg => [1, 1, 1],
1252	bg => [0, 0, 0, 0.2],	1443	bg => [0, 0, 0, 0.2],
1253	active_bg => [1, 1, 1, 0.5],	1444	active_bg => [1, 1, 1, 0.5],
1254	active_fg => [0, 0, 0],	1445	active_fg => [0, 0, 0],
1255	can_hover => 1,	1446	can_hover => 1,
1256	can_focus => 1,	1447	can_focus => 1,
1257	valign => 0,	1448	valign => 0,
1258	can_events => 1,	1449	can_events => 1,
1259	@_	1450	@_
1260	)	1451	)
1261	}	1452	}
1262		1453
…		…
1276	$self->{layout}->set_text ("$text ");	1467	$self->{layout}->set_text ("$text ");
1277		1468
1278	$self->emit (changed => $self->{text});	1469	$self->emit (changed => $self->{text});
1279	}	1470	}
1280		1471
		1472	sub set_text {
		1473	my ($self, $text) = @_;
		1474
		1475	$self->{cursor} = length $text;
		1476	$self->_set_text ($text);
		1477	$self->check_size;
		1478	$self->update;
		1479	}
		1480
1281	sub get_text {	1481	sub get_text {
1282	$_[0]{text}	1482	$_[0]{text}
1283	}	1483	}
1284		1484
1285	sub size_request {	1485	sub size_request {
…		…
1292		1492
1293	sub size_allocate {	1493	sub size_allocate {
1294	my ($self, $w, $h) = @_;	1494	my ($self, $w, $h) = @_;
1295		1495
1296	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text	1496	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1297	}
1298
1299	sub set_text {
1300	my ($self, $text) = @_;
1301
1302	$self->{cursor} = length $text;
1303	$self->_set_text ($text);
1304	$self->update;
1305	}	1497	}
1306		1498
1307	sub key_down {	1499	sub key_down {
1308	my ($self, $ev) = @_;	1500	my ($self, $ev) = @_;
1309		1501
…		…
1311	my $sym = $ev->{sym};	1503	my $sym = $ev->{sym};
1312	my $uni = $ev->{unicode};	1504	my $uni = $ev->{unicode};
1313		1505
1314	my $text = $self->get_text;	1506	my $text = $self->get_text;
1315		1507
1316	if ($sym == 8) {	1508	if ($uni == 8) {
1317	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1509	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1318	} elsif ($sym == 127) {	1510	} elsif ($uni == 127) {
1319	substr $text, $self->{cursor}, 1, "";	1511	substr $text, $self->{cursor}, 1, "";
1320	} elsif ($sym == CFClient::SDLK_LEFT) {	1512	} elsif ($sym == CFClient::SDLK_LEFT) {
1321	--$self->{cursor} if $self->{cursor};	1513	--$self->{cursor} if $self->{cursor};
1322	} elsif ($sym == CFClient::SDLK_RIGHT) {	1514	} elsif ($sym == CFClient::SDLK_RIGHT) {
1323	++$self->{cursor} if $self->{cursor} < length $self->{text};	1515	++$self->{cursor} if $self->{cursor} < length $self->{text};
1324	} elsif ($sym == CFClient::SDLK_HOME) {	1516	} elsif ($sym == CFClient::SDLK_HOME) {
1325	$self->{cursor} = 0;	1517	$self->{cursor} = 0;
1326	} elsif ($sym == CFClient::SDLK_END) {	1518	} elsif ($sym == CFClient::SDLK_END) {
1327	$self->{cursor} = length $text;	1519	$self->{cursor} = length $text;
1328	} elsif ($sym == 27) {	1520	} elsif ($uni == 27) {
1329	$self->emit ('escape');	1521	$self->emit ('escape');
1330	} elsif ($uni) {	1522	} elsif ($uni) {
1331	substr $text, $self->{cursor}++, 0, chr $uni;	1523	substr $text, $self->{cursor}++, 0, chr $uni;
1332	}	1524	}
1333		1525
…		…
1416	my ($self, $ev) = @_;	1608	my ($self, $ev) = @_;
1417		1609
1418	my $sym = $ev->{sym};	1610	my $sym = $ev->{sym};
1419		1611
1420	if ($sym == 13) {	1612	if ($sym == 13) {
		1613	unshift @{$self->{history}},
		1614	my $txt = $self->get_text;
		1615	$self->{history_pointer} = -1;
		1616	$self->{history_saveback} = '';
1421	$self->emit (activate => $self->get_text);	1617	$self->emit (activate => $txt);
1422	$self->update;	1618	$self->update;
		1619
		1620	} elsif ($sym == CFClient::SDLK_UP) {
		1621	if ($self->{history_pointer} < 0) {
		1622	$self->{history_saveback} = $self->get_text;
		1623	}
		1624	if (@{$self->{history} || []} > 0) {
		1625	$self->{history_pointer}++;
		1626	if ($self->{history_pointer} >= @{$self->{history} || []}) {
		1627	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1628	}
		1629	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1630	}
		1631
		1632	} elsif ($sym == CFClient::SDLK_DOWN) {
		1633	$self->{history_pointer}--;
		1634	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1635
		1636	if ($self->{history_pointer} >= 0) {
		1637	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1638	} else {
		1639	$self->set_text ($self->{history_saveback});
		1640	}
1423		1641
1424	} else {	1642	} else {
1425	$self->SUPER::key_down ($ev);	1643	$self->SUPER::key_down ($ev);
1426	}	1644	}
1427		1645
…		…
1441		1659
1442	sub new {	1660	sub new {
1443	my $class = shift;	1661	my $class = shift;
1444		1662
1445	$class->SUPER::new (	1663	$class->SUPER::new (
1446	padding => 4,	1664	padding => 4,
1447	fg => [1, 1, 1],	1665	fg => [1, 1, 1],
1448	bg => [1, 1, 1, 0.2],	1666	bg => [1, 1, 1, 0.2],
1449	active_fg => [0, 0, 1],	1667	active_fg => [0, 0, 1],
1450	can_hover => 1,	1668	can_hover => 1,
1451	align => 0,	1669	align => 0,
1452	valign => 0,	1670	valign => 0,
1453	can_events => 1,	1671	can_events => 1,
1454	@_	1672	@_
1455	)	1673	)
1456	}	1674	}
1457		1675
…		…
1471		1689
1472	if ($GRAB == $self) {	1690	if ($GRAB == $self) {
1473	$self->{fg} = $self->{active_fg};	1691	$self->{fg} = $self->{active_fg};
1474	}	1692	}
1475		1693
1476	glEnable GL_BLEND;
1477	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1478	glEnable GL_TEXTURE_2D;	1694	glEnable GL_TEXTURE_2D;
1479	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1480	glColor 0, 0, 0, 1;	1696	glColor 0, 0, 0, 1;
1481		1697
1482	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1698	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1483		1699
1484	glDisable GL_TEXTURE_2D;	1700	glDisable GL_TEXTURE_2D;
1485	glDisable GL_BLEND;
1486		1701
1487	$self->SUPER::_draw;	1702	$self->SUPER::_draw;
1488	}	1703	}
1489		1704
1490	#############################################################################	1705	#############################################################################
…		…
1537		1752
1538	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1753	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1539		1754
1540	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1755	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1541		1756
1542	glEnable GL_BLEND;	1757	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1758
1543	glEnable GL_TEXTURE_2D;	1759	glEnable GL_TEXTURE_2D;
1544	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1545
1546	my $tex = $self->{state} ? $tex[1] : $tex[0];
1547
1548	$tex->draw_quad (0, 0, $s, $s);	1760	$tex->draw_quad_alpha (0, 0, $s, $s);
1549
1550	glDisable GL_TEXTURE_2D;	1761	glDisable GL_TEXTURE_2D;
1551	glDisable GL_BLEND;
1552	}	1762	}
1553		1763
1554	#############################################################################	1764	#############################################################################
1555		1765
1556	package CFClient::UI::Image;	1766	package CFClient::UI::Image;
…		…
1599	glTranslate 0, -$self->{w}, 0;	1809	glTranslate 0, -$self->{w}, 0;
1600		1810
1601	($w, $h) = ($h, $w);	1811	($w, $h) = ($h, $w);
1602	}	1812	}
1603		1813
1604	glEnable GL_BLEND;
1605	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1606	glEnable GL_TEXTURE_2D;	1814	glEnable GL_TEXTURE_2D;
1607	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1815	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1608		1816
1609	$tex->draw_quad (0, 0, $w, $h);	1817	$tex->draw_quad_alpha (0, 0, $w, $h);
1610		1818
1611	glDisable GL_BLEND;
1612	glDisable GL_TEXTURE_2D;	1819	glDisable GL_TEXTURE_2D;
1613	}	1820	}
1614		1821
1615	#############################################################################	1822	#############################################################################
1616		1823
1617	package CFClient::UI::VGauge;	1824	package CFClient::UI::VGauge;
1618		1825
1619	our @ISA = CFClient::UI::Base::;	1826	our @ISA = CFClient::UI::Base::;
		1827
		1828	use List::Util qw(min max);
1620		1829
1621	use CFClient::OpenGL;	1830	use CFClient::OpenGL;
1622		1831
1623	my %tex = (	1832	my %tex = (
1624	food => [	1833	food => [
1625	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1834	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1626	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	1835	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1627	],	1836	],
1628	grace => [	1837	grace => [
1629	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1838	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1630	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/	1839	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1631	],	1840	],
1632	hp => [	1841	hp => [
1633	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1842	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1634	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	1843	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1635	],	1844	],
1636	mana => [	1845	mana => [
1637	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1846	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1638	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/	1847	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1639	],	1848	],
1640	);	1849	);
1641		1850
1642	# eg. VGauge->new (gauge => 'food'), default gauge: food	1851	# eg. VGauge->new (gauge => 'food'), default gauge: food
1643	sub new {	1852	sub new {
…		…
1662	}	1871	}
1663		1872
1664	sub set_max {	1873	sub set_max {
1665	my ($self, $max) = @_;	1874	my ($self, $max) = @_;
1666		1875
		1876	return if $self->{max_val} == $max;
		1877
1667	$self->{max_val} = $max;	1878	$self->{max_val} = $max;
		1879	$self->update;
1668	}	1880	}
1669		1881
1670	sub set_value {	1882	sub set_value {
1671	my ($self, $val, $max) = @_;	1883	my ($self, $val, $max) = @_;
1672		1884
1673	$self->set_max ($max)	1885	$self->set_max ($max)
1674	if defined $max;	1886	if defined $max;
1675		1887
1676	$max = $self->{max_val};	1888	return if $self->{val} == $val;
		1889
1677	$self->{val} = $val;	1890	$self->{val} = $val;
1678
1679	$self->update;	1891	$self->update;
1680	}	1892	}
1681		1893
1682	sub _draw {	1894	sub _draw {
1683	my ($self) = @_;	1895	my ($self) = @_;
1684		1896
1685	my $tex = $tex{$self->{type}};	1897	my $tex = $tex{$self->{type}};
		1898	my ($t1, $t2, $t3) = @$tex;
1686		1899
1687	my ($w, $h) = ($self->{w}, $self->{h});	1900	my ($w, $h) = ($self->{w}, $self->{h});
1688		1901
1689	if ($self->{vertical}) {	1902	if ($self->{vertical}) {
1690	glRotate 90, 0, 0, 1;	1903	glRotate 90, 0, 0, 1;
…		…
1692		1905
1693	($w, $h) = ($h, $w);	1906	($w, $h) = ($h, $w);
1694	}	1907	}
1695		1908
1696	my $ycut = $self->{val} / ($self->{max_val} || 1);	1909	my $ycut = $self->{val} / ($self->{max_val} || 1);
1697	$ycut = 1 if $self->{val} > $self->{max_val};
1698		1910
1699	my $t1 = $tex->[0];	1911	my $ycut1 = max 0, min 1, $ycut;
1700	my $t2 = $tex->[1];	1912	my $ycut2 = max 0, min 1, $ycut - 1;
		1913
		1914	my $h1 = $self->{h} * (1 - $ycut1);
		1915	my $h2 = $self->{h} * (1 - $ycut2);
1701		1916
1702	glEnable GL_BLEND;	1917	glEnable GL_BLEND;
1703	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1918	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1704	glEnable GL_TEXTURE_2D;	1919	glEnable GL_TEXTURE_2D;
1705	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1920	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1706		1921
1707	my $h1 = $self->{h} - $ycut * $self->{h};
1708	my $h2 = $ycut * $self->{h};
1709
1710	glBindTexture GL_TEXTURE_2D, $t1->{name};	1922	glBindTexture GL_TEXTURE_2D, $t1->{name};
1711	glBegin GL_QUADS;	1923	glBegin GL_QUADS;
1712	glTexCoord 0 , 0; glVertex 0 , 0;	1924	glTexCoord 0 , 0; glVertex 0 , 0;
1713	glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;	1925	glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1714	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;	1926	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1715	glTexCoord $t1->{s}, 0; glVertex $w, 0;	1927	glTexCoord $t1->{s}, 0; glVertex $w, 0;
1716	glEnd;	1928	glEnd;
1717		1929
		1930	my $ycut1 = List::Util::min 1, $ycut;
1718	glBindTexture GL_TEXTURE_2D, $t2->{name};	1931	glBindTexture GL_TEXTURE_2D, $t2->{name};
1719	glBegin GL_QUADS;	1932	glBegin GL_QUADS;
1720	glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;	1933	glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1721	glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;	1934	glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1722	glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;	1935	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1723	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;	1936	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1724	glEnd;	1937	glEnd;
		1938
		1939	if ($t3) {
		1940	glBindTexture GL_TEXTURE_2D, $t3->{name};
		1941	glBegin GL_QUADS;
		1942	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
		1943	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
		1944	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
		1945	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
		1946	glEnd;
		1947	}
1725		1948
1726	glDisable GL_BLEND;	1949	glDisable GL_BLEND;
1727	glDisable GL_TEXTURE_2D;	1950	glDisable GL_TEXTURE_2D;
1728	}	1951	}
1729		1952
…		…
1735		1958
1736	sub new {	1959	sub new {
1737	my ($class, %arg) = @_;	1960	my ($class, %arg) = @_;
1738		1961
1739	my $self = $class->SUPER::new (	1962	my $self = $class->SUPER::new (
1740	tooltip => $arg{type},	1963	tooltip => $arg{type},
		1964	can_hover => 1,
		1965	can_events => 1,
1741	%arg,	1966	%arg,
1742	);	1967	);
1743		1968
1744	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1);	1969	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1745	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1);	1970	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1746	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1);	1971	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1747		1972
1748	$self	1973	$self
1749	}	1974	}
1750		1975
1751	sub set_fontsize {	1976	sub set_fontsize {
…		…
1753		1978
1754	$self->{value}->set_fontsize ($fsize);	1979	$self->{value}->set_fontsize ($fsize);
1755	$self->{max} ->set_fontsize ($fsize);	1980	$self->{max} ->set_fontsize ($fsize);
1756	}	1981	}
1757		1982
		1983	sub set_max {
		1984	my ($self, $max) = @_;
		1985
		1986	$self->{gauge}->set_max ($max);
		1987	$self->{max}->set_text ($max);
		1988	}
		1989
1758	sub set_value {	1990	sub set_value {
1759	my ($self, $val, $max) = @_;	1991	my ($self, $val, $max) = @_;
1760		1992
1761	$self->set_max ($max)	1993	$self->set_max ($max)
1762	if defined $max;	1994	if defined $max;
1763		1995
1764	$self->{gauge}->set_value ($val, $max);	1996	$self->{gauge}->set_value ($val, $max);
1765	$self->{value}->set_text ($val);	1997	$self->{value}->set_text ($val);
1766	}
1767
1768	sub set_max {
1769	my ($self, $max) = @_;
1770
1771	$self->{gauge}->set_max ($max);
1772	$self->{max}->set_text ($max);
1773	}	1998	}
1774		1999
1775	#############################################################################	2000	#############################################################################
1776		2001
1777	package CFClient::UI::Slider;	2002	package CFClient::UI::Slider;
…		…
1796	# TODO: calculations are off	2021	# TODO: calculations are off
1797	my $self = $class->SUPER::new (	2022	my $self = $class->SUPER::new (
1798	fg => [1, 1, 1],	2023	fg => [1, 1, 1],
1799	active_fg => [0, 0, 0],	2024	active_fg => [0, 0, 0],
1800	range => [0, 0, 100, 10],	2025	range => [0, 0, 100, 10],
1801	req_w => 20,	2026	req_w => $::WIDTH / 80,
1802	req_h => 20,	2027	req_h => $::WIDTH / 80,
1803	vertical => 0,	2028	vertical => 0,
1804	can_hover => 1,	2029	can_hover => 1,
1805	inner_pad => 5,	2030	inner_pad => 5,
1806	@_	2031	@_
1807	);	2032	);
…		…
1890	$page ||= 2;	2115	$page ||= 2;
1891		2116
1892	my $knob_a = $inner_pad_px + ($value - $page * 0.5);	2117	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1893	my $knob_b = $inner_pad_px + ($value + $page * 0.5);	2118	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1894		2119
1895	glEnable GL_BLEND;
1896	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1897	glEnable GL_TEXTURE_2D;	2120	glEnable GL_TEXTURE_2D;
1898	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2121	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1899		2122
1900	# draw background	2123	# draw background
1901	$tex[1]->draw_quad (0, 0, $w, $h);	2124	$tex[1]->draw_quad_alpha (0, 0, $w, $h);
1902		2125
1903	# draw handle	2126	# draw handle
1904	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2127	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1905		2128
1906	glDisable GL_BLEND;
1907	glDisable GL_TEXTURE_2D;	2129	glDisable GL_TEXTURE_2D;
1908	}	2130	}
1909		2131
1910	#############################################################################	2132	#############################################################################
1911		2133
…		…
1917		2139
1918	sub new {	2140	sub new {
1919	my $class = shift;	2141	my $class = shift;
1920		2142
1921	my $self = $class->SUPER::new (	2143	my $self = $class->SUPER::new (
1922	fontsize => 1,	2144	fontsize => 1,
		2145	can_events => 0,
1923	#font => default_font	2146	#font => default_font
1924	@_,	2147	@_,
1925		2148
1926	layout => (new CFClient::Layout),	2149	layout => (new CFClient::Layout 1),
1927	par => [],	2150	par => [],
1928	height => 0,	2151	height => 0,
1929	children => [	2152	children => [
1930	(new CFClient::UI::Empty expand => 1),	2153	(new CFClient::UI::Empty expand => 1),
1931	(new CFClient::UI::Slider vertical => 1),	2154	(new CFClient::UI::Slider vertical => 1),
1932	],	2155	],
1933	);	2156	);
1934		2157
1935	$self->{children}[1]->connect (changed => sub {	2158	$self->{children}[1]->connect (changed => sub { $self->update });
1936	$self->update;
1937	});
1938		2159
1939	$self	2160	$self
1940	}	2161	}
1941		2162
1942	sub set_fontsize {	2163	sub set_fontsize {
…		…
1950	my ($self, $text) = @_;	2171	my ($self, $text) = @_;
1951		2172
1952	my $layout = $self->{layout};	2173	my $layout = $self->{layout};
1953		2174
1954	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2175	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1955	$layout->set_width ($self->{w});	2176	$layout->set_width ($self->{children}[0]{w});
1956	$layout->set_text ($text);	2177	$layout->set_markup ($text);
1957		2178
1958	($layout->size)[1]	2179	($layout->size)[1]
1959	}	2180	}
1960		2181
1961	sub reflow {	2182	sub reflow {
…		…
1999		2220
2000	return unless $self->{h} > 0;	2221	return unless $self->{h} > 0;
2001		2222
2002	delete $self->{texture};	2223	delete $self->{texture};
2003		2224
2004	$ROOT->on_refresh ($self, sub {	2225	$ROOT->on_post_alloc ($self, sub {
2005	if (delete $self->{need_reflow}) {	2226	if (delete $self->{need_reflow}) {
2006	my $height = 0;	2227	my $height = 0;
2007		2228
2008	$height += $_->[0] = $self->text_height ($_->[2])	2229	$height += $_->[0] = $self->text_height ($_->[2])
2009	for @{$self->{par}};	2230	for @{$self->{par}};
…		…
2013	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2234	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2014		2235
2015	delete $self->{texture};	2236	delete $self->{texture};
2016	}	2237	}
2017		2238
2018	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2239	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2019	glClearColor 0, 0, 0, 1;	2240	glClearColor 0, 0, 0, 0;
2020	glClear GL_COLOR_BUFFER_BIT;	2241	glClear GL_COLOR_BUFFER_BIT;
2021		2242
2022	glEnable GL_BLEND;
2023	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2024	glEnable GL_TEXTURE_2D;	2243	glEnable GL_TEXTURE_2D;
2025	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2244	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2026		2245
2027	my $top = int $self->{children}[1]{range}[0];	2246	my $top = int $self->{children}[1]{range}[0];
2028		2247
…		…
2037		2256
2038	for my $par (@{$self->{par}}) {	2257	for my $par (@{$self->{par}}) {
2039	my $h = $par->[0];	2258	my $h = $par->[0];
2040		2259
2041	if ($y0 < $y + $h && $y < $y1) {	2260	if ($y0 < $y + $h && $y < $y1) {
		2261	$layout->set_foreground (@{ $par->[1] });
2042	$layout->set_text ($par->[2]);	2262	$layout->set_markup ($par->[2]);
2043		2263
2044	glColor @{ $par->[1] };
2045	my ($W, $H) = $layout->size;	2264	my ($W, $H) = $layout->size;
2046	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2265	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2047	}	2266	}
2048		2267
2049	$y += $h;	2268	$y += $h;
2050	}	2269	}
2051		2270
2052	glDisable GL_TEXTURE_2D;	2271	glDisable GL_TEXTURE_2D;
2053	glDisable GL_BLEND;
2054	};	2272	};
2055	});	2273	});
2056	}	2274	}
2057		2275
2058	sub _draw {	2276	sub _draw {
2059	my ($self) = @_;	2277	my ($self) = @_;
2060		2278
2061	if ($self->{texture}) {
2062	glEnable GL_TEXTURE_2D;	2279	glEnable GL_TEXTURE_2D;
2063	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2280	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2064	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2281	glColor 1, 1, 1, 1;
		2282	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2065	glDisable GL_TEXTURE_2D;	2283	glDisable GL_TEXTURE_2D;
2066	}
2067		2284
2068	$self->{children}[1]->draw;	2285	$self->{children}[1]->draw;
2069		2286
2070	}	2287	}
2071		2288
…		…
2119		2336
2120	sub new {	2337	sub new {
2121	my $class = shift;	2338	my $class = shift;
2122		2339
2123	my $self = $class->SUPER::new (	2340	my $self = $class->SUPER::new (
2124	state => 0,	2341	state => 0,
2125	connect_activate => \&toggle_flopper,	2342	connect_activate => \&toggle_flopper,
2126	can_events => 1,
2127	@_	2343	@_
2128	);	2344	);
2129		2345
2130	if ($self->{state}) {	2346	if ($self->{state}) {
2131	$self->{state} = 0;	2347	$self->{state} = 0;
…		…
2166	@_,	2382	@_,
2167	can_events => 0,	2383	can_events => 0,
2168	)	2384	)
2169	}	2385	}
2170		2386
2171	sub set_text {	2387	sub set_tooltip_from {
2172	my ($self, $text) = @_;	2388	my ($self, $widget) = @_;
2173		2389
2174	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2390	$self->add (new CFClient::UI::Label
2175	$self->{label}->set_text ($text);	2391	markup => $widget->{tooltip},
2176	$self->add ($self->{label});	2392	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2393	fontsize => 0.8,
		2394	fg => [0, 0, 0, 1],
		2395	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2396	);
2177	}	2397	}
2178		2398
2179	sub size_request {	2399	sub size_request {
2180	my ($self) = @_;	2400	my ($self) = @_;
2181		2401
2182	$self->child->set_max_size ($::WIDTH * 0.2);
2183
2184	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2402	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2185		2403
2186	($w + 4, $h + 4)	2404	($w + 4, $h + 4)
2187	}	2405	}
2188		2406
		2407	sub size_allocate {
		2408	my ($self, $w, $h) = @_;
		2409
		2410	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2411	}
		2412
2189	sub _draw {	2413	sub _draw {
2190	my ($self) = @_;	2414	my ($self) = @_;
2191		2415
2192	glPushMatrix;
2193	glTranslate 0.375, 0.375;	2416	glTranslate 0.375, 0.375;
2194		2417
2195	my ($w, $h) = @$self{qw(w h)};	2418	my ($w, $h) = @$self{qw(w h)};
2196		2419
2197	glColor 1, 0.8, 0.4;	2420	glColor 1, 0.8, 0.4;
…		…
2208	glVertex 0 , $h;	2431	glVertex 0 , $h;
2209	glVertex $w, $h;	2432	glVertex $w, $h;
2210	glVertex $w, 0;	2433	glVertex $w, 0;
2211	glEnd;	2434	glEnd;
2212		2435
2213	glPopMatrix;	2436	glTranslate 2 - 0.375, 2 - 0.375;
2214
2215	glTranslate 2, 2;
2216	$self->SUPER::_draw;	2437	$self->SUPER::_draw;
2217	}	2438	}
2218		2439
2219	#############################################################################	2440	#############################################################################
2220		2441
		2442	package CFClient::UI::Face;
		2443
		2444	our @ISA = CFClient::UI::Base::;
		2445
		2446	use CFClient::OpenGL;
		2447
		2448	sub new {
		2449	my $class = shift;
		2450
		2451	$class->SUPER::new (
		2452	aspect => 1,
		2453	@_,
		2454	)
		2455	}
		2456
		2457	sub size_request {
		2458	(32, 8)
		2459	}
		2460
		2461	sub _draw {
		2462	my ($self) = @_;
		2463
		2464	return unless $::CONN;#d# manage and cache textures differently
		2465	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
		2466
		2467	# TODO animation
		2468	if ($tex) {
		2469	glEnable GL_TEXTURE_2D;
		2470	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2471	glColor 1, 1, 1, 1;
		2472	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2473	glDisable GL_TEXTURE_2D;
		2474	}
		2475	}
		2476
		2477	#############################################################################
		2478
		2479	package CFClient::UI::InventoryItem;
		2480
		2481	our @ISA = CFClient::UI::HBox::;
		2482
		2483	sub new {
		2484	my $class = shift;
		2485
		2486	my %args = @_;
		2487
		2488	my $item = delete $args{item};
		2489
		2490	my $desc = $item->{nrof} < 2
		2491	? $item->{name}
		2492	: "$item->{nrof} $item->{name_pl}";
		2493
		2494
		2495	my $self = $class->SUPER::new (
		2496	can_hover => 1,
		2497	can_events => 1,
		2498	tooltip => (CFClient::UI::Label->escape ($desc)
		2499	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2500	connect_button_down => sub {
		2501	my ($self, $ev, $x, $y) = @_;
		2502
		2503	# todo: maybe put examine on 1? but should just be a tooltip :(
		2504	if ($ev->{button} == 1) {
		2505	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2506	} elsif ($ev->{button} == 2) {
		2507	$::CONN->send ("apply $item->{tag}");
		2508	} elsif ($ev->{button} == 3) {
		2509	CFClient::UI::Menu->new (
		2510	items => [
		2511	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2512	[
		2513	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2514	sub { $::CONN->send ("lock $item->{tag}") },
		2515	],
		2516	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2517	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2518	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
		2519	],
		2520	)->popup ($ev);
		2521	}
		2522
		2523	1
		2524	},
		2525	%args
		2526	);
		2527
		2528	$self->add (new CFClient::UI::Face
		2529	can_events => 0,
		2530	face => $item->{face},
		2531	anim => $item->{anim},
		2532	animspeed => $item->{animspeed},
		2533	);
		2534
		2535	$self->add (new CFClient::UI::Label
		2536	can_events => 0,
		2537	text => $desc,
		2538	);
		2539
		2540	$self
		2541	}
		2542
		2543	#############################################################################
		2544
		2545	package CFClient::UI::Inventory;
		2546
		2547	our @ISA = CFClient::UI::ScrolledWindow::;
		2548
		2549	sub new {
		2550	my $class = shift;
		2551
		2552	my $self = $class->SUPER::new (
		2553	scrolled => (new CFClient::UI::VBox),
		2554	@_,
		2555	);
		2556
		2557	$self
		2558	}
		2559
		2560	sub set_items {
		2561	my ($self, $items) = @_;
		2562
		2563	$self->{scrolled}->clear;
		2564	return unless $items;
		2565
		2566	my @items = sort {
		2567	($a->{type} <=> $b->{type})
		2568	or ($a->{name} cmp $b->{name})
		2569	} @$items;
		2570
		2571	$self->{real_items} = \@items;
		2572
		2573	for my $item (@items) {
		2574	my $desc = $item->{nrof} < 2
		2575	? $item->{name}
		2576	: "$item->{nrof} $item->{name_pl}";
		2577
		2578	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2579	}
		2580
		2581	$self->{scrolled}->add (@items);
		2582
		2583	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2584	}
		2585
		2586	sub size_request {
		2587	my ($self) = @_;
		2588	($self->{req_w}, $self->{req_h});
		2589	}
		2590
		2591	#############################################################################
		2592
		2593	package CFClient::UI::Menu;
		2594
		2595	our @ISA = CFClient::UI::FancyFrame::;
		2596
		2597	use CFClient::OpenGL;
		2598
		2599	sub new {
		2600	my $class = shift;
		2601
		2602	my $self = $class->SUPER::new (
		2603	items => [],
		2604	z => 100,
		2605	@_,
		2606	);
		2607
		2608	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2609
		2610	for my $item (@{ $self->{items} }) {
		2611	my ($widget, $cb) = @$item;
		2612
		2613	# handle various types of items, only text for now
		2614	if (!ref $widget) {
		2615	$widget = new CFClient::UI::Label
		2616	can_hover => 1,
		2617	can_events => 1,
		2618	text => $widget;
		2619	}
		2620
		2621	$self->{item}{$widget} = $item;
		2622
		2623	$self->{vbox}->add ($widget);
		2624	}
		2625
		2626	$self
		2627	}
		2628
		2629	# popup given the event (must be a mouse button down event currently)
		2630	sub popup {
		2631	my ($self, $ev) = @_;
		2632
		2633	$self->emit ("popdown");
		2634
		2635	# maybe save $GRAB? must be careful about events...
		2636	$GRAB = $self;
		2637	$self->{button} = $ev->{button};
		2638
		2639	$self->show;
		2640	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2641	}
		2642
		2643	sub mouse_motion {
		2644	my ($self, $ev, $x, $y) = @_;
		2645
		2646	# TODO: should use vbox->find_widget or so
		2647	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2648	$self->{hover} = $self->{item}{$HOVER};
		2649	}
		2650
		2651	sub button_up {
		2652	my ($self, $ev, $x, $y) = @_;
		2653
		2654	if ($ev->{button} == $self->{button}) {
		2655	undef $GRAB;
		2656	$self->hide;
		2657
		2658	$self->emit ("popdown");
		2659	$self->{hover}[1]->() if $self->{hover};
		2660	}
		2661	}
		2662
		2663	#############################################################################
		2664
		2665	package CFClient::UI::Statusbox;
		2666
		2667	our @ISA = CFClient::UI::VBox::;
		2668
		2669	sub reorder {
		2670	my ($self) = @_;
		2671	my $NOW = time;
		2672
		2673	while (my ($k, $v) = each %{ $self->{item} }) {
		2674	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2675	}
		2676
		2677	my @widgets;
		2678
		2679	my @items = sort {
		2680	$a->{pri} <=> $b->{pri}
		2681	or $b->{id} <=> $a->{id}
		2682	} values %{ $self->{item} };
		2683
		2684	my $count = 10 + 1;
		2685	for my $item (@items) {
		2686	last unless --$count;
		2687
		2688	push @widgets, $item->{label} ||= do {
		2689	# TODO: doesn't handle markup well (read as: at all)
		2690	my $short = $item->{count} > 1
		2691	? "<b>$item->{count} ×</b> $item->{text}"
		2692	: $item->{text};
		2693
		2694	for ($short) {
		2695	s/^\s+//;
		2696	s/\012.*/…/s;
		2697	my $len = int 40 / $item->{fontsize};
		2698	substr $_, $len, length, "…" if $len < length;
		2699	}
		2700
		2701	new CFClient::UI::Label
		2702	markup => $short,
		2703	tooltip => $item->{tooltip},
		2704	tooltip_font => $::FONT_PROP,
		2705	tooltip_width => 0.67,
		2706	fontsize => $item->{fontsize},
		2707	color => $item->{color},
		2708	can_events => 1,
		2709	can_hover => 1
		2710	};
		2711	}
		2712
		2713	$self->clear;
		2714	$self->SUPER::add (reverse @widgets);
		2715	}
		2716
		2717	sub add {
		2718	my ($self, $text, %arg) = @_;
		2719
		2720	$text =~ s/^\s+//;
		2721	$text =~ s/\s+$//;
		2722
		2723	my $timeout = time + ((delete $arg{timeout}) || 60);
		2724
		2725	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2726
		2727	if (my $item = $self->{item}{$group}) {
		2728	if ($item->{text} eq $text) {
		2729	$item->{count}++;
		2730	} else {
		2731	$item->{count} = 1;
		2732	$item->{text} = $item->{tooltip} = $text;
		2733	}
		2734	$item->{id} = ++$self->{id};
		2735	$item->{timeout} = $timeout;
		2736	delete $item->{label};
		2737	} else {
		2738	$self->{item}{$group} = {
		2739	id => ++$self->{id},
		2740	text => $text,
		2741	timeout => $timeout,
		2742	tooltip => $text,
		2743	fontsize => 0.8,
		2744	color => [0.8, 0.8, 0.8, 0.8],
		2745	pri => 0,
		2746	count => 1,
		2747	%arg,
		2748	};
		2749	}
		2750
		2751	$self->reorder;
		2752	}
		2753
		2754	#############################################################################
		2755
2221	package CFClient::UI::Root;	2756	package CFClient::UI::Root;
2222		2757
2223	our @ISA = CFClient::UI::Container::;	2758	our @ISA = CFClient::UI::Container::;
2224		2759
2225	use CFClient::OpenGL;	2760	use CFClient::OpenGL;
2226		2761
2227	sub check_size {	2762	sub new {
2228	my ($self) = @_;	2763	my $class = shift;
2229		2764
2230	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2765	$class->SUPER::new (
2231	}	2766	@_,
2232		2767	)
2233	sub size_request {
2234	($::WIDTH, $::HEIGHT)
2235	}	2768	}
2236		2769
2237	sub configure {	2770	sub configure {
2238	my ($self, $x, $y, $w, $h) = @_;	2771	my ($self, $x, $y, $w, $h) = @_;
2239		2772
2240	$self->SUPER::configure ($x, $y, $w, $h);	2773	$self->{w} = $w;
		2774	$self->{h} = $h;
		2775	}
2241		2776
		2777	sub check_size {
		2778	my ($self) = @_;
		2779
		2780	$self->size_allocate ($self->{w}, $self->{h})
		2781	if $self->{w};
		2782	}
		2783
		2784	sub size_request {
		2785	my ($self) = @_;
		2786
		2787	($self->{w}, $self->{h})
		2788	}
		2789
		2790	sub size_allocate {
		2791	my ($self, $w, $h) = @_;
		2792
		2793	my $old_w = $self->{old_w}; $self->{old_w} = $w;
		2794	my $old_h = $self->{old_h}; $self->{old_h} = $h;
		2795
		2796	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
		2797	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
		2798
2242	for my $child (@{$self->{children}}) {	2799	for my $child ($self->children) {
2243	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2800	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2244		2801
2245	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2802	$X = List::Util::max 0, List::Util::min $w - $W, $X;
2246	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2803	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2247	$child->configure ($X, $Y, $W,$H);	2804	$child->configure ($X, $Y, $W, $H);
2248	}	2805	}
2249	}	2806	}
2250		2807
2251	sub _topleft {	2808	sub coord2local {
2252	my ($self, $x, $y) = @_;	2809	my ($self, $x, $y) = @_;
2253		2810
2254	($x, $y)	2811	($x, $y)
2255	}	2812	}
2256		2813
		2814	sub coord2global {
		2815	my ($self, $x, $y) = @_;
		2816
		2817	($x, $y)
		2818	}
		2819
2257	sub update {	2820	sub update {
2258	my ($self) = @_;	2821	my ($self) = @_;
2259		2822
2260	$self->check_size;	2823	$self->check_size;
2261	::refresh ();	2824	$::WANT_REFRESH++;
2262	}	2825	}
2263		2826
2264	sub add {	2827	sub add {
2265	my ($self, $child) = @_;	2828	my ($self, $child) = @_;
2266		2829
2267	# integerize window positions	2830	# integerise window positions
2268	$child->{x} = int $child->{x};	2831	$child->{x} = int $child->{x};
2269	$child->{y} = int $child->{y};	2832	$child->{y} = int $child->{y};
2270		2833
2271	$self->SUPER::add ($child);	2834	$self->SUPER::add ($child);
2272	}	2835	}
…		…
2275	my ($self, $id, $cb) = @_;	2838	my ($self, $id, $cb) = @_;
2276		2839
2277	$self->{refresh_hook}{$id} = $cb;	2840	$self->{refresh_hook}{$id} = $cb;
2278	}	2841	}
2279		2842
		2843	sub on_post_alloc {
		2844	my ($self, $id, $cb) = @_;
		2845
		2846	$self->{post_alloc_hook}{$id} = $cb;
		2847	}
		2848
2280	sub draw {	2849	sub draw {
2281	my ($self) = @_;	2850	my ($self) = @_;
2282		2851
2283	while (my $rcb = delete $self->{refresh_hook}) {	2852	while ($self->{refresh_hook}) {
2284	$_->() for values %$rcb;	2853	$_->()
		2854	for values %{delete $self->{refresh_hook}};
		2855	}
		2856
		2857	if ($self->{check_size}) {
		2858	my @queue = ([], []);
		2859
		2860	for (;;) {
		2861	if ($self->{check_size}) {
		2862	# heuristic: check containers last
		2863	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2864	for values %{delete $self->{check_size}}
		2865	}
		2866
		2867	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		2868
		2869	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2870	? @$widget{qw(user_w user_h)}
		2871	: $widget->size_request;
		2872
		2873	if (delete $widget->{force_alloc}
		2874	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		2875	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		2876
		2877	$widget->{req_w} = $w;
		2878	$widget->{req_h} = $h;
		2879
		2880	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		2881
		2882	$widget->{parent}->check_size
		2883	if $widget->{parent};
		2884	}
		2885	}
		2886	}
		2887
		2888	while ($self->{size_alloc}) {
		2889	for (values %{delete $self->{size_alloc}}) {
		2890	my ($widget, $w, $h) = @$_;
		2891
		2892	$w = 0 if $w < 0;
		2893	$h = 0 if $h < 0;
		2894
		2895	$widget->{w} = $w;
		2896	$widget->{h} = $h;
		2897	$widget->size_allocate ($w, $h);
		2898	$widget->emit (size_allocate => $w, $h);
		2899	}
		2900	}
		2901
		2902	while ($self->{post_alloc_hook}) {
		2903	$_->()
		2904	for values %{delete $self->{post_alloc_hook}};
2285	}	2905	}
2286		2906
2287	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2907	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2288	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2908	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2289	glClear GL_COLOR_BUFFER_BIT;	2909	glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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