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.204 by root, Sun May 14 22:24:16 2006 UTC

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

Diff Legend

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