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.191 by root, Tue May 9 22:27:53 2006 UTC vs.
Revision 1.228 by root, Wed May 24 03:52: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	}
…		…
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	$self->size_allocate ($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) = @_;
…		…
380	}	434	}
381		435
382	sub set_parent {	436	sub set_parent {
383	my ($self, $parent) = @_;	437	my ($self, $parent) = @_;
384		438
385	$self->{_tree_depth} = $parent->{_tree_depth} + 1;
386	Scalar::Util::weaken ($self->{parent} = $parent);	439	Scalar::Util::weaken ($self->{parent} = $parent);
		440
		441	# TODO: req_w _does_change after ->reconfigure
		442	$self->check_size
		443	unless exists $self->{req_w};
		444
		445	$self->show;
387	}	446	}
388		447
389	sub check_size {	448	sub check_size {
390	my ($self) = @_;	449	my ($self, $forced) = @_;
391		450
		451	$self->{force_alloc} = 1 if $forced;
392	$CFClient::UI::ROOT->{check_size}{$self} = $self;	452	$CFClient::UI::ROOT->{check_size}{$self} = $self;
393	}	453	}
394		454
395	sub update {	455	sub update {
396	my ($self) = @_;	456	my ($self) = @_;
…		…
412	}	472	}
413		473
414	sub DESTROY {	474	sub DESTROY {
415	my ($self) = @_;	475	my ($self) = @_;
416		476
		477	delete $WIDGET{$self+0};
417	#$self->deactivate;	478	#$self->deactivate;
418	}	479	}
419		480
420	#############################################################################	481	#############################################################################
421		482
…		…
430	my $class = shift;	491	my $class = shift;
431		492
432	# range [value, low, high, page]	493	# range [value, low, high, page]
433		494
434	$class->SUPER::new (	495	$class->SUPER::new (
435	bg => [0, 0, 0, 0.2],	496	#bg => [0, 0, 0, 0.2],
436	active_bg => [1, 1, 1, 0.5],	497	#active_bg => [1, 1, 1, 0.5],
437	@_	498	@_
438	)	499	)
439	}	500	}
440		501
441	sub _draw {	502	sub _draw {
442	my ($self) = @_;	503	my ($self) = @_;
443		504
		505	my $color = $FOCUS == $self && $self->{active_bg}
		506	? $self->{active_bg}
		507	: $self->{bg};
		508
		509	if ($color && (@$color < 4 || $color->[3])) {
444	my ($w, $h) = @$self{qw(w h)};	510	my ($w, $h) = @$self{qw(w h)};
445		511
446	glEnable GL_BLEND;	512	glEnable GL_BLEND;
447	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	513	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
448	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	514	glColor @$color;
449		515
450	glBegin GL_QUADS;	516	glBegin GL_QUADS;
451	glVertex 0 , 0;	517	glVertex 0 , 0;
452	glVertex 0 , $h;	518	glVertex 0 , $h;
453	glVertex $w, $h;	519	glVertex $w, $h;
454	glVertex $w, 0;	520	glVertex $w, 0;
455	glEnd;	521	glEnd;
456		522
457	glDisable GL_BLEND;	523	glDisable GL_BLEND;
		524	}
458	}	525	}
459		526
460	#############################################################################	527	#############################################################################
461		528
462	package CFClient::UI::Empty;	529	package CFClient::UI::Empty;
…		…
506	$self->{children} = [	573	$self->{children} = [
507	sort { $a->{z} <=> $b->{z} }	574	sort { $a->{z} <=> $b->{z} }
508	@{$self->{children}}, @widgets	575	@{$self->{children}}, @widgets
509	];	576	];
510		577
511	$_->check_size	578	$self->check_size (1);
512	for @widgets;
513
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) = @_;
…		…
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	821	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
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
781	#TODO# update range on size_allocate depeneing on child	838	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	839	# update viewport offset on scroll
783		840
784	#############################################################################	841	#############################################################################
785		842
786	package CFClient::UI::Frame;	843	package CFClient::UI::Frame;
…		…
790	use CFClient::OpenGL;	847	use CFClient::OpenGL;
791		848
792	sub new {	849	sub new {
793	my $class = shift;	850	my $class = shift;
794		851
795	my $self = $class->SUPER::new (	852	$class->SUPER::new (
796	bg => [1, 1, 1, 1],	853	bg => undef,
797	border_bg => [1, 1, 1, 1],
798	border => 0.8,
799	@_	854	@_,
800	);	855	)
801
802	$self
803	}	856	}
804		857
805	sub _draw {	858	sub _draw {
806	my ($self) = @_;	859	my ($self) = @_;
807		860
808	my ($w, $h) = ($self->{w}, $self->{h});	861	if ($self->{bg}) {
		862	my ($w, $h) = @$self{qw(w h)};
809		863
810	glEnable GL_BLEND;	864	glEnable GL_BLEND;
811	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	865	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812	glEnable GL_TEXTURE_2D;	866	glColor @{ $self->{bg} };
813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814		867
815	# glBegin GL_QUADS;	868	glBegin GL_QUADS;
816	# glColor 0, 0, 0, 0;
817	# glVertex 0 , 0;	869	glVertex 0 , 0;
818	# glVertex 0 , $h;	870	glVertex 0 , $h;
819	# glVertex $w, $h;	871	glVertex $w, $h;
820	# glVertex $w, 0;	872	glVertex $w, 0;
821	# glEnd;	873	glEnd;
822		874
823
824	$self->child->draw;
825	glDisable GL_BLEND;	875	glDisable GL_BLEND;
826	glDisable GL_TEXTURE_2D;	876	}
		877
		878	$self->SUPER::_draw;
827	}	879	}
828		880
829	#############################################################################	881	#############################################################################
830		882
831	package CFClient::UI::FancyFrame;	883	package CFClient::UI::FancyFrame;
…		…
845		897
846	my $self = $class->SUPER::new (	898	my $self = $class->SUPER::new (
847	bg => [1, 1, 1, 1],	899	bg => [1, 1, 1, 1],
848	border_bg => [1, 1, 1, 1],	900	border_bg => [1, 1, 1, 1],
849	border => 0.6,	901	border => 0.6,
		902	toplevel => 1,
850	can_events => 1,	903	can_events => 1,
851	@_	904	@_
852	);	905	);
853		906
854	$self->{title} &&= new CFClient::UI::Label	907	$self->{title} &&= new CFClient::UI::Label
…		…
879	my ($self, $w, $h) = @_;	932	my ($self, $w, $h) = @_;
880		933
881	$h -= List::Util::max 0, $self->border * 2;	934	$h -= List::Util::max 0, $self->border * 2;
882	$w -= List::Util::max 0, $self->border * 2;	935	$w -= List::Util::max 0, $self->border * 2;
883		936
884	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	937	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
885	if $self->{title};	938	if $self->{title};
886		939
887	$self->child->configure ($self->border, $self->border, $w, $h);	940	$self->child->configure ($self->border, $self->border, $w, $h);
888	}	941	}
889		942
…		…
947	my ($self) = @_;	1000	my ($self) = @_;
948		1001
949	my ($w, $h ) = ($self->{w}, $self->{h});	1002	my ($w, $h ) = ($self->{w}, $self->{h});
950	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1003	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951		1004
952	glEnable GL_BLEND;
953	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954	glEnable GL_TEXTURE_2D;	1005	glEnable GL_TEXTURE_2D;
955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1006	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956		1007
957	my $border = $self->border;	1008	my $border = $self->border;
958		1009
959	glColor @{ $self->{border_bg} };	1010	glColor @{ $self->{border_bg} };
960	$tex[1]->draw_quad (0, 0, $w, $border);	1011	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
961	$tex[3]->draw_quad (0, $border, $border, $ch);	1012	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1013	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1014	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964		1015
965	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1016	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966	my $bg = $tex[0];	1017	my $bg = $tex[0];
967		1018
968	# TODO: repeat texture not scale	1019	# TODO: repeat texture not scale
…		…
972	glColor @{ $self->{bg} };	1023	glColor @{ $self->{bg} };
973		1024
974	$bg->{s} = $rep_x;	1025	$bg->{s} = $rep_x;
975	$bg->{t} = $rep_y;	1026	$bg->{t} = $rep_y;
976	$bg->{wrap_mode} = 1;	1027	$bg->{wrap_mode} = 1;
977	$bg->draw_quad ($border, $border, $cw, $ch);	1028	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1029	}
978		1030
979	glDisable GL_TEXTURE_2D;	1031	glDisable GL_TEXTURE_2D;
980	glDisable GL_BLEND;
981	}
982		1032
983	$self->{title}->draw if $self->{title};	1033	$self->{title}->draw if $self->{title};
984		1034
985	$self->child->draw;	1035	$self->child->draw;
986	}	1036	}
…		…
1213	}	1263	}
1214		1264
1215	sub size_allocate {	1265	sub size_allocate {
1216	my ($self, $w, $h) = @_;	1266	my ($self, $w, $h) = @_;
1217		1267
		1268	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1269
1218	my $children = $self->{children};	1270	my $children = $self->{children};
1219		1271
1220	my @h = map $_->{req_h}, @$children;	1272	my @h = map $_->{req_h}, @$children;
1221		1273
1222	my $req_h = List::Util::sum @h;	1274	my $req_h = List::Util::sum @h;
…		…
1251		1303
1252	#############################################################################	1304	#############################################################################
1253		1305
1254	package CFClient::UI::Label;	1306	package CFClient::UI::Label;
1255		1307
1256	our @ISA = CFClient::UI::Base::;	1308	our @ISA = CFClient::UI::DrawBG::;
1257		1309
1258	use CFClient::OpenGL;	1310	use CFClient::OpenGL;
1259		1311
1260	sub new {	1312	sub new {
1261	my ($class, %arg) = @_;	1313	my ($class, %arg) = @_;
1262		1314
1263	my $self = $class->SUPER::new (	1315	my $self = $class->SUPER::new (
1264	fg => [1, 1, 1],	1316	fg => [1, 1, 1],
		1317	#bg => none
		1318	#active_bg => none
1265	#font => default_font	1319	#font => default_font
		1320	#text => initial text
		1321	#markup => initial narkup
		1322	#max_w => maximum pixel width
		1323	ellipsise => 3, # end
		1324	layout => (new CFClient::Layout),
1266	fontsize => 1,	1325	fontsize => 1,
1267	text => "",
1268	align => -1,	1326	align => -1,
1269	valign => -1,	1327	valign => -1,
1270	padding => 2,	1328	padding => 2,
1271	layout => new CFClient::Layout,
1272	can_events => 0,	1329	can_events => 0,
1273	%arg	1330	%arg
1274	);	1331	);
1275		1332
1276	if (exists $self->{template}) {	1333	if (exists $self->{template}) {
1277	my $layout = new CFClient::Layout;	1334	my $layout = new CFClient::Layout;
1278	$layout->set_text (delete $self->{template});	1335	$layout->set_text (delete $self->{template});
1279	$self->{template} = $layout;	1336	$self->{template} = $layout;
1280	}	1337	}
1281		1338
1282	$self->set_text (delete $self->{text}) if exists $self->{text};	1339	if (exists $self->{markup}) {
1283	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1340	$self->set_markup (delete $self->{markup});
		1341	} else {
		1342	$self->set_text (delete $self->{text});
		1343	}
1284		1344
1285	$self	1345	$self
1286	}	1346	}
1287		1347
1288	sub escape {	1348	sub escape($) {
1289	local $_ = $_[1];	1349	local $_ = $_[0];
1290		1350
1291	s/&/&amp;/g;	1351	s/&/&amp;/g;
1292	s/>/&gt;/g;	1352	s/>/&gt;/g;
1293	s/</&lt;/g;	1353	s/</&lt;/g;
1294		1354
1295	$_[1]	1355	$_
1296	}	1356	}
1297		1357
1298	sub update {	1358	sub update {
1299	my ($self) = @_;	1359	my ($self) = @_;
1300		1360
…		…
1306	my ($self, $text) = @_;	1366	my ($self, $text) = @_;
1307		1367
1308	return if $self->{text} eq "T$text";	1368	return if $self->{text} eq "T$text";
1309	$self->{text} = "T$text";	1369	$self->{text} = "T$text";
1310		1370
		1371	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1311	$self->{layout}->set_text ($text);	1372	$self->{layout}->set_text ($text);
1312		1373
1313	$self->update;	1374	$self->update;
1314	$self->check_size;	1375	$self->check_size;
1315	}	1376	}
…		…
1318	my ($self, $markup) = @_;	1379	my ($self, $markup) = @_;
1319		1380
1320	return if $self->{text} eq "M$markup";	1381	return if $self->{text} eq "M$markup";
1321	$self->{text} = "M$markup";	1382	$self->{text} = "M$markup";
1322		1383
		1384	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1385
		1386	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1323	$self->{layout}->set_markup ($markup);	1387	$self->{layout}->set_markup ($markup);
1324		1388
1325	$self->update;	1389	$self->update;
1326	$self->check_size;	1390	$self->check_size;
1327	}	1391	}
…		…
1329	sub size_request {	1393	sub size_request {
1330	my ($self) = @_;	1394	my ($self) = @_;
1331		1395
1332	$self->{layout}->set_font ($self->{font}) if $self->{font};	1396	$self->{layout}->set_font ($self->{font}) if $self->{font};
1333	$self->{layout}->set_width ($self->{max_w} || -1);	1397	$self->{layout}->set_width ($self->{max_w} || -1);
		1398	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1399	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1334	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1400	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1335		1401
1336	my ($w, $h) = $self->{layout}->size;	1402	my ($w, $h) = $self->{layout}->size;
1337		1403
1338	if (exists $self->{template}) {	1404	if (exists $self->{template}) {
…		…
1368	}	1434	}
1369		1435
1370	sub _draw {	1436	sub _draw {
1371	my ($self) = @_;	1437	my ($self) = @_;
1372		1438
		1439	$self->SUPER::_draw; # draw background, if applicable
		1440
1373	my $tex = $self->{texture} ||= do {	1441	my $tex = $self->{texture} ||= do {
		1442	$self->{layout}->set_foreground (@{$self->{fg}});
1374	$self->{layout}->set_font ($self->{font}) if $self->{font};	1443	$self->{layout}->set_font ($self->{font}) if $self->{font};
1375	$self->{layout}->set_width ($self->{w});	1444	$self->{layout}->set_width ($self->{w});
		1445	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1446	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1447	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1448
1377	new_from_layout CFClient::Texture $self->{layout}	1449	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1450
		1451	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1452	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1453	: ($self->{w} - $tex->{w}) * 0.5);
		1454
		1455	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1456	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1457	: ($self->{h} - $tex->{h}) * 0.5);
		1458
		1459	$tex
1378	};	1460	};
1379		1461
1380	glEnable GL_BLEND;
1381	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1382	glEnable GL_TEXTURE_2D;	1462	glEnable GL_TEXTURE_2D;
1383	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1463	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1384		1464
		1465	if ($tex->{format} == GL_ALPHA) {
1385	glColor @{$self->{fg}};	1466	glColor @{$self->{fg}};
1386
1387	$self->{ox} = int (
1388	$self->{align} < 0 ? $self->{padding}
1389	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390	: ($self->{w} - $tex->{w}) * 0.5
1391	);
1392
1393	$self->{oy} = int (
1394	$self->{valign} < 0 ? $self->{padding}
1395	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1396	: ($self->{h} - $tex->{h}) * 0.5
1397	);
1398
1399	$tex->draw_quad ($self->{ox}, $self->{oy});	1467	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1468	} else {
		1469	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1470	}
1400		1471
1401	glDisable GL_TEXTURE_2D;	1472	glDisable GL_TEXTURE_2D;
1402	glDisable GL_BLEND;
1403	}	1473	}
1404		1474
1405	#############################################################################	1475	#############################################################################
1406		1476
1407	package CFClient::UI::EntryBase;	1477	package CFClient::UI::EntryBase;
…		…
1420	active_fg => [0, 0, 0],	1490	active_fg => [0, 0, 0],
1421	can_hover => 1,	1491	can_hover => 1,
1422	can_focus => 1,	1492	can_focus => 1,
1423	valign => 0,	1493	valign => 0,
1424	can_events => 1,	1494	can_events => 1,
		1495	#text => ...
1425	@_	1496	@_
1426	)	1497	)
1427	}	1498	}
1428		1499
1429	sub _set_text {	1500	sub _set_text {
…		…
1440		1511
1441	$text =~ s/./*/g if $self->{hidden};	1512	$text =~ s/./*/g if $self->{hidden};
1442	$self->{layout}->set_text ("$text ");	1513	$self->{layout}->set_text ("$text ");
1443		1514
1444	$self->emit (changed => $self->{text});	1515	$self->emit (changed => $self->{text});
1445	}
1446
1447	sub get_text {
1448	$_[0]{text}
1449	}
1450
1451	sub size_request {
1452	my ($self) = @_;
1453
1454	my ($w, $h) = $self->SUPER::size_request;
1455
1456	($w + 1, $h) # add 1 for cursor
1457	}
1458
1459	sub size_allocate {
1460	my ($self, $w, $h) = @_;
1461
1462	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1463	}	1516	}
1464		1517
1465	sub set_text {	1518	sub set_text {
1466	my ($self, $text) = @_;	1519	my ($self, $text) = @_;
1467		1520
1468	$self->{cursor} = length $text;	1521	$self->{cursor} = length $text;
1469	$self->_set_text ($text);	1522	$self->_set_text ($text);
1470	$self->update;	1523	$self->update;
		1524	$self->check_size;
		1525	}
		1526
		1527	sub get_text {
		1528	$_[0]{text}
		1529	}
		1530
		1531	sub size_request {
		1532	my ($self) = @_;
		1533
		1534	my ($w, $h) = $self->SUPER::size_request;
		1535
		1536	($w + 1, $h) # add 1 for cursor
		1537	}
		1538
		1539	sub size_allocate {
		1540	my ($self, $w, $h) = @_;
		1541
		1542	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1471	}	1543	}
1472		1544
1473	sub key_down {	1545	sub key_down {
1474	my ($self, $ev) = @_;	1546	my ($self, $ev) = @_;
1475		1547
…		…
1477	my $sym = $ev->{sym};	1549	my $sym = $ev->{sym};
1478	my $uni = $ev->{unicode};	1550	my $uni = $ev->{unicode};
1479		1551
1480	my $text = $self->get_text;	1552	my $text = $self->get_text;
1481		1553
1482	if ($sym == 8) {	1554	if ($uni == 8) {
1483	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1555	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1484	} elsif ($sym == 127) {	1556	} elsif ($uni == 127) {
1485	substr $text, $self->{cursor}, 1, "";	1557	substr $text, $self->{cursor}, 1, "";
1486	} elsif ($sym == CFClient::SDLK_LEFT) {	1558	} elsif ($sym == CFClient::SDLK_LEFT) {
1487	--$self->{cursor} if $self->{cursor};	1559	--$self->{cursor} if $self->{cursor};
1488	} elsif ($sym == CFClient::SDLK_RIGHT) {	1560	} elsif ($sym == CFClient::SDLK_RIGHT) {
1489	++$self->{cursor} if $self->{cursor} < length $self->{text};	1561	++$self->{cursor} if $self->{cursor} < length $self->{text};
1490	} elsif ($sym == CFClient::SDLK_HOME) {	1562	} elsif ($sym == CFClient::SDLK_HOME) {
1491	$self->{cursor} = 0;	1563	$self->{cursor} = 0;
1492	} elsif ($sym == CFClient::SDLK_END) {	1564	} elsif ($sym == CFClient::SDLK_END) {
1493	$self->{cursor} = length $text;	1565	$self->{cursor} = length $text;
1494	} elsif ($sym == 27) {	1566	} elsif ($uni == 27) {
1495	$self->emit ('escape');	1567	$self->emit ('escape');
1496	} elsif ($uni) {	1568	} elsif ($uni) {
1497	substr $text, $self->{cursor}++, 0, chr $uni;	1569	substr $text, $self->{cursor}++, 0, chr $uni;
1498	}	1570	}
1499		1571
1500	$self->_set_text ($text);	1572	$self->_set_text ($text);
1501	$self->update;	1573	$self->update;
		1574	$self->check_size;
1502	}	1575	}
1503		1576
1504	sub focus_in {	1577	sub focus_in {
1505	my ($self) = @_;	1578	my ($self) = @_;
1506		1579
…		…
1635	my $class = shift;	1708	my $class = shift;
1636		1709
1637	$class->SUPER::new (	1710	$class->SUPER::new (
1638	padding => 4,	1711	padding => 4,
1639	fg => [1, 1, 1],	1712	fg => [1, 1, 1],
1640	bg => [1, 1, 1, 0.2],
1641	active_fg => [0, 0, 1],	1713	active_fg => [0, 0, 1],
1642	can_hover => 1,	1714	can_hover => 1,
1643	align => 0,	1715	align => 0,
1644	valign => 0,	1716	valign => 0,
1645	can_events => 1,	1717	can_events => 1,
…		…
1663		1735
1664	if ($GRAB == $self) {	1736	if ($GRAB == $self) {
1665	$self->{fg} = $self->{active_fg};	1737	$self->{fg} = $self->{active_fg};
1666	}	1738	}
1667		1739
1668	glEnable GL_BLEND;
1669	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1670	glEnable GL_TEXTURE_2D;	1740	glEnable GL_TEXTURE_2D;
1671	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1741	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672	glColor 0, 0, 0, 1;	1742	glColor 0, 0, 0, 1;
1673		1743
1674	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1744	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1675		1745
1676	glDisable GL_TEXTURE_2D;	1746	glDisable GL_TEXTURE_2D;
1677	glDisable GL_BLEND;
1678		1747
1679	$self->SUPER::_draw;	1748	$self->SUPER::_draw;
1680	}	1749	}
1681		1750
1682	#############################################################################	1751	#############################################################################
…		…
1696		1765
1697	$class->SUPER::new (	1766	$class->SUPER::new (
1698	padding => 2,	1767	padding => 2,
1699	fg => [1, 1, 1],	1768	fg => [1, 1, 1],
1700	active_fg => [1, 1, 0],	1769	active_fg => [1, 1, 0],
		1770	bg => [0, 0, 0, 0.2],
		1771	active_bg => [1, 1, 1, 0.5],
1701	state => 0,	1772	state => 0,
1702	can_hover => 1,	1773	can_hover => 1,
1703	@_	1774	@_
1704	)	1775	)
1705	}	1776	}
…		…
1729		1800
1730	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1801	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1731		1802
1732	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1803	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733		1804
1734	glEnable GL_BLEND;	1805	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1806
1735	glEnable GL_TEXTURE_2D;	1807	glEnable GL_TEXTURE_2D;
1736	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1737
1738	my $tex = $self->{state} ? $tex[1] : $tex[0];
1739
1740	$tex->draw_quad (0, 0, $s, $s);	1808	$tex->draw_quad_alpha (0, 0, $s, $s);
1741
1742	glDisable GL_TEXTURE_2D;	1809	glDisable GL_TEXTURE_2D;
1743	glDisable GL_BLEND;
1744	}	1810	}
1745		1811
1746	#############################################################################	1812	#############################################################################
1747		1813
1748	package CFClient::UI::Image;	1814	package CFClient::UI::Image;
…		…
1791	glTranslate 0, -$self->{w}, 0;	1857	glTranslate 0, -$self->{w}, 0;
1792		1858
1793	($w, $h) = ($h, $w);	1859	($w, $h) = ($h, $w);
1794	}	1860	}
1795		1861
1796	glEnable GL_BLEND;
1797	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798	glEnable GL_TEXTURE_2D;	1862	glEnable GL_TEXTURE_2D;
1799	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800		1864
1801	$tex->draw_quad (0, 0, $w, $h);	1865	$tex->draw_quad_alpha (0, 0, $w, $h);
1802		1866
1803	glDisable GL_BLEND;
1804	glDisable GL_TEXTURE_2D;	1867	glDisable GL_TEXTURE_2D;
1805	}	1868	}
1806		1869
1807	#############################################################################	1870	#############################################################################
1808		1871
…		…
1997	qw(s1_slider.png s1_slider_bg.png);	2060	qw(s1_slider.png s1_slider_bg.png);
1998		2061
1999	sub new {	2062	sub new {
2000	my $class = shift;	2063	my $class = shift;
2001		2064
2002	# range [value, low, high, page]	2065	# range [value, low, high, page, unit]
2003		2066
2004	# TODO: 0-width page	2067	# TODO: 0-width page
2005	# TODO: req_w/h are wrong with vertical	2068	# TODO: req_w/h are wrong with vertical
2006	# TODO: calculations are off	2069	# TODO: calculations are off
2007	my $self = $class->SUPER::new (	2070	my $self = $class->SUPER::new (
2008	fg => [1, 1, 1],	2071	fg => [1, 1, 1],
2009	active_fg => [0, 0, 0],	2072	active_fg => [0, 0, 0],
		2073	bg => [0, 0, 0, 0.2],
		2074	active_bg => [1, 1, 1, 0.5],
2010	range => [0, 0, 100, 10],	2075	range => [0, 0, 100, 10, 0],
2011	req_w => $::WIDTH / 80,	2076	req_w => $::WIDTH / 80,
2012	req_h => $::WIDTH / 80,	2077	req_h => $::WIDTH / 80,
2013	vertical => 0,	2078	vertical => 0,
2014	can_hover => 1,	2079	can_hover => 1,
2015	inner_pad => 5,	2080	inner_pad => 0.02,
2016	@_	2081	@_
2017	);	2082	);
2018		2083
		2084	$self->set_value ($self->{range}[0]);
		2085	$self->update;
		2086
2019	$self	2087	$self
		2088	}
		2089
		2090	sub set_range {
		2091	my ($self, $range) = @_;
		2092
		2093	$self->{range} = $range;
		2094
		2095	$self->update;
		2096	}
		2097
		2098	sub set_value {
		2099	my ($self, $value) = @_;
		2100
		2101	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2102
		2103	$hi = $lo + 1 if $hi <= $lo;
		2104
		2105	$page = $hi - $lo if $page > $hi - $lo;
		2106
		2107	$value = $lo if $value < $lo;
		2108	$value = $hi - $page if $value > $hi - $page;
		2109
		2110	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2111	if $unit;
		2112
		2113	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2114
		2115	if ($value != $old_value) {
		2116	$self->emit (changed => $value);
		2117	$self->update;
		2118	}
2020	}	2119	}
2021		2120
2022	sub size_request {	2121	sub size_request {
2023	my ($self) = @_;	2122	my ($self) = @_;
2024		2123
…		…
2030		2129
2031	sub button_down {	2130	sub button_down {
2032	my ($self, $ev, $x, $y) = @_;	2131	my ($self, $ev, $x, $y) = @_;
2033		2132
2034	$self->SUPER::button_down ($ev, $x, $y);	2133	$self->SUPER::button_down ($ev, $x, $y);
		2134
		2135	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2136
2035	$self->mouse_motion ($ev, $x, $y);	2137	$self->mouse_motion ($ev, $x, $y);
2036	}	2138	}
2037		2139
2038	sub mouse_motion {	2140	sub mouse_motion {
2039	my ($self, $ev, $x, $y) = @_;	2141	my ($self, $ev, $x, $y) = @_;
2040		2142
2041	if ($GRAB == $self) {	2143	if ($GRAB == $self) {
		2144	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2145
		2146	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2147
		2148	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2149
		2150	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2151	}
		2152	}
		2153
		2154	sub update {
		2155	my ($self) = @_;
		2156
		2157	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2158	$self->set_value ($self->{range}[0]);
		2159
2042	my ($value, $lo, $hi, $page) = @{$self->{range}};	2160	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2161	my $range = ($hi - $page - $lo) || 1e-100;
2043		2162
2044	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2163	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2045		2164
2046	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2165	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2047	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2166	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2048		2167
2049	$x -= $inner_pad_px; # substract the padding	2168	$value = ($value - $lo) / $range;
2050	$x = $x * ($hi - $lo) / $inner_w + $lo;	2169	$value = $value * $self->{scale} + $self->{offset};
2051	$x = $lo if $x < $lo;
2052	$x = $hi - $page if $x > $hi - $page;
2053	$self->{range}[0] = $x;
2054		2170
2055	$self->emit (changed => $x);	2171	$self->{knob_x} = $value - $knob_w * 0.5;
2056	$self->update;	2172	$self->{knob_w} = $knob_w;
2057	}	2173	});
2058	}
2059		2174
2060	# the inner_* stuff is for generating a padding for the slider handle,	2175	$self->SUPER::update;
2061	# so that the handle doesn't leave the texture. This calculation isn't 100%
2062	# correct propably, but it does the job for now
2063	sub _calc_inner_pad_px {
2064	my ($self, $w) = @_;
2065	($w / 100) * $self->{inner_pad} # % to pixels
2066	}	2176	}
2067		2177
2068	sub _draw {	2178	sub _draw {
2069	my ($self) = @_;	2179	my ($self) = @_;
2070		2180
2071	$self->SUPER::_draw ();	2181	$self->SUPER::_draw ();
2072		2182
2073	my ($w, $h) = @$self{qw(w h)};	2183	glScale $self->{w}, $self->{h};
2074		2184
2075	if ($self->{vertical}) {	2185	if ($self->{vertical}) {
2076	# draw a vertical slider like a rotated horizontal slider	2186	# draw a vertical slider like a rotated horizontal slider
2077		2187
		2188	glTranslate 1, 0, 0;
2078	glRotate 90, 0, 0, 1;	2189	glRotate 90, 0, 0, 1;
2079	glTranslate 0, -$self->{w}, 0;
2080
2081	($w, $h) = ($h, $w);
2082	}	2190	}
2083		2191
2084	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2192	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2193	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086		2194
2087	my ($value, $lo, $hi, $page) = @{$self->{range}};
2088
2089	$hi = $value + 1 if $lo == $hi;
2090
2091	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2092	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2093
2094	$page = int $page * $inner_w / ($hi - $lo);
2095	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2096
2097	$w -= $page;
2098	$page &= ~1;
2099	glTranslate $page * 0.5, 0, 0;
2100	$page ||= 2;
2101
2102	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2103	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2104
2105	glEnable GL_BLEND;
2106	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2107	glEnable GL_TEXTURE_2D;	2195	glEnable GL_TEXTURE_2D;
2108	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2196	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2109		2197
2110	# draw background	2198	# draw background
2111	$tex[1]->draw_quad (0, 0, $w, $h);	2199	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2112		2200
2113	# draw handle	2201	# draw handle
2114	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2202	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2115		2203
2116	glDisable GL_BLEND;
2117	glDisable GL_TEXTURE_2D;	2204	glDisable GL_TEXTURE_2D;
2118	}	2205	}
		2206
		2207	#############################################################################
		2208
		2209	package CFClient::UI::ValSlider;
		2210
		2211	our @ISA = CFClient::UI::HBox::;
		2212
		2213	sub new {
		2214	my ($class, %arg) = @_;
		2215
		2216	my $range = delete $arg{range};
		2217
		2218	my $self = $class->SUPER::new (
		2219	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2220	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2221	to_value => sub { shift },
		2222	from_value => sub { shift },
		2223	%arg,
		2224	);
		2225
		2226	$self->{slider}->connect (changed => sub {
		2227	my ($self, $value) = @_;
		2228	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2229	$self->{parent}->emit (changed => $value);
		2230	});
		2231
		2232	# $self->{entry}->connect (changed => sub {
		2233	# my ($self, $value) = @_;
		2234	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2235	# $self->{parent}->emit (changed => $value);
		2236	# });
		2237
		2238	$self->add ($self->{slider}, $self->{entry});
		2239
		2240	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2241
		2242	$self
		2243	}
		2244
		2245	sub set_range { shift->{slider}->set_range (@_) }
		2246	sub set_value { shift->{slider}->set_value (@_) }
2119		2247
2120	#############################################################################	2248	#############################################################################
2121		2249
2122	package CFClient::UI::TextView;	2250	package CFClient::UI::TextView;
2123		2251
…		…
2132	fontsize => 1,	2260	fontsize => 1,
2133	can_events => 0,	2261	can_events => 0,
2134	#font => default_font	2262	#font => default_font
2135	@_,	2263	@_,
2136		2264
2137	layout => (new CFClient::Layout),	2265	layout => (new CFClient::Layout 1),
2138	par => [],	2266	par => [],
2139	height => 0,	2267	height => 0,
2140	children => [	2268	children => [
2141	(new CFClient::UI::Empty expand => 1),	2269	(new CFClient::UI::Empty expand => 1),
2142	(new CFClient::UI::Slider vertical => 1),	2270	(new CFClient::UI::Slider vertical => 1),
…		…
2153		2281
2154	$self->{fontsize} = $fontsize;	2282	$self->{fontsize} = $fontsize;
2155	$self->reflow;	2283	$self->reflow;
2156	}	2284	}
2157		2285
2158	sub text_height {
2159	my ($self, $text) = @_;
2160
2161	my $layout = $self->{layout};
2162
2163	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2164	$layout->set_width ($self->{children}[0]{w});
2165	$layout->set_text ($text);
2166
2167	($layout->size)[1]
2168	}
2169
2170	sub reflow {
2171	my ($self) = @_;
2172
2173	$self->{need_reflow}++;
2174	$self->update;
2175	}
2176
2177	sub size_allocate {	2286	sub size_allocate {
2178	my ($self, $w, $h) = @_;	2287	my ($self, $w, $h) = @_;
2179		2288
2180	$self->SUPER::size_allocate ($w, $h);	2289	$self->SUPER::size_allocate ($w, $h);
2181		2290
…		…
2184	$self->{layout}->set_width ($self->{children}[0]{w});	2293	$self->{layout}->set_width ($self->{children}[0]{w});
2185		2294
2186	$self->reflow;	2295	$self->reflow;
2187	}	2296	}
2188		2297
		2298	sub text_size {
		2299	my ($self, $text, $indent) = @_;
		2300
		2301	my $layout = $self->{layout};
		2302
		2303	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2304	$layout->set_width ($self->{children}[0]{w} - $indent);
		2305	$layout->set_markup ($text);
		2306
		2307	$layout->size
		2308	}
		2309
		2310	sub reflow {
		2311	my ($self) = @_;
		2312
		2313	$self->{need_reflow}++;
		2314	$self->update;
		2315	}
		2316
		2317	sub set_offset {
		2318	my ($self, $offset) = @_;
		2319
		2320	# todo: base offset on lines or so, not on pixels
		2321	$self->{children}[1]->set_value ($offset);
		2322	}
		2323
		2324	sub clear {
		2325	my ($self) = @_;
		2326
		2327	$self->{par} = [];
		2328	$self->{height} = 0;
		2329	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2330	}
		2331
2189	sub add_paragraph {	2332	sub add_paragraph {
2190	my ($self, $color, $text) = @_;	2333	my ($self, $color, $text, $indent) = @_;
2191		2334
2192	#TODO: intelligently "reformat" paragraph	2335	for my $line (split /\n/, $text) {
2193		2336	my ($w, $h) = $self->text_size ($line);
2194	my $height = $self->text_height ($text);
2195
2196	$self->{height} += $height;	2337	$self->{height} += $h;
		2338	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2339	}
2197		2340
2198	push @{$self->{par}}, [$height, $color, $text];
2199
2200	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2341	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2201	$self->{children}[1]->update;
2202	}	2342	}
2203		2343
2204	sub update {	2344	sub update {
2205	my ($self) = @_;	2345	my ($self) = @_;
2206		2346
…		…
2208		2348
2209	return unless $self->{h} > 0;	2349	return unless $self->{h} > 0;
2210		2350
2211	delete $self->{texture};	2351	delete $self->{texture};
2212		2352
2213	$ROOT->on_refresh ($self, sub {	2353	$ROOT->on_post_alloc ($self, sub {
		2354	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2355
2214	if (delete $self->{need_reflow}) {	2356	if (delete $self->{need_reflow}) {
2215	my $height = 0;	2357	my $height = 0;
2216		2358
2217	$height += $_->[0] = $self->text_height ($_->[2])	2359	my $layout = $self->{layout};
		2360
		2361	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2362
2218	for @{$self->{par}};	2363	for (@{$self->{par}}) {
		2364	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2365	$layout->set_width ($W - $_->[3]);
		2366	$layout->set_markup ($_->[4]);
		2367	my ($w, $h) = $layout->size;
		2368	$_->[0] = $w + $_->[3];
		2369	$_->[1] = $h;
		2370	}
		2371
		2372	$height += $_->[1];
		2373	}
2219		2374
2220	$self->{height} = $height;	2375	$self->{height} = $height;
2221		2376
2222	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2377	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2223		2378
2224	delete $self->{texture};	2379	delete $self->{texture};
2225	}	2380	}
2226		2381
2227	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2382	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2228	glClearColor 0, 0, 0, 0;	2383	glClearColor 0.5, 0.5, 0.5, 0;
2229	glClear GL_COLOR_BUFFER_BIT;	2384	glClear GL_COLOR_BUFFER_BIT;
2230		2385
		2386	my $top = int $self->{children}[1]{range}[0];
		2387
		2388	my $y0 = $top;
		2389	my $y1 = $top + $H;
		2390
		2391	my $y = 0;
		2392
		2393	my $layout = $self->{layout};
		2394
		2395	$layout->set_font ($self->{font}) if $self->{font};
		2396
2231	glEnable GL_BLEND;	2397	glEnable GL_BLEND;
		2398	#TODO# not correct in windows where rgba is forced off
2232	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2399	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2233	glEnable GL_TEXTURE_2D;
2234	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2235
2236	my $top = int $self->{children}[1]{range}[0];
2237
2238	my $y0 = $top;
2239	my $y1 = $top + $self->{h};
2240
2241	my $y = 0;
2242
2243	my $layout = $self->{layout};
2244
2245	$layout->set_font ($self->{font}) if $self->{font};
2246		2400
2247	for my $par (@{$self->{par}}) {	2401	for my $par (@{$self->{par}}) {
2248	my $h = $par->[0];	2402	my $h = $par->[1];
2249		2403
2250	if ($y0 < $y + $h && $y < $y1) {	2404	if ($y0 < $y + $h && $y < $y1) {
		2405	$layout->set_foreground (@{ $par->[2] });
		2406	$layout->set_width ($W - $par->[3]);
2251	$layout->set_text ($par->[2]);	2407	$layout->set_markup ($par->[4]);
2252		2408
2253	glColor @{ $par->[1] };	2409	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2254	my ($W, $H) = $layout->size;	2410
2255	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2411	glRasterPos $par->[3], $y - $y0;
		2412	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2256	}	2413	}
2257		2414
2258	$y += $h;	2415	$y += $h;
2259	}	2416	}
2260		2417
2261	glDisable GL_TEXTURE_2D;
2262	glDisable GL_BLEND;	2418	glDisable GL_BLEND;
2263	};	2419	};
2264	});	2420	});
2265	}	2421	}
2266		2422
2267	sub _draw {	2423	sub _draw {
2268	my ($self) = @_;	2424	my ($self) = @_;
2269		2425
2270	glEnable GL_BLEND;
2271	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2272	glEnable GL_TEXTURE_2D;	2426	glEnable GL_TEXTURE_2D;
2273	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2427	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274	glColor 1, 1, 1, 1;	2428	glColor 1, 1, 1, 1;
2275	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2429	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2276	glDisable GL_TEXTURE_2D;	2430	glDisable GL_TEXTURE_2D;
2277	glDisable GL_BLEND;
2278		2431
2279	$self->{children}[1]->draw;	2432	$self->{children}[1]->draw;
2280		2433
2281	}	2434	}
2282		2435
…		…
2376	@_,	2529	@_,
2377	can_events => 0,	2530	can_events => 0,
2378	)	2531	)
2379	}	2532	}
2380		2533
2381	sub set_markup {	2534	sub set_tooltip_from {
2382	my ($self, $text) = @_;	2535	my ($self, $widget) = @_;
2383		2536
2384	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2537	$self->add (new CFClient::UI::Label
2385	$self->{label}->set_markup ($text);	2538	markup => $widget->{tooltip},
2386	$self->add ($self->{label});	2539	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2540	fontsize => 0.8,
		2541	fg => [0, 0, 0, 1],
		2542	ellipsise => 0,
		2543	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2544	);
2387	}	2545	}
2388		2546
2389	sub size_request {	2547	sub size_request {
2390	my ($self) = @_;	2548	my ($self) = @_;
2391
2392	$self->child->set_max_size ($::WIDTH * 0.3);
2393		2549
2394	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2550	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2395		2551
2396	($w + 4, $h + 4)	2552	($w + 4, $h + 4)
2397	}	2553	}
…		…
2403	}	2559	}
2404		2560
2405	sub _draw {	2561	sub _draw {
2406	my ($self) = @_;	2562	my ($self) = @_;
2407		2563
2408	glPushMatrix;
2409	glTranslate 0.375, 0.375;	2564	glTranslate 0.375, 0.375;
2410		2565
2411	my ($w, $h) = @$self{qw(w h)};	2566	my ($w, $h) = @$self{qw(w h)};
2412		2567
2413	glColor 1, 0.8, 0.4;	2568	glColor 1, 0.8, 0.4;
…		…
2424	glVertex 0 , $h;	2579	glVertex 0 , $h;
2425	glVertex $w, $h;	2580	glVertex $w, $h;
2426	glVertex $w, 0;	2581	glVertex $w, 0;
2427	glEnd;	2582	glEnd;
2428		2583
2429	glPopMatrix;	2584	glTranslate 2 - 0.375, 2 - 0.375;
2430
2431	glTranslate 2, 2;
2432	$self->SUPER::_draw;	2585	$self->SUPER::_draw;
2433	}	2586	}
2434		2587
2435	#############################################################################	2588	#############################################################################
2436		2589
…		…
2441	use CFClient::OpenGL;	2594	use CFClient::OpenGL;
2442		2595
2443	sub new {	2596	sub new {
2444	my $class = shift;	2597	my $class = shift;
2445		2598
2446	$class->SUPER::new (	2599	my $self = $class->SUPER::new (
2447	aspect => 1,	2600	aspect => 1,
2448	@_,	2601	@_,
2449	)	2602	);
		2603
		2604	if ($self->{anim} && $self->{animspeed}) {
		2605	Scalar::Util::weaken (my $widget = $self);
		2606
		2607	$self->{timer} = Event->timer (
		2608	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2609	hard => 1,
		2610	interval => $self->{animspeed},
		2611	cb => sub {
		2612	++$widget->{frame};
		2613	$widget->update;
		2614	},
		2615	);
		2616	}
		2617
		2618	$self
2450	}	2619	}
2451		2620
2452	sub size_request {	2621	sub size_request {
2453	(32, 8)	2622	(32, 8)
2454	}	2623	}
2455		2624
		2625	sub update {
		2626	my ($self) = @_;
		2627
		2628	return unless $self->{visible};
		2629
		2630	$self->SUPER::update;
		2631	}
		2632
2456	sub _draw {	2633	sub _draw {
2457	my ($self) = @_;	2634	my ($self) = @_;
2458		2635
2459	return unless $::CONN;#d# manage and cache textures differently	2636	return unless $::CONN;
		2637
		2638	my $face;
		2639
		2640	if ($self->{frame}) {
		2641	my $anim = $::CONN->{anim}[$self->{anim}];
		2642
		2643	$face = $anim->[ $self->{frame} % @$anim ]
		2644	if $anim && @$anim;
		2645	}
		2646
2460	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2647	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2461		2648
2462	# TODO animation
2463	if ($tex) {	2649	if ($tex) {
2464	glEnable GL_BLEND;
2465	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2466	glEnable GL_TEXTURE_2D;	2650	glEnable GL_TEXTURE_2D;
2467	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2651	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2468	glColor 1, 1, 1, 1;	2652	glColor 1, 1, 1, 1;
2469	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2653	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470	glDisable GL_TEXTURE_2D;	2654	glDisable GL_TEXTURE_2D;
2471	glDisable GL_BLEND;
2472	}	2655	}
		2656	}
		2657
		2658	sub DESTROY {
		2659	my ($self) = @_;
		2660
		2661	$self->{timer}->cancel
		2662	if $self->{timer};
		2663
		2664	$self->SUPER::DESTROY;
2473	}	2665	}
2474		2666
2475	#############################################################################	2667	#############################################################################
2476		2668
2477	package CFClient::UI::InventoryItem;	2669	package CFClient::UI::InventoryItem;
2478		2670
2479	our @ISA = CFClient::UI::HBox::;	2671	our @ISA = CFClient::UI::HBox::;
		2672
		2673	sub _item_to_desc {
		2674	my ($item) = @_;
		2675
		2676	my $desc =
		2677	$item->{nrof} < 2
		2678	? $item->{name}
		2679	: "$item->{nrof} × $item->{name_pl}";
		2680
		2681	$item->{flags} & Crossfire::Protocol::F_OPEN
		2682	and $desc .= " (open)";
		2683	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2684	and $desc .= " (applied)";
		2685	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2686	and $desc .= " (unpaid)";
		2687	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2688	and $desc .= " (magic)";
		2689	$item->{flags} & Crossfire::Protocol::F_CURSED
		2690	and $desc .= " (cursed)";
		2691	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2692	and $desc .= " (damned)";
		2693	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2694	and $desc .= " *";
		2695
		2696	$desc
		2697	}
2480		2698
2481	sub new {	2699	sub new {
2482	my $class = shift;	2700	my $class = shift;
2483		2701
2484	my %args = @_;	2702	my %args = @_;
2485		2703
2486	my $item = $args{item};	2704	my $item = delete $args{item};
2487		2705
2488	my $desc = $item->{nrof} < 2	2706	my $desc = _item_to_desc ($item);
2489	? $item->{name}
2490	: "$item->{nrof} $item->{name_pl}";
2491
2492		2707
2493	my $self = $class->SUPER::new (	2708	my $self = $class->SUPER::new (
2494	can_hover => 1,	2709	can_hover => 1,
2495	can_events => 1,	2710	can_events => 1,
2496	tooltip => (CFClient::UI::Label->escape ($desc)	2711	tooltip => ((CFClient::UI::Label::escape $desc)
2497	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2712	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2498	connect_button_down => sub {	2713	connect_button_down => sub {
2499	my ($self, $ev, $x, $y) = @_;	2714	my ($self, $ev, $x, $y) = @_;
2500		2715
2501	# todo: maybe put examine on 1? but should just be a tooltip :(	2716	# todo: maybe put examine on 1? but should just be a tooltip :(
		2717	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		2718	my $targ = $::CONN->{player}{tag};
		2719
		2720	if ($item->{container} == $::CONN->{player}{tag}) {
		2721	$targ = $main::OPENCONT;
		2722	}
		2723
		2724	$::CONN->send ("move $targ $item->{tag} 0");
2502	if ($ev->{button} == 1) {	2725	} elsif ($ev->{button} == 1) {
2503	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2726	$::CONN->send ("examine $item->{tag}");
2504	} elsif ($ev->{button} == 2) {	2727	} elsif ($ev->{button} == 2) {
2505	$::CONN->send ("apply $item->{tag}");	2728	$::CONN->send ("apply $item->{tag}");
2506	} elsif ($ev->{button} == 3) {	2729	} elsif ($ev->{button} == 3) {
2507	CFClient::UI::Menu->new (	2730	my @menu_items = (
2508	items => [
2509	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2731	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510	[
2511	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512	sub { $::CONN->send ("lock $item->{tag}") },
2513	],
2514	["mark", sub { $::CONN->send ("mark $item->{tag}") }],	2732	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2515	["apply", sub { $::CONN->send ("apply $item->{tag}") }],	2733	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2734	(
		2735	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2736	? (
		2737	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2738	)
		2739	: (
		2740	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2516	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2741	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2742	)
2517	],	2743	),
2518	)->popup ($ev);	2744	);
		2745
		2746	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2519	}	2747	}
2520		2748
2521	1	2749	1
2522	},	2750	},
2523	%args	2751	%args
2524	);	2752	);
		2753
		2754
2525	$self->add(new CFClient::UI::Face	2755	$self->add (new CFClient::UI::Face
2526	can_events => 0,	2756	can_events => 0,
2527	face => $item->{face},	2757	face => $item->{face},
2528	anim => $item->{anim},	2758	anim => $item->{anim},
2529	animspeed => $item->{animspeed});	2759	animspeed => $item->{animspeed},
2530	$self->add(new CFClient::UI::Label	2760	);
2531	can_events => 0,	2761
2532	text => $desc);	2762	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2763
		2764	$self->{item} = $item;
		2765
		2766	$self->update_item;
2533		2767
2534	$self	2768	$self
		2769	}
		2770
		2771	sub update_item {
		2772	my ($self) = @_;
		2773
		2774	my $desc = _item_to_desc ($self->{item});
		2775
		2776	$self->{name_lbl}->set_text ($desc);
2535	}	2777	}
2536		2778
2537	#############################################################################	2779	#############################################################################
2538		2780
2539	package CFClient::UI::Inventory;	2781	package CFClient::UI::Inventory;
…		…
2542		2784
2543	sub new {	2785	sub new {
2544	my $class = shift;	2786	my $class = shift;
2545		2787
2546	my $self = $class->SUPER::new (	2788	my $self = $class->SUPER::new (
2547	scrolled => (new CFClient::UI::VBox),	2789	scrolled => (new CFClient::UI::Table),
2548	@_,	2790	@_,
2549	);	2791	);
2550		2792
2551	$self	2793	$self
2552	}	2794	}
…		…
2555	my ($self, $items) = @_;	2797	my ($self, $items) = @_;
2556		2798
2557	$self->{scrolled}->clear;	2799	$self->{scrolled}->clear;
2558	return unless $items;	2800	return unless $items;
2559		2801
2560	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2802	my @items = sort {
		2803	($a->{type} <=> $b->{type})
		2804	or ($a->{name} cmp $b->{name})
		2805	} @$items;
2561		2806
2562	$self->{real_items} = \@items;	2807	$self->{real_items} = \@items;
2563		2808
2564	for my $item (@items) {	2809	for my $item (@items) {
2565	my $desc = $item->{nrof} < 2	2810	$item->{item} = $item;
2566	? $item->{name}
2567	: "$item->{nrof} $item->{name_pl}";
2568
2569	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);	2811	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2812	$item->update_item ();
		2813	}
		2814
		2815	my $i = 0;
		2816	for (@items) {
		2817	$self->{scrolled}->add (0, $i, $_);
		2818	my $nrof = $_->{item}->{nrof} || 1;
		2819	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2570	}	2820	}
2571		2821
2572	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2822	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2573	}	2823	}
2574		2824
…		…
2649	}	2899	}
2650	}	2900	}
2651		2901
2652	#############################################################################	2902	#############################################################################
2653		2903
		2904	package CFClient::UI::Statusbox;
		2905
		2906	our @ISA = CFClient::UI::VBox::;
		2907
		2908	sub new {
		2909	my $class = shift;
		2910
		2911	$class->SUPER::new (
		2912	fontsize => 0.8,
		2913	@_,
		2914	)
		2915	}
		2916
		2917	sub reorder {
		2918	my ($self) = @_;
		2919	my $NOW = time;
		2920
		2921	while (my ($k, $v) = each %{ $self->{item} }) {
		2922	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2923	}
		2924
		2925	my @widgets;
		2926
		2927	my @items = sort {
		2928	$a->{pri} <=> $b->{pri}
		2929	or $b->{id} <=> $a->{id}
		2930	} values %{ $self->{item} };
		2931
		2932	my $count = 10 + 1;
		2933	for my $item (@items) {
		2934	last unless --$count;
		2935
		2936	push @widgets, $item->{label} ||= do {
		2937	# TODO: doesn't handle markup well (read as: at all)
		2938	my $short = $item->{count} > 1
		2939	? "<b>$item->{count} ×</b> $item->{text}"
		2940	: $item->{text};
		2941
		2942	for ($short) {
		2943	s/^\s+//;
		2944	s/\s+/ /g;
		2945	}
		2946
		2947	new CFClient::UI::Label
		2948	markup => $short,
		2949	tooltip => $item->{tooltip},
		2950	tooltip_font => $::FONT_PROP,
		2951	tooltip_width => 0.67,
		2952	fontsize => $item->{fontsize} || $self->{fontsize},
		2953	max_w => $::WIDTH * 0.44,
		2954	fg => $item->{fg},
		2955	can_events => 1,
		2956	can_hover => 1
		2957	};
		2958	}
		2959
		2960	$self->clear;
		2961	$self->SUPER::add (reverse @widgets);
		2962	}
		2963
		2964	sub add {
		2965	my ($self, $text, %arg) = @_;
		2966
		2967	$text =~ s/^\s+//;
		2968	$text =~ s/\s+$//;
		2969
		2970	my $timeout = time + ((delete $arg{timeout}) || 60);
		2971
		2972	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2973
		2974	if (my $item = $self->{item}{$group}) {
		2975	if ($item->{text} eq $text) {
		2976	$item->{count}++;
		2977	} else {
		2978	$item->{count} = 1;
		2979	$item->{text} = $item->{tooltip} = $text;
		2980	}
		2981	$item->{id} = ++$self->{id};
		2982	$item->{timeout} = $timeout;
		2983	delete $item->{label};
		2984	} else {
		2985	$self->{item}{$group} = {
		2986	id => ++$self->{id},
		2987	text => $text,
		2988	timeout => $timeout,
		2989	tooltip => $text,
		2990	fg => [0.8, 0.8, 0.8, 0.8],
		2991	pri => 0,
		2992	count => 1,
		2993	%arg,
		2994	};
		2995	}
		2996
		2997	$self->reorder;
		2998	}
		2999
		3000	sub reconfigure {
		3001	my ($self) = @_;
		3002
		3003	delete $_->{label}
		3004	for values %{ $self->{item} || {} };
		3005
		3006	$self->reorder;
		3007	$self->SUPER::reconfigure;
		3008	}
		3009
		3010	#############################################################################
		3011
2654	package CFClient::UI::Root;	3012	package CFClient::UI::Root;
2655		3013
2656	our @ISA = CFClient::UI::Container::;	3014	our @ISA = CFClient::UI::Container::;
2657		3015
2658	use CFClient::OpenGL;	3016	use CFClient::OpenGL;
…		…
2686	}	3044	}
2687		3045
2688	sub size_allocate {	3046	sub size_allocate {
2689	my ($self, $w, $h) = @_;	3047	my ($self, $w, $h) = @_;
2690		3048
2691	my $old_w = $self->{old_w};	3049	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2692	my $old_h = $self->{old_h};	3050	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2693		3051
2694	if ($old_w && $old_h) {	3052	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2695	for my $child ($self->children) {	3053	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2696	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2697	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2698	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2699	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2700	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2701	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2702	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2703	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2704	}
2705	}
2706		3054
2707	for my $child ($self->children) {	3055	for my $child ($self->children) {
2708	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3056	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2709		3057
		3058	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3059	if exists $child->{req_x};
		3060
		3061	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3062	if exists $child->{req_y};
		3063
2710	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3064	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2711	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3065	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3066
2712	$child->configure ($X, $Y, $W, $H);	3067	$child->configure ($X, $Y, $W, $H);
2713	}	3068	}
2714
2715	$self->{old_w} = $w;
2716	$self->{old_h} = $h;
2717	}	3069	}
2718		3070
2719	sub coord2local {	3071	sub coord2local {
2720	my ($self, $x, $y) = @_;	3072	my ($self, $x, $y) = @_;
2721		3073
…		…
2734	$self->check_size;	3086	$self->check_size;
2735	$::WANT_REFRESH++;	3087	$::WANT_REFRESH++;
2736	}	3088	}
2737		3089
2738	sub add {	3090	sub add {
2739	my ($self, $child) = @_;	3091	my ($self, @children) = @_;
2740		3092
		3093	for my $child (@children) {
		3094	$child->{toplevel} = 1;
		3095
2741	# integerise window positions	3096	# integerise window positions
2742	$child->{x} = int $child->{x};	3097	$child->{x} = int $child->{x};
2743	$child->{y} = int $child->{y};	3098	$child->{y} = int $child->{y};
		3099	}
2744		3100
2745	$self->SUPER::add ($child);	3101	$self->SUPER::add (@children);
		3102
		3103	while (@children) {
		3104	my $w = pop @children;
		3105	push @children, $w->children;
		3106	$w->{visible} = 1;
		3107	}
		3108	}
		3109
		3110	sub remove {
		3111	my ($self, @children) = @_;
		3112
		3113	$self->SUPER::remove (@children);
		3114
		3115	while (@children) {
		3116	my $w = pop @children;
		3117	push @children, $w->children;
		3118	delete $w->{visible};
		3119	}
2746	}	3120	}
2747		3121
2748	sub on_refresh {	3122	sub on_refresh {
2749	my ($self, $id, $cb) = @_;	3123	my ($self, $id, $cb) = @_;
2750		3124
2751	$self->{refresh_hook}{$id} = $cb;	3125	$self->{refresh_hook}{$id} = $cb;
2752	}	3126	}
2753		3127
		3128	sub on_post_alloc {
		3129	my ($self, $id, $cb) = @_;
		3130
		3131	$self->{post_alloc_hook}{$id} = $cb;
		3132	}
		3133
2754	sub draw {	3134	sub draw {
2755	my ($self) = @_;	3135	my ($self) = @_;
		3136
		3137	while ($self->{refresh_hook}) {
		3138	$_->()
		3139	for values %{delete $self->{refresh_hook}};
		3140	}
2756		3141
2757	if ($self->{check_size}) {	3142	if ($self->{check_size}) {
2758	my @queue = ([], []);	3143	my @queue = ([], []);
2759		3144
2760	for (;;) {	3145	for (;;) {
…		…
2768		3153
2769	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3154	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2770	? @$widget{qw(user_w user_h)}	3155	? @$widget{qw(user_w user_h)}
2771	: $widget->size_request;	3156	: $widget->size_request;
2772		3157
		3158	if (delete $widget->{force_alloc}
2773	if ($w != $widget->{req_w} || $h != $widget->{req_h}) {	3159	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3160	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3161
2774	$widget->{req_w} = $w;	3162	$widget->{req_w} = $w;
2775	$widget->{req_h} = $h;	3163	$widget->{req_h} = $h;
2776		3164
2777	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];	3165	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2778		3166
2779	$widget->{parent}->check_size	3167	$widget->{parent}->check_size
2780	if $widget->{parent};	3168	if $widget->{parent};
2781	}	3169	}
2782	}	3170	}
2783	}	3171	}
2784		3172
2785	while ($self->{size_alloc}) {	3173	while ($self->{size_alloc}) {
2786	for (values %{delete $self->{size_alloc}}) {	3174	for (values %{delete $self->{size_alloc}}) {
2787	my ($widget, $w, $h) = @$_;	3175	my ($widget, $w, $h) = @$_;
		3176
		3177	$w = 0 if $w < 0;
		3178	$h = 0 if $h < 0;
2788		3179
2789	$widget->{w} = $w;	3180	$widget->{w} = $w;
2790	$widget->{h} = $h;	3181	$widget->{h} = $h;
2791	$widget->size_allocate ($w, $h);	3182	$widget->size_allocate ($w, $h);
2792	$widget->emit (size_allocate => $w, $h);	3183	$widget->emit (size_allocate => $w, $h);
2793	}	3184	}
2794	}	3185	}
2795		3186
2796	while ($self->{refresh_hook}) {	3187	while ($self->{post_alloc_hook}) {
2797	$_->()	3188	$_->()
2798	for values %{delete $self->{refresh_hook}};	3189	for values %{delete $self->{post_alloc_hook}};
2799	}	3190	}
2800		3191
2801	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3192	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2802	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3193	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2803	glClear GL_COLOR_BUFFER_BIT;	3194	glClear GL_COLOR_BUFFER_BIT;
2804		3195
2805	glMatrixMode GL_PROJECTION;	3196	glMatrixMode GL_PROJECTION;
2806	glLoadIdentity;	3197	glLoadIdentity;
2807	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3198	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2808	glMatrixMode GL_MODELVIEW;	3199	glMatrixMode GL_MODELVIEW;
2809	glLoadIdentity;	3200	glLoadIdentity;
2810		3201
2811	$self->_draw;	3202	$self->_draw;
2812	}	3203	}
…		…
2814	#############################################################################	3205	#############################################################################
2815		3206
2816	package CFClient::UI;	3207	package CFClient::UI;
2817		3208
2818	$ROOT = new CFClient::UI::Root;	3209	$ROOT = new CFClient::UI::Root;
2819	$TOOLTIP = new CFClient::UI::Tooltip;	3210	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2820		3211
2821	1	3212	1
2822		3213

Diff Legend

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