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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.173 by root, Tue Apr 25 10:30:48 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
244	# call when resoltuion changes etc.	248	# call when resolution changes etc.
245	sub reconfigure {	249	sub reconfigure {
246	my ($self) = @_;	250	my ($self) = @_;
247		251
248	$_->reconfigure	252	$_->reconfigure
249	for $self->children;	253	for $self->children;
250		254
251	$_->check_size;	255	$self->check_size;
		256	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
		257	$self->update;
252	}	258	}
253		259
254	sub set_max_size {	260	sub set_max_size {
255	my ($self, $w, $h) = @_;	261	my ($self, $w, $h) = @_;
256		262
257	delete $self->{max_w}; $self->{max_w} = $w if $w;	263	delete $self->{max_w}; $self->{max_w} = $w if $w;
258	delete $self->{max_h}; $self->{max_h} = $h if $h;	264	delete $self->{max_h}; $self->{max_h} = $h if $h;
259	}
260
261	# return top left coordinates
262	sub _topleft {
263	my ($self, $x, $y) = @_;
264
265	$self->{parent}
266	or Carp::confess "no parent widget in _topleft\n";#d#
267
268	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
269	}	265	}
270		266
271	# translate global coordinates to local coordinate system	267	# translate global coordinates to local coordinate system
272	sub coord2local {	268	sub coord2local {
273	my ($self, $x, $y) = @_;	269	my ($self, $x, $y) = @_;
274		270
275	my ($X, $Y) = $self->_topleft;	271	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
276	($x - $X, $y - $Y)
277	}	272	}
278		273
279	# translate local coordinates to global coordinate system	274	# translate local coordinates to global coordinate system
280	sub coord2global {	275	sub coord2global {
281	my ($self, $x, $y) = @_;	276	my ($self, $x, $y) = @_;
282		277
283	my ($X, $Y) = $self->_topleft;	278	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
284	($x + $X, $y + $Y)
285	}	279	}
286		280
287	sub focus_in {	281	sub focus_in {
288	my ($self) = @_;	282	my ($self) = @_;
289		283
…		…
387		381
388	sub set_parent {	382	sub set_parent {
389	my ($self, $parent) = @_;	383	my ($self, $parent) = @_;
390		384
391	Scalar::Util::weaken ($self->{parent} = $parent);	385	Scalar::Util::weaken ($self->{parent} = $parent);
		386
		387	$self->check_size
		388	unless exists $self->{req_w};
392	}	389	}
393		390
394	sub check_size {	391	sub check_size {
395	my ($self) = @_;	392	my ($self) = @_;
396		393
397	$self->{parent}	394	$CFClient::UI::ROOT->{check_size}{$self} = $self;
398	or return 1;
399
400	my ($w, $h) = $self->{user_w} && $self->{user_h}
401	? @$self{qw(user_w user_h)}
402	: $self->size_request;
403
404	if ($w != $self->{req_w} \|\| $h != $self->{req_h}) {
405	$self->{req_w} = $w;
406	$self->{req_h} = $h;
407
408	$self->{parent}->check_size
409	or $self->size_allocate (
410	(List::Util::max $self->{w}, $w),
411	(List::Util::max $self->{h}, $h),
412	);
413
414	1
415	} else {
416	0
417	}
418	}	395	}
419		396
420	sub update {	397	sub update {
421	my ($self) = @_;	398	my ($self) = @_;
422		399
…		…
519		496
520	$self	497	$self
521	}	498	}
522		499
523	sub add {	500	sub add {
524	my ($self, $child) = @_;	501	my ($self, @widgets) = @_;
525		502
526	$child->set_parent ($self);	503	$_->set_parent ($self)
		504	for @widgets;
527		505
528	use sort 'stable';	506	use sort 'stable';
529		507
530	$self->{children} = [	508	$self->{children} = [
531	sort { $a->{z} <=> $b->{z} }	509	sort { $a->{z} <=> $b->{z} }
532	@{$self->{children}}, $child	510	@{$self->{children}}, @widgets
533	];	511	];
534		512
535	$child->check_size;	513	$self->check_size;
		514	$self->update;
536	}	515	}
537		516
538	sub children {	517	sub children {
539	@{ $_[0]{children} }	518	@{ $_[0]{children} }
540	}	519	}
…		…
559		538
560	for (@$children) {	539	for (@$children) {
561	delete $_->{parent};	540	delete $_->{parent};
562	$_->hide;	541	$_->hide;
563	}	542	}
		543
		544	$self->check_size;
		545	$self->update;
564	}	546	}
565		547
566	sub find_widget {	548	sub find_widget {
567	my ($self, $x, $y) = @_;	549	my ($self, $x, $y) = @_;
568		550
…		…
643	}	625	}
644		626
645	sub update {	627	sub update {
646	my ($self) = @_;	628	my ($self) = @_;
647		629
648	# we want to do this delayed...	630	$ROOT->on_refresh ($self => sub { $self->render_child });
649	$self->render_chld;
650	$self->SUPER::update;	631	$self->SUPER::update;
651	}
652
653	sub render_chld {
654	my ($self) = @_;
655
656	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
657	glClearColor 0, 0, 0, 1;
658	glClear GL_COLOR_BUFFER_BIT;
659	$self->child->draw;
660	};
661	}	632	}
662		633
663	sub size_allocate {	634	sub size_allocate {
664	my ($self, $w, $h) = @_;	635	my ($self, $w, $h) = @_;
665		636
666	$self->child->configure (0, 0, $w, $h);	637	$self->SUPER::size_allocate ($w, $h);
		638	$self->update;
		639	}
667		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
668	$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	};
669	}	661	}
670		662
671	sub _draw {	663	sub _draw {
672	my ($self) = @_;	664	my ($self) = @_;
673		665
674	my ($w, $h) = ($self->w, $self->h);	666	my ($w, $h) = ($self->w, $self->h);
675		667
676	my $tex = $self->{texture}	668	my $tex = $self->{texture}
677	or return;	669	or return;
678		670
679	glEnable GL_BLEND;
680	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
681	glEnable GL_TEXTURE_2D;	671	glEnable GL_TEXTURE_2D;
682	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;
683		674
684	$tex->draw_quad (0, 0, $w, $h);	675	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
685		676
686	glDisable GL_BLEND;
687	glDisable GL_TEXTURE_2D;	677	glDisable GL_TEXTURE_2D;
688	}	678	}
689		679
690	#############################################################################	680	#############################################################################
691		681
692	package CFClient::UI::ViewPort;	682	package CFClient::UI::ViewPort;
693		683
694	our @ISA = CFClient::UI::Window::;	684	our @ISA = CFClient::UI::Window::;
695		685
696	sub new { die }
697
698	sub size_request {	686	sub size_request {
699	my ($self) = @_;	687	my ($self) = @_;
700		688
701	@$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)};
702	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	690	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
703		691
704	@$self{qw(child_w child_h)}	692	@$self{qw(child_w child_h)}
705	}	693	}
706		694
707	sub _draw {	695	sub size_allocate {
708	my ($self) = @_;	696	my ($self, $w, $h) = @_;
709		697
710	$self->{children}[1]->draw;	698	$self->update;
711	}	699	}
712		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
713		780
714	#############################################################################	781	#############################################################################
715		782
716	package CFClient::UI::Frame;	783	package CFClient::UI::Frame;
717		784
…		…
774	# TODO: user_x, user_y, overwrite moveto?	841	# TODO: user_x, user_y, overwrite moveto?
775		842
776	my $self = $class->SUPER::new (	843	my $self = $class->SUPER::new (
777	bg => [1, 1, 1, 1],	844	bg => [1, 1, 1, 1],
778	border_bg => [1, 1, 1, 1],	845	border_bg => [1, 1, 1, 1],
779	border => 0.8,	846	border => 0.6,
780	can_events => 1,	847	can_events => 1,
781	@_	848	@_
782	);	849	);
783		850
784	$self->{title} &&= new CFClient::UI::Label	851	$self->{title} &&= new CFClient::UI::Label
785	align => 0,	852	align => 0,
786	valign => 1,	853	valign => 1,
787	text => $self->{title},	854	text => $self->{title},
788	fontsize => 1;	855	fontsize => $self->{border};
789		856
790	$self	857	$self
791	}	858	}
792		859
793	sub border {	860	sub border {
…		…
818	}	885	}
819		886
820	sub button_down {	887	sub button_down {
821	my ($self, $ev, $x, $y) = @_;	888	my ($self, $ev, $x, $y) = @_;
822		889
		890	my ($w, $h) = @$self{qw(w h)};
823	my $border = $self->border;	891	my $border = $self->border;
824		892
825	if ($x < $self->{w} && $x >= $self->{w} - $border	893	my $lr = ($x >= 0 && $x < $border) \|\| ($x > $w - $border && $x < $w);
826	&& $y < $self->{h} && $y >= $self->{h} - $border) {	894	my $td = ($y >= 0 && $y < $border) \|\| ($y > $h - $border && $y < $h);
827		895
		896	if ($lr & $td) {
		897	my ($wx, $wy) = ($self->{x}, $self->{y});
828	my ($ox, $oy) = ($ev->{x}, $ev->{y});	898	my ($ox, $oy) = ($ev->{x}, $ev->{y});
829	my ($bw, $bh) = ($self->{w}, $self->{h});	899	my ($bw, $bh) = ($self->{w}, $self->{h});
830		900
		901	my $mx = $x < $border;
		902	my $my = $y < $border;
		903
831	$self->{motion} = sub {	904	$self->{motion} = sub {
832	my ($ev, $x, $y) = @_;	905	my ($ev, $x, $y) = @_;
833		906
834	($x, $y) = ($ev->{x}, $ev->{y});	907	my $dx = $ev->{x} - $ox;
		908	my $dy = $ev->{y} - $oy;
835		909
836	$self->{user_w} = $bw + $x - $ox;	910	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
837	$self->{user_h} = $bh + $y - $oy;	911	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		912	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
838	$self->check_size;	913	$self->check_size;
839	};	914	};
840		915
841	} elsif ($x >= 0 && $x < $self->{w}	916	} elsif ($lr ^ $td) {
842	&& $y >= 0 && $y < $border) {
843
844	my ($ox, $oy) = ($ev->{x}, $ev->{y});	917	my ($ox, $oy) = ($ev->{x}, $ev->{y});
845	my ($bx, $by) = ($self->{x}, $self->{y});	918	my ($bx, $by) = ($self->{x}, $self->{y});
846		919
847	$self->{motion} = sub {	920	$self->{motion} = sub {
848	my ($ev, $x, $y) = @_;	921	my ($ev, $x, $y) = @_;
…		…
884	$tex[1]->draw_quad (0, 0, $w, $border);	957	$tex[1]->draw_quad (0, 0, $w, $border);
885	$tex[3]->draw_quad (0, $border, $border, $ch);	958	$tex[3]->draw_quad (0, $border, $border, $ch);
886	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	959	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
887	$tex[4]->draw_quad (0, $h - $border, $w, $border);	960	$tex[4]->draw_quad (0, $h - $border, $w, $border);
888		961
		962	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
889	my $bg = $tex[0];	963	my $bg = $tex[0];
890		964
891	# TODO: repeat texture not scale	965	# TODO: repeat texture not scale
892	my $rep_x = $cw / $bg->{w};	966	my $rep_x = $cw / $bg->{w};
893	my $rep_y = $ch / $bg->{h};	967	my $rep_y = $ch / $bg->{h};
894		968
895	glColor @{ $self->{bg} };	969	glColor @{ $self->{bg} };
896		970
897	$bg->{s} = $rep_x;	971	$bg->{s} = $rep_x;
898	$bg->{t} = $rep_y;	972	$bg->{t} = $rep_y;
899	$bg->{wrap_mode} = 1;	973	$bg->{wrap_mode} = 1;
900	$bg->draw_quad ($border, $border, $cw, $ch);	974	$bg->draw_quad ($border, $border, $cw, $ch);
901		975
902	glDisable GL_TEXTURE_2D;	976	glDisable GL_TEXTURE_2D;
903	glDisable GL_BLEND;	977	glDisable GL_BLEND;
		978	}
904		979
905	$self->{title}->draw if $self->{title};	980	$self->{title}->draw if $self->{title};
		981
906	$self->child->draw;	982	$self->child->draw;
907	}	983	}
908		984
909	#############################################################################	985	#############################################################################
910		986
…		…
1134	}	1210	}
1135		1211
1136	sub size_allocate {	1212	sub size_allocate {
1137	my ($self, $w, $h) = @_;	1213	my ($self, $w, $h) = @_;
1138		1214
		1215	Carp::confess "negative size" if $w < 0 \|\| $h < 0;#d#
		1216
1139	my $children = $self->{children};	1217	my $children = $self->{children};
1140		1218
1141	my @h = map $_->{req_h}, @$children;	1219	my @h = map $_->{req_h}, @$children;
1142		1220
1143	my $req_h = List::Util::sum @h;	1221	my $req_h = List::Util::sum @h;
…		…
1182	my ($class, %arg) = @_;	1260	my ($class, %arg) = @_;
1183		1261
1184	my $self = $class->SUPER::new (	1262	my $self = $class->SUPER::new (
1185	fg => [1, 1, 1],	1263	fg => [1, 1, 1],
1186	#font => default_font	1264	#font => default_font
		1265	#text => initial text
		1266	#markup => initial narkup
		1267	layout => (new CFClient::Layout),
1187	fontsize => 1,	1268	fontsize => 1,
1188	text => "",
1189	align => -1,	1269	align => -1,
1190	valign => -1,	1270	valign => -1,
1191	padding => 2,	1271	padding => 2,
1192	layout => new CFClient::Layout,
1193	can_events => 0,	1272	can_events => 0,
1194	%arg	1273	%arg
1195	);	1274	);
1196		1275
1197	if (exists $self->{template}) {	1276	if (exists $self->{template}) {
1198	my $layout = new CFClient::Layout;	1277	my $layout = new CFClient::Layout;
1199	$layout->set_text (delete $self->{template});	1278	$layout->set_text (delete $self->{template});
1200	$self->{template} = $layout;	1279	$self->{template} = $layout;
1201	}	1280	}
1202		1281
1203	$self->set_text (delete $self->{text}) if exists $self->{text};	1282	if (exists $self->{markup}) {
1204	$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	}
1205		1287
1206	$self	1288	$self
1207	}	1289	}
1208		1290
1209	sub escape {	1291	sub escape {
…		…
1221		1303
1222	delete $self->{texture};	1304	delete $self->{texture};
1223	$self->SUPER::update;	1305	$self->SUPER::update;
1224	}	1306	}
1225		1307
1226	sub reconfigure {
1227	my ($self) = @_;
1228
1229	delete $self->{texture};
1230	}
1231
1232	sub set_text {	1308	sub set_text {
1233	my ($self, $text) = @_;	1309	my ($self, $text) = @_;
1234		1310
1235	return if $self->{text} eq "T$text";	1311	return if $self->{text} eq "T$text";
1236	$self->{text} = "T$text";	1312	$self->{text} = "T$text";
1237		1313
		1314	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1238	$self->{layout}->set_text ($text);	1315	$self->{layout}->set_text ($text);
1239		1316
1240	delete $self->{texture};
1241	$self->update;	1317	$self->update;
1242	$self->check_size;	1318	$self->check_size;
1243	}	1319	}
1244		1320
1245	sub set_markup {	1321	sub set_markup {
1246	my ($self, $markup) = @_;	1322	my ($self, $markup) = @_;
1247		1323
1248	return if $self->{text} eq "M$markup";	1324	return if $self->{text} eq "M$markup";
1249	$self->{text} = "M$markup";	1325	$self->{text} = "M$markup";
1250		1326
		1327	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
		1328
		1329	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1251	$self->{layout}->set_markup ($markup);	1330	$self->{layout}->set_markup ($markup);
1252		1331
1253	delete $self->{texture};
1254	$self->update;	1332	$self->update;
1255	$self->check_size;	1333	$self->check_size;
1256	}	1334	}
1257		1335
1258	sub size_request {	1336	sub size_request {
…		…
1289	sub set_fontsize {	1367	sub set_fontsize {
1290	my ($self, $fontsize) = @_;	1368	my ($self, $fontsize) = @_;
1291		1369
1292	$self->{fontsize} = $fontsize;	1370	$self->{fontsize} = $fontsize;
1293	delete $self->{texture};	1371	delete $self->{texture};
		1372
		1373	$self->update;
1294	$self->check_size;	1374	$self->check_size;
1295	$self->update;
1296	}	1375	}
1297		1376
1298	sub _draw {	1377	sub _draw {
1299	my ($self) = @_;	1378	my ($self) = @_;
1300		1379
1301	my $tex = $self->{texture} \|\|= do {	1380	my $tex = $self->{texture} \|\|= do {
		1381	$self->{layout}->set_foreground (@{$self->{fg}});
1302	$self->{layout}->set_font ($self->{font}) if $self->{font};	1382	$self->{layout}->set_font ($self->{font}) if $self->{font};
1303	$self->{layout}->set_width ($self->{w});	1383	$self->{layout}->set_width ($self->{w});
1304	$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
1305	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
1306	};	1397	};
1307		1398
1308	glEnable GL_BLEND;
1309	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1310	glEnable GL_TEXTURE_2D;	1399	glEnable GL_TEXTURE_2D;
1311	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1400	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1312		1401
		1402	if ($tex->{format} == GL_ALPHA) {
1313	glColor @{$self->{fg}};	1403	glColor @{$self->{fg}};
1314
1315	$self->{ox} = int (
1316	$self->{align} < 0 ? $self->{padding}
1317	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1318	: ($self->{w} - $tex->{w}) * 0.5
1319	);
1320
1321	$self->{oy} = int (
1322	$self->{valign} < 0 ? $self->{padding}
1323	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1324	: ($self->{h} - $tex->{h}) * 0.5
1325	);
1326
1327	$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	}
1328		1408
1329	glDisable GL_TEXTURE_2D;	1409	glDisable GL_TEXTURE_2D;
1330	glDisable GL_BLEND;
1331	}	1410	}
1332		1411
1333	#############################################################################	1412	#############################################################################
1334		1413
1335	package CFClient::UI::EntryBase;	1414	package CFClient::UI::EntryBase;
…		…
1370	$self->{layout}->set_text ("$text ");	1449	$self->{layout}->set_text ("$text ");
1371		1450
1372	$self->emit (changed => $self->{text});	1451	$self->emit (changed => $self->{text});
1373	}	1452	}
1374		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
1375	sub get_text {	1463	sub get_text {
1376	$_[0]{text}	1464	$_[0]{text}
1377	}	1465	}
1378		1466
1379	sub size_request {	1467	sub size_request {
…		…
1386		1474
1387	sub size_allocate {	1475	sub size_allocate {
1388	my ($self, $w, $h) = @_;	1476	my ($self, $w, $h) = @_;
1389		1477
1390	$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
1391	}
1392
1393	sub set_text {
1394	my ($self, $text) = @_;
1395
1396	$self->{cursor} = length $text;
1397	$self->_set_text ($text);
1398	$self->update;
1399	}	1479	}
1400		1480
1401	sub key_down {	1481	sub key_down {
1402	my ($self, $ev) = @_;	1482	my ($self, $ev) = @_;
1403		1483
…		…
1591		1671
1592	if ($GRAB == $self) {	1672	if ($GRAB == $self) {
1593	$self->{fg} = $self->{active_fg};	1673	$self->{fg} = $self->{active_fg};
1594	}	1674	}
1595		1675
1596	glEnable GL_BLEND;
1597	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1598	glEnable GL_TEXTURE_2D;	1676	glEnable GL_TEXTURE_2D;
1599	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1677	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1600	glColor 0, 0, 0, 1;	1678	glColor 0, 0, 0, 1;
1601		1679
1602	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1680	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1603		1681
1604	glDisable GL_TEXTURE_2D;	1682	glDisable GL_TEXTURE_2D;
1605	glDisable GL_BLEND;
1606		1683
1607	$self->SUPER::_draw;	1684	$self->SUPER::_draw;
1608	}	1685	}
1609		1686
1610	#############################################################################	1687	#############################################################################
…		…
1657		1734
1658	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;
1659		1736
1660	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1737	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1661		1738
1662	glEnable GL_BLEND;
1663	glEnable GL_TEXTURE_2D;	1739	glEnable GL_TEXTURE_2D;
1664	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1665		1740
1666	my $tex = $self->{state} ? $tex[1] : $tex[0];	1741	my $tex = $self->{state} ? $tex[1] : $tex[0];
1667		1742
1668	$tex->draw_quad (0, 0, $s, $s);	1743	$tex->draw_quad_alpha (0, 0, $s, $s);
1669		1744
1670	glDisable GL_TEXTURE_2D;	1745	glDisable GL_TEXTURE_2D;
1671	glDisable GL_BLEND;
1672	}	1746	}
1673		1747
1674	#############################################################################	1748	#############################################################################
1675		1749
1676	package CFClient::UI::Image;	1750	package CFClient::UI::Image;
…		…
1719	glTranslate 0, -$self->{w}, 0;	1793	glTranslate 0, -$self->{w}, 0;
1720		1794
1721	($w, $h) = ($h, $w);	1795	($w, $h) = ($h, $w);
1722	}	1796	}
1723		1797
1724	glEnable GL_BLEND;
1725	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1726	glEnable GL_TEXTURE_2D;	1798	glEnable GL_TEXTURE_2D;
1727	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1799	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1728		1800
1729	$tex->draw_quad (0, 0, $w, $h);	1801	$tex->draw_quad_alpha (0, 0, $w, $h);
1730		1802
1731	glDisable GL_BLEND;
1732	glDisable GL_TEXTURE_2D;	1803	glDisable GL_TEXTURE_2D;
1733	}	1804	}
1734		1805
1735	#############################################################################	1806	#############################################################################
1736		1807
…		…
1934	# TODO: calculations are off	2005	# TODO: calculations are off
1935	my $self = $class->SUPER::new (	2006	my $self = $class->SUPER::new (
1936	fg => [1, 1, 1],	2007	fg => [1, 1, 1],
1937	active_fg => [0, 0, 0],	2008	active_fg => [0, 0, 0],
1938	range => [0, 0, 100, 10],	2009	range => [0, 0, 100, 10],
1939	req_w => 20,	2010	req_w => $::WIDTH / 80,
1940	req_h => 20,	2011	req_h => $::WIDTH / 80,
1941	vertical => 0,	2012	vertical => 0,
1942	can_hover => 1,	2013	can_hover => 1,
1943	inner_pad => 5,	2014	inner_pad => 5,
1944	@_	2015	@_
1945	);	2016	);
…		…
2028	$page \|\|= 2;	2099	$page \|\|= 2;
2029		2100
2030	my $knob_a = $inner_pad_px + ($value - $page * 0.5);	2101	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2031	my $knob_b = $inner_pad_px + ($value + $page * 0.5);	2102	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2032		2103
2033	glEnable GL_BLEND;
2034	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2035	glEnable GL_TEXTURE_2D;	2104	glEnable GL_TEXTURE_2D;
2036	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2105	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2037		2106
2038	# draw background	2107	# draw background
2039	$tex[1]->draw_quad (0, 0, $w, $h);	2108	$tex[1]->draw_quad_alpha (0, 0, $w, $h);
2040		2109
2041	# draw handle	2110	# draw handle
2042	$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);
2043		2112
2044	glDisable GL_BLEND;
2045	glDisable GL_TEXTURE_2D;	2113	glDisable GL_TEXTURE_2D;
2046	}	2114	}
2047		2115
2048	#############################################################################	2116	#############################################################################
2049		2117
…		…
2060	fontsize => 1,	2128	fontsize => 1,
2061	can_events => 0,	2129	can_events => 0,
2062	#font => default_font	2130	#font => default_font
2063	@_,	2131	@_,
2064		2132
2065	layout => (new CFClient::Layout),	2133	layout => (new CFClient::Layout 1),
2066	par => [],	2134	par => [],
2067	height => 0,	2135	height => 0,
2068	children => [	2136	children => [
2069	(new CFClient::UI::Empty expand => 1),	2137	(new CFClient::UI::Empty expand => 1),
2070	(new CFClient::UI::Slider vertical => 1),	2138	(new CFClient::UI::Slider vertical => 1),
2071	],	2139	],
2072	);	2140	);
2073		2141
2074	$self->{children}[1]->connect (changed => sub {	2142	$self->{children}[1]->connect (changed => sub { $self->update });
2075	$self->update;
2076	});
2077		2143
2078	$self	2144	$self
2079	}	2145	}
2080		2146
2081	sub set_fontsize {	2147	sub set_fontsize {
…		…
2089	my ($self, $text) = @_;	2155	my ($self, $text) = @_;
2090		2156
2091	my $layout = $self->{layout};	2157	my $layout = $self->{layout};
2092		2158
2093	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2159	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094	$layout->set_width ($self->{w});	2160	$layout->set_width ($self->{children}[0]{w});
2095	$layout->set_text ($text);	2161	$layout->set_markup ($text);
2096		2162
2097	($layout->size)[1]	2163	($layout->size)[1]
2098	}	2164	}
2099		2165
2100	sub reflow {	2166	sub reflow {
…		…
2152	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2218	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2153		2219
2154	delete $self->{texture};	2220	delete $self->{texture};
2155	}	2221	}
2156		2222
2157	$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 {
2158	glClearColor 0, 0, 0, 1;	2224	glClearColor 0, 0, 0, 0;
2159	glClear GL_COLOR_BUFFER_BIT;	2225	glClear GL_COLOR_BUFFER_BIT;
2160		2226
2161	glEnable GL_BLEND;
2162	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2163	glEnable GL_TEXTURE_2D;	2227	glEnable GL_TEXTURE_2D;
2164	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2228	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2165		2229
2166	my $top = int $self->{children}[1]{range}[0];	2230	my $top = int $self->{children}[1]{range}[0];
2167		2231
…		…
2176		2240
2177	for my $par (@{$self->{par}}) {	2241	for my $par (@{$self->{par}}) {
2178	my $h = $par->[0];	2242	my $h = $par->[0];
2179		2243
2180	if ($y0 < $y + $h && $y < $y1) {	2244	if ($y0 < $y + $h && $y < $y1) {
		2245	$layout->set_foreground (@{ $par->[1] });
2181	$layout->set_text ($par->[2]);	2246	$layout->set_markup ($par->[2]);
2182		2247
2183	glColor @{ $par->[1] };
2184	my ($W, $H) = $layout->size;	2248	my ($W, $H) = $layout->size;
2185	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);
2186	}	2250	}
2187		2251
2188	$y += $h;	2252	$y += $h;
2189	}	2253	}
2190		2254
2191	glDisable GL_TEXTURE_2D;	2255	glDisable GL_TEXTURE_2D;
2192	glDisable GL_BLEND;
2193	};	2256	};
2194	});	2257	});
2195	}	2258	}
2196		2259
2197	sub _draw {	2260	sub _draw {
2198	my ($self) = @_;	2261	my ($self) = @_;
2199		2262
2200	if ($self->{texture}) {
2201	glEnable GL_TEXTURE_2D;	2263	glEnable GL_TEXTURE_2D;
2202	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2264	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203	glColor 1, 1, 1, 1;	2265	glColor 1, 1, 1, 1;
2204	$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});
2205	glDisable GL_TEXTURE_2D;	2267	glDisable GL_TEXTURE_2D;
2206	}
2207		2268
2208	$self->{children}[1]->draw;	2269	$self->{children}[1]->draw;
2209		2270
2210	}	2271	}
2211		2272
…		…
2305	@_,	2366	@_,
2306	can_events => 0,	2367	can_events => 0,
2307	)	2368	)
2308	}	2369	}
2309		2370
2310	sub set_markup {	2371	sub set_tooltip_from {
2311	my ($self, $text) = @_;	2372	my ($self, $widget) = @_;
2312		2373
2313	$self->{label} \|\|= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2374	$self->{label} = new CFClient::UI::Label
2314	$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
2315	$self->add ($self->{label});	2381	$self->add ($self->{label});
2316	}	2382	}
2317		2383
2318	sub size_request {	2384	sub size_request {
2319	my ($self) = @_;	2385	my ($self) = @_;
2320
2321	$self->child->set_max_size ($::WIDTH * 0.3);
2322		2386
2323	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2387	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324		2388
2325	($w + 4, $h + 4)	2389	($w + 4, $h + 4)
2326	}	2390	}
…		…
2380		2444
2381	sub size_request {	2445	sub size_request {
2382	(32, 8)	2446	(32, 8)
2383	}	2447	}
2384		2448
2385	sub draw {	2449	sub _draw {
2386	my ($self) = @_;	2450	my ($self) = @_;
2387		2451
		2452	return unless $::CONN;#d# manage and cache textures differently
2388	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2453	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2389		2454
		2455	# TODO animation
2390	if ($tex) {	2456	if ($tex) {
2391	glEnable GL_BLEND;
2392	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393	glEnable GL_TEXTURE_2D;	2457	glEnable GL_TEXTURE_2D;
2394	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2458	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395	glColor 1, 1, 1, 1;	2459	glColor 1, 1, 1, 1;
2396	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2460	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2397	glDisable GL_TEXTURE_2D;	2461	glDisable GL_TEXTURE_2D;
2398	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,
2399	}	2703	};
		2704
		2705	$item->{timeout} += time;
		2706	$item->{group} \|\|= $item+0;
		2707
		2708	$item = $self->{item}{$item->{group}} \|\|= $item;
		2709
		2710	$self->reorder;
2400	}	2711	}
2401		2712
2402	#############################################################################	2713	#############################################################################
2403		2714
2404	package CFClient::UI::Root;	2715	package CFClient::UI::Root;
2405		2716
2406	our @ISA = CFClient::UI::Container::;	2717	our @ISA = CFClient::UI::Container::;
2407		2718
2408	use CFClient::OpenGL;	2719	use CFClient::OpenGL;
2409		2720
2410	sub check_size {	2721	sub new {
2411	my ($self) = @_;	2722	my $class = shift;
2412		2723
2413	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2724	$class->SUPER::new (
2414	}	2725	@_,
2415		2726	)
2416	sub size_request {
2417	($::WIDTH, $::HEIGHT)
2418	}	2727	}
2419		2728
2420	sub configure {	2729	sub configure {
2421	my ($self, $x, $y, $w, $h) = @_;	2730	my ($self, $x, $y, $w, $h) = @_;
2422		2731
2423	$self->SUPER::configure ($x, $y, $w, $h);	2732	$self->{w} = $w;
		2733	$self->{h} = $h;
		2734	}
2424		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
2425	for my $child (@{$self->{children}}) {	2768	for my $child ($self->children) {
2426	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)};
2427		2770
2428	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2771	$X = List::Util::max 0, List::Util::min $w - $W, $X;
2429	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2772	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2430	$child->configure ($X, $Y, $W,$H);	2773	$child->configure ($X, $Y, $W, $H);
2431	}	2774	}
2432	}
2433		2775
2434	sub _topleft {	2776	$self->{old_w} = $w;
		2777	$self->{old_h} = $h;
		2778	}
		2779
		2780	sub coord2local {
2435	my ($self, $x, $y) = @_;	2781	my ($self, $x, $y) = @_;
2436		2782
2437	($x, $y)	2783	($x, $y)
2438	}	2784	}
2439		2785
		2786	sub coord2global {
		2787	my ($self, $x, $y) = @_;
		2788
		2789	($x, $y)
		2790	}
		2791
2440	sub update {	2792	sub update {
2441	my ($self) = @_;	2793	my ($self) = @_;
2442		2794
2443	$self->check_size;	2795	$self->check_size;
2444	::refresh ();	2796	$::WANT_REFRESH++;
2445	}	2797	}
2446		2798
2447	sub add {	2799	sub add {
2448	my ($self, $child) = @_;	2800	my ($self, $child) = @_;
2449		2801
2450	# integerize window positions	2802	# integerise window positions
2451	$child->{x} = int $child->{x};	2803	$child->{x} = int $child->{x};
2452	$child->{y} = int $child->{y};	2804	$child->{y} = int $child->{y};
2453		2805
2454	$self->SUPER::add ($child);	2806	$self->SUPER::add ($child);
2455	}	2807	}
…		…
2458	my ($self, $id, $cb) = @_;	2810	my ($self, $id, $cb) = @_;
2459		2811
2460	$self->{refresh_hook}{$id} = $cb;	2812	$self->{refresh_hook}{$id} = $cb;
2461	}	2813	}
2462		2814
2463	sub draw {	2815	sub draw {
2464	my ($self) = @_;	2816	my ($self) = @_;
2465		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
2466	while (my $rcb = delete $self->{refresh_hook}) {	2862	while ($self->{refresh_hook}) {
2467	$_->() for values %$rcb;	2863	$_->()
		2864	for values %{delete $self->{refresh_hook}};
2468	}	2865	}
2469		2866
2470	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2867	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2471	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2868	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2472	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.173 by root, Tue Apr 25 10:30:48 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.173 by root, Tue Apr 25 10:30:48 2006 UTC vs.
Revision 1.196 by root, Fri May 12 00:16:34 2006 UTC