ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.191 by root, Tue May 9 22:27:53 2006 UTC vs.
Revision 1.223 by elmex, Tue May 23 18:10: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);
		214	}
		215
		216	sub show_centered {
		217	my ($self) = @_;
		218	return if $self->{parent};
		219
		220	$self->show;
		221
		222	$CFClient::UI::ROOT->on_post_alloc (
		223	"centered $self" => sub {
		224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		225	},
		226	);
179	}	227	}
180		228
181	sub hide {	229	sub hide {
182	my ($self) = @_;	230	my ($self) = @_;
183		231
…		…
240		288
241	sub size_allocate {	289	sub size_allocate {
242	# nothing to be done	290	# nothing to be done
243	}	291	}
244		292
		293	sub reconfigure {
		294	my ($self) = @_;
		295
		296	$self->check_size (1);
		297	$self->update;
		298	}
		299
245	sub children {	300	sub children {
246	}
247
248	# call when resolution changes etc.
249	sub reconfigure {
250	my ($self) = @_;
251
252	$_->reconfigure
253	for $self->children;
254
255	$self->check_size;
256	$self->size_allocate ($self->{w}, $self->{h});
257	$self->update;
258	}	301	}
259		302
260	sub set_max_size {	303	sub set_max_size {
261	my ($self, $w, $h) = @_;	304	my ($self, $w, $h) = @_;
262		305
263	delete $self->{max_w}; $self->{max_w} = $w if $w;	306	delete $self->{max_w}; $self->{max_w} = $w if $w;
264	delete $self->{max_h}; $self->{max_h} = $h if $h;	307	delete $self->{max_h}; $self->{max_h} = $h if $h;
		308	}
		309
		310	sub set_tooltip {
		311	my ($self, $tooltip) = @_;
		312
		313	$self->{tooltip} = $tooltip;
		314
		315	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		316	delete $CFClient::UI::TOOLTIP->{owner};
		317	CFClient::UI::check_tooltip;
		318	}
265	}	319	}
266		320
267	# translate global coordinates to local coordinate system	321	# translate global coordinates to local coordinate system
268	sub coord2local {	322	sub coord2local {
269	my ($self, $x, $y) = @_;	323	my ($self, $x, $y) = @_;
…		…
355	glVertex $self->{w}, 0;	409	glVertex $self->{w}, 0;
356	glVertex $self->{w}, $self->{h};	410	glVertex $self->{w}, $self->{h};
357	glVertex 0 , $self->{h};	411	glVertex 0 , $self->{h};
358	glEnd;	412	glEnd;
359	glPopMatrix;	413	glPopMatrix;
360	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	414	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361	}	415	}
362	}	416	}
363		417
364	sub _draw {	418	sub _draw {
365	my ($self) = @_;	419	my ($self) = @_;
…		…
380	}	434	}
381		435
382	sub set_parent {	436	sub set_parent {
383	my ($self, $parent) = @_;	437	my ($self, $parent) = @_;
384		438
385	$self->{_tree_depth} = $parent->{_tree_depth} + 1;
386	Scalar::Util::weaken ($self->{parent} = $parent);	439	Scalar::Util::weaken ($self->{parent} = $parent);
		440
		441	# TODO: req_w _does_change after ->reconfigure
		442	$self->check_size
		443	unless exists $self->{req_w};
		444
		445	$self->show;
387	}	446	}
388		447
389	sub check_size {	448	sub check_size {
390	my ($self) = @_;	449	my ($self, $forced) = @_;
391		450
		451	$self->{force_alloc} = 1 if $forced;
392	$CFClient::UI::ROOT->{check_size}{$self} = $self;	452	$CFClient::UI::ROOT->{check_size}{$self} = $self;
393	}	453	}
394		454
395	sub update {	455	sub update {
396	my ($self) = @_;	456	my ($self) = @_;
…		…
412	}	472	}
413		473
414	sub DESTROY {	474	sub DESTROY {
415	my ($self) = @_;	475	my ($self) = @_;
416		476
		477	delete $WIDGET{$self+0};
417	#$self->deactivate;	478	#$self->deactivate;
418	}	479	}
419		480
420	#############################################################################	481	#############################################################################
421		482
…		…
430	my $class = shift;	491	my $class = shift;
431		492
432	# range [value, low, high, page]	493	# range [value, low, high, page]
433		494
434	$class->SUPER::new (	495	$class->SUPER::new (
435	bg => [0, 0, 0, 0.2],	496	#bg => [0, 0, 0, 0.2],
436	active_bg => [1, 1, 1, 0.5],	497	#active_bg => [1, 1, 1, 0.5],
437	@_	498	@_
438	)	499	)
439	}	500	}
440		501
441	sub _draw {	502	sub _draw {
442	my ($self) = @_;	503	my ($self) = @_;
443		504
		505	my $color = $FOCUS == $self && $self->{active_bg}
		506	? $self->{active_bg}
		507	: $self->{bg};
		508
		509	if ($color && (@$color < 4 || $color->[3])) {
444	my ($w, $h) = @$self{qw(w h)};	510	my ($w, $h) = @$self{qw(w h)};
445		511
446	glEnable GL_BLEND;	512	glEnable GL_BLEND;
447	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	513	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
448	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	514	glColor @$color;
449		515
450	glBegin GL_QUADS;	516	glBegin GL_QUADS;
451	glVertex 0 , 0;	517	glVertex 0 , 0;
452	glVertex 0 , $h;	518	glVertex 0 , $h;
453	glVertex $w, $h;	519	glVertex $w, $h;
454	glVertex $w, 0;	520	glVertex $w, 0;
455	glEnd;	521	glEnd;
456		522
457	glDisable GL_BLEND;	523	glDisable GL_BLEND;
		524	}
458	}	525	}
459		526
460	#############################################################################	527	#############################################################################
461		528
462	package CFClient::UI::Empty;	529	package CFClient::UI::Empty;
…		…
506	$self->{children} = [	573	$self->{children} = [
507	sort { $a->{z} <=> $b->{z} }	574	sort { $a->{z} <=> $b->{z} }
508	@{$self->{children}}, @widgets	575	@{$self->{children}}, @widgets
509	];	576	];
510		577
511	$_->check_size	578	$self->check_size (1);
512	for @widgets;
513
514	$self->update;	579	$self->update;
515	}	580	}
516		581
517	sub children {	582	sub children {
518	@{ $_[0]{children} }	583	@{ $_[0]{children} }
…		…
625	}	690	}
626		691
627	sub update {	692	sub update {
628	my ($self) = @_;	693	my ($self) = @_;
629		694
630	$ROOT->on_refresh ($self => sub { $self->render_child });	695	$ROOT->on_post_alloc ($self => sub { $self->render_child });
631	$self->SUPER::update;	696	$self->SUPER::update;
632	}	697	}
633		698
634	sub size_allocate {	699	sub size_allocate {
635	my ($self, $w, $h) = @_;	700	my ($self, $w, $h) = @_;
…		…
648	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	713	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649	glClearColor 0, 0, 0, 0;	714	glClearColor 0, 0, 0, 0;
650	glClear GL_COLOR_BUFFER_BIT;	715	glClear GL_COLOR_BUFFER_BIT;
651		716
652	$self->_render;	717	$self->_render;
653	# glColorMask 1, 1, 1, 0;
654	# glEnable GL_BLEND;
655	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656	# glRasterPos 0, 0;
657	# glCopyPixels 0, 0, $self->{w}, $self->{h};
658	# glDisable GL_BLEND;
659	# glColorMask 1, 1, 1, 1;
660	};	718	};
661	}	719	}
662		720
663	sub _draw {	721	sub _draw {
664	my ($self) = @_;	722	my ($self) = @_;
…		…
666	my ($w, $h) = ($self->w, $self->h);	724	my ($w, $h) = ($self->w, $self->h);
667		725
668	my $tex = $self->{texture}	726	my $tex = $self->{texture}
669	or return;	727	or return;
670		728
671	glEnable GL_BLEND;
672	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673	glEnable GL_TEXTURE_2D;	729	glEnable GL_TEXTURE_2D;
674	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	730	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675	glColor 0, 0, 0, 1;	731	glColor 1, 1, 1, 1;
676		732
677	$tex->draw_quad (0, 0, $w, $h);	733	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678		734
679	glDisable GL_BLEND;
680	glDisable GL_TEXTURE_2D;	735	glDisable GL_TEXTURE_2D;
681	}	736	}
682		737
683	#############################################################################	738	#############################################################################
684		739
…		…
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	819	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765	},	820	},
766	;	821	;
767		822
768	$self = $class->SUPER::new (	823	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	824	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	825	slider => $slider,
771	@_,	826	@_,
772	);	827	);
773		828
774	$self->{vp}->add ($self->{scrolled});	829	$self->{vp}->add ($self->{scrolled});
…		…
776	$self->add ($self->{slider});	831	$self->add ($self->{slider});
777		832
778	$self	833	$self
779	}	834	}
780		835
781	#TODO# update range on size_allocate depeneing on child	836	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	837	# update viewport offset on scroll
783		838
784	#############################################################################	839	#############################################################################
785		840
786	package CFClient::UI::Frame;	841	package CFClient::UI::Frame;
…		…
790	use CFClient::OpenGL;	845	use CFClient::OpenGL;
791		846
792	sub new {	847	sub new {
793	my $class = shift;	848	my $class = shift;
794		849
795	my $self = $class->SUPER::new (	850	$class->SUPER::new (
796	bg => [1, 1, 1, 1],	851	bg => undef,
797	border_bg => [1, 1, 1, 1],
798	border => 0.8,
799	@_	852	@_,
800	);	853	)
801
802	$self
803	}	854	}
804		855
805	sub _draw {	856	sub _draw {
806	my ($self) = @_;	857	my ($self) = @_;
807		858
808	my ($w, $h) = ($self->{w}, $self->{h});	859	if ($self->{bg}) {
		860	my ($w, $h) = @$self{qw(w h)};
809		861
810	glEnable GL_BLEND;	862	glEnable GL_BLEND;
811	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	863	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812	glEnable GL_TEXTURE_2D;	864	glColor @{ $self->{bg} };
813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814		865
815	# glBegin GL_QUADS;	866	glBegin GL_QUADS;
816	# glColor 0, 0, 0, 0;
817	# glVertex 0 , 0;	867	glVertex 0 , 0;
818	# glVertex 0 , $h;	868	glVertex 0 , $h;
819	# glVertex $w, $h;	869	glVertex $w, $h;
820	# glVertex $w, 0;	870	glVertex $w, 0;
821	# glEnd;	871	glEnd;
822		872
823
824	$self->child->draw;
825	glDisable GL_BLEND;	873	glDisable GL_BLEND;
826	glDisable GL_TEXTURE_2D;	874	}
		875
		876	$self->SUPER::_draw;
827	}	877	}
828		878
829	#############################################################################	879	#############################################################################
830		880
831	package CFClient::UI::FancyFrame;	881	package CFClient::UI::FancyFrame;
…		…
845		895
846	my $self = $class->SUPER::new (	896	my $self = $class->SUPER::new (
847	bg => [1, 1, 1, 1],	897	bg => [1, 1, 1, 1],
848	border_bg => [1, 1, 1, 1],	898	border_bg => [1, 1, 1, 1],
849	border => 0.6,	899	border => 0.6,
		900	toplevel => 1,
850	can_events => 1,	901	can_events => 1,
851	@_	902	@_
852	);	903	);
853		904
854	$self->{title} &&= new CFClient::UI::Label	905	$self->{title} &&= new CFClient::UI::Label
…		…
879	my ($self, $w, $h) = @_;	930	my ($self, $w, $h) = @_;
880		931
881	$h -= List::Util::max 0, $self->border * 2;	932	$h -= List::Util::max 0, $self->border * 2;
882	$w -= List::Util::max 0, $self->border * 2;	933	$w -= List::Util::max 0, $self->border * 2;
883		934
884	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	935	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
885	if $self->{title};	936	if $self->{title};
886		937
887	$self->child->configure ($self->border, $self->border, $w, $h);	938	$self->child->configure ($self->border, $self->border, $w, $h);
888	}	939	}
889		940
…		…
947	my ($self) = @_;	998	my ($self) = @_;
948		999
949	my ($w, $h ) = ($self->{w}, $self->{h});	1000	my ($w, $h ) = ($self->{w}, $self->{h});
950	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1001	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951		1002
952	glEnable GL_BLEND;
953	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954	glEnable GL_TEXTURE_2D;	1003	glEnable GL_TEXTURE_2D;
955	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1004	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956		1005
957	my $border = $self->border;	1006	my $border = $self->border;
958		1007
959	glColor @{ $self->{border_bg} };	1008	glColor @{ $self->{border_bg} };
960	$tex[1]->draw_quad (0, 0, $w, $border);	1009	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
961	$tex[3]->draw_quad (0, $border, $border, $ch);	1010	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1011	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1012	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964		1013
965	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1014	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966	my $bg = $tex[0];	1015	my $bg = $tex[0];
967		1016
968	# TODO: repeat texture not scale	1017	# TODO: repeat texture not scale
…		…
972	glColor @{ $self->{bg} };	1021	glColor @{ $self->{bg} };
973		1022
974	$bg->{s} = $rep_x;	1023	$bg->{s} = $rep_x;
975	$bg->{t} = $rep_y;	1024	$bg->{t} = $rep_y;
976	$bg->{wrap_mode} = 1;	1025	$bg->{wrap_mode} = 1;
977	$bg->draw_quad ($border, $border, $cw, $ch);	1026	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1027	}
978		1028
979	glDisable GL_TEXTURE_2D;	1029	glDisable GL_TEXTURE_2D;
980	glDisable GL_BLEND;
981	}
982		1030
983	$self->{title}->draw if $self->{title};	1031	$self->{title}->draw if $self->{title};
984		1032
985	$self->child->draw;	1033	$self->child->draw;
986	}	1034	}
…		…
1213	}	1261	}
1214		1262
1215	sub size_allocate {	1263	sub size_allocate {
1216	my ($self, $w, $h) = @_;	1264	my ($self, $w, $h) = @_;
1217		1265
		1266	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1267
1218	my $children = $self->{children};	1268	my $children = $self->{children};
1219		1269
1220	my @h = map $_->{req_h}, @$children;	1270	my @h = map $_->{req_h}, @$children;
1221		1271
1222	my $req_h = List::Util::sum @h;	1272	my $req_h = List::Util::sum @h;
…		…
1251		1301
1252	#############################################################################	1302	#############################################################################
1253		1303
1254	package CFClient::UI::Label;	1304	package CFClient::UI::Label;
1255		1305
1256	our @ISA = CFClient::UI::Base::;	1306	our @ISA = CFClient::UI::DrawBG::;
1257		1307
1258	use CFClient::OpenGL;	1308	use CFClient::OpenGL;
1259		1309
1260	sub new {	1310	sub new {
1261	my ($class, %arg) = @_;	1311	my ($class, %arg) = @_;
1262		1312
1263	my $self = $class->SUPER::new (	1313	my $self = $class->SUPER::new (
1264	fg => [1, 1, 1],	1314	fg => [1, 1, 1],
		1315	#bg => none
		1316	#active_bg => none
1265	#font => default_font	1317	#font => default_font
		1318	#text => initial text
		1319	#markup => initial narkup
		1320	#max_w => maximum pixel width
		1321	ellipsise => 3, # end
		1322	layout => (new CFClient::Layout),
1266	fontsize => 1,	1323	fontsize => 1,
1267	text => "",
1268	align => -1,	1324	align => -1,
1269	valign => -1,	1325	valign => -1,
1270	padding => 2,	1326	padding => 2,
1271	layout => new CFClient::Layout,
1272	can_events => 0,	1327	can_events => 0,
1273	%arg	1328	%arg
1274	);	1329	);
1275		1330
1276	if (exists $self->{template}) {	1331	if (exists $self->{template}) {
1277	my $layout = new CFClient::Layout;	1332	my $layout = new CFClient::Layout;
1278	$layout->set_text (delete $self->{template});	1333	$layout->set_text (delete $self->{template});
1279	$self->{template} = $layout;	1334	$self->{template} = $layout;
1280	}	1335	}
1281		1336
1282	$self->set_text (delete $self->{text}) if exists $self->{text};	1337	if (exists $self->{markup}) {
1283	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1338	$self->set_markup (delete $self->{markup});
		1339	} else {
		1340	$self->set_text (delete $self->{text});
		1341	}
1284		1342
1285	$self	1343	$self
1286	}	1344	}
1287		1345
1288	sub escape {	1346	sub escape($) {
1289	local $_ = $_[1];	1347	local $_ = $_[0];
1290		1348
1291	s/&/&amp;/g;	1349	s/&/&amp;/g;
1292	s/>/&gt;/g;	1350	s/>/&gt;/g;
1293	s/</&lt;/g;	1351	s/</&lt;/g;
1294		1352
1295	$_[1]	1353	$_
1296	}	1354	}
1297		1355
1298	sub update {	1356	sub update {
1299	my ($self) = @_;	1357	my ($self) = @_;
1300		1358
…		…
1306	my ($self, $text) = @_;	1364	my ($self, $text) = @_;
1307		1365
1308	return if $self->{text} eq "T$text";	1366	return if $self->{text} eq "T$text";
1309	$self->{text} = "T$text";	1367	$self->{text} = "T$text";
1310		1368
		1369	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1311	$self->{layout}->set_text ($text);	1370	$self->{layout}->set_text ($text);
1312		1371
1313	$self->update;	1372	$self->update;
1314	$self->check_size;	1373	$self->check_size;
1315	}	1374	}
…		…
1318	my ($self, $markup) = @_;	1377	my ($self, $markup) = @_;
1319		1378
1320	return if $self->{text} eq "M$markup";	1379	return if $self->{text} eq "M$markup";
1321	$self->{text} = "M$markup";	1380	$self->{text} = "M$markup";
1322		1381
		1382	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1383
		1384	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1323	$self->{layout}->set_markup ($markup);	1385	$self->{layout}->set_markup ($markup);
1324		1386
1325	$self->update;	1387	$self->update;
1326	$self->check_size;	1388	$self->check_size;
1327	}	1389	}
…		…
1329	sub size_request {	1391	sub size_request {
1330	my ($self) = @_;	1392	my ($self) = @_;
1331		1393
1332	$self->{layout}->set_font ($self->{font}) if $self->{font};	1394	$self->{layout}->set_font ($self->{font}) if $self->{font};
1333	$self->{layout}->set_width ($self->{max_w} || -1);	1395	$self->{layout}->set_width ($self->{max_w} || -1);
		1396	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1397	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1334	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1398	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1335		1399
1336	my ($w, $h) = $self->{layout}->size;	1400	my ($w, $h) = $self->{layout}->size;
1337		1401
1338	if (exists $self->{template}) {	1402	if (exists $self->{template}) {
…		…
1368	}	1432	}
1369		1433
1370	sub _draw {	1434	sub _draw {
1371	my ($self) = @_;	1435	my ($self) = @_;
1372		1436
		1437	$self->SUPER::_draw; # draw background, if applicable
		1438
1373	my $tex = $self->{texture} ||= do {	1439	my $tex = $self->{texture} ||= do {
		1440	$self->{layout}->set_foreground (@{$self->{fg}});
1374	$self->{layout}->set_font ($self->{font}) if $self->{font};	1441	$self->{layout}->set_font ($self->{font}) if $self->{font};
1375	$self->{layout}->set_width ($self->{w});	1442	$self->{layout}->set_width ($self->{w});
		1443	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1444	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1445	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1446
1377	new_from_layout CFClient::Texture $self->{layout}	1447	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1448
		1449	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1450	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1451	: ($self->{w} - $tex->{w}) * 0.5);
		1452
		1453	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1454	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1455	: ($self->{h} - $tex->{h}) * 0.5);
		1456
		1457	$tex
1378	};	1458	};
1379		1459
1380	glEnable GL_BLEND;
1381	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1382	glEnable GL_TEXTURE_2D;	1460	glEnable GL_TEXTURE_2D;
1383	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1461	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1384		1462
		1463	if ($tex->{format} == GL_ALPHA) {
1385	glColor @{$self->{fg}};	1464	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});	1465	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1466	} else {
		1467	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1468	}
1400		1469
1401	glDisable GL_TEXTURE_2D;	1470	glDisable GL_TEXTURE_2D;
1402	glDisable GL_BLEND;
1403	}	1471	}
1404		1472
1405	#############################################################################	1473	#############################################################################
1406		1474
1407	package CFClient::UI::EntryBase;	1475	package CFClient::UI::EntryBase;
…		…
1442	$self->{layout}->set_text ("$text ");	1510	$self->{layout}->set_text ("$text ");
1443		1511
1444	$self->emit (changed => $self->{text});	1512	$self->emit (changed => $self->{text});
1445	}	1513	}
1446		1514
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 {	1515	sub set_text {
1466	my ($self, $text) = @_;	1516	my ($self, $text) = @_;
1467		1517
1468	$self->{cursor} = length $text;	1518	$self->{cursor} = length $text;
1469	$self->_set_text ($text);	1519	$self->_set_text ($text);
1470	$self->update;	1520	$self->update;
		1521	$self->check_size;
		1522	}
		1523
		1524	sub get_text {
		1525	$_[0]{text}
		1526	}
		1527
		1528	sub size_request {
		1529	my ($self) = @_;
		1530
		1531	my ($w, $h) = $self->SUPER::size_request;
		1532
		1533	($w + 1, $h) # add 1 for cursor
		1534	}
		1535
		1536	sub size_allocate {
		1537	my ($self, $w, $h) = @_;
		1538
		1539	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1471	}	1540	}
1472		1541
1473	sub key_down {	1542	sub key_down {
1474	my ($self, $ev) = @_;	1543	my ($self, $ev) = @_;
1475		1544
…		…
1477	my $sym = $ev->{sym};	1546	my $sym = $ev->{sym};
1478	my $uni = $ev->{unicode};	1547	my $uni = $ev->{unicode};
1479		1548
1480	my $text = $self->get_text;	1549	my $text = $self->get_text;
1481		1550
1482	if ($sym == 8) {	1551	if ($uni == 8) {
1483	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1552	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1484	} elsif ($sym == 127) {	1553	} elsif ($uni == 127) {
1485	substr $text, $self->{cursor}, 1, "";	1554	substr $text, $self->{cursor}, 1, "";
1486	} elsif ($sym == CFClient::SDLK_LEFT) {	1555	} elsif ($sym == CFClient::SDLK_LEFT) {
1487	--$self->{cursor} if $self->{cursor};	1556	--$self->{cursor} if $self->{cursor};
1488	} elsif ($sym == CFClient::SDLK_RIGHT) {	1557	} elsif ($sym == CFClient::SDLK_RIGHT) {
1489	++$self->{cursor} if $self->{cursor} < length $self->{text};	1558	++$self->{cursor} if $self->{cursor} < length $self->{text};
1490	} elsif ($sym == CFClient::SDLK_HOME) {	1559	} elsif ($sym == CFClient::SDLK_HOME) {
1491	$self->{cursor} = 0;	1560	$self->{cursor} = 0;
1492	} elsif ($sym == CFClient::SDLK_END) {	1561	} elsif ($sym == CFClient::SDLK_END) {
1493	$self->{cursor} = length $text;	1562	$self->{cursor} = length $text;
1494	} elsif ($sym == 27) {	1563	} elsif ($uni == 27) {
1495	$self->emit ('escape');	1564	$self->emit ('escape');
1496	} elsif ($uni) {	1565	} elsif ($uni) {
1497	substr $text, $self->{cursor}++, 0, chr $uni;	1566	substr $text, $self->{cursor}++, 0, chr $uni;
1498	}	1567	}
1499		1568
1500	$self->_set_text ($text);	1569	$self->_set_text ($text);
1501	$self->update;	1570	$self->update;
		1571	$self->check_size;
1502	}	1572	}
1503		1573
1504	sub focus_in {	1574	sub focus_in {
1505	my ($self) = @_;	1575	my ($self) = @_;
1506		1576
…		…
1635	my $class = shift;	1705	my $class = shift;
1636		1706
1637	$class->SUPER::new (	1707	$class->SUPER::new (
1638	padding => 4,	1708	padding => 4,
1639	fg => [1, 1, 1],	1709	fg => [1, 1, 1],
1640	bg => [1, 1, 1, 0.2],
1641	active_fg => [0, 0, 1],	1710	active_fg => [0, 0, 1],
1642	can_hover => 1,	1711	can_hover => 1,
1643	align => 0,	1712	align => 0,
1644	valign => 0,	1713	valign => 0,
1645	can_events => 1,	1714	can_events => 1,
…		…
1663		1732
1664	if ($GRAB == $self) {	1733	if ($GRAB == $self) {
1665	$self->{fg} = $self->{active_fg};	1734	$self->{fg} = $self->{active_fg};
1666	}	1735	}
1667		1736
1668	glEnable GL_BLEND;
1669	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1670	glEnable GL_TEXTURE_2D;	1737	glEnable GL_TEXTURE_2D;
1671	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1738	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672	glColor 0, 0, 0, 1;	1739	glColor 0, 0, 0, 1;
1673		1740
1674	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1741	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1675		1742
1676	glDisable GL_TEXTURE_2D;	1743	glDisable GL_TEXTURE_2D;
1677	glDisable GL_BLEND;
1678		1744
1679	$self->SUPER::_draw;	1745	$self->SUPER::_draw;
1680	}	1746	}
1681		1747
1682	#############################################################################	1748	#############################################################################
…		…
1696		1762
1697	$class->SUPER::new (	1763	$class->SUPER::new (
1698	padding => 2,	1764	padding => 2,
1699	fg => [1, 1, 1],	1765	fg => [1, 1, 1],
1700	active_fg => [1, 1, 0],	1766	active_fg => [1, 1, 0],
		1767	bg => [0, 0, 0, 0.2],
		1768	active_bg => [1, 1, 1, 0.5],
1701	state => 0,	1769	state => 0,
1702	can_hover => 1,	1770	can_hover => 1,
1703	@_	1771	@_
1704	)	1772	)
1705	}	1773	}
…		…
1729		1797
1730	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1798	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1731		1799
1732	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1800	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733		1801
1734	glEnable GL_BLEND;	1802	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1803
1735	glEnable GL_TEXTURE_2D;	1804	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);	1805	$tex->draw_quad_alpha (0, 0, $s, $s);
1741
1742	glDisable GL_TEXTURE_2D;	1806	glDisable GL_TEXTURE_2D;
1743	glDisable GL_BLEND;
1744	}	1807	}
1745		1808
1746	#############################################################################	1809	#############################################################################
1747		1810
1748	package CFClient::UI::Image;	1811	package CFClient::UI::Image;
…		…
1791	glTranslate 0, -$self->{w}, 0;	1854	glTranslate 0, -$self->{w}, 0;
1792		1855
1793	($w, $h) = ($h, $w);	1856	($w, $h) = ($h, $w);
1794	}	1857	}
1795		1858
1796	glEnable GL_BLEND;
1797	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798	glEnable GL_TEXTURE_2D;	1859	glEnable GL_TEXTURE_2D;
1799	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1860	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800		1861
1801	$tex->draw_quad (0, 0, $w, $h);	1862	$tex->draw_quad_alpha (0, 0, $w, $h);
1802		1863
1803	glDisable GL_BLEND;
1804	glDisable GL_TEXTURE_2D;	1864	glDisable GL_TEXTURE_2D;
1805	}	1865	}
1806		1866
1807	#############################################################################	1867	#############################################################################
1808		1868
…		…
1997	qw(s1_slider.png s1_slider_bg.png);	2057	qw(s1_slider.png s1_slider_bg.png);
1998		2058
1999	sub new {	2059	sub new {
2000	my $class = shift;	2060	my $class = shift;
2001		2061
2002	# range [value, low, high, page]	2062	# range [value, low, high, page, unit]
2003		2063
2004	# TODO: 0-width page	2064	# TODO: 0-width page
2005	# TODO: req_w/h are wrong with vertical	2065	# TODO: req_w/h are wrong with vertical
2006	# TODO: calculations are off	2066	# TODO: calculations are off
2007	my $self = $class->SUPER::new (	2067	my $self = $class->SUPER::new (
2008	fg => [1, 1, 1],	2068	fg => [1, 1, 1],
2009	active_fg => [0, 0, 0],	2069	active_fg => [0, 0, 0],
		2070	bg => [0, 0, 0, 0.2],
		2071	active_bg => [1, 1, 1, 0.5],
2010	range => [0, 0, 100, 10],	2072	range => [0, 0, 100, 10],
2011	req_w => $::WIDTH / 80,	2073	req_w => $::WIDTH / 80,
2012	req_h => $::WIDTH / 80,	2074	req_h => $::WIDTH / 80,
2013	vertical => 0,	2075	vertical => 0,
2014	can_hover => 1,	2076	can_hover => 1,
2015	inner_pad => 5,	2077	inner_pad => 0.02,
2016	@_	2078	@_
2017	);	2079	);
2018		2080
		2081	$self->set_value ($self->{range}[0]);
		2082	$self->update;
		2083
2019	$self	2084	$self
		2085	}
		2086
		2087	sub set_value {
		2088	my ($self, $value) = @_;
		2089
		2090	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2091
		2092	$hi = $lo + 1 if $hi <= $lo;
		2093
		2094	$value = $lo if $value < $lo;
		2095	$value = $hi if $value > $hi;
		2096
		2097	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2098	if $unit;
		2099
		2100	$page = $hi - $lo if $page > $hi - $lo;
		2101
		2102	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2103
		2104	if ($value != $old_value) {
		2105	$self->emit (changed => $value);
		2106	$self->update;
		2107	}
2020	}	2108	}
2021		2109
2022	sub size_request {	2110	sub size_request {
2023	my ($self) = @_;	2111	my ($self) = @_;
2024		2112
…		…
2037		2125
2038	sub mouse_motion {	2126	sub mouse_motion {
2039	my ($self, $ev, $x, $y) = @_;	2127	my ($self, $ev, $x, $y) = @_;
2040		2128
2041	if ($GRAB == $self) {	2129	if ($GRAB == $self) {
		2130	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2131
		2132	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2133
		2134	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2135
		2136	$self->set_value ($x * ($hi - $lo) + $lo);
		2137	}
		2138	}
		2139
		2140	sub update {
		2141	my ($self) = @_;
		2142
		2143	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2144	$self->set_value ($self->{range}[0]);
		2145
2042	my ($value, $lo, $hi, $page) = @{$self->{range}};	2146	my ($value, $lo, $hi, $page) = @{$self->{range}};
2043		2147
2044	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2148	my $inner_w = 1 - 2 * $self->{inner_pad};
2045		2149
2046	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2150	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2047	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2048		2151
2049	$x -= $inner_pad_px; # substract the padding	2152	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2050	$x = $x * ($hi - $lo) / $inner_w + $lo;	2153	$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		2154
2055	$self->emit (changed => $x);	2155	$value = $self->{inner_pad} + ($value - $page * 0.5);
2056	$self->update;	2156
		2157	$value = 0 if $value < 0;
		2158	$page = 1 - $value if $value + $page > 1;
		2159
		2160	$self->{knob_x} = $value;
		2161	$self->{knob_w} = $page;
2057	}	2162	});
2058	}
2059		2163
2060	# the inner_* stuff is for generating a padding for the slider handle,	2164	$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	}	2165	}
2067		2166
2068	sub _draw {	2167	sub _draw {
2069	my ($self) = @_;	2168	my ($self) = @_;
2070		2169
2071	$self->SUPER::_draw ();	2170	$self->SUPER::_draw ();
2072		2171
2073	my ($w, $h) = @$self{qw(w h)};	2172	glScale $self->{w}, $self->{h};
2074		2173
2075	if ($self->{vertical}) {	2174	if ($self->{vertical}) {
2076	# draw a vertical slider like a rotated horizontal slider	2175	# draw a vertical slider like a rotated horizontal slider
2077		2176
		2177	glTranslate 1, 0, 0;
2078	glRotate 90, 0, 0, 1;	2178	glRotate 90, 0, 0, 1;
2079	glTranslate 0, -$self->{w}, 0;
2080
2081	($w, $h) = ($h, $w);
2082	}	2179	}
2083		2180
2084	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2181	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2182	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086		2183
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;	2184	glEnable GL_TEXTURE_2D;
2108	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2185	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2109		2186
2110	# draw background	2187	# draw background
2111	$tex[1]->draw_quad (0, 0, $w, $h);	2188	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2112		2189
2113	# draw handle	2190	# draw handle
2114	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2191	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2115		2192
2116	glDisable GL_BLEND;
2117	glDisable GL_TEXTURE_2D;	2193	glDisable GL_TEXTURE_2D;
2118	}	2194	}
2119		2195
2120	#############################################################################	2196	#############################################################################
2121		2197
…		…
2132	fontsize => 1,	2208	fontsize => 1,
2133	can_events => 0,	2209	can_events => 0,
2134	#font => default_font	2210	#font => default_font
2135	@_,	2211	@_,
2136		2212
2137	layout => (new CFClient::Layout),	2213	layout => (new CFClient::Layout 1),
2138	par => [],	2214	par => [],
2139	height => 0,	2215	height => 0,
2140	children => [	2216	children => [
2141	(new CFClient::UI::Empty expand => 1),	2217	(new CFClient::UI::Empty expand => 1),
2142	(new CFClient::UI::Slider vertical => 1),	2218	(new CFClient::UI::Slider vertical => 1),
…		…
2153		2229
2154	$self->{fontsize} = $fontsize;	2230	$self->{fontsize} = $fontsize;
2155	$self->reflow;	2231	$self->reflow;
2156	}	2232	}
2157		2233
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 {	2234	sub size_allocate {
2178	my ($self, $w, $h) = @_;	2235	my ($self, $w, $h) = @_;
2179		2236
2180	$self->SUPER::size_allocate ($w, $h);	2237	$self->SUPER::size_allocate ($w, $h);
2181		2238
…		…
2184	$self->{layout}->set_width ($self->{children}[0]{w});	2241	$self->{layout}->set_width ($self->{children}[0]{w});
2185		2242
2186	$self->reflow;	2243	$self->reflow;
2187	}	2244	}
2188		2245
		2246	sub text_height {
		2247	my ($self, $text, $indent) = @_;
		2248
		2249	my $layout = $self->{layout};
		2250
		2251	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2252	$layout->set_width ($self->{children}[0]{w} - $indent);
		2253	$layout->set_markup ($text);
		2254
		2255	($layout->size)[1]
		2256	}
		2257
		2258	sub reflow {
		2259	my ($self) = @_;
		2260
		2261	$self->{need_reflow}++;
		2262	$self->update;
		2263	}
		2264
2189	sub add_paragraph {	2265	sub add_paragraph {
2190	my ($self, $color, $text) = @_;	2266	my ($self, $color, $text, $indent) = @_;
2191		2267
2192	#TODO: intelligently "reformat" paragraph	2268	#TODO: intelligently "reformat" paragraph
2193		2269
		2270	for my $line (split /\n/, $text) {
2194	my $height = $self->text_height ($text);	2271	my $height = $self->text_height ($line);
2195
2196	$self->{height} += $height;	2272	$self->{height} += $height;
2197
2198	push @{$self->{par}}, [$height, $color, $text];	2273	push @{$self->{par}}, [$height, $color, $indent, $line];
		2274	}
2199		2275
2200	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2276	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2201	$self->{children}[1]->update;	2277	$self->{children}[1]->update;
2202	}	2278	}
2203		2279
…		…
2208		2284
2209	return unless $self->{h} > 0;	2285	return unless $self->{h} > 0;
2210		2286
2211	delete $self->{texture};	2287	delete $self->{texture};
2212		2288
2213	$ROOT->on_refresh ($self, sub {	2289	$ROOT->on_post_alloc ($self, sub {
2214	if (delete $self->{need_reflow}) {	2290	if (delete $self->{need_reflow}) {
2215	my $height = 0;	2291	my $height = 0;
2216		2292
2217	$height += $_->[0] = $self->text_height ($_->[2])	2293	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2218	for @{$self->{par}};	2294	for @{$self->{par}};
2219		2295
2220	$self->{height} = $height;	2296	$self->{height} = $height;
2221		2297
2222	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2298	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		2299	$self->{children}[1]->update;
2223		2300
2224	delete $self->{texture};	2301	delete $self->{texture};
2225	}	2302	}
2226		2303
2227	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2304	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2228	glClearColor 0, 0, 0, 0;	2305	glClearColor 0.5, 0.5, 0.5, 0;
2229	glClear GL_COLOR_BUFFER_BIT;	2306	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		2307
2236	my $top = int $self->{children}[1]{range}[0];	2308	my $top = int $self->{children}[1]{range}[0];
2237		2309
2238	my $y0 = $top;	2310	my $y0 = $top;
2239	my $y1 = $top + $self->{h};	2311	my $y1 = $top + $self->{h};
…		…
2242		2314
2243	my $layout = $self->{layout};	2315	my $layout = $self->{layout};
2244		2316
2245	$layout->set_font ($self->{font}) if $self->{font};	2317	$layout->set_font ($self->{font}) if $self->{font};
2246		2318
		2319	glEnable GL_BLEND;
		2320	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2321
2247	for my $par (@{$self->{par}}) {	2322	for my $par (@{$self->{par}}) {
2248	my $h = $par->[0];	2323	my $h = $par->[0];
2249		2324
2250	if ($y0 < $y + $h && $y < $y1) {	2325	if ($y0 < $y + $h && $y < $y1) {
		2326	$layout->set_foreground (@{ $par->[1] });
		2327	$layout->set_width ($self->{w} - $par->[2]);
2251	$layout->set_text ($par->[2]);	2328	$layout->set_markup ($par->[3]);
2252		2329
2253	glColor @{ $par->[1] };	2330	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2254	my ($W, $H) = $layout->size;	2331
2255	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2332	glRasterPos $par->[2], $y - $y0;
		2333	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2256	}	2334	}
2257		2335
2258	$y += $h;	2336	$y += $h;
2259	}	2337	}
2260		2338
2261	glDisable GL_TEXTURE_2D;
2262	glDisable GL_BLEND;	2339	glDisable GL_BLEND;
2263	};	2340	};
2264	});	2341	});
2265	}	2342	}
2266		2343
2267	sub _draw {	2344	sub _draw {
2268	my ($self) = @_;	2345	my ($self) = @_;
2269		2346
2270	glEnable GL_BLEND;
2271	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2272	glEnable GL_TEXTURE_2D;	2347	glEnable GL_TEXTURE_2D;
2273	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2348	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274	glColor 1, 1, 1, 1;	2349	glColor 1, 1, 1, 1;
2275	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2350	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2276	glDisable GL_TEXTURE_2D;	2351	glDisable GL_TEXTURE_2D;
2277	glDisable GL_BLEND;
2278		2352
2279	$self->{children}[1]->draw;	2353	$self->{children}[1]->draw;
2280		2354
2281	}	2355	}
2282		2356
…		…
2376	@_,	2450	@_,
2377	can_events => 0,	2451	can_events => 0,
2378	)	2452	)
2379	}	2453	}
2380		2454
2381	sub set_markup {	2455	sub set_tooltip_from {
2382	my ($self, $text) = @_;	2456	my ($self, $widget) = @_;
2383		2457
2384	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2458	$self->add (new CFClient::UI::Label
2385	$self->{label}->set_markup ($text);	2459	markup => $widget->{tooltip},
2386	$self->add ($self->{label});	2460	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2461	fontsize => 0.8,
		2462	fg => [0, 0, 0, 1],
		2463	ellipsise => 0,
		2464	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2465	);
2387	}	2466	}
2388		2467
2389	sub size_request {	2468	sub size_request {
2390	my ($self) = @_;	2469	my ($self) = @_;
2391
2392	$self->child->set_max_size ($::WIDTH * 0.3);
2393		2470
2394	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2471	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2395		2472
2396	($w + 4, $h + 4)	2473	($w + 4, $h + 4)
2397	}	2474	}
…		…
2403	}	2480	}
2404		2481
2405	sub _draw {	2482	sub _draw {
2406	my ($self) = @_;	2483	my ($self) = @_;
2407		2484
2408	glPushMatrix;
2409	glTranslate 0.375, 0.375;	2485	glTranslate 0.375, 0.375;
2410		2486
2411	my ($w, $h) = @$self{qw(w h)};	2487	my ($w, $h) = @$self{qw(w h)};
2412		2488
2413	glColor 1, 0.8, 0.4;	2489	glColor 1, 0.8, 0.4;
…		…
2424	glVertex 0 , $h;	2500	glVertex 0 , $h;
2425	glVertex $w, $h;	2501	glVertex $w, $h;
2426	glVertex $w, 0;	2502	glVertex $w, 0;
2427	glEnd;	2503	glEnd;
2428		2504
2429	glPopMatrix;	2505	glTranslate 2 - 0.375, 2 - 0.375;
2430
2431	glTranslate 2, 2;
2432	$self->SUPER::_draw;	2506	$self->SUPER::_draw;
2433	}	2507	}
2434		2508
2435	#############################################################################	2509	#############################################################################
2436		2510
…		…
2441	use CFClient::OpenGL;	2515	use CFClient::OpenGL;
2442		2516
2443	sub new {	2517	sub new {
2444	my $class = shift;	2518	my $class = shift;
2445		2519
2446	$class->SUPER::new (	2520	my $self = $class->SUPER::new (
2447	aspect => 1,	2521	aspect => 1,
2448	@_,	2522	@_,
2449	)	2523	);
		2524
		2525	if ($self->{anim} && $self->{animspeed}) {
		2526	Scalar::Util::weaken (my $widget = $self);
		2527
		2528	$self->{timer} = Event->timer (
		2529	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2530	hard => 1,
		2531	interval => $self->{animspeed},
		2532	cb => sub {
		2533	++$widget->{frame};
		2534	$widget->update;
		2535	},
		2536	);
		2537	}
		2538
		2539	$self
2450	}	2540	}
2451		2541
2452	sub size_request {	2542	sub size_request {
2453	(32, 8)	2543	(32, 8)
2454	}	2544	}
2455		2545
		2546	sub update {
		2547	my ($self) = @_;
		2548
		2549	return unless $self->{visible};
		2550
		2551	$self->SUPER::update;
		2552	}
		2553
2456	sub _draw {	2554	sub _draw {
2457	my ($self) = @_;	2555	my ($self) = @_;
2458		2556
2459	return unless $::CONN;#d# manage and cache textures differently	2557	return unless $::CONN;#d# manage and cache textures differently
		2558
		2559	my $face;
		2560
		2561	if ($self->{frame}) {
		2562	my $anim = $::CONN->{anim}[$self->{anim}];
		2563
		2564	$face = $anim->[ $self->{frame} % @$anim ]
		2565	if $anim && @$anim;
		2566	}
		2567
2460	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2568	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2461		2569
2462	# TODO animation
2463	if ($tex) {	2570	if ($tex) {
2464	glEnable GL_BLEND;
2465	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2466	glEnable GL_TEXTURE_2D;	2571	glEnable GL_TEXTURE_2D;
2467	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2572	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2468	glColor 1, 1, 1, 1;	2573	glColor 1, 1, 1, 1;
2469	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2574	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470	glDisable GL_TEXTURE_2D;	2575	glDisable GL_TEXTURE_2D;
2471	glDisable GL_BLEND;
2472	}	2576	}
		2577	}
		2578
		2579	sub DESTROY {
		2580	my ($self) = @_;
		2581
		2582	$self->{timer}->cancel
		2583	if $self->{timer};
		2584
		2585	$self->SUPER::DESTROY;
2473	}	2586	}
2474		2587
2475	#############################################################################	2588	#############################################################################
2476		2589
2477	package CFClient::UI::InventoryItem;	2590	package CFClient::UI::InventoryItem;
2478		2591
2479	our @ISA = CFClient::UI::HBox::;	2592	our @ISA = CFClient::UI::HBox::;
		2593
		2594	sub _item_to_desc {
		2595	my ($item) = @_;
		2596
		2597	my $desc =
		2598	$item->{nrof} < 2
		2599	? $item->{name}
		2600	: "$item->{nrof} × $item->{name_pl}";
		2601
		2602	$item->{flags} & Crossfire::Protocol::F_OPEN
		2603	and $desc .= " (open)";
		2604	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2605	and $desc .= " (applied)";
		2606	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2607	and $desc .= " (unpaid)";
		2608	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2609	and $desc .= " (magic)";
		2610	$item->{flags} & Crossfire::Protocol::F_CURSED
		2611	and $desc .= " (cursed)";
		2612	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2613	and $desc .= " (damned)";
		2614	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2615	and $desc .= " *";
		2616
		2617	$desc
		2618	}
2480		2619
2481	sub new {	2620	sub new {
2482	my $class = shift;	2621	my $class = shift;
2483		2622
2484	my %args = @_;	2623	my %args = @_;
2485		2624
2486	my $item = $args{item};	2625	my $item = delete $args{item};
2487		2626
2488	my $desc = $item->{nrof} < 2	2627	my $desc = _item_to_desc ($item);
2489	? $item->{name}
2490	: "$item->{nrof} $item->{name_pl}";
2491
2492		2628
2493	my $self = $class->SUPER::new (	2629	my $self = $class->SUPER::new (
2494	can_hover => 1,	2630	can_hover => 1,
2495	can_events => 1,	2631	can_events => 1,
2496	tooltip => (CFClient::UI::Label->escape ($desc)	2632	tooltip => ((CFClient::UI::Label::escape $desc)
2497	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2633	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498	connect_button_down => sub {	2634	connect_button_down => sub {
2499	my ($self, $ev, $x, $y) = @_;	2635	my ($self, $ev, $x, $y) = @_;
2500		2636
2501	# todo: maybe put examine on 1? but should just be a tooltip :(	2637	# todo: maybe put examine on 1? but should just be a tooltip :(
2502	if ($ev->{button} == 1) {	2638	if ($ev->{button} == 1) {
		2639	my $targ = $::CONN->{player}{tag};
		2640
		2641	if ($item->{container} == $::CONN->{player}{tag}) {
		2642	$targ = $main::OPENCONT;
		2643	}
		2644
2503	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2645	$::CONN->send ("move $targ $item->{tag} 0");
2504	} elsif ($ev->{button} == 2) {	2646	} elsif ($ev->{button} == 2) {
2505	$::CONN->send ("apply $item->{tag}");	2647	$::CONN->send ("apply $item->{tag}");
2506	} elsif ($ev->{button} == 3) {	2648	} elsif ($ev->{button} == 3) {
2507	CFClient::UI::Menu->new (	2649	my @menu_items = (
2508	items => [
2509	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2650	["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}") }],	2651	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2515	["apply", sub { $::CONN->send ("apply $item->{tag}") }],	2652	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2653	(
		2654	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2655	? (
		2656	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2657	)
		2658	: (
		2659	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2516	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],	2660	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2661	)
2517	],	2662	),
2518	)->popup ($ev);	2663	);
		2664
		2665	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2519	}	2666	}
2520		2667
2521	1	2668	1
2522	},	2669	},
2523	%args	2670	%args
2524	);	2671	);
		2672
		2673
2525	$self->add(new CFClient::UI::Face	2674	$self->add (new CFClient::UI::Face
2526	can_events => 0,	2675	can_events => 0,
2527	face => $item->{face},	2676	face => $item->{face},
2528	anim => $item->{anim},	2677	anim => $item->{anim},
2529	animspeed => $item->{animspeed});	2678	animspeed => $item->{animspeed},
2530	$self->add(new CFClient::UI::Label	2679	);
2531	can_events => 0,	2680
2532	text => $desc);	2681	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2682
		2683	$self->{item} = $item;
		2684
		2685	$self->update_item;
2533		2686
2534	$self	2687	$self
		2688	}
		2689
		2690	sub update_item {
		2691	my ($self) = @_;
		2692
		2693	my $desc = _item_to_desc ($self->{item});
		2694
		2695	$self->{name_lbl}->set_text ($desc);
2535	}	2696	}
2536		2697
2537	#############################################################################	2698	#############################################################################
2538		2699
2539	package CFClient::UI::Inventory;	2700	package CFClient::UI::Inventory;
…		…
2555	my ($self, $items) = @_;	2716	my ($self, $items) = @_;
2556		2717
2557	$self->{scrolled}->clear;	2718	$self->{scrolled}->clear;
2558	return unless $items;	2719	return unless $items;
2559		2720
2560	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2721	my @items = sort {
		2722	($a->{type} <=> $b->{type})
		2723	or ($a->{name} cmp $b->{name})
		2724	} @$items;
2561		2725
2562	$self->{real_items} = \@items;	2726	$self->{real_items} = \@items;
2563		2727
2564	for my $item (@items) {	2728	for my $item (@items) {
2565	my $desc = $item->{nrof} < 2
2566	? $item->{name}
2567	: "$item->{nrof} $item->{name_pl}";
2568
2569	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);	2729	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2730	$item->update_item ();
2570	}	2731	}
		2732
		2733	$self->{scrolled}->add (@items);
2571		2734
2572	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2735	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2573	}	2736	}
2574		2737
2575	sub size_request {	2738	sub size_request {
…		…
2649	}	2812	}
2650	}	2813	}
2651		2814
2652	#############################################################################	2815	#############################################################################
2653		2816
		2817	package CFClient::UI::Statusbox;
		2818
		2819	our @ISA = CFClient::UI::VBox::;
		2820
		2821	sub new {
		2822	my $class = shift;
		2823
		2824	$class->SUPER::new (
		2825	fontsize => 0.8,
		2826	@_,
		2827	)
		2828	}
		2829
		2830	sub reorder {
		2831	my ($self) = @_;
		2832	my $NOW = time;
		2833
		2834	while (my ($k, $v) = each %{ $self->{item} }) {
		2835	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2836	}
		2837
		2838	my @widgets;
		2839
		2840	my @items = sort {
		2841	$a->{pri} <=> $b->{pri}
		2842	or $b->{id} <=> $a->{id}
		2843	} values %{ $self->{item} };
		2844
		2845	my $count = 10 + 1;
		2846	for my $item (@items) {
		2847	last unless --$count;
		2848
		2849	push @widgets, $item->{label} ||= do {
		2850	# TODO: doesn't handle markup well (read as: at all)
		2851	my $short = $item->{count} > 1
		2852	? "<b>$item->{count} ×</b> $item->{text}"
		2853	: $item->{text};
		2854
		2855	for ($short) {
		2856	s/^\s+//;
		2857	s/\s+/ /g;
		2858	}
		2859
		2860	new CFClient::UI::Label
		2861	markup => $short,
		2862	tooltip => $item->{tooltip},
		2863	tooltip_font => $::FONT_PROP,
		2864	tooltip_width => 0.67,
		2865	fontsize => $item->{fontsize} || $self->{fontsize},
		2866	max_w => $::WIDTH * 0.44,
		2867	fg => $item->{fg},
		2868	can_events => 1,
		2869	can_hover => 1
		2870	};
		2871	}
		2872
		2873	$self->clear;
		2874	$self->SUPER::add (reverse @widgets);
		2875	}
		2876
		2877	sub add {
		2878	my ($self, $text, %arg) = @_;
		2879
		2880	$text =~ s/^\s+//;
		2881	$text =~ s/\s+$//;
		2882
		2883	my $timeout = time + ((delete $arg{timeout}) || 60);
		2884
		2885	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2886
		2887	if (my $item = $self->{item}{$group}) {
		2888	if ($item->{text} eq $text) {
		2889	$item->{count}++;
		2890	} else {
		2891	$item->{count} = 1;
		2892	$item->{text} = $item->{tooltip} = $text;
		2893	}
		2894	$item->{id} = ++$self->{id};
		2895	$item->{timeout} = $timeout;
		2896	delete $item->{label};
		2897	} else {
		2898	$self->{item}{$group} = {
		2899	id => ++$self->{id},
		2900	text => $text,
		2901	timeout => $timeout,
		2902	tooltip => $text,
		2903	fg => [0.8, 0.8, 0.8, 0.8],
		2904	pri => 0,
		2905	count => 1,
		2906	%arg,
		2907	};
		2908	}
		2909
		2910	$self->reorder;
		2911	}
		2912
		2913	sub reconfigure {
		2914	my ($self) = @_;
		2915
		2916	delete $_->{label}
		2917	for values %{ $self->{item} || {} };
		2918
		2919	$self->reorder;
		2920	$self->SUPER::reconfigure;
		2921	}
		2922
		2923	#############################################################################
		2924
2654	package CFClient::UI::Root;	2925	package CFClient::UI::Root;
2655		2926
2656	our @ISA = CFClient::UI::Container::;	2927	our @ISA = CFClient::UI::Container::;
2657		2928
2658	use CFClient::OpenGL;	2929	use CFClient::OpenGL;
…		…
2686	}	2957	}
2687		2958
2688	sub size_allocate {	2959	sub size_allocate {
2689	my ($self, $w, $h) = @_;	2960	my ($self, $w, $h) = @_;
2690		2961
2691	my $old_w = $self->{old_w};	2962	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2692	my $old_h = $self->{old_h};	2963	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2693		2964
2694	if ($old_w && $old_h) {	2965	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2695	for my $child ($self->children) {	2966	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2696	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2697	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2698	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2699	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2700	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2701	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2702	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2703	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2704	}
2705	}
2706		2967
2707	for my $child ($self->children) {	2968	for my $child ($self->children) {
2708	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2969	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2709		2970
		2971	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2972	if exists $child->{req_x};
		2973
		2974	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2975	if exists $child->{req_y};
		2976
2710	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2977	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2711	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2978	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2979
2712	$child->configure ($X, $Y, $W, $H);	2980	$child->configure ($X, $Y, $W, $H);
2713	}	2981	}
2714
2715	$self->{old_w} = $w;
2716	$self->{old_h} = $h;
2717	}	2982	}
2718		2983
2719	sub coord2local {	2984	sub coord2local {
2720	my ($self, $x, $y) = @_;	2985	my ($self, $x, $y) = @_;
2721		2986
…		…
2734	$self->check_size;	2999	$self->check_size;
2735	$::WANT_REFRESH++;	3000	$::WANT_REFRESH++;
2736	}	3001	}
2737		3002
2738	sub add {	3003	sub add {
2739	my ($self, $child) = @_;	3004	my ($self, @children) = @_;
2740		3005
		3006	for my $child (@children) {
		3007	$child->{toplevel} = 1;
		3008
2741	# integerise window positions	3009	# integerise window positions
2742	$child->{x} = int $child->{x};	3010	$child->{x} = int $child->{x};
2743	$child->{y} = int $child->{y};	3011	$child->{y} = int $child->{y};
		3012	}
2744		3013
2745	$self->SUPER::add ($child);	3014	$self->SUPER::add (@children);
		3015
		3016	while (@children) {
		3017	my $w = pop @children;
		3018	push @children, $w->children;
		3019	$w->{visible} = 1;
		3020	}
		3021	}
		3022
		3023	sub remove {
		3024	my ($self, @children) = @_;
		3025
		3026	$self->SUPER::remove (@children);
		3027
		3028	while (@children) {
		3029	my $w = pop @children;
		3030	push @children, $w->children;
		3031	delete $w->{visible};
		3032	}
2746	}	3033	}
2747		3034
2748	sub on_refresh {	3035	sub on_refresh {
2749	my ($self, $id, $cb) = @_;	3036	my ($self, $id, $cb) = @_;
2750		3037
2751	$self->{refresh_hook}{$id} = $cb;	3038	$self->{refresh_hook}{$id} = $cb;
2752	}	3039	}
2753		3040
		3041	sub on_post_alloc {
		3042	my ($self, $id, $cb) = @_;
		3043
		3044	$self->{post_alloc_hook}{$id} = $cb;
		3045	}
		3046
2754	sub draw {	3047	sub draw {
2755	my ($self) = @_;	3048	my ($self) = @_;
		3049
		3050	while ($self->{refresh_hook}) {
		3051	$_->()
		3052	for values %{delete $self->{refresh_hook}};
		3053	}
2756		3054
2757	if ($self->{check_size}) {	3055	if ($self->{check_size}) {
2758	my @queue = ([], []);	3056	my @queue = ([], []);
2759		3057
2760	for (;;) {	3058	for (;;) {
…		…
2768		3066
2769	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3067	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2770	? @$widget{qw(user_w user_h)}	3068	? @$widget{qw(user_w user_h)}
2771	: $widget->size_request;	3069	: $widget->size_request;
2772		3070
		3071	if (delete $widget->{force_alloc}
2773	if ($w != $widget->{req_w} || $h != $widget->{req_h}) {	3072	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3073	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3074
2774	$widget->{req_w} = $w;	3075	$widget->{req_w} = $w;
2775	$widget->{req_h} = $h;	3076	$widget->{req_h} = $h;
2776		3077
2777	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];	3078	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2778		3079
2779	$widget->{parent}->check_size	3080	$widget->{parent}->check_size
2780	if $widget->{parent};	3081	if $widget->{parent};
2781	}	3082	}
2782	}	3083	}
2783	}	3084	}
2784		3085
2785	while ($self->{size_alloc}) {	3086	while ($self->{size_alloc}) {
2786	for (values %{delete $self->{size_alloc}}) {	3087	for (values %{delete $self->{size_alloc}}) {
2787	my ($widget, $w, $h) = @$_;	3088	my ($widget, $w, $h) = @$_;
		3089
		3090	$w = 0 if $w < 0;
		3091	$h = 0 if $h < 0;
2788		3092
2789	$widget->{w} = $w;	3093	$widget->{w} = $w;
2790	$widget->{h} = $h;	3094	$widget->{h} = $h;
2791	$widget->size_allocate ($w, $h);	3095	$widget->size_allocate ($w, $h);
2792	$widget->emit (size_allocate => $w, $h);	3096	$widget->emit (size_allocate => $w, $h);
2793	}	3097	}
2794	}	3098	}
2795		3099
2796	while ($self->{refresh_hook}) {	3100	while ($self->{post_alloc_hook}) {
2797	$_->()	3101	$_->()
2798	for values %{delete $self->{refresh_hook}};	3102	for values %{delete $self->{post_alloc_hook}};
2799	}	3103	}
2800		3104
2801	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3105	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2802	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3106	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2803	glClear GL_COLOR_BUFFER_BIT;	3107	glClear GL_COLOR_BUFFER_BIT;
2804		3108
2805	glMatrixMode GL_PROJECTION;	3109	glMatrixMode GL_PROJECTION;
2806	glLoadIdentity;	3110	glLoadIdentity;
2807	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3111	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2808	glMatrixMode GL_MODELVIEW;	3112	glMatrixMode GL_MODELVIEW;
2809	glLoadIdentity;	3113	glLoadIdentity;
2810		3114
2811	$self->_draw;	3115	$self->_draw;
2812	}	3116	}
…		…
2814	#############################################################################	3118	#############################################################################
2815		3119
2816	package CFClient::UI;	3120	package CFClient::UI;
2817		3121
2818	$ROOT = new CFClient::UI::Root;	3122	$ROOT = new CFClient::UI::Root;
2819	$TOOLTIP = new CFClient::UI::Tooltip;	3123	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2820		3124
2821	1	3125	1
2822		3126

Diff Legend

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