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.192 by root, Tue May 9 22:49:32 2006 UTC vs.
Revision 1.222 by root, Mon May 22 03:59:51 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
…		…
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
15		18
16	sub check_tooltip {	19	sub check_tooltip {
17	if (!$GRAB) {	20	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
23		26
24	my $tip = $widget->{tooltip};	27	my $tip = $widget->{tooltip};
25		28
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	29	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		30
28	$TOOLTIP->set_markup ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29
30	$TOOLTIP->show;	32	$TOOLTIP->show;
31		33
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		35
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
37		38
38	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
39	}	42	}
40		43
41	return;	44	return;
42	}	45	}
43	}	46	}
…		…
130		133
131	for (@$vals) {	134	for (@$vals) {
132	my $i = int $_ + $rem;	135	my $i = int $_ + $rem;
133	$rem += $_ - $i;	136	$rem += $_ - $i;
134	$_ = $i;	137	$_ = $i;
		138	}
		139	}
		140
		141	sub full_refresh {
		142	# make a copy, otherwise for complains about freed values.
		143	my @widgets = values %WIDGET;
		144
		145	$_->update
		146	for @widgets;
		147	}
		148
		149	# call when resolution changes etc.
		150	sub rescale_widgets {
		151	my ($sx, $sy) = @_;
		152
		153	# make a copy, otherwise for complains about freed values.
		154	my @widgets = values %WIDGET;
		155
		156	for my $widget (@widgets) {
		157	if ($widget->{toplevel}) {
		158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		166	}
		167
		168	$widget->reconfigure;
135	}	169	}
136	}	170	}
137		171
138	#############################################################################	172	#############################################################################
139		173
…		…
158	if (/^connect_(.*)$/) {	192	if (/^connect_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	193	$self->connect ($1 => delete $self->{$_});
160	}	194	}
161	}	195	}
162		196
		197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		198
163	$self	199	$self
164	}	200	}
165		201
166	sub destroy {	202	sub destroy {
167	my ($self) = @_;	203	my ($self) = @_;
…		…
170	%$self = ();	206	%$self = ();
171	}	207	}
172		208
173	sub show {	209	sub show {
174	my ($self) = @_;	210	my ($self) = @_;
175
176	return if $self->{parent};	211	return if $self->{parent};
177		212
178	$CFClient::UI::ROOT->add ($self);	213	$CFClient::UI::ROOT->add ($self);
179	}	214	}
180		215
…		…
240		275
241	sub size_allocate {	276	sub size_allocate {
242	# nothing to be done	277	# nothing to be done
243	}	278	}
244		279
		280	sub reconfigure {
		281	my ($self) = @_;
		282
		283	$self->check_size (1);
		284	$self->update;
		285	}
		286
245	sub children {	287	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	}	288	}
259		289
260	sub set_max_size {	290	sub set_max_size {
261	my ($self, $w, $h) = @_;	291	my ($self, $w, $h) = @_;
262		292
263	delete $self->{max_w}; $self->{max_w} = $w if $w;	293	delete $self->{max_w}; $self->{max_w} = $w if $w;
264	delete $self->{max_h}; $self->{max_h} = $h if $h;	294	delete $self->{max_h}; $self->{max_h} = $h if $h;
		295	}
		296
		297	sub set_tooltip {
		298	my ($self, $tooltip) = @_;
		299
		300	$self->{tooltip} = $tooltip;
		301
		302	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		303	delete $CFClient::UI::TOOLTIP->{owner};
		304	CFClient::UI::check_tooltip;
		305	}
265	}	306	}
266		307
267	# translate global coordinates to local coordinate system	308	# translate global coordinates to local coordinate system
268	sub coord2local {	309	sub coord2local {
269	my ($self, $x, $y) = @_;	310	my ($self, $x, $y) = @_;
…		…
355	glVertex $self->{w}, 0;	396	glVertex $self->{w}, 0;
356	glVertex $self->{w}, $self->{h};	397	glVertex $self->{w}, $self->{h};
357	glVertex 0 , $self->{h};	398	glVertex 0 , $self->{h};
358	glEnd;	399	glEnd;
359	glPopMatrix;	400	glPopMatrix;
360	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	401	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361	}	402	}
362	}	403	}
363		404
364	sub _draw {	405	sub _draw {
365	my ($self) = @_;	406	my ($self) = @_;
…		…
380	}	421	}
381		422
382	sub set_parent {	423	sub set_parent {
383	my ($self, $parent) = @_;	424	my ($self, $parent) = @_;
384		425
385	$self->{_tree_depth} = $parent->{_tree_depth} + 1;
386	Scalar::Util::weaken ($self->{parent} = $parent);	426	Scalar::Util::weaken ($self->{parent} = $parent);
		427
		428	# TODO: req_w _does_change after ->reconfigure
		429	$self->check_size
		430	unless exists $self->{req_w};
		431
		432	$self->show;
387	}	433	}
388		434
389	sub check_size {	435	sub check_size {
390	my ($self) = @_;	436	my ($self, $forced) = @_;
391		437
		438	$self->{force_alloc} = 1 if $forced;
392	$CFClient::UI::ROOT->{check_size}{$self} = $self;	439	$CFClient::UI::ROOT->{check_size}{$self} = $self;
393	}	440	}
394		441
395	sub update {	442	sub update {
396	my ($self) = @_;	443	my ($self) = @_;
…		…
412	}	459	}
413		460
414	sub DESTROY {	461	sub DESTROY {
415	my ($self) = @_;	462	my ($self) = @_;
416		463
		464	delete $WIDGET{$self+0};
417	#$self->deactivate;	465	#$self->deactivate;
418	}	466	}
419		467
420	#############################################################################	468	#############################################################################
421		469
…		…
430	my $class = shift;	478	my $class = shift;
431		479
432	# range [value, low, high, page]	480	# range [value, low, high, page]
433		481
434	$class->SUPER::new (	482	$class->SUPER::new (
435	bg => [0, 0, 0, 0.2],	483	#bg => [0, 0, 0, 0.2],
436	active_bg => [1, 1, 1, 0.5],	484	#active_bg => [1, 1, 1, 0.5],
437	@_	485	@_
438	)	486	)
439	}	487	}
440		488
441	sub _draw {	489	sub _draw {
442	my ($self) = @_;	490	my ($self) = @_;
443		491
		492	my $color = $FOCUS == $self && $self->{active_bg}
		493	? $self->{active_bg}
		494	: $self->{bg};
		495
		496	if ($color && (@$color < 4 || $color->[3])) {
444	my ($w, $h) = @$self{qw(w h)};	497	my ($w, $h) = @$self{qw(w h)};
445		498
446	glEnable GL_BLEND;	499	glEnable GL_BLEND;
447	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	500	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
448	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	501	glColor @$color;
449		502
450	glBegin GL_QUADS;	503	glBegin GL_QUADS;
451	glVertex 0 , 0;	504	glVertex 0 , 0;
452	glVertex 0 , $h;	505	glVertex 0 , $h;
453	glVertex $w, $h;	506	glVertex $w, $h;
454	glVertex $w, 0;	507	glVertex $w, 0;
455	glEnd;	508	glEnd;
456		509
457	glDisable GL_BLEND;	510	glDisable GL_BLEND;
		511	}
458	}	512	}
459		513
460	#############################################################################	514	#############################################################################
461		515
462	package CFClient::UI::Empty;	516	package CFClient::UI::Empty;
…		…
506	$self->{children} = [	560	$self->{children} = [
507	sort { $a->{z} <=> $b->{z} }	561	sort { $a->{z} <=> $b->{z} }
508	@{$self->{children}}, @widgets	562	@{$self->{children}}, @widgets
509	];	563	];
510		564
511	$_->check_size	565	$self->check_size (1);
512	for @widgets;
513
514	$self->update;	566	$self->update;
515	}	567	}
516		568
517	sub children {	569	sub children {
518	@{ $_[0]{children} }	570	@{ $_[0]{children} }
…		…
625	}	677	}
626		678
627	sub update {	679	sub update {
628	my ($self) = @_;	680	my ($self) = @_;
629		681
630	$ROOT->on_refresh ($self => sub { $self->render_child });	682	$ROOT->on_post_alloc ($self => sub { $self->render_child });
631	$self->SUPER::update;	683	$self->SUPER::update;
632	}	684	}
633		685
634	sub size_allocate {	686	sub size_allocate {
635	my ($self, $w, $h) = @_;	687	my ($self, $w, $h) = @_;
…		…
648	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	700	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649	glClearColor 0, 0, 0, 0;	701	glClearColor 0, 0, 0, 0;
650	glClear GL_COLOR_BUFFER_BIT;	702	glClear GL_COLOR_BUFFER_BIT;
651		703
652	$self->_render;	704	$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	};	705	};
661	}	706	}
662		707
663	sub _draw {	708	sub _draw {
664	my ($self) = @_;	709	my ($self) = @_;
…		…
666	my ($w, $h) = ($self->w, $self->h);	711	my ($w, $h) = ($self->w, $self->h);
667		712
668	my $tex = $self->{texture}	713	my $tex = $self->{texture}
669	or return;	714	or return;
670		715
671	glEnable GL_BLEND;
672	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673	glEnable GL_TEXTURE_2D;	716	glEnable GL_TEXTURE_2D;
674	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	717	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675	glColor 0, 0, 0, 1;	718	glColor 1, 1, 1, 1;
676		719
677	$tex->draw_quad (0, 0, $w, $h);	720	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678		721
679	glDisable GL_BLEND;
680	glDisable GL_TEXTURE_2D;	722	glDisable GL_TEXTURE_2D;
681	}	723	}
682		724
683	#############################################################################	725	#############################################################################
684		726
…		…
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	806	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765	},	807	},
766	;	808	;
767		809
768	$self = $class->SUPER::new (	810	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	811	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	812	slider => $slider,
771	@_,	813	@_,
772	);	814	);
773		815
774	$self->{vp}->add ($self->{scrolled});	816	$self->{vp}->add ($self->{scrolled});
…		…
776	$self->add ($self->{slider});	818	$self->add ($self->{slider});
777		819
778	$self	820	$self
779	}	821	}
780		822
781	#TODO# update range on size_allocate depeneing on child	823	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	824	# update viewport offset on scroll
783		825
784	#############################################################################	826	#############################################################################
785		827
786	package CFClient::UI::Frame;	828	package CFClient::UI::Frame;
…		…
790	use CFClient::OpenGL;	832	use CFClient::OpenGL;
791		833
792	sub new {	834	sub new {
793	my $class = shift;	835	my $class = shift;
794		836
795	my $self = $class->SUPER::new (	837	$class->SUPER::new (
796	bg => [1, 1, 1, 1],	838	bg => undef,
797	border_bg => [1, 1, 1, 1],
798	border => 0.8,
799	@_	839	@_,
800	);	840	)
801
802	$self
803	}	841	}
804		842
805	sub _draw {	843	sub _draw {
806	my ($self) = @_;	844	my ($self) = @_;
807		845
808	my ($w, $h) = ($self->{w}, $self->{h});	846	if ($self->{bg}) {
		847	my ($w, $h) = @$self{qw(w h)};
809		848
810	glEnable GL_BLEND;	849	glEnable GL_BLEND;
811	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	850	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812	glEnable GL_TEXTURE_2D;	851	glColor @{ $self->{bg} };
813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814		852
815	# glBegin GL_QUADS;	853	glBegin GL_QUADS;
816	# glColor 0, 0, 0, 0;
817	# glVertex 0 , 0;	854	glVertex 0 , 0;
818	# glVertex 0 , $h;	855	glVertex 0 , $h;
819	# glVertex $w, $h;	856	glVertex $w, $h;
820	# glVertex $w, 0;	857	glVertex $w, 0;
821	# glEnd;	858	glEnd;
822		859
823
824	$self->child->draw;
825	glDisable GL_BLEND;	860	glDisable GL_BLEND;
826	glDisable GL_TEXTURE_2D;	861	}
		862
		863	$self->SUPER::_draw;
827	}	864	}
828		865
829	#############################################################################	866	#############################################################################
830		867
831	package CFClient::UI::FancyFrame;	868	package CFClient::UI::FancyFrame;
…		…
845		882
846	my $self = $class->SUPER::new (	883	my $self = $class->SUPER::new (
847	bg => [1, 1, 1, 1],	884	bg => [1, 1, 1, 1],
848	border_bg => [1, 1, 1, 1],	885	border_bg => [1, 1, 1, 1],
849	border => 0.6,	886	border => 0.6,
		887	toplevel => 1,
850	can_events => 1,	888	can_events => 1,
851	@_	889	@_
852	);	890	);
853		891
854	$self->{title} &&= new CFClient::UI::Label	892	$self->{title} &&= new CFClient::UI::Label
…		…
879	my ($self, $w, $h) = @_;	917	my ($self, $w, $h) = @_;
880		918
881	$h -= List::Util::max 0, $self->border * 2;	919	$h -= List::Util::max 0, $self->border * 2;
882	$w -= List::Util::max 0, $self->border * 2;	920	$w -= List::Util::max 0, $self->border * 2;
883		921
884	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	922	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
885	if $self->{title};	923	if $self->{title};
886		924
887	$self->child->configure ($self->border, $self->border, $w, $h);	925	$self->child->configure ($self->border, $self->border, $w, $h);
888	}	926	}
889		927
…		…
947	my ($self) = @_;	985	my ($self) = @_;
948		986
949	my ($w, $h ) = ($self->{w}, $self->{h});	987	my ($w, $h ) = ($self->{w}, $self->{h});
950	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	988	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951		989
952	glEnable GL_BLEND;
953	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954	glEnable GL_TEXTURE_2D;	990	glEnable GL_TEXTURE_2D;
955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	991	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956		992
957	my $border = $self->border;	993	my $border = $self->border;
958		994
959	glColor @{ $self->{border_bg} };	995	glColor @{ $self->{border_bg} };
960	$tex[1]->draw_quad (0, 0, $w, $border);	996	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
961	$tex[3]->draw_quad (0, $border, $border, $ch);	997	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	998	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963	$tex[4]->draw_quad (0, $h - $border, $w, $border);	999	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964		1000
965	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1001	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966	my $bg = $tex[0];	1002	my $bg = $tex[0];
967		1003
968	# TODO: repeat texture not scale	1004	# TODO: repeat texture not scale
…		…
972	glColor @{ $self->{bg} };	1008	glColor @{ $self->{bg} };
973		1009
974	$bg->{s} = $rep_x;	1010	$bg->{s} = $rep_x;
975	$bg->{t} = $rep_y;	1011	$bg->{t} = $rep_y;
976	$bg->{wrap_mode} = 1;	1012	$bg->{wrap_mode} = 1;
977	$bg->draw_quad ($border, $border, $cw, $ch);	1013	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1014	}
978		1015
979	glDisable GL_TEXTURE_2D;	1016	glDisable GL_TEXTURE_2D;
980	glDisable GL_BLEND;
981	}
982		1017
983	$self->{title}->draw if $self->{title};	1018	$self->{title}->draw if $self->{title};
984		1019
985	$self->child->draw;	1020	$self->child->draw;
986	}	1021	}
…		…
1213	}	1248	}
1214		1249
1215	sub size_allocate {	1250	sub size_allocate {
1216	my ($self, $w, $h) = @_;	1251	my ($self, $w, $h) = @_;
1217		1252
		1253	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1254
1218	my $children = $self->{children};	1255	my $children = $self->{children};
1219		1256
1220	my @h = map $_->{req_h}, @$children;	1257	my @h = map $_->{req_h}, @$children;
1221		1258
1222	my $req_h = List::Util::sum @h;	1259	my $req_h = List::Util::sum @h;
…		…
1251		1288
1252	#############################################################################	1289	#############################################################################
1253		1290
1254	package CFClient::UI::Label;	1291	package CFClient::UI::Label;
1255		1292
1256	our @ISA = CFClient::UI::Base::;	1293	our @ISA = CFClient::UI::DrawBG::;
1257		1294
1258	use CFClient::OpenGL;	1295	use CFClient::OpenGL;
1259		1296
1260	sub new {	1297	sub new {
1261	my ($class, %arg) = @_;	1298	my ($class, %arg) = @_;
1262		1299
1263	my $self = $class->SUPER::new (	1300	my $self = $class->SUPER::new (
1264	fg => [1, 1, 1],	1301	fg => [1, 1, 1],
		1302	#bg => none
		1303	#active_bg => none
1265	#font => default_font	1304	#font => default_font
		1305	#text => initial text
		1306	#markup => initial narkup
		1307	#max_w => maximum pixel width
		1308	ellipsise => 3, # end
		1309	layout => (new CFClient::Layout),
1266	fontsize => 1,	1310	fontsize => 1,
1267	text => "",
1268	align => -1,	1311	align => -1,
1269	valign => -1,	1312	valign => -1,
1270	padding => 2,	1313	padding => 2,
1271	layout => new CFClient::Layout,
1272	can_events => 0,	1314	can_events => 0,
1273	%arg	1315	%arg
1274	);	1316	);
1275		1317
1276	if (exists $self->{template}) {	1318	if (exists $self->{template}) {
1277	my $layout = new CFClient::Layout;	1319	my $layout = new CFClient::Layout;
1278	$layout->set_text (delete $self->{template});	1320	$layout->set_text (delete $self->{template});
1279	$self->{template} = $layout;	1321	$self->{template} = $layout;
1280	}	1322	}
1281		1323
1282	$self->set_text (delete $self->{text}) if exists $self->{text};	1324	if (exists $self->{markup}) {
1283	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1325	$self->set_markup (delete $self->{markup});
		1326	} else {
		1327	$self->set_text (delete $self->{text});
		1328	}
1284		1329
1285	$self	1330	$self
1286	}	1331	}
1287		1332
1288	sub escape {	1333	sub escape($) {
1289	local $_ = $_[1];	1334	local $_ = $_[0];
1290		1335
1291	s/&/&amp;/g;	1336	s/&/&amp;/g;
1292	s/>/&gt;/g;	1337	s/>/&gt;/g;
1293	s/</&lt;/g;	1338	s/</&lt;/g;
1294		1339
1295	$_[1]	1340	$_
1296	}	1341	}
1297		1342
1298	sub update {	1343	sub update {
1299	my ($self) = @_;	1344	my ($self) = @_;
1300		1345
…		…
1306	my ($self, $text) = @_;	1351	my ($self, $text) = @_;
1307		1352
1308	return if $self->{text} eq "T$text";	1353	return if $self->{text} eq "T$text";
1309	$self->{text} = "T$text";	1354	$self->{text} = "T$text";
1310		1355
		1356	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1311	$self->{layout}->set_text ($text);	1357	$self->{layout}->set_text ($text);
1312		1358
1313	$self->update;	1359	$self->update;
1314	$self->check_size;	1360	$self->check_size;
1315	}	1361	}
…		…
1318	my ($self, $markup) = @_;	1364	my ($self, $markup) = @_;
1319		1365
1320	return if $self->{text} eq "M$markup";	1366	return if $self->{text} eq "M$markup";
1321	$self->{text} = "M$markup";	1367	$self->{text} = "M$markup";
1322		1368
		1369	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1370
		1371	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1323	$self->{layout}->set_markup ($markup);	1372	$self->{layout}->set_markup ($markup);
1324		1373
1325	$self->update;	1374	$self->update;
1326	$self->check_size;	1375	$self->check_size;
1327	}	1376	}
…		…
1329	sub size_request {	1378	sub size_request {
1330	my ($self) = @_;	1379	my ($self) = @_;
1331		1380
1332	$self->{layout}->set_font ($self->{font}) if $self->{font};	1381	$self->{layout}->set_font ($self->{font}) if $self->{font};
1333	$self->{layout}->set_width ($self->{max_w} || -1);	1382	$self->{layout}->set_width ($self->{max_w} || -1);
		1383	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1384	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1334	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1385	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1335		1386
1336	my ($w, $h) = $self->{layout}->size;	1387	my ($w, $h) = $self->{layout}->size;
1337		1388
1338	if (exists $self->{template}) {	1389	if (exists $self->{template}) {
…		…
1368	}	1419	}
1369		1420
1370	sub _draw {	1421	sub _draw {
1371	my ($self) = @_;	1422	my ($self) = @_;
1372		1423
		1424	$self->SUPER::_draw; # draw background, if applicable
		1425
1373	my $tex = $self->{texture} ||= do {	1426	my $tex = $self->{texture} ||= do {
		1427	$self->{layout}->set_foreground (@{$self->{fg}});
1374	$self->{layout}->set_font ($self->{font}) if $self->{font};	1428	$self->{layout}->set_font ($self->{font}) if $self->{font};
1375	$self->{layout}->set_width ($self->{w});	1429	$self->{layout}->set_width ($self->{w});
		1430	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1431	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1432	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1433
1377	new_from_layout CFClient::Texture $self->{layout}	1434	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1435
		1436	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1437	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1438	: ($self->{w} - $tex->{w}) * 0.5);
		1439
		1440	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1441	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1442	: ($self->{h} - $tex->{h}) * 0.5);
		1443
		1444	$tex
1378	};	1445	};
1379		1446
1380	glEnable GL_BLEND;
1381	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1382	glEnable GL_TEXTURE_2D;	1447	glEnable GL_TEXTURE_2D;
1383	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1448	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1384		1449
		1450	if ($tex->{format} == GL_ALPHA) {
1385	glColor @{$self->{fg}};	1451	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});	1452	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1453	} else {
		1454	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1455	}
1400		1456
1401	glDisable GL_TEXTURE_2D;	1457	glDisable GL_TEXTURE_2D;
1402	glDisable GL_BLEND;
1403	}	1458	}
1404		1459
1405	#############################################################################	1460	#############################################################################
1406		1461
1407	package CFClient::UI::EntryBase;	1462	package CFClient::UI::EntryBase;
…		…
1442	$self->{layout}->set_text ("$text ");	1497	$self->{layout}->set_text ("$text ");
1443		1498
1444	$self->emit (changed => $self->{text});	1499	$self->emit (changed => $self->{text});
1445	}	1500	}
1446		1501
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	}
1464
1465	sub set_text {	1502	sub set_text {
1466	my ($self, $text) = @_;	1503	my ($self, $text) = @_;
1467		1504
1468	$self->{cursor} = length $text;	1505	$self->{cursor} = length $text;
1469	$self->_set_text ($text);	1506	$self->_set_text ($text);
1470	$self->update;	1507	$self->update;
		1508	$self->check_size;
		1509	}
		1510
		1511	sub get_text {
		1512	$_[0]{text}
		1513	}
		1514
		1515	sub size_request {
		1516	my ($self) = @_;
		1517
		1518	my ($w, $h) = $self->SUPER::size_request;
		1519
		1520	($w + 1, $h) # add 1 for cursor
		1521	}
		1522
		1523	sub size_allocate {
		1524	my ($self, $w, $h) = @_;
		1525
		1526	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1471	}	1527	}
1472		1528
1473	sub key_down {	1529	sub key_down {
1474	my ($self, $ev) = @_;	1530	my ($self, $ev) = @_;
1475		1531
…		…
1477	my $sym = $ev->{sym};	1533	my $sym = $ev->{sym};
1478	my $uni = $ev->{unicode};	1534	my $uni = $ev->{unicode};
1479		1535
1480	my $text = $self->get_text;	1536	my $text = $self->get_text;
1481		1537
1482	if ($sym == 8) {	1538	if ($uni == 8) {
1483	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1539	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1484	} elsif ($sym == 127) {	1540	} elsif ($uni == 127) {
1485	substr $text, $self->{cursor}, 1, "";	1541	substr $text, $self->{cursor}, 1, "";
1486	} elsif ($sym == CFClient::SDLK_LEFT) {	1542	} elsif ($sym == CFClient::SDLK_LEFT) {
1487	--$self->{cursor} if $self->{cursor};	1543	--$self->{cursor} if $self->{cursor};
1488	} elsif ($sym == CFClient::SDLK_RIGHT) {	1544	} elsif ($sym == CFClient::SDLK_RIGHT) {
1489	++$self->{cursor} if $self->{cursor} < length $self->{text};	1545	++$self->{cursor} if $self->{cursor} < length $self->{text};
1490	} elsif ($sym == CFClient::SDLK_HOME) {	1546	} elsif ($sym == CFClient::SDLK_HOME) {
1491	$self->{cursor} = 0;	1547	$self->{cursor} = 0;
1492	} elsif ($sym == CFClient::SDLK_END) {	1548	} elsif ($sym == CFClient::SDLK_END) {
1493	$self->{cursor} = length $text;	1549	$self->{cursor} = length $text;
1494	} elsif ($sym == 27) {	1550	} elsif ($uni == 27) {
1495	$self->emit ('escape');	1551	$self->emit ('escape');
1496	} elsif ($uni) {	1552	} elsif ($uni) {
1497	substr $text, $self->{cursor}++, 0, chr $uni;	1553	substr $text, $self->{cursor}++, 0, chr $uni;
1498	}	1554	}
1499		1555
1500	$self->_set_text ($text);	1556	$self->_set_text ($text);
1501	$self->update;	1557	$self->update;
		1558	$self->check_size;
1502	}	1559	}
1503		1560
1504	sub focus_in {	1561	sub focus_in {
1505	my ($self) = @_;	1562	my ($self) = @_;
1506		1563
…		…
1635	my $class = shift;	1692	my $class = shift;
1636		1693
1637	$class->SUPER::new (	1694	$class->SUPER::new (
1638	padding => 4,	1695	padding => 4,
1639	fg => [1, 1, 1],	1696	fg => [1, 1, 1],
1640	bg => [1, 1, 1, 0.2],
1641	active_fg => [0, 0, 1],	1697	active_fg => [0, 0, 1],
1642	can_hover => 1,	1698	can_hover => 1,
1643	align => 0,	1699	align => 0,
1644	valign => 0,	1700	valign => 0,
1645	can_events => 1,	1701	can_events => 1,
…		…
1663		1719
1664	if ($GRAB == $self) {	1720	if ($GRAB == $self) {
1665	$self->{fg} = $self->{active_fg};	1721	$self->{fg} = $self->{active_fg};
1666	}	1722	}
1667		1723
1668	glEnable GL_BLEND;
1669	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1670	glEnable GL_TEXTURE_2D;	1724	glEnable GL_TEXTURE_2D;
1671	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1725	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672	glColor 0, 0, 0, 1;	1726	glColor 0, 0, 0, 1;
1673		1727
1674	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1728	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1675		1729
1676	glDisable GL_TEXTURE_2D;	1730	glDisable GL_TEXTURE_2D;
1677	glDisable GL_BLEND;
1678		1731
1679	$self->SUPER::_draw;	1732	$self->SUPER::_draw;
1680	}	1733	}
1681		1734
1682	#############################################################################	1735	#############################################################################
…		…
1696		1749
1697	$class->SUPER::new (	1750	$class->SUPER::new (
1698	padding => 2,	1751	padding => 2,
1699	fg => [1, 1, 1],	1752	fg => [1, 1, 1],
1700	active_fg => [1, 1, 0],	1753	active_fg => [1, 1, 0],
		1754	bg => [0, 0, 0, 0.2],
		1755	active_bg => [1, 1, 1, 0.5],
1701	state => 0,	1756	state => 0,
1702	can_hover => 1,	1757	can_hover => 1,
1703	@_	1758	@_
1704	)	1759	)
1705	}	1760	}
…		…
1729		1784
1730	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1785	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1731		1786
1732	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1787	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733		1788
1734	glEnable GL_BLEND;	1789	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1790
1735	glEnable GL_TEXTURE_2D;	1791	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);	1792	$tex->draw_quad_alpha (0, 0, $s, $s);
1741
1742	glDisable GL_TEXTURE_2D;	1793	glDisable GL_TEXTURE_2D;
1743	glDisable GL_BLEND;
1744	}	1794	}
1745		1795
1746	#############################################################################	1796	#############################################################################
1747		1797
1748	package CFClient::UI::Image;	1798	package CFClient::UI::Image;
…		…
1791	glTranslate 0, -$self->{w}, 0;	1841	glTranslate 0, -$self->{w}, 0;
1792		1842
1793	($w, $h) = ($h, $w);	1843	($w, $h) = ($h, $w);
1794	}	1844	}
1795		1845
1796	glEnable GL_BLEND;
1797	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798	glEnable GL_TEXTURE_2D;	1846	glEnable GL_TEXTURE_2D;
1799	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1847	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800		1848
1801	$tex->draw_quad (0, 0, $w, $h);	1849	$tex->draw_quad_alpha (0, 0, $w, $h);
1802		1850
1803	glDisable GL_BLEND;
1804	glDisable GL_TEXTURE_2D;	1851	glDisable GL_TEXTURE_2D;
1805	}	1852	}
1806		1853
1807	#############################################################################	1854	#############################################################################
1808		1855
…		…
1997	qw(s1_slider.png s1_slider_bg.png);	2044	qw(s1_slider.png s1_slider_bg.png);
1998		2045
1999	sub new {	2046	sub new {
2000	my $class = shift;	2047	my $class = shift;
2001		2048
2002	# range [value, low, high, page]	2049	# range [value, low, high, page, unit]
2003		2050
2004	# TODO: 0-width page	2051	# TODO: 0-width page
2005	# TODO: req_w/h are wrong with vertical	2052	# TODO: req_w/h are wrong with vertical
2006	# TODO: calculations are off	2053	# TODO: calculations are off
2007	my $self = $class->SUPER::new (	2054	my $self = $class->SUPER::new (
2008	fg => [1, 1, 1],	2055	fg => [1, 1, 1],
2009	active_fg => [0, 0, 0],	2056	active_fg => [0, 0, 0],
		2057	bg => [0, 0, 0, 0.2],
		2058	active_bg => [1, 1, 1, 0.5],
2010	range => [0, 0, 100, 10],	2059	range => [0, 0, 100, 10],
2011	req_w => $::WIDTH / 80,	2060	req_w => $::WIDTH / 80,
2012	req_h => $::WIDTH / 80,	2061	req_h => $::WIDTH / 80,
2013	vertical => 0,	2062	vertical => 0,
2014	can_hover => 1,	2063	can_hover => 1,
2015	inner_pad => 5,	2064	inner_pad => 0.02,
2016	@_	2065	@_
2017	);	2066	);
2018		2067
		2068	$self->set_value ($self->{range}[0]);
		2069	$self->update;
		2070
2019	$self	2071	$self
		2072	}
		2073
		2074	sub set_value {
		2075	my ($self, $value) = @_;
		2076
		2077	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2078
		2079	$hi = $lo + 1 if $hi <= $lo;
		2080
		2081	$value = $lo if $value < $lo;
		2082	$value = $hi if $value > $hi;
		2083
		2084	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2085	if $unit;
		2086
		2087	$page = $hi - $lo if $page > $hi - $lo;
		2088
		2089	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2090
		2091	if ($value != $old_value) {
		2092	$self->emit (changed => $value);
		2093	$self->update;
		2094	}
2020	}	2095	}
2021		2096
2022	sub size_request {	2097	sub size_request {
2023	my ($self) = @_;	2098	my ($self) = @_;
2024		2099
…		…
2037		2112
2038	sub mouse_motion {	2113	sub mouse_motion {
2039	my ($self, $ev, $x, $y) = @_;	2114	my ($self, $ev, $x, $y) = @_;
2040		2115
2041	if ($GRAB == $self) {	2116	if ($GRAB == $self) {
		2117	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2118
		2119	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2120
		2121	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2122
		2123	$self->set_value ($x * ($hi - $lo) + $lo);
		2124	}
		2125	}
		2126
		2127	sub update {
		2128	my ($self) = @_;
		2129
		2130	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2131	$self->set_value ($self->{range}[0]);
		2132
2042	my ($value, $lo, $hi, $page) = @{$self->{range}};	2133	my ($value, $lo, $hi, $page) = @{$self->{range}};
2043		2134
2044	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2135	my $inner_w = 1 - 2 * $self->{inner_pad};
2045		2136
2046	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2137	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2047	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2048		2138
2049	$x -= $inner_pad_px; # substract the padding	2139	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2050	$x = $x * ($hi - $lo) / $inner_w + $lo;	2140	$value = $self->{scale} * ($value - $lo);
2051	$x = $lo if $x < $lo;
2052	$x = $hi - $page if $x > $hi - $page;
2053	$self->{range}[0] = $x;
2054		2141
2055	$self->emit (changed => $x);	2142	$value = $self->{inner_pad} + ($value - $page * 0.5);
2056	$self->update;	2143
		2144	$value = 0 if $value < 0;
		2145	$page = 1 - $value if $value + $page > 1;
		2146
		2147	$self->{knob_x} = $value;
		2148	$self->{knob_w} = $page;
2057	}	2149	});
2058	}
2059		2150
2060	# the inner_* stuff is for generating a padding for the slider handle,	2151	$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	}	2152	}
2067		2153
2068	sub _draw {	2154	sub _draw {
2069	my ($self) = @_;	2155	my ($self) = @_;
2070		2156
2071	$self->SUPER::_draw ();	2157	$self->SUPER::_draw ();
2072		2158
2073	my ($w, $h) = @$self{qw(w h)};	2159	glScale $self->{w}, $self->{h};
2074		2160
2075	if ($self->{vertical}) {	2161	if ($self->{vertical}) {
2076	# draw a vertical slider like a rotated horizontal slider	2162	# draw a vertical slider like a rotated horizontal slider
2077		2163
		2164	glTranslate 1, 0, 0;
2078	glRotate 90, 0, 0, 1;	2165	glRotate 90, 0, 0, 1;
2079	glTranslate 0, -$self->{w}, 0;
2080
2081	($w, $h) = ($h, $w);
2082	}	2166	}
2083		2167
2084	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2168	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2169	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086		2170
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;	2171	glEnable GL_TEXTURE_2D;
2108	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2172	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2109		2173
2110	# draw background	2174	# draw background
2111	$tex[1]->draw_quad (0, 0, $w, $h);	2175	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2112		2176
2113	# draw handle	2177	# draw handle
2114	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2178	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2115		2179
2116	glDisable GL_BLEND;
2117	glDisable GL_TEXTURE_2D;	2180	glDisable GL_TEXTURE_2D;
2118	}	2181	}
2119		2182
2120	#############################################################################	2183	#############################################################################
2121		2184
…		…
2132	fontsize => 1,	2195	fontsize => 1,
2133	can_events => 0,	2196	can_events => 0,
2134	#font => default_font	2197	#font => default_font
2135	@_,	2198	@_,
2136		2199
2137	layout => (new CFClient::Layout),	2200	layout => (new CFClient::Layout 1),
2138	par => [],	2201	par => [],
2139	height => 0,	2202	height => 0,
2140	children => [	2203	children => [
2141	(new CFClient::UI::Empty expand => 1),	2204	(new CFClient::UI::Empty expand => 1),
2142	(new CFClient::UI::Slider vertical => 1),	2205	(new CFClient::UI::Slider vertical => 1),
…		…
2153		2216
2154	$self->{fontsize} = $fontsize;	2217	$self->{fontsize} = $fontsize;
2155	$self->reflow;	2218	$self->reflow;
2156	}	2219	}
2157		2220
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 {	2221	sub size_allocate {
2178	my ($self, $w, $h) = @_;	2222	my ($self, $w, $h) = @_;
2179		2223
2180	$self->SUPER::size_allocate ($w, $h);	2224	$self->SUPER::size_allocate ($w, $h);
2181		2225
…		…
2184	$self->{layout}->set_width ($self->{children}[0]{w});	2228	$self->{layout}->set_width ($self->{children}[0]{w});
2185		2229
2186	$self->reflow;	2230	$self->reflow;
2187	}	2231	}
2188		2232
		2233	sub text_height {
		2234	my ($self, $text, $indent) = @_;
		2235
		2236	my $layout = $self->{layout};
		2237
		2238	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2239	$layout->set_width ($self->{children}[0]{w} - $indent);
		2240	$layout->set_markup ($text);
		2241
		2242	($layout->size)[1]
		2243	}
		2244
		2245	sub reflow {
		2246	my ($self) = @_;
		2247
		2248	$self->{need_reflow}++;
		2249	$self->update;
		2250	}
		2251
2189	sub add_paragraph {	2252	sub add_paragraph {
2190	my ($self, $color, $text) = @_;	2253	my ($self, $color, $text, $indent) = @_;
2191		2254
2192	#TODO: intelligently "reformat" paragraph	2255	#TODO: intelligently "reformat" paragraph
2193		2256
		2257	for my $line (split /\n/, $text) {
2194	my $height = $self->text_height ($text);	2258	my $height = $self->text_height ($line);
2195
2196	$self->{height} += $height;	2259	$self->{height} += $height;
2197
2198	push @{$self->{par}}, [$height, $color, $text];	2260	push @{$self->{par}}, [$height, $color, $indent, $line];
		2261	}
2199		2262
2200	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2263	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2201	$self->{children}[1]->update;	2264	$self->{children}[1]->update;
2202	}	2265	}
2203		2266
…		…
2208		2271
2209	return unless $self->{h} > 0;	2272	return unless $self->{h} > 0;
2210		2273
2211	delete $self->{texture};	2274	delete $self->{texture};
2212		2275
2213	$ROOT->on_refresh ($self, sub {	2276	$ROOT->on_post_alloc ($self, sub {
2214	if (delete $self->{need_reflow}) {	2277	if (delete $self->{need_reflow}) {
2215	my $height = 0;	2278	my $height = 0;
2216		2279
2217	$height += $_->[0] = $self->text_height ($_->[2])	2280	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2218	for @{$self->{par}};	2281	for @{$self->{par}};
2219		2282
2220	$self->{height} = $height;	2283	$self->{height} = $height;
2221		2284
2222	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2285	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		2286	$self->{children}[1]->update;
2223		2287
2224	delete $self->{texture};	2288	delete $self->{texture};
2225	}	2289	}
2226		2290
2227	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2291	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2228	glClearColor 0, 0, 0, 0;	2292	glClearColor 0.5, 0.5, 0.5, 0;
2229	glClear GL_COLOR_BUFFER_BIT;	2293	glClear GL_COLOR_BUFFER_BIT;
2230
2231	glEnable GL_BLEND;
2232	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2233	glEnable GL_TEXTURE_2D;
2234	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2235		2294
2236	my $top = int $self->{children}[1]{range}[0];	2295	my $top = int $self->{children}[1]{range}[0];
2237		2296
2238	my $y0 = $top;	2297	my $y0 = $top;
2239	my $y1 = $top + $self->{h};	2298	my $y1 = $top + $self->{h};
…		…
2242		2301
2243	my $layout = $self->{layout};	2302	my $layout = $self->{layout};
2244		2303
2245	$layout->set_font ($self->{font}) if $self->{font};	2304	$layout->set_font ($self->{font}) if $self->{font};
2246		2305
		2306	glEnable GL_BLEND;
		2307	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2308
2247	for my $par (@{$self->{par}}) {	2309	for my $par (@{$self->{par}}) {
2248	my $h = $par->[0];	2310	my $h = $par->[0];
2249		2311
2250	if ($y0 < $y + $h && $y < $y1) {	2312	if ($y0 < $y + $h && $y < $y1) {
		2313	$layout->set_foreground (@{ $par->[1] });
		2314	$layout->set_width ($self->{w} - $par->[2]);
2251	$layout->set_text ($par->[2]);	2315	$layout->set_markup ($par->[3]);
2252		2316
2253	glColor @{ $par->[1] };	2317	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2254	my ($W, $H) = $layout->size;	2318
2255	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2319	glRasterPos $par->[2], $y - $y0;
		2320	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2256	}	2321	}
2257		2322
2258	$y += $h;	2323	$y += $h;
2259	}	2324	}
2260		2325
2261	glDisable GL_TEXTURE_2D;
2262	glDisable GL_BLEND;	2326	glDisable GL_BLEND;
2263	};	2327	};
2264	});	2328	});
2265	}	2329	}
2266		2330
2267	sub _draw {	2331	sub _draw {
2268	my ($self) = @_;	2332	my ($self) = @_;
2269		2333
2270	glEnable GL_BLEND;
2271	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2272	glEnable GL_TEXTURE_2D;	2334	glEnable GL_TEXTURE_2D;
2273	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2335	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274	glColor 1, 1, 1, 1;	2336	glColor 1, 1, 1, 1;
2275	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2337	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2276	glDisable GL_TEXTURE_2D;	2338	glDisable GL_TEXTURE_2D;
2277	glDisable GL_BLEND;
2278		2339
2279	$self->{children}[1]->draw;	2340	$self->{children}[1]->draw;
2280		2341
2281	}	2342	}
2282		2343
…		…
2376	@_,	2437	@_,
2377	can_events => 0,	2438	can_events => 0,
2378	)	2439	)
2379	}	2440	}
2380		2441
2381	sub set_markup {	2442	sub set_tooltip_from {
2382	my ($self, $text) = @_;	2443	my ($self, $widget) = @_;
2383		2444
2384	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2445	$self->add (new CFClient::UI::Label
2385	$self->{label}->set_markup ($text);	2446	markup => $widget->{tooltip},
2386	$self->add ($self->{label});	2447	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2448	fontsize => 0.8,
		2449	fg => [0, 0, 0, 1],
		2450	ellipsise => 0,
		2451	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2452	);
2387	}	2453	}
2388		2454
2389	sub size_request {	2455	sub size_request {
2390	my ($self) = @_;	2456	my ($self) = @_;
2391
2392	$self->child->set_max_size ($::WIDTH * 0.3);
2393		2457
2394	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2458	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2395		2459
2396	($w + 4, $h + 4)	2460	($w + 4, $h + 4)
2397	}	2461	}
…		…
2403	}	2467	}
2404		2468
2405	sub _draw {	2469	sub _draw {
2406	my ($self) = @_;	2470	my ($self) = @_;
2407		2471
2408	glPushMatrix;
2409	glTranslate 0.375, 0.375;	2472	glTranslate 0.375, 0.375;
2410		2473
2411	my ($w, $h) = @$self{qw(w h)};	2474	my ($w, $h) = @$self{qw(w h)};
2412		2475
2413	glColor 1, 0.8, 0.4;	2476	glColor 1, 0.8, 0.4;
…		…
2424	glVertex 0 , $h;	2487	glVertex 0 , $h;
2425	glVertex $w, $h;	2488	glVertex $w, $h;
2426	glVertex $w, 0;	2489	glVertex $w, 0;
2427	glEnd;	2490	glEnd;
2428		2491
2429	glPopMatrix;	2492	glTranslate 2 - 0.375, 2 - 0.375;
2430
2431	glTranslate 2, 2;
2432	$self->SUPER::_draw;	2493	$self->SUPER::_draw;
2433	}	2494	}
2434		2495
2435	#############################################################################	2496	#############################################################################
2436		2497
…		…
2441	use CFClient::OpenGL;	2502	use CFClient::OpenGL;
2442		2503
2443	sub new {	2504	sub new {
2444	my $class = shift;	2505	my $class = shift;
2445		2506
2446	$class->SUPER::new (	2507	my $self = $class->SUPER::new (
2447	aspect => 1,	2508	aspect => 1,
2448	@_,	2509	@_,
2449	)	2510	);
		2511
		2512	if ($self->{anim} && $self->{animspeed}) {
		2513	Scalar::Util::weaken (my $widget = $self);
		2514
		2515	$self->{timer} = Event->timer (
		2516	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2517	hard => 1,
		2518	interval => $self->{animspeed},
		2519	cb => sub {
		2520	++$widget->{frame};
		2521	$widget->update;
		2522	},
		2523	);
		2524	}
		2525
		2526	$self
2450	}	2527	}
2451		2528
2452	sub size_request {	2529	sub size_request {
2453	(32, 8)	2530	(32, 8)
2454	}	2531	}
2455		2532
		2533	sub update {
		2534	my ($self) = @_;
		2535
		2536	return unless $self->{visible};
		2537
		2538	$self->SUPER::update;
		2539	}
		2540
2456	sub _draw {	2541	sub _draw {
2457	my ($self) = @_;	2542	my ($self) = @_;
2458		2543
2459	return unless $::CONN;#d# manage and cache textures differently	2544	return unless $::CONN;#d# manage and cache textures differently
		2545
		2546	my $face;
		2547
		2548	if ($self->{frame}) {
		2549	my $anim = $::CONN->{anim}[$self->{anim}];
		2550
		2551	$face = $anim->[ $self->{frame} % @$anim ]
		2552	if $anim && @$anim;
		2553	}
		2554
2460	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2555	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2461		2556
2462	# TODO animation
2463	if ($tex) {	2557	if ($tex) {
2464	glEnable GL_BLEND;
2465	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2466	glEnable GL_TEXTURE_2D;	2558	glEnable GL_TEXTURE_2D;
2467	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2559	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2468	glColor 1, 1, 1, 1;	2560	glColor 1, 1, 1, 1;
2469	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2561	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470	glDisable GL_TEXTURE_2D;	2562	glDisable GL_TEXTURE_2D;
2471	glDisable GL_BLEND;
2472	}	2563	}
		2564	}
		2565
		2566	sub DESTROY {
		2567	my ($self) = @_;
		2568
		2569	$self->{timer}->cancel
		2570	if $self->{timer};
		2571
		2572	$self->SUPER::DESTROY;
2473	}	2573	}
2474		2574
2475	#############################################################################	2575	#############################################################################
2476		2576
2477	package CFClient::UI::InventoryItem;	2577	package CFClient::UI::InventoryItem;
2478		2578
2479	our @ISA = CFClient::UI::HBox::;	2579	our @ISA = CFClient::UI::HBox::;
		2580
		2581	sub _item_to_desc {
		2582	my ($item) = @_;
		2583
		2584	my $desc =
		2585	$item->{nrof} < 2
		2586	? $item->{name}
		2587	: "$item->{nrof} × $item->{name_pl}";
		2588
		2589	$item->{flags} & Crossfire::Protocol::F_OPEN
		2590	and $desc .= " (open)";
		2591	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2592	and $desc .= " (applied)";
		2593	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2594	and $desc .= " (unpaid)";
		2595	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2596	and $desc .= " (magic)";
		2597	$item->{flags} & Crossfire::Protocol::F_CURSED
		2598	and $desc .= " (cursed)";
		2599	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2600	and $desc .= " (damned)";
		2601	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2602	and $desc .= " *";
		2603
		2604	$desc
		2605	}
2480		2606
2481	sub new {	2607	sub new {
2482	my $class = shift;	2608	my $class = shift;
2483		2609
2484	my %args = @_;	2610	my %args = @_;
2485		2611
2486	my $item = delete $args{item};	2612	my $item = delete $args{item};
2487		2613
2488	my $desc = $item->{nrof} < 2	2614	my $desc = _item_to_desc ($item);
2489	? $item->{name}
2490	: "$item->{nrof} $item->{name_pl}";
2491
2492		2615
2493	my $self = $class->SUPER::new (	2616	my $self = $class->SUPER::new (
2494	can_hover => 1,	2617	can_hover => 1,
2495	can_events => 1,	2618	can_events => 1,
2496	tooltip => (CFClient::UI::Label->escape ($desc)	2619	tooltip => ((CFClient::UI::Label::escape $desc)
2497	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2620	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498	connect_button_down => sub {	2621	connect_button_down => sub {
2499	my ($self, $ev, $x, $y) = @_;	2622	my ($self, $ev, $x, $y) = @_;
2500		2623
2501	# todo: maybe put examine on 1? but should just be a tooltip :(	2624	# todo: maybe put examine on 1? but should just be a tooltip :(
2502	if ($ev->{button} == 1) {	2625	if ($ev->{button} == 1) {
		2626	my $targ = $::CONN->{player}{tag};
		2627
		2628	if ($item->{container} == $::CONN->{player}{tag}) {
		2629	$targ = $main::OPENCONT;
		2630	}
		2631
2503	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2632	$::CONN->send ("move $targ $item->{tag} 0");
2504	} elsif ($ev->{button} == 2) {	2633	} elsif ($ev->{button} == 2) {
2505	$::CONN->send ("apply $item->{tag}");	2634	$::CONN->send ("apply $item->{tag}");
2506	} elsif ($ev->{button} == 3) {	2635	} elsif ($ev->{button} == 3) {
2507	CFClient::UI::Menu->new (	2636	my @menu_items = (
2508	items => [
2509	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2637	["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}") }],	2638	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2515	["apply", sub { $::CONN->send ("apply $item->{tag}") }],	2639	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2640	(
		2641	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2642	? (
		2643	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2644	)
		2645	: (
		2646	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2516	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2647	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2648	)
2517	],	2649	),
2518	)->popup ($ev);	2650	);
		2651
		2652	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2519	}	2653	}
2520		2654
2521	1	2655	1
2522	},	2656	},
2523	%args	2657	%args
2524	);	2658	);
		2659
2525		2660
2526	$self->add (new CFClient::UI::Face	2661	$self->add (new CFClient::UI::Face
2527	can_events => 0,	2662	can_events => 0,
2528	face => $item->{face},	2663	face => $item->{face},
2529	anim => $item->{anim},	2664	anim => $item->{anim},
2530	animspeed => $item->{animspeed},	2665	animspeed => $item->{animspeed},
2531	);	2666	);
2532		2667
2533	$self->add (new CFClient::UI::Label	2668	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2534	can_events => 0,	2669
2535	text => $desc,	2670	$self->{item} = $item;
2536	);	2671
		2672	$self->update_item;
2537		2673
2538	$self	2674	$self
		2675	}
		2676
		2677	sub update_item {
		2678	my ($self) = @_;
		2679
		2680	my $desc = _item_to_desc ($self->{item});
		2681
		2682	$self->{name_lbl}->set_text ($desc);
2539	}	2683	}
2540		2684
2541	#############################################################################	2685	#############################################################################
2542		2686
2543	package CFClient::UI::Inventory;	2687	package CFClient::UI::Inventory;
…		…
2559	my ($self, $items) = @_;	2703	my ($self, $items) = @_;
2560		2704
2561	$self->{scrolled}->clear;	2705	$self->{scrolled}->clear;
2562	return unless $items;	2706	return unless $items;
2563		2707
2564	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2708	my @items = sort {
		2709	($a->{type} <=> $b->{type})
		2710	or ($a->{name} cmp $b->{name})
		2711	} @$items;
2565		2712
2566	$self->{real_items} = \@items;	2713	$self->{real_items} = \@items;
2567		2714
2568	for my $item (@items) {	2715	for my $item (@items) {
2569	my $desc = $item->{nrof} < 2
2570	? $item->{name}
2571	: "$item->{nrof} $item->{name_pl}";
2572
2573	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2716	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2717	$item->update_item ();
2574	}	2718	}
		2719
		2720	$self->{scrolled}->add (@items);
2575		2721
2576	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2722	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2577	}	2723	}
2578		2724
2579	sub size_request {	2725	sub size_request {
…		…
2653	}	2799	}
2654	}	2800	}
2655		2801
2656	#############################################################################	2802	#############################################################################
2657		2803
		2804	package CFClient::UI::Statusbox;
		2805
		2806	our @ISA = CFClient::UI::VBox::;
		2807
		2808	sub new {
		2809	my $class = shift;
		2810
		2811	$class->SUPER::new (
		2812	fontsize => 0.8,
		2813	@_,
		2814	)
		2815	}
		2816
		2817	sub reorder {
		2818	my ($self) = @_;
		2819	my $NOW = time;
		2820
		2821	while (my ($k, $v) = each %{ $self->{item} }) {
		2822	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2823	}
		2824
		2825	my @widgets;
		2826
		2827	my @items = sort {
		2828	$a->{pri} <=> $b->{pri}
		2829	or $b->{id} <=> $a->{id}
		2830	} values %{ $self->{item} };
		2831
		2832	my $count = 10 + 1;
		2833	for my $item (@items) {
		2834	last unless --$count;
		2835
		2836	push @widgets, $item->{label} ||= do {
		2837	# TODO: doesn't handle markup well (read as: at all)
		2838	my $short = $item->{count} > 1
		2839	? "<b>$item->{count} ×</b> $item->{text}"
		2840	: $item->{text};
		2841
		2842	for ($short) {
		2843	s/^\s+//;
		2844	s/\s+/ /g;
		2845	}
		2846
		2847	new CFClient::UI::Label
		2848	markup => $short,
		2849	tooltip => $item->{tooltip},
		2850	tooltip_font => $::FONT_PROP,
		2851	tooltip_width => 0.67,
		2852	fontsize => $item->{fontsize} || $self->{fontsize},
		2853	max_w => $::WIDTH * 0.44,
		2854	fg => $item->{fg},
		2855	can_events => 1,
		2856	can_hover => 1
		2857	};
		2858	}
		2859
		2860	$self->clear;
		2861	$self->SUPER::add (reverse @widgets);
		2862	}
		2863
		2864	sub add {
		2865	my ($self, $text, %arg) = @_;
		2866
		2867	$text =~ s/^\s+//;
		2868	$text =~ s/\s+$//;
		2869
		2870	my $timeout = time + ((delete $arg{timeout}) || 60);
		2871
		2872	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2873
		2874	if (my $item = $self->{item}{$group}) {
		2875	if ($item->{text} eq $text) {
		2876	$item->{count}++;
		2877	} else {
		2878	$item->{count} = 1;
		2879	$item->{text} = $item->{tooltip} = $text;
		2880	}
		2881	$item->{id} = ++$self->{id};
		2882	$item->{timeout} = $timeout;
		2883	delete $item->{label};
		2884	} else {
		2885	$self->{item}{$group} = {
		2886	id => ++$self->{id},
		2887	text => $text,
		2888	timeout => $timeout,
		2889	tooltip => $text,
		2890	fg => [0.8, 0.8, 0.8, 0.8],
		2891	pri => 0,
		2892	count => 1,
		2893	%arg,
		2894	};
		2895	}
		2896
		2897	$self->reorder;
		2898	}
		2899
		2900	sub reconfigure {
		2901	my ($self) = @_;
		2902
		2903	delete $_->{label}
		2904	for values %{ $self->{item} || {} };
		2905
		2906	$self->reorder;
		2907	$self->SUPER::reconfigure;
		2908	}
		2909
		2910	#############################################################################
		2911
2658	package CFClient::UI::Root;	2912	package CFClient::UI::Root;
2659		2913
2660	our @ISA = CFClient::UI::Container::;	2914	our @ISA = CFClient::UI::Container::;
2661		2915
2662	use CFClient::OpenGL;	2916	use CFClient::OpenGL;
…		…
2690	}	2944	}
2691		2945
2692	sub size_allocate {	2946	sub size_allocate {
2693	my ($self, $w, $h) = @_;	2947	my ($self, $w, $h) = @_;
2694		2948
2695	my $old_w = $self->{old_w};	2949	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2696	my $old_h = $self->{old_h};	2950	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2697		2951
2698	if ($old_w && $old_h) {	2952	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2699	for my $child ($self->children) {	2953	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2700	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2701	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2702	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2703	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2704	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2705	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2706	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2707	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2708	}
2709	}
2710		2954
2711	for my $child ($self->children) {	2955	for my $child ($self->children) {
2712	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2956	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2713		2957
		2958	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2959	if exists $child->{req_x};
		2960
		2961	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2962	if exists $child->{req_y};
		2963
2714	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2964	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2715	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2965	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2966
2716	$child->configure ($X, $Y, $W, $H);	2967	$child->configure ($X, $Y, $W, $H);
2717	}	2968	}
2718
2719	$self->{old_w} = $w;
2720	$self->{old_h} = $h;
2721	}	2969	}
2722		2970
2723	sub coord2local {	2971	sub coord2local {
2724	my ($self, $x, $y) = @_;	2972	my ($self, $x, $y) = @_;
2725		2973
…		…
2738	$self->check_size;	2986	$self->check_size;
2739	$::WANT_REFRESH++;	2987	$::WANT_REFRESH++;
2740	}	2988	}
2741		2989
2742	sub add {	2990	sub add {
2743	my ($self, $child) = @_;	2991	my ($self, @children) = @_;
2744		2992
		2993	for my $child (@children) {
		2994	$child->{toplevel} = 1;
		2995
2745	# integerise window positions	2996	# integerise window positions
2746	$child->{x} = int $child->{x};	2997	$child->{x} = int $child->{x};
2747	$child->{y} = int $child->{y};	2998	$child->{y} = int $child->{y};
		2999	}
2748		3000
2749	$self->SUPER::add ($child);	3001	$self->SUPER::add (@children);
		3002
		3003	while (@children) {
		3004	my $w = pop @children;
		3005	push @children, $w->children;
		3006	$w->{visible} = 1;
		3007	}
		3008	}
		3009
		3010	sub remove {
		3011	my ($self, @children) = @_;
		3012
		3013	$self->SUPER::remove (@children);
		3014
		3015	while (@children) {
		3016	my $w = pop @children;
		3017	push @children, $w->children;
		3018	delete $w->{visible};
		3019	}
2750	}	3020	}
2751		3021
2752	sub on_refresh {	3022	sub on_refresh {
2753	my ($self, $id, $cb) = @_;	3023	my ($self, $id, $cb) = @_;
2754		3024
2755	$self->{refresh_hook}{$id} = $cb;	3025	$self->{refresh_hook}{$id} = $cb;
2756	}	3026	}
2757		3027
		3028	sub on_post_alloc {
		3029	my ($self, $id, $cb) = @_;
		3030
		3031	$self->{post_alloc_hook}{$id} = $cb;
		3032	}
		3033
2758	sub draw {	3034	sub draw {
2759	my ($self) = @_;	3035	my ($self) = @_;
		3036
		3037	while ($self->{refresh_hook}) {
		3038	$_->()
		3039	for values %{delete $self->{refresh_hook}};
		3040	}
2760		3041
2761	if ($self->{check_size}) {	3042	if ($self->{check_size}) {
2762	my @queue = ([], []);	3043	my @queue = ([], []);
2763		3044
2764	for (;;) {	3045	for (;;) {
…		…
2772		3053
2773	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3054	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2774	? @$widget{qw(user_w user_h)}	3055	? @$widget{qw(user_w user_h)}
2775	: $widget->size_request;	3056	: $widget->size_request;
2776		3057
		3058	if (delete $widget->{force_alloc}
2777	if ($w != $widget->{req_w} || $h != $widget->{req_h}) {	3059	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3060	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3061
2778	$widget->{req_w} = $w;	3062	$widget->{req_w} = $w;
2779	$widget->{req_h} = $h;	3063	$widget->{req_h} = $h;
2780		3064
2781	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];	3065	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2782		3066
2783	$widget->{parent}->check_size	3067	$widget->{parent}->check_size
2784	if $widget->{parent};	3068	if $widget->{parent};
2785	}	3069	}
2786	}	3070	}
2787	}	3071	}
2788		3072
2789	while ($self->{size_alloc}) {	3073	while ($self->{size_alloc}) {
2790	for (values %{delete $self->{size_alloc}}) {	3074	for (values %{delete $self->{size_alloc}}) {
2791	my ($widget, $w, $h) = @$_;	3075	my ($widget, $w, $h) = @$_;
		3076
		3077	$w = 0 if $w < 0;
		3078	$h = 0 if $h < 0;
2792		3079
2793	$widget->{w} = $w;	3080	$widget->{w} = $w;
2794	$widget->{h} = $h;	3081	$widget->{h} = $h;
2795	$widget->size_allocate ($w, $h);	3082	$widget->size_allocate ($w, $h);
2796	$widget->emit (size_allocate => $w, $h);	3083	$widget->emit (size_allocate => $w, $h);
2797	}	3084	}
2798	}	3085	}
2799		3086
2800	while ($self->{refresh_hook}) {	3087	while ($self->{post_alloc_hook}) {
2801	$_->()	3088	$_->()
2802	for values %{delete $self->{refresh_hook}};	3089	for values %{delete $self->{post_alloc_hook}};
2803	}	3090	}
2804		3091
2805	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3092	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2806	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3093	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2807	glClear GL_COLOR_BUFFER_BIT;	3094	glClear GL_COLOR_BUFFER_BIT;
2808		3095
2809	glMatrixMode GL_PROJECTION;	3096	glMatrixMode GL_PROJECTION;
2810	glLoadIdentity;	3097	glLoadIdentity;
2811	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3098	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2812	glMatrixMode GL_MODELVIEW;	3099	glMatrixMode GL_MODELVIEW;
2813	glLoadIdentity;	3100	glLoadIdentity;
2814		3101
2815	$self->_draw;	3102	$self->_draw;
2816	}	3103	}
…		…
2818	#############################################################################	3105	#############################################################################
2819		3106
2820	package CFClient::UI;	3107	package CFClient::UI;
2821		3108
2822	$ROOT = new CFClient::UI::Root;	3109	$ROOT = new CFClient::UI::Root;
2823	$TOOLTIP = new CFClient::UI::Tooltip;	3110	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2824		3111
2825	1	3112	1
2826		3113

Diff Legend

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