[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.196 by root, Fri May 12 00:16:34 2006 UTC

…		…
1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
23		24
24	my $tip = $widget->{tooltip};	25	my $tip = $widget->{tooltip};
25		26
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	27	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		28
28	$TOOLTIP->set_markup ($widget->{tooltip});	29	$TOOLTIP->set_tooltip_from ($widget);
29	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30	$TOOLTIP->show;	30	$TOOLTIP->show;
		31
		32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		33
		34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
		35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
		36	}
		37
		38	$TOOLTIP->move ($x, $y);
31	}	39	}
32		40
33	return;	41	return;
34	}	42	}
35	}	43	}
…		…
224	$self->{y} = $y;	232	$self->{y} = $y;
225	$self->update;	233	$self->update;
226	}	234	}
227		235
228	if ($self->{w} != $w \|\| $self->{h} != $h) {	236	if ($self->{w} != $w \|\| $self->{h} != $h) {
229	$self->{w} = $w;	237	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230	$self->{h} = $h;
231
232	$self->size_allocate ($w, $h);
233	$self->update;
234	}	238	}
235	}	239	}
236		240
237	sub size_allocate {	241	sub size_allocate {
238	# nothing to be done	242	# nothing to be done
239	}	243	}
240		244
241	sub children {	245	sub children {
242	}	246	}
243		247
		248	# call when resolution changes etc.
		249	sub reconfigure {
		250	my ($self) = @_;
		251
		252	$_->reconfigure
		253	for $self->children;
		254
		255	$self->check_size;
		256	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
		257	$self->update;
		258	}
		259
244	sub set_max_size {	260	sub set_max_size {
245	my ($self, $w, $h) = @_;	261	my ($self, $w, $h) = @_;
246		262
247	delete $self->{max_w}; $self->{max_w} = $w if $w;	263	delete $self->{max_w}; $self->{max_w} = $w if $w;
248	delete $self->{max_h}; $self->{max_h} = $h if $h;	264	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	}	265	}
260		266
261	# translate global coordinates to local coordinate system	267	# translate global coordinates to local coordinate system
262	sub coord2local {	268	sub coord2local {
263	my ($self, $x, $y) = @_;	269	my ($self, $x, $y) = @_;
264		270
265	my ($X, $Y) = $self->_topleft;	271	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
266	($x - $X, $y - $Y)
267	}	272	}
268		273
269	# translate local coordinates to global coordinate system	274	# translate local coordinates to global coordinate system
270	sub coord2global {	275	sub coord2global {
271	my ($self, $x, $y) = @_;	276	my ($self, $x, $y) = @_;
272		277
273	my ($X, $Y) = $self->_topleft;	278	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
274	($x + $X, $y + $Y)
275	}	279	}
276		280
277	sub focus_in {	281	sub focus_in {
278	my ($self) = @_;	282	my ($self) = @_;
279		283
…		…
377		381
378	sub set_parent {	382	sub set_parent {
379	my ($self, $parent) = @_;	383	my ($self, $parent) = @_;
380		384
381	Scalar::Util::weaken ($self->{parent} = $parent);	385	Scalar::Util::weaken ($self->{parent} = $parent);
		386
		387	$self->check_size
		388	unless exists $self->{req_w};
382	}	389	}
383		390
384	sub check_size {	391	sub check_size {
385	my ($self) = @_;	392	my ($self) = @_;
386		393
387	$self->{parent}	394	$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	}	395	}
409		396
410	sub update {	397	sub update {
411	my ($self) = @_;	398	my ($self) = @_;
412		399
…		…
509		496
510	$self	497	$self
511	}	498	}
512		499
513	sub add {	500	sub add {
514	my ($self, $child) = @_;	501	my ($self, @widgets) = @_;
515		502
516	$child->set_parent ($self);	503	$_->set_parent ($self)
		504	for @widgets;
517		505
518	use sort 'stable';	506	use sort 'stable';
519		507
520	$self->{children} = [	508	$self->{children} = [
521	sort { $a->{z} <=> $b->{z} }	509	sort { $a->{z} <=> $b->{z} }
522	@{$self->{children}}, $child	510	@{$self->{children}}, @widgets
523	];	511	];
524		512
525	$child->check_size;	513	$self->check_size;
		514	$self->update;
526	}	515	}
527		516
528	sub children {	517	sub children {
529	@{ $_[0]{children} }	518	@{ $_[0]{children} }
530	}	519	}
…		…
549		538
550	for (@$children) {	539	for (@$children) {
551	delete $_->{parent};	540	delete $_->{parent};
552	$_->hide;	541	$_->hide;
553	}	542	}
		543
		544	$self->check_size;
		545	$self->update;
554	}	546	}
555		547
556	sub find_widget {	548	sub find_widget {
557	my ($self, $x, $y) = @_;	549	my ($self, $x, $y) = @_;
558		550
…		…
633	}	625	}
634		626
635	sub update {	627	sub update {
636	my ($self) = @_;	628	my ($self) = @_;
637		629
638	# we want to do this delayed...	630	$ROOT->on_refresh ($self => sub { $self->render_child });
639	$self->render_chld;
640	$self->SUPER::update;	631	$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	}	632	}
652		633
653	sub size_allocate {	634	sub size_allocate {
654	my ($self, $w, $h) = @_;	635	my ($self, $w, $h) = @_;
655		636
656	$self->child->configure (0, 0, $w, $h);	637	$self->SUPER::size_allocate ($w, $h);
		638	$self->update;
		639	}
657		640
		641	sub _render {
		642	$_[0]{children}[0]->draw;
		643	}
		644
		645	sub render_child {
		646	my ($self) = @_;
		647
		648	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		649	glClearColor 0, 0, 0, 0;
		650	glClear GL_COLOR_BUFFER_BIT;
		651
658	$self->render_chld;	652	$self->_render;
		653	# glColorMask 1, 1, 1, 0;
		654	# glEnable GL_BLEND;
		655	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
		656	# glRasterPos 0, 0;
		657	# glCopyPixels 0, 0, $self->{w}, $self->{h};
		658	# glDisable GL_BLEND;
		659	# glColorMask 1, 1, 1, 1;
		660	};
659	}	661	}
660		662
661	sub _draw {	663	sub _draw {
662	my ($self) = @_;	664	my ($self) = @_;
663		665
664	my ($w, $h) = ($self->w, $self->h);	666	my ($w, $h) = ($self->w, $self->h);
665		667
666	my $tex = $self->{texture}	668	my $tex = $self->{texture}
667	or return;	669	or return;
668		670
669	glEnable GL_BLEND;
670	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
671	glEnable GL_TEXTURE_2D;	671	glEnable GL_TEXTURE_2D;
672	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	672	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		673	glColor 0, 0, 0, 1;
673		674
674	$tex->draw_quad (0, 0, $w, $h);	675	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
675		676
676	glDisable GL_BLEND;
677	glDisable GL_TEXTURE_2D;	677	glDisable GL_TEXTURE_2D;
678	}	678	}
679		679
680	#############################################################################	680	#############################################################################
681		681
682	package CFClient::UI::ViewPort;	682	package CFClient::UI::ViewPort;
683		683
684	our @ISA = CFClient::UI::Window::;	684	our @ISA = CFClient::UI::Window::;
685		685
686	sub new { die }
687
688	sub size_request {	686	sub size_request {
689	my ($self) = @_;	687	my ($self) = @_;
690		688
691	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	689	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
692	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	690	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
693		691
694	@$self{qw(child_w child_h)}	692	@$self{qw(child_w child_h)}
695	}	693	}
696		694
697	sub _draw {	695	sub size_allocate {
698	my ($self) = @_;	696	my ($self, $w, $h) = @_;
699		697
700	$self->{children}[1]->draw;	698	$self->update;
701	}	699	}
702		700
		701	sub set_offset {
		702	my ($self, $x, $y) = @_;
		703
		704	$self->{view_x} = int $x;
		705	$self->{view_y} = int $y;
		706
		707	$self->update;
		708	}
		709
		710	# hmm, this does not work for topleft of $self... but we should not ask for that
		711	sub coord2local {
		712	my ($self, $x, $y) = @_;
		713
		714	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		715	}
		716
		717	sub coord2global {
		718	my ($self, $x, $y) = @_;
		719
		720	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		721	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		722
		723	$self->SUPER::coord2global ($x, $y)
		724	}
		725
		726	sub find_widget {
		727	my ($self, $x, $y) = @_;
		728
		729	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		730	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		731	) {
		732	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		733	} else {
		734	$self->CFClient::UI::Base::find_widget ($x, $y)
		735	}
		736	}
		737
		738	sub _render {
		739	my ($self) = @_;
		740
		741	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		742
		743	$self->SUPER::_render;
		744	}
		745
		746	#############################################################################
		747
		748	package CFClient::UI::ScrolledWindow;
		749
		750	our @ISA = CFClient::UI::HBox::;
		751
		752	sub new {
		753	my $class = shift;
		754
		755	my $self;
		756
		757	my $slider = new CFClient::UI::Slider
		758	vertical => 1,
		759	range => [0, 0, 1, 0.01], # HACK fix
		760	connect_changed => sub {
		761	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		762	},
		763	;
		764
		765	$self = $class->SUPER::new (
		766	vp => (new CFClient::UI::ViewPort),
		767	slider => $slider,
		768	@_,
		769	);
		770
		771	$self->{vp}->add ($self->{scrolled});
		772	$self->add ($self->{vp});
		773	$self->add ($self->{slider});
		774
		775	$self
		776	}
		777
		778	#TODO# update range on size_allocate depeneing on child
		779	# update viewport offset on scroll
703		780
704	#############################################################################	781	#############################################################################
705		782
706	package CFClient::UI::Frame;	783	package CFClient::UI::Frame;
707		784
…		…
764	# TODO: user_x, user_y, overwrite moveto?	841	# TODO: user_x, user_y, overwrite moveto?
765		842
766	my $self = $class->SUPER::new (	843	my $self = $class->SUPER::new (
767	bg => [1, 1, 1, 1],	844	bg => [1, 1, 1, 1],
768	border_bg => [1, 1, 1, 1],	845	border_bg => [1, 1, 1, 1],
769	border => 0.8,	846	border => 0.6,
770	can_events => 1,	847	can_events => 1,
771	@_	848	@_
772	);	849	);
773		850
774	$self->{title} &&= new CFClient::UI::Label	851	$self->{title} &&= new CFClient::UI::Label
775	align => 0,	852	align => 0,
776	valign => 1,	853	valign => 1,
777	text => $self->{title},	854	text => $self->{title},
778	fontsize => 1;	855	fontsize => $self->{border};
779		856
780	$self	857	$self
781	}	858	}
782		859
783	sub border {	860	sub border {
…		…
808	}	885	}
809		886
810	sub button_down {	887	sub button_down {
811	my ($self, $ev, $x, $y) = @_;	888	my ($self, $ev, $x, $y) = @_;
812		889
		890	my ($w, $h) = @$self{qw(w h)};
813	my $border = $self->border;	891	my $border = $self->border;
814		892
815	if ($x < $self->{w} && $x >= $self->{w} - $border	893	my $lr = ($x >= 0 && $x < $border) \|\| ($x > $w - $border && $x < $w);
816	&& $y < $self->{h} && $y >= $self->{h} - $border) {	894	my $td = ($y >= 0 && $y < $border) \|\| ($y > $h - $border && $y < $h);
817		895
		896	if ($lr & $td) {
		897	my ($wx, $wy) = ($self->{x}, $self->{y});
818	my ($ox, $oy) = ($ev->{x}, $ev->{y});	898	my ($ox, $oy) = ($ev->{x}, $ev->{y});
819	my ($bw, $bh) = ($self->{w}, $self->{h});	899	my ($bw, $bh) = ($self->{w}, $self->{h});
820		900
		901	my $mx = $x < $border;
		902	my $my = $y < $border;
		903
821	$self->{motion} = sub {	904	$self->{motion} = sub {
822	my ($ev, $x, $y) = @_;	905	my ($ev, $x, $y) = @_;
823		906
824	($x, $y) = ($ev->{x}, $ev->{y});	907	my $dx = $ev->{x} - $ox;
		908	my $dy = $ev->{y} - $oy;
825		909
826	$self->{user_w} = $bw + $x - $ox;	910	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
827	$self->{user_h} = $bh + $y - $oy;	911	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		912	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
828	$self->check_size;	913	$self->check_size;
829	};	914	};
830		915
831	} elsif ($x >= 0 && $x < $self->{w}	916	} elsif ($lr ^ $td) {
832	&& $y >= 0 && $y < $border) {
833
834	my ($ox, $oy) = ($ev->{x}, $ev->{y});	917	my ($ox, $oy) = ($ev->{x}, $ev->{y});
835	my ($bx, $by) = ($self->{x}, $self->{y});	918	my ($bx, $by) = ($self->{x}, $self->{y});
836		919
837	$self->{motion} = sub {	920	$self->{motion} = sub {
838	my ($ev, $x, $y) = @_;	921	my ($ev, $x, $y) = @_;
…		…
874	$tex[1]->draw_quad (0, 0, $w, $border);	957	$tex[1]->draw_quad (0, 0, $w, $border);
875	$tex[3]->draw_quad (0, $border, $border, $ch);	958	$tex[3]->draw_quad (0, $border, $border, $ch);
876	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	959	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
877	$tex[4]->draw_quad (0, $h - $border, $w, $border);	960	$tex[4]->draw_quad (0, $h - $border, $w, $border);
878		961
		962	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
879	my $bg = $tex[0];	963	my $bg = $tex[0];
880		964
881	# TODO: repeat texture not scale	965	# TODO: repeat texture not scale
882	my $rep_x = $cw / $bg->{w};	966	my $rep_x = $cw / $bg->{w};
883	my $rep_y = $ch / $bg->{h};	967	my $rep_y = $ch / $bg->{h};
884		968
885	glColor @{ $self->{bg} };	969	glColor @{ $self->{bg} };
886		970
887	$bg->{s} = $rep_x;	971	$bg->{s} = $rep_x;
888	$bg->{t} = $rep_y;	972	$bg->{t} = $rep_y;
889	$bg->{wrap_mode} = 1;	973	$bg->{wrap_mode} = 1;
890	$bg->draw_quad ($border, $border, $cw, $ch);	974	$bg->draw_quad ($border, $border, $cw, $ch);
891		975
892	glDisable GL_TEXTURE_2D;	976	glDisable GL_TEXTURE_2D;
893	glDisable GL_BLEND;	977	glDisable GL_BLEND;
		978	}
894		979
895	$self->{title}->draw if $self->{title};	980	$self->{title}->draw if $self->{title};
		981
896	$self->child->draw;	982	$self->child->draw;
897	}	983	}
898		984
899	#############################################################################	985	#############################################################################
900		986
…		…
1124	}	1210	}
1125		1211
1126	sub size_allocate {	1212	sub size_allocate {
1127	my ($self, $w, $h) = @_;	1213	my ($self, $w, $h) = @_;
1128		1214
		1215	Carp::confess "negative size" if $w < 0 \|\| $h < 0;#d#
		1216
1129	my $children = $self->{children};	1217	my $children = $self->{children};
1130		1218
1131	my @h = map $_->{req_h}, @$children;	1219	my @h = map $_->{req_h}, @$children;
1132		1220
1133	my $req_h = List::Util::sum @h;	1221	my $req_h = List::Util::sum @h;
…		…
1172	my ($class, %arg) = @_;	1260	my ($class, %arg) = @_;
1173		1261
1174	my $self = $class->SUPER::new (	1262	my $self = $class->SUPER::new (
1175	fg => [1, 1, 1],	1263	fg => [1, 1, 1],
1176	#font => default_font	1264	#font => default_font
		1265	#text => initial text
		1266	#markup => initial narkup
		1267	layout => (new CFClient::Layout),
1177	fontsize => 1,	1268	fontsize => 1,
1178	text => "",
1179	align => -1,	1269	align => -1,
1180	valign => -1,	1270	valign => -1,
1181	padding => 2,	1271	padding => 2,
1182	layout => new CFClient::Layout,
1183	can_events => 0,	1272	can_events => 0,
1184	%arg	1273	%arg
1185	);	1274	);
1186		1275
1187	if (exists $self->{template}) {	1276	if (exists $self->{template}) {
1188	my $layout = new CFClient::Layout;	1277	my $layout = new CFClient::Layout;
1189	$layout->set_text (delete $self->{template});	1278	$layout->set_text (delete $self->{template});
1190	$self->{template} = $layout;	1279	$self->{template} = $layout;
1191	}	1280	}
1192		1281
1193	$self->set_text (delete $self->{text}) if exists $self->{text};	1282	if (exists $self->{markup}) {
1194	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1283	$self->set_markup (delete $self->{markup});
		1284	} else {
		1285	$self->set_text (delete $self->{text});
		1286	}
1195		1287
1196	$self	1288	$self
1197	}	1289	}
1198		1290
1199	sub escape {	1291	sub escape {
…		…
1204	s/</</g;	1296	s/</</g;
1205		1297
1206	$_[1]	1298	$_[1]
1207	}	1299	}
1208		1300
		1301	sub update {
		1302	my ($self) = @_;
		1303
		1304	delete $self->{texture};
		1305	$self->SUPER::update;
		1306	}
		1307
1209	sub set_text {	1308	sub set_text {
1210	my ($self, $text) = @_;	1309	my ($self, $text) = @_;
1211		1310
		1311	return if $self->{text} eq "T$text";
		1312	$self->{text} = "T$text";
		1313
		1314	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1212	$self->{layout}->set_text ($text);	1315	$self->{layout}->set_text ($text);
1213		1316
1214	delete $self->{texture};	1317	$self->update;
1215	$self->check_size;	1318	$self->check_size;
1216	$self->update;
1217	}	1319	}
1218		1320
1219	sub set_markup {	1321	sub set_markup {
1220	my ($self, $markup) = @_;	1322	my ($self, $markup) = @_;
1221		1323
		1324	return if $self->{text} eq "M$markup";
		1325	$self->{text} = "M$markup";
		1326
		1327	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
		1328
		1329	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1222	$self->{layout}->set_markup ($markup);	1330	$self->{layout}->set_markup ($markup);
1223		1331
1224	delete $self->{texture};	1332	$self->update;
1225	$self->check_size;	1333	$self->check_size;
1226	$self->update;
1227	}	1334	}
1228		1335
1229	sub size_request {	1336	sub size_request {
1230	my ($self) = @_;	1337	my ($self) = @_;
1231		1338
…		…
1260	sub set_fontsize {	1367	sub set_fontsize {
1261	my ($self, $fontsize) = @_;	1368	my ($self, $fontsize) = @_;
1262		1369
1263	$self->{fontsize} = $fontsize;	1370	$self->{fontsize} = $fontsize;
1264	delete $self->{texture};	1371	delete $self->{texture};
		1372
		1373	$self->update;
1265	$self->check_size;	1374	$self->check_size;
1266	$self->update;
1267	}	1375	}
1268		1376
1269	sub _draw {	1377	sub _draw {
1270	my ($self) = @_;	1378	my ($self) = @_;
1271		1379
1272	my $tex = $self->{texture} \|\|= do {	1380	my $tex = $self->{texture} \|\|= do {
		1381	$self->{layout}->set_foreground (@{$self->{fg}});
1273	$self->{layout}->set_font ($self->{font}) if $self->{font};	1382	$self->{layout}->set_font ($self->{font}) if $self->{font};
1274	$self->{layout}->set_width ($self->{w});	1383	$self->{layout}->set_width ($self->{w});
1275	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1384	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
		1385
1276	new_from_layout CFClient::Texture $self->{layout}	1386	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1387
		1388	$self->{ox} = int $self->{align} < 0 ? $self->{padding}
		1389	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1390	: ($self->{w} - $tex->{w}) * 0.5;
		1391
		1392	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}
		1393	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1394	: ($self->{h} - $tex->{h}) * 0.5;
		1395
		1396	$tex
1277	};	1397	};
1278		1398
1279	glEnable GL_BLEND;
1280	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1281	glEnable GL_TEXTURE_2D;	1399	glEnable GL_TEXTURE_2D;
1282	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1400	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1283		1401
		1402	if ($tex->{format} == GL_ALPHA) {
1284	glColor @{$self->{fg}};	1403	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});	1404	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1405	} else {
		1406	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1407	}
1299		1408
1300	glDisable GL_TEXTURE_2D;	1409	glDisable GL_TEXTURE_2D;
1301	glDisable GL_BLEND;
1302	}	1410	}
1303		1411
1304	#############################################################################	1412	#############################################################################
1305		1413
1306	package CFClient::UI::EntryBase;	1414	package CFClient::UI::EntryBase;
…		…
1341	$self->{layout}->set_text ("$text ");	1449	$self->{layout}->set_text ("$text ");
1342		1450
1343	$self->emit (changed => $self->{text});	1451	$self->emit (changed => $self->{text});
1344	}	1452	}
1345		1453
		1454	sub set_text {
		1455	my ($self, $text) = @_;
		1456
		1457	$self->{cursor} = length $text;
		1458	$self->_set_text ($text);
		1459	$self->check_size;
		1460	$self->update;
		1461	}
		1462
1346	sub get_text {	1463	sub get_text {
1347	$_[0]{text}	1464	$_[0]{text}
1348	}	1465	}
1349		1466
1350	sub size_request {	1467	sub size_request {
…		…
1357		1474
1358	sub size_allocate {	1475	sub size_allocate {
1359	my ($self, $w, $h) = @_;	1476	my ($self, $w, $h) = @_;
1360		1477
1361	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text	1478	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
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	}	1479	}
1371		1480
1372	sub key_down {	1481	sub key_down {
1373	my ($self, $ev) = @_;	1482	my ($self, $ev) = @_;
1374		1483
…		…
1562		1671
1563	if ($GRAB == $self) {	1672	if ($GRAB == $self) {
1564	$self->{fg} = $self->{active_fg};	1673	$self->{fg} = $self->{active_fg};
1565	}	1674	}
1566		1675
1567	glEnable GL_BLEND;
1568	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1569	glEnable GL_TEXTURE_2D;	1676	glEnable GL_TEXTURE_2D;
1570	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1677	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1571	glColor 0, 0, 0, 1;	1678	glColor 0, 0, 0, 1;
1572		1679
1573	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1680	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1574		1681
1575	glDisable GL_TEXTURE_2D;	1682	glDisable GL_TEXTURE_2D;
1576	glDisable GL_BLEND;
1577		1683
1578	$self->SUPER::_draw;	1684	$self->SUPER::_draw;
1579	}	1685	}
1580		1686
1581	#############################################################################	1687	#############################################################################
…		…
1628		1734
1629	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1735	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1630		1736
1631	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1737	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1632		1738
1633	glEnable GL_BLEND;
1634	glEnable GL_TEXTURE_2D;	1739	glEnable GL_TEXTURE_2D;
1635	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1636		1740
1637	my $tex = $self->{state} ? $tex[1] : $tex[0];	1741	my $tex = $self->{state} ? $tex[1] : $tex[0];
1638		1742
1639	$tex->draw_quad (0, 0, $s, $s);	1743	$tex->draw_quad_alpha (0, 0, $s, $s);
1640		1744
1641	glDisable GL_TEXTURE_2D;	1745	glDisable GL_TEXTURE_2D;
1642	glDisable GL_BLEND;
1643	}	1746	}
1644		1747
1645	#############################################################################	1748	#############################################################################
1646		1749
1647	package CFClient::UI::Image;	1750	package CFClient::UI::Image;
…		…
1690	glTranslate 0, -$self->{w}, 0;	1793	glTranslate 0, -$self->{w}, 0;
1691		1794
1692	($w, $h) = ($h, $w);	1795	($w, $h) = ($h, $w);
1693	}	1796	}
1694		1797
1695	glEnable GL_BLEND;
1696	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1697	glEnable GL_TEXTURE_2D;	1798	glEnable GL_TEXTURE_2D;
1698	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1799	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1699		1800
1700	$tex->draw_quad (0, 0, $w, $h);	1801	$tex->draw_quad_alpha (0, 0, $w, $h);
1701		1802
1702	glDisable GL_BLEND;
1703	glDisable GL_TEXTURE_2D;	1803	glDisable GL_TEXTURE_2D;
1704	}	1804	}
1705		1805
1706	#############################################################################	1806	#############################################################################
1707		1807
…		…
1755	}	1855	}
1756		1856
1757	sub set_max {	1857	sub set_max {
1758	my ($self, $max) = @_;	1858	my ($self, $max) = @_;
1759		1859
		1860	return if $self->{max_val} == $max;
		1861
1760	$self->{max_val} = $max;	1862	$self->{max_val} = $max;
		1863	$self->update;
1761	}	1864	}
1762		1865
1763	sub set_value {	1866	sub set_value {
1764	my ($self, $val, $max) = @_;	1867	my ($self, $val, $max) = @_;
1765		1868
1766	$self->set_max ($max)	1869	$self->set_max ($max)
1767	if defined $max;	1870	if defined $max;
1768		1871
1769	$max = $self->{max_val};	1872	return if $self->{val} == $val;
		1873
1770	$self->{val} = $val;	1874	$self->{val} = $val;
1771
1772	$self->update;	1875	$self->update;
1773	}	1876	}
1774		1877
1775	sub _draw {	1878	sub _draw {
1776	my ($self) = @_;	1879	my ($self) = @_;
…		…
1859		1962
1860	$self->{value}->set_fontsize ($fsize);	1963	$self->{value}->set_fontsize ($fsize);
1861	$self->{max} ->set_fontsize ($fsize);	1964	$self->{max} ->set_fontsize ($fsize);
1862	}	1965	}
1863		1966
		1967	sub set_max {
		1968	my ($self, $max) = @_;
		1969
		1970	$self->{gauge}->set_max ($max);
		1971	$self->{max}->set_text ($max);
		1972	}
		1973
1864	sub set_value {	1974	sub set_value {
1865	my ($self, $val, $max) = @_;	1975	my ($self, $val, $max) = @_;
1866		1976
1867	$self->set_max ($max)	1977	$self->set_max ($max)
1868	if defined $max;	1978	if defined $max;
1869		1979
1870	$self->{gauge}->set_value ($val, $max);	1980	$self->{gauge}->set_value ($val, $max);
1871	$self->{value}->set_text ($val);	1981	$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	}	1982	}
1880		1983
1881	#############################################################################	1984	#############################################################################
1882		1985
1883	package CFClient::UI::Slider;	1986	package CFClient::UI::Slider;
…		…
1902	# TODO: calculations are off	2005	# TODO: calculations are off
1903	my $self = $class->SUPER::new (	2006	my $self = $class->SUPER::new (
1904	fg => [1, 1, 1],	2007	fg => [1, 1, 1],
1905	active_fg => [0, 0, 0],	2008	active_fg => [0, 0, 0],
1906	range => [0, 0, 100, 10],	2009	range => [0, 0, 100, 10],
1907	req_w => 20,	2010	req_w => $::WIDTH / 80,
1908	req_h => 20,	2011	req_h => $::WIDTH / 80,
1909	vertical => 0,	2012	vertical => 0,
1910	can_hover => 1,	2013	can_hover => 1,
1911	inner_pad => 5,	2014	inner_pad => 5,
1912	@_	2015	@_
1913	);	2016	);
…		…
1996	$page \|\|= 2;	2099	$page \|\|= 2;
1997		2100
1998	my $knob_a = $inner_pad_px + ($value - $page * 0.5);	2101	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1999	my $knob_b = $inner_pad_px + ($value + $page * 0.5);	2102	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2000		2103
2001	glEnable GL_BLEND;
2002	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2003	glEnable GL_TEXTURE_2D;	2104	glEnable GL_TEXTURE_2D;
2004	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2105	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2005		2106
2006	# draw background	2107	# draw background
2007	$tex[1]->draw_quad (0, 0, $w, $h);	2108	$tex[1]->draw_quad_alpha (0, 0, $w, $h);
2008		2109
2009	# draw handle	2110	# draw handle
2010	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2111	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
2011		2112
2012	glDisable GL_BLEND;
2013	glDisable GL_TEXTURE_2D;	2113	glDisable GL_TEXTURE_2D;
2014	}	2114	}
2015		2115
2016	#############################################################################	2116	#############################################################################
2017		2117
…		…
2028	fontsize => 1,	2128	fontsize => 1,
2029	can_events => 0,	2129	can_events => 0,
2030	#font => default_font	2130	#font => default_font
2031	@_,	2131	@_,
2032		2132
2033	layout => (new CFClient::Layout),	2133	layout => (new CFClient::Layout 1),
2034	par => [],	2134	par => [],
2035	height => 0,	2135	height => 0,
2036	children => [	2136	children => [
2037	(new CFClient::UI::Empty expand => 1),	2137	(new CFClient::UI::Empty expand => 1),
2038	(new CFClient::UI::Slider vertical => 1),	2138	(new CFClient::UI::Slider vertical => 1),
2039	],	2139	],
2040	);	2140	);
2041		2141
2042	$self->{children}[1]->connect (changed => sub {	2142	$self->{children}[1]->connect (changed => sub { $self->update });
2043	$self->update;
2044	});
2045		2143
2046	$self	2144	$self
2047	}	2145	}
2048		2146
2049	sub set_fontsize {	2147	sub set_fontsize {
…		…
2057	my ($self, $text) = @_;	2155	my ($self, $text) = @_;
2058		2156
2059	my $layout = $self->{layout};	2157	my $layout = $self->{layout};
2060		2158
2061	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2159	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2062	$layout->set_width ($self->{w});	2160	$layout->set_width ($self->{children}[0]{w});
2063	$layout->set_text ($text);	2161	$layout->set_markup ($text);
2064		2162
2065	($layout->size)[1]	2163	($layout->size)[1]
2066	}	2164	}
2067		2165
2068	sub reflow {	2166	sub reflow {
…		…
2120	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2218	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2121		2219
2122	delete $self->{texture};	2220	delete $self->{texture};
2123	}	2221	}
2124		2222
2125	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2223	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2126	glClearColor 0, 0, 0, 1;	2224	glClearColor 0, 0, 0, 0;
2127	glClear GL_COLOR_BUFFER_BIT;	2225	glClear GL_COLOR_BUFFER_BIT;
2128		2226
2129	glEnable GL_BLEND;
2130	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2131	glEnable GL_TEXTURE_2D;	2227	glEnable GL_TEXTURE_2D;
2132	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2228	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2133		2229
2134	my $top = int $self->{children}[1]{range}[0];	2230	my $top = int $self->{children}[1]{range}[0];
2135		2231
…		…
2144		2240
2145	for my $par (@{$self->{par}}) {	2241	for my $par (@{$self->{par}}) {
2146	my $h = $par->[0];	2242	my $h = $par->[0];
2147		2243
2148	if ($y0 < $y + $h && $y < $y1) {	2244	if ($y0 < $y + $h && $y < $y1) {
		2245	$layout->set_foreground (@{ $par->[1] });
2149	$layout->set_text ($par->[2]);	2246	$layout->set_markup ($par->[2]);
2150		2247
2151	glColor @{ $par->[1] };
2152	my ($W, $H) = $layout->size;	2248	my ($W, $H) = $layout->size;
2153	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2249	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2154	}	2250	}
2155		2251
2156	$y += $h;	2252	$y += $h;
2157	}	2253	}
2158		2254
2159	glDisable GL_TEXTURE_2D;	2255	glDisable GL_TEXTURE_2D;
2160	glDisable GL_BLEND;
2161	};	2256	};
2162	});	2257	});
2163	}	2258	}
2164		2259
2165	sub _draw {	2260	sub _draw {
2166	my ($self) = @_;	2261	my ($self) = @_;
2167		2262
2168	if ($self->{texture}) {
2169	glEnable GL_TEXTURE_2D;	2263	glEnable GL_TEXTURE_2D;
2170	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2264	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171	glColor 1, 1, 1, 1;	2265	glColor 1, 1, 1, 1;
2172	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2266	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2173	glDisable GL_TEXTURE_2D;	2267	glDisable GL_TEXTURE_2D;
2174	}
2175		2268
2176	$self->{children}[1]->draw;	2269	$self->{children}[1]->draw;
2177		2270
2178	}	2271	}
2179		2272
…		…
2273	@_,	2366	@_,
2274	can_events => 0,	2367	can_events => 0,
2275	)	2368	)
2276	}	2369	}
2277		2370
2278	sub set_markup {	2371	sub set_tooltip_from {
2279	my ($self, $text) = @_;	2372	my ($self, $widget) = @_;
2280		2373
2281	$self->{label} \|\|= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2374	$self->{label} = new CFClient::UI::Label
2282	$self->{label}->set_markup ($text);	2375	markup => $widget->{tooltip},
		2376	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
		2377	fontsize => 0.8,
		2378	fg => [0, 0, 0, 1],
		2379	font => ($widget->{tooltip_font} \|\| $::FONT_PROP);
		2380
2283	$self->add ($self->{label});	2381	$self->add ($self->{label});
2284	}	2382	}
2285		2383
2286	sub size_request {	2384	sub size_request {
2287	my ($self) = @_;	2385	my ($self) = @_;
2288
2289	$self->child->set_max_size ($::WIDTH * 0.3);
2290		2386
2291	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2387	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2292		2388
2293	($w + 4, $h + 4)	2389	($w + 4, $h + 4)
2294	}	2390	}
…		…
2348		2444
2349	sub size_request {	2445	sub size_request {
2350	(32, 8)	2446	(32, 8)
2351	}	2447	}
2352		2448
2353	sub draw {	2449	sub _draw {
2354	my ($self) = @_;	2450	my ($self) = @_;
2355		2451
		2452	return unless $::CONN;#d# manage and cache textures differently
2356	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2453	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2357		2454
		2455	# TODO animation
2358	if ($tex) {	2456	if ($tex) {
2359	glEnable GL_BLEND;
2360	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361	glEnable GL_TEXTURE_2D;	2457	glEnable GL_TEXTURE_2D;
2362	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2458	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2363	glColor 1, 1, 1, 1;	2459	glColor 1, 1, 1, 1;
2364	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2460	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365	glDisable GL_TEXTURE_2D;	2461	glDisable GL_TEXTURE_2D;
2366	glDisable GL_BLEND;	2462	}
		2463	}
		2464
		2465	#############################################################################
		2466
		2467	package CFClient::UI::InventoryItem;
		2468
		2469	our @ISA = CFClient::UI::HBox::;
		2470
		2471	sub new {
		2472	my $class = shift;
		2473
		2474	my %args = @_;
		2475
		2476	my $item = delete $args{item};
		2477
		2478	my $desc = $item->{nrof} < 2
		2479	? $item->{name}
		2480	: "$item->{nrof} $item->{name_pl}";
		2481
		2482
		2483	my $self = $class->SUPER::new (
		2484	can_hover => 1,
		2485	can_events => 1,
		2486	tooltip => (CFClient::UI::Label->escape ($desc)
		2487	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2488	connect_button_down => sub {
		2489	my ($self, $ev, $x, $y) = @_;
		2490
		2491	# todo: maybe put examine on 1? but should just be a tooltip :(
		2492	if ($ev->{button} == 1) {
		2493	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2494	} elsif ($ev->{button} == 2) {
		2495	$::CONN->send ("apply $item->{tag}");
		2496	} elsif ($ev->{button} == 3) {
		2497	CFClient::UI::Menu->new (
		2498	items => [
		2499	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2500	[
		2501	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2502	sub { $::CONN->send ("lock $item->{tag}") },
		2503	],
		2504	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2505	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2506	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
		2507	],
		2508	)->popup ($ev);
		2509	}
		2510
		2511	1
		2512	},
		2513	%args
		2514	);
		2515
		2516	$self->add (new CFClient::UI::Face
		2517	can_events => 0,
		2518	face => $item->{face},
		2519	anim => $item->{anim},
		2520	animspeed => $item->{animspeed},
		2521	);
		2522
		2523	$self->add (new CFClient::UI::Label
		2524	can_events => 0,
		2525	text => $desc,
		2526	);
		2527
		2528	$self
		2529	}
		2530
		2531	#############################################################################
		2532
		2533	package CFClient::UI::Inventory;
		2534
		2535	our @ISA = CFClient::UI::ScrolledWindow::;
		2536
		2537	sub new {
		2538	my $class = shift;
		2539
		2540	my $self = $class->SUPER::new (
		2541	scrolled => (new CFClient::UI::VBox),
		2542	@_,
		2543	);
		2544
		2545	$self
		2546	}
		2547
		2548	sub set_items {
		2549	my ($self, $items) = @_;
		2550
		2551	$self->{scrolled}->clear;
		2552	return unless $items;
		2553
		2554	my @items = sort { $a->{type} <=> $b->{type} } @$items;
		2555
		2556	$self->{real_items} = \@items;
		2557
		2558	for my $item (@items) {
		2559	my $desc = $item->{nrof} < 2
		2560	? $item->{name}
		2561	: "$item->{nrof} $item->{name_pl}";
		2562
		2563	$self->{scrolled}->add ($item->{widget} \|\|= new CFClient::UI::InventoryItem item => $item);
		2564	}
		2565
		2566	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2567	}
		2568
		2569	sub size_request {
		2570	my ($self) = @_;
		2571	($self->{req_w}, $self->{req_h});
		2572	}
		2573
		2574	#############################################################################
		2575
		2576	package CFClient::UI::Menu;
		2577
		2578	our @ISA = CFClient::UI::FancyFrame::;
		2579
		2580	use CFClient::OpenGL;
		2581
		2582	sub new {
		2583	my $class = shift;
		2584
		2585	my $self = $class->SUPER::new (
		2586	items => [],
		2587	z => 100,
		2588	@_,
		2589	);
		2590
		2591	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2592
		2593	for my $item (@{ $self->{items} }) {
		2594	my ($widget, $cb) = @$item;
		2595
		2596	# handle various types of items, only text for now
		2597	if (!ref $widget) {
		2598	$widget = new CFClient::UI::Label
		2599	can_hover => 1,
		2600	can_events => 1,
		2601	text => $widget;
		2602	}
		2603
		2604	$self->{item}{$widget} = $item;
		2605
		2606	$self->{vbox}->add ($widget);
		2607	}
		2608
		2609	$self
		2610	}
		2611
		2612	# popup given the event (must be a mouse button down event currently)
		2613	sub popup {
		2614	my ($self, $ev) = @_;
		2615
		2616	$self->emit ("popdown");
		2617
		2618	# maybe save $GRAB? must be careful about events...
		2619	$GRAB = $self;
		2620	$self->{button} = $ev->{button};
		2621
		2622	$self->show;
		2623	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2624	}
		2625
		2626	sub mouse_motion {
		2627	my ($self, $ev, $x, $y) = @_;
		2628
		2629	# TODO: should use vbox->find_widget or so
		2630	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2631	$self->{hover} = $self->{item}{$HOVER};
		2632	}
		2633
		2634	sub button_up {
		2635	my ($self, $ev, $x, $y) = @_;
		2636
		2637	if ($ev->{button} == $self->{button}) {
		2638	undef $GRAB;
		2639	$self->hide;
		2640
		2641	$self->emit ("popdown");
		2642	$self->{hover}[1]->() if $self->{hover};
		2643	}
		2644	}
		2645
		2646	#############################################################################
		2647
		2648	package CFClient::UI::Statusbox;
		2649
		2650	our @ISA = CFClient::UI::VBox::;
		2651
		2652	sub reorder {
		2653	my ($self) = @_;
		2654	my $NOW = time;
		2655
		2656	while (my ($k, $v) = each %{ $self->{item} }) {
		2657	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2658	}
		2659
		2660	my @widgets;
		2661	my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };
		2662	my $count = 10 + 1;
		2663	for my $item (@items) {
		2664	last unless --$count;
		2665
		2666	push @widgets, $item->{label} \|\|= do {
		2667	# TODO: doesn't handle markup well (read as: at all)
		2668	my $short = delete $item->{text};
		2669	for ($short) {
		2670	s/^\s+//;
		2671	s/\012.*//s;
		2672	my $len = int 30 / $item->{fontsize};
		2673	substr $_, $len, length, "…" if $len < length;
		2674	}
		2675
		2676	new CFClient::UI::Label
		2677	markup => $short,
		2678	tooltip => delete $item->{tooltip},
		2679	tooltip_font => $::FONT_PROP,
		2680	tooltip_width => 0.75,
		2681	fontsize => delete $item->{fontsize},
		2682	color => delete $item->{color},
		2683	can_events => 1,
		2684	can_hover => 1,
		2685	};
		2686	}
		2687
		2688	$self->clear;
		2689	$self->SUPER::add (@widgets);
		2690	}
		2691
		2692	sub add {
		2693	my ($self, $text, %arg) = @_;
		2694
		2695	my $item = {
		2696	time => time,
		2697	text => $text,
		2698	timeout => 60,
		2699	tooltip => $text,
		2700	fontsize => 0.8,
		2701	color => [0.8, 0.8, 0.8, 0.8],
		2702	%arg,
2367	}	2703	};
		2704
		2705	$item->{timeout} += time;
		2706	$item->{group} \|\|= $item+0;
		2707
		2708	$item = $self->{item}{$item->{group}} \|\|= $item;
		2709
		2710	$self->reorder;
2368	}	2711	}
2369		2712
2370	#############################################################################	2713	#############################################################################
2371		2714
2372	package CFClient::UI::Root;	2715	package CFClient::UI::Root;
2373		2716
2374	our @ISA = CFClient::UI::Container::;	2717	our @ISA = CFClient::UI::Container::;
2375		2718
2376	use CFClient::OpenGL;	2719	use CFClient::OpenGL;
2377		2720
2378	sub check_size {	2721	sub new {
2379	my ($self) = @_;	2722	my $class = shift;
2380		2723
2381	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2724	$class->SUPER::new (
2382	}	2725	@_,
2383		2726	)
2384	sub size_request {
2385	($::WIDTH, $::HEIGHT)
2386	}	2727	}
2387		2728
2388	sub configure {	2729	sub configure {
2389	my ($self, $x, $y, $w, $h) = @_;	2730	my ($self, $x, $y, $w, $h) = @_;
2390		2731
2391	$self->SUPER::configure ($x, $y, $w, $h);	2732	$self->{w} = $w;
		2733	$self->{h} = $h;
		2734	}
2392		2735
		2736	sub check_size {
		2737	my ($self) = @_;
		2738
		2739	$self->size_allocate ($self->{w}, $self->{h})
		2740	if $self->{w};
		2741	}
		2742
		2743	sub size_request {
		2744	my ($self) = @_;
		2745
		2746	($self->{w}, $self->{h})
		2747	}
		2748
		2749	sub size_allocate {
		2750	my ($self, $w, $h) = @_;
		2751
		2752	my $old_w = $self->{old_w};
		2753	my $old_h = $self->{old_h};
		2754
		2755	if ($old_w && $old_h) {
		2756	for my $child ($self->children) {
		2757	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
		2758	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
		2759	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
		2760	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
		2761	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
		2762	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
		2763	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
		2764	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
		2765	}
		2766	}
		2767
2393	for my $child (@{$self->{children}}) {	2768	for my $child ($self->children) {
2394	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2769	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2395		2770
2396	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2771	$X = List::Util::max 0, List::Util::min $w - $W, $X;
2397	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2772	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2398	$child->configure ($X, $Y, $W,$H);	2773	$child->configure ($X, $Y, $W, $H);
2399	}	2774	}
2400	}
2401		2775
2402	sub _topleft {	2776	$self->{old_w} = $w;
		2777	$self->{old_h} = $h;
		2778	}
		2779
		2780	sub coord2local {
2403	my ($self, $x, $y) = @_;	2781	my ($self, $x, $y) = @_;
2404		2782
2405	($x, $y)	2783	($x, $y)
2406	}	2784	}
2407		2785
		2786	sub coord2global {
		2787	my ($self, $x, $y) = @_;
		2788
		2789	($x, $y)
		2790	}
		2791
2408	sub update {	2792	sub update {
2409	my ($self) = @_;	2793	my ($self) = @_;
2410		2794
2411	$self->check_size;	2795	$self->check_size;
2412	::refresh ();	2796	$::WANT_REFRESH++;
2413	}	2797	}
2414		2798
2415	sub add {	2799	sub add {
2416	my ($self, $child) = @_;	2800	my ($self, $child) = @_;
2417		2801
2418	# integerize window positions	2802	# integerise window positions
2419	$child->{x} = int $child->{x};	2803	$child->{x} = int $child->{x};
2420	$child->{y} = int $child->{y};	2804	$child->{y} = int $child->{y};
2421		2805
2422	$self->SUPER::add ($child);	2806	$self->SUPER::add ($child);
2423	}	2807	}
…		…
2426	my ($self, $id, $cb) = @_;	2810	my ($self, $id, $cb) = @_;
2427		2811
2428	$self->{refresh_hook}{$id} = $cb;	2812	$self->{refresh_hook}{$id} = $cb;
2429	}	2813	}
2430		2814
2431	sub draw {	2815	sub draw {
2432	my ($self) = @_;	2816	my ($self) = @_;
2433		2817
		2818	if ($self->{check_size}) {
		2819	my @queue = ([], []);
		2820
		2821	for (;;) {
		2822	if ($self->{check_size}) {
		2823	# heuristic: check containers last
		2824	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2825	for values %{delete $self->{check_size}}
		2826	}
		2827
		2828	my $widget = (pop @{ $queue[0] }) \|\| (pop @{ $queue[1] }) \|\| last;
		2829
		2830	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2831	? @$widget{qw(user_w user_h)}
		2832	: $widget->size_request;
		2833
		2834	if ($w != $widget->{req_w} \|\| $h != $widget->{req_h}) {
		2835	Carp::confess "$widget: size_request is negative" if $w < 0 \|\| $h < 0;#d#
		2836
		2837	$widget->{req_w} = $w;
		2838	$widget->{req_h} = $h;
		2839
		2840	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
		2841
		2842	$widget->{parent}->check_size
		2843	if $widget->{parent};
		2844	}
		2845	}
		2846	}
		2847
		2848	while ($self->{size_alloc}) {
		2849	for (values %{delete $self->{size_alloc}}) {
		2850	my ($widget, $w, $h) = @$_;
		2851
		2852	$w = 0 if $w < 0;
		2853	$h = 0 if $h < 0;
		2854
		2855	$widget->{w} = $w;
		2856	$widget->{h} = $h;
		2857	$widget->size_allocate ($w, $h);
		2858	$widget->emit (size_allocate => $w, $h);
		2859	}
		2860	}
		2861
2434	while (my $rcb = delete $self->{refresh_hook}) {	2862	while ($self->{refresh_hook}) {
2435	$_->() for values %$rcb;	2863	$_->()
		2864	for values %{delete $self->{refresh_hook}};
2436	}	2865	}
2437		2866
2438	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2867	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2439	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2868	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2440	glClear GL_COLOR_BUFFER_BIT;	2869	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.196 by root, Fri May 12 00:16:34 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.196 by root, Fri May 12 00:16:34 2006 UTC