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.159 by root, Mon Apr 24 03:19:42 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) {
…		…
160	}	181	}
161		182
162	sub hide {	183	sub hide {
163	my ($self) = @_;	184	my ($self) = @_;
164		185
165	return unless $self->{parent};	186	undef $GRAB if $GRAB == $self;
		187	undef $HOVER if $HOVER == $self;
166		188
167	$self->{parent}->remove ($self);	189	$self->{parent}->remove ($self)
		190	if $self->{parent};
168	}	191	}
169		192
170	sub move {	193	sub move {
171	my ($self, $x, $y, $z) = @_;	194	my ($self, $x, $y, $z) = @_;
172		195
…		…
211	$self->{y} = $y;	234	$self->{y} = $y;
212	$self->update;	235	$self->update;
213	}	236	}
214		237
215	if ($self->{w} != $w || $self->{h} != $h) {	238	if ($self->{w} != $w || $self->{h} != $h) {
216	$self->{w} = $w;	239	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
217	$self->{h} = $h;
218
219	$self->size_allocate ($w, $h);
220	$self->update;
221	}	240	}
222	}	241	}
223		242
224	sub size_allocate {	243	sub size_allocate {
225	# nothing to be done	244	# nothing to be done
226	}	245	}
227		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
228	sub set_max_size {	262	sub set_max_size {
229	my ($self, $w, $h) = @_;	263	my ($self, $w, $h) = @_;
230		264
231	delete $self->{max_w}; $self->{max_w} = $w if $w;	265	delete $self->{max_w}; $self->{max_w} = $w if $w;
232	delete $self->{max_h}; $self->{max_h} = $h if $h;	266	delete $self->{max_h}; $self->{max_h} = $h if $h;
233	}
234
235	# return top left coordinates
236	sub _topleft {
237	my ($self, $x, $y) = @_;
238
239	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
240	}	267	}
241		268
242	# translate global coordinates to local coordinate system	269	# translate global coordinates to local coordinate system
243	sub coord2local {	270	sub coord2local {
244	my ($self, $x, $y) = @_;	271	my ($self, $x, $y) = @_;
245		272
246	my ($X, $Y) = $self->_topleft;	273	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
247	($x - $X, $y - $Y)
248	}	274	}
249		275
250	# translate local coordinates to global coordinate system	276	# translate local coordinates to global coordinate system
251	sub coord2global {	277	sub coord2global {
252	my ($self, $x, $y) = @_;	278	my ($self, $x, $y) = @_;
253		279
254	my ($X, $Y) = $self->_topleft;	280	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
255	($x + $X, $y + $Y)
256	}	281	}
257		282
258	sub focus_in {	283	sub focus_in {
259	my ($self) = @_;	284	my ($self) = @_;
260		285
…		…
320	glVertex $x + $self->{w}, $y + $self->{h};	345	glVertex $x + $self->{w}, $y + $self->{h};
321	glVertex $x , $y + $self->{h};	346	glVertex $x , $y + $self->{h};
322	glEnd;	347	glEnd;
323	glDisable GL_BLEND;	348	glDisable GL_BLEND;
324	}	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	}
325	}	364	}
326		365
327	sub _draw {	366	sub _draw {
328	my ($self) = @_;	367	my ($self) = @_;
329		368
…		…
344		383
345	sub set_parent {	384	sub set_parent {
346	my ($self, $parent) = @_;	385	my ($self, $parent) = @_;
347		386
348	Scalar::Util::weaken ($self->{parent} = $parent);	387	Scalar::Util::weaken ($self->{parent} = $parent);
		388
		389	$self->check_size
		390	unless exists $self->{req_w};
349	}	391	}
350		392
351	sub check_size {	393	sub check_size {
352	my ($self) = @_;	394	my ($self, $forced) = @_;
353		395
354	$self->{parent}	396	$self->{force_alloc} = 1 if $forced;
355	or return 1;	397	$CFClient::UI::ROOT->{check_size}{$self} = $self;
356
357	my ($w, $h) = $self->{user_w} && $self->{user_h}
358	? @$self{qw(user_w user_h)}
359	: $self->size_request;
360
361	if ($w != $self->{req_w} || $h != $self->{req_h}) {
362	$self->{req_w} = $w;
363	$self->{req_h} = $h;
364
365	$self->{parent}->check_size
366	or $self->size_allocate (
367	(List::Util::max $self->{w}, $w),
368	(List::Util::max $self->{h}, $h),
369	);
370
371	1
372	} else {
373	0
374	}
375	}	398	}
376		399
377	sub update {	400	sub update {
378	my ($self) = @_;	401	my ($self) = @_;
379		402
…		…
388	}	411	}
389		412
390	sub emit {	413	sub emit {
391	my ($self, $signal, @args) = @_;	414	my ($self, $signal, @args) = @_;
392		415
393	for my $cb (@{$self->{signal_cb}{$signal} || []}) {	416	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
394	$cb->($self, @args);
395	}
396	}	417	}
397		418
398	sub DESTROY {	419	sub DESTROY {
399	my ($self) = @_;	420	my ($self) = @_;
400		421
…		…
467	sub new {	488	sub new {
468	my ($class, %arg) = @_;	489	my ($class, %arg) = @_;
469		490
470	my $children = delete $arg{children} || [];	491	my $children = delete $arg{children} || [];
471		492
472	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	);
473	$self->add ($_) for @$children;	498	$self->add ($_) for @$children;
474		499
475	$self	500	$self
476	}	501	}
477		502
478	sub add {	503	sub add {
479	my ($self, $child) = @_;	504	my ($self, @widgets) = @_;
480		505
481	$child->set_parent ($self);	506	$_->set_parent ($self)
		507	for @widgets;
482		508
483	use sort 'stable';	509	use sort 'stable';
484		510
485	$self->{children} = [	511	$self->{children} = [
486	sort { $a->{z} <=> $b->{z} }	512	sort { $a->{z} <=> $b->{z} }
487	@{$self->{children}}, $child	513	@{$self->{children}}, @widgets
488	];	514	];
489		515
490	$child->check_size;	516	$self->check_size (1);
		517	$self->update;
		518	}
		519
		520	sub children {
		521	@{ $_[0]{children} }
491	}	522	}
492		523
493	sub remove {	524	sub remove {
494	my ($self, $child) = @_;	525	my ($self, $child) = @_;
495		526
496	delete $child->{parent};	527	delete $child->{parent};
		528	$child->hide;
497		529
498	$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	}
499		546
500	$self->check_size;	547	$self->check_size;
501	$self->update;	548	$self->update;
502	}	549	}
503		550
…		…
581	}	628	}
582		629
583	sub update {	630	sub update {
584	my ($self) = @_;	631	my ($self) = @_;
585		632
586	# we want to do this delayed...	633	$ROOT->on_refresh ($self => sub { $self->render_child });
587	$self->render_chld;
588	$self->SUPER::update;	634	$self->SUPER::update;
589	}
590
591	sub render_chld {
592	my ($self) = @_;
593
594	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
595	glClearColor 0, 0, 0, 1;
596	glClear GL_COLOR_BUFFER_BIT;
597	$self->child->draw;
598	};
599	}	635	}
600		636
601	sub size_allocate {	637	sub size_allocate {
602	my ($self, $w, $h) = @_;	638	my ($self, $w, $h) = @_;
603		639
604	$self->child->configure (0, 0, $w, $h);	640	$self->SUPER::size_allocate ($w, $h);
		641	$self->update;
		642	}
605		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
606	$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	};
607	}	664	}
608		665
609	sub _draw {	666	sub _draw {
610	my ($self) = @_;	667	my ($self) = @_;
611		668
612	my ($w, $h) = ($self->w, $self->h);	669	my ($w, $h) = ($self->w, $self->h);
613		670
614	my $tex = $self->{texture}	671	my $tex = $self->{texture}
615	or return;	672	or return;
616		673
617	glEnable GL_BLEND;
618	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
619	glEnable GL_TEXTURE_2D;	674	glEnable GL_TEXTURE_2D;
620	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;
621		677
622	$tex->draw_quad (0, 0, $w, $h);	678	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
623		679
624	glDisable GL_BLEND;
625	glDisable GL_TEXTURE_2D;	680	glDisable GL_TEXTURE_2D;
626	}	681	}
627		682
628	#############################################################################	683	#############################################################################
629		684
630	package CFClient::UI::ViewPort;	685	package CFClient::UI::ViewPort;
631		686
632	our @ISA = CFClient::UI::Window::;	687	our @ISA = CFClient::UI::Window::;
633		688
634	sub new { die }
635
636	sub size_request {	689	sub size_request {
637	my ($self) = @_;	690	my ($self) = @_;
638		691
639	@$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)};
640	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	693	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
641		694
642	@$self{qw(child_w child_h)}	695	@$self{qw(child_w child_h)}
643	}	696	}
644		697
645	sub _draw {	698	sub size_allocate {
646	my ($self) = @_;	699	my ($self, $w, $h) = @_;
647		700
648	$self->{children}[1]->draw;	701	$self->update;
649	}	702	}
650		703
		704	sub set_offset {
		705	my ($self, $x, $y) = @_;
651		706
652	#############################################################################	707	$self->{view_x} = int $x;
		708	$self->{view_y} = int $y;
653		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
654	package CFClient::UI::Frame;	751	package CFClient::UI::ScrolledWindow;
655		752
656	our @ISA = CFClient::UI::Bin::;	753	our @ISA = CFClient::UI::HBox::;
657
658	use CFClient::OpenGL;
659		754
660	sub new {	755	sub new {
661	my $class = shift;	756	my $class = shift;
662		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
663	my $self = $class->SUPER::new (	768	$self = $class->SUPER::new (
664	bg => [1, 1, 1, 1],	769	vp => (new CFClient::UI::ViewPort),
665	border_bg => [1, 1, 1, 1],	770	slider => $slider,
666	border => 0.8,
667	@_	771	@_,
668	);	772	);
669		773
		774	$self->{vp}->add ($self->{scrolled});
		775	$self->add ($self->{vp});
		776	$self->add ($self->{slider});
		777
670	$self	778	$self
671	}	779	}
672		780
673	sub _draw {	781	#TODO# update range on size_allocate depeneing on child
674	my ($self) = @_;	782	# update viewport offset on scroll
675		783
676	my ($w, $h) = ($self->{w}, $self->{h});	784	#############################################################################
677		785
678	glEnable GL_BLEND;	786	package CFClient::UI::Frame;
679	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
680	glEnable GL_TEXTURE_2D;
681	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
682		787
683	# glBegin GL_QUADS;	788	our @ISA = CFClient::UI::Bin::;
684	# glColor 0, 0, 0, 0;
685	# glVertex 0 , 0;
686	# glVertex 0 , $h;
687	# glVertex $w, $h;
688	# glVertex $w, 0;
689	# glEnd;
690		789
691		790	use CFClient::OpenGL;
692	$self->child->draw;
693	glDisable GL_BLEND;
694	glDisable GL_TEXTURE_2D;
695	}
696		791
697	#############################################################################	792	#############################################################################
698		793
699	package CFClient::UI::FancyFrame;	794	package CFClient::UI::FancyFrame;
700		795
…		…
710	my $class = shift;	805	my $class = shift;
711		806
712	# TODO: user_x, user_y, overwrite moveto?	807	# TODO: user_x, user_y, overwrite moveto?
713		808
714	my $self = $class->SUPER::new (	809	my $self = $class->SUPER::new (
715	bg => [1, 1, 1, 1],	810	bg => [1, 1, 1, 1],
716	border_bg => [1, 1, 1, 1],	811	border_bg => [1, 1, 1, 1],
717	border => 0.8,	812	border => 0.6,
718	can_events => 1,	813	can_events => 1,
719	@_	814	@_
720	);	815	);
721		816
722	$self->{title} &&= new CFClient::UI::Label	817	$self->{title} &&= new CFClient::UI::Label
723	align => 0,	818	align => 0,
724	valign => 1,	819	valign => 1,
725	text => $self->{title},	820	text => $self->{title},
726	fontsize => 1;	821	fontsize => $self->{border};
727		822
728	$self	823	$self
729	}	824	}
730		825
731	sub border {	826	sub border {
…		…
756	}	851	}
757		852
758	sub button_down {	853	sub button_down {
759	my ($self, $ev, $x, $y) = @_;	854	my ($self, $ev, $x, $y) = @_;
760		855
		856	my ($w, $h) = @$self{qw(w h)};
761	my $border = $self->border;	857	my $border = $self->border;
762		858
763	if ($x < $self->{w} && $x >= $self->{w} - $border	859	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
764	&& $y < $self->{h} && $y >= $self->{h} - $border) {	860	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
765		861
		862	if ($lr & $td) {
		863	my ($wx, $wy) = ($self->{x}, $self->{y});
766	my ($ox, $oy) = ($ev->{x}, $ev->{y});	864	my ($ox, $oy) = ($ev->{x}, $ev->{y});
767	my ($bw, $bh) = ($self->{w}, $self->{h});	865	my ($bw, $bh) = ($self->{w}, $self->{h});
768		866
		867	my $mx = $x < $border;
		868	my $my = $y < $border;
		869
769	$self->{motion} = sub {	870	$self->{motion} = sub {
770	my ($ev, $x, $y) = @_;	871	my ($ev, $x, $y) = @_;
771		872
772	($x, $y) = ($ev->{x}, $ev->{y});	873	my $dx = $ev->{x} - $ox;
		874	my $dy = $ev->{y} - $oy;
773		875
774	$self->{user_w} = $bw + $x - $ox;	876	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
775	$self->{user_h} = $bh + $y - $oy;	877	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		878	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
776	$self->check_size;	879	$self->check_size;
777	};	880	};
778		881
779	} elsif ($x >= 0 && $x < $self->{w}	882	} elsif ($lr ^ $td) {
780	&& $y >= 0 && $y < $border) {
781
782	my ($ox, $oy) = ($ev->{x}, $ev->{y});	883	my ($ox, $oy) = ($ev->{x}, $ev->{y});
783	my ($bx, $by) = ($self->{x}, $self->{y});	884	my ($bx, $by) = ($self->{x}, $self->{y});
784		885
785	$self->{motion} = sub {	886	$self->{motion} = sub {
786	my ($ev, $x, $y) = @_;	887	my ($ev, $x, $y) = @_;
…		…
809	my ($self) = @_;	910	my ($self) = @_;
810		911
811	my ($w, $h ) = ($self->{w}, $self->{h});	912	my ($w, $h ) = ($self->{w}, $self->{h});
812	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	913	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
813		914
814	glEnable GL_BLEND;
815	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
816	glEnable GL_TEXTURE_2D;	915	glEnable GL_TEXTURE_2D;
817	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	916	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
818		917
819	my $border = $self->border;	918	my $border = $self->border;
820		919
821	glColor @{ $self->{border_bg} };	920	glColor @{ $self->{border_bg} };
822	$tex[1]->draw_quad (0, 0, $w, $border);	921	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
823	$tex[3]->draw_quad (0, $border, $border, $ch);	922	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
824	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	923	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
825	$tex[4]->draw_quad (0, $h - $border, $w, $border);	924	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
826		925
		926	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
827	my $bg = $tex[0];	927	my $bg = $tex[0];
828		928
829	# TODO: repeat texture not scale	929	# TODO: repeat texture not scale
830	my $rep_x = $cw / $bg->{w};	930	my $rep_x = $cw / $bg->{w};
831	my $rep_y = $ch / $bg->{h};	931	my $rep_y = $ch / $bg->{h};
832		932
833	glColor @{ $self->{bg} };	933	glColor @{ $self->{bg} };
834		934
835	$bg->{s} = $rep_x;	935	$bg->{s} = $rep_x;
836	$bg->{t} = $rep_y;	936	$bg->{t} = $rep_y;
837	$bg->{wrap_mode} = 1;	937	$bg->{wrap_mode} = 1;
838	$bg->draw_quad ($border, $border, $cw, $ch);	938	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		939	}
839		940
840	glDisable GL_TEXTURE_2D;	941	glDisable GL_TEXTURE_2D;
841	glDisable GL_BLEND;
842		942
843	$self->{title}->draw if $self->{title};	943	$self->{title}->draw if $self->{title};
		944
844	$self->child->draw;	945	$self->child->draw;
845	}	946	}
846		947
847	#############################################################################	948	#############################################################################
848		949
…		…
870	$self->{children}[$y][$x] = $child;	971	$self->{children}[$y][$x] = $child;
871		972
872	$child->check_size;	973	$child->check_size;
873	}	974	}
874		975
		976	sub children {
		977	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		978	}
		979
875	# 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?
876	sub clear {	981	sub clear {
877	my ($self) = @_;	982	my ($self) = @_;
878		983
		984	my @children = $self->children;
879	delete $self->{children};	985	delete $self->{children};
		986
		987	for (@children) {
		988	delete $_->{parent};
		989	$_->hide;
		990	}
		991
880	$self->update;	992	$self->update;
881	}	993	}
882		994
883	sub get_wh {	995	sub get_wh {
884	my ($self) = @_;	996	my ($self) = @_;
…		…
1061	}	1173	}
1062		1174
1063	sub size_allocate {	1175	sub size_allocate {
1064	my ($self, $w, $h) = @_;	1176	my ($self, $w, $h) = @_;
1065		1177
		1178	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1179
1066	my $children = $self->{children};	1180	my $children = $self->{children};
1067		1181
1068	my @h = map $_->{req_h}, @$children;	1182	my @h = map $_->{req_h}, @$children;
1069		1183
1070	my $req_h = List::Util::sum @h;	1184	my $req_h = List::Util::sum @h;
…		…
1107		1221
1108	sub new {	1222	sub new {
1109	my ($class, %arg) = @_;	1223	my ($class, %arg) = @_;
1110		1224
1111	my $self = $class->SUPER::new (	1225	my $self = $class->SUPER::new (
1112	fg => [1, 1, 1],	1226	fg => [1, 1, 1],
1113	#font => default_font	1227	#font => default_font
		1228	#text => initial text
		1229	#markup => initial narkup
		1230	layout => (new CFClient::Layout),
1114	fontsize => 1,	1231	fontsize => 1,
1115	text => "",
1116	align => -1,	1232	align => -1,
1117	valign => -1,	1233	valign => -1,
1118	padding => 2,	1234	padding => 2,
1119	layout => new CFClient::Layout,
1120	can_events => 0,	1235	can_events => 0,
1121	%arg	1236	%arg
1122	);	1237	);
1123		1238
1124	if (exists $self->{template}) {	1239	if (exists $self->{template}) {
1125	my $layout = new CFClient::Layout;	1240	my $layout = new CFClient::Layout;
1126	$layout->set_text (delete $self->{template});	1241	$layout->set_text (delete $self->{template});
1127	$self->{template} = $layout;	1242	$self->{template} = $layout;
1128	}	1243	}
1129		1244
1130	$self->set_text (delete $self->{text}) if exists $self->{text};	1245	if (exists $self->{markup}) {
1131	$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	}
1132		1250
1133	$self	1251	$self
1134	}	1252	}
1135		1253
1136	sub escape_text {	1254	sub escape {
1137	local $_ = $_[1];	1255	local $_ = $_[1];
1138		1256
1139	s/&/&amp;/g;	1257	s/&/&amp;/g;
1140	s/>/&gt;/g;	1258	s/>/&gt;/g;
1141	s/</&lt;/g;	1259	s/</&lt;/g;
1142		1260
1143	$_[1]	1261	$_[1]
1144	}	1262	}
1145		1263
		1264	sub update {
		1265	my ($self) = @_;
		1266
		1267	delete $self->{texture};
		1268	$self->SUPER::update;
		1269	}
		1270
1146	sub set_text {	1271	sub set_text {
1147	my ($self, $text) = @_;	1272	my ($self, $text) = @_;
1148		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;
1149	$self->{layout}->set_text ($text);	1278	$self->{layout}->set_text ($text);
1150		1279
1151	delete $self->{texture};	1280	$self->update;
1152	$self->check_size;	1281	$self->check_size;
1153	$self->update;
1154	}	1282	}
1155		1283
1156	sub set_markup {	1284	sub set_markup {
1157	my ($self, $markup) = @_;	1285	my ($self, $markup) = @_;
1158		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;
1159	$self->{layout}->set_markup ($markup);	1293	$self->{layout}->set_markup ($markup);
1160		1294
1161	delete $self->{texture};	1295	$self->update;
1162	$self->check_size;	1296	$self->check_size;
1163	$self->update;
1164	}	1297	}
1165		1298
1166	sub size_request {	1299	sub size_request {
1167	my ($self) = @_;	1300	my ($self) = @_;
1168		1301
…		…
1197	sub set_fontsize {	1330	sub set_fontsize {
1198	my ($self, $fontsize) = @_;	1331	my ($self, $fontsize) = @_;
1199		1332
1200	$self->{fontsize} = $fontsize;	1333	$self->{fontsize} = $fontsize;
1201	delete $self->{texture};	1334	delete $self->{texture};
		1335
		1336	$self->update;
1202	$self->check_size;	1337	$self->check_size;
1203	$self->update;
1204	}	1338	}
1205		1339
1206	sub _draw {	1340	sub _draw {
1207	my ($self) = @_;	1341	my ($self) = @_;
1208		1342
1209	my $tex = $self->{texture} ||= do {	1343	my $tex = $self->{texture} ||= do {
		1344	$self->{layout}->set_foreground (@{$self->{fg}});
1210	$self->{layout}->set_font ($self->{font}) if $self->{font};	1345	$self->{layout}->set_font ($self->{font}) if $self->{font};
1211	$self->{layout}->set_width ($self->{w});	1346	$self->{layout}->set_width ($self->{w});
1212	$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
1213	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
1214	};	1360	};
1215		1361
1216	glEnable GL_BLEND;
1217	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1218	glEnable GL_TEXTURE_2D;	1362	glEnable GL_TEXTURE_2D;
1219	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1363	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1220		1364
		1365	if ($tex->{format} == GL_ALPHA) {
1221	glColor @{$self->{fg}};	1366	glColor @{$self->{fg}};
1222
1223	$self->{ox} = int (
1224	$self->{align} < 0 ? $self->{padding}
1225	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1226	: ($self->{w} - $tex->{w}) * 0.5
1227	);
1228
1229	$self->{oy} = int (
1230	$self->{valign} < 0 ? $self->{padding}
1231	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1232	: ($self->{h} - $tex->{h}) * 0.5
1233	);
1234
1235	$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	}
1236		1371
1237	glDisable GL_TEXTURE_2D;	1372	glDisable GL_TEXTURE_2D;
1238	glDisable GL_BLEND;
1239	}	1373	}
1240		1374
1241	#############################################################################	1375	#############################################################################
1242		1376
1243	package CFClient::UI::EntryBase;	1377	package CFClient::UI::EntryBase;
…		…
1248		1382
1249	sub new {	1383	sub new {
1250	my $class = shift;	1384	my $class = shift;
1251		1385
1252	$class->SUPER::new (	1386	$class->SUPER::new (
1253	fg => [1, 1, 1],	1387	fg => [1, 1, 1],
1254	bg => [0, 0, 0, 0.2],	1388	bg => [0, 0, 0, 0.2],
1255	active_bg => [1, 1, 1, 0.5],	1389	active_bg => [1, 1, 1, 0.5],
1256	active_fg => [0, 0, 0],	1390	active_fg => [0, 0, 0],
1257	can_hover => 1,	1391	can_hover => 1,
1258	can_focus => 1,	1392	can_focus => 1,
1259	valign => 0,	1393	valign => 0,
1260	can_events => 1,	1394	can_events => 1,
1261	@_	1395	@_
1262	)	1396	)
1263	}	1397	}
1264		1398
…		…
1278	$self->{layout}->set_text ("$text ");	1412	$self->{layout}->set_text ("$text ");
1279		1413
1280	$self->emit (changed => $self->{text});	1414	$self->emit (changed => $self->{text});
1281	}	1415	}
1282		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
1283	sub get_text {	1426	sub get_text {
1284	$_[0]{text}	1427	$_[0]{text}
1285	}	1428	}
1286		1429
1287	sub size_request {	1430	sub size_request {
…		…
1294		1437
1295	sub size_allocate {	1438	sub size_allocate {
1296	my ($self, $w, $h) = @_;	1439	my ($self, $w, $h) = @_;
1297		1440
1298	$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
1299	}
1300
1301	sub set_text {
1302	my ($self, $text) = @_;
1303
1304	$self->{cursor} = length $text;
1305	$self->_set_text ($text);
1306	$self->update;
1307	}	1442	}
1308		1443
1309	sub key_down {	1444	sub key_down {
1310	my ($self, $ev) = @_;	1445	my ($self, $ev) = @_;
1311		1446
…		…
1418	my ($self, $ev) = @_;	1553	my ($self, $ev) = @_;
1419		1554
1420	my $sym = $ev->{sym};	1555	my $sym = $ev->{sym};
1421		1556
1422	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} = '';
1423	$self->emit (activate => $self->get_text);	1562	$self->emit (activate => $txt);
1424	$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	}
1425		1586
1426	} else {	1587	} else {
1427	$self->SUPER::key_down ($ev);	1588	$self->SUPER::key_down ($ev);
1428	}	1589	}
1429		1590
…		…
1443		1604
1444	sub new {	1605	sub new {
1445	my $class = shift;	1606	my $class = shift;
1446		1607
1447	$class->SUPER::new (	1608	$class->SUPER::new (
1448	padding => 4,	1609	padding => 4,
1449	fg => [1, 1, 1],	1610	fg => [1, 1, 1],
1450	bg => [1, 1, 1, 0.2],	1611	bg => [1, 1, 1, 0.2],
1451	active_fg => [0, 0, 1],	1612	active_fg => [0, 0, 1],
1452	can_hover => 1,	1613	can_hover => 1,
1453	align => 0,	1614	align => 0,
1454	valign => 0,	1615	valign => 0,
1455	can_events => 1,	1616	can_events => 1,
1456	@_	1617	@_
1457	)	1618	)
1458	}	1619	}
1459		1620
…		…
1473		1634
1474	if ($GRAB == $self) {	1635	if ($GRAB == $self) {
1475	$self->{fg} = $self->{active_fg};	1636	$self->{fg} = $self->{active_fg};
1476	}	1637	}
1477		1638
1478	glEnable GL_BLEND;
1479	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1480	glEnable GL_TEXTURE_2D;	1639	glEnable GL_TEXTURE_2D;
1481	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1640	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1482	glColor 0, 0, 0, 1;	1641	glColor 0, 0, 0, 1;
1483		1642
1484	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1643	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1485		1644
1486	glDisable GL_TEXTURE_2D;	1645	glDisable GL_TEXTURE_2D;
1487	glDisable GL_BLEND;
1488		1646
1489	$self->SUPER::_draw;	1647	$self->SUPER::_draw;
1490	}	1648	}
1491		1649
1492	#############################################################################	1650	#############################################################################
…		…
1539		1697
1540	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;
1541		1699
1542	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1700	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1543		1701
1544	glEnable GL_BLEND;	1702	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1703
1545	glEnable GL_TEXTURE_2D;	1704	glEnable GL_TEXTURE_2D;
1546	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1547
1548	my $tex = $self->{state} ? $tex[1] : $tex[0];
1549
1550	$tex->draw_quad (0, 0, $s, $s);	1705	$tex->draw_quad_alpha (0, 0, $s, $s);
1551
1552	glDisable GL_TEXTURE_2D;	1706	glDisable GL_TEXTURE_2D;
1553	glDisable GL_BLEND;
1554	}	1707	}
1555		1708
1556	#############################################################################	1709	#############################################################################
1557		1710
1558	package CFClient::UI::Image;	1711	package CFClient::UI::Image;
…		…
1601	glTranslate 0, -$self->{w}, 0;	1754	glTranslate 0, -$self->{w}, 0;
1602		1755
1603	($w, $h) = ($h, $w);	1756	($w, $h) = ($h, $w);
1604	}	1757	}
1605		1758
1606	glEnable GL_BLEND;
1607	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1608	glEnable GL_TEXTURE_2D;	1759	glEnable GL_TEXTURE_2D;
1609	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1760	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1610		1761
1611	$tex->draw_quad (0, 0, $w, $h);	1762	$tex->draw_quad_alpha (0, 0, $w, $h);
1612		1763
1613	glDisable GL_BLEND;
1614	glDisable GL_TEXTURE_2D;	1764	glDisable GL_TEXTURE_2D;
1615	}	1765	}
1616		1766
1617	#############################################################################	1767	#############################################################################
1618		1768
…		…
1666	}	1816	}
1667		1817
1668	sub set_max {	1818	sub set_max {
1669	my ($self, $max) = @_;	1819	my ($self, $max) = @_;
1670		1820
		1821	return if $self->{max_val} == $max;
		1822
1671	$self->{max_val} = $max;	1823	$self->{max_val} = $max;
		1824	$self->update;
1672	}	1825	}
1673		1826
1674	sub set_value {	1827	sub set_value {
1675	my ($self, $val, $max) = @_;	1828	my ($self, $val, $max) = @_;
1676		1829
1677	$self->set_max ($max)	1830	$self->set_max ($max)
1678	if defined $max;	1831	if defined $max;
1679		1832
1680	$max = $self->{max_val};	1833	return if $self->{val} == $val;
		1834
1681	$self->{val} = $val;	1835	$self->{val} = $val;
1682
1683	$self->update;	1836	$self->update;
1684	}	1837	}
1685		1838
1686	sub _draw {	1839	sub _draw {
1687	my ($self) = @_;	1840	my ($self) = @_;
…		…
1750		1903
1751	sub new {	1904	sub new {
1752	my ($class, %arg) = @_;	1905	my ($class, %arg) = @_;
1753		1906
1754	my $self = $class->SUPER::new (	1907	my $self = $class->SUPER::new (
1755	tooltip => $arg{type},	1908	tooltip => $arg{type},
		1909	can_hover => 1,
		1910	can_events => 1,
1756	%arg,	1911	%arg,
1757	);	1912	);
1758		1913
1759	$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");
1760	$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);
1761	$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");
1762		1917
1763	$self	1918	$self
1764	}	1919	}
1765		1920
1766	sub set_fontsize {	1921	sub set_fontsize {
…		…
1768		1923
1769	$self->{value}->set_fontsize ($fsize);	1924	$self->{value}->set_fontsize ($fsize);
1770	$self->{max} ->set_fontsize ($fsize);	1925	$self->{max} ->set_fontsize ($fsize);
1771	}	1926	}
1772		1927
		1928	sub set_max {
		1929	my ($self, $max) = @_;
		1930
		1931	$self->{gauge}->set_max ($max);
		1932	$self->{max}->set_text ($max);
		1933	}
		1934
1773	sub set_value {	1935	sub set_value {
1774	my ($self, $val, $max) = @_;	1936	my ($self, $val, $max) = @_;
1775		1937
1776	$self->set_max ($max)	1938	$self->set_max ($max)
1777	if defined $max;	1939	if defined $max;
1778		1940
1779	$self->{gauge}->set_value ($val, $max);	1941	$self->{gauge}->set_value ($val, $max);
1780	$self->{value}->set_text ($val);	1942	$self->{value}->set_text ($val);
1781	}
1782
1783	sub set_max {
1784	my ($self, $max) = @_;
1785
1786	$self->{gauge}->set_max ($max);
1787	$self->{max}->set_text ($max);
1788	}	1943	}
1789		1944
1790	#############################################################################	1945	#############################################################################
1791		1946
1792	package CFClient::UI::Slider;	1947	package CFClient::UI::Slider;
…		…
1811	# TODO: calculations are off	1966	# TODO: calculations are off
1812	my $self = $class->SUPER::new (	1967	my $self = $class->SUPER::new (
1813	fg => [1, 1, 1],	1968	fg => [1, 1, 1],
1814	active_fg => [0, 0, 0],	1969	active_fg => [0, 0, 0],
1815	range => [0, 0, 100, 10],	1970	range => [0, 0, 100, 10],
1816	req_w => 20,	1971	req_w => $::WIDTH / 80,
1817	req_h => 20,	1972	req_h => $::WIDTH / 80,
1818	vertical => 0,	1973	vertical => 0,
1819	can_hover => 1,	1974	can_hover => 1,
1820	inner_pad => 5,	1975	inner_pad => 5,
1821	@_	1976	@_
1822	);	1977	);
…		…
1905	$page ||= 2;	2060	$page ||= 2;
1906		2061
1907	my $knob_a = $inner_pad_px + ($value - $page * 0.5);	2062	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1908	my $knob_b = $inner_pad_px + ($value + $page * 0.5);	2063	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1909		2064
1910	glEnable GL_BLEND;
1911	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1912	glEnable GL_TEXTURE_2D;	2065	glEnable GL_TEXTURE_2D;
1913	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2066	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914		2067
1915	# draw background	2068	# draw background
1916	$tex[1]->draw_quad (0, 0, $w, $h);	2069	$tex[1]->draw_quad_alpha (0, 0, $w, $h);
1917		2070
1918	# draw handle	2071	# draw handle
1919	$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);
1920		2073
1921	glDisable GL_BLEND;
1922	glDisable GL_TEXTURE_2D;	2074	glDisable GL_TEXTURE_2D;
1923	}	2075	}
1924		2076
1925	#############################################################################	2077	#############################################################################
1926		2078
…		…
1932		2084
1933	sub new {	2085	sub new {
1934	my $class = shift;	2086	my $class = shift;
1935		2087
1936	my $self = $class->SUPER::new (	2088	my $self = $class->SUPER::new (
1937	fontsize => 1,	2089	fontsize => 1,
		2090	can_events => 0,
1938	#font => default_font	2091	#font => default_font
1939	@_,	2092	@_,
1940		2093
1941	layout => (new CFClient::Layout),	2094	layout => (new CFClient::Layout 1),
1942	par => [],	2095	par => [],
1943	height => 0,	2096	height => 0,
1944	children => [	2097	children => [
1945	(new CFClient::UI::Empty expand => 1),	2098	(new CFClient::UI::Empty expand => 1),
1946	(new CFClient::UI::Slider vertical => 1),	2099	(new CFClient::UI::Slider vertical => 1),
1947	],	2100	],
1948	);	2101	);
1949		2102
1950	$self->{children}[1]->connect (changed => sub {	2103	$self->{children}[1]->connect (changed => sub { $self->update });
1951	$self->update;
1952	});
1953		2104
1954	$self	2105	$self
1955	}	2106	}
1956		2107
1957	sub set_fontsize {	2108	sub set_fontsize {
…		…
1965	my ($self, $text) = @_;	2116	my ($self, $text) = @_;
1966		2117
1967	my $layout = $self->{layout};	2118	my $layout = $self->{layout};
1968		2119
1969	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2120	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1970	$layout->set_width ($self->{w});	2121	$layout->set_width ($self->{children}[0]{w});
1971	$layout->set_text ($text);	2122	$layout->set_markup ($text);
1972		2123
1973	($layout->size)[1]	2124	($layout->size)[1]
1974	}	2125	}
1975		2126
1976	sub reflow {	2127	sub reflow {
…		…
2028	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2179	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2029		2180
2030	delete $self->{texture};	2181	delete $self->{texture};
2031	}	2182	}
2032		2183
2033	$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 {
2034	glClearColor 0, 0, 0, 1;	2185	glClearColor 0, 0, 0, 0;
2035	glClear GL_COLOR_BUFFER_BIT;	2186	glClear GL_COLOR_BUFFER_BIT;
2036		2187
2037	glEnable GL_BLEND;
2038	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2039	glEnable GL_TEXTURE_2D;	2188	glEnable GL_TEXTURE_2D;
2040	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2189	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2041		2190
2042	my $top = int $self->{children}[1]{range}[0];	2191	my $top = int $self->{children}[1]{range}[0];
2043		2192
…		…
2052		2201
2053	for my $par (@{$self->{par}}) {	2202	for my $par (@{$self->{par}}) {
2054	my $h = $par->[0];	2203	my $h = $par->[0];
2055		2204
2056	if ($y0 < $y + $h && $y < $y1) {	2205	if ($y0 < $y + $h && $y < $y1) {
		2206	$layout->set_foreground (@{ $par->[1] });
2057	$layout->set_text ($par->[2]);	2207	$layout->set_markup ($par->[2]);
2058		2208
2059	glColor @{ $par->[1] };
2060	my ($W, $H) = $layout->size;	2209	my ($W, $H) = $layout->size;
2061	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);
2062	}	2211	}
2063		2212
2064	$y += $h;	2213	$y += $h;
2065	}	2214	}
2066		2215
2067	glDisable GL_TEXTURE_2D;	2216	glDisable GL_TEXTURE_2D;
2068	glDisable GL_BLEND;
2069	};	2217	};
2070	});	2218	});
2071	}	2219	}
2072		2220
2073	sub _draw {	2221	sub _draw {
2074	my ($self) = @_;	2222	my ($self) = @_;
2075		2223
2076	if ($self->{texture}) {
2077	glEnable GL_TEXTURE_2D;	2224	glEnable GL_TEXTURE_2D;
2078	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2225	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2079	$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});
2080	glDisable GL_TEXTURE_2D;	2228	glDisable GL_TEXTURE_2D;
2081	}
2082		2229
2083	$self->{children}[1]->draw;	2230	$self->{children}[1]->draw;
2084		2231
2085	}	2232	}
2086		2233
…		…
2134		2281
2135	sub new {	2282	sub new {
2136	my $class = shift;	2283	my $class = shift;
2137		2284
2138	my $self = $class->SUPER::new (	2285	my $self = $class->SUPER::new (
2139	state => 0,	2286	state => 0,
2140	connect_activate => \&toggle_flopper,	2287	connect_activate => \&toggle_flopper,
2141	can_events => 1,
2142	@_	2288	@_
2143	);	2289	);
2144		2290
2145	if ($self->{state}) {	2291	if ($self->{state}) {
2146	$self->{state} = 0;	2292	$self->{state} = 0;
…		…
2181	@_,	2327	@_,
2182	can_events => 0,	2328	can_events => 0,
2183	)	2329	)
2184	}	2330	}
2185		2331
2186	sub set_text {	2332	sub set_tooltip_from {
2187	my ($self, $text) = @_;	2333	my ($self, $widget) = @_;
2188		2334
2189	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2335	$self->add (new CFClient::UI::Label
2190	$self->{label}->set_text ($text);	2336	markup => $widget->{tooltip},
2191	$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	);
2192	}	2342	}
2193		2343
2194	sub size_request {	2344	sub size_request {
2195	my ($self) = @_;	2345	my ($self) = @_;
2196		2346
2197	$self->child->set_max_size ($::WIDTH * 0.2);
2198
2199	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2347	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2200		2348
2201	($w + 4, $h + 4)	2349	($w + 4, $h + 4)
2202	}	2350	}
2203		2351
		2352	sub size_allocate {
		2353	my ($self, $w, $h) = @_;
		2354
		2355	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2356	}
		2357
2204	sub _draw {	2358	sub _draw {
2205	my ($self) = @_;	2359	my ($self) = @_;
2206		2360
2207	glPushMatrix;
2208	glTranslate 0.375, 0.375;	2361	glTranslate 0.375, 0.375;
2209		2362
2210	my ($w, $h) = @$self{qw(w h)};	2363	my ($w, $h) = @$self{qw(w h)};
2211		2364
2212	glColor 1, 0.8, 0.4;	2365	glColor 1, 0.8, 0.4;
…		…
2223	glVertex 0 , $h;	2376	glVertex 0 , $h;
2224	glVertex $w, $h;	2377	glVertex $w, $h;
2225	glVertex $w, 0;	2378	glVertex $w, 0;
2226	glEnd;	2379	glEnd;
2227		2380
2228	glPopMatrix;	2381	glTranslate 2 - 0.375, 2 - 0.375;
2229
2230	glTranslate 2, 2;
2231	$self->SUPER::_draw;	2382	$self->SUPER::_draw;
2232	}	2383	}
2233		2384
2234	#############################################################################	2385	#############################################################################
2235		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
2236	package CFClient::UI::Root;	2692	package CFClient::UI::Root;
2237		2693
2238	our @ISA = CFClient::UI::Container::;	2694	our @ISA = CFClient::UI::Container::;
2239		2695
2240	use CFClient::OpenGL;	2696	use CFClient::OpenGL;
2241		2697
2242	sub check_size {	2698	sub new {
2243	my ($self) = @_;	2699	my $class = shift;
2244		2700
2245	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2701	$class->SUPER::new (
2246	}	2702	@_,
2247		2703	)
2248	sub size_request {
2249	($::WIDTH, $::HEIGHT)
2250	}	2704	}
2251		2705
2252	sub configure {	2706	sub configure {
2253	my ($self, $x, $y, $w, $h) = @_;	2707	my ($self, $x, $y, $w, $h) = @_;
2254		2708
2255	$self->SUPER::configure ($x, $y, $w, $h);	2709	$self->{w} = $w;
		2710	$self->{h} = $h;
		2711	}
2256		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
2257	for my $child (@{$self->{children}}) {	2745	for my $child ($self->children) {
2258	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)};
2259		2747
2260	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2748	$X = List::Util::max 0, List::Util::min $w - $W, $X;
2261	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2749	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2262	$child->configure ($X, $Y, $W,$H);	2750	$child->configure ($X, $Y, $W, $H);
2263	}	2751	}
2264	}
2265		2752
2266	sub _topleft {	2753	$self->{old_w} = $w;
		2754	$self->{old_h} = $h;
		2755	}
		2756
		2757	sub coord2local {
2267	my ($self, $x, $y) = @_;	2758	my ($self, $x, $y) = @_;
2268		2759
2269	($x, $y)	2760	($x, $y)
2270	}	2761	}
2271		2762
		2763	sub coord2global {
		2764	my ($self, $x, $y) = @_;
		2765
		2766	($x, $y)
		2767	}
		2768
2272	sub update {	2769	sub update {
2273	my ($self) = @_;	2770	my ($self) = @_;
2274		2771
2275	$self->check_size;	2772	$self->check_size;
2276	::refresh ();	2773	$::WANT_REFRESH++;
2277	}	2774	}
2278		2775
2279	sub add {	2776	sub add {
2280	my ($self, $child) = @_;	2777	my ($self, $child) = @_;
2281		2778
2282	# integerize window positions	2779	# integerise window positions
2283	$child->{x} = int $child->{x};	2780	$child->{x} = int $child->{x};
2284	$child->{y} = int $child->{y};	2781	$child->{y} = int $child->{y};
2285		2782
2286	$self->SUPER::add ($child);	2783	$self->SUPER::add ($child);
2287	}	2784	}
…		…
2290	my ($self, $id, $cb) = @_;	2787	my ($self, $id, $cb) = @_;
2291		2788
2292	$self->{refresh_hook}{$id} = $cb;	2789	$self->{refresh_hook}{$id} = $cb;
2293	}	2790	}
2294		2791
2295	sub draw {	2792	sub draw {
2296	my ($self) = @_;	2793	my ($self) = @_;
2297		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
2298	while (my $rcb = delete $self->{refresh_hook}) {	2840	while ($self->{refresh_hook}) {
2299	$_->() for values %$rcb;	2841	$_->()
		2842	for values %{delete $self->{refresh_hook}};
2300	}	2843	}
2301		2844
2302	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2845	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2303	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2846	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2304	glClear GL_COLOR_BUFFER_BIT;	2847	glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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