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.158 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.197 by root, Fri May 12 01:47:04 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
…		…
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
15		16
16	sub check_tooltip {	17	sub check_tooltip {
17	if (!$GRAB) {	18	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	19	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (exists $widget->{tooltip}) {	20	if (length $widget->{tooltip}) {
20		21
21	if ($TOOLTIP->{owner} != $widget) {	22	if ($TOOLTIP->{owner} != $widget) {
22	$TOOLTIP->{owner} = $widget;	23	$TOOLTIP->{owner} = $widget;
23		24
24	my $tip = $widget->{tooltip};	25	my $tip = $widget->{tooltip};
25		26
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	27	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		28
28	$TOOLTIP->set_text ($widget->{tooltip});	29	$TOOLTIP->set_tooltip_from ($widget);
29	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30	$TOOLTIP->show;	30	$TOOLTIP->show;
		31
		32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		33
		34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
		35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
		36	}
		37
		38	$TOOLTIP->move ($x, $y);
		39	$TOOLTIP->check_size;
		40	$TOOLTIP->update;
31	}	41	}
32		42
33	return;	43	return;
34	}	44	}
35	}	45	}
…		…
39	delete $TOOLTIP->{owner};	49	delete $TOOLTIP->{owner};
40	}	50	}
41		51
42	# class methods for events	52	# class methods for events
43	sub feed_sdl_key_down_event {	53	sub feed_sdl_key_down_event {
44	$FOCUS->key_down ($_[0]) if $FOCUS;	54	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
		55	if $FOCUS;
45	}	56	}
46		57
47	sub feed_sdl_key_up_event {	58	sub feed_sdl_key_up_event {
48	$FOCUS->key_up ($_[0]) if $FOCUS;	59	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
		60	if $FOCUS;
49	}	61	}
50		62
51	sub feed_sdl_button_down_event {	63	sub feed_sdl_button_down_event {
52	my ($ev) = @_;	64	my ($ev) = @_;
53	my ($x, $y) = ($ev->{x}, $ev->{y});	65	my ($x, $y) = ($ev->{x}, $ev->{y});
…		…
61	check_tooltip;	73	check_tooltip;
62	}	74	}
63		75
64	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	76	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
65		77
66	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	78	if ($GRAB) {
		79	($x, $y) = $GRAB->coord2local ($x, $y);
		80	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
		81	}
67	}	82	}
68		83
69	sub feed_sdl_button_up_event {	84	sub feed_sdl_button_up_event {
70	my ($ev) = @_;	85	my ($ev) = @_;
71	my ($x, $y) = ($ev->{x}, $ev->{y});	86	my ($x, $y) = ($ev->{x}, $ev->{y});
72		87
73	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	88	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74		89
75	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	90	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76		91
77	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	92	if ($GRAB) {
		93	($x, $y) = $GRAB->coord2local ($x, $y);
		94	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
		95	}
78		96
79	if (!$BUTTON_STATE) {	97	if (!$BUTTON_STATE) {
80	my $grab = $GRAB; undef $GRAB;	98	my $grab = $GRAB; undef $GRAB;
81	$grab->update if $grab;	99	$grab->update if $grab;
82	$GRAB->update if $GRAB;	100	$GRAB->update if $GRAB;
…		…
98	$HOVER->update if $HOVER && $HOVER->{can_hover};	116	$HOVER->update if $HOVER && $HOVER->{can_hover};
99		117
100	check_tooltip;	118	check_tooltip;
101	}	119	}
102		120
103	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;	121	if ($HOVER) {
		122	($x, $y) = $HOVER->coord2local ($x, $y);
		123	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
		124	}
104	}	125	}
105		126
106	# convert position array to integers	127	# convert position array to integers
107	sub harmonize {	128	sub harmonize {
108	my ($vals) = @_;	129	my ($vals) = @_;
…		…
126		147
127	sub new {	148	sub new {
128	my $class = shift;	149	my $class = shift;
129		150
130	my $self = bless {	151	my $self = bless {
131	x => 0,	152	x => 0,
132	y => 0,	153	y => 0,
133	z => 0,	154	z => 0,
134	can_events => 1,	155	can_events => 1,
135	@_	156	@_
136	}, $class;	157	}, $class;
137		158
138	for (keys %$self) {	159	for (keys %$self) {
…		…
142	}	163	}
143		164
144	$self	165	$self
145	}	166	}
146		167
		168	sub destroy {
		169	my ($self) = @_;
		170
		171	$self->hide;
		172	%$self = ();
		173	}
		174
147	sub show {	175	sub show {
148	my ($self) = @_;	176	my ($self) = @_;
149		177
150	return if $self->{parent};	178	return if $self->{parent};
151		179
…		…
153	}	181	}
154		182
155	sub hide {	183	sub hide {
156	my ($self) = @_;	184	my ($self) = @_;
157		185
158	return unless $self->{parent};	186	undef $GRAB if $GRAB == $self;
		187	undef $HOVER if $HOVER == $self;
159		188
160	$self->{parent}->remove ($self);	189	$self->{parent}->remove ($self)
		190	if $self->{parent};
161	}	191	}
162		192
163	sub move {	193	sub move {
164	my ($self, $x, $y, $z) = @_;	194	my ($self, $x, $y, $z) = @_;
165		195
…		…
204	$self->{y} = $y;	234	$self->{y} = $y;
205	$self->update;	235	$self->update;
206	}	236	}
207		237
208	if ($self->{w} != $w || $self->{h} != $h) {	238	if ($self->{w} != $w || $self->{h} != $h) {
209	$self->{w} = $w;	239	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
210	$self->{h} = $h;
211
212	$self->size_allocate ($w, $h);
213	$self->update;
214	}	240	}
215	}	241	}
216		242
217	sub size_allocate {	243	sub size_allocate {
218	# nothing to be done	244	# nothing to be done
219	}	245	}
220		246
		247	sub children {
		248	}
		249
		250	# call when resolution changes etc.
		251	sub reconfigure {
		252	my ($self) = @_;
		253
		254	$_->reconfigure
		255	for $self->children;
		256
		257	$self->check_size;
		258	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
		259	$self->update;
		260	}
		261
221	sub set_max_size {	262	sub set_max_size {
222	my ($self, $w, $h) = @_;	263	my ($self, $w, $h) = @_;
223		264
224	delete $self->{max_w}; $self->{max_w} = $w if $w;	265	delete $self->{max_w}; $self->{max_w} = $w if $w;
225	delete $self->{max_h}; $self->{max_h} = $h if $h;	266	delete $self->{max_h}; $self->{max_h} = $h if $h;
226	}
227
228	# return top left coordinates
229	sub _topleft {
230	my ($self, $x, $y) = @_;
231
232	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
233	}	267	}
234		268
235	# translate global coordinates to local coordinate system	269	# translate global coordinates to local coordinate system
236	sub coord2local {	270	sub coord2local {
237	my ($self, $x, $y) = @_;	271	my ($self, $x, $y) = @_;
238		272
239	my ($X, $Y) = $self->_topleft;	273	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
240	($x - $X, $y - $Y)
241	}	274	}
242		275
243	# translate local coordinates to global coordinate system	276	# translate local coordinates to global coordinate system
244	sub coord2global {	277	sub coord2global {
245	my ($self, $x, $y) = @_;	278	my ($self, $x, $y) = @_;
246		279
247	my ($X, $Y) = $self->_topleft;	280	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
248	($x + $X, $y + $Y)
249	}	281	}
250		282
251	sub focus_in {	283	sub focus_in {
252	my ($self) = @_;	284	my ($self) = @_;
253		285
…		…
313	glVertex $x + $self->{w}, $y + $self->{h};	345	glVertex $x + $self->{w}, $y + $self->{h};
314	glVertex $x , $y + $self->{h};	346	glVertex $x , $y + $self->{h};
315	glEnd;	347	glEnd;
316	glDisable GL_BLEND;	348	glDisable GL_BLEND;
317	}	349	}
		350
		351	if ($ENV{PCLIENT_DEBUG}) {
		352	glPushMatrix;
		353	glColor 1, 1, 0, 1;
		354	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
		355	glBegin GL_LINE_LOOP;
		356	glVertex 0 , 0;
		357	glVertex $self->{w}, 0;
		358	glVertex $self->{w}, $self->{h};
		359	glVertex 0 , $self->{h};
		360	glEnd;
		361	glPopMatrix;
		362	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		363	}
318	}	364	}
319		365
320	sub _draw {	366	sub _draw {
321	my ($self) = @_;	367	my ($self) = @_;
322		368
…		…
337		383
338	sub set_parent {	384	sub set_parent {
339	my ($self, $parent) = @_;	385	my ($self, $parent) = @_;
340		386
341	Scalar::Util::weaken ($self->{parent} = $parent);	387	Scalar::Util::weaken ($self->{parent} = $parent);
		388
		389	$self->check_size
		390	unless exists $self->{req_w};
342	}	391	}
343		392
344	sub check_size {	393	sub check_size {
345	my ($self) = @_;	394	my ($self, $forced) = @_;
346		395
347	$self->{parent}	396	$self->{force_alloc} = 1 if $forced;
348	or return 1;	397	$CFClient::UI::ROOT->{check_size}{$self} = $self;
349
350	my ($w, $h) = $self->{user_w} && $self->{user_h}
351	? @$self{qw(user_w user_h)}
352	: $self->size_request;
353
354	if ($w != $self->{req_w} || $h != $self->{req_h}) {
355	$self->{req_w} = $w;
356	$self->{req_h} = $h;
357
358	$self->{parent}->check_size
359	or $self->size_allocate (
360	(List::Util::max $self->{w}, $w),
361	(List::Util::max $self->{h}, $h),
362	);
363
364	1
365	} else {
366	0
367	}
368	}	398	}
369		399
370	sub update {	400	sub update {
371	my ($self) = @_;	401	my ($self) = @_;
372		402
…		…
381	}	411	}
382		412
383	sub emit {	413	sub emit {
384	my ($self, $signal, @args) = @_;	414	my ($self, $signal, @args) = @_;
385		415
386	for my $cb (@{$self->{signal_cb}{$signal} || []}) {	416	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
387	$cb->($self, @args);
388	}
389	}	417	}
390		418
391	sub DESTROY {	419	sub DESTROY {
392	my ($self) = @_;	420	my ($self) = @_;
393		421
…		…
460	sub new {	488	sub new {
461	my ($class, %arg) = @_;	489	my ($class, %arg) = @_;
462		490
463	my $children = delete $arg{children} || [];	491	my $children = delete $arg{children} || [];
464		492
465	my $self = $class->SUPER::new (children => [], can_events => 0, %arg);	493	my $self = $class->SUPER::new (
		494	children => [],
		495	can_events => 0,
		496	%arg,
		497	);
466	$self->add ($_) for @$children;	498	$self->add ($_) for @$children;
467		499
468	$self	500	$self
469	}	501	}
470		502
471	sub add {	503	sub add {
472	my ($self, $child) = @_;	504	my ($self, @widgets) = @_;
473		505
474	$child->set_parent ($self);	506	$_->set_parent ($self)
		507	for @widgets;
475		508
476	use sort 'stable';	509	use sort 'stable';
477		510
478	$self->{children} = [	511	$self->{children} = [
479	sort { $a->{z} <=> $b->{z} }	512	sort { $a->{z} <=> $b->{z} }
480	@{$self->{children}}, $child	513	@{$self->{children}}, @widgets
481	];	514	];
482		515
483	$child->check_size;	516	$self->check_size (1);
		517	$self->update;
		518	}
		519
		520	sub children {
		521	@{ $_[0]{children} }
484	}	522	}
485		523
486	sub remove {	524	sub remove {
487	my ($self, $child) = @_;	525	my ($self, $child) = @_;
488		526
489	delete $child->{parent};	527	delete $child->{parent};
		528	$child->hide;
490		529
491	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	530	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		531
		532	$self->check_size;
		533	$self->update;
		534	}
		535
		536	sub clear {
		537	my ($self) = @_;
		538
		539	my $children = delete $self->{children};
		540	$self->{children} = [];
		541
		542	for (@$children) {
		543	delete $_->{parent};
		544	$_->hide;
		545	}
492		546
493	$self->check_size;	547	$self->check_size;
494	$self->update;	548	$self->update;
495	}	549	}
496		550
…		…
574	}	628	}
575		629
576	sub update {	630	sub update {
577	my ($self) = @_;	631	my ($self) = @_;
578		632
579	# we want to do this delayed...	633	$ROOT->on_refresh ($self => sub { $self->render_child });
580	$self->render_chld;
581	$self->SUPER::update;	634	$self->SUPER::update;
582	}
583
584	sub render_chld {
585	my ($self) = @_;
586
587	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
588	glClearColor 0, 0, 0, 1;
589	glClear GL_COLOR_BUFFER_BIT;
590	$self->child->draw;
591	};
592	}	635	}
593		636
594	sub size_allocate {	637	sub size_allocate {
595	my ($self, $w, $h) = @_;	638	my ($self, $w, $h) = @_;
596		639
597	$self->child->configure (0, 0, $w, $h);	640	$self->SUPER::size_allocate ($w, $h);
		641	$self->update;
		642	}
598		643
		644	sub _render {
		645	$_[0]{children}[0]->draw;
		646	}
		647
		648	sub render_child {
		649	my ($self) = @_;
		650
		651	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		652	glClearColor 0, 0, 0, 0;
		653	glClear GL_COLOR_BUFFER_BIT;
		654
599	$self->render_chld;	655	$self->_render;
		656	# glColorMask 1, 1, 1, 0;
		657	# glEnable GL_BLEND;
		658	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
		659	# glRasterPos 0, 0;
		660	# glCopyPixels 0, 0, $self->{w}, $self->{h};
		661	# glDisable GL_BLEND;
		662	# glColorMask 1, 1, 1, 1;
		663	};
600	}	664	}
601		665
602	sub _draw {	666	sub _draw {
603	my ($self) = @_;	667	my ($self) = @_;
604		668
605	my ($w, $h) = ($self->w, $self->h);	669	my ($w, $h) = ($self->w, $self->h);
606		670
607	my $tex = $self->{texture}	671	my $tex = $self->{texture}
608	or return;	672	or return;
609		673
610	glEnable GL_BLEND;
611	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
612	glEnable GL_TEXTURE_2D;	674	glEnable GL_TEXTURE_2D;
613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		676	glColor 0, 0, 0, 1;
614		677
615	$tex->draw_quad (0, 0, $w, $h);	678	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
616		679
617	glDisable GL_BLEND;
618	glDisable GL_TEXTURE_2D;	680	glDisable GL_TEXTURE_2D;
619	}	681	}
620		682
621	#############################################################################	683	#############################################################################
622		684
623	package CFClient::UI::ViewPort;	685	package CFClient::UI::ViewPort;
624		686
625	our @ISA = CFClient::UI::Window::;	687	our @ISA = CFClient::UI::Window::;
626		688
627	sub new { die }
628
629	sub size_request {	689	sub size_request {
630	my ($self) = @_;	690	my ($self) = @_;
631		691
632	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
633	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	693	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
634		694
635	@$self{qw(child_w child_h)}	695	@$self{qw(child_w child_h)}
636	}	696	}
637		697
638	sub _draw {	698	sub size_allocate {
639	my ($self) = @_;	699	my ($self, $w, $h) = @_;
640		700
641	$self->{children}[1]->draw;	701	$self->update;
642	}	702	}
643		703
		704	sub set_offset {
		705	my ($self, $x, $y) = @_;
644		706
645	#############################################################################	707	$self->{view_x} = int $x;
		708	$self->{view_y} = int $y;
646		709
		710	$self->update;
		711	}
		712
		713	# hmm, this does not work for topleft of $self... but we should not ask for that
		714	sub coord2local {
		715	my ($self, $x, $y) = @_;
		716
		717	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		718	}
		719
		720	sub coord2global {
		721	my ($self, $x, $y) = @_;
		722
		723	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		724	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		725
		726	$self->SUPER::coord2global ($x, $y)
		727	}
		728
		729	sub find_widget {
		730	my ($self, $x, $y) = @_;
		731
		732	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		733	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		734	) {
		735	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		736	} else {
		737	$self->CFClient::UI::Base::find_widget ($x, $y)
		738	}
		739	}
		740
		741	sub _render {
		742	my ($self) = @_;
		743
		744	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		745
		746	$self->SUPER::_render;
		747	}
		748
		749	#############################################################################
		750
647	package CFClient::UI::Frame;	751	package CFClient::UI::ScrolledWindow;
648		752
649	our @ISA = CFClient::UI::Bin::;	753	our @ISA = CFClient::UI::HBox::;
650
651	use CFClient::OpenGL;
652		754
653	sub new {	755	sub new {
654	my $class = shift;	756	my $class = shift;
655		757
		758	my $self;
		759
		760	my $slider = new CFClient::UI::Slider
		761	vertical => 1,
		762	range => [0, 0, 1, 0.01], # HACK fix
		763	connect_changed => sub {
		764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		765	},
		766	;
		767
656	my $self = $class->SUPER::new (	768	$self = $class->SUPER::new (
657	bg => [1, 1, 1, 1],	769	vp => (new CFClient::UI::ViewPort),
658	border_bg => [1, 1, 1, 1],	770	slider => $slider,
659	border => 0.8,
660	@_	771	@_,
661	);	772	);
662		773
		774	$self->{vp}->add ($self->{scrolled});
		775	$self->add ($self->{vp});
		776	$self->add ($self->{slider});
		777
663	$self	778	$self
664	}	779	}
665		780
666	sub _draw {	781	#TODO# update range on size_allocate depeneing on child
667	my ($self) = @_;	782	# update viewport offset on scroll
668		783
669	my ($w, $h) = ($self->{w}, $self->{h});	784	#############################################################################
670		785
671	glEnable GL_BLEND;	786	package CFClient::UI::Frame;
672	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
673	glEnable GL_TEXTURE_2D;
674	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675		787
676	# glBegin GL_QUADS;	788	our @ISA = CFClient::UI::Bin::;
677	# glColor 0, 0, 0, 0;
678	# glVertex 0 , 0;
679	# glVertex 0 , $h;
680	# glVertex $w, $h;
681	# glVertex $w, 0;
682	# glEnd;
683		789
684		790	use CFClient::OpenGL;
685	$self->child->draw;
686	glDisable GL_BLEND;
687	glDisable GL_TEXTURE_2D;
688	}
689		791
690	#############################################################################	792	#############################################################################
691		793
692	package CFClient::UI::FancyFrame;	794	package CFClient::UI::FancyFrame;
693		795
…		…
703	my $class = shift;	805	my $class = shift;
704		806
705	# TODO: user_x, user_y, overwrite moveto?	807	# TODO: user_x, user_y, overwrite moveto?
706		808
707	my $self = $class->SUPER::new (	809	my $self = $class->SUPER::new (
708	bg => [1, 1, 1, 1],	810	bg => [1, 1, 1, 1],
709	border_bg => [1, 1, 1, 1],	811	border_bg => [1, 1, 1, 1],
710	border => 0.8,	812	border => 0.6,
711	can_events => 1,	813	can_events => 1,
712	@_	814	@_
713	);	815	);
714		816
715	$self->{title} &&= new CFClient::UI::Label	817	$self->{title} &&= new CFClient::UI::Label
716	align => 0,	818	align => 0,
717	valign => 1,	819	valign => 1,
718	text => $self->{title},	820	text => $self->{title},
719	fontsize => 1;	821	fontsize => $self->{border};
720		822
721	$self	823	$self
722	}	824	}
723		825
724	sub border {	826	sub border {
…		…
749	}	851	}
750		852
751	sub button_down {	853	sub button_down {
752	my ($self, $ev, $x, $y) = @_;	854	my ($self, $ev, $x, $y) = @_;
753		855
		856	my ($w, $h) = @$self{qw(w h)};
754	my $border = $self->border;	857	my $border = $self->border;
755		858
756	if ($x < $self->{w} && $x >= $self->{w} - $border	859	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
757	&& $y < $self->{h} && $y >= $self->{h} - $border) {	860	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
758		861
		862	if ($lr & $td) {
		863	my ($wx, $wy) = ($self->{x}, $self->{y});
759	my ($ox, $oy) = ($ev->{x}, $ev->{y});	864	my ($ox, $oy) = ($ev->{x}, $ev->{y});
760	my ($bw, $bh) = ($self->{w}, $self->{h});	865	my ($bw, $bh) = ($self->{w}, $self->{h});
761		866
		867	my $mx = $x < $border;
		868	my $my = $y < $border;
		869
762	$self->{motion} = sub {	870	$self->{motion} = sub {
763	my ($ev, $x, $y) = @_;	871	my ($ev, $x, $y) = @_;
764		872
765	($x, $y) = ($ev->{x}, $ev->{y});	873	my $dx = $ev->{x} - $ox;
		874	my $dy = $ev->{y} - $oy;
766		875
767	$self->{user_w} = $bw + $x - $ox;	876	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
768	$self->{user_h} = $bh + $y - $oy;	877	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		878	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
769	$self->check_size;	879	$self->check_size;
770	};	880	};
771		881
772	} elsif ($x >= 0 && $x < $self->{w}	882	} elsif ($lr ^ $td) {
773	&& $y >= 0 && $y < $border) {
774
775	my ($ox, $oy) = ($ev->{x}, $ev->{y});	883	my ($ox, $oy) = ($ev->{x}, $ev->{y});
776	my ($bx, $by) = ($self->{x}, $self->{y});	884	my ($bx, $by) = ($self->{x}, $self->{y});
777		885
778	$self->{motion} = sub {	886	$self->{motion} = sub {
779	my ($ev, $x, $y) = @_;	887	my ($ev, $x, $y) = @_;
…		…
802	my ($self) = @_;	910	my ($self) = @_;
803		911
804	my ($w, $h ) = ($self->{w}, $self->{h});	912	my ($w, $h ) = ($self->{w}, $self->{h});
805	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	913	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
806		914
807	glEnable GL_BLEND;
808	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809	glEnable GL_TEXTURE_2D;	915	glEnable GL_TEXTURE_2D;
810	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	916	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
811		917
812	my $border = $self->border;	918	my $border = $self->border;
813		919
814	glColor @{ $self->{border_bg} };	920	glColor @{ $self->{border_bg} };
815	$tex[1]->draw_quad (0, 0, $w, $border);	921	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
816	$tex[3]->draw_quad (0, $border, $border, $ch);	922	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
817	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	923	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
818	$tex[4]->draw_quad (0, $h - $border, $w, $border);	924	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
819		925
		926	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
820	my $bg = $tex[0];	927	my $bg = $tex[0];
821		928
822	# TODO: repeat texture not scale	929	# TODO: repeat texture not scale
823	my $rep_x = $cw / $bg->{w};	930	my $rep_x = $cw / $bg->{w};
824	my $rep_y = $ch / $bg->{h};	931	my $rep_y = $ch / $bg->{h};
825		932
826	glColor @{ $self->{bg} };	933	glColor @{ $self->{bg} };
827		934
828	$bg->{s} = $rep_x;	935	$bg->{s} = $rep_x;
829	$bg->{t} = $rep_y;	936	$bg->{t} = $rep_y;
830	$bg->{wrap_mode} = 1;	937	$bg->{wrap_mode} = 1;
831	$bg->draw_quad ($border, $border, $cw, $ch);	938	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		939	}
832		940
833	glDisable GL_TEXTURE_2D;	941	glDisable GL_TEXTURE_2D;
834	glDisable GL_BLEND;
835		942
836	$self->{title}->draw if $self->{title};	943	$self->{title}->draw if $self->{title};
		944
837	$self->child->draw;	945	$self->child->draw;
838	}	946	}
839		947
840	#############################################################################	948	#############################################################################
841		949
…		…
863	$self->{children}[$y][$x] = $child;	971	$self->{children}[$y][$x] = $child;
864		972
865	$child->check_size;	973	$child->check_size;
866	}	974	}
867		975
		976	sub children {
		977	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		978	}
		979
868	# TODO: move to container class maybe? send childs a signal on removal?	980	# TODO: move to container class maybe? send childs a signal on removal?
869	sub clear {	981	sub clear {
870	my ($self) = @_;	982	my ($self) = @_;
871		983
		984	my @children = $self->children;
872	delete $self->{children};	985	delete $self->{children};
		986
		987	for (@children) {
		988	delete $_->{parent};
		989	$_->hide;
		990	}
		991
873	$self->update;	992	$self->update;
874	}	993	}
875		994
876	sub get_wh {	995	sub get_wh {
877	my ($self) = @_;	996	my ($self) = @_;
…		…
1054	}	1173	}
1055		1174
1056	sub size_allocate {	1175	sub size_allocate {
1057	my ($self, $w, $h) = @_;	1176	my ($self, $w, $h) = @_;
1058		1177
		1178	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1179
1059	my $children = $self->{children};	1180	my $children = $self->{children};
1060		1181
1061	my @h = map $_->{req_h}, @$children;	1182	my @h = map $_->{req_h}, @$children;
1062		1183
1063	my $req_h = List::Util::sum @h;	1184	my $req_h = List::Util::sum @h;
…		…
1100		1221
1101	sub new {	1222	sub new {
1102	my ($class, %arg) = @_;	1223	my ($class, %arg) = @_;
1103		1224
1104	my $self = $class->SUPER::new (	1225	my $self = $class->SUPER::new (
1105	fg => [1, 1, 1],	1226	fg => [1, 1, 1],
1106	#font => default_font	1227	#font => default_font
		1228	#text => initial text
		1229	#markup => initial narkup
		1230	layout => (new CFClient::Layout),
1107	fontsize => 1,	1231	fontsize => 1,
1108	text => "",
1109	align => -1,	1232	align => -1,
1110	valign => -1,	1233	valign => -1,
1111	padding => 2,	1234	padding => 2,
1112	layout => new CFClient::Layout,
1113	can_events => 0,	1235	can_events => 0,
1114	%arg	1236	%arg
1115	);	1237	);
1116		1238
1117	if (exists $self->{template}) {	1239	if (exists $self->{template}) {
1118	my $layout = new CFClient::Layout;	1240	my $layout = new CFClient::Layout;
1119	$layout->set_text (delete $self->{template});	1241	$layout->set_text (delete $self->{template});
1120	$self->{template} = $layout;	1242	$self->{template} = $layout;
1121	}	1243	}
1122		1244
1123	$self->set_text (delete $self->{text}) if exists $self->{text};	1245	if (exists $self->{markup}) {
1124	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1246	$self->set_markup (delete $self->{markup});
		1247	} else {
		1248	$self->set_text (delete $self->{text});
		1249	}
1125		1250
1126	$self	1251	$self
1127	}	1252	}
1128		1253
1129	sub escape_text {	1254	sub escape {
1130	local $_ = $_[1];	1255	local $_ = $_[1];
1131		1256
1132	s/&/&amp;/g;	1257	s/&/&amp;/g;
1133	s/>/&gt;/g;	1258	s/>/&gt;/g;
1134	s/</&lt;/g;	1259	s/</&lt;/g;
1135		1260
1136	$_[1]	1261	$_[1]
1137	}	1262	}
1138		1263
		1264	sub update {
		1265	my ($self) = @_;
		1266
		1267	delete $self->{texture};
		1268	$self->SUPER::update;
		1269	}
		1270
1139	sub set_text {	1271	sub set_text {
1140	my ($self, $text) = @_;	1272	my ($self, $text) = @_;
1141		1273
		1274	return if $self->{text} eq "T$text";
		1275	$self->{text} = "T$text";
		1276
		1277	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1142	$self->{layout}->set_text ($text);	1278	$self->{layout}->set_text ($text);
1143		1279
1144	delete $self->{texture};	1280	$self->update;
1145	$self->check_size;	1281	$self->check_size;
1146	$self->update;
1147	}	1282	}
1148		1283
1149	sub set_markup {	1284	sub set_markup {
1150	my ($self, $markup) = @_;	1285	my ($self, $markup) = @_;
1151		1286
		1287	return if $self->{text} eq "M$markup";
		1288	$self->{text} = "M$markup";
		1289
		1290	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1291
		1292	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1152	$self->{layout}->set_markup ($markup);	1293	$self->{layout}->set_markup ($markup);
1153		1294
1154	delete $self->{texture};	1295	$self->update;
1155	$self->check_size;	1296	$self->check_size;
1156	$self->update;
1157	}	1297	}
1158		1298
1159	sub size_request {	1299	sub size_request {
1160	my ($self) = @_;	1300	my ($self) = @_;
1161		1301
…		…
1190	sub set_fontsize {	1330	sub set_fontsize {
1191	my ($self, $fontsize) = @_;	1331	my ($self, $fontsize) = @_;
1192		1332
1193	$self->{fontsize} = $fontsize;	1333	$self->{fontsize} = $fontsize;
1194	delete $self->{texture};	1334	delete $self->{texture};
		1335
		1336	$self->update;
1195	$self->check_size;	1337	$self->check_size;
1196	$self->update;
1197	}	1338	}
1198		1339
1199	sub _draw {	1340	sub _draw {
1200	my ($self) = @_;	1341	my ($self) = @_;
1201		1342
1202	my $tex = $self->{texture} ||= do {	1343	my $tex = $self->{texture} ||= do {
		1344	$self->{layout}->set_foreground (@{$self->{fg}});
1203	$self->{layout}->set_font ($self->{font}) if $self->{font};	1345	$self->{layout}->set_font ($self->{font}) if $self->{font};
1204	$self->{layout}->set_width ($self->{w});	1346	$self->{layout}->set_width ($self->{w});
1205	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1347	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
		1348
1206	new_from_layout CFClient::Texture $self->{layout}	1349	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1350
		1351	$self->{ox} = int $self->{align} < 0 ? $self->{padding}
		1352	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1353	: ($self->{w} - $tex->{w}) * 0.5;
		1354
		1355	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}
		1356	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1357	: ($self->{h} - $tex->{h}) * 0.5;
		1358
		1359	$tex
1207	};	1360	};
1208		1361
1209	glEnable GL_BLEND;
1210	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1211	glEnable GL_TEXTURE_2D;	1362	glEnable GL_TEXTURE_2D;
1212	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1363	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1213		1364
		1365	if ($tex->{format} == GL_ALPHA) {
1214	glColor @{$self->{fg}};	1366	glColor @{$self->{fg}};
1215
1216	$self->{ox} = int (
1217	$self->{align} < 0 ? $self->{padding}
1218	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1219	: ($self->{w} - $tex->{w}) * 0.5
1220	);
1221
1222	$self->{oy} = int (
1223	$self->{valign} < 0 ? $self->{padding}
1224	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1225	: ($self->{h} - $tex->{h}) * 0.5
1226	);
1227
1228	$tex->draw_quad ($self->{ox}, $self->{oy});	1367	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1368	} else {
		1369	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1370	}
1229		1371
1230	glDisable GL_TEXTURE_2D;	1372	glDisable GL_TEXTURE_2D;
1231	glDisable GL_BLEND;
1232	}	1373	}
1233		1374
1234	#############################################################################	1375	#############################################################################
1235		1376
1236	package CFClient::UI::EntryBase;	1377	package CFClient::UI::EntryBase;
…		…
1241		1382
1242	sub new {	1383	sub new {
1243	my $class = shift;	1384	my $class = shift;
1244		1385
1245	$class->SUPER::new (	1386	$class->SUPER::new (
1246	fg => [1, 1, 1],	1387	fg => [1, 1, 1],
1247	bg => [0, 0, 0, 0.2],	1388	bg => [0, 0, 0, 0.2],
1248	active_bg => [1, 1, 1, 0.5],	1389	active_bg => [1, 1, 1, 0.5],
1249	active_fg => [0, 0, 0],	1390	active_fg => [0, 0, 0],
1250	can_hover => 1,	1391	can_hover => 1,
1251	can_focus => 1,	1392	can_focus => 1,
1252	valign => 0,	1393	valign => 0,
1253	can_events => 1,	1394	can_events => 1,
1254	@_	1395	@_
1255	)	1396	)
1256	}	1397	}
1257		1398
…		…
1271	$self->{layout}->set_text ("$text ");	1412	$self->{layout}->set_text ("$text ");
1272		1413
1273	$self->emit (changed => $self->{text});	1414	$self->emit (changed => $self->{text});
1274	}	1415	}
1275		1416
		1417	sub set_text {
		1418	my ($self, $text) = @_;
		1419
		1420	$self->{cursor} = length $text;
		1421	$self->_set_text ($text);
		1422	$self->check_size;
		1423	$self->update;
		1424	}
		1425
1276	sub get_text {	1426	sub get_text {
1277	$_[0]{text}	1427	$_[0]{text}
1278	}	1428	}
1279		1429
1280	sub size_request {	1430	sub size_request {
…		…
1287		1437
1288	sub size_allocate {	1438	sub size_allocate {
1289	my ($self, $w, $h) = @_;	1439	my ($self, $w, $h) = @_;
1290		1440
1291	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text	1441	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1292	}
1293
1294	sub set_text {
1295	my ($self, $text) = @_;
1296
1297	$self->{cursor} = length $text;
1298	$self->_set_text ($text);
1299	$self->update;
1300	}	1442	}
1301		1443
1302	sub key_down {	1444	sub key_down {
1303	my ($self, $ev) = @_;	1445	my ($self, $ev) = @_;
1304		1446
…		…
1411	my ($self, $ev) = @_;	1553	my ($self, $ev) = @_;
1412		1554
1413	my $sym = $ev->{sym};	1555	my $sym = $ev->{sym};
1414		1556
1415	if ($sym == 13) {	1557	if ($sym == 13) {
		1558	unshift @{$self->{history}},
		1559	my $txt = $self->get_text;
		1560	$self->{history_pointer} = -1;
		1561	$self->{history_saveback} = '';
1416	$self->emit (activate => $self->get_text);	1562	$self->emit (activate => $txt);
1417	$self->update;	1563	$self->update;
		1564
		1565	} elsif ($sym == CFClient::SDLK_UP) {
		1566	if ($self->{history_pointer} < 0) {
		1567	$self->{history_saveback} = $self->get_text;
		1568	}
		1569	if (@{$self->{history} || []} > 0) {
		1570	$self->{history_pointer}++;
		1571	if ($self->{history_pointer} >= @{$self->{history} || []}) {
		1572	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1573	}
		1574	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1575	}
		1576
		1577	} elsif ($sym == CFClient::SDLK_DOWN) {
		1578	$self->{history_pointer}--;
		1579	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1580
		1581	if ($self->{history_pointer} >= 0) {
		1582	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1583	} else {
		1584	$self->set_text ($self->{history_saveback});
		1585	}
1418		1586
1419	} else {	1587	} else {
1420	$self->SUPER::key_down ($ev);	1588	$self->SUPER::key_down ($ev);
1421	}	1589	}
1422		1590
…		…
1436		1604
1437	sub new {	1605	sub new {
1438	my $class = shift;	1606	my $class = shift;
1439		1607
1440	$class->SUPER::new (	1608	$class->SUPER::new (
1441	padding => 4,	1609	padding => 4,
1442	fg => [1, 1, 1],	1610	fg => [1, 1, 1],
1443	bg => [1, 1, 1, 0.2],	1611	bg => [1, 1, 1, 0.2],
1444	active_fg => [0, 0, 1],	1612	active_fg => [0, 0, 1],
1445	can_hover => 1,	1613	can_hover => 1,
1446	align => 0,	1614	align => 0,
1447	valign => 0,	1615	valign => 0,
1448	can_events => 1,	1616	can_events => 1,
1449	@_	1617	@_
1450	)	1618	)
1451	}	1619	}
1452		1620
…		…
1466		1634
1467	if ($GRAB == $self) {	1635	if ($GRAB == $self) {
1468	$self->{fg} = $self->{active_fg};	1636	$self->{fg} = $self->{active_fg};
1469	}	1637	}
1470		1638
1471	glEnable GL_BLEND;
1472	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1473	glEnable GL_TEXTURE_2D;	1639	glEnable GL_TEXTURE_2D;
1474	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1640	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1475	glColor 0, 0, 0, 1;	1641	glColor 0, 0, 0, 1;
1476		1642
1477	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1643	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1478		1644
1479	glDisable GL_TEXTURE_2D;	1645	glDisable GL_TEXTURE_2D;
1480	glDisable GL_BLEND;
1481		1646
1482	$self->SUPER::_draw;	1647	$self->SUPER::_draw;
1483	}	1648	}
1484		1649
1485	#############################################################################	1650	#############################################################################
…		…
1532		1697
1533	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1698	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1534		1699
1535	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1700	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1536		1701
1537	glEnable GL_BLEND;	1702	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1703
1538	glEnable GL_TEXTURE_2D;	1704	glEnable GL_TEXTURE_2D;
1539	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1540
1541	my $tex = $self->{state} ? $tex[1] : $tex[0];
1542
1543	$tex->draw_quad (0, 0, $s, $s);	1705	$tex->draw_quad_alpha (0, 0, $s, $s);
1544
1545	glDisable GL_TEXTURE_2D;	1706	glDisable GL_TEXTURE_2D;
1546	glDisable GL_BLEND;
1547	}	1707	}
1548		1708
1549	#############################################################################	1709	#############################################################################
1550		1710
1551	package CFClient::UI::Image;	1711	package CFClient::UI::Image;
…		…
1594	glTranslate 0, -$self->{w}, 0;	1754	glTranslate 0, -$self->{w}, 0;
1595		1755
1596	($w, $h) = ($h, $w);	1756	($w, $h) = ($h, $w);
1597	}	1757	}
1598		1758
1599	glEnable GL_BLEND;
1600	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1601	glEnable GL_TEXTURE_2D;	1759	glEnable GL_TEXTURE_2D;
1602	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1760	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1603		1761
1604	$tex->draw_quad (0, 0, $w, $h);	1762	$tex->draw_quad_alpha (0, 0, $w, $h);
1605		1763
1606	glDisable GL_BLEND;
1607	glDisable GL_TEXTURE_2D;	1764	glDisable GL_TEXTURE_2D;
1608	}	1765	}
1609		1766
1610	#############################################################################	1767	#############################################################################
1611		1768
…		…
1659	}	1816	}
1660		1817
1661	sub set_max {	1818	sub set_max {
1662	my ($self, $max) = @_;	1819	my ($self, $max) = @_;
1663		1820
		1821	return if $self->{max_val} == $max;
		1822
1664	$self->{max_val} = $max;	1823	$self->{max_val} = $max;
		1824	$self->update;
1665	}	1825	}
1666		1826
1667	sub set_value {	1827	sub set_value {
1668	my ($self, $val, $max) = @_;	1828	my ($self, $val, $max) = @_;
1669		1829
1670	$self->set_max ($max)	1830	$self->set_max ($max)
1671	if defined $max;	1831	if defined $max;
1672		1832
1673	$max = $self->{max_val};	1833	return if $self->{val} == $val;
		1834
1674	$self->{val} = $val;	1835	$self->{val} = $val;
1675
1676	$self->update;	1836	$self->update;
1677	}	1837	}
1678		1838
1679	sub _draw {	1839	sub _draw {
1680	my ($self) = @_;	1840	my ($self) = @_;
…		…
1743		1903
1744	sub new {	1904	sub new {
1745	my ($class, %arg) = @_;	1905	my ($class, %arg) = @_;
1746		1906
1747	my $self = $class->SUPER::new (	1907	my $self = $class->SUPER::new (
1748	tooltip => $arg{type},	1908	tooltip => $arg{type},
		1909	can_hover => 1,
		1910	can_events => 1,
1749	%arg,	1911	%arg,
1750	);	1912	);
1751		1913
1752	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1);	1914	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1753	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1);	1915	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1754	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1);	1916	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1755		1917
1756	$self	1918	$self
1757	}	1919	}
1758		1920
1759	sub set_fontsize {	1921	sub set_fontsize {
…		…
1761		1923
1762	$self->{value}->set_fontsize ($fsize);	1924	$self->{value}->set_fontsize ($fsize);
1763	$self->{max} ->set_fontsize ($fsize);	1925	$self->{max} ->set_fontsize ($fsize);
1764	}	1926	}
1765		1927
		1928	sub set_max {
		1929	my ($self, $max) = @_;
		1930
		1931	$self->{gauge}->set_max ($max);
		1932	$self->{max}->set_text ($max);
		1933	}
		1934
1766	sub set_value {	1935	sub set_value {
1767	my ($self, $val, $max) = @_;	1936	my ($self, $val, $max) = @_;
1768		1937
1769	$self->set_max ($max)	1938	$self->set_max ($max)
1770	if defined $max;	1939	if defined $max;
1771		1940
1772	$self->{gauge}->set_value ($val, $max);	1941	$self->{gauge}->set_value ($val, $max);
1773	$self->{value}->set_text ($val);	1942	$self->{value}->set_text ($val);
1774	}
1775
1776	sub set_max {
1777	my ($self, $max) = @_;
1778
1779	$self->{gauge}->set_max ($max);
1780	$self->{max}->set_text ($max);
1781	}	1943	}
1782		1944
1783	#############################################################################	1945	#############################################################################
1784		1946
1785	package CFClient::UI::Slider;	1947	package CFClient::UI::Slider;
…		…
1804	# TODO: calculations are off	1966	# TODO: calculations are off
1805	my $self = $class->SUPER::new (	1967	my $self = $class->SUPER::new (
1806	fg => [1, 1, 1],	1968	fg => [1, 1, 1],
1807	active_fg => [0, 0, 0],	1969	active_fg => [0, 0, 0],
1808	range => [0, 0, 100, 10],	1970	range => [0, 0, 100, 10],
1809	req_w => 20,	1971	req_w => $::WIDTH / 80,
1810	req_h => 20,	1972	req_h => $::WIDTH / 80,
1811	vertical => 0,	1973	vertical => 0,
1812	can_hover => 1,	1974	can_hover => 1,
1813	inner_pad => 5,	1975	inner_pad => 5,
1814	@_	1976	@_
1815	);	1977	);
…		…
1898	$page ||= 2;	2060	$page ||= 2;
1899		2061
1900	my $knob_a = $inner_pad_px + ($value - $page * 0.5);	2062	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1901	my $knob_b = $inner_pad_px + ($value + $page * 0.5);	2063	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1902		2064
1903	glEnable GL_BLEND;
1904	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1905	glEnable GL_TEXTURE_2D;	2065	glEnable GL_TEXTURE_2D;
1906	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2066	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907		2067
1908	# draw background	2068	# draw background
1909	$tex[1]->draw_quad (0, 0, $w, $h);	2069	$tex[1]->draw_quad_alpha (0, 0, $w, $h);
1910		2070
1911	# draw handle	2071	# draw handle
1912	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2072	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1913		2073
1914	glDisable GL_BLEND;
1915	glDisable GL_TEXTURE_2D;	2074	glDisable GL_TEXTURE_2D;
1916	}	2075	}
1917		2076
1918	#############################################################################	2077	#############################################################################
1919		2078
…		…
1925		2084
1926	sub new {	2085	sub new {
1927	my $class = shift;	2086	my $class = shift;
1928		2087
1929	my $self = $class->SUPER::new (	2088	my $self = $class->SUPER::new (
1930	fontsize => 1,	2089	fontsize => 1,
		2090	can_events => 0,
1931	#font => default_font	2091	#font => default_font
1932	@_,	2092	@_,
1933		2093
1934	layout => (new CFClient::Layout),	2094	layout => (new CFClient::Layout 1),
1935	par => [],	2095	par => [],
1936	height => 0,	2096	height => 0,
1937	children => [	2097	children => [
1938	(new CFClient::UI::Empty expand => 1),	2098	(new CFClient::UI::Empty expand => 1),
1939	(new CFClient::UI::Slider vertical => 1),	2099	(new CFClient::UI::Slider vertical => 1),
1940	],	2100	],
1941	);	2101	);
1942		2102
1943	$self->{children}[1]->connect (changed => sub {	2103	$self->{children}[1]->connect (changed => sub { $self->update });
1944	$self->update;
1945	});
1946		2104
1947	$self	2105	$self
1948	}	2106	}
1949		2107
1950	sub set_fontsize {	2108	sub set_fontsize {
…		…
1958	my ($self, $text) = @_;	2116	my ($self, $text) = @_;
1959		2117
1960	my $layout = $self->{layout};	2118	my $layout = $self->{layout};
1961		2119
1962	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2120	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1963	$layout->set_width ($self->{w});	2121	$layout->set_width ($self->{children}[0]{w});
1964	$layout->set_text ($text);	2122	$layout->set_markup ($text);
1965		2123
1966	($layout->size)[1]	2124	($layout->size)[1]
1967	}	2125	}
1968		2126
1969	sub reflow {	2127	sub reflow {
…		…
2021	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2179	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2022		2180
2023	delete $self->{texture};	2181	delete $self->{texture};
2024	}	2182	}
2025		2183
2026	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2184	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2027	glClearColor 0, 0, 0, 1;	2185	glClearColor 0, 0, 0, 0;
2028	glClear GL_COLOR_BUFFER_BIT;	2186	glClear GL_COLOR_BUFFER_BIT;
2029		2187
2030	glEnable GL_BLEND;
2031	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2032	glEnable GL_TEXTURE_2D;	2188	glEnable GL_TEXTURE_2D;
2033	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2189	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2034		2190
2035	my $top = int $self->{children}[1]{range}[0];	2191	my $top = int $self->{children}[1]{range}[0];
2036		2192
…		…
2045		2201
2046	for my $par (@{$self->{par}}) {	2202	for my $par (@{$self->{par}}) {
2047	my $h = $par->[0];	2203	my $h = $par->[0];
2048		2204
2049	if ($y0 < $y + $h && $y < $y1) {	2205	if ($y0 < $y + $h && $y < $y1) {
		2206	$layout->set_foreground (@{ $par->[1] });
2050	$layout->set_text ($par->[2]);	2207	$layout->set_markup ($par->[2]);
2051		2208
2052	glColor @{ $par->[1] };
2053	my ($W, $H) = $layout->size;	2209	my ($W, $H) = $layout->size;
2054	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2210	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2055	}	2211	}
2056		2212
2057	$y += $h;	2213	$y += $h;
2058	}	2214	}
2059		2215
2060	glDisable GL_TEXTURE_2D;	2216	glDisable GL_TEXTURE_2D;
2061	glDisable GL_BLEND;
2062	};	2217	};
2063	});	2218	});
2064	}	2219	}
2065		2220
2066	sub _draw {	2221	sub _draw {
2067	my ($self) = @_;	2222	my ($self) = @_;
2068		2223
2069	if ($self->{texture}) {
2070	glEnable GL_TEXTURE_2D;	2224	glEnable GL_TEXTURE_2D;
2071	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2225	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2226	glColor 1, 1, 1, 1;
		2227	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2073	glDisable GL_TEXTURE_2D;	2228	glDisable GL_TEXTURE_2D;
2074	}
2075		2229
2076	$self->{children}[1]->draw;	2230	$self->{children}[1]->draw;
2077		2231
2078	}	2232	}
2079		2233
…		…
2127		2281
2128	sub new {	2282	sub new {
2129	my $class = shift;	2283	my $class = shift;
2130		2284
2131	my $self = $class->SUPER::new (	2285	my $self = $class->SUPER::new (
2132	state => 0,	2286	state => 0,
2133	connect_activate => \&toggle_flopper,	2287	connect_activate => \&toggle_flopper,
2134	can_events => 1,
2135	@_	2288	@_
2136	);	2289	);
2137		2290
2138	if ($self->{state}) {	2291	if ($self->{state}) {
2139	$self->{state} = 0;	2292	$self->{state} = 0;
…		…
2174	@_,	2327	@_,
2175	can_events => 0,	2328	can_events => 0,
2176	)	2329	)
2177	}	2330	}
2178		2331
2179	sub set_text {	2332	sub set_tooltip_from {
2180	my ($self, $text) = @_;	2333	my ($self, $widget) = @_;
2181		2334
2182	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2335	$self->add (new CFClient::UI::Label
2183	$self->{label}->set_text ($text);	2336	markup => $widget->{tooltip},
2184	$self->add ($self->{label});	2337	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2338	fontsize => 0.8,
		2339	fg => [0, 0, 0, 1],
		2340	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2341	);
2185	}	2342	}
2186		2343
2187	sub size_request {	2344	sub size_request {
2188	my ($self) = @_;	2345	my ($self) = @_;
2189		2346
2190	$self->child->set_max_size ($::WIDTH * 0.2);
2191
2192	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2347	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2193		2348
2194	($w + 4, $h + 4)	2349	($w + 4, $h + 4)
2195	}	2350	}
2196		2351
		2352	sub size_allocate {
		2353	my ($self, $w, $h) = @_;
		2354
		2355	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2356	}
		2357
2197	sub _draw {	2358	sub _draw {
2198	my ($self) = @_;	2359	my ($self) = @_;
2199		2360
2200	glPushMatrix;
2201	glTranslate 0.375, 0.375;	2361	glTranslate 0.375, 0.375;
2202		2362
2203	my ($w, $h) = @$self{qw(w h)};	2363	my ($w, $h) = @$self{qw(w h)};
2204		2364
2205	glColor 1, 0.8, 0.4;	2365	glColor 1, 0.8, 0.4;
…		…
2216	glVertex 0 , $h;	2376	glVertex 0 , $h;
2217	glVertex $w, $h;	2377	glVertex $w, $h;
2218	glVertex $w, 0;	2378	glVertex $w, 0;
2219	glEnd;	2379	glEnd;
2220		2380
2221	glPopMatrix;	2381	glTranslate 2 - 0.375, 2 - 0.375;
2222
2223	glTranslate 2, 2;
2224	$self->SUPER::_draw;	2382	$self->SUPER::_draw;
2225	}	2383	}
2226		2384
2227	#############################################################################	2385	#############################################################################
2228		2386
		2387	package CFClient::UI::Face;
		2388
		2389	our @ISA = CFClient::UI::Base::;
		2390
		2391	use CFClient::OpenGL;
		2392
		2393	sub new {
		2394	my $class = shift;
		2395
		2396	$class->SUPER::new (
		2397	aspect => 1,
		2398	@_,
		2399	)
		2400	}
		2401
		2402	sub size_request {
		2403	(32, 8)
		2404	}
		2405
		2406	sub _draw {
		2407	my ($self) = @_;
		2408
		2409	return unless $::CONN;#d# manage and cache textures differently
		2410	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
		2411
		2412	# TODO animation
		2413	if ($tex) {
		2414	glEnable GL_TEXTURE_2D;
		2415	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2416	glColor 1, 1, 1, 1;
		2417	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2418	glDisable GL_TEXTURE_2D;
		2419	}
		2420	}
		2421
		2422	#############################################################################
		2423
		2424	package CFClient::UI::InventoryItem;
		2425
		2426	our @ISA = CFClient::UI::HBox::;
		2427
		2428	sub new {
		2429	my $class = shift;
		2430
		2431	my %args = @_;
		2432
		2433	my $item = delete $args{item};
		2434
		2435	my $desc = $item->{nrof} < 2
		2436	? $item->{name}
		2437	: "$item->{nrof} $item->{name_pl}";
		2438
		2439
		2440	my $self = $class->SUPER::new (
		2441	can_hover => 1,
		2442	can_events => 1,
		2443	tooltip => (CFClient::UI::Label->escape ($desc)
		2444	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2445	connect_button_down => sub {
		2446	my ($self, $ev, $x, $y) = @_;
		2447
		2448	# todo: maybe put examine on 1? but should just be a tooltip :(
		2449	if ($ev->{button} == 1) {
		2450	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2451	} elsif ($ev->{button} == 2) {
		2452	$::CONN->send ("apply $item->{tag}");
		2453	} elsif ($ev->{button} == 3) {
		2454	CFClient::UI::Menu->new (
		2455	items => [
		2456	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2457	[
		2458	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2459	sub { $::CONN->send ("lock $item->{tag}") },
		2460	],
		2461	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2462	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2463	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
		2464	],
		2465	)->popup ($ev);
		2466	}
		2467
		2468	1
		2469	},
		2470	%args
		2471	);
		2472
		2473	$self->add (new CFClient::UI::Face
		2474	can_events => 0,
		2475	face => $item->{face},
		2476	anim => $item->{anim},
		2477	animspeed => $item->{animspeed},
		2478	);
		2479
		2480	$self->add (new CFClient::UI::Label
		2481	can_events => 0,
		2482	text => $desc,
		2483	);
		2484
		2485	$self
		2486	}
		2487
		2488	#############################################################################
		2489
		2490	package CFClient::UI::Inventory;
		2491
		2492	our @ISA = CFClient::UI::ScrolledWindow::;
		2493
		2494	sub new {
		2495	my $class = shift;
		2496
		2497	my $self = $class->SUPER::new (
		2498	scrolled => (new CFClient::UI::VBox),
		2499	@_,
		2500	);
		2501
		2502	$self
		2503	}
		2504
		2505	sub set_items {
		2506	my ($self, $items) = @_;
		2507
		2508	$self->{scrolled}->clear;
		2509	return unless $items;
		2510
		2511	my @items = sort { $a->{type} <=> $b->{type} } @$items;
		2512
		2513	$self->{real_items} = \@items;
		2514
		2515	for my $item (@items) {
		2516	my $desc = $item->{nrof} < 2
		2517	? $item->{name}
		2518	: "$item->{nrof} $item->{name_pl}";
		2519
		2520	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
		2521	}
		2522
		2523	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2524	}
		2525
		2526	sub size_request {
		2527	my ($self) = @_;
		2528	($self->{req_w}, $self->{req_h});
		2529	}
		2530
		2531	#############################################################################
		2532
		2533	package CFClient::UI::Menu;
		2534
		2535	our @ISA = CFClient::UI::FancyFrame::;
		2536
		2537	use CFClient::OpenGL;
		2538
		2539	sub new {
		2540	my $class = shift;
		2541
		2542	my $self = $class->SUPER::new (
		2543	items => [],
		2544	z => 100,
		2545	@_,
		2546	);
		2547
		2548	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2549
		2550	for my $item (@{ $self->{items} }) {
		2551	my ($widget, $cb) = @$item;
		2552
		2553	# handle various types of items, only text for now
		2554	if (!ref $widget) {
		2555	$widget = new CFClient::UI::Label
		2556	can_hover => 1,
		2557	can_events => 1,
		2558	text => $widget;
		2559	}
		2560
		2561	$self->{item}{$widget} = $item;
		2562
		2563	$self->{vbox}->add ($widget);
		2564	}
		2565
		2566	$self
		2567	}
		2568
		2569	# popup given the event (must be a mouse button down event currently)
		2570	sub popup {
		2571	my ($self, $ev) = @_;
		2572
		2573	$self->emit ("popdown");
		2574
		2575	# maybe save $GRAB? must be careful about events...
		2576	$GRAB = $self;
		2577	$self->{button} = $ev->{button};
		2578
		2579	$self->show;
		2580	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2581	}
		2582
		2583	sub mouse_motion {
		2584	my ($self, $ev, $x, $y) = @_;
		2585
		2586	# TODO: should use vbox->find_widget or so
		2587	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2588	$self->{hover} = $self->{item}{$HOVER};
		2589	}
		2590
		2591	sub button_up {
		2592	my ($self, $ev, $x, $y) = @_;
		2593
		2594	if ($ev->{button} == $self->{button}) {
		2595	undef $GRAB;
		2596	$self->hide;
		2597
		2598	$self->emit ("popdown");
		2599	$self->{hover}[1]->() if $self->{hover};
		2600	}
		2601	}
		2602
		2603	#############################################################################
		2604
		2605	package CFClient::UI::Statusbox;
		2606
		2607	our @ISA = CFClient::UI::VBox::;
		2608
		2609	sub reorder {
		2610	my ($self) = @_;
		2611	my $NOW = time;
		2612
		2613	while (my ($k, $v) = each %{ $self->{item} }) {
		2614	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2615	}
		2616
		2617	my @widgets;
		2618
		2619	my @items = sort {
		2620	$a->{pri} <=> $b->{pri}
		2621	or $b->{id} <=> $a->{id}
		2622	} values %{ $self->{item} };
		2623
		2624	my $count = 10 + 1;
		2625	for my $item (@items) {
		2626	last unless --$count;
		2627
		2628	push @widgets, $item->{label} ||= do {
		2629	# TODO: doesn't handle markup well (read as: at all)
		2630	my $short = $item->{count} > 1
		2631	? "<b>$item->{count} ×</b> $item->{text}"
		2632	: $item->{text};
		2633
		2634	for ($short) {
		2635	s/^\s+//;
		2636	s/\012.*/…/s;
		2637	my $len = int 30 / $item->{fontsize};
		2638	substr $_, $len, length, "…" if $len < length;
		2639	}
		2640
		2641	new CFClient::UI::Label
		2642	markup => $short,
		2643	tooltip => $item->{tooltip},
		2644	tooltip_font => $::FONT_PROP,
		2645	tooltip_width => 0.67,
		2646	fontsize => $item->{fontsize},
		2647	color => $item->{color},
		2648	can_events => 1,
		2649	can_hover => 1
		2650	};
		2651	}
		2652
		2653	$self->clear;
		2654	$self->SUPER::add (reverse @widgets);
		2655	}
		2656
		2657	sub add {
		2658	my ($self, $text, %arg) = @_;
		2659
		2660	my $timeout = time + ((delete $arg{timeout}) || 60);
		2661
		2662	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2663
		2664	if (my $item = $self->{item}{$group}) {
		2665	if ($item->{text} eq $text) {
		2666	$item->{count}++;
		2667	} else {
		2668	$item->{count} = 1;
		2669	$item->{text} = $item->{tooltip} = $text;
		2670	}
		2671	$item->{timeout} = $timeout;
		2672	delete $item->{label};
		2673	} else {
		2674	$self->{item}{$group} = {
		2675	id => ++$self->{id},
		2676	text => $text,
		2677	timeout => $timeout,
		2678	tooltip => $text,
		2679	fontsize => 0.8,
		2680	color => [0.8, 0.8, 0.8, 0.8],
		2681	pri => 0,
		2682	count => 1,
		2683	%arg,
		2684	};
		2685	}
		2686
		2687	$self->reorder;
		2688	}
		2689
		2690	#############################################################################
		2691
2229	package CFClient::UI::Root;	2692	package CFClient::UI::Root;
2230		2693
2231	our @ISA = CFClient::UI::Container::;	2694	our @ISA = CFClient::UI::Container::;
2232		2695
2233	use CFClient::OpenGL;	2696	use CFClient::OpenGL;
2234		2697
2235	sub check_size {	2698	sub new {
2236	my ($self) = @_;	2699	my $class = shift;
2237		2700
2238	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2701	$class->SUPER::new (
2239	}	2702	@_,
2240		2703	)
2241	sub size_request {
2242	($::WIDTH, $::HEIGHT)
2243	}	2704	}
2244		2705
2245	sub configure {	2706	sub configure {
2246	my ($self, $x, $y, $w, $h) = @_;	2707	my ($self, $x, $y, $w, $h) = @_;
2247		2708
2248	$self->SUPER::configure ($x, $y, $w, $h);	2709	$self->{w} = $w;
		2710	$self->{h} = $h;
		2711	}
2249		2712
		2713	sub check_size {
		2714	my ($self) = @_;
		2715
		2716	$self->size_allocate ($self->{w}, $self->{h})
		2717	if $self->{w};
		2718	}
		2719
		2720	sub size_request {
		2721	my ($self) = @_;
		2722
		2723	($self->{w}, $self->{h})
		2724	}
		2725
		2726	sub size_allocate {
		2727	my ($self, $w, $h) = @_;
		2728
		2729	my $old_w = $self->{old_w};
		2730	my $old_h = $self->{old_h};
		2731
		2732	if ($old_w && $old_h) {
		2733	for my $child ($self->children) {
		2734	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
		2735	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
		2736	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
		2737	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
		2738	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
		2739	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
		2740	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
		2741	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
		2742	}
		2743	}
		2744
2250	for my $child (@{$self->{children}}) {	2745	for my $child ($self->children) {
2251	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2746	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2252		2747
2253	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2748	$X = List::Util::max 0, List::Util::min $w - $W, $X;
2254	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2749	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2255	$child->configure ($X, $Y, $W,$H);	2750	$child->configure ($X, $Y, $W, $H);
2256	}	2751	}
2257	}
2258		2752
2259	sub _topleft {	2753	$self->{old_w} = $w;
		2754	$self->{old_h} = $h;
		2755	}
		2756
		2757	sub coord2local {
2260	my ($self, $x, $y) = @_;	2758	my ($self, $x, $y) = @_;
2261		2759
2262	($x, $y)	2760	($x, $y)
2263	}	2761	}
2264		2762
		2763	sub coord2global {
		2764	my ($self, $x, $y) = @_;
		2765
		2766	($x, $y)
		2767	}
		2768
2265	sub update {	2769	sub update {
2266	my ($self) = @_;	2770	my ($self) = @_;
2267		2771
2268	$self->check_size;	2772	$self->check_size;
2269	::refresh ();	2773	$::WANT_REFRESH++;
2270	}	2774	}
2271		2775
2272	sub add {	2776	sub add {
2273	my ($self, $child) = @_;	2777	my ($self, $child) = @_;
2274		2778
2275	# integerize window positions	2779	# integerise window positions
2276	$child->{x} = int $child->{x};	2780	$child->{x} = int $child->{x};
2277	$child->{y} = int $child->{y};	2781	$child->{y} = int $child->{y};
2278		2782
2279	$self->SUPER::add ($child);	2783	$self->SUPER::add ($child);
2280	}	2784	}
…		…
2283	my ($self, $id, $cb) = @_;	2787	my ($self, $id, $cb) = @_;
2284		2788
2285	$self->{refresh_hook}{$id} = $cb;	2789	$self->{refresh_hook}{$id} = $cb;
2286	}	2790	}
2287		2791
2288	sub draw {	2792	sub draw {
2289	my ($self) = @_;	2793	my ($self) = @_;
2290		2794
		2795	if ($self->{check_size}) {
		2796	my @queue = ([], []);
		2797
		2798	for (;;) {
		2799	if ($self->{check_size}) {
		2800	# heuristic: check containers last
		2801	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2802	for values %{delete $self->{check_size}}
		2803	}
		2804
		2805	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		2806
		2807	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2808	? @$widget{qw(user_w user_h)}
		2809	: $widget->size_request;
		2810
		2811	if (delete $widget->{force_alloc}
		2812	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		2813	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		2814
		2815	$widget->{req_w} = $w;
		2816	$widget->{req_h} = $h;
		2817
		2818	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		2819
		2820	$widget->{parent}->check_size
		2821	if $widget->{parent};
		2822	}
		2823	}
		2824	}
		2825
		2826	while ($self->{size_alloc}) {
		2827	for (values %{delete $self->{size_alloc}}) {
		2828	my ($widget, $w, $h) = @$_;
		2829
		2830	$w = 0 if $w < 0;
		2831	$h = 0 if $h < 0;
		2832
		2833	$widget->{w} = $w;
		2834	$widget->{h} = $h;
		2835	$widget->size_allocate ($w, $h);
		2836	$widget->emit (size_allocate => $w, $h);
		2837	}
		2838	}
		2839
2291	while (my $rcb = delete $self->{refresh_hook}) {	2840	while ($self->{refresh_hook}) {
2292	$_->() for values %$rcb;	2841	$_->()
		2842	for values %{delete $self->{refresh_hook}};
2293	}	2843	}
2294		2844
2295	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2845	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2296	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2846	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2297	glClear GL_COLOR_BUFFER_BIT;	2847	glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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