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.203 by root, Sun May 14 21:13:11 2006 UTC

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

Diff Legend

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