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.188 by root, Mon May 8 21:16:09 2006 UTC vs.
Revision 1.222 by root, Mon May 22 03:59:51 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
…		…
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
15		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 (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
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_markup ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29
30	$TOOLTIP->show;	32	$TOOLTIP->show;
31		33
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		35
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
37		38
38	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
39	}	42	}
40		43
41	return;	44	return;
42	}	45	}
43	}	46	}
…		…
130		133
131	for (@$vals) {	134	for (@$vals) {
132	my $i = int $_ + $rem;	135	my $i = int $_ + $rem;
133	$rem += $_ - $i;	136	$rem += $_ - $i;
134	$_ = $i;	137	$_ = $i;
		138	}
		139	}
		140
		141	sub full_refresh {
		142	# make a copy, otherwise for complains about freed values.
		143	my @widgets = values %WIDGET;
		144
		145	$_->update
		146	for @widgets;
		147	}
		148
		149	# call when resolution changes etc.
		150	sub rescale_widgets {
		151	my ($sx, $sy) = @_;
		152
		153	# make a copy, otherwise for complains about freed values.
		154	my @widgets = values %WIDGET;
		155
		156	for my $widget (@widgets) {
		157	if ($widget->{toplevel}) {
		158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		166	}
		167
		168	$widget->reconfigure;
135	}	169	}
136	}	170	}
137		171
138	#############################################################################	172	#############################################################################
139		173
…		…
158	if (/^connect_(.*)$/) {	192	if (/^connect_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	193	$self->connect ($1 => delete $self->{$_});
160	}	194	}
161	}	195	}
162		196
		197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		198
163	$self	199	$self
164	}	200	}
165		201
166	sub destroy {	202	sub destroy {
167	my ($self) = @_;	203	my ($self) = @_;
…		…
170	%$self = ();	206	%$self = ();
171	}	207	}
172		208
173	sub show {	209	sub show {
174	my ($self) = @_;	210	my ($self) = @_;
175
176	return if $self->{parent};	211	return if $self->{parent};
177		212
178	$CFClient::UI::ROOT->add ($self);	213	$CFClient::UI::ROOT->add ($self);
179	}	214	}
180		215
…		…
232	$self->{y} = $y;	267	$self->{y} = $y;
233	$self->update;	268	$self->update;
234	}	269	}
235		270
236	if ($self->{w} != $w || $self->{h} != $h) {	271	if ($self->{w} != $w || $self->{h} != $h) {
237	$self->{w} = $w;	272	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238	$self->{h} = $h;
239
240	$self->size_allocate ($w, $h);
241	$self->update;
242	$self->emit (size_allocate => $w, $h);
243	}	273	}
244	}	274	}
245		275
246	sub size_allocate {	276	sub size_allocate {
247	# nothing to be done	277	# nothing to be done
248	}	278	}
249		279
		280	sub reconfigure {
		281	my ($self) = @_;
		282
		283	$self->check_size (1);
		284	$self->update;
		285	}
		286
250	sub children {	287	sub children {
251	}
252
253	# call when resolution changes etc.
254	sub reconfigure {
255	my ($self) = @_;
256
257	$_->reconfigure
258	for $self->children;
259
260	$self->check_size;
261	$self->size_allocate ($self->{w}, $self->{h});
262	$self->update;
263	}	288	}
264		289
265	sub set_max_size {	290	sub set_max_size {
266	my ($self, $w, $h) = @_;	291	my ($self, $w, $h) = @_;
267		292
268	delete $self->{max_w}; $self->{max_w} = $w if $w;	293	delete $self->{max_w}; $self->{max_w} = $w if $w;
269	delete $self->{max_h}; $self->{max_h} = $h if $h;	294	delete $self->{max_h}; $self->{max_h} = $h if $h;
270	}	295	}
271		296
272	# return top left coordinates	297	sub set_tooltip {
273	sub _topleft {
274	my ($self, $x, $y) = @_;	298	my ($self, $tooltip) = @_;
275		299
276	$self->{parent}	300	$self->{tooltip} = $tooltip;
277	or Carp::confess "no parent widget in _topleft\n";#d#
278		301
279	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	302	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		303	delete $CFClient::UI::TOOLTIP->{owner};
		304	CFClient::UI::check_tooltip;
		305	}
280	}	306	}
281		307
282	# translate global coordinates to local coordinate system	308	# translate global coordinates to local coordinate system
283	sub coord2local {	309	sub coord2local {
284	my ($self, $x, $y) = @_;	310	my ($self, $x, $y) = @_;
285		311
286	my ($X, $Y) = $self->_topleft;	312	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287	($x - $X, $y - $Y)
288	}	313	}
289		314
290	# translate local coordinates to global coordinate system	315	# translate local coordinates to global coordinate system
291	sub coord2global {	316	sub coord2global {
292	my ($self, $x, $y) = @_;	317	my ($self, $x, $y) = @_;
293		318
294	my ($X, $Y) = $self->_topleft;	319	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295	($x + $X, $y + $Y)
296	}	320	}
297		321
298	sub focus_in {	322	sub focus_in {
299	my ($self) = @_;	323	my ($self) = @_;
300		324
…		…
372	glVertex $self->{w}, 0;	396	glVertex $self->{w}, 0;
373	glVertex $self->{w}, $self->{h};	397	glVertex $self->{w}, $self->{h};
374	glVertex 0 , $self->{h};	398	glVertex 0 , $self->{h};
375	glEnd;	399	glEnd;
376	glPopMatrix;	400	glPopMatrix;
377	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	401	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378	}	402	}
379	}	403	}
380		404
381	sub _draw {	405	sub _draw {
382	my ($self) = @_;	406	my ($self) = @_;
…		…
398		422
399	sub set_parent {	423	sub set_parent {
400	my ($self, $parent) = @_;	424	my ($self, $parent) = @_;
401		425
402	Scalar::Util::weaken ($self->{parent} = $parent);	426	Scalar::Util::weaken ($self->{parent} = $parent);
		427
		428	# TODO: req_w _does_change after ->reconfigure
		429	$self->check_size
		430	unless exists $self->{req_w};
		431
		432	$self->show;
403	}	433	}
404		434
405	sub check_size {	435	sub check_size {
406	my ($self) = @_;	436	my ($self, $forced) = @_;
407		437
408	$self->{parent}	438	$self->{force_alloc} = 1 if $forced;
409	or return 1;	439	$CFClient::UI::ROOT->{check_size}{$self} = $self;
410
411	my ($w, $h) = $self->{user_w} && $self->{user_h}
412	? @$self{qw(user_w user_h)}
413	: $self->size_request;
414
415	if ($w != $self->{req_w} || $h != $self->{req_h}) {
416	$self->{req_w} = $w;
417	$self->{req_h} = $h;
418
419	$self->{parent}->check_size
420	or $self->size_allocate (
421	(List::Util::max $self->{w}, $w),
422	(List::Util::max $self->{h}, $h),
423	);
424
425	1
426	} else {
427	0
428	}
429	}	440	}
430		441
431	sub update {	442	sub update {
432	my ($self) = @_;	443	my ($self) = @_;
433		444
…		…
448	}	459	}
449		460
450	sub DESTROY {	461	sub DESTROY {
451	my ($self) = @_;	462	my ($self) = @_;
452		463
		464	delete $WIDGET{$self+0};
453	#$self->deactivate;	465	#$self->deactivate;
454	}	466	}
455		467
456	#############################################################################	468	#############################################################################
457		469
…		…
466	my $class = shift;	478	my $class = shift;
467		479
468	# range [value, low, high, page]	480	# range [value, low, high, page]
469		481
470	$class->SUPER::new (	482	$class->SUPER::new (
471	bg => [0, 0, 0, 0.2],	483	#bg => [0, 0, 0, 0.2],
472	active_bg => [1, 1, 1, 0.5],	484	#active_bg => [1, 1, 1, 0.5],
473	@_	485	@_
474	)	486	)
475	}	487	}
476		488
477	sub _draw {	489	sub _draw {
478	my ($self) = @_;	490	my ($self) = @_;
479		491
		492	my $color = $FOCUS == $self && $self->{active_bg}
		493	? $self->{active_bg}
		494	: $self->{bg};
		495
		496	if ($color && (@$color < 4 || $color->[3])) {
480	my ($w, $h) = @$self{qw(w h)};	497	my ($w, $h) = @$self{qw(w h)};
481		498
482	glEnable GL_BLEND;	499	glEnable GL_BLEND;
483	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	500	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
484	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	501	glColor @$color;
485		502
486	glBegin GL_QUADS;	503	glBegin GL_QUADS;
487	glVertex 0 , 0;	504	glVertex 0 , 0;
488	glVertex 0 , $h;	505	glVertex 0 , $h;
489	glVertex $w, $h;	506	glVertex $w, $h;
490	glVertex $w, 0;	507	glVertex $w, 0;
491	glEnd;	508	glEnd;
492		509
493	glDisable GL_BLEND;	510	glDisable GL_BLEND;
		511	}
494	}	512	}
495		513
496	#############################################################################	514	#############################################################################
497		515
498	package CFClient::UI::Empty;	516	package CFClient::UI::Empty;
…		…
542	$self->{children} = [	560	$self->{children} = [
543	sort { $a->{z} <=> $b->{z} }	561	sort { $a->{z} <=> $b->{z} }
544	@{$self->{children}}, @widgets	562	@{$self->{children}}, @widgets
545	];	563	];
546		564
547	$_->check_size	565	$self->check_size (1);
548	for @widgets;
549
550	$self->update;	566	$self->update;
551	}	567	}
552		568
553	sub children {	569	sub children {
554	@{ $_[0]{children} }	570	@{ $_[0]{children} }
…		…
661	}	677	}
662		678
663	sub update {	679	sub update {
664	my ($self) = @_;	680	my ($self) = @_;
665		681
666	$ROOT->on_refresh ($self => sub { $self->render_child });	682	$ROOT->on_post_alloc ($self => sub { $self->render_child });
667	$self->SUPER::update;	683	$self->SUPER::update;
668	}	684	}
669		685
670	sub size_allocate {	686	sub size_allocate {
671	my ($self, $w, $h) = @_;	687	my ($self, $w, $h) = @_;
…		…
684	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	700	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
685	glClearColor 0, 0, 0, 0;	701	glClearColor 0, 0, 0, 0;
686	glClear GL_COLOR_BUFFER_BIT;	702	glClear GL_COLOR_BUFFER_BIT;
687		703
688	$self->_render;	704	$self->_render;
689	# glColorMask 1, 1, 1, 0;
690	# glEnable GL_BLEND;
691	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
692	# glRasterPos 0, 0;
693	# glCopyPixels 0, 0, $self->{w}, $self->{h};
694	# glDisable GL_BLEND;
695	# glColorMask 1, 1, 1, 1;
696	};	705	};
697	}	706	}
698		707
699	sub _draw {	708	sub _draw {
700	my ($self) = @_;	709	my ($self) = @_;
…		…
702	my ($w, $h) = ($self->w, $self->h);	711	my ($w, $h) = ($self->w, $self->h);
703		712
704	my $tex = $self->{texture}	713	my $tex = $self->{texture}
705	or return;	714	or return;
706		715
707	glEnable GL_BLEND;
708	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
709	glEnable GL_TEXTURE_2D;	716	glEnable GL_TEXTURE_2D;
710	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	717	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
711	glColor 0, 0, 0, 1;	718	glColor 1, 1, 1, 1;
712		719
713	$tex->draw_quad (0, 0, $w, $h);	720	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
714		721
715	glDisable GL_BLEND;
716	glDisable GL_TEXTURE_2D;	722	glDisable GL_TEXTURE_2D;
717	}	723	}
718		724
719	#############################################################################	725	#############################################################################
720		726
…		…
744	$self->{view_y} = int $y;	750	$self->{view_y} = int $y;
745		751
746	$self->update;	752	$self->update;
747	}	753	}
748		754
749	# hmm, this does not work for topleft of $self... but we should not aks for that	755	# hmm, this does not work for topleft of $self... but we should not ask for that
750	sub _topleft {	756	sub coord2local {
751	my ($self, $x, $y) = @_;	757	my ($self, $x, $y) = @_;
752		758
753	$self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})	759	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		760	}
		761
		762	sub coord2global {
		763	my ($self, $x, $y) = @_;
		764
		765	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		766	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		767
		768	$self->SUPER::coord2global ($x, $y)
754	}	769	}
755		770
756	sub find_widget {	771	sub find_widget {
757	my ($self, $x, $y) = @_;	772	my ($self, $x, $y) = @_;
758		773
…		…
791	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	806	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
792	},	807	},
793	;	808	;
794		809
795	$self = $class->SUPER::new (	810	$self = $class->SUPER::new (
796	vp => (new CFClient::UI::ViewPort),	811	vp => (new CFClient::UI::ViewPort expand => 1),
797	slider => $slider,	812	slider => $slider,
798	@_,	813	@_,
799	);	814	);
800		815
801	$self->{vp}->add ($self->{scrolled});	816	$self->{vp}->add ($self->{scrolled});
…		…
803	$self->add ($self->{slider});	818	$self->add ($self->{slider});
804		819
805	$self	820	$self
806	}	821	}
807		822
808	#TODO# update range on size_allocate depeneing on child	823	#TODO# update range on size_allocate depending on child
809	# update viewport offset on scroll	824	# update viewport offset on scroll
810		825
811	#############################################################################	826	#############################################################################
812		827
813	package CFClient::UI::Frame;	828	package CFClient::UI::Frame;
…		…
817	use CFClient::OpenGL;	832	use CFClient::OpenGL;
818		833
819	sub new {	834	sub new {
820	my $class = shift;	835	my $class = shift;
821		836
822	my $self = $class->SUPER::new (	837	$class->SUPER::new (
823	bg => [1, 1, 1, 1],	838	bg => undef,
824	border_bg => [1, 1, 1, 1],
825	border => 0.8,
826	@_	839	@_,
827	);	840	)
828
829	$self
830	}	841	}
831		842
832	sub _draw {	843	sub _draw {
833	my ($self) = @_;	844	my ($self) = @_;
834		845
835	my ($w, $h) = ($self->{w}, $self->{h});	846	if ($self->{bg}) {
		847	my ($w, $h) = @$self{qw(w h)};
836		848
837	glEnable GL_BLEND;	849	glEnable GL_BLEND;
838	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	850	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839	glEnable GL_TEXTURE_2D;	851	glColor @{ $self->{bg} };
840	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
841		852
842	# glBegin GL_QUADS;	853	glBegin GL_QUADS;
843	# glColor 0, 0, 0, 0;
844	# glVertex 0 , 0;	854	glVertex 0 , 0;
845	# glVertex 0 , $h;	855	glVertex 0 , $h;
846	# glVertex $w, $h;	856	glVertex $w, $h;
847	# glVertex $w, 0;	857	glVertex $w, 0;
848	# glEnd;	858	glEnd;
849		859
850
851	$self->child->draw;
852	glDisable GL_BLEND;	860	glDisable GL_BLEND;
853	glDisable GL_TEXTURE_2D;	861	}
		862
		863	$self->SUPER::_draw;
854	}	864	}
855		865
856	#############################################################################	866	#############################################################################
857		867
858	package CFClient::UI::FancyFrame;	868	package CFClient::UI::FancyFrame;
…		…
872		882
873	my $self = $class->SUPER::new (	883	my $self = $class->SUPER::new (
874	bg => [1, 1, 1, 1],	884	bg => [1, 1, 1, 1],
875	border_bg => [1, 1, 1, 1],	885	border_bg => [1, 1, 1, 1],
876	border => 0.6,	886	border => 0.6,
		887	toplevel => 1,
877	can_events => 1,	888	can_events => 1,
878	@_	889	@_
879	);	890	);
880		891
881	$self->{title} &&= new CFClient::UI::Label	892	$self->{title} &&= new CFClient::UI::Label
…		…
906	my ($self, $w, $h) = @_;	917	my ($self, $w, $h) = @_;
907		918
908	$h -= List::Util::max 0, $self->border * 2;	919	$h -= List::Util::max 0, $self->border * 2;
909	$w -= List::Util::max 0, $self->border * 2;	920	$w -= List::Util::max 0, $self->border * 2;
910		921
911	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	922	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
912	if $self->{title};	923	if $self->{title};
913		924
914	$self->child->configure ($self->border, $self->border, $w, $h);	925	$self->child->configure ($self->border, $self->border, $w, $h);
915	}	926	}
916		927
…		…
974	my ($self) = @_;	985	my ($self) = @_;
975		986
976	my ($w, $h ) = ($self->{w}, $self->{h});	987	my ($w, $h ) = ($self->{w}, $self->{h});
977	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	988	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
978		989
979	glEnable GL_BLEND;
980	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
981	glEnable GL_TEXTURE_2D;	990	glEnable GL_TEXTURE_2D;
982	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	991	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983		992
984	my $border = $self->border;	993	my $border = $self->border;
985		994
986	glColor @{ $self->{border_bg} };	995	glColor @{ $self->{border_bg} };
987	$tex[1]->draw_quad (0, 0, $w, $border);	996	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
988	$tex[3]->draw_quad (0, $border, $border, $ch);	997	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
989	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	998	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990	$tex[4]->draw_quad (0, $h - $border, $w, $border);	999	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
991		1000
992	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1001	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993	my $bg = $tex[0];	1002	my $bg = $tex[0];
994		1003
995	# TODO: repeat texture not scale	1004	# TODO: repeat texture not scale
…		…
999	glColor @{ $self->{bg} };	1008	glColor @{ $self->{bg} };
1000		1009
1001	$bg->{s} = $rep_x;	1010	$bg->{s} = $rep_x;
1002	$bg->{t} = $rep_y;	1011	$bg->{t} = $rep_y;
1003	$bg->{wrap_mode} = 1;	1012	$bg->{wrap_mode} = 1;
1004	$bg->draw_quad ($border, $border, $cw, $ch);	1013	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1014	}
1005		1015
1006	glDisable GL_TEXTURE_2D;	1016	glDisable GL_TEXTURE_2D;
1007	glDisable GL_BLEND;
1008	}
1009		1017
1010	$self->{title}->draw if $self->{title};	1018	$self->{title}->draw if $self->{title};
1011		1019
1012	$self->child->draw;	1020	$self->child->draw;
1013	}	1021	}
…		…
1240	}	1248	}
1241		1249
1242	sub size_allocate {	1250	sub size_allocate {
1243	my ($self, $w, $h) = @_;	1251	my ($self, $w, $h) = @_;
1244		1252
		1253	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1254
1245	my $children = $self->{children};	1255	my $children = $self->{children};
1246		1256
1247	my @h = map $_->{req_h}, @$children;	1257	my @h = map $_->{req_h}, @$children;
1248		1258
1249	my $req_h = List::Util::sum @h;	1259	my $req_h = List::Util::sum @h;
…		…
1278		1288
1279	#############################################################################	1289	#############################################################################
1280		1290
1281	package CFClient::UI::Label;	1291	package CFClient::UI::Label;
1282		1292
1283	our @ISA = CFClient::UI::Base::;	1293	our @ISA = CFClient::UI::DrawBG::;
1284		1294
1285	use CFClient::OpenGL;	1295	use CFClient::OpenGL;
1286		1296
1287	sub new {	1297	sub new {
1288	my ($class, %arg) = @_;	1298	my ($class, %arg) = @_;
1289		1299
1290	my $self = $class->SUPER::new (	1300	my $self = $class->SUPER::new (
1291	fg => [1, 1, 1],	1301	fg => [1, 1, 1],
		1302	#bg => none
		1303	#active_bg => none
1292	#font => default_font	1304	#font => default_font
		1305	#text => initial text
		1306	#markup => initial narkup
		1307	#max_w => maximum pixel width
		1308	ellipsise => 3, # end
		1309	layout => (new CFClient::Layout),
1293	fontsize => 1,	1310	fontsize => 1,
1294	text => "",
1295	align => -1,	1311	align => -1,
1296	valign => -1,	1312	valign => -1,
1297	padding => 2,	1313	padding => 2,
1298	layout => new CFClient::Layout,
1299	can_events => 0,	1314	can_events => 0,
1300	%arg	1315	%arg
1301	);	1316	);
1302		1317
1303	if (exists $self->{template}) {	1318	if (exists $self->{template}) {
1304	my $layout = new CFClient::Layout;	1319	my $layout = new CFClient::Layout;
1305	$layout->set_text (delete $self->{template});	1320	$layout->set_text (delete $self->{template});
1306	$self->{template} = $layout;	1321	$self->{template} = $layout;
1307	}	1322	}
1308		1323
1309	$self->set_text (delete $self->{text}) if exists $self->{text};	1324	if (exists $self->{markup}) {
1310	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1325	$self->set_markup (delete $self->{markup});
		1326	} else {
		1327	$self->set_text (delete $self->{text});
		1328	}
1311		1329
1312	$self	1330	$self
1313	}	1331	}
1314		1332
1315	sub escape {	1333	sub escape($) {
1316	local $_ = $_[1];	1334	local $_ = $_[0];
1317		1335
1318	s/&/&amp;/g;	1336	s/&/&amp;/g;
1319	s/>/&gt;/g;	1337	s/>/&gt;/g;
1320	s/</&lt;/g;	1338	s/</&lt;/g;
1321		1339
1322	$_[1]	1340	$_
1323	}	1341	}
1324		1342
1325	sub update {	1343	sub update {
1326	my ($self) = @_;	1344	my ($self) = @_;
1327		1345
…		…
1333	my ($self, $text) = @_;	1351	my ($self, $text) = @_;
1334		1352
1335	return if $self->{text} eq "T$text";	1353	return if $self->{text} eq "T$text";
1336	$self->{text} = "T$text";	1354	$self->{text} = "T$text";
1337		1355
		1356	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1338	$self->{layout}->set_text ($text);	1357	$self->{layout}->set_text ($text);
1339		1358
1340	delete $self->{texture};
1341	$self->update;	1359	$self->update;
1342	$self->check_size;	1360	$self->check_size;
1343	}	1361	}
1344		1362
1345	sub set_markup {	1363	sub set_markup {
1346	my ($self, $markup) = @_;	1364	my ($self, $markup) = @_;
1347		1365
1348	return if $self->{text} eq "M$markup";	1366	return if $self->{text} eq "M$markup";
1349	$self->{text} = "M$markup";	1367	$self->{text} = "M$markup";
1350		1368
		1369	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1370
		1371	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1351	$self->{layout}->set_markup ($markup);	1372	$self->{layout}->set_markup ($markup);
1352		1373
1353	delete $self->{texture};
1354	$self->update;	1374	$self->update;
1355	$self->check_size;	1375	$self->check_size;
1356	}	1376	}
1357		1377
1358	sub size_request {	1378	sub size_request {
1359	my ($self) = @_;	1379	my ($self) = @_;
1360		1380
1361	$self->{layout}->set_font ($self->{font}) if $self->{font};	1381	$self->{layout}->set_font ($self->{font}) if $self->{font};
1362	$self->{layout}->set_width ($self->{max_w} || -1);	1382	$self->{layout}->set_width ($self->{max_w} || -1);
		1383	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1384	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1363	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1385	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1364		1386
1365	my ($w, $h) = $self->{layout}->size;	1387	my ($w, $h) = $self->{layout}->size;
1366		1388
1367	if (exists $self->{template}) {	1389	if (exists $self->{template}) {
…		…
1397	}	1419	}
1398		1420
1399	sub _draw {	1421	sub _draw {
1400	my ($self) = @_;	1422	my ($self) = @_;
1401		1423
		1424	$self->SUPER::_draw; # draw background, if applicable
		1425
1402	my $tex = $self->{texture} ||= do {	1426	my $tex = $self->{texture} ||= do {
		1427	$self->{layout}->set_foreground (@{$self->{fg}});
1403	$self->{layout}->set_font ($self->{font}) if $self->{font};	1428	$self->{layout}->set_font ($self->{font}) if $self->{font};
1404	$self->{layout}->set_width ($self->{w});	1429	$self->{layout}->set_width ($self->{w});
		1430	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1431	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1405	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1432	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1433
1406	new_from_layout CFClient::Texture $self->{layout}	1434	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1435
		1436	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1437	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1438	: ($self->{w} - $tex->{w}) * 0.5);
		1439
		1440	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1441	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1442	: ($self->{h} - $tex->{h}) * 0.5);
		1443
		1444	$tex
1407	};	1445	};
1408		1446
1409	glEnable GL_BLEND;
1410	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1411	glEnable GL_TEXTURE_2D;	1447	glEnable GL_TEXTURE_2D;
1412	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1448	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1413		1449
		1450	if ($tex->{format} == GL_ALPHA) {
1414	glColor @{$self->{fg}};	1451	glColor @{$self->{fg}};
1415
1416	$self->{ox} = int (
1417	$self->{align} < 0 ? $self->{padding}
1418	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1419	: ($self->{w} - $tex->{w}) * 0.5
1420	);
1421
1422	$self->{oy} = int (
1423	$self->{valign} < 0 ? $self->{padding}
1424	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1425	: ($self->{h} - $tex->{h}) * 0.5
1426	);
1427
1428	$tex->draw_quad ($self->{ox}, $self->{oy});	1452	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1453	} else {
		1454	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1455	}
1429		1456
1430	glDisable GL_TEXTURE_2D;	1457	glDisable GL_TEXTURE_2D;
1431	glDisable GL_BLEND;
1432	}	1458	}
1433		1459
1434	#############################################################################	1460	#############################################################################
1435		1461
1436	package CFClient::UI::EntryBase;	1462	package CFClient::UI::EntryBase;
…		…
1471	$self->{layout}->set_text ("$text ");	1497	$self->{layout}->set_text ("$text ");
1472		1498
1473	$self->emit (changed => $self->{text});	1499	$self->emit (changed => $self->{text});
1474	}	1500	}
1475		1501
1476	sub get_text {
1477	$_[0]{text}
1478	}
1479
1480	sub size_request {
1481	my ($self) = @_;
1482
1483	my ($w, $h) = $self->SUPER::size_request;
1484
1485	($w + 1, $h) # add 1 for cursor
1486	}
1487
1488	sub size_allocate {
1489	my ($self, $w, $h) = @_;
1490
1491	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1492	}
1493
1494	sub set_text {	1502	sub set_text {
1495	my ($self, $text) = @_;	1503	my ($self, $text) = @_;
1496		1504
1497	$self->{cursor} = length $text;	1505	$self->{cursor} = length $text;
1498	$self->_set_text ($text);	1506	$self->_set_text ($text);
1499	$self->update;	1507	$self->update;
		1508	$self->check_size;
		1509	}
		1510
		1511	sub get_text {
		1512	$_[0]{text}
		1513	}
		1514
		1515	sub size_request {
		1516	my ($self) = @_;
		1517
		1518	my ($w, $h) = $self->SUPER::size_request;
		1519
		1520	($w + 1, $h) # add 1 for cursor
		1521	}
		1522
		1523	sub size_allocate {
		1524	my ($self, $w, $h) = @_;
		1525
		1526	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1500	}	1527	}
1501		1528
1502	sub key_down {	1529	sub key_down {
1503	my ($self, $ev) = @_;	1530	my ($self, $ev) = @_;
1504		1531
…		…
1506	my $sym = $ev->{sym};	1533	my $sym = $ev->{sym};
1507	my $uni = $ev->{unicode};	1534	my $uni = $ev->{unicode};
1508		1535
1509	my $text = $self->get_text;	1536	my $text = $self->get_text;
1510		1537
1511	if ($sym == 8) {	1538	if ($uni == 8) {
1512	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1539	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1513	} elsif ($sym == 127) {	1540	} elsif ($uni == 127) {
1514	substr $text, $self->{cursor}, 1, "";	1541	substr $text, $self->{cursor}, 1, "";
1515	} elsif ($sym == CFClient::SDLK_LEFT) {	1542	} elsif ($sym == CFClient::SDLK_LEFT) {
1516	--$self->{cursor} if $self->{cursor};	1543	--$self->{cursor} if $self->{cursor};
1517	} elsif ($sym == CFClient::SDLK_RIGHT) {	1544	} elsif ($sym == CFClient::SDLK_RIGHT) {
1518	++$self->{cursor} if $self->{cursor} < length $self->{text};	1545	++$self->{cursor} if $self->{cursor} < length $self->{text};
1519	} elsif ($sym == CFClient::SDLK_HOME) {	1546	} elsif ($sym == CFClient::SDLK_HOME) {
1520	$self->{cursor} = 0;	1547	$self->{cursor} = 0;
1521	} elsif ($sym == CFClient::SDLK_END) {	1548	} elsif ($sym == CFClient::SDLK_END) {
1522	$self->{cursor} = length $text;	1549	$self->{cursor} = length $text;
1523	} elsif ($sym == 27) {	1550	} elsif ($uni == 27) {
1524	$self->emit ('escape');	1551	$self->emit ('escape');
1525	} elsif ($uni) {	1552	} elsif ($uni) {
1526	substr $text, $self->{cursor}++, 0, chr $uni;	1553	substr $text, $self->{cursor}++, 0, chr $uni;
1527	}	1554	}
1528		1555
1529	$self->_set_text ($text);	1556	$self->_set_text ($text);
1530	$self->update;	1557	$self->update;
		1558	$self->check_size;
1531	}	1559	}
1532		1560
1533	sub focus_in {	1561	sub focus_in {
1534	my ($self) = @_;	1562	my ($self) = @_;
1535		1563
…		…
1664	my $class = shift;	1692	my $class = shift;
1665		1693
1666	$class->SUPER::new (	1694	$class->SUPER::new (
1667	padding => 4,	1695	padding => 4,
1668	fg => [1, 1, 1],	1696	fg => [1, 1, 1],
1669	bg => [1, 1, 1, 0.2],
1670	active_fg => [0, 0, 1],	1697	active_fg => [0, 0, 1],
1671	can_hover => 1,	1698	can_hover => 1,
1672	align => 0,	1699	align => 0,
1673	valign => 0,	1700	valign => 0,
1674	can_events => 1,	1701	can_events => 1,
…		…
1692		1719
1693	if ($GRAB == $self) {	1720	if ($GRAB == $self) {
1694	$self->{fg} = $self->{active_fg};	1721	$self->{fg} = $self->{active_fg};
1695	}	1722	}
1696		1723
1697	glEnable GL_BLEND;
1698	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1699	glEnable GL_TEXTURE_2D;	1724	glEnable GL_TEXTURE_2D;
1700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1725	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701	glColor 0, 0, 0, 1;	1726	glColor 0, 0, 0, 1;
1702		1727
1703	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1728	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1704		1729
1705	glDisable GL_TEXTURE_2D;	1730	glDisable GL_TEXTURE_2D;
1706	glDisable GL_BLEND;
1707		1731
1708	$self->SUPER::_draw;	1732	$self->SUPER::_draw;
1709	}	1733	}
1710		1734
1711	#############################################################################	1735	#############################################################################
…		…
1725		1749
1726	$class->SUPER::new (	1750	$class->SUPER::new (
1727	padding => 2,	1751	padding => 2,
1728	fg => [1, 1, 1],	1752	fg => [1, 1, 1],
1729	active_fg => [1, 1, 0],	1753	active_fg => [1, 1, 0],
		1754	bg => [0, 0, 0, 0.2],
		1755	active_bg => [1, 1, 1, 0.5],
1730	state => 0,	1756	state => 0,
1731	can_hover => 1,	1757	can_hover => 1,
1732	@_	1758	@_
1733	)	1759	)
1734	}	1760	}
…		…
1758		1784
1759	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1785	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1760		1786
1761	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1787	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1762		1788
1763	glEnable GL_BLEND;	1789	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1790
1764	glEnable GL_TEXTURE_2D;	1791	glEnable GL_TEXTURE_2D;
1765	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1766
1767	my $tex = $self->{state} ? $tex[1] : $tex[0];
1768
1769	$tex->draw_quad (0, 0, $s, $s);	1792	$tex->draw_quad_alpha (0, 0, $s, $s);
1770
1771	glDisable GL_TEXTURE_2D;	1793	glDisable GL_TEXTURE_2D;
1772	glDisable GL_BLEND;
1773	}	1794	}
1774		1795
1775	#############################################################################	1796	#############################################################################
1776		1797
1777	package CFClient::UI::Image;	1798	package CFClient::UI::Image;
…		…
1820	glTranslate 0, -$self->{w}, 0;	1841	glTranslate 0, -$self->{w}, 0;
1821		1842
1822	($w, $h) = ($h, $w);	1843	($w, $h) = ($h, $w);
1823	}	1844	}
1824		1845
1825	glEnable GL_BLEND;
1826	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827	glEnable GL_TEXTURE_2D;	1846	glEnable GL_TEXTURE_2D;
1828	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1847	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829		1848
1830	$tex->draw_quad (0, 0, $w, $h);	1849	$tex->draw_quad_alpha (0, 0, $w, $h);
1831		1850
1832	glDisable GL_BLEND;
1833	glDisable GL_TEXTURE_2D;	1851	glDisable GL_TEXTURE_2D;
1834	}	1852	}
1835		1853
1836	#############################################################################	1854	#############################################################################
1837		1855
…		…
2026	qw(s1_slider.png s1_slider_bg.png);	2044	qw(s1_slider.png s1_slider_bg.png);
2027		2045
2028	sub new {	2046	sub new {
2029	my $class = shift;	2047	my $class = shift;
2030		2048
2031	# range [value, low, high, page]	2049	# range [value, low, high, page, unit]
2032		2050
2033	# TODO: 0-width page	2051	# TODO: 0-width page
2034	# TODO: req_w/h are wrong with vertical	2052	# TODO: req_w/h are wrong with vertical
2035	# TODO: calculations are off	2053	# TODO: calculations are off
2036	my $self = $class->SUPER::new (	2054	my $self = $class->SUPER::new (
2037	fg => [1, 1, 1],	2055	fg => [1, 1, 1],
2038	active_fg => [0, 0, 0],	2056	active_fg => [0, 0, 0],
		2057	bg => [0, 0, 0, 0.2],
		2058	active_bg => [1, 1, 1, 0.5],
2039	range => [0, 0, 100, 10],	2059	range => [0, 0, 100, 10],
2040	req_w => $::WIDTH / 80,	2060	req_w => $::WIDTH / 80,
2041	req_h => $::WIDTH / 80,	2061	req_h => $::WIDTH / 80,
2042	vertical => 0,	2062	vertical => 0,
2043	can_hover => 1,	2063	can_hover => 1,
2044	inner_pad => 5,	2064	inner_pad => 0.02,
2045	@_	2065	@_
2046	);	2066	);
2047		2067
		2068	$self->set_value ($self->{range}[0]);
		2069	$self->update;
		2070
2048	$self	2071	$self
		2072	}
		2073
		2074	sub set_value {
		2075	my ($self, $value) = @_;
		2076
		2077	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2078
		2079	$hi = $lo + 1 if $hi <= $lo;
		2080
		2081	$value = $lo if $value < $lo;
		2082	$value = $hi if $value > $hi;
		2083
		2084	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2085	if $unit;
		2086
		2087	$page = $hi - $lo if $page > $hi - $lo;
		2088
		2089	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2090
		2091	if ($value != $old_value) {
		2092	$self->emit (changed => $value);
		2093	$self->update;
		2094	}
2049	}	2095	}
2050		2096
2051	sub size_request {	2097	sub size_request {
2052	my ($self) = @_;	2098	my ($self) = @_;
2053		2099
…		…
2066		2112
2067	sub mouse_motion {	2113	sub mouse_motion {
2068	my ($self, $ev, $x, $y) = @_;	2114	my ($self, $ev, $x, $y) = @_;
2069		2115
2070	if ($GRAB == $self) {	2116	if ($GRAB == $self) {
		2117	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2118
		2119	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2120
		2121	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2122
		2123	$self->set_value ($x * ($hi - $lo) + $lo);
		2124	}
		2125	}
		2126
		2127	sub update {
		2128	my ($self) = @_;
		2129
		2130	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2131	$self->set_value ($self->{range}[0]);
		2132
2071	my ($value, $lo, $hi, $page) = @{$self->{range}};	2133	my ($value, $lo, $hi, $page) = @{$self->{range}};
2072		2134
2073	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2135	my $inner_w = 1 - 2 * $self->{inner_pad};
2074		2136
2075	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2137	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2076	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2077		2138
2078	$x -= $inner_pad_px; # substract the padding	2139	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2079	$x = $x * ($hi - $lo) / $inner_w + $lo;	2140	$value = $self->{scale} * ($value - $lo);
2080	$x = $lo if $x < $lo;
2081	$x = $hi - $page if $x > $hi - $page;
2082	$self->{range}[0] = $x;
2083		2141
2084	$self->emit (changed => $x);	2142	$value = $self->{inner_pad} + ($value - $page * 0.5);
2085	$self->update;	2143
		2144	$value = 0 if $value < 0;
		2145	$page = 1 - $value if $value + $page > 1;
		2146
		2147	$self->{knob_x} = $value;
		2148	$self->{knob_w} = $page;
2086	}	2149	});
2087	}
2088		2150
2089	# the inner_* stuff is for generating a padding for the slider handle,	2151	$self->SUPER::update;
2090	# so that the handle doesn't leave the texture. This calculation isn't 100%
2091	# correct propably, but it does the job for now
2092	sub _calc_inner_pad_px {
2093	my ($self, $w) = @_;
2094	($w / 100) * $self->{inner_pad} # % to pixels
2095	}	2152	}
2096		2153
2097	sub _draw {	2154	sub _draw {
2098	my ($self) = @_;	2155	my ($self) = @_;
2099		2156
2100	$self->SUPER::_draw ();	2157	$self->SUPER::_draw ();
2101		2158
2102	my ($w, $h) = @$self{qw(w h)};	2159	glScale $self->{w}, $self->{h};
2103		2160
2104	if ($self->{vertical}) {	2161	if ($self->{vertical}) {
2105	# draw a vertical slider like a rotated horizontal slider	2162	# draw a vertical slider like a rotated horizontal slider
2106		2163
		2164	glTranslate 1, 0, 0;
2107	glRotate 90, 0, 0, 1;	2165	glRotate 90, 0, 0, 1;
2108	glTranslate 0, -$self->{w}, 0;
2109
2110	($w, $h) = ($h, $w);
2111	}	2166	}
2112		2167
2113	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2168	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2114	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2169	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2115		2170
2116	my ($value, $lo, $hi, $page) = @{$self->{range}};
2117
2118	$hi = $value + 1 if $lo == $hi;
2119
2120	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2121	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2122
2123	$page = int $page * $inner_w / ($hi - $lo);
2124	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2125
2126	$w -= $page;
2127	$page &= ~1;
2128	glTranslate $page * 0.5, 0, 0;
2129	$page ||= 2;
2130
2131	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2132	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2133
2134	glEnable GL_BLEND;
2135	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2136	glEnable GL_TEXTURE_2D;	2171	glEnable GL_TEXTURE_2D;
2137	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2172	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2138		2173
2139	# draw background	2174	# draw background
2140	$tex[1]->draw_quad (0, 0, $w, $h);	2175	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2141		2176
2142	# draw handle	2177	# draw handle
2143	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2178	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2144		2179
2145	glDisable GL_BLEND;
2146	glDisable GL_TEXTURE_2D;	2180	glDisable GL_TEXTURE_2D;
2147	}	2181	}
2148		2182
2149	#############################################################################	2183	#############################################################################
2150		2184
…		…
2161	fontsize => 1,	2195	fontsize => 1,
2162	can_events => 0,	2196	can_events => 0,
2163	#font => default_font	2197	#font => default_font
2164	@_,	2198	@_,
2165		2199
2166	layout => (new CFClient::Layout),	2200	layout => (new CFClient::Layout 1),
2167	par => [],	2201	par => [],
2168	height => 0,	2202	height => 0,
2169	children => [	2203	children => [
2170	(new CFClient::UI::Empty expand => 1),	2204	(new CFClient::UI::Empty expand => 1),
2171	(new CFClient::UI::Slider vertical => 1),	2205	(new CFClient::UI::Slider vertical => 1),
…		…
2182		2216
2183	$self->{fontsize} = $fontsize;	2217	$self->{fontsize} = $fontsize;
2184	$self->reflow;	2218	$self->reflow;
2185	}	2219	}
2186		2220
2187	sub text_height {
2188	my ($self, $text) = @_;
2189
2190	my $layout = $self->{layout};
2191
2192	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2193	$layout->set_width ($self->{children}[0]{w});
2194	$layout->set_text ($text);
2195
2196	($layout->size)[1]
2197	}
2198
2199	sub reflow {
2200	my ($self) = @_;
2201
2202	$self->{need_reflow}++;
2203	$self->update;
2204	}
2205
2206	sub size_allocate {	2221	sub size_allocate {
2207	my ($self, $w, $h) = @_;	2222	my ($self, $w, $h) = @_;
2208		2223
2209	$self->SUPER::size_allocate ($w, $h);	2224	$self->SUPER::size_allocate ($w, $h);
2210		2225
…		…
2213	$self->{layout}->set_width ($self->{children}[0]{w});	2228	$self->{layout}->set_width ($self->{children}[0]{w});
2214		2229
2215	$self->reflow;	2230	$self->reflow;
2216	}	2231	}
2217		2232
		2233	sub text_height {
		2234	my ($self, $text, $indent) = @_;
		2235
		2236	my $layout = $self->{layout};
		2237
		2238	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2239	$layout->set_width ($self->{children}[0]{w} - $indent);
		2240	$layout->set_markup ($text);
		2241
		2242	($layout->size)[1]
		2243	}
		2244
		2245	sub reflow {
		2246	my ($self) = @_;
		2247
		2248	$self->{need_reflow}++;
		2249	$self->update;
		2250	}
		2251
2218	sub add_paragraph {	2252	sub add_paragraph {
2219	my ($self, $color, $text) = @_;	2253	my ($self, $color, $text, $indent) = @_;
2220		2254
2221	#TODO: intelligently "reformat" paragraph	2255	#TODO: intelligently "reformat" paragraph
2222		2256
		2257	for my $line (split /\n/, $text) {
2223	my $height = $self->text_height ($text);	2258	my $height = $self->text_height ($line);
2224
2225	$self->{height} += $height;	2259	$self->{height} += $height;
2226
2227	push @{$self->{par}}, [$height, $color, $text];	2260	push @{$self->{par}}, [$height, $color, $indent, $line];
		2261	}
2228		2262
2229	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2263	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2230	$self->{children}[1]->update;	2264	$self->{children}[1]->update;
2231	}	2265	}
2232		2266
…		…
2237		2271
2238	return unless $self->{h} > 0;	2272	return unless $self->{h} > 0;
2239		2273
2240	delete $self->{texture};	2274	delete $self->{texture};
2241		2275
2242	$ROOT->on_refresh ($self, sub {	2276	$ROOT->on_post_alloc ($self, sub {
2243	if (delete $self->{need_reflow}) {	2277	if (delete $self->{need_reflow}) {
2244	my $height = 0;	2278	my $height = 0;
2245		2279
2246	$height += $_->[0] = $self->text_height ($_->[2])	2280	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2247	for @{$self->{par}};	2281	for @{$self->{par}};
2248		2282
2249	$self->{height} = $height;	2283	$self->{height} = $height;
2250		2284
2251	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2285	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		2286	$self->{children}[1]->update;
2252		2287
2253	delete $self->{texture};	2288	delete $self->{texture};
2254	}	2289	}
2255		2290
2256	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2291	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2257	glClearColor 0, 0, 0, 0;	2292	glClearColor 0.5, 0.5, 0.5, 0;
2258	glClear GL_COLOR_BUFFER_BIT;	2293	glClear GL_COLOR_BUFFER_BIT;
2259
2260	glEnable GL_BLEND;
2261	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2262	glEnable GL_TEXTURE_2D;
2263	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2264		2294
2265	my $top = int $self->{children}[1]{range}[0];	2295	my $top = int $self->{children}[1]{range}[0];
2266		2296
2267	my $y0 = $top;	2297	my $y0 = $top;
2268	my $y1 = $top + $self->{h};	2298	my $y1 = $top + $self->{h};
…		…
2271		2301
2272	my $layout = $self->{layout};	2302	my $layout = $self->{layout};
2273		2303
2274	$layout->set_font ($self->{font}) if $self->{font};	2304	$layout->set_font ($self->{font}) if $self->{font};
2275		2305
		2306	glEnable GL_BLEND;
		2307	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2308
2276	for my $par (@{$self->{par}}) {	2309	for my $par (@{$self->{par}}) {
2277	my $h = $par->[0];	2310	my $h = $par->[0];
2278		2311
2279	if ($y0 < $y + $h && $y < $y1) {	2312	if ($y0 < $y + $h && $y < $y1) {
		2313	$layout->set_foreground (@{ $par->[1] });
		2314	$layout->set_width ($self->{w} - $par->[2]);
2280	$layout->set_text ($par->[2]);	2315	$layout->set_markup ($par->[3]);
2281		2316
2282	glColor @{ $par->[1] };	2317	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2283	my ($W, $H) = $layout->size;	2318
2284	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2319	glRasterPos $par->[2], $y - $y0;
		2320	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2285	}	2321	}
2286		2322
2287	$y += $h;	2323	$y += $h;
2288	}	2324	}
2289		2325
2290	glDisable GL_TEXTURE_2D;
2291	glDisable GL_BLEND;	2326	glDisable GL_BLEND;
2292	};	2327	};
2293	});	2328	});
2294	}	2329	}
2295		2330
2296	sub _draw {	2331	sub _draw {
2297	my ($self) = @_;	2332	my ($self) = @_;
2298		2333
2299	glEnable GL_BLEND;
2300	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2301	glEnable GL_TEXTURE_2D;	2334	glEnable GL_TEXTURE_2D;
2302	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2335	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303	glColor 1, 1, 1, 1;	2336	glColor 1, 1, 1, 1;
2304	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2337	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2305	glDisable GL_TEXTURE_2D;	2338	glDisable GL_TEXTURE_2D;
2306	glDisable GL_BLEND;
2307		2339
2308	$self->{children}[1]->draw;	2340	$self->{children}[1]->draw;
2309		2341
2310	}	2342	}
2311		2343
…		…
2405	@_,	2437	@_,
2406	can_events => 0,	2438	can_events => 0,
2407	)	2439	)
2408	}	2440	}
2409		2441
2410	sub set_markup {	2442	sub set_tooltip_from {
2411	my ($self, $text) = @_;	2443	my ($self, $widget) = @_;
2412		2444
2413	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2445	$self->add (new CFClient::UI::Label
2414	$self->{label}->set_markup ($text);	2446	markup => $widget->{tooltip},
2415	$self->add ($self->{label});	2447	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2448	fontsize => 0.8,
		2449	fg => [0, 0, 0, 1],
		2450	ellipsise => 0,
		2451	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2452	);
2416	}	2453	}
2417		2454
2418	sub size_request {	2455	sub size_request {
2419	my ($self) = @_;	2456	my ($self) = @_;
2420
2421	$self->child->set_max_size ($::WIDTH * 0.3);
2422		2457
2423	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2458	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2424		2459
2425	($w + 4, $h + 4)	2460	($w + 4, $h + 4)
2426	}	2461	}
…		…
2432	}	2467	}
2433		2468
2434	sub _draw {	2469	sub _draw {
2435	my ($self) = @_;	2470	my ($self) = @_;
2436		2471
2437	glPushMatrix;
2438	glTranslate 0.375, 0.375;	2472	glTranslate 0.375, 0.375;
2439		2473
2440	my ($w, $h) = @$self{qw(w h)};	2474	my ($w, $h) = @$self{qw(w h)};
2441		2475
2442	glColor 1, 0.8, 0.4;	2476	glColor 1, 0.8, 0.4;
…		…
2453	glVertex 0 , $h;	2487	glVertex 0 , $h;
2454	glVertex $w, $h;	2488	glVertex $w, $h;
2455	glVertex $w, 0;	2489	glVertex $w, 0;
2456	glEnd;	2490	glEnd;
2457		2491
2458	glPopMatrix;	2492	glTranslate 2 - 0.375, 2 - 0.375;
2459
2460	glTranslate 2, 2;
2461	$self->SUPER::_draw;	2493	$self->SUPER::_draw;
2462	}	2494	}
2463		2495
2464	#############################################################################	2496	#############################################################################
2465		2497
…		…
2470	use CFClient::OpenGL;	2502	use CFClient::OpenGL;
2471		2503
2472	sub new {	2504	sub new {
2473	my $class = shift;	2505	my $class = shift;
2474		2506
2475	$class->SUPER::new (	2507	my $self = $class->SUPER::new (
2476	aspect => 1,	2508	aspect => 1,
2477	@_,	2509	@_,
2478	)	2510	);
		2511
		2512	if ($self->{anim} && $self->{animspeed}) {
		2513	Scalar::Util::weaken (my $widget = $self);
		2514
		2515	$self->{timer} = Event->timer (
		2516	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2517	hard => 1,
		2518	interval => $self->{animspeed},
		2519	cb => sub {
		2520	++$widget->{frame};
		2521	$widget->update;
		2522	},
		2523	);
		2524	}
		2525
		2526	$self
2479	}	2527	}
2480		2528
2481	sub size_request {	2529	sub size_request {
2482	(32, 8)	2530	(32, 8)
2483	}	2531	}
2484		2532
		2533	sub update {
		2534	my ($self) = @_;
		2535
		2536	return unless $self->{visible};
		2537
		2538	$self->SUPER::update;
		2539	}
		2540
2485	sub _draw {	2541	sub _draw {
2486	my ($self) = @_;	2542	my ($self) = @_;
2487		2543
2488	return unless $::CONN;#d# manage and cache textures differently	2544	return unless $::CONN;#d# manage and cache textures differently
		2545
		2546	my $face;
		2547
		2548	if ($self->{frame}) {
		2549	my $anim = $::CONN->{anim}[$self->{anim}];
		2550
		2551	$face = $anim->[ $self->{frame} % @$anim ]
		2552	if $anim && @$anim;
		2553	}
		2554
2489	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2555	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2490		2556
2491	# TODO animation
2492	if ($tex) {	2557	if ($tex) {
2493	glEnable GL_BLEND;
2494	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2495	glEnable GL_TEXTURE_2D;	2558	glEnable GL_TEXTURE_2D;
2496	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2559	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2497	glColor 1, 1, 1, 1;	2560	glColor 1, 1, 1, 1;
2498	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2561	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2499	glDisable GL_TEXTURE_2D;	2562	glDisable GL_TEXTURE_2D;
2500	glDisable GL_BLEND;
2501	}	2563	}
		2564	}
		2565
		2566	sub DESTROY {
		2567	my ($self) = @_;
		2568
		2569	$self->{timer}->cancel
		2570	if $self->{timer};
		2571
		2572	$self->SUPER::DESTROY;
2502	}	2573	}
2503		2574
2504	#############################################################################	2575	#############################################################################
2505		2576
2506	package CFClient::UI::InventoryItem;	2577	package CFClient::UI::InventoryItem;
2507		2578
2508	our @ISA = CFClient::UI::HBox::;	2579	our @ISA = CFClient::UI::HBox::;
		2580
		2581	sub _item_to_desc {
		2582	my ($item) = @_;
		2583
		2584	my $desc =
		2585	$item->{nrof} < 2
		2586	? $item->{name}
		2587	: "$item->{nrof} × $item->{name_pl}";
		2588
		2589	$item->{flags} & Crossfire::Protocol::F_OPEN
		2590	and $desc .= " (open)";
		2591	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2592	and $desc .= " (applied)";
		2593	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2594	and $desc .= " (unpaid)";
		2595	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2596	and $desc .= " (magic)";
		2597	$item->{flags} & Crossfire::Protocol::F_CURSED
		2598	and $desc .= " (cursed)";
		2599	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2600	and $desc .= " (damned)";
		2601	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2602	and $desc .= " *";
		2603
		2604	$desc
		2605	}
2509		2606
2510	sub new {	2607	sub new {
2511	my $class = shift;	2608	my $class = shift;
2512		2609
2513	my %args = @_;	2610	my %args = @_;
2514		2611
2515	my $item = $args{item};	2612	my $item = delete $args{item};
2516		2613
2517	my $desc = $item->{nrof} < 2	2614	my $desc = _item_to_desc ($item);
2518	? $item->{name}
2519	: "$item->{nrof} $item->{name_pl}";
2520
2521		2615
2522	my $self = $class->SUPER::new (	2616	my $self = $class->SUPER::new (
2523	can_hover => 1,	2617	can_hover => 1,
2524	can_events => 1,	2618	can_events => 1,
2525	tooltip => (CFClient::UI::Label->escape ($desc)	2619	tooltip => ((CFClient::UI::Label::escape $desc)
2526	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2620	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2527	connect_button_down => sub {	2621	connect_button_down => sub {
2528	my ($self, $ev, $x, $y) = @_;	2622	my ($self, $ev, $x, $y) = @_;
2529		2623
2530	# todo: maybe put examine on 1? but should just be a tooltip :(	2624	# todo: maybe put examine on 1? but should just be a tooltip :(
2531	if ($ev->{button} == 1) {	2625	if ($ev->{button} == 1) {
		2626	my $targ = $::CONN->{player}{tag};
		2627
		2628	if ($item->{container} == $::CONN->{player}{tag}) {
		2629	$targ = $main::OPENCONT;
		2630	}
		2631
2532	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2632	$::CONN->send ("move $targ $item->{tag} 0");
2533	} elsif ($ev->{button} == 2) {	2633	} elsif ($ev->{button} == 2) {
2534	$::CONN->send ("apply $item->{tag}");	2634	$::CONN->send ("apply $item->{tag}");
2535	} elsif ($ev->{button} == 3) {	2635	} elsif ($ev->{button} == 3) {
2536	CFClient::UI::Menu->new (	2636	my @menu_items = (
2537	items => [
2538	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2637	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2539	[
2540	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2541	sub { $::CONN->send ("lock $item->{tag}") },
2542	],
2543	["mark", sub { $::CONN->send ("mark $item->{tag}") }],	2638	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2544	["apply", sub { $::CONN->send ("apply $item->{tag}") }],	2639	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2640	(
		2641	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2642	? (
		2643	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2644	)
		2645	: (
		2646	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2545	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2647	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2648	)
2546	],	2649	),
2547	)->popup ($ev);	2650	);
		2651
		2652	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2548	}	2653	}
2549		2654
2550	1	2655	1
2551	},	2656	},
2552	%args	2657	%args
2553	);	2658	);
		2659
		2660
2554	$self->add(new CFClient::UI::Face	2661	$self->add (new CFClient::UI::Face
2555	can_events => 0,	2662	can_events => 0,
2556	face => $item->{face},	2663	face => $item->{face},
2557	anim => $item->{anim},	2664	anim => $item->{anim},
2558	animspeed => $item->{animspeed});	2665	animspeed => $item->{animspeed},
2559	$self->add(new CFClient::UI::Label	2666	);
2560	can_events => 0,	2667
2561	text => $desc);	2668	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2669
		2670	$self->{item} = $item;
		2671
		2672	$self->update_item;
2562		2673
2563	$self	2674	$self
		2675	}
		2676
		2677	sub update_item {
		2678	my ($self) = @_;
		2679
		2680	my $desc = _item_to_desc ($self->{item});
		2681
		2682	$self->{name_lbl}->set_text ($desc);
2564	}	2683	}
2565		2684
2566	#############################################################################	2685	#############################################################################
2567		2686
2568	package CFClient::UI::Inventory;	2687	package CFClient::UI::Inventory;
…		…
2584	my ($self, $items) = @_;	2703	my ($self, $items) = @_;
2585		2704
2586	$self->{scrolled}->clear;	2705	$self->{scrolled}->clear;
2587	return unless $items;	2706	return unless $items;
2588		2707
2589	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2708	my @items = sort {
		2709	($a->{type} <=> $b->{type})
		2710	or ($a->{name} cmp $b->{name})
		2711	} @$items;
2590		2712
2591	$self->{real_items} = \@items;	2713	$self->{real_items} = \@items;
2592		2714
2593	for my $item (@items) {	2715	for my $item (@items) {
2594	my $desc = $item->{nrof} < 2
2595	? $item->{name}
2596	: "$item->{nrof} $item->{name_pl}";
2597
2598	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);	2716	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2717	$item->update_item ();
2599	}	2718	}
		2719
		2720	$self->{scrolled}->add (@items);
2600		2721
2601	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2722	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2602	}	2723	}
2603		2724
2604	sub size_request {	2725	sub size_request {
…		…
2678	}	2799	}
2679	}	2800	}
2680		2801
2681	#############################################################################	2802	#############################################################################
2682		2803
		2804	package CFClient::UI::Statusbox;
		2805
		2806	our @ISA = CFClient::UI::VBox::;
		2807
		2808	sub new {
		2809	my $class = shift;
		2810
		2811	$class->SUPER::new (
		2812	fontsize => 0.8,
		2813	@_,
		2814	)
		2815	}
		2816
		2817	sub reorder {
		2818	my ($self) = @_;
		2819	my $NOW = time;
		2820
		2821	while (my ($k, $v) = each %{ $self->{item} }) {
		2822	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2823	}
		2824
		2825	my @widgets;
		2826
		2827	my @items = sort {
		2828	$a->{pri} <=> $b->{pri}
		2829	or $b->{id} <=> $a->{id}
		2830	} values %{ $self->{item} };
		2831
		2832	my $count = 10 + 1;
		2833	for my $item (@items) {
		2834	last unless --$count;
		2835
		2836	push @widgets, $item->{label} ||= do {
		2837	# TODO: doesn't handle markup well (read as: at all)
		2838	my $short = $item->{count} > 1
		2839	? "<b>$item->{count} ×</b> $item->{text}"
		2840	: $item->{text};
		2841
		2842	for ($short) {
		2843	s/^\s+//;
		2844	s/\s+/ /g;
		2845	}
		2846
		2847	new CFClient::UI::Label
		2848	markup => $short,
		2849	tooltip => $item->{tooltip},
		2850	tooltip_font => $::FONT_PROP,
		2851	tooltip_width => 0.67,
		2852	fontsize => $item->{fontsize} || $self->{fontsize},
		2853	max_w => $::WIDTH * 0.44,
		2854	fg => $item->{fg},
		2855	can_events => 1,
		2856	can_hover => 1
		2857	};
		2858	}
		2859
		2860	$self->clear;
		2861	$self->SUPER::add (reverse @widgets);
		2862	}
		2863
		2864	sub add {
		2865	my ($self, $text, %arg) = @_;
		2866
		2867	$text =~ s/^\s+//;
		2868	$text =~ s/\s+$//;
		2869
		2870	my $timeout = time + ((delete $arg{timeout}) || 60);
		2871
		2872	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2873
		2874	if (my $item = $self->{item}{$group}) {
		2875	if ($item->{text} eq $text) {
		2876	$item->{count}++;
		2877	} else {
		2878	$item->{count} = 1;
		2879	$item->{text} = $item->{tooltip} = $text;
		2880	}
		2881	$item->{id} = ++$self->{id};
		2882	$item->{timeout} = $timeout;
		2883	delete $item->{label};
		2884	} else {
		2885	$self->{item}{$group} = {
		2886	id => ++$self->{id},
		2887	text => $text,
		2888	timeout => $timeout,
		2889	tooltip => $text,
		2890	fg => [0.8, 0.8, 0.8, 0.8],
		2891	pri => 0,
		2892	count => 1,
		2893	%arg,
		2894	};
		2895	}
		2896
		2897	$self->reorder;
		2898	}
		2899
		2900	sub reconfigure {
		2901	my ($self) = @_;
		2902
		2903	delete $_->{label}
		2904	for values %{ $self->{item} || {} };
		2905
		2906	$self->reorder;
		2907	$self->SUPER::reconfigure;
		2908	}
		2909
		2910	#############################################################################
		2911
2683	package CFClient::UI::Root;	2912	package CFClient::UI::Root;
2684		2913
2685	our @ISA = CFClient::UI::Container::;	2914	our @ISA = CFClient::UI::Container::;
2686		2915
2687	use CFClient::OpenGL;	2916	use CFClient::OpenGL;
2688		2917
		2918	sub new {
		2919	my $class = shift;
		2920
		2921	$class->SUPER::new (
		2922	@_,
		2923	)
		2924	}
		2925
		2926	sub configure {
		2927	my ($self, $x, $y, $w, $h) = @_;
		2928
		2929	$self->{w} = $w;
		2930	$self->{h} = $h;
		2931	}
		2932
2689	sub check_size {	2933	sub check_size {
2690	my ($self) = @_;	2934	my ($self) = @_;
2691		2935
2692	$self->configure (0, 0, $self->{w}, $self->{h});	2936	$self->size_allocate ($self->{w}, $self->{h})
		2937	if $self->{w};
2693	}	2938	}
2694		2939
2695	sub size_request {	2940	sub size_request {
2696	my ($self) = @_;	2941	my ($self) = @_;
2697		2942
…		…
2699	}	2944	}
2700		2945
2701	sub size_allocate {	2946	sub size_allocate {
2702	my ($self, $w, $h) = @_;	2947	my ($self, $w, $h) = @_;
2703		2948
2704	my $old_w = $self->{old_w};	2949	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2705	my $old_h = $self->{old_h};	2950	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2706		2951
2707	if ($old_w && $old_h) {	2952	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2708	for my $child ($self->children) {	2953	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2709	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2710	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2711	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2712	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2713	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2714	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2715	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2716	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2717	}
2718	}
2719
2720	$self->{old_w} = $w;
2721	$self->{old_h} = $h;
2722	}
2723
2724	sub configure {
2725	my ($self, $x, $y, $w, $h) = @_;
2726
2727	$self->SUPER::configure ($x, $y, $w, $h);
2728		2954
2729	for my $child ($self->children) {	2955	for my $child ($self->children) {
2730	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2956	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2731		2957
		2958	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2959	if exists $child->{req_x};
		2960
		2961	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2962	if exists $child->{req_y};
		2963
2732	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2964	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2733	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2965	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2966
2734	$child->configure ($X, $Y, $W, $H);	2967	$child->configure ($X, $Y, $W, $H);
2735	}	2968	}
2736	}	2969	}
2737		2970
2738	sub _topleft {	2971	sub coord2local {
2739	my ($self, $x, $y) = @_;	2972	my ($self, $x, $y) = @_;
2740		2973
2741	($x, $y)	2974	($x, $y)
2742	}	2975	}
2743		2976
		2977	sub coord2global {
		2978	my ($self, $x, $y) = @_;
		2979
		2980	($x, $y)
		2981	}
		2982
2744	sub update {	2983	sub update {
2745	my ($self) = @_;	2984	my ($self) = @_;
2746		2985
2747	$self->check_size;	2986	$self->check_size;
2748	::refresh ();	2987	$::WANT_REFRESH++;
2749	}	2988	}
2750		2989
2751	sub add {	2990	sub add {
2752	my ($self, $child) = @_;	2991	my ($self, @children) = @_;
2753		2992
		2993	for my $child (@children) {
		2994	$child->{toplevel} = 1;
		2995
2754	# integerize window positions	2996	# integerise window positions
2755	$child->{x} = int $child->{x};	2997	$child->{x} = int $child->{x};
2756	$child->{y} = int $child->{y};	2998	$child->{y} = int $child->{y};
		2999	}
2757		3000
2758	$self->SUPER::add ($child);	3001	$self->SUPER::add (@children);
		3002
		3003	while (@children) {
		3004	my $w = pop @children;
		3005	push @children, $w->children;
		3006	$w->{visible} = 1;
		3007	}
		3008	}
		3009
		3010	sub remove {
		3011	my ($self, @children) = @_;
		3012
		3013	$self->SUPER::remove (@children);
		3014
		3015	while (@children) {
		3016	my $w = pop @children;
		3017	push @children, $w->children;
		3018	delete $w->{visible};
		3019	}
2759	}	3020	}
2760		3021
2761	sub on_refresh {	3022	sub on_refresh {
2762	my ($self, $id, $cb) = @_;	3023	my ($self, $id, $cb) = @_;
2763		3024
2764	$self->{refresh_hook}{$id} = $cb;	3025	$self->{refresh_hook}{$id} = $cb;
2765	}	3026	}
2766		3027
		3028	sub on_post_alloc {
		3029	my ($self, $id, $cb) = @_;
		3030
		3031	$self->{post_alloc_hook}{$id} = $cb;
		3032	}
		3033
2767	sub draw {	3034	sub draw {
2768	my ($self) = @_;	3035	my ($self) = @_;
2769		3036
2770	while (my $rcb = delete $self->{refresh_hook}) {	3037	while ($self->{refresh_hook}) {
2771	$_->() for values %$rcb;	3038	$_->()
		3039	for values %{delete $self->{refresh_hook}};
		3040	}
		3041
		3042	if ($self->{check_size}) {
		3043	my @queue = ([], []);
		3044
		3045	for (;;) {
		3046	if ($self->{check_size}) {
		3047	# heuristic: check containers last
		3048	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		3049	for values %{delete $self->{check_size}}
		3050	}
		3051
		3052	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		3053
		3054	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		3055	? @$widget{qw(user_w user_h)}
		3056	: $widget->size_request;
		3057
		3058	if (delete $widget->{force_alloc}
		3059	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3060	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3061
		3062	$widget->{req_w} = $w;
		3063	$widget->{req_h} = $h;
		3064
		3065	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3066
		3067	$widget->{parent}->check_size
		3068	if $widget->{parent};
		3069	}
		3070	}
		3071	}
		3072
		3073	while ($self->{size_alloc}) {
		3074	for (values %{delete $self->{size_alloc}}) {
		3075	my ($widget, $w, $h) = @$_;
		3076
		3077	$w = 0 if $w < 0;
		3078	$h = 0 if $h < 0;
		3079
		3080	$widget->{w} = $w;
		3081	$widget->{h} = $h;
		3082	$widget->size_allocate ($w, $h);
		3083	$widget->emit (size_allocate => $w, $h);
		3084	}
		3085	}
		3086
		3087	while ($self->{post_alloc_hook}) {
		3088	$_->()
		3089	for values %{delete $self->{post_alloc_hook}};
2772	}	3090	}
2773		3091
2774	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3092	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2775	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3093	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2776	glClear GL_COLOR_BUFFER_BIT;	3094	glClear GL_COLOR_BUFFER_BIT;
2777		3095
2778	glMatrixMode GL_PROJECTION;	3096	glMatrixMode GL_PROJECTION;
2779	glLoadIdentity;	3097	glLoadIdentity;
2780	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3098	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2781	glMatrixMode GL_MODELVIEW;	3099	glMatrixMode GL_MODELVIEW;
2782	glLoadIdentity;	3100	glLoadIdentity;
2783		3101
2784	$self->_draw;	3102	$self->_draw;
2785	}	3103	}
…		…
2787	#############################################################################	3105	#############################################################################
2788		3106
2789	package CFClient::UI;	3107	package CFClient::UI;
2790		3108
2791	$ROOT = new CFClient::UI::Root;	3109	$ROOT = new CFClient::UI::Root;
2792	$TOOLTIP = new CFClient::UI::Tooltip;	3110	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2793		3111
2794	1	3112	1
2795		3113

Diff Legend

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