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.229 by root, Wed May 24 21:49:58 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
…		…
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
15		18
16	sub check_tooltip {	19	sub check_tooltip {
17	if (!$GRAB) {	20	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
23		26
24	my $tip = $widget->{tooltip};	27	my $tip = $widget->{tooltip};
25		28
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	29	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		30
28	$TOOLTIP->set_markup ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29
30	$TOOLTIP->show;	32	$TOOLTIP->show;
31		33
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		35
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
37		38
38	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
39	}	42	}
40		43
41	return;	44	return;
42	}	45	}
43	}	46	}
…		…
130		133
131	for (@$vals) {	134	for (@$vals) {
132	my $i = int $_ + $rem;	135	my $i = int $_ + $rem;
133	$rem += $_ - $i;	136	$rem += $_ - $i;
134	$_ = $i;	137	$_ = $i;
		138	}
		139	}
		140
		141	sub full_refresh {
		142	# make a copy, otherwise for complains about freed values.
		143	my @widgets = values %WIDGET;
		144
		145	$_->update
		146	for @widgets;
		147	}
		148
		149	# call when resolution changes etc.
		150	sub rescale_widgets {
		151	my ($sx, $sy) = @_;
		152
		153	# make a copy, otherwise for complains about freed values.
		154	my @widgets = values %WIDGET;
		155
		156	for my $widget (@widgets) {
		157	if ($widget->{toplevel}) {
		158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		166	}
		167
		168	$widget->reconfigure;
135	}	169	}
136	}	170	}
137		171
138	#############################################################################	172	#############################################################################
139		173
…		…
158	if (/^connect_(.*)$/) {	192	if (/^connect_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	193	$self->connect ($1 => delete $self->{$_});
160	}	194	}
161	}	195	}
162		196
		197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		198
163	$self	199	$self
164	}	200	}
165		201
166	sub destroy {	202	sub destroy {
167	my ($self) = @_;	203	my ($self) = @_;
…		…
170	%$self = ();	206	%$self = ();
171	}	207	}
172		208
173	sub show {	209	sub show {
174	my ($self) = @_;	210	my ($self) = @_;
175
176	return if $self->{parent};	211	return if $self->{parent};
177		212
178	$CFClient::UI::ROOT->add ($self);	213	$CFClient::UI::ROOT->add ($self);
		214	}
		215
		216	sub show_centered {
		217	my ($self) = @_;
		218	return if $self->{parent};
		219
		220	$self->show;
		221
		222	$CFClient::UI::ROOT->on_post_alloc (
		223	"centered $self" => sub {
		224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		225	},
		226	);
179	}	227	}
180		228
181	sub hide {	229	sub hide {
182	my ($self) = @_;	230	my ($self) = @_;
183		231
…		…
240		288
241	sub size_allocate {	289	sub size_allocate {
242	# nothing to be done	290	# nothing to be done
243	}	291	}
244		292
		293	sub reconfigure {
		294	my ($self) = @_;
		295
		296	$self->check_size (1);
		297	$self->update;
		298	}
		299
245	sub children {	300	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	}	301	}
259		302
260	sub set_max_size {	303	sub set_max_size {
261	my ($self, $w, $h) = @_;	304	my ($self, $w, $h) = @_;
262		305
263	delete $self->{max_w}; $self->{max_w} = $w if $w;	306	delete $self->{max_w}; $self->{max_w} = $w if $w;
264	delete $self->{max_h}; $self->{max_h} = $h if $h;	307	delete $self->{max_h}; $self->{max_h} = $h if $h;
		308	}
		309
		310	sub set_tooltip {
		311	my ($self, $tooltip) = @_;
		312
		313	$self->{tooltip} = $tooltip;
		314
		315	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		316	delete $CFClient::UI::TOOLTIP->{owner};
		317	CFClient::UI::check_tooltip;
		318	}
265	}	319	}
266		320
267	# translate global coordinates to local coordinate system	321	# translate global coordinates to local coordinate system
268	sub coord2local {	322	sub coord2local {
269	my ($self, $x, $y) = @_;	323	my ($self, $x, $y) = @_;
…		…
355	glVertex $self->{w}, 0;	409	glVertex $self->{w}, 0;
356	glVertex $self->{w}, $self->{h};	410	glVertex $self->{w}, $self->{h};
357	glVertex 0 , $self->{h};	411	glVertex 0 , $self->{h};
358	glEnd;	412	glEnd;
359	glPopMatrix;	413	glPopMatrix;
360	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	414	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361	}	415	}
362	}	416	}
363		417
364	sub _draw {	418	sub _draw {
365	my ($self) = @_;	419	my ($self) = @_;
…		…
382	sub set_parent {	436	sub set_parent {
383	my ($self, $parent) = @_;	437	my ($self, $parent) = @_;
384		438
385	Scalar::Util::weaken ($self->{parent} = $parent);	439	Scalar::Util::weaken ($self->{parent} = $parent);
386		440
		441	# TODO: req_w _does_change after ->reconfigure
387	$self->check_size	442	$self->check_size
388	unless exists $self->{req_w};	443	unless exists $self->{req_w};
		444
		445	$self->show;
389	}	446	}
390		447
391	sub check_size {	448	sub check_size {
392	my ($self) = @_;	449	my ($self, $forced) = @_;
393		450
		451	$self->{force_alloc} = 1 if $forced;
394	$CFClient::UI::ROOT->{check_size}{$self} = $self;	452	$CFClient::UI::ROOT->{check_size}{$self} = $self;
395	}	453	}
396		454
397	sub update {	455	sub update {
398	my ($self) = @_;	456	my ($self) = @_;
…		…
414	}	472	}
415		473
416	sub DESTROY {	474	sub DESTROY {
417	my ($self) = @_;	475	my ($self) = @_;
418		476
		477	delete $WIDGET{$self+0};
419	#$self->deactivate;	478	#$self->deactivate;
420	}	479	}
421		480
422	#############################################################################	481	#############################################################################
423		482
…		…
432	my $class = shift;	491	my $class = shift;
433		492
434	# range [value, low, high, page]	493	# range [value, low, high, page]
435		494
436	$class->SUPER::new (	495	$class->SUPER::new (
437	bg => [0, 0, 0, 0.2],	496	#bg => [0, 0, 0, 0.2],
438	active_bg => [1, 1, 1, 0.5],	497	#active_bg => [1, 1, 1, 0.5],
439	@_	498	@_
440	)	499	)
441	}	500	}
442		501
443	sub _draw {	502	sub _draw {
444	my ($self) = @_;	503	my ($self) = @_;
445		504
		505	my $color = $FOCUS == $self && $self->{active_bg}
		506	? $self->{active_bg}
		507	: $self->{bg};
		508
		509	if ($color && (@$color < 4 || $color->[3])) {
446	my ($w, $h) = @$self{qw(w h)};	510	my ($w, $h) = @$self{qw(w h)};
447		511
448	glEnable GL_BLEND;	512	glEnable GL_BLEND;
449	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	513	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	514	glColor @$color;
451		515
452	glBegin GL_QUADS;	516	glBegin GL_QUADS;
453	glVertex 0 , 0;	517	glVertex 0 , 0;
454	glVertex 0 , $h;	518	glVertex 0 , $h;
455	glVertex $w, $h;	519	glVertex $w, $h;
456	glVertex $w, 0;	520	glVertex $w, 0;
457	glEnd;	521	glEnd;
458		522
459	glDisable GL_BLEND;	523	glDisable GL_BLEND;
		524	}
460	}	525	}
461		526
462	#############################################################################	527	#############################################################################
463		528
464	package CFClient::UI::Empty;	529	package CFClient::UI::Empty;
…		…
508	$self->{children} = [	573	$self->{children} = [
509	sort { $a->{z} <=> $b->{z} }	574	sort { $a->{z} <=> $b->{z} }
510	@{$self->{children}}, @widgets	575	@{$self->{children}}, @widgets
511	];	576	];
512		577
513	$self->check_size;	578	$self->check_size (1);
514	$self->update;	579	$self->update;
515	}	580	}
516		581
517	sub children {	582	sub children {
518	@{ $_[0]{children} }	583	@{ $_[0]{children} }
…		…
625	}	690	}
626		691
627	sub update {	692	sub update {
628	my ($self) = @_;	693	my ($self) = @_;
629		694
630	$ROOT->on_refresh ($self => sub { $self->render_child });	695	$ROOT->on_post_alloc ($self => sub { $self->render_child });
631	$self->SUPER::update;	696	$self->SUPER::update;
632	}	697	}
633		698
634	sub size_allocate {	699	sub size_allocate {
635	my ($self, $w, $h) = @_;	700	my ($self, $w, $h) = @_;
…		…
648	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	713	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649	glClearColor 0, 0, 0, 0;	714	glClearColor 0, 0, 0, 0;
650	glClear GL_COLOR_BUFFER_BIT;	715	glClear GL_COLOR_BUFFER_BIT;
651		716
652	$self->_render;	717	$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	};	718	};
661	}	719	}
662		720
663	sub _draw {	721	sub _draw {
664	my ($self) = @_;	722	my ($self) = @_;
…		…
666	my ($w, $h) = ($self->w, $self->h);	724	my ($w, $h) = ($self->w, $self->h);
667		725
668	my $tex = $self->{texture}	726	my $tex = $self->{texture}
669	or return;	727	or return;
670		728
671	glEnable GL_BLEND;
672	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673	glEnable GL_TEXTURE_2D;	729	glEnable GL_TEXTURE_2D;
674	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	730	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675	glColor 0, 0, 0, 1;	731	glColor 1, 1, 1, 1;
676		732
677	$tex->draw_quad (0, 0, $w, $h);	733	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678		734
679	glDisable GL_BLEND;
680	glDisable GL_TEXTURE_2D;	735	glDisable GL_TEXTURE_2D;
681	}	736	}
682		737
683	#############################################################################	738	#############################################################################
684		739
…		…
688		743
689	sub size_request {	744	sub size_request {
690	my ($self) = @_;	745	my ($self) = @_;
691		746
692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	747	@$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		748
695	@$self{qw(child_w child_h)}	749	@$self{qw(child_w child_h)}
696	}	750	}
697		751
698	sub size_allocate {	752	sub size_allocate {
699	my ($self, $w, $h) = @_;	753	my ($self, $w, $h) = @_;
700		754
		755	my ($cw, $ch) = @$self{qw(child_w child_h)};
		756	# $w = $self->{w};
		757	$self->child->configure (0, 0, $cw, $ch);
701	$self->update;	758	$self->update;
702	}	759	}
703		760
704	sub set_offset {	761	sub set_offset {
705	my ($self, $x, $y) = @_;	762	my ($self, $x, $y) = @_;
…		…
759		816
760	my $slider = new CFClient::UI::Slider	817	my $slider = new CFClient::UI::Slider
761	vertical => 1,	818	vertical => 1,
762	range => [0, 0, 1, 0.01], # HACK fix	819	range => [0, 0, 1, 0.01], # HACK fix
763	connect_changed => sub {	820	connect_changed => sub {
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	821	$self->{vp}->set_offset (0, $_[1]);
765	},	822	},
766	;	823	;
767		824
768	$self = $class->SUPER::new (	825	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	826	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	827	slider => $slider,
771	@_,	828	@_,
772	);	829	);
773		830
774	$self->{vp}->add ($self->{scrolled});	831	$self->{vp}->add ($self->{scrolled});
…		…
776	$self->add ($self->{slider});	833	$self->add ($self->{slider});
777		834
778	$self	835	$self
779	}	836	}
780		837
		838	sub size_allocate {
		839	my ($self, $w, $h) = @_;
		840
		841	$self->SUPER::size_allocate ($w, $h);
		842
		843	my $child = $self->{vp}->child;
		844	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		845	}
		846
781	#TODO# update range on size_allocate depeneing on child	847	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	848	# update viewport offset on scroll
783		849
784	#############################################################################	850	#############################################################################
785		851
786	package CFClient::UI::Frame;	852	package CFClient::UI::Frame;
…		…
790	use CFClient::OpenGL;	856	use CFClient::OpenGL;
791		857
792	sub new {	858	sub new {
793	my $class = shift;	859	my $class = shift;
794		860
795	my $self = $class->SUPER::new (	861	$class->SUPER::new (
796	bg => [1, 1, 1, 1],	862	bg => undef,
797	border_bg => [1, 1, 1, 1],
798	border => 0.8,
799	@_	863	@_,
800	);	864	)
801
802	$self
803	}	865	}
804		866
805	sub _draw {	867	sub _draw {
806	my ($self) = @_;	868	my ($self) = @_;
807		869
808	my ($w, $h) = ($self->{w}, $self->{h});	870	if ($self->{bg}) {
		871	my ($w, $h) = @$self{qw(w h)};
809		872
810	glEnable GL_BLEND;	873	glEnable GL_BLEND;
811	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	874	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812	glEnable GL_TEXTURE_2D;	875	glColor @{ $self->{bg} };
813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814		876
815	# glBegin GL_QUADS;	877	glBegin GL_QUADS;
816	# glColor 0, 0, 0, 0;
817	# glVertex 0 , 0;	878	glVertex 0 , 0;
818	# glVertex 0 , $h;	879	glVertex 0 , $h;
819	# glVertex $w, $h;	880	glVertex $w, $h;
820	# glVertex $w, 0;	881	glVertex $w, 0;
821	# glEnd;	882	glEnd;
822		883
823
824	$self->child->draw;
825	glDisable GL_BLEND;	884	glDisable GL_BLEND;
826	glDisable GL_TEXTURE_2D;	885	}
		886
		887	$self->SUPER::_draw;
827	}	888	}
828		889
829	#############################################################################	890	#############################################################################
830		891
831	package CFClient::UI::FancyFrame;	892	package CFClient::UI::FancyFrame;
…		…
845		906
846	my $self = $class->SUPER::new (	907	my $self = $class->SUPER::new (
847	bg => [1, 1, 1, 1],	908	bg => [1, 1, 1, 1],
848	border_bg => [1, 1, 1, 1],	909	border_bg => [1, 1, 1, 1],
849	border => 0.6,	910	border => 0.6,
		911	toplevel => 1,
850	can_events => 1,	912	can_events => 1,
851	@_	913	@_
852	);	914	);
853		915
854	$self->{title} &&= new CFClient::UI::Label	916	$self->{title} &&= new CFClient::UI::Label
…		…
879	my ($self, $w, $h) = @_;	941	my ($self, $w, $h) = @_;
880		942
881	$h -= List::Util::max 0, $self->border * 2;	943	$h -= List::Util::max 0, $self->border * 2;
882	$w -= List::Util::max 0, $self->border * 2;	944	$w -= List::Util::max 0, $self->border * 2;
883		945
884	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	946	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
885	if $self->{title};	947	if $self->{title};
886		948
887	$self->child->configure ($self->border, $self->border, $w, $h);	949	$self->child->configure ($self->border, $self->border, $w, $h);
888	}	950	}
889		951
…		…
947	my ($self) = @_;	1009	my ($self) = @_;
948		1010
949	my ($w, $h ) = ($self->{w}, $self->{h});	1011	my ($w, $h ) = ($self->{w}, $self->{h});
950	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1012	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951		1013
952	glEnable GL_BLEND;
953	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954	glEnable GL_TEXTURE_2D;	1014	glEnable GL_TEXTURE_2D;
955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1015	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956		1016
957	my $border = $self->border;	1017	my $border = $self->border;
958		1018
959	glColor @{ $self->{border_bg} };	1019	glColor @{ $self->{border_bg} };
960	$tex[1]->draw_quad (0, 0, $w, $border);	1020	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
961	$tex[3]->draw_quad (0, $border, $border, $ch);	1021	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1022	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1023	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964		1024
965	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1025	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966	my $bg = $tex[0];	1026	my $bg = $tex[0];
967		1027
968	# TODO: repeat texture not scale	1028	# TODO: repeat texture not scale
…		…
972	glColor @{ $self->{bg} };	1032	glColor @{ $self->{bg} };
973		1033
974	$bg->{s} = $rep_x;	1034	$bg->{s} = $rep_x;
975	$bg->{t} = $rep_y;	1035	$bg->{t} = $rep_y;
976	$bg->{wrap_mode} = 1;	1036	$bg->{wrap_mode} = 1;
977	$bg->draw_quad ($border, $border, $cw, $ch);	1037	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1038	}
978		1039
979	glDisable GL_TEXTURE_2D;	1040	glDisable GL_TEXTURE_2D;
980	glDisable GL_BLEND;
981	}
982		1041
983	$self->{title}->draw if $self->{title};	1042	$self->{title}->draw if $self->{title};
984		1043
985	$self->child->draw;	1044	$self->child->draw;
986	}	1045	}
…		…
1253		1312
1254	#############################################################################	1313	#############################################################################
1255		1314
1256	package CFClient::UI::Label;	1315	package CFClient::UI::Label;
1257		1316
1258	our @ISA = CFClient::UI::Base::;	1317	our @ISA = CFClient::UI::DrawBG::;
1259		1318
1260	use CFClient::OpenGL;	1319	use CFClient::OpenGL;
1261		1320
1262	sub new {	1321	sub new {
1263	my ($class, %arg) = @_;	1322	my ($class, %arg) = @_;
1264		1323
1265	my $self = $class->SUPER::new (	1324	my $self = $class->SUPER::new (
1266	fg => [1, 1, 1],	1325	fg => [1, 1, 1],
		1326	#bg => none
		1327	#active_bg => none
1267	#font => default_font	1328	#font => default_font
		1329	#text => initial text
		1330	#markup => initial narkup
		1331	#max_w => maximum pixel width
		1332	ellipsise => 3, # end
		1333	layout => (new CFClient::Layout),
1268	fontsize => 1,	1334	fontsize => 1,
1269	text => "",
1270	align => -1,	1335	align => -1,
1271	valign => -1,	1336	valign => -1,
1272	padding => 2,	1337	padding => 2,
1273	layout => new CFClient::Layout,
1274	can_events => 0,	1338	can_events => 0,
1275	%arg	1339	%arg
1276	);	1340	);
1277		1341
1278	if (exists $self->{template}) {	1342	if (exists $self->{template}) {
1279	my $layout = new CFClient::Layout;	1343	my $layout = new CFClient::Layout;
1280	$layout->set_text (delete $self->{template});	1344	$layout->set_text (delete $self->{template});
1281	$self->{template} = $layout;	1345	$self->{template} = $layout;
1282	}	1346	}
1283		1347
1284	$self->set_text (delete $self->{text}) if exists $self->{text};	1348	if (exists $self->{markup}) {
1285	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1349	$self->set_markup (delete $self->{markup});
		1350	} else {
		1351	$self->set_text (delete $self->{text});
		1352	}
1286		1353
1287	$self	1354	$self
1288	}	1355	}
1289		1356
1290	sub escape {	1357	sub escape($) {
1291	local $_ = $_[1];	1358	local $_ = $_[0];
1292		1359
1293	s/&/&amp;/g;	1360	s/&/&amp;/g;
1294	s/>/&gt;/g;	1361	s/>/&gt;/g;
1295	s/</&lt;/g;	1362	s/</&lt;/g;
1296		1363
1297	$_[1]	1364	$_
1298	}	1365	}
1299		1366
1300	sub update {	1367	sub update {
1301	my ($self) = @_;	1368	my ($self) = @_;
1302		1369
…		…
1308	my ($self, $text) = @_;	1375	my ($self, $text) = @_;
1309		1376
1310	return if $self->{text} eq "T$text";	1377	return if $self->{text} eq "T$text";
1311	$self->{text} = "T$text";	1378	$self->{text} = "T$text";
1312		1379
		1380	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1313	$self->{layout}->set_text ($text);	1381	$self->{layout}->set_text ($text);
1314		1382
1315	$self->update;	1383	$self->update;
1316	$self->check_size;	1384	$self->check_size;
1317	}	1385	}
…		…
1320	my ($self, $markup) = @_;	1388	my ($self, $markup) = @_;
1321		1389
1322	return if $self->{text} eq "M$markup";	1390	return if $self->{text} eq "M$markup";
1323	$self->{text} = "M$markup";	1391	$self->{text} = "M$markup";
1324		1392
		1393	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1394
		1395	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1325	$self->{layout}->set_markup ($markup);	1396	$self->{layout}->set_markup ($markup);
1326		1397
1327	$self->update;	1398	$self->update;
1328	$self->check_size;	1399	$self->check_size;
1329	}	1400	}
…		…
1331	sub size_request {	1402	sub size_request {
1332	my ($self) = @_;	1403	my ($self) = @_;
1333		1404
1334	$self->{layout}->set_font ($self->{font}) if $self->{font};	1405	$self->{layout}->set_font ($self->{font}) if $self->{font};
1335	$self->{layout}->set_width ($self->{max_w} || -1);	1406	$self->{layout}->set_width ($self->{max_w} || -1);
		1407	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1408	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1409	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337		1410
1338	my ($w, $h) = $self->{layout}->size;	1411	my ($w, $h) = $self->{layout}->size;
1339		1412
1340	if (exists $self->{template}) {	1413	if (exists $self->{template}) {
…		…
1370	}	1443	}
1371		1444
1372	sub _draw {	1445	sub _draw {
1373	my ($self) = @_;	1446	my ($self) = @_;
1374		1447
		1448	$self->SUPER::_draw; # draw background, if applicable
		1449
1375	my $tex = $self->{texture} ||= do {	1450	my $tex = $self->{texture} ||= do {
		1451	$self->{layout}->set_foreground (@{$self->{fg}});
1376	$self->{layout}->set_font ($self->{font}) if $self->{font};	1452	$self->{layout}->set_font ($self->{font}) if $self->{font};
1377	$self->{layout}->set_width ($self->{w});	1453	$self->{layout}->set_width ($self->{w});
		1454	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1455	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1378	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1456	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1457
1379	new_from_layout CFClient::Texture $self->{layout}	1458	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1459
		1460	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1461	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1462	: ($self->{w} - $tex->{w}) * 0.5);
		1463
		1464	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1465	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1466	: ($self->{h} - $tex->{h}) * 0.5);
		1467
		1468	$tex
1380	};	1469	};
1381		1470
1382	glEnable GL_BLEND;
1383	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1384	glEnable GL_TEXTURE_2D;	1471	glEnable GL_TEXTURE_2D;
1385	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1472	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1386		1473
		1474	if ($tex->{format} == GL_ALPHA) {
1387	glColor @{$self->{fg}};	1475	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});	1476	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1477	} else {
		1478	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1479	}
1402		1480
1403	glDisable GL_TEXTURE_2D;	1481	glDisable GL_TEXTURE_2D;
1404	glDisable GL_BLEND;
1405	}	1482	}
1406		1483
1407	#############################################################################	1484	#############################################################################
1408		1485
1409	package CFClient::UI::EntryBase;	1486	package CFClient::UI::EntryBase;
…		…
1422	active_fg => [0, 0, 0],	1499	active_fg => [0, 0, 0],
1423	can_hover => 1,	1500	can_hover => 1,
1424	can_focus => 1,	1501	can_focus => 1,
1425	valign => 0,	1502	valign => 0,
1426	can_events => 1,	1503	can_events => 1,
		1504	#text => ...
1427	@_	1505	@_
1428	)	1506	)
1429	}	1507	}
1430		1508
1431	sub _set_text {	1509	sub _set_text {
…		…
1442		1520
1443	$text =~ s/./*/g if $self->{hidden};	1521	$text =~ s/./*/g if $self->{hidden};
1444	$self->{layout}->set_text ("$text ");	1522	$self->{layout}->set_text ("$text ");
1445		1523
1446	$self->emit (changed => $self->{text});	1524	$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	}	1525	}
1466		1526
1467	sub set_text {	1527	sub set_text {
1468	my ($self, $text) = @_;	1528	my ($self, $text) = @_;
1469		1529
1470	$self->{cursor} = length $text;	1530	$self->{cursor} = length $text;
1471	$self->_set_text ($text);	1531	$self->_set_text ($text);
1472	$self->update;	1532	$self->update;
		1533	$self->check_size;
		1534	}
		1535
		1536	sub get_text {
		1537	$_[0]{text}
		1538	}
		1539
		1540	sub size_request {
		1541	my ($self) = @_;
		1542
		1543	my ($w, $h) = $self->SUPER::size_request;
		1544
		1545	($w + 1, $h) # add 1 for cursor
		1546	}
		1547
		1548	sub size_allocate {
		1549	my ($self, $w, $h) = @_;
		1550
		1551	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1473	}	1552	}
1474		1553
1475	sub key_down {	1554	sub key_down {
1476	my ($self, $ev) = @_;	1555	my ($self, $ev) = @_;
1477		1556
…		…
1479	my $sym = $ev->{sym};	1558	my $sym = $ev->{sym};
1480	my $uni = $ev->{unicode};	1559	my $uni = $ev->{unicode};
1481		1560
1482	my $text = $self->get_text;	1561	my $text = $self->get_text;
1483		1562
1484	if ($sym == 8) {	1563	if ($uni == 8) {
1485	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1564	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1486	} elsif ($sym == 127) {	1565	} elsif ($uni == 127) {
1487	substr $text, $self->{cursor}, 1, "";	1566	substr $text, $self->{cursor}, 1, "";
1488	} elsif ($sym == CFClient::SDLK_LEFT) {	1567	} elsif ($sym == CFClient::SDLK_LEFT) {
1489	--$self->{cursor} if $self->{cursor};	1568	--$self->{cursor} if $self->{cursor};
1490	} elsif ($sym == CFClient::SDLK_RIGHT) {	1569	} elsif ($sym == CFClient::SDLK_RIGHT) {
1491	++$self->{cursor} if $self->{cursor} < length $self->{text};	1570	++$self->{cursor} if $self->{cursor} < length $self->{text};
1492	} elsif ($sym == CFClient::SDLK_HOME) {	1571	} elsif ($sym == CFClient::SDLK_HOME) {
1493	$self->{cursor} = 0;	1572	$self->{cursor} = 0;
1494	} elsif ($sym == CFClient::SDLK_END) {	1573	} elsif ($sym == CFClient::SDLK_END) {
1495	$self->{cursor} = length $text;	1574	$self->{cursor} = length $text;
1496	} elsif ($sym == 27) {	1575	} elsif ($uni == 27) {
1497	$self->emit ('escape');	1576	$self->emit ('escape');
1498	} elsif ($uni) {	1577	} elsif ($uni) {
1499	substr $text, $self->{cursor}++, 0, chr $uni;	1578	substr $text, $self->{cursor}++, 0, chr $uni;
1500	}	1579	}
1501		1580
1502	$self->_set_text ($text);	1581	$self->_set_text ($text);
1503	$self->update;	1582	$self->update;
		1583	$self->check_size;
1504	}	1584	}
1505		1585
1506	sub focus_in {	1586	sub focus_in {
1507	my ($self) = @_;	1587	my ($self) = @_;
1508		1588
…		…
1637	my $class = shift;	1717	my $class = shift;
1638		1718
1639	$class->SUPER::new (	1719	$class->SUPER::new (
1640	padding => 4,	1720	padding => 4,
1641	fg => [1, 1, 1],	1721	fg => [1, 1, 1],
1642	bg => [1, 1, 1, 0.2],
1643	active_fg => [0, 0, 1],	1722	active_fg => [0, 0, 1],
1644	can_hover => 1,	1723	can_hover => 1,
1645	align => 0,	1724	align => 0,
1646	valign => 0,	1725	valign => 0,
1647	can_events => 1,	1726	can_events => 1,
…		…
1665		1744
1666	if ($GRAB == $self) {	1745	if ($GRAB == $self) {
1667	$self->{fg} = $self->{active_fg};	1746	$self->{fg} = $self->{active_fg};
1668	}	1747	}
1669		1748
1670	glEnable GL_BLEND;
1671	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672	glEnable GL_TEXTURE_2D;	1749	glEnable GL_TEXTURE_2D;
1673	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1750	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1674	glColor 0, 0, 0, 1;	1751	glColor 0, 0, 0, 1;
1675		1752
1676	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1753	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1677		1754
1678	glDisable GL_TEXTURE_2D;	1755	glDisable GL_TEXTURE_2D;
1679	glDisable GL_BLEND;
1680		1756
1681	$self->SUPER::_draw;	1757	$self->SUPER::_draw;
1682	}	1758	}
1683		1759
1684	#############################################################################	1760	#############################################################################
…		…
1698		1774
1699	$class->SUPER::new (	1775	$class->SUPER::new (
1700	padding => 2,	1776	padding => 2,
1701	fg => [1, 1, 1],	1777	fg => [1, 1, 1],
1702	active_fg => [1, 1, 0],	1778	active_fg => [1, 1, 0],
		1779	bg => [0, 0, 0, 0.2],
		1780	active_bg => [1, 1, 1, 0.5],
1703	state => 0,	1781	state => 0,
1704	can_hover => 1,	1782	can_hover => 1,
1705	@_	1783	@_
1706	)	1784	)
1707	}	1785	}
…		…
1731		1809
1732	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1810	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1733		1811
1734	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1812	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1735		1813
1736	glEnable GL_BLEND;	1814	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1815
1737	glEnable GL_TEXTURE_2D;	1816	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);	1817	$tex->draw_quad_alpha (0, 0, $s, $s);
1743
1744	glDisable GL_TEXTURE_2D;	1818	glDisable GL_TEXTURE_2D;
1745	glDisable GL_BLEND;
1746	}	1819	}
1747		1820
1748	#############################################################################	1821	#############################################################################
1749		1822
1750	package CFClient::UI::Image;	1823	package CFClient::UI::Image;
…		…
1793	glTranslate 0, -$self->{w}, 0;	1866	glTranslate 0, -$self->{w}, 0;
1794		1867
1795	($w, $h) = ($h, $w);	1868	($w, $h) = ($h, $w);
1796	}	1869	}
1797		1870
1798	glEnable GL_BLEND;
1799	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1800	glEnable GL_TEXTURE_2D;	1871	glEnable GL_TEXTURE_2D;
1801	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1872	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802		1873
1803	$tex->draw_quad (0, 0, $w, $h);	1874	$tex->draw_quad_alpha (0, 0, $w, $h);
1804		1875
1805	glDisable GL_BLEND;
1806	glDisable GL_TEXTURE_2D;	1876	glDisable GL_TEXTURE_2D;
1807	}	1877	}
1808		1878
1809	#############################################################################	1879	#############################################################################
1810		1880
…		…
1999	qw(s1_slider.png s1_slider_bg.png);	2069	qw(s1_slider.png s1_slider_bg.png);
2000		2070
2001	sub new {	2071	sub new {
2002	my $class = shift;	2072	my $class = shift;
2003		2073
2004	# range [value, low, high, page]	2074	# range [value, low, high, page, unit]
2005		2075
2006	# TODO: 0-width page	2076	# TODO: 0-width page
2007	# TODO: req_w/h are wrong with vertical	2077	# TODO: req_w/h are wrong with vertical
2008	# TODO: calculations are off	2078	# TODO: calculations are off
2009	my $self = $class->SUPER::new (	2079	my $self = $class->SUPER::new (
2010	fg => [1, 1, 1],	2080	fg => [1, 1, 1],
2011	active_fg => [0, 0, 0],	2081	active_fg => [0, 0, 0],
		2082	bg => [0, 0, 0, 0.2],
		2083	active_bg => [1, 1, 1, 0.5],
2012	range => [0, 0, 100, 10],	2084	range => [0, 0, 100, 10, 0],
2013	req_w => $::WIDTH / 80,	2085	req_w => $::WIDTH / 80,
2014	req_h => $::WIDTH / 80,	2086	req_h => $::WIDTH / 80,
2015	vertical => 0,	2087	vertical => 0,
2016	can_hover => 1,	2088	can_hover => 1,
2017	inner_pad => 5,	2089	inner_pad => 0.02,
2018	@_	2090	@_
2019	);	2091	);
2020		2092
		2093	$self->set_value ($self->{range}[0]);
		2094	$self->update;
		2095
2021	$self	2096	$self
		2097	}
		2098
		2099	sub set_range {
		2100	my ($self, $range) = @_;
		2101
		2102	$self->{range} = $range;
		2103
		2104	$self->update;
		2105	}
		2106
		2107	sub set_value {
		2108	my ($self, $value) = @_;
		2109
		2110	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2111
		2112	$hi = $lo + 1 if $hi <= $lo;
		2113
		2114	$page = $hi - $lo if $page > $hi - $lo;
		2115
		2116	$value = $lo if $value < $lo;
		2117	$value = $hi - $page if $value > $hi - $page;
		2118
		2119	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2120	if $unit;
		2121
		2122	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2123
		2124	if ($value != $old_value) {
		2125	$self->emit (changed => $value);
		2126	$self->update;
		2127	}
2022	}	2128	}
2023		2129
2024	sub size_request {	2130	sub size_request {
2025	my ($self) = @_;	2131	my ($self) = @_;
2026		2132
…		…
2032		2138
2033	sub button_down {	2139	sub button_down {
2034	my ($self, $ev, $x, $y) = @_;	2140	my ($self, $ev, $x, $y) = @_;
2035		2141
2036	$self->SUPER::button_down ($ev, $x, $y);	2142	$self->SUPER::button_down ($ev, $x, $y);
		2143
		2144	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2145
2037	$self->mouse_motion ($ev, $x, $y);	2146	$self->mouse_motion ($ev, $x, $y);
2038	}	2147	}
2039		2148
2040	sub mouse_motion {	2149	sub mouse_motion {
2041	my ($self, $ev, $x, $y) = @_;	2150	my ($self, $ev, $x, $y) = @_;
2042		2151
2043	if ($GRAB == $self) {	2152	if ($GRAB == $self) {
		2153	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2154
		2155	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2156
		2157	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2158
		2159	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2160	}
		2161	}
		2162
		2163	sub update {
		2164	my ($self) = @_;
		2165
		2166	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2167	$self->set_value ($self->{range}[0]);
		2168
2044	my ($value, $lo, $hi, $page) = @{$self->{range}};	2169	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2170	my $range = ($hi - $page - $lo) || 1e-100;
2045		2171
2046	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2172	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2047		2173
2048	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2174	$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	2175	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2050		2176
2051	$x -= $inner_pad_px; # substract the padding	2177	$value = ($value - $lo) / $range;
2052	$x = $x * ($hi - $lo) / $inner_w + $lo;	2178	$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		2179
2057	$self->emit (changed => $x);	2180	$self->{knob_x} = $value - $knob_w * 0.5;
2058	$self->update;	2181	$self->{knob_w} = $knob_w;
2059	}	2182	});
2060	}
2061		2183
2062	# the inner_* stuff is for generating a padding for the slider handle,	2184	$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	}	2185	}
2069		2186
2070	sub _draw {	2187	sub _draw {
2071	my ($self) = @_;	2188	my ($self) = @_;
2072		2189
2073	$self->SUPER::_draw ();	2190	$self->SUPER::_draw ();
2074		2191
2075	my ($w, $h) = @$self{qw(w h)};	2192	glScale $self->{w}, $self->{h};
2076		2193
2077	if ($self->{vertical}) {	2194	if ($self->{vertical}) {
2078	# draw a vertical slider like a rotated horizontal slider	2195	# draw a vertical slider like a rotated horizontal slider
2079		2196
		2197	glTranslate 1, 0, 0;
2080	glRotate 90, 0, 0, 1;	2198	glRotate 90, 0, 0, 1;
2081	glTranslate 0, -$self->{w}, 0;
2082
2083	($w, $h) = ($h, $w);
2084	}	2199	}
2085		2200
2086	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2201	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2087	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2202	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2088		2203
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;	2204	glEnable GL_TEXTURE_2D;
2110	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2205	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2111		2206
2112	# draw background	2207	# draw background
2113	$tex[1]->draw_quad (0, 0, $w, $h);	2208	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2114		2209
2115	# draw handle	2210	# draw handle
2116	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2211	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2117		2212
2118	glDisable GL_BLEND;
2119	glDisable GL_TEXTURE_2D;	2213	glDisable GL_TEXTURE_2D;
2120	}	2214	}
		2215
		2216	#############################################################################
		2217
		2218	package CFClient::UI::ValSlider;
		2219
		2220	our @ISA = CFClient::UI::HBox::;
		2221
		2222	sub new {
		2223	my ($class, %arg) = @_;
		2224
		2225	my $range = delete $arg{range};
		2226
		2227	my $self = $class->SUPER::new (
		2228	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2229	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2230	to_value => sub { shift },
		2231	from_value => sub { shift },
		2232	%arg,
		2233	);
		2234
		2235	$self->{slider}->connect (changed => sub {
		2236	my ($self, $value) = @_;
		2237	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2238	$self->{parent}->emit (changed => $value);
		2239	});
		2240
		2241	# $self->{entry}->connect (changed => sub {
		2242	# my ($self, $value) = @_;
		2243	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2244	# $self->{parent}->emit (changed => $value);
		2245	# });
		2246
		2247	$self->add ($self->{slider}, $self->{entry});
		2248
		2249	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2250
		2251	$self
		2252	}
		2253
		2254	sub set_range { shift->{slider}->set_range (@_) }
		2255	sub set_value { shift->{slider}->set_value (@_) }
2121		2256
2122	#############################################################################	2257	#############################################################################
2123		2258
2124	package CFClient::UI::TextView;	2259	package CFClient::UI::TextView;
2125		2260
…		…
2134	fontsize => 1,	2269	fontsize => 1,
2135	can_events => 0,	2270	can_events => 0,
2136	#font => default_font	2271	#font => default_font
2137	@_,	2272	@_,
2138		2273
2139	layout => (new CFClient::Layout),	2274	layout => (new CFClient::Layout 1),
2140	par => [],	2275	par => [],
2141	height => 0,	2276	height => 0,
2142	children => [	2277	children => [
2143	(new CFClient::UI::Empty expand => 1),	2278	(new CFClient::UI::Empty expand => 1),
2144	(new CFClient::UI::Slider vertical => 1),	2279	(new CFClient::UI::Slider vertical => 1),
…		…
2155		2290
2156	$self->{fontsize} = $fontsize;	2291	$self->{fontsize} = $fontsize;
2157	$self->reflow;	2292	$self->reflow;
2158	}	2293	}
2159		2294
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 {	2295	sub size_allocate {
2180	my ($self, $w, $h) = @_;	2296	my ($self, $w, $h) = @_;
2181		2297
2182	$self->SUPER::size_allocate ($w, $h);	2298	$self->SUPER::size_allocate ($w, $h);
2183		2299
…		…
2186	$self->{layout}->set_width ($self->{children}[0]{w});	2302	$self->{layout}->set_width ($self->{children}[0]{w});
2187		2303
2188	$self->reflow;	2304	$self->reflow;
2189	}	2305	}
2190		2306
		2307	sub text_size {
		2308	my ($self, $text, $indent) = @_;
		2309
		2310	my $layout = $self->{layout};
		2311
		2312	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2313	$layout->set_width ($self->{children}[0]{w} - $indent);
		2314	$layout->set_markup ($text);
		2315
		2316	$layout->size
		2317	}
		2318
		2319	sub reflow {
		2320	my ($self) = @_;
		2321
		2322	$self->{need_reflow}++;
		2323	$self->update;
		2324	}
		2325
		2326	sub set_offset {
		2327	my ($self, $offset) = @_;
		2328
		2329	# todo: base offset on lines or so, not on pixels
		2330	$self->{children}[1]->set_value ($offset);
		2331	}
		2332
		2333	sub clear {
		2334	my ($self) = @_;
		2335
		2336	$self->{par} = [];
		2337	$self->{height} = 0;
		2338	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2339	}
		2340
2191	sub add_paragraph {	2341	sub add_paragraph {
2192	my ($self, $color, $text) = @_;	2342	my ($self, $color, $text, $indent) = @_;
2193		2343
2194	#TODO: intelligently "reformat" paragraph	2344	for my $line (split /\n/, $text) {
2195		2345	my ($w, $h) = $self->text_size ($line);
2196	my $height = $self->text_height ($text);
2197
2198	$self->{height} += $height;	2346	$self->{height} += $h;
		2347	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2348	}
2199		2349
2200	push @{$self->{par}}, [$height, $color, $text];
2201
2202	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2350	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2203	$self->{children}[1]->update;
2204	}	2351	}
2205		2352
2206	sub update {	2353	sub update {
2207	my ($self) = @_;	2354	my ($self) = @_;
2208		2355
…		…
2210		2357
2211	return unless $self->{h} > 0;	2358	return unless $self->{h} > 0;
2212		2359
2213	delete $self->{texture};	2360	delete $self->{texture};
2214		2361
2215	$ROOT->on_refresh ($self, sub {	2362	$ROOT->on_post_alloc ($self, sub {
		2363	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2364
2216	if (delete $self->{need_reflow}) {	2365	if (delete $self->{need_reflow}) {
2217	my $height = 0;	2366	my $height = 0;
2218		2367
2219	$height += $_->[0] = $self->text_height ($_->[2])	2368	my $layout = $self->{layout};
		2369
		2370	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2371
2220	for @{$self->{par}};	2372	for (@{$self->{par}}) {
		2373	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2374	$layout->set_width ($W - $_->[3]);
		2375	$layout->set_markup ($_->[4]);
		2376	my ($w, $h) = $layout->size;
		2377	$_->[0] = $w + $_->[3];
		2378	$_->[1] = $h;
		2379	}
		2380
		2381	$height += $_->[1];
		2382	}
2221		2383
2222	$self->{height} = $height;	2384	$self->{height} = $height;
2223		2385
2224	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2386	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2225		2387
2226	delete $self->{texture};	2388	delete $self->{texture};
2227	}	2389	}
2228		2390
2229	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2391	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2230	glClearColor 0, 0, 0, 0;	2392	glClearColor 0.5, 0.5, 0.5, 0;
2231	glClear GL_COLOR_BUFFER_BIT;	2393	glClear GL_COLOR_BUFFER_BIT;
2232		2394
		2395	my $top = int $self->{children}[1]{range}[0];
		2396
		2397	my $y0 = $top;
		2398	my $y1 = $top + $H;
		2399
		2400	my $y = 0;
		2401
		2402	my $layout = $self->{layout};
		2403
		2404	$layout->set_font ($self->{font}) if $self->{font};
		2405
2233	glEnable GL_BLEND;	2406	glEnable GL_BLEND;
		2407	#TODO# not correct in windows where rgba is forced off
2234	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2408	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		2409
2249	for my $par (@{$self->{par}}) {	2410	for my $par (@{$self->{par}}) {
2250	my $h = $par->[0];	2411	my $h = $par->[1];
2251		2412
2252	if ($y0 < $y + $h && $y < $y1) {	2413	if ($y0 < $y + $h && $y < $y1) {
		2414	$layout->set_foreground (@{ $par->[2] });
		2415	$layout->set_width ($W - $par->[3]);
2253	$layout->set_text ($par->[2]);	2416	$layout->set_markup ($par->[4]);
2254		2417
2255	glColor @{ $par->[1] };	2418	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2256	my ($W, $H) = $layout->size;	2419
2257	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2420	glRasterPos $par->[3], $y - $y0;
		2421	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2258	}	2422	}
2259		2423
2260	$y += $h;	2424	$y += $h;
2261	}	2425	}
2262		2426
2263	glDisable GL_TEXTURE_2D;
2264	glDisable GL_BLEND;	2427	glDisable GL_BLEND;
2265	};	2428	};
2266	});	2429	});
2267	}	2430	}
2268		2431
2269	sub _draw {	2432	sub _draw {
2270	my ($self) = @_;	2433	my ($self) = @_;
2271		2434
2272	glEnable GL_BLEND;
2273	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2274	glEnable GL_TEXTURE_2D;	2435	glEnable GL_TEXTURE_2D;
2275	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2436	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2276	glColor 1, 1, 1, 1;	2437	glColor 1, 1, 1, 1;
2277	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2438	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2278	glDisable GL_TEXTURE_2D;	2439	glDisable GL_TEXTURE_2D;
2279	glDisable GL_BLEND;
2280		2440
2281	$self->{children}[1]->draw;	2441	$self->{children}[1]->draw;
2282		2442
2283	}	2443	}
2284		2444
…		…
2378	@_,	2538	@_,
2379	can_events => 0,	2539	can_events => 0,
2380	)	2540	)
2381	}	2541	}
2382		2542
2383	sub set_markup {	2543	sub set_tooltip_from {
2384	my ($self, $text) = @_;	2544	my ($self, $widget) = @_;
2385		2545
2386	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2546	$self->add (new CFClient::UI::Label
2387	$self->{label}->set_markup ($text);	2547	markup => $widget->{tooltip},
2388	$self->add ($self->{label});	2548	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2549	fontsize => 0.8,
		2550	fg => [0, 0, 0, 1],
		2551	ellipsise => 0,
		2552	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2553	);
2389	}	2554	}
2390		2555
2391	sub size_request {	2556	sub size_request {
2392	my ($self) = @_;	2557	my ($self) = @_;
2393
2394	$self->child->set_max_size ($::WIDTH * 0.3);
2395		2558
2396	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2559	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2397		2560
2398	($w + 4, $h + 4)	2561	($w + 4, $h + 4)
2399	}	2562	}
…		…
2405	}	2568	}
2406		2569
2407	sub _draw {	2570	sub _draw {
2408	my ($self) = @_;	2571	my ($self) = @_;
2409		2572
2410	glPushMatrix;
2411	glTranslate 0.375, 0.375;	2573	glTranslate 0.375, 0.375;
2412		2574
2413	my ($w, $h) = @$self{qw(w h)};	2575	my ($w, $h) = @$self{qw(w h)};
2414		2576
2415	glColor 1, 0.8, 0.4;	2577	glColor 1, 0.8, 0.4;
…		…
2426	glVertex 0 , $h;	2588	glVertex 0 , $h;
2427	glVertex $w, $h;	2589	glVertex $w, $h;
2428	glVertex $w, 0;	2590	glVertex $w, 0;
2429	glEnd;	2591	glEnd;
2430		2592
2431	glPopMatrix;	2593	glTranslate 2 - 0.375, 2 - 0.375;
2432
2433	glTranslate 2, 2;
2434	$self->SUPER::_draw;	2594	$self->SUPER::_draw;
2435	}	2595	}
2436		2596
2437	#############################################################################	2597	#############################################################################
2438		2598
…		…
2443	use CFClient::OpenGL;	2603	use CFClient::OpenGL;
2444		2604
2445	sub new {	2605	sub new {
2446	my $class = shift;	2606	my $class = shift;
2447		2607
2448	$class->SUPER::new (	2608	my $self = $class->SUPER::new (
2449	aspect => 1,	2609	aspect => 1,
2450	@_,	2610	@_,
2451	)	2611	);
		2612
		2613	if ($self->{anim} && $self->{animspeed}) {
		2614	Scalar::Util::weaken (my $widget = $self);
		2615
		2616	$self->{timer} = Event->timer (
		2617	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2618	hard => 1,
		2619	interval => $self->{animspeed},
		2620	cb => sub {
		2621	++$widget->{frame};
		2622	$widget->update;
		2623	},
		2624	);
		2625	}
		2626
		2627	$self
2452	}	2628	}
2453		2629
2454	sub size_request {	2630	sub size_request {
2455	(32, 8)	2631	(32, 8)
2456	}	2632	}
2457		2633
		2634	sub update {
		2635	my ($self) = @_;
		2636
		2637	return unless $self->{visible};
		2638
		2639	$self->SUPER::update;
		2640	}
		2641
2458	sub _draw {	2642	sub _draw {
2459	my ($self) = @_;	2643	my ($self) = @_;
2460		2644
2461	return unless $::CONN;#d# manage and cache textures differently	2645	return unless $::CONN;
		2646
		2647	my $face;
		2648
		2649	if ($self->{frame}) {
		2650	my $anim = $::CONN->{anim}[$self->{anim}];
		2651
		2652	$face = $anim->[ $self->{frame} % @$anim ]
		2653	if $anim && @$anim;
		2654	}
		2655
2462	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2656	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2463		2657
2464	# TODO animation
2465	if ($tex) {	2658	if ($tex) {
2466	glEnable GL_BLEND;
2467	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2468	glEnable GL_TEXTURE_2D;	2659	glEnable GL_TEXTURE_2D;
2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2660	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470	glColor 1, 1, 1, 1;	2661	glColor 1, 1, 1, 1;
2471	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2662	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472	glDisable GL_TEXTURE_2D;	2663	glDisable GL_TEXTURE_2D;
2473	glDisable GL_BLEND;
2474	}	2664	}
		2665	}
		2666
		2667	sub DESTROY {
		2668	my ($self) = @_;
		2669
		2670	$self->{timer}->cancel
		2671	if $self->{timer};
		2672
		2673	$self->SUPER::DESTROY;
2475	}	2674	}
2476		2675
2477	#############################################################################	2676	#############################################################################
2478		2677
2479	package CFClient::UI::InventoryItem;	2678	package CFClient::UI::InventoryItem;
2480		2679
2481	our @ISA = CFClient::UI::HBox::;	2680	our @ISA = CFClient::UI::HBox::;
		2681
		2682	sub _item_to_desc {
		2683	my ($item) = @_;
		2684
		2685	my $desc =
		2686	$item->{nrof} < 2
		2687	? $item->{name}
		2688	: "$item->{nrof} × $item->{name_pl}";
		2689
		2690	$item->{flags} & Crossfire::Protocol::F_OPEN
		2691	and $desc .= " (open)";
		2692	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2693	and $desc .= " (applied)";
		2694	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2695	and $desc .= " (unpaid)";
		2696	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2697	and $desc .= " (magic)";
		2698	$item->{flags} & Crossfire::Protocol::F_CURSED
		2699	and $desc .= " (cursed)";
		2700	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2701	and $desc .= " (damned)";
		2702	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2703	and $desc .= " *";
		2704
		2705	$desc
		2706	}
2482		2707
2483	sub new {	2708	sub new {
2484	my $class = shift;	2709	my $class = shift;
2485		2710
2486	my %args = @_;	2711	my %args = @_;
2487		2712
2488	my $item = delete $args{item};	2713	my $item = delete $args{item};
2489		2714
2490	my $desc = $item->{nrof} < 2	2715	my $desc = _item_to_desc ($item);
2491	? $item->{name}
2492	: "$item->{nrof} $item->{name_pl}";
2493
2494		2716
2495	my $self = $class->SUPER::new (	2717	my $self = $class->SUPER::new (
2496	can_hover => 1,	2718	can_hover => 1,
2497	can_events => 1,	2719	can_events => 1,
2498	tooltip => (CFClient::UI::Label->escape ($desc)	2720	tooltip => ((CFClient::UI::Label::escape $desc)
2499	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2721	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2500	connect_button_down => sub {	2722	connect_button_down => sub {
2501	my ($self, $ev, $x, $y) = @_;	2723	my ($self, $ev, $x, $y) = @_;
2502		2724
2503	# todo: maybe put examine on 1? but should just be a tooltip :(	2725	# todo: maybe put examine on 1? but should just be a tooltip :(
		2726	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		2727	my $targ = $::CONN->{player}{tag};
		2728
		2729	if ($item->{container} == $::CONN->{player}{tag}) {
		2730	$targ = $main::OPENCONT;
		2731	}
		2732
		2733	$::CONN->send ("move $targ $item->{tag} 0");
2504	if ($ev->{button} == 1) {	2734	} elsif ($ev->{button} == 1) {
2505	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2735	$::CONN->send ("examine $item->{tag}");
2506	} elsif ($ev->{button} == 2) {	2736	} elsif ($ev->{button} == 2) {
2507	$::CONN->send ("apply $item->{tag}");	2737	$::CONN->send ("apply $item->{tag}");
2508	} elsif ($ev->{button} == 3) {	2738	} elsif ($ev->{button} == 3) {
2509	CFClient::UI::Menu->new (	2739	my @menu_items = (
2510	items => [
2511	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2740	["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}") }],	2741	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2517	["apply", sub { $::CONN->send ("apply $item->{tag}") }],	2742	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2743	(
		2744	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2745	? (
		2746	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2747	)
		2748	: (
		2749	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2518	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2750	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2751	)
2519	],	2752	),
2520	)->popup ($ev);	2753	);
		2754
		2755	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2521	}	2756	}
2522		2757
2523	1	2758	1
2524	},	2759	},
2525	%args	2760	%args
2526	);	2761	);
		2762
2527		2763
2528	$self->add (new CFClient::UI::Face	2764	$self->add (new CFClient::UI::Face
2529	can_events => 0,	2765	can_events => 0,
2530	face => $item->{face},	2766	face => $item->{face},
2531	anim => $item->{anim},	2767	anim => $item->{anim},
2532	animspeed => $item->{animspeed},	2768	animspeed => $item->{animspeed},
2533	);	2769	);
2534		2770
2535	$self->add (new CFClient::UI::Label	2771	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2536	can_events => 0,	2772
2537	text => $desc,	2773	$self->{item} = $item;
2538	);	2774
		2775	$self->update_item;
2539		2776
2540	$self	2777	$self
		2778	}
		2779
		2780	sub update_item {
		2781	my ($self) = @_;
		2782
		2783	my $desc = _item_to_desc ($self->{item});
		2784
		2785	$self->{name_lbl}->set_text ($desc);
2541	}	2786	}
2542		2787
2543	#############################################################################	2788	#############################################################################
2544		2789
2545	package CFClient::UI::Inventory;	2790	package CFClient::UI::Inventory;
…		…
2548		2793
2549	sub new {	2794	sub new {
2550	my $class = shift;	2795	my $class = shift;
2551		2796
2552	my $self = $class->SUPER::new (	2797	my $self = $class->SUPER::new (
2553	scrolled => (new CFClient::UI::VBox),	2798	scrolled => (new CFClient::UI::Table),
2554	@_,	2799	@_,
2555	);	2800	);
2556		2801
2557	$self	2802	$self
2558	}	2803	}
…		…
2561	my ($self, $items) = @_;	2806	my ($self, $items) = @_;
2562		2807
2563	$self->{scrolled}->clear;	2808	$self->{scrolled}->clear;
2564	return unless $items;	2809	return unless $items;
2565		2810
2566	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2811	my @items = sort {
		2812	($a->{type} <=> $b->{type})
		2813	or ($a->{name} cmp $b->{name})
		2814	} @$items;
2567		2815
2568	$self->{real_items} = \@items;	2816	$self->{real_items} = \@items;
2569		2817
2570	for my $item (@items) {	2818	for my $item (@items) {
2571	my $desc = $item->{nrof} < 2	2819	$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);	2820	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2821	$item->update_item ();
		2822	}
		2823
		2824	my $i = 0;
		2825	for (@items) {
		2826	$self->{scrolled}->add (0, $i, $_);
		2827	my $nrof = $_->{item}->{nrof} || 1;
		2828	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2576	}	2829	}
2577		2830
2578	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2831	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2579	}	2832	}
2580		2833
…		…
2655	}	2908	}
2656	}	2909	}
2657		2910
2658	#############################################################################	2911	#############################################################################
2659		2912
		2913	package CFClient::UI::Statusbox;
		2914
		2915	our @ISA = CFClient::UI::VBox::;
		2916
		2917	sub new {
		2918	my $class = shift;
		2919
		2920	$class->SUPER::new (
		2921	fontsize => 0.8,
		2922	@_,
		2923	)
		2924	}
		2925
		2926	sub reorder {
		2927	my ($self) = @_;
		2928	my $NOW = time;
		2929
		2930	while (my ($k, $v) = each %{ $self->{item} }) {
		2931	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2932	}
		2933
		2934	my @widgets;
		2935
		2936	my @items = sort {
		2937	$a->{pri} <=> $b->{pri}
		2938	or $b->{id} <=> $a->{id}
		2939	} values %{ $self->{item} };
		2940
		2941	my $count = 10 + 1;
		2942	for my $item (@items) {
		2943	last unless --$count;
		2944
		2945	push @widgets, $item->{label} ||= do {
		2946	# TODO: doesn't handle markup well (read as: at all)
		2947	my $short = $item->{count} > 1
		2948	? "<b>$item->{count} ×</b> $item->{text}"
		2949	: $item->{text};
		2950
		2951	for ($short) {
		2952	s/^\s+//;
		2953	s/\s+/ /g;
		2954	}
		2955
		2956	new CFClient::UI::Label
		2957	markup => $short,
		2958	tooltip => $item->{tooltip},
		2959	tooltip_font => $::FONT_PROP,
		2960	tooltip_width => 0.67,
		2961	fontsize => $item->{fontsize} || $self->{fontsize},
		2962	max_w => $::WIDTH * 0.44,
		2963	fg => $item->{fg},
		2964	can_events => 1,
		2965	can_hover => 1
		2966	};
		2967	}
		2968
		2969	$self->clear;
		2970	$self->SUPER::add (reverse @widgets);
		2971	}
		2972
		2973	sub add {
		2974	my ($self, $text, %arg) = @_;
		2975
		2976	$text =~ s/^\s+//;
		2977	$text =~ s/\s+$//;
		2978
		2979	my $timeout = time + ((delete $arg{timeout}) || 60);
		2980
		2981	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2982
		2983	if (my $item = $self->{item}{$group}) {
		2984	if ($item->{text} eq $text) {
		2985	$item->{count}++;
		2986	} else {
		2987	$item->{count} = 1;
		2988	$item->{text} = $item->{tooltip} = $text;
		2989	}
		2990	$item->{id} = ++$self->{id};
		2991	$item->{timeout} = $timeout;
		2992	delete $item->{label};
		2993	} else {
		2994	$self->{item}{$group} = {
		2995	id => ++$self->{id},
		2996	text => $text,
		2997	timeout => $timeout,
		2998	tooltip => $text,
		2999	fg => [0.8, 0.8, 0.8, 0.8],
		3000	pri => 0,
		3001	count => 1,
		3002	%arg,
		3003	};
		3004	}
		3005
		3006	$self->reorder;
		3007	}
		3008
		3009	sub reconfigure {
		3010	my ($self) = @_;
		3011
		3012	delete $_->{label}
		3013	for values %{ $self->{item} || {} };
		3014
		3015	$self->reorder;
		3016	$self->SUPER::reconfigure;
		3017	}
		3018
		3019	#############################################################################
		3020
2660	package CFClient::UI::Root;	3021	package CFClient::UI::Root;
2661		3022
2662	our @ISA = CFClient::UI::Container::;	3023	our @ISA = CFClient::UI::Container::;
2663		3024
2664	use CFClient::OpenGL;	3025	use CFClient::OpenGL;
…		…
2692	}	3053	}
2693		3054
2694	sub size_allocate {	3055	sub size_allocate {
2695	my ($self, $w, $h) = @_;	3056	my ($self, $w, $h) = @_;
2696		3057
2697	my $old_w = $self->{old_w};	3058	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2698	my $old_h = $self->{old_h};	3059	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2699		3060
2700	if ($old_w && $old_h) {	3061	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2701	for my $child ($self->children) {	3062	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
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		3063
2713	for my $child ($self->children) {	3064	for my $child ($self->children) {
2714	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3065	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2715		3066
		3067	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3068	if exists $child->{req_x};
		3069
		3070	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3071	if exists $child->{req_y};
		3072
2716	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3073	$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;	3074	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3075
2718	$child->configure ($X, $Y, $W, $H);	3076	$child->configure ($X, $Y, $W, $H);
2719	}	3077	}
2720
2721	$self->{old_w} = $w;
2722	$self->{old_h} = $h;
2723	}	3078	}
2724		3079
2725	sub coord2local {	3080	sub coord2local {
2726	my ($self, $x, $y) = @_;	3081	my ($self, $x, $y) = @_;
2727		3082
…		…
2740	$self->check_size;	3095	$self->check_size;
2741	$::WANT_REFRESH++;	3096	$::WANT_REFRESH++;
2742	}	3097	}
2743		3098
2744	sub add {	3099	sub add {
2745	my ($self, $child) = @_;	3100	my ($self, @children) = @_;
2746		3101
		3102	for (my @widgets = @children; my $w = pop @widgets; ) {
		3103	push @widgets, $w->children;
		3104	$w->{root} = $self;
		3105	$w->{visible} = 1;
		3106	}
		3107
		3108	for my $child (@children) {
		3109	$child->{toplevel} = 1;
		3110
2747	# integerise window positions	3111	# integerise window positions
2748	$child->{x} = int $child->{x};	3112	$child->{x} = int $child->{x};
2749	$child->{y} = int $child->{y};	3113	$child->{y} = int $child->{y};
		3114	}
2750		3115
2751	$self->SUPER::add ($child);	3116	$self->SUPER::add (@children);
		3117	}
		3118
		3119	sub remove {
		3120	my ($self, @children) = @_;
		3121
		3122	$self->SUPER::remove (@children);
		3123
		3124	while (@children) {
		3125	my $w = pop @children;
		3126	push @children, $w->children;
		3127	delete $w->{visible};
		3128	}
2752	}	3129	}
2753		3130
2754	sub on_refresh {	3131	sub on_refresh {
2755	my ($self, $id, $cb) = @_;	3132	my ($self, $id, $cb) = @_;
2756		3133
2757	$self->{refresh_hook}{$id} = $cb;	3134	$self->{refresh_hook}{$id} = $cb;
2758	}	3135	}
2759		3136
		3137	sub on_post_alloc {
		3138	my ($self, $id, $cb) = @_;
		3139
		3140	$self->{post_alloc_hook}{$id} = $cb;
		3141	}
		3142
2760	sub draw {	3143	sub draw {
2761	my ($self) = @_;	3144	my ($self) = @_;
		3145
		3146	while ($self->{refresh_hook}) {
		3147	$_->()
		3148	for values %{delete $self->{refresh_hook}};
		3149	}
2762		3150
2763	if ($self->{check_size}) {	3151	if ($self->{check_size}) {
2764	my @queue = ([], []);	3152	my @queue = ([], []);
2765		3153
2766	for (;;) {	3154	for (;;) {
…		…
2774		3162
2775	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3163	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2776	? @$widget{qw(user_w user_h)}	3164	? @$widget{qw(user_w user_h)}
2777	: $widget->size_request;	3165	: $widget->size_request;
2778		3166
		3167	if (delete $widget->{force_alloc}
2779	if ($w != $widget->{req_w} || $h != $widget->{req_h}) {	3168	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2780	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3169	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2781		3170
2782	$widget->{req_w} = $w;	3171	$widget->{req_w} = $w;
2783	$widget->{req_h} = $h;	3172	$widget->{req_h} = $h;
2784		3173
2785	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];	3174	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2786		3175
2787	$widget->{parent}->check_size	3176	$widget->{parent}->check_size
2788	if $widget->{parent};	3177	if $widget->{parent};
2789	}	3178	}
2790	}	3179	}
…		…
2802	$widget->size_allocate ($w, $h);	3191	$widget->size_allocate ($w, $h);
2803	$widget->emit (size_allocate => $w, $h);	3192	$widget->emit (size_allocate => $w, $h);
2804	}	3193	}
2805	}	3194	}
2806		3195
2807	while ($self->{refresh_hook}) {	3196	while ($self->{post_alloc_hook}) {
2808	$_->()	3197	$_->()
2809	for values %{delete $self->{refresh_hook}};	3198	for values %{delete $self->{post_alloc_hook}};
2810	}	3199	}
2811		3200
2812	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3201	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2813	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3202	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2814	glClear GL_COLOR_BUFFER_BIT;	3203	glClear GL_COLOR_BUFFER_BIT;
2815		3204
2816	glMatrixMode GL_PROJECTION;	3205	glMatrixMode GL_PROJECTION;
2817	glLoadIdentity;	3206	glLoadIdentity;
2818	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3207	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2819	glMatrixMode GL_MODELVIEW;	3208	glMatrixMode GL_MODELVIEW;
2820	glLoadIdentity;	3209	glLoadIdentity;
2821		3210
2822	$self->_draw;	3211	$self->_draw;
2823	}	3212	}
…		…
2825	#############################################################################	3214	#############################################################################
2826		3215
2827	package CFClient::UI;	3216	package CFClient::UI;
2828		3217
2829	$ROOT = new CFClient::UI::Root;	3218	$ROOT = new CFClient::UI::Root;
2830	$TOOLTIP = new CFClient::UI::Tooltip;	3219	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2831		3220
2832	1	3221	1
2833		3222

Diff Legend

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