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.193 by root, Wed May 10 21:12:26 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
…		…
240		293
241	sub size_allocate {	294	sub size_allocate {
242	# nothing to be done	295	# nothing to be done
243	}	296	}
244		297
		298	sub reconfigure {
		299	my ($self) = @_;
		300
		301	$self->check_size (1);
		302	$self->update;
		303	}
		304
245	sub children {	305	sub children {
246	}
247
248	# call when resolution changes etc.
249	sub reconfigure {
250	my ($self) = @_;
251
252	$_->reconfigure
253	for $self->children;
254
255	$self->check_size;
256	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257	$self->update;
258	}	306	}
259		307
260	sub set_max_size {	308	sub set_max_size {
261	my ($self, $w, $h) = @_;	309	my ($self, $w, $h) = @_;
262		310
263	delete $self->{max_w}; $self->{max_w} = $w if $w;	311	delete $self->{max_w}; $self->{max_w} = $w if $w;
264	delete $self->{max_h}; $self->{max_h} = $h if $h;	312	delete $self->{max_h}; $self->{max_h} = $h if $h;
		313	}
		314
		315	sub set_tooltip {
		316	my ($self, $tooltip) = @_;
		317
		318	$self->{tooltip} = $tooltip;
		319
		320	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		321	delete $CFClient::UI::TOOLTIP->{owner};
		322	CFClient::UI::check_tooltip;
		323	}
265	}	324	}
266		325
267	# translate global coordinates to local coordinate system	326	# translate global coordinates to local coordinate system
268	sub coord2local {	327	sub coord2local {
269	my ($self, $x, $y) = @_;	328	my ($self, $x, $y) = @_;
…		…
355	glVertex $self->{w}, 0;	414	glVertex $self->{w}, 0;
356	glVertex $self->{w}, $self->{h};	415	glVertex $self->{w}, $self->{h};
357	glVertex 0 , $self->{h};	416	glVertex 0 , $self->{h};
358	glEnd;	417	glEnd;
359	glPopMatrix;	418	glPopMatrix;
360	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;
361	}	420	}
362	}	421	}
363		422
364	sub _draw {	423	sub _draw {
365	my ($self) = @_;	424	my ($self) = @_;
…		…
382	sub set_parent {	441	sub set_parent {
383	my ($self, $parent) = @_;	442	my ($self, $parent) = @_;
384		443
385	Scalar::Util::weaken ($self->{parent} = $parent);	444	Scalar::Util::weaken ($self->{parent} = $parent);
386		445
		446	# TODO: req_w _does_change after ->reconfigure
387	$self->check_size	447	$self->check_size
388	unless exists $self->{req_w};	448	unless exists $self->{req_w};
		449
		450	$self->show;
389	}	451	}
390		452
391	sub check_size {	453	sub check_size {
392	my ($self) = @_;	454	my ($self, $forced) = @_;
393		455
		456	$self->{force_alloc} = 1 if $forced;
394	$CFClient::UI::ROOT->{check_size}{$self} = $self;	457	$CFClient::UI::ROOT->{check_size}{$self} = $self;
395	}	458	}
396		459
397	sub update {	460	sub update {
398	my ($self) = @_;	461	my ($self) = @_;
…		…
414	}	477	}
415		478
416	sub DESTROY {	479	sub DESTROY {
417	my ($self) = @_;	480	my ($self) = @_;
418		481
		482	delete $WIDGET{$self+0};
419	#$self->deactivate;	483	#$self->deactivate;
420	}	484	}
421		485
422	#############################################################################	486	#############################################################################
423		487
…		…
432	my $class = shift;	496	my $class = shift;
433		497
434	# range [value, low, high, page]	498	# range [value, low, high, page]
435		499
436	$class->SUPER::new (	500	$class->SUPER::new (
437	bg => [0, 0, 0, 0.2],	501	#bg => [0, 0, 0, 0.2],
438	active_bg => [1, 1, 1, 0.5],	502	#active_bg => [1, 1, 1, 0.5],
439	@_	503	@_
440	)	504	)
441	}	505	}
442		506
443	sub _draw {	507	sub _draw {
444	my ($self) = @_;	508	my ($self) = @_;
445		509
		510	my $color = $FOCUS == $self && $self->{active_bg}
		511	? $self->{active_bg}
		512	: $self->{bg};
		513
		514	if ($color && (@$color < 4 || $color->[3])) {
446	my ($w, $h) = @$self{qw(w h)};	515	my ($w, $h) = @$self{qw(w h)};
447		516
448	glEnable GL_BLEND;	517	glEnable GL_BLEND;
449	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	518	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	519	glColor @$color;
451		520
452	glBegin GL_QUADS;	521	glBegin GL_QUADS;
453	glVertex 0 , 0;	522	glVertex 0 , 0;
454	glVertex 0 , $h;	523	glVertex 0 , $h;
455	glVertex $w, $h;	524	glVertex $w, $h;
456	glVertex $w, 0;	525	glVertex $w, 0;
457	glEnd;	526	glEnd;
458		527
459	glDisable GL_BLEND;	528	glDisable GL_BLEND;
		529	}
460	}	530	}
461		531
462	#############################################################################	532	#############################################################################
463		533
464	package CFClient::UI::Empty;	534	package CFClient::UI::Empty;
…		…
508	$self->{children} = [	578	$self->{children} = [
509	sort { $a->{z} <=> $b->{z} }	579	sort { $a->{z} <=> $b->{z} }
510	@{$self->{children}}, @widgets	580	@{$self->{children}}, @widgets
511	];	581	];
512		582
513	$self->check_size;	583	$self->check_size (1);
514	$self->update;	584	$self->update;
515	}	585	}
516		586
517	sub children {	587	sub children {
518	@{ $_[0]{children} }	588	@{ $_[0]{children} }
…		…
625	}	695	}
626		696
627	sub update {	697	sub update {
628	my ($self) = @_;	698	my ($self) = @_;
629		699
630	$ROOT->on_refresh ($self => sub { $self->render_child });	700	$ROOT->on_post_alloc ($self => sub { $self->render_child });
631	$self->SUPER::update;	701	$self->SUPER::update;
632	}	702	}
633		703
634	sub size_allocate {	704	sub size_allocate {
635	my ($self, $w, $h) = @_;	705	my ($self, $w, $h) = @_;
…		…
648	$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 {
649	glClearColor 0, 0, 0, 0;	719	glClearColor 0, 0, 0, 0;
650	glClear GL_COLOR_BUFFER_BIT;	720	glClear GL_COLOR_BUFFER_BIT;
651		721
652	$self->_render;	722	$self->_render;
653	# glColorMask 1, 1, 1, 0;
654	# glEnable GL_BLEND;
655	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656	# glRasterPos 0, 0;
657	# glCopyPixels 0, 0, $self->{w}, $self->{h};
658	# glDisable GL_BLEND;
659	# glColorMask 1, 1, 1, 1;
660	};	723	};
661	}	724	}
662		725
663	sub _draw {	726	sub _draw {
664	my ($self) = @_;	727	my ($self) = @_;
…		…
666	my ($w, $h) = ($self->w, $self->h);	729	my ($w, $h) = ($self->w, $self->h);
667		730
668	my $tex = $self->{texture}	731	my $tex = $self->{texture}
669	or return;	732	or return;
670		733
671	glEnable GL_BLEND;
672	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673	glEnable GL_TEXTURE_2D;	734	glEnable GL_TEXTURE_2D;
674	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	735	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675	glColor 0, 0, 0, 1;	736	glColor 1, 1, 1, 1;
676		737
677	$tex->draw_quad (0, 0, $w, $h);	738	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678		739
679	glDisable GL_BLEND;
680	glDisable GL_TEXTURE_2D;	740	glDisable GL_TEXTURE_2D;
681	}	741	}
682		742
683	#############################################################################	743	#############################################################################
684		744
…		…
688		748
689	sub size_request {	749	sub size_request {
690	my ($self) = @_;	750	my ($self) = @_;
691		751
692	@$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)};
693	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
694		753
695	@$self{qw(child_w child_h)}	754	@$self{qw(child_w child_h)}
696	}	755	}
697		756
698	sub size_allocate {	757	sub size_allocate {
699	my ($self, $w, $h) = @_;	758	my ($self, $w, $h) = @_;
700		759
		760	my ($cw, $ch) = @$self{qw(child_w child_h)};
		761	# $w = $self->{w};
		762	$self->child->configure (0, 0, $cw, $ch);
701	$self->update;	763	$self->update;
702	}	764	}
703		765
704	sub set_offset {	766	sub set_offset {
705	my ($self, $x, $y) = @_;	767	my ($self, $x, $y) = @_;
…		…
759		821
760	my $slider = new CFClient::UI::Slider	822	my $slider = new CFClient::UI::Slider
761	vertical => 1,	823	vertical => 1,
762	range => [0, 0, 1, 0.01], # HACK fix	824	range => [0, 0, 1, 0.01], # HACK fix
763	connect_changed => sub {	825	connect_changed => sub {
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	826	$self->{vp}->set_offset (0, $_[1]);
765	},	827	},
766	;	828	;
767		829
768	$self = $class->SUPER::new (	830	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	831	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	832	slider => $slider,
771	@_,	833	@_,
772	);	834	);
773		835
774	$self->{vp}->add ($self->{scrolled});	836	$self->{vp}->add ($self->{scrolled});
…		…
776	$self->add ($self->{slider});	838	$self->add ($self->{slider});
777		839
778	$self	840	$self
779	}	841	}
780		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
781	#TODO# update range on size_allocate depeneing on child	852	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	853	# update viewport offset on scroll
783		854
784	#############################################################################	855	#############################################################################
785		856
786	package CFClient::UI::Frame;	857	package CFClient::UI::Frame;
…		…
790	use CFClient::OpenGL;	861	use CFClient::OpenGL;
791		862
792	sub new {	863	sub new {
793	my $class = shift;	864	my $class = shift;
794		865
795	my $self = $class->SUPER::new (	866	$class->SUPER::new (
796	bg => [1, 1, 1, 1],	867	bg => undef,
797	border_bg => [1, 1, 1, 1],
798	border => 0.8,
799	@_	868	@_,
800	);	869	)
801
802	$self
803	}	870	}
804		871
805	sub _draw {	872	sub _draw {
806	my ($self) = @_;	873	my ($self) = @_;
807		874
808	my ($w, $h) = ($self->{w}, $self->{h});	875	if ($self->{bg}) {
		876	my ($w, $h) = @$self{qw(w h)};
809		877
810	glEnable GL_BLEND;	878	glEnable GL_BLEND;
811	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	879	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812	glEnable GL_TEXTURE_2D;	880	glColor @{ $self->{bg} };
813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814		881
815	# glBegin GL_QUADS;	882	glBegin GL_QUADS;
816	# glColor 0, 0, 0, 0;
817	# glVertex 0 , 0;	883	glVertex 0 , 0;
818	# glVertex 0 , $h;	884	glVertex 0 , $h;
819	# glVertex $w, $h;	885	glVertex $w, $h;
820	# glVertex $w, 0;	886	glVertex $w, 0;
821	# glEnd;	887	glEnd;
822		888
823
824	$self->child->draw;
825	glDisable GL_BLEND;	889	glDisable GL_BLEND;
826	glDisable GL_TEXTURE_2D;	890	}
		891
		892	$self->SUPER::_draw;
827	}	893	}
828		894
829	#############################################################################	895	#############################################################################
830		896
831	package CFClient::UI::FancyFrame;	897	package CFClient::UI::FancyFrame;
…		…
842	my $class = shift;	908	my $class = shift;
843		909
844	# TODO: user_x, user_y, overwrite moveto?	910	# TODO: user_x, user_y, overwrite moveto?
845		911
846	my $self = $class->SUPER::new (	912	my $self = $class->SUPER::new (
847	bg => [1, 1, 1, 1],	913	bg => [1, 1, 1, 1],
848	border_bg => [1, 1, 1, 1],	914	border_bg => [1, 1, 1, 1],
849	border => 0.6,	915	border => 0.6,
		916	is_toplevel => 1,
850	can_events => 1,	917	can_events => 1,
851	@_	918	@_
852	);	919	);
853		920
854	$self->{title} &&= new CFClient::UI::Label	921	$self->{title} &&= new CFClient::UI::Label
855	align => 0,	922	align => 0,
…		…
879	my ($self, $w, $h) = @_;	946	my ($self, $w, $h) = @_;
880		947
881	$h -= List::Util::max 0, $self->border * 2;	948	$h -= List::Util::max 0, $self->border * 2;
882	$w -= List::Util::max 0, $self->border * 2;	949	$w -= List::Util::max 0, $self->border * 2;
883		950
884	$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)
885	if $self->{title};	952	if $self->{title};
886		953
887	$self->child->configure ($self->border, $self->border, $w, $h);	954	$self->child->configure ($self->border, $self->border, $w, $h);
888	}	955	}
889		956
…		…
947	my ($self) = @_;	1014	my ($self) = @_;
948		1015
949	my ($w, $h ) = ($self->{w}, $self->{h});	1016	my ($w, $h ) = ($self->{w}, $self->{h});
950	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1017	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951		1018
952	glEnable GL_BLEND;
953	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954	glEnable GL_TEXTURE_2D;	1019	glEnable GL_TEXTURE_2D;
955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1020	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956		1021
957	my $border = $self->border;	1022	my $border = $self->border;
958		1023
959	glColor @{ $self->{border_bg} };	1024	glColor @{ $self->{border_bg} };
960	$tex[1]->draw_quad (0, 0, $w, $border);	1025	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
961	$tex[3]->draw_quad (0, $border, $border, $ch);	1026	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1027	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1028	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964		1029
965	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1030	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966	my $bg = $tex[0];	1031	my $bg = $tex[0];
967		1032
968	# TODO: repeat texture not scale	1033	# TODO: repeat texture not scale
…		…
972	glColor @{ $self->{bg} };	1037	glColor @{ $self->{bg} };
973		1038
974	$bg->{s} = $rep_x;	1039	$bg->{s} = $rep_x;
975	$bg->{t} = $rep_y;	1040	$bg->{t} = $rep_y;
976	$bg->{wrap_mode} = 1;	1041	$bg->{wrap_mode} = 1;
977	$bg->draw_quad ($border, $border, $cw, $ch);	1042	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1043	}
978		1044
979	glDisable GL_TEXTURE_2D;	1045	glDisable GL_TEXTURE_2D;
980	glDisable GL_BLEND;
981	}
982		1046
983	$self->{title}->draw if $self->{title};	1047	$self->{title}->draw if $self->{title};
984		1048
985	$self->child->draw;	1049	$self->child->draw;
986	}	1050	}
…		…
1253		1317
1254	#############################################################################	1318	#############################################################################
1255		1319
1256	package CFClient::UI::Label;	1320	package CFClient::UI::Label;
1257		1321
1258	our @ISA = CFClient::UI::Base::;	1322	our @ISA = CFClient::UI::DrawBG::;
1259		1323
1260	use CFClient::OpenGL;	1324	use CFClient::OpenGL;
1261		1325
1262	sub new {	1326	sub new {
1263	my ($class, %arg) = @_;	1327	my ($class, %arg) = @_;
1264		1328
1265	my $self = $class->SUPER::new (	1329	my $self = $class->SUPER::new (
1266	fg => [1, 1, 1],	1330	fg => [1, 1, 1],
		1331	#bg => none
		1332	#active_bg => none
1267	#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),
1268	fontsize => 1,	1339	fontsize => 1,
1269	text => "",
1270	align => -1,	1340	align => -1,
1271	valign => -1,	1341	valign => -1,
1272	padding => 2,	1342	padding => 2,
1273	layout => new CFClient::Layout,
1274	can_events => 0,	1343	can_events => 0,
1275	%arg	1344	%arg
1276	);	1345	);
1277		1346
1278	if (exists $self->{template}) {	1347	if (exists $self->{template}) {
1279	my $layout = new CFClient::Layout;	1348	my $layout = new CFClient::Layout;
1280	$layout->set_text (delete $self->{template});	1349	$layout->set_text (delete $self->{template});
1281	$self->{template} = $layout;	1350	$self->{template} = $layout;
1282	}	1351	}
1283		1352
1284	$self->set_text (delete $self->{text}) if exists $self->{text};	1353	if (exists $self->{markup}) {
1285	$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	}
1286		1358
1287	$self	1359	$self
1288	}	1360	}
1289		1361
1290	sub escape {	1362	sub escape($) {
1291	local $_ = $_[1];	1363	local $_ = $_[0];
1292		1364
1293	s/&/&amp;/g;	1365	s/&/&amp;/g;
1294	s/>/&gt;/g;	1366	s/>/&gt;/g;
1295	s/</&lt;/g;	1367	s/</&lt;/g;
1296		1368
1297	$_[1]	1369	$_
1298	}	1370	}
1299		1371
1300	sub update {	1372	sub update {
1301	my ($self) = @_;	1373	my ($self) = @_;
1302		1374
…		…
1308	my ($self, $text) = @_;	1380	my ($self, $text) = @_;
1309		1381
1310	return if $self->{text} eq "T$text";	1382	return if $self->{text} eq "T$text";
1311	$self->{text} = "T$text";	1383	$self->{text} = "T$text";
1312		1384
		1385	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1313	$self->{layout}->set_text ($text);	1386	$self->{layout}->set_text ($text);
1314		1387
1315	$self->update;	1388	$self->update;
1316	$self->check_size;	1389	$self->check_size;
1317	}	1390	}
…		…
1320	my ($self, $markup) = @_;	1393	my ($self, $markup) = @_;
1321		1394
1322	return if $self->{text} eq "M$markup";	1395	return if $self->{text} eq "M$markup";
1323	$self->{text} = "M$markup";	1396	$self->{text} = "M$markup";
1324		1397
		1398	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1399
		1400	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1325	$self->{layout}->set_markup ($markup);	1401	$self->{layout}->set_markup ($markup);
1326		1402
1327	$self->update;	1403	$self->update;
1328	$self->check_size;	1404	$self->check_size;
1329	}	1405	}
…		…
1331	sub size_request {	1407	sub size_request {
1332	my ($self) = @_;	1408	my ($self) = @_;
1333		1409
1334	$self->{layout}->set_font ($self->{font}) if $self->{font};	1410	$self->{layout}->set_font ($self->{font}) if $self->{font};
1335	$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});
1336	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1414	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337		1415
1338	my ($w, $h) = $self->{layout}->size;	1416	my ($w, $h) = $self->{layout}->size;
1339		1417
1340	if (exists $self->{template}) {	1418	if (exists $self->{template}) {
…		…
1370	}	1448	}
1371		1449
1372	sub _draw {	1450	sub _draw {
1373	my ($self) = @_;	1451	my ($self) = @_;
1374		1452
		1453	$self->SUPER::_draw; # draw background, if applicable
		1454
1375	my $tex = $self->{texture} ||= do {	1455	my $tex = $self->{texture} ||= do {
		1456	$self->{layout}->set_foreground (@{$self->{fg}});
1376	$self->{layout}->set_font ($self->{font}) if $self->{font};	1457	$self->{layout}->set_font ($self->{font}) if $self->{font};
1377	$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});
1378	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1461	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1462
1379	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
1380	};	1474	};
1381		1475
1382	glEnable GL_BLEND;
1383	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1384	glEnable GL_TEXTURE_2D;	1476	glEnable GL_TEXTURE_2D;
1385	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1477	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1386		1478
		1479	if ($tex->{format} == GL_ALPHA) {
1387	glColor @{$self->{fg}};	1480	glColor @{$self->{fg}};
1388
1389	$self->{ox} = int (
1390	$self->{align} < 0 ? $self->{padding}
1391	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1392	: ($self->{w} - $tex->{w}) * 0.5
1393	);
1394
1395	$self->{oy} = int (
1396	$self->{valign} < 0 ? $self->{padding}
1397	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1398	: ($self->{h} - $tex->{h}) * 0.5
1399	);
1400
1401	$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	}
1402		1485
1403	glDisable GL_TEXTURE_2D;	1486	glDisable GL_TEXTURE_2D;
1404	glDisable GL_BLEND;
1405	}	1487	}
1406		1488
1407	#############################################################################	1489	#############################################################################
1408		1490
1409	package CFClient::UI::EntryBase;	1491	package CFClient::UI::EntryBase;
…		…
1422	active_fg => [0, 0, 0],	1504	active_fg => [0, 0, 0],
1423	can_hover => 1,	1505	can_hover => 1,
1424	can_focus => 1,	1506	can_focus => 1,
1425	valign => 0,	1507	valign => 0,
1426	can_events => 1,	1508	can_events => 1,
		1509	#text => ...
1427	@_	1510	@_
1428	)	1511	)
1429	}	1512	}
1430		1513
1431	sub _set_text {	1514	sub _set_text {
…		…
1442		1525
1443	$text =~ s/./*/g if $self->{hidden};	1526	$text =~ s/./*/g if $self->{hidden};
1444	$self->{layout}->set_text ("$text ");	1527	$self->{layout}->set_text ("$text ");
1445		1528
1446	$self->emit (changed => $self->{text});	1529	$self->emit (changed => $self->{text});
1447	}
1448
1449	sub get_text {
1450	$_[0]{text}
1451	}
1452
1453	sub size_request {
1454	my ($self) = @_;
1455
1456	my ($w, $h) = $self->SUPER::size_request;
1457
1458	($w + 1, $h) # add 1 for cursor
1459	}
1460
1461	sub size_allocate {
1462	my ($self, $w, $h) = @_;
1463
1464	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1465	}	1530	}
1466		1531
1467	sub set_text {	1532	sub set_text {
1468	my ($self, $text) = @_;	1533	my ($self, $text) = @_;
1469		1534
1470	$self->{cursor} = length $text;	1535	$self->{cursor} = length $text;
1471	$self->_set_text ($text);	1536	$self->_set_text ($text);
1472	$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
1473	}	1557	}
1474		1558
1475	sub key_down {	1559	sub key_down {
1476	my ($self, $ev) = @_;	1560	my ($self, $ev) = @_;
1477		1561
…		…
1479	my $sym = $ev->{sym};	1563	my $sym = $ev->{sym};
1480	my $uni = $ev->{unicode};	1564	my $uni = $ev->{unicode};
1481		1565
1482	my $text = $self->get_text;	1566	my $text = $self->get_text;
1483		1567
1484	if ($sym == 8) {	1568	if ($uni == 8) {
1485	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1569	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1486	} elsif ($sym == 127) {	1570	} elsif ($uni == 127) {
1487	substr $text, $self->{cursor}, 1, "";	1571	substr $text, $self->{cursor}, 1, "";
1488	} elsif ($sym == CFClient::SDLK_LEFT) {	1572	} elsif ($sym == CFClient::SDLK_LEFT) {
1489	--$self->{cursor} if $self->{cursor};	1573	--$self->{cursor} if $self->{cursor};
1490	} elsif ($sym == CFClient::SDLK_RIGHT) {	1574	} elsif ($sym == CFClient::SDLK_RIGHT) {
1491	++$self->{cursor} if $self->{cursor} < length $self->{text};	1575	++$self->{cursor} if $self->{cursor} < length $self->{text};
1492	} elsif ($sym == CFClient::SDLK_HOME) {	1576	} elsif ($sym == CFClient::SDLK_HOME) {
1493	$self->{cursor} = 0;	1577	$self->{cursor} = 0;
1494	} elsif ($sym == CFClient::SDLK_END) {	1578	} elsif ($sym == CFClient::SDLK_END) {
1495	$self->{cursor} = length $text;	1579	$self->{cursor} = length $text;
1496	} elsif ($sym == 27) {	1580	} elsif ($uni == 27) {
1497	$self->emit ('escape');	1581	$self->emit ('escape');
1498	} elsif ($uni) {	1582	} elsif ($uni) {
1499	substr $text, $self->{cursor}++, 0, chr $uni;	1583	substr $text, $self->{cursor}++, 0, chr $uni;
1500	}	1584	}
1501		1585
1502	$self->_set_text ($text);	1586	$self->_set_text ($text);
1503	$self->update;	1587	$self->update;
		1588	$self->check_size;
1504	}	1589	}
1505		1590
1506	sub focus_in {	1591	sub focus_in {
1507	my ($self) = @_;	1592	my ($self) = @_;
1508		1593
…		…
1637	my $class = shift;	1722	my $class = shift;
1638		1723
1639	$class->SUPER::new (	1724	$class->SUPER::new (
1640	padding => 4,	1725	padding => 4,
1641	fg => [1, 1, 1],	1726	fg => [1, 1, 1],
1642	bg => [1, 1, 1, 0.2],
1643	active_fg => [0, 0, 1],	1727	active_fg => [0, 0, 1],
1644	can_hover => 1,	1728	can_hover => 1,
1645	align => 0,	1729	align => 0,
1646	valign => 0,	1730	valign => 0,
1647	can_events => 1,	1731	can_events => 1,
…		…
1665		1749
1666	if ($GRAB == $self) {	1750	if ($GRAB == $self) {
1667	$self->{fg} = $self->{active_fg};	1751	$self->{fg} = $self->{active_fg};
1668	}	1752	}
1669		1753
1670	glEnable GL_BLEND;
1671	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672	glEnable GL_TEXTURE_2D;	1754	glEnable GL_TEXTURE_2D;
1673	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1755	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1674	glColor 0, 0, 0, 1;	1756	glColor 0, 0, 0, 1;
1675		1757
1676	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1758	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1677		1759
1678	glDisable GL_TEXTURE_2D;	1760	glDisable GL_TEXTURE_2D;
1679	glDisable GL_BLEND;
1680		1761
1681	$self->SUPER::_draw;	1762	$self->SUPER::_draw;
1682	}	1763	}
1683		1764
1684	#############################################################################	1765	#############################################################################
…		…
1698		1779
1699	$class->SUPER::new (	1780	$class->SUPER::new (
1700	padding => 2,	1781	padding => 2,
1701	fg => [1, 1, 1],	1782	fg => [1, 1, 1],
1702	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],
1703	state => 0,	1786	state => 0,
1704	can_hover => 1,	1787	can_hover => 1,
1705	@_	1788	@_
1706	)	1789	)
1707	}	1790	}
…		…
1731		1814
1732	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;
1733		1816
1734	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1817	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1735		1818
1736	glEnable GL_BLEND;	1819	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1820
1737	glEnable GL_TEXTURE_2D;	1821	glEnable GL_TEXTURE_2D;
1738	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1739
1740	my $tex = $self->{state} ? $tex[1] : $tex[0];
1741
1742	$tex->draw_quad (0, 0, $s, $s);	1822	$tex->draw_quad_alpha (0, 0, $s, $s);
1743
1744	glDisable GL_TEXTURE_2D;	1823	glDisable GL_TEXTURE_2D;
1745	glDisable GL_BLEND;
1746	}	1824	}
1747		1825
1748	#############################################################################	1826	#############################################################################
1749		1827
1750	package CFClient::UI::Image;	1828	package CFClient::UI::Image;
…		…
1793	glTranslate 0, -$self->{w}, 0;	1871	glTranslate 0, -$self->{w}, 0;
1794		1872
1795	($w, $h) = ($h, $w);	1873	($w, $h) = ($h, $w);
1796	}	1874	}
1797		1875
1798	glEnable GL_BLEND;
1799	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1800	glEnable GL_TEXTURE_2D;	1876	glEnable GL_TEXTURE_2D;
1801	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1877	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802		1878
1803	$tex->draw_quad (0, 0, $w, $h);	1879	$tex->draw_quad_alpha (0, 0, $w, $h);
1804		1880
1805	glDisable GL_BLEND;
1806	glDisable GL_TEXTURE_2D;	1881	glDisable GL_TEXTURE_2D;
1807	}	1882	}
1808		1883
1809	#############################################################################	1884	#############################################################################
1810		1885
…		…
1999	qw(s1_slider.png s1_slider_bg.png);	2074	qw(s1_slider.png s1_slider_bg.png);
2000		2075
2001	sub new {	2076	sub new {
2002	my $class = shift;	2077	my $class = shift;
2003		2078
2004	# range [value, low, high, page]	2079	# range [value, low, high, page, unit]
2005		2080
2006	# TODO: 0-width page	2081	# TODO: 0-width page
2007	# TODO: req_w/h are wrong with vertical	2082	# TODO: req_w/h are wrong with vertical
2008	# TODO: calculations are off	2083	# TODO: calculations are off
2009	my $self = $class->SUPER::new (	2084	my $self = $class->SUPER::new (
2010	fg => [1, 1, 1],	2085	fg => [1, 1, 1],
2011	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],
2012	range => [0, 0, 100, 10],	2089	range => [0, 0, 100, 10, 0],
2013	req_w => $::WIDTH / 80,	2090	req_w => $::WIDTH / 80,
2014	req_h => $::WIDTH / 80,	2091	req_h => $::WIDTH / 80,
2015	vertical => 0,	2092	vertical => 0,
2016	can_hover => 1,	2093	can_hover => 1,
2017	inner_pad => 5,	2094	inner_pad => 0.02,
2018	@_	2095	@_
2019	);	2096	);
2020		2097
		2098	$self->set_value ($self->{range}[0]);
		2099	$self->update;
		2100
2021	$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	}
2022	}	2133	}
2023		2134
2024	sub size_request {	2135	sub size_request {
2025	my ($self) = @_;	2136	my ($self) = @_;
2026		2137
…		…
2032		2143
2033	sub button_down {	2144	sub button_down {
2034	my ($self, $ev, $x, $y) = @_;	2145	my ($self, $ev, $x, $y) = @_;
2035		2146
2036	$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
2037	$self->mouse_motion ($ev, $x, $y);	2151	$self->mouse_motion ($ev, $x, $y);
2038	}	2152	}
2039		2153
2040	sub mouse_motion {	2154	sub mouse_motion {
2041	my ($self, $ev, $x, $y) = @_;	2155	my ($self, $ev, $x, $y) = @_;
2042		2156
2043	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
2044	my ($value, $lo, $hi, $page) = @{$self->{range}};	2174	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2175	my $range = ($hi - $page - $lo) || 1e-100;
2045		2176
2046	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2177	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2047		2178
2048	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2179	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2049	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2180	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2050		2181
2051	$x -= $inner_pad_px; # substract the padding	2182	$value = ($value - $lo) / $range;
2052	$x = $x * ($hi - $lo) / $inner_w + $lo;	2183	$value = $value * $self->{scale} + $self->{offset};
2053	$x = $lo if $x < $lo;
2054	$x = $hi - $page if $x > $hi - $page;
2055	$self->{range}[0] = $x;
2056		2184
2057	$self->emit (changed => $x);	2185	$self->{knob_x} = $value - $knob_w * 0.5;
2058	$self->update;	2186	$self->{knob_w} = $knob_w;
2059	}	2187	});
2060	}
2061		2188
2062	# the inner_* stuff is for generating a padding for the slider handle,	2189	$self->SUPER::update;
2063	# so that the handle doesn't leave the texture. This calculation isn't 100%
2064	# correct propably, but it does the job for now
2065	sub _calc_inner_pad_px {
2066	my ($self, $w) = @_;
2067	($w / 100) * $self->{inner_pad} # % to pixels
2068	}	2190	}
2069		2191
2070	sub _draw {	2192	sub _draw {
2071	my ($self) = @_;	2193	my ($self) = @_;
2072		2194
2073	$self->SUPER::_draw ();	2195	$self->SUPER::_draw ();
2074		2196
2075	my ($w, $h) = @$self{qw(w h)};	2197	glScale $self->{w}, $self->{h};
2076		2198
2077	if ($self->{vertical}) {	2199	if ($self->{vertical}) {
2078	# draw a vertical slider like a rotated horizontal slider	2200	# draw a vertical slider like a rotated horizontal slider
2079		2201
		2202	glTranslate 1, 0, 0;
2080	glRotate 90, 0, 0, 1;	2203	glRotate 90, 0, 0, 1;
2081	glTranslate 0, -$self->{w}, 0;
2082
2083	($w, $h) = ($h, $w);
2084	}	2204	}
2085		2205
2086	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2206	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2087	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2207	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2088		2208
2089	my ($value, $lo, $hi, $page) = @{$self->{range}};
2090
2091	$hi = $value + 1 if $lo == $hi;
2092
2093	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2094	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2095
2096	$page = int $page * $inner_w / ($hi - $lo);
2097	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2098
2099	$w -= $page;
2100	$page &= ~1;
2101	glTranslate $page * 0.5, 0, 0;
2102	$page ||= 2;
2103
2104	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2105	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2106
2107	glEnable GL_BLEND;
2108	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2109	glEnable GL_TEXTURE_2D;	2209	glEnable GL_TEXTURE_2D;
2110	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2210	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2111		2211
2112	# draw background	2212	# draw background
2113	$tex[1]->draw_quad (0, 0, $w, $h);	2213	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2114		2214
2115	# draw handle	2215	# draw handle
2116	$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);
2117		2217
2118	glDisable GL_BLEND;
2119	glDisable GL_TEXTURE_2D;	2218	glDisable GL_TEXTURE_2D;
2120	}	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 (@_) }
2121		2261
2122	#############################################################################	2262	#############################################################################
2123		2263
2124	package CFClient::UI::TextView;	2264	package CFClient::UI::TextView;
2125		2265
…		…
2134	fontsize => 1,	2274	fontsize => 1,
2135	can_events => 0,	2275	can_events => 0,
2136	#font => default_font	2276	#font => default_font
2137	@_,	2277	@_,
2138		2278
2139	layout => (new CFClient::Layout),	2279	layout => (new CFClient::Layout 1),
2140	par => [],	2280	par => [],
2141	height => 0,	2281	height => 0,
2142	children => [	2282	children => [
2143	(new CFClient::UI::Empty expand => 1),	2283	(new CFClient::UI::Empty expand => 1),
2144	(new CFClient::UI::Slider vertical => 1),	2284	(new CFClient::UI::Slider vertical => 1),
…		…
2155		2295
2156	$self->{fontsize} = $fontsize;	2296	$self->{fontsize} = $fontsize;
2157	$self->reflow;	2297	$self->reflow;
2158	}	2298	}
2159		2299
2160	sub text_height {
2161	my ($self, $text) = @_;
2162
2163	my $layout = $self->{layout};
2164
2165	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2166	$layout->set_width ($self->{children}[0]{w});
2167	$layout->set_text ($text);
2168
2169	($layout->size)[1]
2170	}
2171
2172	sub reflow {
2173	my ($self) = @_;
2174
2175	$self->{need_reflow}++;
2176	$self->update;
2177	}
2178
2179	sub size_allocate {	2300	sub size_allocate {
2180	my ($self, $w, $h) = @_;	2301	my ($self, $w, $h) = @_;
2181		2302
2182	$self->SUPER::size_allocate ($w, $h);	2303	$self->SUPER::size_allocate ($w, $h);
2183		2304
…		…
2186	$self->{layout}->set_width ($self->{children}[0]{w});	2307	$self->{layout}->set_width ($self->{children}[0]{w});
2187		2308
2188	$self->reflow;	2309	$self->reflow;
2189	}	2310	}
2190		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
2191	sub add_paragraph {	2346	sub add_paragraph {
2192	my ($self, $color, $text) = @_;	2347	my ($self, $color, $text, $indent) = @_;
2193		2348
2194	#TODO: intelligently "reformat" paragraph	2349	for my $line (split /\n/, $text) {
2195		2350	my ($w, $h) = $self->text_size ($line);
2196	my $height = $self->text_height ($text);
2197
2198	$self->{height} += $height;	2351	$self->{height} += $h;
		2352	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2353	}
2199		2354
2200	push @{$self->{par}}, [$height, $color, $text];
2201
2202	$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]);
2203	$self->{children}[1]->update;
2204	}	2356	}
2205		2357
2206	sub update {	2358	sub update {
2207	my ($self) = @_;	2359	my ($self) = @_;
2208		2360
…		…
2210		2362
2211	return unless $self->{h} > 0;	2363	return unless $self->{h} > 0;
2212		2364
2213	delete $self->{texture};	2365	delete $self->{texture};
2214		2366
2215	$ROOT->on_refresh ($self, sub {	2367	$ROOT->on_post_alloc ($self, sub {
		2368	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2369
2216	if (delete $self->{need_reflow}) {	2370	if (delete $self->{need_reflow}) {
2217	my $height = 0;	2371	my $height = 0;
2218		2372
2219	$height += $_->[0] = $self->text_height ($_->[2])	2373	my $layout = $self->{layout};
		2374
		2375	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2376
2220	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	}
2221		2388
2222	$self->{height} = $height;	2389	$self->{height} = $height;
2223		2390
2224	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2391	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2225		2392
2226	delete $self->{texture};	2393	delete $self->{texture};
2227	}	2394	}
2228		2395
2229	$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 {
2230	glClearColor 0, 0, 0, 0;	2397	glClearColor 0.5, 0.5, 0.5, 0;
2231	glClear GL_COLOR_BUFFER_BIT;	2398	glClear GL_COLOR_BUFFER_BIT;
2232		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
2233	glEnable GL_BLEND;	2411	glEnable GL_BLEND;
		2412	#TODO# not correct in windows where rgba is forced off
2234	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2413	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2235	glEnable GL_TEXTURE_2D;
2236	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2237
2238	my $top = int $self->{children}[1]{range}[0];
2239
2240	my $y0 = $top;
2241	my $y1 = $top + $self->{h};
2242
2243	my $y = 0;
2244
2245	my $layout = $self->{layout};
2246
2247	$layout->set_font ($self->{font}) if $self->{font};
2248		2414
2249	for my $par (@{$self->{par}}) {	2415	for my $par (@{$self->{par}}) {
2250	my $h = $par->[0];	2416	my $h = $par->[1];
2251		2417
2252	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]);
2253	$layout->set_text ($par->[2]);	2421	$layout->set_markup ($par->[4]);
2254		2422
2255	glColor @{ $par->[1] };	2423	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2256	my ($W, $H) = $layout->size;	2424
2257	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;
2258	}	2427	}
2259		2428
2260	$y += $h;	2429	$y += $h;
2261	}	2430	}
2262		2431
2263	glDisable GL_TEXTURE_2D;
2264	glDisable GL_BLEND;	2432	glDisable GL_BLEND;
2265	};	2433	};
2266	});	2434	});
2267	}	2435	}
2268		2436
2269	sub _draw {	2437	sub _draw {
2270	my ($self) = @_;	2438	my ($self) = @_;
2271		2439
2272	glEnable GL_BLEND;
2273	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2274	glEnable GL_TEXTURE_2D;	2440	glEnable GL_TEXTURE_2D;
2275	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2441	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2276	glColor 1, 1, 1, 1;	2442	glColor 1, 1, 1, 1;
2277	$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});
2278	glDisable GL_TEXTURE_2D;	2444	glDisable GL_TEXTURE_2D;
2279	glDisable GL_BLEND;
2280		2445
2281	$self->{children}[1]->draw;	2446	$self->{children}[1]->draw;
2282		2447
2283	}	2448	}
2284		2449
…		…
2378	@_,	2543	@_,
2379	can_events => 0,	2544	can_events => 0,
2380	)	2545	)
2381	}	2546	}
2382		2547
2383	sub set_markup {	2548	sub set_tooltip_from {
2384	my ($self, $text) = @_;	2549	my ($self, $widget) = @_;
2385		2550
2386	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2551	$self->add (new CFClient::UI::Label
2387	$self->{label}->set_markup ($text);	2552	markup => $widget->{tooltip},
2388	$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	);
2389	}	2559	}
2390		2560
2391	sub size_request {	2561	sub size_request {
2392	my ($self) = @_;	2562	my ($self) = @_;
2393
2394	$self->child->set_max_size ($::WIDTH * 0.3);
2395		2563
2396	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2564	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2397		2565
2398	($w + 4, $h + 4)	2566	($w + 4, $h + 4)
2399	}	2567	}
…		…
2405	}	2573	}
2406		2574
2407	sub _draw {	2575	sub _draw {
2408	my ($self) = @_;	2576	my ($self) = @_;
2409		2577
2410	glPushMatrix;
2411	glTranslate 0.375, 0.375;	2578	glTranslate 0.375, 0.375;
2412		2579
2413	my ($w, $h) = @$self{qw(w h)};	2580	my ($w, $h) = @$self{qw(w h)};
2414		2581
2415	glColor 1, 0.8, 0.4;	2582	glColor 1, 0.8, 0.4;
…		…
2426	glVertex 0 , $h;	2593	glVertex 0 , $h;
2427	glVertex $w, $h;	2594	glVertex $w, $h;
2428	glVertex $w, 0;	2595	glVertex $w, 0;
2429	glEnd;	2596	glEnd;
2430		2597
2431	glPopMatrix;	2598	glTranslate 2 - 0.375, 2 - 0.375;
2432
2433	glTranslate 2, 2;
2434	$self->SUPER::_draw;	2599	$self->SUPER::_draw;
2435	}	2600	}
2436		2601
2437	#############################################################################	2602	#############################################################################
2438		2603
…		…
2443	use CFClient::OpenGL;	2608	use CFClient::OpenGL;
2444		2609
2445	sub new {	2610	sub new {
2446	my $class = shift;	2611	my $class = shift;
2447		2612
2448	$class->SUPER::new (	2613	my $self = $class->SUPER::new (
2449	aspect => 1,	2614	aspect => 1,
2450	@_,	2615	@_,
2451	)	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
2452	}	2633	}
2453		2634
2454	sub size_request {	2635	sub size_request {
2455	(32, 8)	2636	(32, 8)
2456	}	2637	}
2457		2638
		2639	sub update {
		2640	my ($self) = @_;
		2641
		2642	return unless $self->{visible};
		2643
		2644	$self->SUPER::update;
		2645	}
		2646
2458	sub _draw {	2647	sub _draw {
2459	my ($self) = @_;	2648	my ($self) = @_;
2460		2649
2461	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
2462	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2661	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2463		2662
2464	# TODO animation
2465	if ($tex) {	2663	if ($tex) {
2466	glEnable GL_BLEND;
2467	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2468	glEnable GL_TEXTURE_2D;	2664	glEnable GL_TEXTURE_2D;
2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2665	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470	glColor 1, 1, 1, 1;	2666	glColor 1, 1, 1, 1;
2471	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2667	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472	glDisable GL_TEXTURE_2D;	2668	glDisable GL_TEXTURE_2D;
2473	glDisable GL_BLEND;
2474	}	2669	}
		2670	}
		2671
		2672	sub DESTROY {
		2673	my ($self) = @_;
		2674
		2675	$self->{timer}->cancel
		2676	if $self->{timer};
		2677
		2678	$self->SUPER::DESTROY;
2475	}	2679	}
2476		2680
2477	#############################################################################	2681	#############################################################################
2478		2682
2479	package CFClient::UI::InventoryItem;	2683	package CFClient::UI::InventoryItem;
2480		2684
2481	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	}
2482		2712
2483	sub new {	2713	sub new {
2484	my $class = shift;	2714	my $class = shift;
2485		2715
2486	my %args = @_;	2716	my %args = @_;
2487		2717
2488	my $item = delete $args{item};	2718	my $item = delete $args{item};
2489		2719
2490	my $desc = $item->{nrof} < 2	2720	my $desc = _item_to_desc ($item);
2491	? $item->{name}
2492	: "$item->{nrof} $item->{name_pl}";
2493
2494		2721
2495	my $self = $class->SUPER::new (	2722	my $self = $class->SUPER::new (
2496	can_hover => 1,	2723	can_hover => 1,
2497	can_events => 1,	2724	can_events => 1,
2498	tooltip => (CFClient::UI::Label->escape ($desc)	2725	tooltip => ((CFClient::UI::Label::escape $desc)
2499	. "\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>"),
2500	connect_button_down => sub {	2727	connect_button_down => sub {
2501	my ($self, $ev, $x, $y) = @_;	2728	my ($self, $ev, $x, $y) = @_;
2502		2729
2503	# 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");
2504	if ($ev->{button} == 1) {	2739	} elsif ($ev->{button} == 1) {
2505	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2740	$::CONN->send ("examine $item->{tag}");
2506	} elsif ($ev->{button} == 2) {	2741	} elsif ($ev->{button} == 2) {
2507	$::CONN->send ("apply $item->{tag}");	2742	$::CONN->send ("apply $item->{tag}");
2508	} elsif ($ev->{button} == 3) {	2743	} elsif ($ev->{button} == 3) {
2509	CFClient::UI::Menu->new (	2744	my @menu_items = (
2510	items => [
2511	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2745	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2512	[
2513	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2514	sub { $::CONN->send ("lock $item->{tag}") },
2515	],
2516	["mark", sub { $::CONN->send ("mark $item->{tag}") }],	2746	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2517	["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}) }],
2518	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2755	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2756	)
2519	],	2757	),
2520	)->popup ($ev);	2758	);
		2759
		2760	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2521	}	2761	}
2522		2762
2523	1	2763	1
2524	},	2764	},
2525	%args	2765	%args
2526	);	2766	);
		2767
2527		2768
2528	$self->add (new CFClient::UI::Face	2769	$self->add (new CFClient::UI::Face
2529	can_events => 0,	2770	can_events => 0,
2530	face => $item->{face},	2771	face => $item->{face},
2531	anim => $item->{anim},	2772	anim => $item->{anim},
2532	animspeed => $item->{animspeed},	2773	animspeed => $item->{animspeed},
2533	);	2774	);
2534		2775
2535	$self->add (new CFClient::UI::Label	2776	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2536	can_events => 0,	2777
2537	text => $desc,	2778	$self->{item} = $item;
2538	);	2779
		2780	$self->update_item;
2539		2781
2540	$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);
2541	}	2791	}
2542		2792
2543	#############################################################################	2793	#############################################################################
2544		2794
2545	package CFClient::UI::Inventory;	2795	package CFClient::UI::Inventory;
…		…
2548		2798
2549	sub new {	2799	sub new {
2550	my $class = shift;	2800	my $class = shift;
2551		2801
2552	my $self = $class->SUPER::new (	2802	my $self = $class->SUPER::new (
2553	scrolled => (new CFClient::UI::VBox),	2803	scrolled => (new CFClient::UI::Table),
2554	@_,	2804	@_,
2555	);	2805	);
2556		2806
2557	$self	2807	$self
2558	}	2808	}
…		…
2561	my ($self, $items) = @_;	2811	my ($self, $items) = @_;
2562		2812
2563	$self->{scrolled}->clear;	2813	$self->{scrolled}->clear;
2564	return unless $items;	2814	return unless $items;
2565		2815
2566	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;
2567		2820
2568	$self->{real_items} = \@items;	2821	$self->{real_items} = \@items;
2569		2822
2570	for my $item (@items) {	2823	for my $item (@items) {
2571	my $desc = $item->{nrof} < 2	2824	$item->{item} = $item;
2572	? $item->{name}
2573	: "$item->{nrof} $item->{name_pl}";
2574
2575	$self->{scrolled}->add ($item->{widget} ||= 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);
2576	}	2834	}
2577		2835
2578	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2836	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2579	}	2837	}
2580		2838
…		…
2655	}	2913	}
2656	}	2914	}
2657		2915
2658	#############################################################################	2916	#############################################################################
2659		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
2660	package CFClient::UI::Root;	3026	package CFClient::UI::Root;
2661		3027
2662	our @ISA = CFClient::UI::Container::;	3028	our @ISA = CFClient::UI::Container::;
2663		3029
2664	use CFClient::OpenGL;	3030	use CFClient::OpenGL;
…		…
2692	}	3058	}
2693		3059
2694	sub size_allocate {	3060	sub size_allocate {
2695	my ($self, $w, $h) = @_;	3061	my ($self, $w, $h) = @_;
2696		3062
2697	my $old_w = $self->{old_w};
2698	my $old_h = $self->{old_h};
2699
2700	if ($old_w && $old_h) {
2701	for my $child ($self->children) {
2702	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2703	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2704	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2705	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2706	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2707	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2708	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2709	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2710	}
2711	}
2712
2713	for my $child ($self->children) {	3063	for my $child ($self->children) {
2714	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)};
2715		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
2716	$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;
2717	$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
2718	$child->configure ($X, $Y, $W, $H);	3075	$child->configure ($X, $Y, $W, $H);
2719	}	3076	}
2720
2721	$self->{old_w} = $w;
2722	$self->{old_h} = $h;
2723	}	3077	}
2724		3078
2725	sub coord2local {	3079	sub coord2local {
2726	my ($self, $x, $y) = @_;	3080	my ($self, $x, $y) = @_;
2727		3081
…		…
2740	$self->check_size;	3094	$self->check_size;
2741	$::WANT_REFRESH++;	3095	$::WANT_REFRESH++;
2742	}	3096	}
2743		3097
2744	sub add {	3098	sub add {
2745	my ($self, $child) = @_;	3099	my ($self, @children) = @_;
2746		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
2747	# integerise window positions	3110	# integerise window positions
2748	$child->{x} = int $child->{x};	3111	$child->{x} = int $child->{x};
2749	$child->{y} = int $child->{y};	3112	$child->{y} = int $child->{y};
		3113	}
2750		3114
2751	$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	}
2752	}	3128	}
2753		3129
2754	sub on_refresh {	3130	sub on_refresh {
2755	my ($self, $id, $cb) = @_;	3131	my ($self, $id, $cb) = @_;
2756		3132
2757	$self->{refresh_hook}{$id} = $cb;	3133	$self->{refresh_hook}{$id} = $cb;
2758	}	3134	}
2759		3135
		3136	sub on_post_alloc {
		3137	my ($self, $id, $cb) = @_;
		3138
		3139	$self->{post_alloc_hook}{$id} = $cb;
		3140	}
		3141
2760	sub draw {	3142	sub draw {
2761	my ($self) = @_;	3143	my ($self) = @_;
		3144
		3145	while ($self->{refresh_hook}) {
		3146	$_->()
		3147	for values %{delete $self->{refresh_hook}};
		3148	}
2762		3149
2763	if ($self->{check_size}) {	3150	if ($self->{check_size}) {
2764	my @queue = ([], []);	3151	my @queue = ([], []);
2765		3152
2766	for (;;) {	3153	for (;;) {
…		…
2774		3161
2775	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3162	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2776	? @$widget{qw(user_w user_h)}	3163	? @$widget{qw(user_w user_h)}
2777	: $widget->size_request;	3164	: $widget->size_request;
2778		3165
		3166	if (delete $widget->{force_alloc}
2779	if ($w != $widget->{req_w} || $h != $widget->{req_h}) {	3167	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2780	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3168	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2781		3169
2782	$widget->{req_w} = $w;	3170	$widget->{req_w} = $w;
2783	$widget->{req_h} = $h;	3171	$widget->{req_h} = $h;
2784		3172
2785	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];	3173	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2786		3174
2787	$widget->{parent}->check_size	3175	$widget->{parent}->check_size
2788	if $widget->{parent};	3176	if $widget->{parent};
2789	}	3177	}
2790	}	3178	}
…		…
2802	$widget->size_allocate ($w, $h);	3190	$widget->size_allocate ($w, $h);
2803	$widget->emit (size_allocate => $w, $h);	3191	$widget->emit (size_allocate => $w, $h);
2804	}	3192	}
2805	}	3193	}
2806		3194
2807	while ($self->{refresh_hook}) {	3195	while ($self->{post_alloc_hook}) {
2808	$_->()	3196	$_->()
2809	for values %{delete $self->{refresh_hook}};	3197	for values %{delete $self->{post_alloc_hook}};
2810	}	3198	}
2811		3199
2812	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3200	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2813	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3201	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2814	glClear GL_COLOR_BUFFER_BIT;	3202	glClear GL_COLOR_BUFFER_BIT;
2815		3203
2816	glMatrixMode GL_PROJECTION;	3204	glMatrixMode GL_PROJECTION;
2817	glLoadIdentity;	3205	glLoadIdentity;
2818	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3206	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2819	glMatrixMode GL_MODELVIEW;	3207	glMatrixMode GL_MODELVIEW;
2820	glLoadIdentity;	3208	glLoadIdentity;
2821		3209
2822	$self->_draw;	3210	$self->_draw;
2823	}	3211	}
…		…
2825	#############################################################################	3213	#############################################################################
2826		3214
2827	package CFClient::UI;	3215	package CFClient::UI;
2828		3216
2829	$ROOT = new CFClient::UI::Root;	3217	$ROOT = new CFClient::UI::Root;
2830	$TOOLTIP = new CFClient::UI::Tooltip;	3218	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2831		3219
2832	1	3220	1
2833		3221

Diff Legend

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