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

Diff Legend

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