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.186 by root, Mon May 8 20:39:34 2006 UTC vs.
Revision 1.230 by root, Wed May 24 21:59:54 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	}
…		…
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;
135	}	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	sub reconfigure_widgets {
		150	# make a copy, otherwise C<for> complains about freed values.
		151	my @widgets = values %WIDGET;
		152
		153	$_->reconfigure
		154	for @widgets;
		155	}
		156
		157	# call when resolution changes etc.
		158	sub rescale_widgets {
		159	my ($sx, $sy) = @_;
		160
		161	for my $widget (values %WIDGET) {
		162	if ($widget->{is_toplevel}) {
		163	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		164	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		165	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		166	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		167	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		168	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		169	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		170	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		171	}
		172	}
		173
		174	reconfigure_widgets;
136	}	175	}
137		176
138	#############################################################################	177	#############################################################################
139		178
140	package CFClient::UI::Base;	179	package CFClient::UI::Base;
…		…
158	if (/^connect_(.*)$/) {	197	if (/^connect_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	198	$self->connect ($1 => delete $self->{$_});
160	}	199	}
161	}	200	}
162		201
		202	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		203
163	$self	204	$self
164	}	205	}
165		206
166	sub destroy {	207	sub destroy {
167	my ($self) = @_;	208	my ($self) = @_;
…		…
170	%$self = ();	211	%$self = ();
171	}	212	}
172		213
173	sub show {	214	sub show {
174	my ($self) = @_;	215	my ($self) = @_;
175
176	return if $self->{parent};	216	return if $self->{parent};
177		217
178	$CFClient::UI::ROOT->add ($self);	218	$CFClient::UI::ROOT->add ($self);
		219	}
		220
		221	sub show_centered {
		222	my ($self) = @_;
		223	return if $self->{parent};
		224
		225	$self->show;
		226
		227	$CFClient::UI::ROOT->on_post_alloc (
		228	"centered $self" => sub {
		229	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		230	},
		231	);
179	}	232	}
180		233
181	sub hide {	234	sub hide {
182	my ($self) = @_;	235	my ($self) = @_;
183		236
…		…
232	$self->{y} = $y;	285	$self->{y} = $y;
233	$self->update;	286	$self->update;
234	}	287	}
235		288
236	if ($self->{w} != $w || $self->{h} != $h) {	289	if ($self->{w} != $w || $self->{h} != $h) {
237	$self->{w} = $w;	290	$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	}	291	}
244	}	292	}
245		293
246	sub size_allocate {	294	sub size_allocate {
247	# nothing to be done	295	# nothing to be done
248	}	296	}
249		297
		298	sub reconfigure {
		299	my ($self) = @_;
		300
		301	$self->check_size (1);
		302	$self->update;
		303	}
		304
250	sub children {	305	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	}	306	}
264		307
265	sub set_max_size {	308	sub set_max_size {
266	my ($self, $w, $h) = @_;	309	my ($self, $w, $h) = @_;
267		310
268	delete $self->{max_w}; $self->{max_w} = $w if $w;	311	delete $self->{max_w}; $self->{max_w} = $w if $w;
269	delete $self->{max_h}; $self->{max_h} = $h if $h;	312	delete $self->{max_h}; $self->{max_h} = $h if $h;
270	}	313	}
271		314
272	# return top left coordinates	315	sub set_tooltip {
273	sub _topleft {
274	my ($self, $x, $y) = @_;	316	my ($self, $tooltip) = @_;
275		317
276	$self->{parent}	318	$self->{tooltip} = $tooltip;
277	or Carp::confess "no parent widget in _topleft\n";#d#
278		319
279	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	320	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		321	delete $CFClient::UI::TOOLTIP->{owner};
		322	CFClient::UI::check_tooltip;
		323	}
280	}	324	}
281		325
282	# translate global coordinates to local coordinate system	326	# translate global coordinates to local coordinate system
283	sub coord2local {	327	sub coord2local {
284	my ($self, $x, $y) = @_;	328	my ($self, $x, $y) = @_;
285		329
286	my ($X, $Y) = $self->_topleft;	330	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287	($x - $X, $y - $Y)
288	}	331	}
289		332
290	# translate local coordinates to global coordinate system	333	# translate local coordinates to global coordinate system
291	sub coord2global {	334	sub coord2global {
292	my ($self, $x, $y) = @_;	335	my ($self, $x, $y) = @_;
293		336
294	my ($X, $Y) = $self->_topleft;	337	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295	($x + $X, $y + $Y)
296	}	338	}
297		339
298	sub focus_in {	340	sub focus_in {
299	my ($self) = @_;	341	my ($self) = @_;
300		342
…		…
372	glVertex $self->{w}, 0;	414	glVertex $self->{w}, 0;
373	glVertex $self->{w}, $self->{h};	415	glVertex $self->{w}, $self->{h};
374	glVertex 0 , $self->{h};	416	glVertex 0 , $self->{h};
375	glEnd;	417	glEnd;
376	glPopMatrix;	418	glPopMatrix;
377	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	419	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378	}	420	}
379	}	421	}
380		422
381	sub _draw {	423	sub _draw {
382	my ($self) = @_;	424	my ($self) = @_;
…		…
398		440
399	sub set_parent {	441	sub set_parent {
400	my ($self, $parent) = @_;	442	my ($self, $parent) = @_;
401		443
402	Scalar::Util::weaken ($self->{parent} = $parent);	444	Scalar::Util::weaken ($self->{parent} = $parent);
		445
		446	# TODO: req_w _does_change after ->reconfigure
		447	$self->check_size
		448	unless exists $self->{req_w};
		449
		450	$self->show;
403	}	451	}
404		452
405	sub check_size {	453	sub check_size {
406	my ($self) = @_;	454	my ($self, $forced) = @_;
407		455
408	$self->{parent}	456	$self->{force_alloc} = 1 if $forced;
409	or return 1;	457	$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	}	458	}
430		459
431	sub update {	460	sub update {
432	my ($self) = @_;	461	my ($self) = @_;
433		462
…		…
448	}	477	}
449		478
450	sub DESTROY {	479	sub DESTROY {
451	my ($self) = @_;	480	my ($self) = @_;
452		481
		482	delete $WIDGET{$self+0};
453	#$self->deactivate;	483	#$self->deactivate;
454	}	484	}
455		485
456	#############################################################################	486	#############################################################################
457		487
…		…
466	my $class = shift;	496	my $class = shift;
467		497
468	# range [value, low, high, page]	498	# range [value, low, high, page]
469		499
470	$class->SUPER::new (	500	$class->SUPER::new (
471	bg => [0, 0, 0, 0.2],	501	#bg => [0, 0, 0, 0.2],
472	active_bg => [1, 1, 1, 0.5],	502	#active_bg => [1, 1, 1, 0.5],
473	@_	503	@_
474	)	504	)
475	}	505	}
476		506
477	sub _draw {	507	sub _draw {
478	my ($self) = @_;	508	my ($self) = @_;
479		509
		510	my $color = $FOCUS == $self && $self->{active_bg}
		511	? $self->{active_bg}
		512	: $self->{bg};
		513
		514	if ($color && (@$color < 4 || $color->[3])) {
480	my ($w, $h) = @$self{qw(w h)};	515	my ($w, $h) = @$self{qw(w h)};
481		516
482	glEnable GL_BLEND;	517	glEnable GL_BLEND;
483	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	518	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
484	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	519	glColor @$color;
485		520
486	glBegin GL_QUADS;	521	glBegin GL_QUADS;
487	glVertex 0 , 0;	522	glVertex 0 , 0;
488	glVertex 0 , $h;	523	glVertex 0 , $h;
489	glVertex $w, $h;	524	glVertex $w, $h;
490	glVertex $w, 0;	525	glVertex $w, 0;
491	glEnd;	526	glEnd;
492		527
493	glDisable GL_BLEND;	528	glDisable GL_BLEND;
		529	}
494	}	530	}
495		531
496	#############################################################################	532	#############################################################################
497		533
498	package CFClient::UI::Empty;	534	package CFClient::UI::Empty;
…		…
530		566
531	$self	567	$self
532	}	568	}
533		569
534	sub add {	570	sub add {
535	my ($self, $child) = @_;	571	my ($self, @widgets) = @_;
536		572
537	$child->set_parent ($self);	573	$_->set_parent ($self)
		574	for @widgets;
538		575
539	use sort 'stable';	576	use sort 'stable';
540		577
541	$self->{children} = [	578	$self->{children} = [
542	sort { $a->{z} <=> $b->{z} }	579	sort { $a->{z} <=> $b->{z} }
543	@{$self->{children}}, $child	580	@{$self->{children}}, @widgets
544	];	581	];
545		582
546	$child->check_size;	583	$self->check_size (1);
547	$self->update;	584	$self->update;
548	}	585	}
549		586
550	sub children {	587	sub children {
551	@{ $_[0]{children} }	588	@{ $_[0]{children} }
…		…
658	}	695	}
659		696
660	sub update {	697	sub update {
661	my ($self) = @_;	698	my ($self) = @_;
662		699
663	$ROOT->on_refresh ($self => sub { $self->render_child });	700	$ROOT->on_post_alloc ($self => sub { $self->render_child });
664	$self->SUPER::update;	701	$self->SUPER::update;
665	}	702	}
666		703
667	sub size_allocate {	704	sub size_allocate {
668	my ($self, $w, $h) = @_;	705	my ($self, $w, $h) = @_;
…		…
681	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	718	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
682	glClearColor 0, 0, 0, 0;	719	glClearColor 0, 0, 0, 0;
683	glClear GL_COLOR_BUFFER_BIT;	720	glClear GL_COLOR_BUFFER_BIT;
684		721
685	$self->_render;	722	$self->_render;
686	# glColorMask 1, 1, 1, 0;
687	# glEnable GL_BLEND;
688	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
689	# glRasterPos 0, 0;
690	# glCopyPixels 0, 0, $self->{w}, $self->{h};
691	# glDisable GL_BLEND;
692	# glColorMask 1, 1, 1, 1;
693	};	723	};
694	}	724	}
695		725
696	sub _draw {	726	sub _draw {
697	my ($self) = @_;	727	my ($self) = @_;
…		…
699	my ($w, $h) = ($self->w, $self->h);	729	my ($w, $h) = ($self->w, $self->h);
700		730
701	my $tex = $self->{texture}	731	my $tex = $self->{texture}
702	or return;	732	or return;
703		733
704	glEnable GL_BLEND;
705	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
706	glEnable GL_TEXTURE_2D;	734	glEnable GL_TEXTURE_2D;
707	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	735	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708	glColor 0, 0, 0, 1;	736	glColor 1, 1, 1, 1;
709		737
710	$tex->draw_quad (0, 0, $w, $h);	738	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
711		739
712	glDisable GL_BLEND;
713	glDisable GL_TEXTURE_2D;	740	glDisable GL_TEXTURE_2D;
714	}	741	}
715		742
716	#############################################################################	743	#############################################################################
717		744
…		…
721		748
722	sub size_request {	749	sub size_request {
723	my ($self) = @_;	750	my ($self) = @_;
724		751
725	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	752	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
726	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
727		753
728	@$self{qw(child_w child_h)}	754	@$self{qw(child_w child_h)}
729	}	755	}
730		756
731	sub size_allocate {	757	sub size_allocate {
732	my ($self, $w, $h) = @_;	758	my ($self, $w, $h) = @_;
733		759
		760	my ($cw, $ch) = @$self{qw(child_w child_h)};
		761	# $w = $self->{w};
		762	$self->child->configure (0, 0, $cw, $ch);
734	$self->update;	763	$self->update;
735	}	764	}
736		765
737	sub set_offset {	766	sub set_offset {
738	my ($self, $x, $y) = @_;	767	my ($self, $x, $y) = @_;
…		…
741	$self->{view_y} = int $y;	770	$self->{view_y} = int $y;
742		771
743	$self->update;	772	$self->update;
744	}	773	}
745		774
746	# hmm, this does not work for topleft of $self... but we should not aks for that	775	# hmm, this does not work for topleft of $self... but we should not ask for that
747	sub _topleft {	776	sub coord2local {
748	my ($self, $x, $y) = @_;	777	my ($self, $x, $y) = @_;
749		778
750	$self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})	779	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		780	}
		781
		782	sub coord2global {
		783	my ($self, $x, $y) = @_;
		784
		785	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		786	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		787
		788	$self->SUPER::coord2global ($x, $y)
751	}	789	}
752		790
753	sub find_widget {	791	sub find_widget {
754	my ($self, $x, $y) = @_;	792	my ($self, $x, $y) = @_;
755		793
…		…
783		821
784	my $slider = new CFClient::UI::Slider	822	my $slider = new CFClient::UI::Slider
785	vertical => 1,	823	vertical => 1,
786	range => [0, 0, 1, 0.01], # HACK fix	824	range => [0, 0, 1, 0.01], # HACK fix
787	connect_changed => sub {	825	connect_changed => sub {
788	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	826	$self->{vp}->set_offset (0, $_[1]);
789	},	827	},
790	;	828	;
791		829
792	$self = $class->SUPER::new (	830	$self = $class->SUPER::new (
793	vp => (new CFClient::UI::ViewPort),	831	vp => (new CFClient::UI::ViewPort expand => 1),
794	slider => $slider,	832	slider => $slider,
795	@_,	833	@_,
796	);	834	);
797		835
798	$self->{vp}->add ($self->{scrolled});	836	$self->{vp}->add ($self->{scrolled});
…		…
800	$self->add ($self->{slider});	838	$self->add ($self->{slider});
801		839
802	$self	840	$self
803	}	841	}
804		842
		843	sub size_allocate {
		844	my ($self, $w, $h) = @_;
		845
		846	$self->SUPER::size_allocate ($w, $h);
		847
		848	my $child = $self->{vp}->child;
		849	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		850	}
		851
805	#TODO# update range on size_allocate depeneing on child	852	#TODO# update range on size_allocate depending on child
806	# update viewport offset on scroll	853	# update viewport offset on scroll
807		854
808	#############################################################################	855	#############################################################################
809		856
810	package CFClient::UI::Frame;	857	package CFClient::UI::Frame;
…		…
814	use CFClient::OpenGL;	861	use CFClient::OpenGL;
815		862
816	sub new {	863	sub new {
817	my $class = shift;	864	my $class = shift;
818		865
819	my $self = $class->SUPER::new (	866	$class->SUPER::new (
820	bg => [1, 1, 1, 1],	867	bg => undef,
821	border_bg => [1, 1, 1, 1],
822	border => 0.8,
823	@_	868	@_,
824	);	869	)
825
826	$self
827	}	870	}
828		871
829	sub _draw {	872	sub _draw {
830	my ($self) = @_;	873	my ($self) = @_;
831		874
832	my ($w, $h) = ($self->{w}, $self->{h});	875	if ($self->{bg}) {
		876	my ($w, $h) = @$self{qw(w h)};
833		877
834	glEnable GL_BLEND;	878	glEnable GL_BLEND;
835	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	879	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
836	glEnable GL_TEXTURE_2D;	880	glColor @{ $self->{bg} };
837	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
838		881
839	# glBegin GL_QUADS;	882	glBegin GL_QUADS;
840	# glColor 0, 0, 0, 0;
841	# glVertex 0 , 0;	883	glVertex 0 , 0;
842	# glVertex 0 , $h;	884	glVertex 0 , $h;
843	# glVertex $w, $h;	885	glVertex $w, $h;
844	# glVertex $w, 0;	886	glVertex $w, 0;
845	# glEnd;	887	glEnd;
846		888
847
848	$self->child->draw;
849	glDisable GL_BLEND;	889	glDisable GL_BLEND;
850	glDisable GL_TEXTURE_2D;	890	}
		891
		892	$self->SUPER::_draw;
851	}	893	}
852		894
853	#############################################################################	895	#############################################################################
854		896
855	package CFClient::UI::FancyFrame;	897	package CFClient::UI::FancyFrame;
…		…
866	my $class = shift;	908	my $class = shift;
867		909
868	# TODO: user_x, user_y, overwrite moveto?	910	# TODO: user_x, user_y, overwrite moveto?
869		911
870	my $self = $class->SUPER::new (	912	my $self = $class->SUPER::new (
871	bg => [1, 1, 1, 1],	913	bg => [1, 1, 1, 1],
872	border_bg => [1, 1, 1, 1],	914	border_bg => [1, 1, 1, 1],
873	border => 0.6,	915	border => 0.6,
		916	is_toplevel => 1,
874	can_events => 1,	917	can_events => 1,
875	@_	918	@_
876	);	919	);
877		920
878	$self->{title} &&= new CFClient::UI::Label	921	$self->{title} &&= new CFClient::UI::Label
879	align => 0,	922	align => 0,
…		…
903	my ($self, $w, $h) = @_;	946	my ($self, $w, $h) = @_;
904		947
905	$h -= List::Util::max 0, $self->border * 2;	948	$h -= List::Util::max 0, $self->border * 2;
906	$w -= List::Util::max 0, $self->border * 2;	949	$w -= List::Util::max 0, $self->border * 2;
907		950
908	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	951	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
909	if $self->{title};	952	if $self->{title};
910		953
911	$self->child->configure ($self->border, $self->border, $w, $h);	954	$self->child->configure ($self->border, $self->border, $w, $h);
912	}	955	}
913		956
…		…
971	my ($self) = @_;	1014	my ($self) = @_;
972		1015
973	my ($w, $h ) = ($self->{w}, $self->{h});	1016	my ($w, $h ) = ($self->{w}, $self->{h});
974	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1017	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
975		1018
976	glEnable GL_BLEND;
977	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
978	glEnable GL_TEXTURE_2D;	1019	glEnable GL_TEXTURE_2D;
979	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1020	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
980		1021
981	my $border = $self->border;	1022	my $border = $self->border;
982		1023
983	glColor @{ $self->{border_bg} };	1024	glColor @{ $self->{border_bg} };
984	$tex[1]->draw_quad (0, 0, $w, $border);	1025	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
985	$tex[3]->draw_quad (0, $border, $border, $ch);	1026	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
986	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1027	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
987	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1028	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
988		1029
989	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1030	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
990	my $bg = $tex[0];	1031	my $bg = $tex[0];
991		1032
992	# TODO: repeat texture not scale	1033	# TODO: repeat texture not scale
…		…
996	glColor @{ $self->{bg} };	1037	glColor @{ $self->{bg} };
997		1038
998	$bg->{s} = $rep_x;	1039	$bg->{s} = $rep_x;
999	$bg->{t} = $rep_y;	1040	$bg->{t} = $rep_y;
1000	$bg->{wrap_mode} = 1;	1041	$bg->{wrap_mode} = 1;
1001	$bg->draw_quad ($border, $border, $cw, $ch);	1042	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1043	}
1002		1044
1003	glDisable GL_TEXTURE_2D;	1045	glDisable GL_TEXTURE_2D;
1004	glDisable GL_BLEND;
1005	}
1006		1046
1007	$self->{title}->draw if $self->{title};	1047	$self->{title}->draw if $self->{title};
1008		1048
1009	$self->child->draw;	1049	$self->child->draw;
1010	}	1050	}
…		…
1237	}	1277	}
1238		1278
1239	sub size_allocate {	1279	sub size_allocate {
1240	my ($self, $w, $h) = @_;	1280	my ($self, $w, $h) = @_;
1241		1281
		1282	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1283
1242	my $children = $self->{children};	1284	my $children = $self->{children};
1243		1285
1244	my @h = map $_->{req_h}, @$children;	1286	my @h = map $_->{req_h}, @$children;
1245		1287
1246	my $req_h = List::Util::sum @h;	1288	my $req_h = List::Util::sum @h;
…		…
1275		1317
1276	#############################################################################	1318	#############################################################################
1277		1319
1278	package CFClient::UI::Label;	1320	package CFClient::UI::Label;
1279		1321
1280	our @ISA = CFClient::UI::Base::;	1322	our @ISA = CFClient::UI::DrawBG::;
1281		1323
1282	use CFClient::OpenGL;	1324	use CFClient::OpenGL;
1283		1325
1284	sub new {	1326	sub new {
1285	my ($class, %arg) = @_;	1327	my ($class, %arg) = @_;
1286		1328
1287	my $self = $class->SUPER::new (	1329	my $self = $class->SUPER::new (
1288	fg => [1, 1, 1],	1330	fg => [1, 1, 1],
		1331	#bg => none
		1332	#active_bg => none
1289	#font => default_font	1333	#font => default_font
		1334	#text => initial text
		1335	#markup => initial narkup
		1336	#max_w => maximum pixel width
		1337	ellipsise => 3, # end
		1338	layout => (new CFClient::Layout),
1290	fontsize => 1,	1339	fontsize => 1,
1291	text => "",
1292	align => -1,	1340	align => -1,
1293	valign => -1,	1341	valign => -1,
1294	padding => 2,	1342	padding => 2,
1295	layout => new CFClient::Layout,
1296	can_events => 0,	1343	can_events => 0,
1297	%arg	1344	%arg
1298	);	1345	);
1299		1346
1300	if (exists $self->{template}) {	1347	if (exists $self->{template}) {
1301	my $layout = new CFClient::Layout;	1348	my $layout = new CFClient::Layout;
1302	$layout->set_text (delete $self->{template});	1349	$layout->set_text (delete $self->{template});
1303	$self->{template} = $layout;	1350	$self->{template} = $layout;
1304	}	1351	}
1305		1352
1306	$self->set_text (delete $self->{text}) if exists $self->{text};	1353	if (exists $self->{markup}) {
1307	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1354	$self->set_markup (delete $self->{markup});
		1355	} else {
		1356	$self->set_text (delete $self->{text});
		1357	}
1308		1358
1309	$self	1359	$self
1310	}	1360	}
1311		1361
1312	sub escape {	1362	sub escape($) {
1313	local $_ = $_[1];	1363	local $_ = $_[0];
1314		1364
1315	s/&/&amp;/g;	1365	s/&/&amp;/g;
1316	s/>/&gt;/g;	1366	s/>/&gt;/g;
1317	s/</&lt;/g;	1367	s/</&lt;/g;
1318		1368
1319	$_[1]	1369	$_
1320	}	1370	}
1321		1371
1322	sub update {	1372	sub update {
1323	my ($self) = @_;	1373	my ($self) = @_;
1324		1374
…		…
1330	my ($self, $text) = @_;	1380	my ($self, $text) = @_;
1331		1381
1332	return if $self->{text} eq "T$text";	1382	return if $self->{text} eq "T$text";
1333	$self->{text} = "T$text";	1383	$self->{text} = "T$text";
1334		1384
		1385	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1335	$self->{layout}->set_text ($text);	1386	$self->{layout}->set_text ($text);
1336		1387
1337	delete $self->{texture};
1338	$self->update;	1388	$self->update;
1339	$self->check_size;	1389	$self->check_size;
1340	}	1390	}
1341		1391
1342	sub set_markup {	1392	sub set_markup {
1343	my ($self, $markup) = @_;	1393	my ($self, $markup) = @_;
1344		1394
1345	return if $self->{text} eq "M$markup";	1395	return if $self->{text} eq "M$markup";
1346	$self->{text} = "M$markup";	1396	$self->{text} = "M$markup";
1347		1397
		1398	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1399
		1400	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348	$self->{layout}->set_markup ($markup);	1401	$self->{layout}->set_markup ($markup);
1349		1402
1350	delete $self->{texture};
1351	$self->update;	1403	$self->update;
1352	$self->check_size;	1404	$self->check_size;
1353	}	1405	}
1354		1406
1355	sub size_request {	1407	sub size_request {
1356	my ($self) = @_;	1408	my ($self) = @_;
1357		1409
1358	$self->{layout}->set_font ($self->{font}) if $self->{font};	1410	$self->{layout}->set_font ($self->{font}) if $self->{font};
1359	$self->{layout}->set_width ($self->{max_w} || -1);	1411	$self->{layout}->set_width ($self->{max_w} || -1);
		1412	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1413	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1360	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1414	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1361		1415
1362	my ($w, $h) = $self->{layout}->size;	1416	my ($w, $h) = $self->{layout}->size;
1363		1417
1364	if (exists $self->{template}) {	1418	if (exists $self->{template}) {
…		…
1394	}	1448	}
1395		1449
1396	sub _draw {	1450	sub _draw {
1397	my ($self) = @_;	1451	my ($self) = @_;
1398		1452
		1453	$self->SUPER::_draw; # draw background, if applicable
		1454
1399	my $tex = $self->{texture} ||= do {	1455	my $tex = $self->{texture} ||= do {
		1456	$self->{layout}->set_foreground (@{$self->{fg}});
1400	$self->{layout}->set_font ($self->{font}) if $self->{font};	1457	$self->{layout}->set_font ($self->{font}) if $self->{font};
1401	$self->{layout}->set_width ($self->{w});	1458	$self->{layout}->set_width ($self->{w});
		1459	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1460	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1402	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1461	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1462
1403	new_from_layout CFClient::Texture $self->{layout}	1463	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1464
		1465	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1466	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1467	: ($self->{w} - $tex->{w}) * 0.5);
		1468
		1469	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1470	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1471	: ($self->{h} - $tex->{h}) * 0.5);
		1472
		1473	$tex
1404	};	1474	};
1405		1475
1406	glEnable GL_BLEND;
1407	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1408	glEnable GL_TEXTURE_2D;	1476	glEnable GL_TEXTURE_2D;
1409	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1477	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1410		1478
		1479	if ($tex->{format} == GL_ALPHA) {
1411	glColor @{$self->{fg}};	1480	glColor @{$self->{fg}};
1412
1413	$self->{ox} = int (
1414	$self->{align} < 0 ? $self->{padding}
1415	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1416	: ($self->{w} - $tex->{w}) * 0.5
1417	);
1418
1419	$self->{oy} = int (
1420	$self->{valign} < 0 ? $self->{padding}
1421	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1422	: ($self->{h} - $tex->{h}) * 0.5
1423	);
1424
1425	$tex->draw_quad ($self->{ox}, $self->{oy});	1481	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1482	} else {
		1483	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1484	}
1426		1485
1427	glDisable GL_TEXTURE_2D;	1486	glDisable GL_TEXTURE_2D;
1428	glDisable GL_BLEND;
1429	}	1487	}
1430		1488
1431	#############################################################################	1489	#############################################################################
1432		1490
1433	package CFClient::UI::EntryBase;	1491	package CFClient::UI::EntryBase;
…		…
1446	active_fg => [0, 0, 0],	1504	active_fg => [0, 0, 0],
1447	can_hover => 1,	1505	can_hover => 1,
1448	can_focus => 1,	1506	can_focus => 1,
1449	valign => 0,	1507	valign => 0,
1450	can_events => 1,	1508	can_events => 1,
		1509	#text => ...
1451	@_	1510	@_
1452	)	1511	)
1453	}	1512	}
1454		1513
1455	sub _set_text {	1514	sub _set_text {
…		…
1466		1525
1467	$text =~ s/./*/g if $self->{hidden};	1526	$text =~ s/./*/g if $self->{hidden};
1468	$self->{layout}->set_text ("$text ");	1527	$self->{layout}->set_text ("$text ");
1469		1528
1470	$self->emit (changed => $self->{text});	1529	$self->emit (changed => $self->{text});
1471	}
1472
1473	sub get_text {
1474	$_[0]{text}
1475	}
1476
1477	sub size_request {
1478	my ($self) = @_;
1479
1480	my ($w, $h) = $self->SUPER::size_request;
1481
1482	($w + 1, $h) # add 1 for cursor
1483	}
1484
1485	sub size_allocate {
1486	my ($self, $w, $h) = @_;
1487
1488	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1489	}	1530	}
1490		1531
1491	sub set_text {	1532	sub set_text {
1492	my ($self, $text) = @_;	1533	my ($self, $text) = @_;
1493		1534
1494	$self->{cursor} = length $text;	1535	$self->{cursor} = length $text;
1495	$self->_set_text ($text);	1536	$self->_set_text ($text);
1496	$self->update;	1537	$self->update;
		1538	$self->check_size;
		1539	}
		1540
		1541	sub get_text {
		1542	$_[0]{text}
		1543	}
		1544
		1545	sub size_request {
		1546	my ($self) = @_;
		1547
		1548	my ($w, $h) = $self->SUPER::size_request;
		1549
		1550	($w + 1, $h) # add 1 for cursor
		1551	}
		1552
		1553	sub size_allocate {
		1554	my ($self, $w, $h) = @_;
		1555
		1556	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1497	}	1557	}
1498		1558
1499	sub key_down {	1559	sub key_down {
1500	my ($self, $ev) = @_;	1560	my ($self, $ev) = @_;
1501		1561
…		…
1503	my $sym = $ev->{sym};	1563	my $sym = $ev->{sym};
1504	my $uni = $ev->{unicode};	1564	my $uni = $ev->{unicode};
1505		1565
1506	my $text = $self->get_text;	1566	my $text = $self->get_text;
1507		1567
1508	if ($sym == 8) {	1568	if ($uni == 8) {
1509	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1569	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1510	} elsif ($sym == 127) {	1570	} elsif ($uni == 127) {
1511	substr $text, $self->{cursor}, 1, "";	1571	substr $text, $self->{cursor}, 1, "";
1512	} elsif ($sym == CFClient::SDLK_LEFT) {	1572	} elsif ($sym == CFClient::SDLK_LEFT) {
1513	--$self->{cursor} if $self->{cursor};	1573	--$self->{cursor} if $self->{cursor};
1514	} elsif ($sym == CFClient::SDLK_RIGHT) {	1574	} elsif ($sym == CFClient::SDLK_RIGHT) {
1515	++$self->{cursor} if $self->{cursor} < length $self->{text};	1575	++$self->{cursor} if $self->{cursor} < length $self->{text};
1516	} elsif ($sym == CFClient::SDLK_HOME) {	1576	} elsif ($sym == CFClient::SDLK_HOME) {
1517	$self->{cursor} = 0;	1577	$self->{cursor} = 0;
1518	} elsif ($sym == CFClient::SDLK_END) {	1578	} elsif ($sym == CFClient::SDLK_END) {
1519	$self->{cursor} = length $text;	1579	$self->{cursor} = length $text;
1520	} elsif ($sym == 27) {	1580	} elsif ($uni == 27) {
1521	$self->emit ('escape');	1581	$self->emit ('escape');
1522	} elsif ($uni) {	1582	} elsif ($uni) {
1523	substr $text, $self->{cursor}++, 0, chr $uni;	1583	substr $text, $self->{cursor}++, 0, chr $uni;
1524	}	1584	}
1525		1585
1526	$self->_set_text ($text);	1586	$self->_set_text ($text);
1527	$self->update;	1587	$self->update;
		1588	$self->check_size;
1528	}	1589	}
1529		1590
1530	sub focus_in {	1591	sub focus_in {
1531	my ($self) = @_;	1592	my ($self) = @_;
1532		1593
…		…
1661	my $class = shift;	1722	my $class = shift;
1662		1723
1663	$class->SUPER::new (	1724	$class->SUPER::new (
1664	padding => 4,	1725	padding => 4,
1665	fg => [1, 1, 1],	1726	fg => [1, 1, 1],
1666	bg => [1, 1, 1, 0.2],
1667	active_fg => [0, 0, 1],	1727	active_fg => [0, 0, 1],
1668	can_hover => 1,	1728	can_hover => 1,
1669	align => 0,	1729	align => 0,
1670	valign => 0,	1730	valign => 0,
1671	can_events => 1,	1731	can_events => 1,
…		…
1689		1749
1690	if ($GRAB == $self) {	1750	if ($GRAB == $self) {
1691	$self->{fg} = $self->{active_fg};	1751	$self->{fg} = $self->{active_fg};
1692	}	1752	}
1693		1753
1694	glEnable GL_BLEND;
1695	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1696	glEnable GL_TEXTURE_2D;	1754	glEnable GL_TEXTURE_2D;
1697	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1755	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1698	glColor 0, 0, 0, 1;	1756	glColor 0, 0, 0, 1;
1699		1757
1700	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1758	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1701		1759
1702	glDisable GL_TEXTURE_2D;	1760	glDisable GL_TEXTURE_2D;
1703	glDisable GL_BLEND;
1704		1761
1705	$self->SUPER::_draw;	1762	$self->SUPER::_draw;
1706	}	1763	}
1707		1764
1708	#############################################################################	1765	#############################################################################
…		…
1722		1779
1723	$class->SUPER::new (	1780	$class->SUPER::new (
1724	padding => 2,	1781	padding => 2,
1725	fg => [1, 1, 1],	1782	fg => [1, 1, 1],
1726	active_fg => [1, 1, 0],	1783	active_fg => [1, 1, 0],
		1784	bg => [0, 0, 0, 0.2],
		1785	active_bg => [1, 1, 1, 0.5],
1727	state => 0,	1786	state => 0,
1728	can_hover => 1,	1787	can_hover => 1,
1729	@_	1788	@_
1730	)	1789	)
1731	}	1790	}
…		…
1755		1814
1756	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1815	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1757		1816
1758	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1817	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1759		1818
1760	glEnable GL_BLEND;	1819	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1820
1761	glEnable GL_TEXTURE_2D;	1821	glEnable GL_TEXTURE_2D;
1762	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1763
1764	my $tex = $self->{state} ? $tex[1] : $tex[0];
1765
1766	$tex->draw_quad (0, 0, $s, $s);	1822	$tex->draw_quad_alpha (0, 0, $s, $s);
1767
1768	glDisable GL_TEXTURE_2D;	1823	glDisable GL_TEXTURE_2D;
1769	glDisable GL_BLEND;
1770	}	1824	}
1771		1825
1772	#############################################################################	1826	#############################################################################
1773		1827
1774	package CFClient::UI::Image;	1828	package CFClient::UI::Image;
…		…
1817	glTranslate 0, -$self->{w}, 0;	1871	glTranslate 0, -$self->{w}, 0;
1818		1872
1819	($w, $h) = ($h, $w);	1873	($w, $h) = ($h, $w);
1820	}	1874	}
1821		1875
1822	glEnable GL_BLEND;
1823	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1824	glEnable GL_TEXTURE_2D;	1876	glEnable GL_TEXTURE_2D;
1825	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1877	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1826		1878
1827	$tex->draw_quad (0, 0, $w, $h);	1879	$tex->draw_quad_alpha (0, 0, $w, $h);
1828		1880
1829	glDisable GL_BLEND;
1830	glDisable GL_TEXTURE_2D;	1881	glDisable GL_TEXTURE_2D;
1831	}	1882	}
1832		1883
1833	#############################################################################	1884	#############################################################################
1834		1885
…		…
2023	qw(s1_slider.png s1_slider_bg.png);	2074	qw(s1_slider.png s1_slider_bg.png);
2024		2075
2025	sub new {	2076	sub new {
2026	my $class = shift;	2077	my $class = shift;
2027		2078
2028	# range [value, low, high, page]	2079	# range [value, low, high, page, unit]
2029		2080
2030	# TODO: 0-width page	2081	# TODO: 0-width page
2031	# TODO: req_w/h are wrong with vertical	2082	# TODO: req_w/h are wrong with vertical
2032	# TODO: calculations are off	2083	# TODO: calculations are off
2033	my $self = $class->SUPER::new (	2084	my $self = $class->SUPER::new (
2034	fg => [1, 1, 1],	2085	fg => [1, 1, 1],
2035	active_fg => [0, 0, 0],	2086	active_fg => [0, 0, 0],
		2087	bg => [0, 0, 0, 0.2],
		2088	active_bg => [1, 1, 1, 0.5],
2036	range => [0, 0, 100, 10],	2089	range => [0, 0, 100, 10, 0],
2037	req_w => $::WIDTH / 80,	2090	req_w => $::WIDTH / 80,
2038	req_h => $::WIDTH / 80,	2091	req_h => $::WIDTH / 80,
2039	vertical => 0,	2092	vertical => 0,
2040	can_hover => 1,	2093	can_hover => 1,
2041	inner_pad => 5,	2094	inner_pad => 0.02,
2042	@_	2095	@_
2043	);	2096	);
2044		2097
		2098	$self->set_value ($self->{range}[0]);
		2099	$self->update;
		2100
2045	$self	2101	$self
		2102	}
		2103
		2104	sub set_range {
		2105	my ($self, $range) = @_;
		2106
		2107	$self->{range} = $range;
		2108
		2109	$self->update;
		2110	}
		2111
		2112	sub set_value {
		2113	my ($self, $value) = @_;
		2114
		2115	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2116
		2117	$hi = $lo + 1 if $hi <= $lo;
		2118
		2119	$page = $hi - $lo if $page > $hi - $lo;
		2120
		2121	$value = $lo if $value < $lo;
		2122	$value = $hi - $page if $value > $hi - $page;
		2123
		2124	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2125	if $unit;
		2126
		2127	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2128
		2129	if ($value != $old_value) {
		2130	$self->emit (changed => $value);
		2131	$self->update;
		2132	}
2046	}	2133	}
2047		2134
2048	sub size_request {	2135	sub size_request {
2049	my ($self) = @_;	2136	my ($self) = @_;
2050		2137
…		…
2056		2143
2057	sub button_down {	2144	sub button_down {
2058	my ($self, $ev, $x, $y) = @_;	2145	my ($self, $ev, $x, $y) = @_;
2059		2146
2060	$self->SUPER::button_down ($ev, $x, $y);	2147	$self->SUPER::button_down ($ev, $x, $y);
		2148
		2149	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2150
2061	$self->mouse_motion ($ev, $x, $y);	2151	$self->mouse_motion ($ev, $x, $y);
2062	}	2152	}
2063		2153
2064	sub mouse_motion {	2154	sub mouse_motion {
2065	my ($self, $ev, $x, $y) = @_;	2155	my ($self, $ev, $x, $y) = @_;
2066		2156
2067	if ($GRAB == $self) {	2157	if ($GRAB == $self) {
		2158	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2159
		2160	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2161
		2162	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2163
		2164	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2165	}
		2166	}
		2167
		2168	sub update {
		2169	my ($self) = @_;
		2170
		2171	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2172	$self->set_value ($self->{range}[0]);
		2173
2068	my ($value, $lo, $hi, $page) = @{$self->{range}};	2174	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2175	my $range = ($hi - $page - $lo) || 1e-100;
2069		2176
2070	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2177	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2071		2178
2072	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2179	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2073	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2180	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2074		2181
2075	$x -= $inner_pad_px; # substract the padding	2182	$value = ($value - $lo) / $range;
2076	$x = $x * ($hi - $lo) / $inner_w + $lo;	2183	$value = $value * $self->{scale} + $self->{offset};
2077	$x = $lo if $x < $lo;
2078	$x = $hi - $page if $x > $hi - $page;
2079	$self->{range}[0] = $x;
2080		2184
2081	$self->emit (changed => $x);	2185	$self->{knob_x} = $value - $knob_w * 0.5;
2082	$self->update;	2186	$self->{knob_w} = $knob_w;
2083	}	2187	});
2084	}
2085		2188
2086	# the inner_* stuff is for generating a padding for the slider handle,	2189	$self->SUPER::update;
2087	# so that the handle doesn't leave the texture. This calculation isn't 100%
2088	# correct propably, but it does the job for now
2089	sub _calc_inner_pad_px {
2090	my ($self, $w) = @_;
2091	($w / 100) * $self->{inner_pad} # % to pixels
2092	}	2190	}
2093		2191
2094	sub _draw {	2192	sub _draw {
2095	my ($self) = @_;	2193	my ($self) = @_;
2096		2194
2097	$self->SUPER::_draw ();	2195	$self->SUPER::_draw ();
2098		2196
2099	my ($w, $h) = @$self{qw(w h)};	2197	glScale $self->{w}, $self->{h};
2100		2198
2101	if ($self->{vertical}) {	2199	if ($self->{vertical}) {
2102	# draw a vertical slider like a rotated horizontal slider	2200	# draw a vertical slider like a rotated horizontal slider
2103		2201
		2202	glTranslate 1, 0, 0;
2104	glRotate 90, 0, 0, 1;	2203	glRotate 90, 0, 0, 1;
2105	glTranslate 0, -$self->{w}, 0;
2106
2107	($w, $h) = ($h, $w);
2108	}	2204	}
2109		2205
2110	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2206	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2111	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2207	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2112		2208
2113	my ($value, $lo, $hi, $page) = @{$self->{range}};
2114
2115	$hi = $value + 1 if $lo == $hi;
2116
2117	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2118	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2119
2120	$page = int $page * $inner_w / ($hi - $lo);
2121	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2122
2123	$w -= $page;
2124	$page &= ~1;
2125	glTranslate $page * 0.5, 0, 0;
2126	$page ||= 2;
2127
2128	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2129	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2130
2131	glEnable GL_BLEND;
2132	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2133	glEnable GL_TEXTURE_2D;	2209	glEnable GL_TEXTURE_2D;
2134	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2210	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2135		2211
2136	# draw background	2212	# draw background
2137	$tex[1]->draw_quad (0, 0, $w, $h);	2213	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2138		2214
2139	# draw handle	2215	# draw handle
2140	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2216	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2141		2217
2142	glDisable GL_BLEND;
2143	glDisable GL_TEXTURE_2D;	2218	glDisable GL_TEXTURE_2D;
2144	}	2219	}
		2220
		2221	#############################################################################
		2222
		2223	package CFClient::UI::ValSlider;
		2224
		2225	our @ISA = CFClient::UI::HBox::;
		2226
		2227	sub new {
		2228	my ($class, %arg) = @_;
		2229
		2230	my $range = delete $arg{range};
		2231
		2232	my $self = $class->SUPER::new (
		2233	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2234	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2235	to_value => sub { shift },
		2236	from_value => sub { shift },
		2237	%arg,
		2238	);
		2239
		2240	$self->{slider}->connect (changed => sub {
		2241	my ($self, $value) = @_;
		2242	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2243	$self->{parent}->emit (changed => $value);
		2244	});
		2245
		2246	# $self->{entry}->connect (changed => sub {
		2247	# my ($self, $value) = @_;
		2248	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2249	# $self->{parent}->emit (changed => $value);
		2250	# });
		2251
		2252	$self->add ($self->{slider}, $self->{entry});
		2253
		2254	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2255
		2256	$self
		2257	}
		2258
		2259	sub set_range { shift->{slider}->set_range (@_) }
		2260	sub set_value { shift->{slider}->set_value (@_) }
2145		2261
2146	#############################################################################	2262	#############################################################################
2147		2263
2148	package CFClient::UI::TextView;	2264	package CFClient::UI::TextView;
2149		2265
…		…
2158	fontsize => 1,	2274	fontsize => 1,
2159	can_events => 0,	2275	can_events => 0,
2160	#font => default_font	2276	#font => default_font
2161	@_,	2277	@_,
2162		2278
2163	layout => (new CFClient::Layout),	2279	layout => (new CFClient::Layout 1),
2164	par => [],	2280	par => [],
2165	height => 0,	2281	height => 0,
2166	children => [	2282	children => [
2167	(new CFClient::UI::Empty expand => 1),	2283	(new CFClient::UI::Empty expand => 1),
2168	(new CFClient::UI::Slider vertical => 1),	2284	(new CFClient::UI::Slider vertical => 1),
…		…
2179		2295
2180	$self->{fontsize} = $fontsize;	2296	$self->{fontsize} = $fontsize;
2181	$self->reflow;	2297	$self->reflow;
2182	}	2298	}
2183		2299
2184	sub text_height {
2185	my ($self, $text) = @_;
2186
2187	my $layout = $self->{layout};
2188
2189	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2190	$layout->set_width ($self->{children}[0]{w});
2191	$layout->set_text ($text);
2192
2193	($layout->size)[1]
2194	}
2195
2196	sub reflow {
2197	my ($self) = @_;
2198
2199	$self->{need_reflow}++;
2200	$self->update;
2201	}
2202
2203	sub size_allocate {	2300	sub size_allocate {
2204	my ($self, $w, $h) = @_;	2301	my ($self, $w, $h) = @_;
2205		2302
2206	$self->SUPER::size_allocate ($w, $h);	2303	$self->SUPER::size_allocate ($w, $h);
2207		2304
…		…
2210	$self->{layout}->set_width ($self->{children}[0]{w});	2307	$self->{layout}->set_width ($self->{children}[0]{w});
2211		2308
2212	$self->reflow;	2309	$self->reflow;
2213	}	2310	}
2214		2311
		2312	sub text_size {
		2313	my ($self, $text, $indent) = @_;
		2314
		2315	my $layout = $self->{layout};
		2316
		2317	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2318	$layout->set_width ($self->{children}[0]{w} - $indent);
		2319	$layout->set_markup ($text);
		2320
		2321	$layout->size
		2322	}
		2323
		2324	sub reflow {
		2325	my ($self) = @_;
		2326
		2327	$self->{need_reflow}++;
		2328	$self->update;
		2329	}
		2330
		2331	sub set_offset {
		2332	my ($self, $offset) = @_;
		2333
		2334	# todo: base offset on lines or so, not on pixels
		2335	$self->{children}[1]->set_value ($offset);
		2336	}
		2337
		2338	sub clear {
		2339	my ($self) = @_;
		2340
		2341	$self->{par} = [];
		2342	$self->{height} = 0;
		2343	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2344	}
		2345
2215	sub add_paragraph {	2346	sub add_paragraph {
2216	my ($self, $color, $text) = @_;	2347	my ($self, $color, $text, $indent) = @_;
2217		2348
2218	#TODO: intelligently "reformat" paragraph	2349	for my $line (split /\n/, $text) {
2219		2350	my ($w, $h) = $self->text_size ($line);
2220	my $height = $self->text_height ($text);
2221
2222	$self->{height} += $height;	2351	$self->{height} += $h;
		2352	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2353	}
2223		2354
2224	push @{$self->{par}}, [$height, $color, $text];
2225
2226	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2355	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2227	$self->{children}[1]->update;
2228	}	2356	}
2229		2357
2230	sub update {	2358	sub update {
2231	my ($self) = @_;	2359	my ($self) = @_;
2232		2360
…		…
2234		2362
2235	return unless $self->{h} > 0;	2363	return unless $self->{h} > 0;
2236		2364
2237	delete $self->{texture};	2365	delete $self->{texture};
2238		2366
2239	$ROOT->on_refresh ($self, sub {	2367	$ROOT->on_post_alloc ($self, sub {
		2368	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2369
2240	if (delete $self->{need_reflow}) {	2370	if (delete $self->{need_reflow}) {
2241	my $height = 0;	2371	my $height = 0;
2242		2372
2243	$height += $_->[0] = $self->text_height ($_->[2])	2373	my $layout = $self->{layout};
		2374
		2375	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2376
2244	for @{$self->{par}};	2377	for (@{$self->{par}}) {
		2378	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2379	$layout->set_width ($W - $_->[3]);
		2380	$layout->set_markup ($_->[4]);
		2381	my ($w, $h) = $layout->size;
		2382	$_->[0] = $w + $_->[3];
		2383	$_->[1] = $h;
		2384	}
		2385
		2386	$height += $_->[1];
		2387	}
2245		2388
2246	$self->{height} = $height;	2389	$self->{height} = $height;
2247		2390
2248	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2391	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2249		2392
2250	delete $self->{texture};	2393	delete $self->{texture};
2251	}	2394	}
2252		2395
2253	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2396	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2254	glClearColor 0, 0, 0, 0;	2397	glClearColor 0.5, 0.5, 0.5, 0;
2255	glClear GL_COLOR_BUFFER_BIT;	2398	glClear GL_COLOR_BUFFER_BIT;
2256		2399
		2400	my $top = int $self->{children}[1]{range}[0];
		2401
		2402	my $y0 = $top;
		2403	my $y1 = $top + $H;
		2404
		2405	my $y = 0;
		2406
		2407	my $layout = $self->{layout};
		2408
		2409	$layout->set_font ($self->{font}) if $self->{font};
		2410
2257	glEnable GL_BLEND;	2411	glEnable GL_BLEND;
		2412	#TODO# not correct in windows where rgba is forced off
2258	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2413	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2259	glEnable GL_TEXTURE_2D;
2260	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261
2262	my $top = int $self->{children}[1]{range}[0];
2263
2264	my $y0 = $top;
2265	my $y1 = $top + $self->{h};
2266
2267	my $y = 0;
2268
2269	my $layout = $self->{layout};
2270
2271	$layout->set_font ($self->{font}) if $self->{font};
2272		2414
2273	for my $par (@{$self->{par}}) {	2415	for my $par (@{$self->{par}}) {
2274	my $h = $par->[0];	2416	my $h = $par->[1];
2275		2417
2276	if ($y0 < $y + $h && $y < $y1) {	2418	if ($y0 < $y + $h && $y < $y1) {
		2419	$layout->set_foreground (@{ $par->[2] });
		2420	$layout->set_width ($W - $par->[3]);
2277	$layout->set_text ($par->[2]);	2421	$layout->set_markup ($par->[4]);
2278		2422
2279	glColor @{ $par->[1] };	2423	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280	my ($W, $H) = $layout->size;	2424
2281	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2425	glRasterPos $par->[3], $y - $y0;
		2426	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2282	}	2427	}
2283		2428
2284	$y += $h;	2429	$y += $h;
2285	}	2430	}
2286		2431
2287	glDisable GL_TEXTURE_2D;
2288	glDisable GL_BLEND;	2432	glDisable GL_BLEND;
2289	};	2433	};
2290	});	2434	});
2291	}	2435	}
2292		2436
2293	sub _draw {	2437	sub _draw {
2294	my ($self) = @_;	2438	my ($self) = @_;
2295		2439
2296	glEnable GL_BLEND;
2297	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2298	glEnable GL_TEXTURE_2D;	2440	glEnable GL_TEXTURE_2D;
2299	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2441	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300	glColor 1, 1, 1, 1;	2442	glColor 1, 1, 1, 1;
2301	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2443	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2302	glDisable GL_TEXTURE_2D;	2444	glDisable GL_TEXTURE_2D;
2303	glDisable GL_BLEND;
2304		2445
2305	$self->{children}[1]->draw;	2446	$self->{children}[1]->draw;
2306		2447
2307	}	2448	}
2308		2449
…		…
2402	@_,	2543	@_,
2403	can_events => 0,	2544	can_events => 0,
2404	)	2545	)
2405	}	2546	}
2406		2547
2407	sub set_markup {	2548	sub set_tooltip_from {
2408	my ($self, $text) = @_;	2549	my ($self, $widget) = @_;
2409		2550
2410	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2551	$self->add (new CFClient::UI::Label
2411	$self->{label}->set_markup ($text);	2552	markup => $widget->{tooltip},
2412	$self->add ($self->{label});	2553	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2554	fontsize => 0.8,
		2555	fg => [0, 0, 0, 1],
		2556	ellipsise => 0,
		2557	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2558	);
2413	}	2559	}
2414		2560
2415	sub size_request {	2561	sub size_request {
2416	my ($self) = @_;	2562	my ($self) = @_;
2417
2418	$self->child->set_max_size ($::WIDTH * 0.3);
2419		2563
2420	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2564	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2421		2565
2422	($w + 4, $h + 4)	2566	($w + 4, $h + 4)
2423	}	2567	}
…		…
2429	}	2573	}
2430		2574
2431	sub _draw {	2575	sub _draw {
2432	my ($self) = @_;	2576	my ($self) = @_;
2433		2577
2434	glPushMatrix;
2435	glTranslate 0.375, 0.375;	2578	glTranslate 0.375, 0.375;
2436		2579
2437	my ($w, $h) = @$self{qw(w h)};	2580	my ($w, $h) = @$self{qw(w h)};
2438		2581
2439	glColor 1, 0.8, 0.4;	2582	glColor 1, 0.8, 0.4;
…		…
2450	glVertex 0 , $h;	2593	glVertex 0 , $h;
2451	glVertex $w, $h;	2594	glVertex $w, $h;
2452	glVertex $w, 0;	2595	glVertex $w, 0;
2453	glEnd;	2596	glEnd;
2454		2597
2455	glPopMatrix;	2598	glTranslate 2 - 0.375, 2 - 0.375;
2456
2457	glTranslate 2, 2;
2458	$self->SUPER::_draw;	2599	$self->SUPER::_draw;
2459	}	2600	}
2460		2601
2461	#############################################################################	2602	#############################################################################
2462		2603
…		…
2467	use CFClient::OpenGL;	2608	use CFClient::OpenGL;
2468		2609
2469	sub new {	2610	sub new {
2470	my $class = shift;	2611	my $class = shift;
2471		2612
2472	$class->SUPER::new (	2613	my $self = $class->SUPER::new (
2473	aspect => 1,	2614	aspect => 1,
2474	@_,	2615	@_,
2475	)	2616	);
		2617
		2618	if ($self->{anim} && $self->{animspeed}) {
		2619	Scalar::Util::weaken (my $widget = $self);
		2620
		2621	$self->{timer} = Event->timer (
		2622	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2623	hard => 1,
		2624	interval => $self->{animspeed},
		2625	cb => sub {
		2626	++$widget->{frame};
		2627	$widget->update;
		2628	},
		2629	);
		2630	}
		2631
		2632	$self
2476	}	2633	}
2477		2634
2478	sub size_request {	2635	sub size_request {
2479	(32, 8)	2636	(32, 8)
2480	}	2637	}
2481		2638
		2639	sub update {
		2640	my ($self) = @_;
		2641
		2642	return unless $self->{visible};
		2643
		2644	$self->SUPER::update;
		2645	}
		2646
2482	sub _draw {	2647	sub _draw {
2483	my ($self) = @_;	2648	my ($self) = @_;
2484		2649
2485	return unless $::CONN;#d# manage and cache textures differently	2650	return unless $::CONN;
		2651
		2652	my $face;
		2653
		2654	if ($self->{frame}) {
		2655	my $anim = $::CONN->{anim}[$self->{anim}];
		2656
		2657	$face = $anim->[ $self->{frame} % @$anim ]
		2658	if $anim && @$anim;
		2659	}
		2660
2486	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2661	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2487		2662
2488	# TODO animation
2489	if ($tex) {	2663	if ($tex) {
2490	glEnable GL_BLEND;
2491	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492	glEnable GL_TEXTURE_2D;	2664	glEnable GL_TEXTURE_2D;
2493	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2665	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494	glColor 1, 1, 1, 1;	2666	glColor 1, 1, 1, 1;
2495	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2667	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2496	glDisable GL_TEXTURE_2D;	2668	glDisable GL_TEXTURE_2D;
2497	glDisable GL_BLEND;
2498	}	2669	}
		2670	}
		2671
		2672	sub DESTROY {
		2673	my ($self) = @_;
		2674
		2675	$self->{timer}->cancel
		2676	if $self->{timer};
		2677
		2678	$self->SUPER::DESTROY;
2499	}	2679	}
2500		2680
2501	#############################################################################	2681	#############################################################################
2502		2682
2503	package CFClient::UI::InventoryItem;	2683	package CFClient::UI::InventoryItem;
2504		2684
2505	our @ISA = CFClient::UI::HBox::;	2685	our @ISA = CFClient::UI::HBox::;
		2686
		2687	sub _item_to_desc {
		2688	my ($item) = @_;
		2689
		2690	my $desc =
		2691	$item->{nrof} < 2
		2692	? $item->{name}
		2693	: "$item->{nrof} × $item->{name_pl}";
		2694
		2695	$item->{flags} & Crossfire::Protocol::F_OPEN
		2696	and $desc .= " (open)";
		2697	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2698	and $desc .= " (applied)";
		2699	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2700	and $desc .= " (unpaid)";
		2701	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2702	and $desc .= " (magic)";
		2703	$item->{flags} & Crossfire::Protocol::F_CURSED
		2704	and $desc .= " (cursed)";
		2705	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2706	and $desc .= " (damned)";
		2707	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2708	and $desc .= " *";
		2709
		2710	$desc
		2711	}
2506		2712
2507	sub new {	2713	sub new {
2508	my $class = shift;	2714	my $class = shift;
2509		2715
2510	my %args = @_;	2716	my %args = @_;
2511		2717
2512	my $item = $args{item};	2718	my $item = delete $args{item};
2513		2719
2514	my $desc = $item->{nrof} < 2	2720	my $desc = _item_to_desc ($item);
2515	? $item->{name}
2516	: "$item->{nrof} $item->{name_pl}";
2517
2518		2721
2519	my $self = $class->SUPER::new (	2722	my $self = $class->SUPER::new (
2520	can_hover => 1,	2723	can_hover => 1,
2521	can_events => 1,	2724	can_events => 1,
2522	tooltip => (CFClient::UI::Label->escape ($desc)	2725	tooltip => ((CFClient::UI::Label::escape $desc)
2523	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2726	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2524	connect_button_down => sub {	2727	connect_button_down => sub {
2525	my ($self, $ev, $x, $y) = @_;	2728	my ($self, $ev, $x, $y) = @_;
2526		2729
2527	# todo: maybe put examine on 1? but should just be a tooltip :(	2730	# todo: maybe put examine on 1? but should just be a tooltip :(
		2731	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		2732	my $targ = $::CONN->{player}{tag};
		2733
		2734	if ($item->{container} == $::CONN->{player}{tag}) {
		2735	$targ = $main::OPENCONT;
		2736	}
		2737
		2738	$::CONN->send ("move $targ $item->{tag} 0");
2528	if ($ev->{button} == 1) {	2739	} elsif ($ev->{button} == 1) {
2529	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2740	$::CONN->send ("examine $item->{tag}");
2530	} elsif ($ev->{button} == 2) {	2741	} elsif ($ev->{button} == 2) {
2531	$::CONN->send ("apply $item->{tag}");	2742	$::CONN->send ("apply $item->{tag}");
2532	} elsif ($ev->{button} == 3) {	2743	} elsif ($ev->{button} == 3) {
2533	CFClient::UI::Menu->new (	2744	my @menu_items = (
2534	items => [
2535	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2745	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2536	[
2537	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2538	sub { $::CONN->send ("lock $item->{tag}") },
2539	],
2540	["mark", sub { $::CONN->send ("mark $item->{tag}") }],	2746	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2541	["apply", sub { $::CONN->send ("apply $item->{tag}") }],	2747	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2748	(
		2749	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2750	? (
		2751	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2752	)
		2753	: (
		2754	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2542	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2755	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2756	)
2543	],	2757	),
2544	)->popup ($ev);	2758	);
		2759
		2760	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2545	}	2761	}
2546		2762
2547	1	2763	1
2548	},	2764	},
2549	%args	2765	%args
2550	);	2766	);
		2767
		2768
2551	$self->add(new CFClient::UI::Face	2769	$self->add (new CFClient::UI::Face
2552	can_events => 0,	2770	can_events => 0,
2553	face => $item->{face},	2771	face => $item->{face},
2554	anim => $item->{anim},	2772	anim => $item->{anim},
2555	animspeed => $item->{animspeed});	2773	animspeed => $item->{animspeed},
2556	$self->add(new CFClient::UI::Label	2774	);
2557	can_events => 0,	2775
2558	text => $desc);	2776	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2777
		2778	$self->{item} = $item;
		2779
		2780	$self->update_item;
2559		2781
2560	$self	2782	$self
		2783	}
		2784
		2785	sub update_item {
		2786	my ($self) = @_;
		2787
		2788	my $desc = _item_to_desc ($self->{item});
		2789
		2790	$self->{name_lbl}->set_text ($desc);
2561	}	2791	}
2562		2792
2563	#############################################################################	2793	#############################################################################
2564		2794
2565	package CFClient::UI::Inventory;	2795	package CFClient::UI::Inventory;
…		…
2568		2798
2569	sub new {	2799	sub new {
2570	my $class = shift;	2800	my $class = shift;
2571		2801
2572	my $self = $class->SUPER::new (	2802	my $self = $class->SUPER::new (
2573	scrolled => (new CFClient::UI::VBox),	2803	scrolled => (new CFClient::UI::Table),
2574	@_,	2804	@_,
2575	);	2805	);
2576		2806
2577	$self	2807	$self
2578	}	2808	}
…		…
2581	my ($self, $items) = @_;	2811	my ($self, $items) = @_;
2582		2812
2583	$self->{scrolled}->clear;	2813	$self->{scrolled}->clear;
2584	return unless $items;	2814	return unless $items;
2585		2815
2586	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2816	my @items = sort {
		2817	($a->{type} <=> $b->{type})
		2818	or ($a->{name} cmp $b->{name})
		2819	} @$items;
2587		2820
2588	$self->{real_items} = \@items;	2821	$self->{real_items} = \@items;
2589		2822
2590	for my $item (@items) {	2823	for my $item (@items) {
2591	my $desc = $item->{nrof} < 2	2824	$item->{item} = $item;
2592	? $item->{name}
2593	: "$item->{nrof} $item->{name_pl}";
2594
2595	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);	2825	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2826	$item->update_item ();
		2827	}
		2828
		2829	my $i = 0;
		2830	for (@items) {
		2831	$self->{scrolled}->add (0, $i, $_);
		2832	my $nrof = $_->{item}->{nrof} || 1;
		2833	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2596	}	2834	}
2597		2835
2598	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2836	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2599	}	2837	}
2600		2838
…		…
2675	}	2913	}
2676	}	2914	}
2677		2915
2678	#############################################################################	2916	#############################################################################
2679		2917
		2918	package CFClient::UI::Statusbox;
		2919
		2920	our @ISA = CFClient::UI::VBox::;
		2921
		2922	sub new {
		2923	my $class = shift;
		2924
		2925	$class->SUPER::new (
		2926	fontsize => 0.8,
		2927	@_,
		2928	)
		2929	}
		2930
		2931	sub reorder {
		2932	my ($self) = @_;
		2933	my $NOW = time;
		2934
		2935	while (my ($k, $v) = each %{ $self->{item} }) {
		2936	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2937	}
		2938
		2939	my @widgets;
		2940
		2941	my @items = sort {
		2942	$a->{pri} <=> $b->{pri}
		2943	or $b->{id} <=> $a->{id}
		2944	} values %{ $self->{item} };
		2945
		2946	my $count = 10 + 1;
		2947	for my $item (@items) {
		2948	last unless --$count;
		2949
		2950	push @widgets, $item->{label} ||= do {
		2951	# TODO: doesn't handle markup well (read as: at all)
		2952	my $short = $item->{count} > 1
		2953	? "<b>$item->{count} ×</b> $item->{text}"
		2954	: $item->{text};
		2955
		2956	for ($short) {
		2957	s/^\s+//;
		2958	s/\s+/ /g;
		2959	}
		2960
		2961	new CFClient::UI::Label
		2962	markup => $short,
		2963	tooltip => $item->{tooltip},
		2964	tooltip_font => $::FONT_PROP,
		2965	tooltip_width => 0.67,
		2966	fontsize => $item->{fontsize} || $self->{fontsize},
		2967	max_w => $::WIDTH * 0.44,
		2968	fg => $item->{fg},
		2969	can_events => 1,
		2970	can_hover => 1
		2971	};
		2972	}
		2973
		2974	$self->clear;
		2975	$self->SUPER::add (reverse @widgets);
		2976	}
		2977
		2978	sub add {
		2979	my ($self, $text, %arg) = @_;
		2980
		2981	$text =~ s/^\s+//;
		2982	$text =~ s/\s+$//;
		2983
		2984	my $timeout = time + ((delete $arg{timeout}) || 60);
		2985
		2986	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2987
		2988	if (my $item = $self->{item}{$group}) {
		2989	if ($item->{text} eq $text) {
		2990	$item->{count}++;
		2991	} else {
		2992	$item->{count} = 1;
		2993	$item->{text} = $item->{tooltip} = $text;
		2994	}
		2995	$item->{id} = ++$self->{id};
		2996	$item->{timeout} = $timeout;
		2997	delete $item->{label};
		2998	} else {
		2999	$self->{item}{$group} = {
		3000	id => ++$self->{id},
		3001	text => $text,
		3002	timeout => $timeout,
		3003	tooltip => $text,
		3004	fg => [0.8, 0.8, 0.8, 0.8],
		3005	pri => 0,
		3006	count => 1,
		3007	%arg,
		3008	};
		3009	}
		3010
		3011	$self->reorder;
		3012	}
		3013
		3014	sub reconfigure {
		3015	my ($self) = @_;
		3016
		3017	delete $_->{label}
		3018	for values %{ $self->{item} || {} };
		3019
		3020	$self->reorder;
		3021	$self->SUPER::reconfigure;
		3022	}
		3023
		3024	#############################################################################
		3025
2680	package CFClient::UI::Root;	3026	package CFClient::UI::Root;
2681		3027
2682	our @ISA = CFClient::UI::Container::;	3028	our @ISA = CFClient::UI::Container::;
2683		3029
2684	use CFClient::OpenGL;	3030	use CFClient::OpenGL;
2685		3031
		3032	sub new {
		3033	my $class = shift;
		3034
		3035	$class->SUPER::new (
		3036	@_,
		3037	)
		3038	}
		3039
		3040	sub configure {
		3041	my ($self, $x, $y, $w, $h) = @_;
		3042
		3043	$self->{w} = $w;
		3044	$self->{h} = $h;
		3045	}
		3046
2686	sub check_size {	3047	sub check_size {
2687	my ($self) = @_;	3048	my ($self) = @_;
2688		3049
2689	$self->configure (0, 0, $self->{w}, $self->{h});	3050	$self->size_allocate ($self->{w}, $self->{h})
		3051	if $self->{w};
2690	}	3052	}
2691		3053
2692	sub size_request {	3054	sub size_request {
2693	my ($self) = @_;	3055	my ($self) = @_;
2694		3056
…		…
2696	}	3058	}
2697		3059
2698	sub size_allocate {	3060	sub size_allocate {
2699	my ($self, $w, $h) = @_;	3061	my ($self, $w, $h) = @_;
2700		3062
2701	my $old_w = $self->{old_w};
2702	my $old_h = $self->{old_h};
2703
2704	if ($old_w && $old_h) {
2705	for my $child ($self->children) {
2706	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2707	$child->{w} = int 0.5 + $child->{req_w} * $w / $old_w;
2708	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2709	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2710	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2711	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2712	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2713	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2714	}
2715	}
2716
2717	$self->{old_w} = $w;
2718	$self->{old_h} = $h;
2719	}
2720
2721	sub configure {
2722	my ($self, $x, $y, $w, $h) = @_;
2723
2724	$self->SUPER::configure ($x, $y, $w, $h);
2725
2726	for my $child ($self->children) {	3063	for my $child ($self->children) {
2727	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3064	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2728		3065
		3066	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3067	if exists $child->{req_x};
		3068
		3069	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3070	if exists $child->{req_y};
		3071
2729	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3072	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2730	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3073	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3074
2731	$child->configure ($X, $Y, $W, $H);	3075	$child->configure ($X, $Y, $W, $H);
2732	}	3076	}
2733	}	3077	}
2734		3078
2735	sub _topleft {	3079	sub coord2local {
2736	my ($self, $x, $y) = @_;	3080	my ($self, $x, $y) = @_;
2737		3081
2738	($x, $y)	3082	($x, $y)
2739	}	3083	}
2740		3084
		3085	sub coord2global {
		3086	my ($self, $x, $y) = @_;
		3087
		3088	($x, $y)
		3089	}
		3090
2741	sub update {	3091	sub update {
2742	my ($self) = @_;	3092	my ($self) = @_;
2743		3093
2744	$self->check_size;	3094	$self->check_size;
2745	::refresh ();	3095	$::WANT_REFRESH++;
2746	}	3096	}
2747		3097
2748	sub add {	3098	sub add {
2749	my ($self, $child) = @_;	3099	my ($self, @children) = @_;
2750		3100
		3101	for (my @widgets = @children; my $w = pop @widgets; ) {
		3102	push @widgets, $w->children;
		3103	$w->{root} = $self;
		3104	$w->{visible} = 1;
		3105	}
		3106
		3107	for my $child (@children) {
		3108	$child->{is_toplevel} = 1;
		3109
2751	# integerize window positions	3110	# integerise window positions
2752	$child->{x} = int $child->{x};	3111	$child->{x} = int $child->{x};
2753	$child->{y} = int $child->{y};	3112	$child->{y} = int $child->{y};
		3113	}
2754		3114
2755	$self->SUPER::add ($child);	3115	$self->SUPER::add (@children);
		3116	}
		3117
		3118	sub remove {
		3119	my ($self, @children) = @_;
		3120
		3121	$self->SUPER::remove (@children);
		3122
		3123	while (@children) {
		3124	my $w = pop @children;
		3125	push @children, $w->children;
		3126	delete $w->{visible};
		3127	}
2756	}	3128	}
2757		3129
2758	sub on_refresh {	3130	sub on_refresh {
2759	my ($self, $id, $cb) = @_;	3131	my ($self, $id, $cb) = @_;
2760		3132
2761	$self->{refresh_hook}{$id} = $cb;	3133	$self->{refresh_hook}{$id} = $cb;
2762	}	3134	}
2763		3135
		3136	sub on_post_alloc {
		3137	my ($self, $id, $cb) = @_;
		3138
		3139	$self->{post_alloc_hook}{$id} = $cb;
		3140	}
		3141
2764	sub draw {	3142	sub draw {
2765	my ($self) = @_;	3143	my ($self) = @_;
2766		3144
2767	while (my $rcb = delete $self->{refresh_hook}) {	3145	while ($self->{refresh_hook}) {
2768	$_->() for values %$rcb;	3146	$_->()
		3147	for values %{delete $self->{refresh_hook}};
		3148	}
		3149
		3150	if ($self->{check_size}) {
		3151	my @queue = ([], []);
		3152
		3153	for (;;) {
		3154	if ($self->{check_size}) {
		3155	# heuristic: check containers last
		3156	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		3157	for values %{delete $self->{check_size}}
		3158	}
		3159
		3160	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		3161
		3162	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		3163	? @$widget{qw(user_w user_h)}
		3164	: $widget->size_request;
		3165
		3166	if (delete $widget->{force_alloc}
		3167	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3168	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3169
		3170	$widget->{req_w} = $w;
		3171	$widget->{req_h} = $h;
		3172
		3173	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3174
		3175	$widget->{parent}->check_size
		3176	if $widget->{parent};
		3177	}
		3178	}
		3179	}
		3180
		3181	while ($self->{size_alloc}) {
		3182	for (values %{delete $self->{size_alloc}}) {
		3183	my ($widget, $w, $h) = @$_;
		3184
		3185	$w = 0 if $w < 0;
		3186	$h = 0 if $h < 0;
		3187
		3188	$widget->{w} = $w;
		3189	$widget->{h} = $h;
		3190	$widget->size_allocate ($w, $h);
		3191	$widget->emit (size_allocate => $w, $h);
		3192	}
		3193	}
		3194
		3195	while ($self->{post_alloc_hook}) {
		3196	$_->()
		3197	for values %{delete $self->{post_alloc_hook}};
2769	}	3198	}
2770		3199
2771	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3200	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2772	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3201	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2773	glClear GL_COLOR_BUFFER_BIT;	3202	glClear GL_COLOR_BUFFER_BIT;
2774		3203
2775	glMatrixMode GL_PROJECTION;	3204	glMatrixMode GL_PROJECTION;
2776	glLoadIdentity;	3205	glLoadIdentity;
2777	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3206	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2778	glMatrixMode GL_MODELVIEW;	3207	glMatrixMode GL_MODELVIEW;
2779	glLoadIdentity;	3208	glLoadIdentity;
2780		3209
2781	$self->_draw;	3210	$self->_draw;
2782	}	3211	}
…		…
2784	#############################################################################	3213	#############################################################################
2785		3214
2786	package CFClient::UI;	3215	package CFClient::UI;
2787		3216
2788	$ROOT = new CFClient::UI::Root;	3217	$ROOT = new CFClient::UI::Root;
2789	$TOOLTIP = new CFClient::UI::Tooltip;	3218	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2790		3219
2791	1	3220	1
2792		3221

Diff Legend

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