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.166 by root, Mon Apr 24 08:38:36 2006 UTC vs.
Revision 1.196 by root, Fri May 12 00:16:34 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
…		…
23		24
24	my $tip = $widget->{tooltip};	25	my $tip = $widget->{tooltip};
25		26
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	27	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		28
28	$TOOLTIP->set_markup ($widget->{tooltip});	29	$TOOLTIP->set_tooltip_from ($widget);
29	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30	$TOOLTIP->show;	30	$TOOLTIP->show;
		31
		32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		33
		34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
		35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
		36	}
		37
		38	$TOOLTIP->move ($x, $y);
31	}	39	}
32		40
33	return;	41	return;
34	}	42	}
35	}	43	}
…		…
224	$self->{y} = $y;	232	$self->{y} = $y;
225	$self->update;	233	$self->update;
226	}	234	}
227		235
228	if ($self->{w} != $w || $self->{h} != $h) {	236	if ($self->{w} != $w || $self->{h} != $h) {
229	$self->{w} = $w;	237	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230	$self->{h} = $h;
231
232	$self->size_allocate ($w, $h);
233	$self->update;
234	}	238	}
235	}	239	}
236		240
237	sub size_allocate {	241	sub size_allocate {
238	# nothing to be done	242	# nothing to be done
239	}	243	}
240		244
		245	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	}
		259
241	sub set_max_size {	260	sub set_max_size {
242	my ($self, $w, $h) = @_;	261	my ($self, $w, $h) = @_;
243		262
244	delete $self->{max_w}; $self->{max_w} = $w if $w;	263	delete $self->{max_w}; $self->{max_w} = $w if $w;
245	delete $self->{max_h}; $self->{max_h} = $h if $h;	264	delete $self->{max_h}; $self->{max_h} = $h if $h;
246	}
247
248	# return top left coordinates
249	sub _topleft {
250	my ($self, $x, $y) = @_;
251
252	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
253	}	265	}
254		266
255	# translate global coordinates to local coordinate system	267	# translate global coordinates to local coordinate system
256	sub coord2local {	268	sub coord2local {
257	my ($self, $x, $y) = @_;	269	my ($self, $x, $y) = @_;
258		270
259	my ($X, $Y) = $self->_topleft;	271	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260	($x - $X, $y - $Y)
261	}	272	}
262		273
263	# translate local coordinates to global coordinate system	274	# translate local coordinates to global coordinate system
264	sub coord2global {	275	sub coord2global {
265	my ($self, $x, $y) = @_;	276	my ($self, $x, $y) = @_;
266		277
267	my ($X, $Y) = $self->_topleft;	278	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268	($x + $X, $y + $Y)
269	}	279	}
270		280
271	sub focus_in {	281	sub focus_in {
272	my ($self) = @_;	282	my ($self) = @_;
273		283
…		…
371		381
372	sub set_parent {	382	sub set_parent {
373	my ($self, $parent) = @_;	383	my ($self, $parent) = @_;
374		384
375	Scalar::Util::weaken ($self->{parent} = $parent);	385	Scalar::Util::weaken ($self->{parent} = $parent);
		386
		387	$self->check_size
		388	unless exists $self->{req_w};
376	}	389	}
377		390
378	sub check_size {	391	sub check_size {
379	my ($self) = @_;	392	my ($self) = @_;
380		393
381	$self->{parent}	394	$CFClient::UI::ROOT->{check_size}{$self} = $self;
382	or return 1;
383
384	my ($w, $h) = $self->{user_w} && $self->{user_h}
385	? @$self{qw(user_w user_h)}
386	: $self->size_request;
387
388	if ($w != $self->{req_w} || $h != $self->{req_h}) {
389	$self->{req_w} = $w;
390	$self->{req_h} = $h;
391
392	$self->{parent}->check_size
393	or $self->size_allocate (
394	(List::Util::max $self->{w}, $w),
395	(List::Util::max $self->{h}, $h),
396	);
397
398	1
399	} else {
400	0
401	}
402	}	395	}
403		396
404	sub update {	397	sub update {
405	my ($self) = @_;	398	my ($self) = @_;
406		399
…		…
503		496
504	$self	497	$self
505	}	498	}
506		499
507	sub add {	500	sub add {
508	my ($self, $child) = @_;	501	my ($self, @widgets) = @_;
509		502
510	$child->set_parent ($self);	503	$_->set_parent ($self)
		504	for @widgets;
511		505
512	use sort 'stable';	506	use sort 'stable';
513		507
514	$self->{children} = [	508	$self->{children} = [
515	sort { $a->{z} <=> $b->{z} }	509	sort { $a->{z} <=> $b->{z} }
516	@{$self->{children}}, $child	510	@{$self->{children}}, @widgets
517	];	511	];
518		512
519	$child->check_size;	513	$self->check_size;
		514	$self->update;
		515	}
		516
		517	sub children {
		518	@{ $_[0]{children} }
520	}	519	}
521		520
522	sub remove {	521	sub remove {
523	my ($self, $child) = @_;	522	my ($self, $child) = @_;
524		523
…		…
539		538
540	for (@$children) {	539	for (@$children) {
541	delete $_->{parent};	540	delete $_->{parent};
542	$_->hide;	541	$_->hide;
543	}	542	}
		543
		544	$self->check_size;
		545	$self->update;
544	}	546	}
545		547
546	sub find_widget {	548	sub find_widget {
547	my ($self, $x, $y) = @_;	549	my ($self, $x, $y) = @_;
548		550
…		…
623	}	625	}
624		626
625	sub update {	627	sub update {
626	my ($self) = @_;	628	my ($self) = @_;
627		629
628	# we want to do this delayed...	630	$ROOT->on_refresh ($self => sub { $self->render_child });
629	$self->render_chld;
630	$self->SUPER::update;	631	$self->SUPER::update;
631	}
632
633	sub render_chld {
634	my ($self) = @_;
635
636	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
637	glClearColor 0, 0, 0, 1;
638	glClear GL_COLOR_BUFFER_BIT;
639	$self->child->draw;
640	};
641	}	632	}
642		633
643	sub size_allocate {	634	sub size_allocate {
644	my ($self, $w, $h) = @_;	635	my ($self, $w, $h) = @_;
645		636
646	$self->child->configure (0, 0, $w, $h);	637	$self->SUPER::size_allocate ($w, $h);
		638	$self->update;
		639	}
647		640
		641	sub _render {
		642	$_[0]{children}[0]->draw;
		643	}
		644
		645	sub render_child {
		646	my ($self) = @_;
		647
		648	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		649	glClearColor 0, 0, 0, 0;
		650	glClear GL_COLOR_BUFFER_BIT;
		651
648	$self->render_chld;	652	$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	};
649	}	661	}
650		662
651	sub _draw {	663	sub _draw {
652	my ($self) = @_;	664	my ($self) = @_;
653		665
654	my ($w, $h) = ($self->w, $self->h);	666	my ($w, $h) = ($self->w, $self->h);
655		667
656	my $tex = $self->{texture}	668	my $tex = $self->{texture}
657	or return;	669	or return;
658		670
659	glEnable GL_BLEND;
660	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661	glEnable GL_TEXTURE_2D;	671	glEnable GL_TEXTURE_2D;
662	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	672	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		673	glColor 0, 0, 0, 1;
663		674
664	$tex->draw_quad (0, 0, $w, $h);	675	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
665		676
666	glDisable GL_BLEND;
667	glDisable GL_TEXTURE_2D;	677	glDisable GL_TEXTURE_2D;
668	}	678	}
669		679
670	#############################################################################	680	#############################################################################
671		681
672	package CFClient::UI::ViewPort;	682	package CFClient::UI::ViewPort;
673		683
674	our @ISA = CFClient::UI::Window::;	684	our @ISA = CFClient::UI::Window::;
675		685
676	sub new { die }
677
678	sub size_request {	686	sub size_request {
679	my ($self) = @_;	687	my ($self) = @_;
680		688
681	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	689	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
682	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	690	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
683		691
684	@$self{qw(child_w child_h)}	692	@$self{qw(child_w child_h)}
685	}	693	}
686		694
687	sub _draw {	695	sub size_allocate {
688	my ($self) = @_;	696	my ($self, $w, $h) = @_;
689		697
690	$self->{children}[1]->draw;	698	$self->update;
691	}	699	}
692		700
		701	sub set_offset {
		702	my ($self, $x, $y) = @_;
		703
		704	$self->{view_x} = int $x;
		705	$self->{view_y} = int $y;
		706
		707	$self->update;
		708	}
		709
		710	# hmm, this does not work for topleft of $self... but we should not ask for that
		711	sub coord2local {
		712	my ($self, $x, $y) = @_;
		713
		714	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		715	}
		716
		717	sub coord2global {
		718	my ($self, $x, $y) = @_;
		719
		720	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		721	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		722
		723	$self->SUPER::coord2global ($x, $y)
		724	}
		725
		726	sub find_widget {
		727	my ($self, $x, $y) = @_;
		728
		729	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		730	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		731	) {
		732	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		733	} else {
		734	$self->CFClient::UI::Base::find_widget ($x, $y)
		735	}
		736	}
		737
		738	sub _render {
		739	my ($self) = @_;
		740
		741	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		742
		743	$self->SUPER::_render;
		744	}
		745
		746	#############################################################################
		747
		748	package CFClient::UI::ScrolledWindow;
		749
		750	our @ISA = CFClient::UI::HBox::;
		751
		752	sub new {
		753	my $class = shift;
		754
		755	my $self;
		756
		757	my $slider = new CFClient::UI::Slider
		758	vertical => 1,
		759	range => [0, 0, 1, 0.01], # HACK fix
		760	connect_changed => sub {
		761	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		762	},
		763	;
		764
		765	$self = $class->SUPER::new (
		766	vp => (new CFClient::UI::ViewPort),
		767	slider => $slider,
		768	@_,
		769	);
		770
		771	$self->{vp}->add ($self->{scrolled});
		772	$self->add ($self->{vp});
		773	$self->add ($self->{slider});
		774
		775	$self
		776	}
		777
		778	#TODO# update range on size_allocate depeneing on child
		779	# update viewport offset on scroll
693		780
694	#############################################################################	781	#############################################################################
695		782
696	package CFClient::UI::Frame;	783	package CFClient::UI::Frame;
697		784
…		…
754	# TODO: user_x, user_y, overwrite moveto?	841	# TODO: user_x, user_y, overwrite moveto?
755		842
756	my $self = $class->SUPER::new (	843	my $self = $class->SUPER::new (
757	bg => [1, 1, 1, 1],	844	bg => [1, 1, 1, 1],
758	border_bg => [1, 1, 1, 1],	845	border_bg => [1, 1, 1, 1],
759	border => 0.8,	846	border => 0.6,
760	can_events => 1,	847	can_events => 1,
761	@_	848	@_
762	);	849	);
763		850
764	$self->{title} &&= new CFClient::UI::Label	851	$self->{title} &&= new CFClient::UI::Label
765	align => 0,	852	align => 0,
766	valign => 1,	853	valign => 1,
767	text => $self->{title},	854	text => $self->{title},
768	fontsize => 1;	855	fontsize => $self->{border};
769		856
770	$self	857	$self
771	}	858	}
772		859
773	sub border {	860	sub border {
…		…
798	}	885	}
799		886
800	sub button_down {	887	sub button_down {
801	my ($self, $ev, $x, $y) = @_;	888	my ($self, $ev, $x, $y) = @_;
802		889
		890	my ($w, $h) = @$self{qw(w h)};
803	my $border = $self->border;	891	my $border = $self->border;
804		892
805	if ($x < $self->{w} && $x >= $self->{w} - $border	893	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806	&& $y < $self->{h} && $y >= $self->{h} - $border) {	894	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807		895
		896	if ($lr & $td) {
		897	my ($wx, $wy) = ($self->{x}, $self->{y});
808	my ($ox, $oy) = ($ev->{x}, $ev->{y});	898	my ($ox, $oy) = ($ev->{x}, $ev->{y});
809	my ($bw, $bh) = ($self->{w}, $self->{h});	899	my ($bw, $bh) = ($self->{w}, $self->{h});
810		900
		901	my $mx = $x < $border;
		902	my $my = $y < $border;
		903
811	$self->{motion} = sub {	904	$self->{motion} = sub {
812	my ($ev, $x, $y) = @_;	905	my ($ev, $x, $y) = @_;
813		906
814	($x, $y) = ($ev->{x}, $ev->{y});	907	my $dx = $ev->{x} - $ox;
		908	my $dy = $ev->{y} - $oy;
815		909
816	$self->{user_w} = $bw + $x - $ox;	910	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
817	$self->{user_h} = $bh + $y - $oy;	911	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		912	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
818	$self->check_size;	913	$self->check_size;
819	};	914	};
820		915
821	} elsif ($x >= 0 && $x < $self->{w}	916	} elsif ($lr ^ $td) {
822	&& $y >= 0 && $y < $border) {
823
824	my ($ox, $oy) = ($ev->{x}, $ev->{y});	917	my ($ox, $oy) = ($ev->{x}, $ev->{y});
825	my ($bx, $by) = ($self->{x}, $self->{y});	918	my ($bx, $by) = ($self->{x}, $self->{y});
826		919
827	$self->{motion} = sub {	920	$self->{motion} = sub {
828	my ($ev, $x, $y) = @_;	921	my ($ev, $x, $y) = @_;
…		…
864	$tex[1]->draw_quad (0, 0, $w, $border);	957	$tex[1]->draw_quad (0, 0, $w, $border);
865	$tex[3]->draw_quad (0, $border, $border, $ch);	958	$tex[3]->draw_quad (0, $border, $border, $ch);
866	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	959	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
867	$tex[4]->draw_quad (0, $h - $border, $w, $border);	960	$tex[4]->draw_quad (0, $h - $border, $w, $border);
868		961
		962	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
869	my $bg = $tex[0];	963	my $bg = $tex[0];
870		964
871	# TODO: repeat texture not scale	965	# TODO: repeat texture not scale
872	my $rep_x = $cw / $bg->{w};	966	my $rep_x = $cw / $bg->{w};
873	my $rep_y = $ch / $bg->{h};	967	my $rep_y = $ch / $bg->{h};
874		968
875	glColor @{ $self->{bg} };	969	glColor @{ $self->{bg} };
876		970
877	$bg->{s} = $rep_x;	971	$bg->{s} = $rep_x;
878	$bg->{t} = $rep_y;	972	$bg->{t} = $rep_y;
879	$bg->{wrap_mode} = 1;	973	$bg->{wrap_mode} = 1;
880	$bg->draw_quad ($border, $border, $cw, $ch);	974	$bg->draw_quad ($border, $border, $cw, $ch);
881		975
882	glDisable GL_TEXTURE_2D;	976	glDisable GL_TEXTURE_2D;
883	glDisable GL_BLEND;	977	glDisable GL_BLEND;
		978	}
884		979
885	$self->{title}->draw if $self->{title};	980	$self->{title}->draw if $self->{title};
		981
886	$self->child->draw;	982	$self->child->draw;
887	}	983	}
888		984
889	#############################################################################	985	#############################################################################
890		986
…		…
912	$self->{children}[$y][$x] = $child;	1008	$self->{children}[$y][$x] = $child;
913		1009
914	$child->check_size;	1010	$child->check_size;
915	}	1011	}
916		1012
		1013	sub children {
		1014	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1015	}
		1016
917	# TODO: move to container class maybe? send childs a signal on removal?	1017	# TODO: move to container class maybe? send childs a signal on removal?
918	sub clear {	1018	sub clear {
919	my ($self) = @_;	1019	my ($self) = @_;
920		1020
921	my $children = delete $self->{children};	1021	my @children = $self->children;
		1022	delete $self->{children};
922		1023
923	for (grep $_, map @$_, grep $_, @$children) {	1024	for (@children) {
924	delete $_->{parent};	1025	delete $_->{parent};
925	$_->hide;	1026	$_->hide;
926	}	1027	}
927		1028
928	$self->update;	1029	$self->update;
…		…
1109	}	1210	}
1110		1211
1111	sub size_allocate {	1212	sub size_allocate {
1112	my ($self, $w, $h) = @_;	1213	my ($self, $w, $h) = @_;
1113		1214
		1215	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1216
1114	my $children = $self->{children};	1217	my $children = $self->{children};
1115		1218
1116	my @h = map $_->{req_h}, @$children;	1219	my @h = map $_->{req_h}, @$children;
1117		1220
1118	my $req_h = List::Util::sum @h;	1221	my $req_h = List::Util::sum @h;
…		…
1157	my ($class, %arg) = @_;	1260	my ($class, %arg) = @_;
1158		1261
1159	my $self = $class->SUPER::new (	1262	my $self = $class->SUPER::new (
1160	fg => [1, 1, 1],	1263	fg => [1, 1, 1],
1161	#font => default_font	1264	#font => default_font
		1265	#text => initial text
		1266	#markup => initial narkup
		1267	layout => (new CFClient::Layout),
1162	fontsize => 1,	1268	fontsize => 1,
1163	text => "",
1164	align => -1,	1269	align => -1,
1165	valign => -1,	1270	valign => -1,
1166	padding => 2,	1271	padding => 2,
1167	layout => new CFClient::Layout,
1168	can_events => 0,	1272	can_events => 0,
1169	%arg	1273	%arg
1170	);	1274	);
1171		1275
1172	if (exists $self->{template}) {	1276	if (exists $self->{template}) {
1173	my $layout = new CFClient::Layout;	1277	my $layout = new CFClient::Layout;
1174	$layout->set_text (delete $self->{template});	1278	$layout->set_text (delete $self->{template});
1175	$self->{template} = $layout;	1279	$self->{template} = $layout;
1176	}	1280	}
1177		1281
1178	$self->set_text (delete $self->{text}) if exists $self->{text};	1282	if (exists $self->{markup}) {
1179	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1283	$self->set_markup (delete $self->{markup});
		1284	} else {
		1285	$self->set_text (delete $self->{text});
		1286	}
1180		1287
1181	$self	1288	$self
1182	}	1289	}
1183		1290
1184	sub escape {	1291	sub escape {
…		…
1189	s/</&lt;/g;	1296	s/</&lt;/g;
1190		1297
1191	$_[1]	1298	$_[1]
1192	}	1299	}
1193		1300
		1301	sub update {
		1302	my ($self) = @_;
		1303
		1304	delete $self->{texture};
		1305	$self->SUPER::update;
		1306	}
		1307
1194	sub set_text {	1308	sub set_text {
1195	my ($self, $text) = @_;	1309	my ($self, $text) = @_;
1196		1310
		1311	return if $self->{text} eq "T$text";
		1312	$self->{text} = "T$text";
		1313
		1314	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1197	$self->{layout}->set_text ($text);	1315	$self->{layout}->set_text ($text);
1198		1316
1199	delete $self->{texture};	1317	$self->update;
1200	$self->check_size;	1318	$self->check_size;
1201	$self->update;
1202	}	1319	}
1203		1320
1204	sub set_markup {	1321	sub set_markup {
1205	my ($self, $markup) = @_;	1322	my ($self, $markup) = @_;
1206		1323
		1324	return if $self->{text} eq "M$markup";
		1325	$self->{text} = "M$markup";
		1326
		1327	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1328
		1329	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1207	$self->{layout}->set_markup ($markup);	1330	$self->{layout}->set_markup ($markup);
1208		1331
1209	delete $self->{texture};	1332	$self->update;
1210	$self->check_size;	1333	$self->check_size;
1211	$self->update;
1212	}	1334	}
1213		1335
1214	sub size_request {	1336	sub size_request {
1215	my ($self) = @_;	1337	my ($self) = @_;
1216		1338
…		…
1245	sub set_fontsize {	1367	sub set_fontsize {
1246	my ($self, $fontsize) = @_;	1368	my ($self, $fontsize) = @_;
1247		1369
1248	$self->{fontsize} = $fontsize;	1370	$self->{fontsize} = $fontsize;
1249	delete $self->{texture};	1371	delete $self->{texture};
		1372
		1373	$self->update;
1250	$self->check_size;	1374	$self->check_size;
1251	$self->update;
1252	}	1375	}
1253		1376
1254	sub _draw {	1377	sub _draw {
1255	my ($self) = @_;	1378	my ($self) = @_;
1256		1379
1257	my $tex = $self->{texture} ||= do {	1380	my $tex = $self->{texture} ||= do {
		1381	$self->{layout}->set_foreground (@{$self->{fg}});
1258	$self->{layout}->set_font ($self->{font}) if $self->{font};	1382	$self->{layout}->set_font ($self->{font}) if $self->{font};
1259	$self->{layout}->set_width ($self->{w});	1383	$self->{layout}->set_width ($self->{w});
1260	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1384	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
		1385
1261	new_from_layout CFClient::Texture $self->{layout}	1386	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1387
		1388	$self->{ox} = int $self->{align} < 0 ? $self->{padding}
		1389	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1390	: ($self->{w} - $tex->{w}) * 0.5;
		1391
		1392	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}
		1393	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1394	: ($self->{h} - $tex->{h}) * 0.5;
		1395
		1396	$tex
1262	};	1397	};
1263		1398
1264	glEnable GL_BLEND;
1265	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1266	glEnable GL_TEXTURE_2D;	1399	glEnable GL_TEXTURE_2D;
1267	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1400	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268		1401
		1402	if ($tex->{format} == GL_ALPHA) {
1269	glColor @{$self->{fg}};	1403	glColor @{$self->{fg}};
1270
1271	$self->{ox} = int (
1272	$self->{align} < 0 ? $self->{padding}
1273	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1274	: ($self->{w} - $tex->{w}) * 0.5
1275	);
1276
1277	$self->{oy} = int (
1278	$self->{valign} < 0 ? $self->{padding}
1279	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1280	: ($self->{h} - $tex->{h}) * 0.5
1281	);
1282
1283	$tex->draw_quad ($self->{ox}, $self->{oy});	1404	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1405	} else {
		1406	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1407	}
1284		1408
1285	glDisable GL_TEXTURE_2D;	1409	glDisable GL_TEXTURE_2D;
1286	glDisable GL_BLEND;
1287	}	1410	}
1288		1411
1289	#############################################################################	1412	#############################################################################
1290		1413
1291	package CFClient::UI::EntryBase;	1414	package CFClient::UI::EntryBase;
…		…
1326	$self->{layout}->set_text ("$text ");	1449	$self->{layout}->set_text ("$text ");
1327		1450
1328	$self->emit (changed => $self->{text});	1451	$self->emit (changed => $self->{text});
1329	}	1452	}
1330		1453
		1454	sub set_text {
		1455	my ($self, $text) = @_;
		1456
		1457	$self->{cursor} = length $text;
		1458	$self->_set_text ($text);
		1459	$self->check_size;
		1460	$self->update;
		1461	}
		1462
1331	sub get_text {	1463	sub get_text {
1332	$_[0]{text}	1464	$_[0]{text}
1333	}	1465	}
1334		1466
1335	sub size_request {	1467	sub size_request {
…		…
1342		1474
1343	sub size_allocate {	1475	sub size_allocate {
1344	my ($self, $w, $h) = @_;	1476	my ($self, $w, $h) = @_;
1345		1477
1346	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text	1478	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1347	}
1348
1349	sub set_text {
1350	my ($self, $text) = @_;
1351
1352	$self->{cursor} = length $text;
1353	$self->_set_text ($text);
1354	$self->update;
1355	}	1479	}
1356		1480
1357	sub key_down {	1481	sub key_down {
1358	my ($self, $ev) = @_;	1482	my ($self, $ev) = @_;
1359		1483
…		…
1466	my ($self, $ev) = @_;	1590	my ($self, $ev) = @_;
1467		1591
1468	my $sym = $ev->{sym};	1592	my $sym = $ev->{sym};
1469		1593
1470	if ($sym == 13) {	1594	if ($sym == 13) {
		1595	unshift @{$self->{history}},
		1596	my $txt = $self->get_text;
		1597	$self->{history_pointer} = -1;
		1598	$self->{history_saveback} = '';
1471	$self->emit (activate => $self->get_text);	1599	$self->emit (activate => $txt);
1472	$self->update;	1600	$self->update;
		1601
		1602	} elsif ($sym == CFClient::SDLK_UP) {
		1603	if ($self->{history_pointer} < 0) {
		1604	$self->{history_saveback} = $self->get_text;
		1605	}
		1606	if (@{$self->{history} || []} > 0) {
		1607	$self->{history_pointer}++;
		1608	if ($self->{history_pointer} >= @{$self->{history} || []}) {
		1609	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1610	}
		1611	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1612	}
		1613
		1614	} elsif ($sym == CFClient::SDLK_DOWN) {
		1615	$self->{history_pointer}--;
		1616	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1617
		1618	if ($self->{history_pointer} >= 0) {
		1619	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1620	} else {
		1621	$self->set_text ($self->{history_saveback});
		1622	}
1473		1623
1474	} else {	1624	} else {
1475	$self->SUPER::key_down ($ev);	1625	$self->SUPER::key_down ($ev);
1476	}	1626	}
1477		1627
…		…
1521		1671
1522	if ($GRAB == $self) {	1672	if ($GRAB == $self) {
1523	$self->{fg} = $self->{active_fg};	1673	$self->{fg} = $self->{active_fg};
1524	}	1674	}
1525		1675
1526	glEnable GL_BLEND;
1527	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1528	glEnable GL_TEXTURE_2D;	1676	glEnable GL_TEXTURE_2D;
1529	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1677	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1530	glColor 0, 0, 0, 1;	1678	glColor 0, 0, 0, 1;
1531		1679
1532	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1680	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1533		1681
1534	glDisable GL_TEXTURE_2D;	1682	glDisable GL_TEXTURE_2D;
1535	glDisable GL_BLEND;
1536		1683
1537	$self->SUPER::_draw;	1684	$self->SUPER::_draw;
1538	}	1685	}
1539		1686
1540	#############################################################################	1687	#############################################################################
…		…
1587		1734
1588	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1735	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1589		1736
1590	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1737	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1591		1738
1592	glEnable GL_BLEND;
1593	glEnable GL_TEXTURE_2D;	1739	glEnable GL_TEXTURE_2D;
1594	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1595		1740
1596	my $tex = $self->{state} ? $tex[1] : $tex[0];	1741	my $tex = $self->{state} ? $tex[1] : $tex[0];
1597		1742
1598	$tex->draw_quad (0, 0, $s, $s);	1743	$tex->draw_quad_alpha (0, 0, $s, $s);
1599		1744
1600	glDisable GL_TEXTURE_2D;	1745	glDisable GL_TEXTURE_2D;
1601	glDisable GL_BLEND;
1602	}	1746	}
1603		1747
1604	#############################################################################	1748	#############################################################################
1605		1749
1606	package CFClient::UI::Image;	1750	package CFClient::UI::Image;
…		…
1649	glTranslate 0, -$self->{w}, 0;	1793	glTranslate 0, -$self->{w}, 0;
1650		1794
1651	($w, $h) = ($h, $w);	1795	($w, $h) = ($h, $w);
1652	}	1796	}
1653		1797
1654	glEnable GL_BLEND;
1655	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1656	glEnable GL_TEXTURE_2D;	1798	glEnable GL_TEXTURE_2D;
1657	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1799	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1658		1800
1659	$tex->draw_quad (0, 0, $w, $h);	1801	$tex->draw_quad_alpha (0, 0, $w, $h);
1660		1802
1661	glDisable GL_BLEND;
1662	glDisable GL_TEXTURE_2D;	1803	glDisable GL_TEXTURE_2D;
1663	}	1804	}
1664		1805
1665	#############################################################################	1806	#############################################################################
1666		1807
…		…
1714	}	1855	}
1715		1856
1716	sub set_max {	1857	sub set_max {
1717	my ($self, $max) = @_;	1858	my ($self, $max) = @_;
1718		1859
		1860	return if $self->{max_val} == $max;
		1861
1719	$self->{max_val} = $max;	1862	$self->{max_val} = $max;
		1863	$self->update;
1720	}	1864	}
1721		1865
1722	sub set_value {	1866	sub set_value {
1723	my ($self, $val, $max) = @_;	1867	my ($self, $val, $max) = @_;
1724		1868
1725	$self->set_max ($max)	1869	$self->set_max ($max)
1726	if defined $max;	1870	if defined $max;
1727		1871
1728	$max = $self->{max_val};	1872	return if $self->{val} == $val;
		1873
1729	$self->{val} = $val;	1874	$self->{val} = $val;
1730
1731	$self->update;	1875	$self->update;
1732	}	1876	}
1733		1877
1734	sub _draw {	1878	sub _draw {
1735	my ($self) = @_;	1879	my ($self) = @_;
…		…
1798		1942
1799	sub new {	1943	sub new {
1800	my ($class, %arg) = @_;	1944	my ($class, %arg) = @_;
1801		1945
1802	my $self = $class->SUPER::new (	1946	my $self = $class->SUPER::new (
1803	tooltip => $arg{type},	1947	tooltip => $arg{type},
1804	can_hover => 1,	1948	can_hover => 1,
		1949	can_events => 1,
1805	%arg,	1950	%arg,
1806	);	1951	);
1807		1952
1808	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	1953	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1809	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	1954	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
…		…
1817		1962
1818	$self->{value}->set_fontsize ($fsize);	1963	$self->{value}->set_fontsize ($fsize);
1819	$self->{max} ->set_fontsize ($fsize);	1964	$self->{max} ->set_fontsize ($fsize);
1820	}	1965	}
1821		1966
		1967	sub set_max {
		1968	my ($self, $max) = @_;
		1969
		1970	$self->{gauge}->set_max ($max);
		1971	$self->{max}->set_text ($max);
		1972	}
		1973
1822	sub set_value {	1974	sub set_value {
1823	my ($self, $val, $max) = @_;	1975	my ($self, $val, $max) = @_;
1824		1976
1825	$self->set_max ($max)	1977	$self->set_max ($max)
1826	if defined $max;	1978	if defined $max;
1827		1979
1828	$self->{gauge}->set_value ($val, $max);	1980	$self->{gauge}->set_value ($val, $max);
1829	$self->{value}->set_text ($val);	1981	$self->{value}->set_text ($val);
1830	}
1831
1832	sub set_max {
1833	my ($self, $max) = @_;
1834
1835	$self->{gauge}->set_max ($max);
1836	$self->{max}->set_text ($max);
1837	}	1982	}
1838		1983
1839	#############################################################################	1984	#############################################################################
1840		1985
1841	package CFClient::UI::Slider;	1986	package CFClient::UI::Slider;
…		…
1860	# TODO: calculations are off	2005	# TODO: calculations are off
1861	my $self = $class->SUPER::new (	2006	my $self = $class->SUPER::new (
1862	fg => [1, 1, 1],	2007	fg => [1, 1, 1],
1863	active_fg => [0, 0, 0],	2008	active_fg => [0, 0, 0],
1864	range => [0, 0, 100, 10],	2009	range => [0, 0, 100, 10],
1865	req_w => 20,	2010	req_w => $::WIDTH / 80,
1866	req_h => 20,	2011	req_h => $::WIDTH / 80,
1867	vertical => 0,	2012	vertical => 0,
1868	can_hover => 1,	2013	can_hover => 1,
1869	inner_pad => 5,	2014	inner_pad => 5,
1870	@_	2015	@_
1871	);	2016	);
…		…
1954	$page ||= 2;	2099	$page ||= 2;
1955		2100
1956	my $knob_a = $inner_pad_px + ($value - $page * 0.5);	2101	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1957	my $knob_b = $inner_pad_px + ($value + $page * 0.5);	2102	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1958		2103
1959	glEnable GL_BLEND;
1960	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1961	glEnable GL_TEXTURE_2D;	2104	glEnable GL_TEXTURE_2D;
1962	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2105	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1963		2106
1964	# draw background	2107	# draw background
1965	$tex[1]->draw_quad (0, 0, $w, $h);	2108	$tex[1]->draw_quad_alpha (0, 0, $w, $h);
1966		2109
1967	# draw handle	2110	# draw handle
1968	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2111	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1969		2112
1970	glDisable GL_BLEND;
1971	glDisable GL_TEXTURE_2D;	2113	glDisable GL_TEXTURE_2D;
1972	}	2114	}
1973		2115
1974	#############################################################################	2116	#############################################################################
1975		2117
…		…
1986	fontsize => 1,	2128	fontsize => 1,
1987	can_events => 0,	2129	can_events => 0,
1988	#font => default_font	2130	#font => default_font
1989	@_,	2131	@_,
1990		2132
1991	layout => (new CFClient::Layout),	2133	layout => (new CFClient::Layout 1),
1992	par => [],	2134	par => [],
1993	height => 0,	2135	height => 0,
1994	children => [	2136	children => [
1995	(new CFClient::UI::Empty expand => 1),	2137	(new CFClient::UI::Empty expand => 1),
1996	(new CFClient::UI::Slider vertical => 1),	2138	(new CFClient::UI::Slider vertical => 1),
1997	],	2139	],
1998	);	2140	);
1999		2141
2000	$self->{children}[1]->connect (changed => sub {	2142	$self->{children}[1]->connect (changed => sub { $self->update });
2001	$self->update;
2002	});
2003		2143
2004	$self	2144	$self
2005	}	2145	}
2006		2146
2007	sub set_fontsize {	2147	sub set_fontsize {
…		…
2015	my ($self, $text) = @_;	2155	my ($self, $text) = @_;
2016		2156
2017	my $layout = $self->{layout};	2157	my $layout = $self->{layout};
2018		2158
2019	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2159	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2020	$layout->set_width ($self->{w});	2160	$layout->set_width ($self->{children}[0]{w});
2021	$layout->set_text ($text);	2161	$layout->set_markup ($text);
2022		2162
2023	($layout->size)[1]	2163	($layout->size)[1]
2024	}	2164	}
2025		2165
2026	sub reflow {	2166	sub reflow {
…		…
2078	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2218	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2079		2219
2080	delete $self->{texture};	2220	delete $self->{texture};
2081	}	2221	}
2082		2222
2083	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2223	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2084	glClearColor 0, 0, 0, 1;	2224	glClearColor 0, 0, 0, 0;
2085	glClear GL_COLOR_BUFFER_BIT;	2225	glClear GL_COLOR_BUFFER_BIT;
2086		2226
2087	glEnable GL_BLEND;
2088	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2089	glEnable GL_TEXTURE_2D;	2227	glEnable GL_TEXTURE_2D;
2090	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2228	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2091		2229
2092	my $top = int $self->{children}[1]{range}[0];	2230	my $top = int $self->{children}[1]{range}[0];
2093		2231
…		…
2102		2240
2103	for my $par (@{$self->{par}}) {	2241	for my $par (@{$self->{par}}) {
2104	my $h = $par->[0];	2242	my $h = $par->[0];
2105		2243
2106	if ($y0 < $y + $h && $y < $y1) {	2244	if ($y0 < $y + $h && $y < $y1) {
		2245	$layout->set_foreground (@{ $par->[1] });
2107	$layout->set_text ($par->[2]);	2246	$layout->set_markup ($par->[2]);
2108		2247
2109	glColor @{ $par->[1] };
2110	my ($W, $H) = $layout->size;	2248	my ($W, $H) = $layout->size;
2111	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2249	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2112	}	2250	}
2113		2251
2114	$y += $h;	2252	$y += $h;
2115	}	2253	}
2116		2254
2117	glDisable GL_TEXTURE_2D;	2255	glDisable GL_TEXTURE_2D;
2118	glDisable GL_BLEND;
2119	};	2256	};
2120	});	2257	});
2121	}	2258	}
2122		2259
2123	sub _draw {	2260	sub _draw {
2124	my ($self) = @_;	2261	my ($self) = @_;
2125		2262
2126	if ($self->{texture}) {
2127	glEnable GL_TEXTURE_2D;	2263	glEnable GL_TEXTURE_2D;
2128	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2264	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2129	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2265	glColor 1, 1, 1, 1;
		2266	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2130	glDisable GL_TEXTURE_2D;	2267	glDisable GL_TEXTURE_2D;
2131	}
2132		2268
2133	$self->{children}[1]->draw;	2269	$self->{children}[1]->draw;
2134		2270
2135	}	2271	}
2136		2272
…		…
2230	@_,	2366	@_,
2231	can_events => 0,	2367	can_events => 0,
2232	)	2368	)
2233	}	2369	}
2234		2370
2235	sub set_markup {	2371	sub set_tooltip_from {
2236	my ($self, $text) = @_;	2372	my ($self, $widget) = @_;
2237		2373
2238	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2374	$self->{label} = new CFClient::UI::Label
2239	$self->{label}->set_markup ($text);	2375	markup => $widget->{tooltip},
		2376	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2377	fontsize => 0.8,
		2378	fg => [0, 0, 0, 1],
		2379	font => ($widget->{tooltip_font} || $::FONT_PROP);
		2380
2240	$self->add ($self->{label});	2381	$self->add ($self->{label});
2241	}	2382	}
2242		2383
2243	sub size_request {	2384	sub size_request {
2244	my ($self) = @_;	2385	my ($self) = @_;
2245
2246	$self->child->set_max_size ($::WIDTH * 0.3);
2247		2386
2248	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2387	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2249		2388
2250	($w + 4, $h + 4)	2389	($w + 4, $h + 4)
2251	}	2390	}
…		…
2305		2444
2306	sub size_request {	2445	sub size_request {
2307	(32, 8)	2446	(32, 8)
2308	}	2447	}
2309		2448
2310	sub draw {	2449	sub _draw {
2311	my ($self) = @_;	2450	my ($self) = @_;
2312		2451
		2452	return unless $::CONN;#d# manage and cache textures differently
2313	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2453	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2314		2454
		2455	# TODO animation
2315	if ($tex) {	2456	if ($tex) {
2316	glEnable GL_BLEND;
2317	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2318	glEnable GL_TEXTURE_2D;	2457	glEnable GL_TEXTURE_2D;
2319	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2458	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2320	glColor 1, 1, 1, 1;	2459	glColor 1, 1, 1, 1;
2321	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2460	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2322	glDisable GL_TEXTURE_2D;	2461	glDisable GL_TEXTURE_2D;
2323	glDisable GL_BLEND;	2462	}
		2463	}
		2464
		2465	#############################################################################
		2466
		2467	package CFClient::UI::InventoryItem;
		2468
		2469	our @ISA = CFClient::UI::HBox::;
		2470
		2471	sub new {
		2472	my $class = shift;
		2473
		2474	my %args = @_;
		2475
		2476	my $item = delete $args{item};
		2477
		2478	my $desc = $item->{nrof} < 2
		2479	? $item->{name}
		2480	: "$item->{nrof} $item->{name_pl}";
		2481
		2482
		2483	my $self = $class->SUPER::new (
		2484	can_hover => 1,
		2485	can_events => 1,
		2486	tooltip => (CFClient::UI::Label->escape ($desc)
		2487	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2488	connect_button_down => sub {
		2489	my ($self, $ev, $x, $y) = @_;
		2490
		2491	# todo: maybe put examine on 1? but should just be a tooltip :(
		2492	if ($ev->{button} == 1) {
		2493	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2494	} elsif ($ev->{button} == 2) {
		2495	$::CONN->send ("apply $item->{tag}");
		2496	} elsif ($ev->{button} == 3) {
		2497	CFClient::UI::Menu->new (
		2498	items => [
		2499	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2500	[
		2501	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2502	sub { $::CONN->send ("lock $item->{tag}") },
		2503	],
		2504	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2505	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2506	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
		2507	],
		2508	)->popup ($ev);
		2509	}
		2510
		2511	1
		2512	},
		2513	%args
		2514	);
		2515
		2516	$self->add (new CFClient::UI::Face
		2517	can_events => 0,
		2518	face => $item->{face},
		2519	anim => $item->{anim},
		2520	animspeed => $item->{animspeed},
		2521	);
		2522
		2523	$self->add (new CFClient::UI::Label
		2524	can_events => 0,
		2525	text => $desc,
		2526	);
		2527
		2528	$self
		2529	}
		2530
		2531	#############################################################################
		2532
		2533	package CFClient::UI::Inventory;
		2534
		2535	our @ISA = CFClient::UI::ScrolledWindow::;
		2536
		2537	sub new {
		2538	my $class = shift;
		2539
		2540	my $self = $class->SUPER::new (
		2541	scrolled => (new CFClient::UI::VBox),
		2542	@_,
		2543	);
		2544
		2545	$self
		2546	}
		2547
		2548	sub set_items {
		2549	my ($self, $items) = @_;
		2550
		2551	$self->{scrolled}->clear;
		2552	return unless $items;
		2553
		2554	my @items = sort { $a->{type} <=> $b->{type} } @$items;
		2555
		2556	$self->{real_items} = \@items;
		2557
		2558	for my $item (@items) {
		2559	my $desc = $item->{nrof} < 2
		2560	? $item->{name}
		2561	: "$item->{nrof} $item->{name_pl}";
		2562
		2563	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
		2564	}
		2565
		2566	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2567	}
		2568
		2569	sub size_request {
		2570	my ($self) = @_;
		2571	($self->{req_w}, $self->{req_h});
		2572	}
		2573
		2574	#############################################################################
		2575
		2576	package CFClient::UI::Menu;
		2577
		2578	our @ISA = CFClient::UI::FancyFrame::;
		2579
		2580	use CFClient::OpenGL;
		2581
		2582	sub new {
		2583	my $class = shift;
		2584
		2585	my $self = $class->SUPER::new (
		2586	items => [],
		2587	z => 100,
		2588	@_,
		2589	);
		2590
		2591	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2592
		2593	for my $item (@{ $self->{items} }) {
		2594	my ($widget, $cb) = @$item;
		2595
		2596	# handle various types of items, only text for now
		2597	if (!ref $widget) {
		2598	$widget = new CFClient::UI::Label
		2599	can_hover => 1,
		2600	can_events => 1,
		2601	text => $widget;
		2602	}
		2603
		2604	$self->{item}{$widget} = $item;
		2605
		2606	$self->{vbox}->add ($widget);
		2607	}
		2608
		2609	$self
		2610	}
		2611
		2612	# popup given the event (must be a mouse button down event currently)
		2613	sub popup {
		2614	my ($self, $ev) = @_;
		2615
		2616	$self->emit ("popdown");
		2617
		2618	# maybe save $GRAB? must be careful about events...
		2619	$GRAB = $self;
		2620	$self->{button} = $ev->{button};
		2621
		2622	$self->show;
		2623	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2624	}
		2625
		2626	sub mouse_motion {
		2627	my ($self, $ev, $x, $y) = @_;
		2628
		2629	# TODO: should use vbox->find_widget or so
		2630	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2631	$self->{hover} = $self->{item}{$HOVER};
		2632	}
		2633
		2634	sub button_up {
		2635	my ($self, $ev, $x, $y) = @_;
		2636
		2637	if ($ev->{button} == $self->{button}) {
		2638	undef $GRAB;
		2639	$self->hide;
		2640
		2641	$self->emit ("popdown");
		2642	$self->{hover}[1]->() if $self->{hover};
		2643	}
		2644	}
		2645
		2646	#############################################################################
		2647
		2648	package CFClient::UI::Statusbox;
		2649
		2650	our @ISA = CFClient::UI::VBox::;
		2651
		2652	sub reorder {
		2653	my ($self) = @_;
		2654	my $NOW = time;
		2655
		2656	while (my ($k, $v) = each %{ $self->{item} }) {
		2657	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2658	}
		2659
		2660	my @widgets;
		2661	my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };
		2662	my $count = 10 + 1;
		2663	for my $item (@items) {
		2664	last unless --$count;
		2665
		2666	push @widgets, $item->{label} ||= do {
		2667	# TODO: doesn't handle markup well (read as: at all)
		2668	my $short = delete $item->{text};
		2669	for ($short) {
		2670	s/^\s+//;
		2671	s/\012.*//s;
		2672	my $len = int 30 / $item->{fontsize};
		2673	substr $_, $len, length, "…" if $len < length;
		2674	}
		2675
		2676	new CFClient::UI::Label
		2677	markup => $short,
		2678	tooltip => delete $item->{tooltip},
		2679	tooltip_font => $::FONT_PROP,
		2680	tooltip_width => 0.75,
		2681	fontsize => delete $item->{fontsize},
		2682	color => delete $item->{color},
		2683	can_events => 1,
		2684	can_hover => 1,
		2685	};
		2686	}
		2687
		2688	$self->clear;
		2689	$self->SUPER::add (@widgets);
		2690	}
		2691
		2692	sub add {
		2693	my ($self, $text, %arg) = @_;
		2694
		2695	my $item = {
		2696	time => time,
		2697	text => $text,
		2698	timeout => 60,
		2699	tooltip => $text,
		2700	fontsize => 0.8,
		2701	color => [0.8, 0.8, 0.8, 0.8],
		2702	%arg,
2324	}	2703	};
		2704
		2705	$item->{timeout} += time;
		2706	$item->{group} ||= $item+0;
		2707
		2708	$item = $self->{item}{$item->{group}} ||= $item;
		2709
		2710	$self->reorder;
2325	}	2711	}
2326		2712
2327	#############################################################################	2713	#############################################################################
2328		2714
2329	package CFClient::UI::Root;	2715	package CFClient::UI::Root;
2330		2716
2331	our @ISA = CFClient::UI::Container::;	2717	our @ISA = CFClient::UI::Container::;
2332		2718
2333	use CFClient::OpenGL;	2719	use CFClient::OpenGL;
2334		2720
2335	sub check_size {	2721	sub new {
2336	my ($self) = @_;	2722	my $class = shift;
2337		2723
2338	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2724	$class->SUPER::new (
2339	}	2725	@_,
2340		2726	)
2341	sub size_request {
2342	($::WIDTH, $::HEIGHT)
2343	}	2727	}
2344		2728
2345	sub configure {	2729	sub configure {
2346	my ($self, $x, $y, $w, $h) = @_;	2730	my ($self, $x, $y, $w, $h) = @_;
2347		2731
2348	$self->SUPER::configure ($x, $y, $w, $h);	2732	$self->{w} = $w;
		2733	$self->{h} = $h;
		2734	}
2349		2735
		2736	sub check_size {
		2737	my ($self) = @_;
		2738
		2739	$self->size_allocate ($self->{w}, $self->{h})
		2740	if $self->{w};
		2741	}
		2742
		2743	sub size_request {
		2744	my ($self) = @_;
		2745
		2746	($self->{w}, $self->{h})
		2747	}
		2748
		2749	sub size_allocate {
		2750	my ($self, $w, $h) = @_;
		2751
		2752	my $old_w = $self->{old_w};
		2753	my $old_h = $self->{old_h};
		2754
		2755	if ($old_w && $old_h) {
		2756	for my $child ($self->children) {
		2757	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
		2758	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
		2759	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
		2760	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
		2761	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
		2762	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
		2763	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
		2764	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
		2765	}
		2766	}
		2767
2350	for my $child (@{$self->{children}}) {	2768	for my $child ($self->children) {
2351	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2769	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2352		2770
2353	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2771	$X = List::Util::max 0, List::Util::min $w - $W, $X;
2354	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2772	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2355	$child->configure ($X, $Y, $W,$H);	2773	$child->configure ($X, $Y, $W, $H);
2356	}	2774	}
2357	}
2358		2775
2359	sub _topleft {	2776	$self->{old_w} = $w;
		2777	$self->{old_h} = $h;
		2778	}
		2779
		2780	sub coord2local {
2360	my ($self, $x, $y) = @_;	2781	my ($self, $x, $y) = @_;
2361		2782
2362	($x, $y)	2783	($x, $y)
2363	}	2784	}
2364		2785
		2786	sub coord2global {
		2787	my ($self, $x, $y) = @_;
		2788
		2789	($x, $y)
		2790	}
		2791
2365	sub update {	2792	sub update {
2366	my ($self) = @_;	2793	my ($self) = @_;
2367		2794
2368	$self->check_size;	2795	$self->check_size;
2369	::refresh ();	2796	$::WANT_REFRESH++;
2370	}	2797	}
2371		2798
2372	sub add {	2799	sub add {
2373	my ($self, $child) = @_;	2800	my ($self, $child) = @_;
2374		2801
2375	# integerize window positions	2802	# integerise window positions
2376	$child->{x} = int $child->{x};	2803	$child->{x} = int $child->{x};
2377	$child->{y} = int $child->{y};	2804	$child->{y} = int $child->{y};
2378		2805
2379	$self->SUPER::add ($child);	2806	$self->SUPER::add ($child);
2380	}	2807	}
…		…
2383	my ($self, $id, $cb) = @_;	2810	my ($self, $id, $cb) = @_;
2384		2811
2385	$self->{refresh_hook}{$id} = $cb;	2812	$self->{refresh_hook}{$id} = $cb;
2386	}	2813	}
2387		2814
2388	sub draw {	2815	sub draw {
2389	my ($self) = @_;	2816	my ($self) = @_;
2390		2817
		2818	if ($self->{check_size}) {
		2819	my @queue = ([], []);
		2820
		2821	for (;;) {
		2822	if ($self->{check_size}) {
		2823	# heuristic: check containers last
		2824	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2825	for values %{delete $self->{check_size}}
		2826	}
		2827
		2828	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		2829
		2830	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2831	? @$widget{qw(user_w user_h)}
		2832	: $widget->size_request;
		2833
		2834	if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
		2835	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		2836
		2837	$widget->{req_w} = $w;
		2838	$widget->{req_h} = $h;
		2839
		2840	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
		2841
		2842	$widget->{parent}->check_size
		2843	if $widget->{parent};
		2844	}
		2845	}
		2846	}
		2847
		2848	while ($self->{size_alloc}) {
		2849	for (values %{delete $self->{size_alloc}}) {
		2850	my ($widget, $w, $h) = @$_;
		2851
		2852	$w = 0 if $w < 0;
		2853	$h = 0 if $h < 0;
		2854
		2855	$widget->{w} = $w;
		2856	$widget->{h} = $h;
		2857	$widget->size_allocate ($w, $h);
		2858	$widget->emit (size_allocate => $w, $h);
		2859	}
		2860	}
		2861
2391	while (my $rcb = delete $self->{refresh_hook}) {	2862	while ($self->{refresh_hook}) {
2392	$_->() for values %$rcb;	2863	$_->()
		2864	for values %{delete $self->{refresh_hook}};
2393	}	2865	}
2394		2866
2395	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2867	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2396	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2868	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2397	glClear GL_COLOR_BUFFER_BIT;	2869	glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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