ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

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

Diff Legend

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