[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.172 by root, Tue Apr 25 09:52:04 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
241	sub children {	246	sub children {
242	}	247	}
243		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
244	sub set_max_size {	261	sub set_max_size {
245	my ($self, $w, $h) = @_;	262	my ($self, $w, $h) = @_;
246		263
247	delete $self->{max_w}; $self->{max_w} = $w if $w;	264	delete $self->{max_w}; $self->{max_w} = $w if $w;
248	delete $self->{max_h}; $self->{max_h} = $h if $h;	265	delete $self->{max_h}; $self->{max_h} = $h if $h;
249	}
250
251	# return top left coordinates
252	sub _topleft {
253	my ($self, $x, $y) = @_;
254
255	$self->{parent}
256	or Carp::confess "no parent widget in _topleft\n";#d#
257
258	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
259	}	266	}
260		267
261	# translate global coordinates to local coordinate system	268	# translate global coordinates to local coordinate system
262	sub coord2local {	269	sub coord2local {
263	my ($self, $x, $y) = @_;	270	my ($self, $x, $y) = @_;
264		271
265	my ($X, $Y) = $self->_topleft;	272	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
266	($x - $X, $y - $Y)
267	}	273	}
268		274
269	# translate local coordinates to global coordinate system	275	# translate local coordinates to global coordinate system
270	sub coord2global {	276	sub coord2global {
271	my ($self, $x, $y) = @_;	277	my ($self, $x, $y) = @_;
272		278
273	my ($X, $Y) = $self->_topleft;	279	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
274	($x + $X, $y + $Y)
275	}	280	}
276		281
277	sub focus_in {	282	sub focus_in {
278	my ($self) = @_;	283	my ($self) = @_;
279		284
…		…
377		382
378	sub set_parent {	383	sub set_parent {
379	my ($self, $parent) = @_;	384	my ($self, $parent) = @_;
380		385
381	Scalar::Util::weaken ($self->{parent} = $parent);	386	Scalar::Util::weaken ($self->{parent} = $parent);
		387
		388	$self->check_size
		389	unless exists $self->{req_w};
382	}	390	}
383		391
384	sub check_size {	392	sub check_size {
385	my ($self) = @_;	393	my ($self) = @_;
386		394
387	$self->{parent}	395	$CFClient::UI::ROOT->{check_size}{$self} = $self;
388	or return 1;
389
390	my ($w, $h) = $self->{user_w} && $self->{user_h}
391	? @$self{qw(user_w user_h)}
392	: $self->size_request;
393
394	if ($w != $self->{req_w} \|\| $h != $self->{req_h}) {
395	$self->{req_w} = $w;
396	$self->{req_h} = $h;
397
398	$self->{parent}->check_size
399	or $self->size_allocate (
400	(List::Util::max $self->{w}, $w),
401	(List::Util::max $self->{h}, $h),
402	);
403
404	1
405	} else {
406	0
407	}
408	}	396	}
409		397
410	sub update {	398	sub update {
411	my ($self) = @_;	399	my ($self) = @_;
412		400
…		…
509		497
510	$self	498	$self
511	}	499	}
512		500
513	sub add {	501	sub add {
514	my ($self, $child) = @_;	502	my ($self, @widgets) = @_;
515		503
516	$child->set_parent ($self);	504	$_->set_parent ($self)
		505	for @widgets;
517		506
518	use sort 'stable';	507	use sort 'stable';
519		508
520	$self->{children} = [	509	$self->{children} = [
521	sort { $a->{z} <=> $b->{z} }	510	sort { $a->{z} <=> $b->{z} }
522	@{$self->{children}}, $child	511	@{$self->{children}}, @widgets
523	];	512	];
524		513
525	$child->check_size;	514	$self->check_size;
		515	$self->update;
526	}	516	}
527		517
528	sub children {	518	sub children {
529	@{ $_[0]{children} }	519	@{ $_[0]{children} }
530	}	520	}
…		…
549		539
550	for (@$children) {	540	for (@$children) {
551	delete $_->{parent};	541	delete $_->{parent};
552	$_->hide;	542	$_->hide;
553	}	543	}
		544
		545	$self->check_size;
		546	$self->update;
554	}	547	}
555		548
556	sub find_widget {	549	sub find_widget {
557	my ($self, $x, $y) = @_;	550	my ($self, $x, $y) = @_;
558		551
…		…
633	}	626	}
634		627
635	sub update {	628	sub update {
636	my ($self) = @_;	629	my ($self) = @_;
637		630
638	# we want to do this delayed...	631	$ROOT->on_refresh ($self => sub { $self->render_child });
639	$self->render_chld;
640	$self->SUPER::update;	632	$self->SUPER::update;
641	}
642
643	sub render_chld {
644	my ($self) = @_;
645
646	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
647	glClearColor 0, 0, 0, 1;
648	glClear GL_COLOR_BUFFER_BIT;
649	$self->child->draw;
650	};
651	}	633	}
652		634
653	sub size_allocate {	635	sub size_allocate {
654	my ($self, $w, $h) = @_;	636	my ($self, $w, $h) = @_;
655		637
656	$self->child->configure (0, 0, $w, $h);	638	$self->SUPER::size_allocate ($w, $h);
		639	$self->update;
		640	}
657		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
658	$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	};
659	}	662	}
660		663
661	sub _draw {	664	sub _draw {
662	my ($self) = @_;	665	my ($self) = @_;
663		666
664	my ($w, $h) = ($self->w, $self->h);	667	my ($w, $h) = ($self->w, $self->h);
665		668
666	my $tex = $self->{texture}	669	my $tex = $self->{texture}
667	or return;	670	or return;
668		671
669	glEnable GL_BLEND;
670	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
671	glEnable GL_TEXTURE_2D;	672	glEnable GL_TEXTURE_2D;
672	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;
673		675
674	$tex->draw_quad (0, 0, $w, $h);	676	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
675		677
676	glDisable GL_BLEND;
677	glDisable GL_TEXTURE_2D;	678	glDisable GL_TEXTURE_2D;
678	}	679	}
679		680
680	#############################################################################	681	#############################################################################
681		682
682	package CFClient::UI::ViewPort;	683	package CFClient::UI::ViewPort;
683		684
684	our @ISA = CFClient::UI::Window::;	685	our @ISA = CFClient::UI::Window::;
685		686
686	sub new { die }
687
688	sub size_request {	687	sub size_request {
689	my ($self) = @_;	688	my ($self) = @_;
690		689
691	@$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)};
692	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	691	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
693		692
694	@$self{qw(child_w child_h)}	693	@$self{qw(child_w child_h)}
695	}	694	}
696		695
697	sub _draw {	696	sub size_allocate {
698	my ($self) = @_;	697	my ($self, $w, $h) = @_;
699		698
700	$self->{children}[1]->draw;	699	$self->update;
701	}	700	}
702		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
703		781
704	#############################################################################	782	#############################################################################
705		783
706	package CFClient::UI::Frame;	784	package CFClient::UI::Frame;
707		785
…		…
764	# TODO: user_x, user_y, overwrite moveto?	842	# TODO: user_x, user_y, overwrite moveto?
765		843
766	my $self = $class->SUPER::new (	844	my $self = $class->SUPER::new (
767	bg => [1, 1, 1, 1],	845	bg => [1, 1, 1, 1],
768	border_bg => [1, 1, 1, 1],	846	border_bg => [1, 1, 1, 1],
769	border => 0.8,	847	border => 0.6,
770	can_events => 1,	848	can_events => 1,
771	@_	849	@_
772	);	850	);
773		851
774	$self->{title} &&= new CFClient::UI::Label	852	$self->{title} &&= new CFClient::UI::Label
775	align => 0,	853	align => 0,
776	valign => 1,	854	valign => 1,
777	text => $self->{title},	855	text => $self->{title},
778	fontsize => 1;	856	fontsize => $self->{border};
779		857
780	$self	858	$self
781	}	859	}
782		860
783	sub border {	861	sub border {
…		…
808	}	886	}
809		887
810	sub button_down {	888	sub button_down {
811	my ($self, $ev, $x, $y) = @_;	889	my ($self, $ev, $x, $y) = @_;
812		890
		891	my ($w, $h) = @$self{qw(w h)};
813	my $border = $self->border;	892	my $border = $self->border;
814		893
815	if ($x < $self->{w} && $x >= $self->{w} - $border	894	my $lr = ($x >= 0 && $x < $border) \|\| ($x > $w - $border && $x < $w);
816	&& $y < $self->{h} && $y >= $self->{h} - $border) {	895	my $td = ($y >= 0 && $y < $border) \|\| ($y > $h - $border && $y < $h);
817		896
		897	if ($lr & $td) {
		898	my ($wx, $wy) = ($self->{x}, $self->{y});
818	my ($ox, $oy) = ($ev->{x}, $ev->{y});	899	my ($ox, $oy) = ($ev->{x}, $ev->{y});
819	my ($bw, $bh) = ($self->{w}, $self->{h});	900	my ($bw, $bh) = ($self->{w}, $self->{h});
820		901
		902	my $mx = $x < $border;
		903	my $my = $y < $border;
		904
821	$self->{motion} = sub {	905	$self->{motion} = sub {
822	my ($ev, $x, $y) = @_;	906	my ($ev, $x, $y) = @_;
823		907
824	($x, $y) = ($ev->{x}, $ev->{y});	908	my $dx = $ev->{x} - $ox;
		909	my $dy = $ev->{y} - $oy;
825		910
826	$self->{user_w} = $bw + $x - $ox;	911	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
827	$self->{user_h} = $bh + $y - $oy;	912	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		913	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
828	$self->check_size;	914	$self->check_size;
829	};	915	};
830		916
831	} elsif ($x >= 0 && $x < $self->{w}	917	} elsif ($lr ^ $td) {
832	&& $y >= 0 && $y < $border) {
833
834	my ($ox, $oy) = ($ev->{x}, $ev->{y});	918	my ($ox, $oy) = ($ev->{x}, $ev->{y});
835	my ($bx, $by) = ($self->{x}, $self->{y});	919	my ($bx, $by) = ($self->{x}, $self->{y});
836		920
837	$self->{motion} = sub {	921	$self->{motion} = sub {
838	my ($ev, $x, $y) = @_;	922	my ($ev, $x, $y) = @_;
…		…
874	$tex[1]->draw_quad (0, 0, $w, $border);	958	$tex[1]->draw_quad (0, 0, $w, $border);
875	$tex[3]->draw_quad (0, $border, $border, $ch);	959	$tex[3]->draw_quad (0, $border, $border, $ch);
876	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	960	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
877	$tex[4]->draw_quad (0, $h - $border, $w, $border);	961	$tex[4]->draw_quad (0, $h - $border, $w, $border);
878		962
		963	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
879	my $bg = $tex[0];	964	my $bg = $tex[0];
880		965
881	# TODO: repeat texture not scale	966	# TODO: repeat texture not scale
882	my $rep_x = $cw / $bg->{w};	967	my $rep_x = $cw / $bg->{w};
883	my $rep_y = $ch / $bg->{h};	968	my $rep_y = $ch / $bg->{h};
884		969
885	glColor @{ $self->{bg} };	970	glColor @{ $self->{bg} };
886		971
887	$bg->{s} = $rep_x;	972	$bg->{s} = $rep_x;
888	$bg->{t} = $rep_y;	973	$bg->{t} = $rep_y;
889	$bg->{wrap_mode} = 1;	974	$bg->{wrap_mode} = 1;
890	$bg->draw_quad ($border, $border, $cw, $ch);	975	$bg->draw_quad ($border, $border, $cw, $ch);
891		976
892	glDisable GL_TEXTURE_2D;	977	glDisable GL_TEXTURE_2D;
893	glDisable GL_BLEND;	978	glDisable GL_BLEND;
		979	}
894		980
895	$self->{title}->draw if $self->{title};	981	$self->{title}->draw if $self->{title};
		982
896	$self->child->draw;	983	$self->child->draw;
897	}	984	}
898		985
899	#############################################################################	986	#############################################################################
900		987
…		…
1124	}	1211	}
1125		1212
1126	sub size_allocate {	1213	sub size_allocate {
1127	my ($self, $w, $h) = @_;	1214	my ($self, $w, $h) = @_;
1128		1215
		1216	Carp::confess "negative size" if $w < 0 \|\| $h < 0;#d#
		1217
1129	my $children = $self->{children};	1218	my $children = $self->{children};
1130		1219
1131	my @h = map $_->{req_h}, @$children;	1220	my @h = map $_->{req_h}, @$children;
1132		1221
1133	my $req_h = List::Util::sum @h;	1222	my $req_h = List::Util::sum @h;
…		…
1172	my ($class, %arg) = @_;	1261	my ($class, %arg) = @_;
1173		1262
1174	my $self = $class->SUPER::new (	1263	my $self = $class->SUPER::new (
1175	fg => [1, 1, 1],	1264	fg => [1, 1, 1],
1176	#font => default_font	1265	#font => default_font
		1266	#text => initial text
		1267	#markup => initial narkup
		1268	layout => (new CFClient::Layout),
1177	fontsize => 1,	1269	fontsize => 1,
1178	text => "",
1179	align => -1,	1270	align => -1,
1180	valign => -1,	1271	valign => -1,
1181	padding => 2,	1272	padding => 2,
1182	layout => new CFClient::Layout,
1183	can_events => 0,	1273	can_events => 0,
1184	%arg	1274	%arg
1185	);	1275	);
1186		1276
1187	if (exists $self->{template}) {	1277	if (exists $self->{template}) {
1188	my $layout = new CFClient::Layout;	1278	my $layout = new CFClient::Layout;
1189	$layout->set_text (delete $self->{template});	1279	$layout->set_text (delete $self->{template});
1190	$self->{template} = $layout;	1280	$self->{template} = $layout;
1191	}	1281	}
1192		1282
1193	$self->set_text (delete $self->{text}) if exists $self->{text};	1283	if (exists $self->{markup}) {
1194	$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	}
1195		1288
1196	$self	1289	$self
1197	}	1290	}
1198		1291
1199	sub escape {	1292	sub escape {
…		…
1204	s/</</g;	1297	s/</</g;
1205		1298
1206	$_[1]	1299	$_[1]
1207	}	1300	}
1208		1301
		1302	sub update {
		1303	my ($self) = @_;
		1304
		1305	delete $self->{texture};
		1306	$self->SUPER::update;
		1307	}
		1308
1209	sub set_text {	1309	sub set_text {
1210	my ($self, $text) = @_;	1310	my ($self, $text) = @_;
1211		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;
1212	$self->{layout}->set_text ($text);	1316	$self->{layout}->set_text ($text);
1213		1317
1214	delete $self->{texture};	1318	$self->update;
1215	$self->check_size;	1319	$self->check_size;
1216	$self->update;
1217	}	1320	}
1218		1321
1219	sub set_markup {	1322	sub set_markup {
1220	my ($self, $markup) = @_;	1323	my ($self, $markup) = @_;
1221		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;
1222	$self->{layout}->set_markup ($markup);	1331	$self->{layout}->set_markup ($markup);
1223		1332
1224	delete $self->{texture};	1333	$self->update;
1225	$self->check_size;	1334	$self->check_size;
1226	$self->update;
1227	}	1335	}
1228		1336
1229	sub size_request {	1337	sub size_request {
1230	my ($self) = @_;	1338	my ($self) = @_;
1231		1339
…		…
1260	sub set_fontsize {	1368	sub set_fontsize {
1261	my ($self, $fontsize) = @_;	1369	my ($self, $fontsize) = @_;
1262		1370
1263	$self->{fontsize} = $fontsize;	1371	$self->{fontsize} = $fontsize;
1264	delete $self->{texture};	1372	delete $self->{texture};
		1373
		1374	$self->update;
1265	$self->check_size;	1375	$self->check_size;
1266	$self->update;
1267	}	1376	}
1268		1377
1269	sub _draw {	1378	sub _draw {
1270	my ($self) = @_;	1379	my ($self) = @_;
1271		1380
1272	my $tex = $self->{texture} \|\|= do {	1381	my $tex = $self->{texture} \|\|= do {
		1382	$self->{layout}->set_foreground (@{$self->{fg}});
1273	$self->{layout}->set_font ($self->{font}) if $self->{font};	1383	$self->{layout}->set_font ($self->{font}) if $self->{font};
1274	$self->{layout}->set_width ($self->{w});	1384	$self->{layout}->set_width ($self->{w});
1275	$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
1276	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
1277	};	1398	};
1278		1399
1279	glEnable GL_BLEND;
1280	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1281	glEnable GL_TEXTURE_2D;	1400	glEnable GL_TEXTURE_2D;
1282	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1401	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1283		1402
		1403	if ($tex->{format} == GL_ALPHA) {
1284	glColor @{$self->{fg}};	1404	glColor @{$self->{fg}};
1285
1286	$self->{ox} = int (
1287	$self->{align} < 0 ? $self->{padding}
1288	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1289	: ($self->{w} - $tex->{w}) * 0.5
1290	);
1291
1292	$self->{oy} = int (
1293	$self->{valign} < 0 ? $self->{padding}
1294	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1295	: ($self->{h} - $tex->{h}) * 0.5
1296	);
1297
1298	$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	}
1299		1409
1300	glDisable GL_TEXTURE_2D;	1410	glDisable GL_TEXTURE_2D;
1301	glDisable GL_BLEND;
1302	}	1411	}
1303		1412
1304	#############################################################################	1413	#############################################################################
1305		1414
1306	package CFClient::UI::EntryBase;	1415	package CFClient::UI::EntryBase;
…		…
1341	$self->{layout}->set_text ("$text ");	1450	$self->{layout}->set_text ("$text ");
1342		1451
1343	$self->emit (changed => $self->{text});	1452	$self->emit (changed => $self->{text});
1344	}	1453	}
1345		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
1346	sub get_text {	1464	sub get_text {
1347	$_[0]{text}	1465	$_[0]{text}
1348	}	1466	}
1349		1467
1350	sub size_request {	1468	sub size_request {
…		…
1357		1475
1358	sub size_allocate {	1476	sub size_allocate {
1359	my ($self, $w, $h) = @_;	1477	my ($self, $w, $h) = @_;
1360		1478
1361	$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
1362	}
1363
1364	sub set_text {
1365	my ($self, $text) = @_;
1366
1367	$self->{cursor} = length $text;
1368	$self->_set_text ($text);
1369	$self->update;
1370	}	1480	}
1371		1481
1372	sub key_down {	1482	sub key_down {
1373	my ($self, $ev) = @_;	1483	my ($self, $ev) = @_;
1374		1484
…		…
1562		1672
1563	if ($GRAB == $self) {	1673	if ($GRAB == $self) {
1564	$self->{fg} = $self->{active_fg};	1674	$self->{fg} = $self->{active_fg};
1565	}	1675	}
1566		1676
1567	glEnable GL_BLEND;
1568	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1569	glEnable GL_TEXTURE_2D;	1677	glEnable GL_TEXTURE_2D;
1570	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1678	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1571	glColor 0, 0, 0, 1;	1679	glColor 0, 0, 0, 1;
1572		1680
1573	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1681	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1574		1682
1575	glDisable GL_TEXTURE_2D;	1683	glDisable GL_TEXTURE_2D;
1576	glDisable GL_BLEND;
1577		1684
1578	$self->SUPER::_draw;	1685	$self->SUPER::_draw;
1579	}	1686	}
1580		1687
1581	#############################################################################	1688	#############################################################################
…		…
1628		1735
1629	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;
1630		1737
1631	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1738	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1632		1739
1633	glEnable GL_BLEND;
1634	glEnable GL_TEXTURE_2D;	1740	glEnable GL_TEXTURE_2D;
1635	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1636		1741
1637	my $tex = $self->{state} ? $tex[1] : $tex[0];	1742	my $tex = $self->{state} ? $tex[1] : $tex[0];
1638		1743
1639	$tex->draw_quad (0, 0, $s, $s);	1744	$tex->draw_quad_alpha (0, 0, $s, $s);
1640		1745
1641	glDisable GL_TEXTURE_2D;	1746	glDisable GL_TEXTURE_2D;
1642	glDisable GL_BLEND;
1643	}	1747	}
1644		1748
1645	#############################################################################	1749	#############################################################################
1646		1750
1647	package CFClient::UI::Image;	1751	package CFClient::UI::Image;
…		…
1690	glTranslate 0, -$self->{w}, 0;	1794	glTranslate 0, -$self->{w}, 0;
1691		1795
1692	($w, $h) = ($h, $w);	1796	($w, $h) = ($h, $w);
1693	}	1797	}
1694		1798
1695	glEnable GL_BLEND;
1696	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1697	glEnable GL_TEXTURE_2D;	1799	glEnable GL_TEXTURE_2D;
1698	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1800	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1699		1801
1700	$tex->draw_quad (0, 0, $w, $h);	1802	$tex->draw_quad_alpha (0, 0, $w, $h);
1701		1803
1702	glDisable GL_BLEND;
1703	glDisable GL_TEXTURE_2D;	1804	glDisable GL_TEXTURE_2D;
1704	}	1805	}
1705		1806
1706	#############################################################################	1807	#############################################################################
1707		1808
…		…
1755	}	1856	}
1756		1857
1757	sub set_max {	1858	sub set_max {
1758	my ($self, $max) = @_;	1859	my ($self, $max) = @_;
1759		1860
		1861	return if $self->{max_val} == $max;
		1862
1760	$self->{max_val} = $max;	1863	$self->{max_val} = $max;
		1864	$self->update;
1761	}	1865	}
1762		1866
1763	sub set_value {	1867	sub set_value {
1764	my ($self, $val, $max) = @_;	1868	my ($self, $val, $max) = @_;
1765		1869
1766	$self->set_max ($max)	1870	$self->set_max ($max)
1767	if defined $max;	1871	if defined $max;
1768		1872
1769	$max = $self->{max_val};	1873	return if $self->{val} == $val;
		1874
1770	$self->{val} = $val;	1875	$self->{val} = $val;
1771
1772	$self->update;	1876	$self->update;
1773	}	1877	}
1774		1878
1775	sub _draw {	1879	sub _draw {
1776	my ($self) = @_;	1880	my ($self) = @_;
…		…
1859		1963
1860	$self->{value}->set_fontsize ($fsize);	1964	$self->{value}->set_fontsize ($fsize);
1861	$self->{max} ->set_fontsize ($fsize);	1965	$self->{max} ->set_fontsize ($fsize);
1862	}	1966	}
1863		1967
		1968	sub set_max {
		1969	my ($self, $max) = @_;
		1970
		1971	$self->{gauge}->set_max ($max);
		1972	$self->{max}->set_text ($max);
		1973	}
		1974
1864	sub set_value {	1975	sub set_value {
1865	my ($self, $val, $max) = @_;	1976	my ($self, $val, $max) = @_;
1866		1977
1867	$self->set_max ($max)	1978	$self->set_max ($max)
1868	if defined $max;	1979	if defined $max;
1869		1980
1870	$self->{gauge}->set_value ($val, $max);	1981	$self->{gauge}->set_value ($val, $max);
1871	$self->{value}->set_text ($val);	1982	$self->{value}->set_text ($val);
1872	}
1873
1874	sub set_max {
1875	my ($self, $max) = @_;
1876
1877	$self->{gauge}->set_max ($max);
1878	$self->{max}->set_text ($max);
1879	}	1983	}
1880		1984
1881	#############################################################################	1985	#############################################################################
1882		1986
1883	package CFClient::UI::Slider;	1987	package CFClient::UI::Slider;
…		…
1902	# TODO: calculations are off	2006	# TODO: calculations are off
1903	my $self = $class->SUPER::new (	2007	my $self = $class->SUPER::new (
1904	fg => [1, 1, 1],	2008	fg => [1, 1, 1],
1905	active_fg => [0, 0, 0],	2009	active_fg => [0, 0, 0],
1906	range => [0, 0, 100, 10],	2010	range => [0, 0, 100, 10],
1907	req_w => 20,	2011	req_w => $::WIDTH / 80,
1908	req_h => 20,	2012	req_h => $::WIDTH / 80,
1909	vertical => 0,	2013	vertical => 0,
1910	can_hover => 1,	2014	can_hover => 1,
1911	inner_pad => 5,	2015	inner_pad => 5,
1912	@_	2016	@_
1913	);	2017	);
…		…
1996	$page \|\|= 2;	2100	$page \|\|= 2;
1997		2101
1998	my $knob_a = $inner_pad_px + ($value - $page * 0.5);	2102	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1999	my $knob_b = $inner_pad_px + ($value + $page * 0.5);	2103	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2000		2104
2001	glEnable GL_BLEND;
2002	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2003	glEnable GL_TEXTURE_2D;	2105	glEnable GL_TEXTURE_2D;
2004	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2106	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2005		2107
2006	# draw background	2108	# draw background
2007	$tex[1]->draw_quad (0, 0, $w, $h);	2109	$tex[1]->draw_quad_alpha (0, 0, $w, $h);
2008		2110
2009	# draw handle	2111	# draw handle
2010	$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);
2011		2113
2012	glDisable GL_BLEND;
2013	glDisable GL_TEXTURE_2D;	2114	glDisable GL_TEXTURE_2D;
2014	}	2115	}
2015		2116
2016	#############################################################################	2117	#############################################################################
2017		2118
…		…
2028	fontsize => 1,	2129	fontsize => 1,
2029	can_events => 0,	2130	can_events => 0,
2030	#font => default_font	2131	#font => default_font
2031	@_,	2132	@_,
2032		2133
2033	layout => (new CFClient::Layout),	2134	layout => (new CFClient::Layout 1),
2034	par => [],	2135	par => [],
2035	height => 0,	2136	height => 0,
2036	children => [	2137	children => [
2037	(new CFClient::UI::Empty expand => 1),	2138	(new CFClient::UI::Empty expand => 1),
2038	(new CFClient::UI::Slider vertical => 1),	2139	(new CFClient::UI::Slider vertical => 1),
2039	],	2140	],
2040	);	2141	);
2041		2142
2042	$self->{children}[1]->connect (changed => sub {	2143	$self->{children}[1]->connect (changed => sub { $self->update });
2043	$self->update;
2044	});
2045		2144
2046	$self	2145	$self
2047	}	2146	}
2048		2147
2049	sub set_fontsize {	2148	sub set_fontsize {
…		…
2057	my ($self, $text) = @_;	2156	my ($self, $text) = @_;
2058		2157
2059	my $layout = $self->{layout};	2158	my $layout = $self->{layout};
2060		2159
2061	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2160	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2062	$layout->set_width ($self->{w});	2161	$layout->set_width ($self->{children}[0]{w});
2063	$layout->set_text ($text);	2162	$layout->set_markup ($text);
2064		2163
2065	($layout->size)[1]	2164	($layout->size)[1]
2066	}	2165	}
2067		2166
2068	sub reflow {	2167	sub reflow {
…		…
2120	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2219	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2121		2220
2122	delete $self->{texture};	2221	delete $self->{texture};
2123	}	2222	}
2124		2223
2125	$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 {
2126	glClearColor 0, 0, 0, 1;	2225	glClearColor 0, 0, 0, 0;
2127	glClear GL_COLOR_BUFFER_BIT;	2226	glClear GL_COLOR_BUFFER_BIT;
2128		2227
2129	glEnable GL_BLEND;
2130	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2131	glEnable GL_TEXTURE_2D;	2228	glEnable GL_TEXTURE_2D;
2132	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2229	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2133		2230
2134	my $top = int $self->{children}[1]{range}[0];	2231	my $top = int $self->{children}[1]{range}[0];
2135		2232
…		…
2144		2241
2145	for my $par (@{$self->{par}}) {	2242	for my $par (@{$self->{par}}) {
2146	my $h = $par->[0];	2243	my $h = $par->[0];
2147		2244
2148	if ($y0 < $y + $h && $y < $y1) {	2245	if ($y0 < $y + $h && $y < $y1) {
		2246	$layout->set_foreground (@{ $par->[1] });
2149	$layout->set_text ($par->[2]);	2247	$layout->set_markup ($par->[2]);
2150		2248
2151	glColor @{ $par->[1] };
2152	my ($W, $H) = $layout->size;	2249	my ($W, $H) = $layout->size;
2153	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);
2154	}	2251	}
2155		2252
2156	$y += $h;	2253	$y += $h;
2157	}	2254	}
2158		2255
2159	glDisable GL_TEXTURE_2D;	2256	glDisable GL_TEXTURE_2D;
2160	glDisable GL_BLEND;
2161	};	2257	};
2162	});	2258	});
2163	}	2259	}
2164		2260
2165	sub _draw {	2261	sub _draw {
2166	my ($self) = @_;	2262	my ($self) = @_;
2167		2263
2168	if ($self->{texture}) {
2169	glEnable GL_TEXTURE_2D;	2264	glEnable GL_TEXTURE_2D;
2170	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2265	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171	glColor 1, 1, 1, 1;	2266	glColor 1, 1, 1, 1;
2172	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2267	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2173	glDisable GL_TEXTURE_2D;	2268	glDisable GL_TEXTURE_2D;
2174	}
2175		2269
2176	$self->{children}[1]->draw;	2270	$self->{children}[1]->draw;
2177		2271
2178	}	2272	}
2179		2273
…		…
2274	can_events => 0,	2368	can_events => 0,
2275	)	2369	)
2276	}	2370	}
2277		2371
2278	sub set_markup {	2372	sub set_markup {
2279	my ($self, $text) = @_;	2373	my ($self, $text, $font) = @_;
2280		2374
2281	$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);
2282	$self->{label}->set_markup ($text);	2381	$self->{label}->set_markup ($text);
2283	$self->add ($self->{label});	2382	$self->add ($self->{label});
2284	}	2383	}
2285		2384
2286	sub size_request {	2385	sub size_request {
2287	my ($self) = @_;	2386	my ($self) = @_;
2288
2289	$self->child->set_max_size ($::WIDTH * 0.3);
2290		2387
2291	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2388	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2292		2389
2293	($w + 4, $h + 4)	2390	($w + 4, $h + 4)
2294	}	2391	}
…		…
2348		2445
2349	sub size_request {	2446	sub size_request {
2350	(32, 8)	2447	(32, 8)
2351	}	2448	}
2352		2449
2353	sub draw {	2450	sub _draw {
2354	my ($self) = @_;	2451	my ($self) = @_;
2355		2452
		2453	return unless $::CONN;#d# manage and cache textures differently
2356	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2454	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2357		2455
		2456	# TODO animation
2358	if ($tex) {	2457	if ($tex) {
2359	glEnable GL_BLEND;
2360	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361	glEnable GL_TEXTURE_2D;	2458	glEnable GL_TEXTURE_2D;
2362	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2459	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2363	glColor 1, 1, 1, 1;	2460	glColor 1, 1, 1, 1;
2364	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2461	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365	glDisable GL_TEXTURE_2D;	2462	glDisable GL_TEXTURE_2D;
2366	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,
2367	}	2702	};
		2703
		2704	$item->{timeout} += time;
		2705	$item->{group} \|\|= $item+0;
		2706
		2707	$item = $self->{item}{$item->{group}} \|\|= $item;
		2708
		2709	$self->reorder;
2368	}	2710	}
2369		2711
2370	#############################################################################	2712	#############################################################################
2371		2713
2372	package CFClient::UI::Root;	2714	package CFClient::UI::Root;
2373		2715
2374	our @ISA = CFClient::UI::Container::;	2716	our @ISA = CFClient::UI::Container::;
2375		2717
2376	use CFClient::OpenGL;	2718	use CFClient::OpenGL;
2377		2719
2378	sub check_size {	2720	sub new {
2379	my ($self) = @_;	2721	my $class = shift;
2380		2722
2381	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2723	$class->SUPER::new (
2382	}	2724	@_,
2383		2725	)
2384	sub size_request {
2385	($::WIDTH, $::HEIGHT)
2386	}	2726	}
2387		2727
2388	sub configure {	2728	sub configure {
2389	my ($self, $x, $y, $w, $h) = @_;	2729	my ($self, $x, $y, $w, $h) = @_;
2390		2730
2391	$self->SUPER::configure ($x, $y, $w, $h);	2731	$self->{w} = $w;
		2732	$self->{h} = $h;
		2733	}
2392		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
2393	for my $child (@{$self->{children}}) {	2767	for my $child ($self->children) {
2394	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)};
2395		2769
2396	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2770	$X = List::Util::max 0, List::Util::min $w - $W, $X;
2397	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2771	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2398	$child->configure ($X, $Y, $W,$H);	2772	$child->configure ($X, $Y, $W, $H);
2399	}	2773	}
2400	}
2401		2774
2402	sub _topleft {	2775	$self->{old_w} = $w;
		2776	$self->{old_h} = $h;
		2777	}
		2778
		2779	sub coord2local {
2403	my ($self, $x, $y) = @_;	2780	my ($self, $x, $y) = @_;
2404		2781
2405	($x, $y)	2782	($x, $y)
2406	}	2783	}
2407		2784
		2785	sub coord2global {
		2786	my ($self, $x, $y) = @_;
		2787
		2788	($x, $y)
		2789	}
		2790
2408	sub update {	2791	sub update {
2409	my ($self) = @_;	2792	my ($self) = @_;
2410		2793
2411	$self->check_size;	2794	$self->check_size;
2412	::refresh ();	2795	$::WANT_REFRESH++;
2413	}	2796	}
2414		2797
2415	sub add {	2798	sub add {
2416	my ($self, $child) = @_;	2799	my ($self, $child) = @_;
2417		2800
2418	# integerize window positions	2801	# integerise window positions
2419	$child->{x} = int $child->{x};	2802	$child->{x} = int $child->{x};
2420	$child->{y} = int $child->{y};	2803	$child->{y} = int $child->{y};
2421		2804
2422	$self->SUPER::add ($child);	2805	$self->SUPER::add ($child);
2423	}	2806	}
…		…
2426	my ($self, $id, $cb) = @_;	2809	my ($self, $id, $cb) = @_;
2427		2810
2428	$self->{refresh_hook}{$id} = $cb;	2811	$self->{refresh_hook}{$id} = $cb;
2429	}	2812	}
2430		2813
2431	sub draw {	2814	sub draw {
2432	my ($self) = @_;	2815	my ($self) = @_;
2433		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
2434	while (my $rcb = delete $self->{refresh_hook}) {	2861	while ($self->{refresh_hook}) {
2435	$_->() for values %$rcb;	2862	$_->()
		2863	for values %{delete $self->{refresh_hook}};
2436	}	2864	}
2437		2865
2438	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2866	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2439	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2867	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2440	glClear GL_COLOR_BUFFER_BIT;	2868	glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.172 by root, Tue Apr 25 09:52:04 2006 UTC vs. Revision 1.195 by root, Thu May 11 23:54:31 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.172 by root, Tue Apr 25 09:52:04 2006 UTC vs.
Revision 1.195 by root, Thu May 11 23:54:31 2006 UTC