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

Diff Legend

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