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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.189 by root, Mon May 8 22:17:24 2006 UTC vs.
Revision 1.197 by root, Fri May 12 01:47:04 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
30	$TOOLTIP->show;	30	$TOOLTIP->show;
31		31
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		33
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {	34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36	}	36	}
37		37
38	$TOOLTIP->move ($x, $y);	38	$TOOLTIP->move ($x, $y);
		39	$TOOLTIP->check_size;
		40	$TOOLTIP->update;
39	}	41	}
40		42
41	return;	43	return;
42	}	44	}
43	}	45	}
…		…
232	$self->{y} = $y;	234	$self->{y} = $y;
233	$self->update;	235	$self->update;
234	}	236	}
235		237
236	if ($self->{w} != $w \|\| $self->{h} != $h) {	238	if ($self->{w} != $w \|\| $self->{h} != $h) {
237	$self->{w} = $w;	239	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238	$self->{h} = $h;
239
240	$self->size_allocate ($w, $h);
241	$self->update;
242	$self->emit (size_allocate => $w, $h);
243	}	240	}
244	}	241	}
245		242
246	sub size_allocate {	243	sub size_allocate {
247	# nothing to be done	244	# nothing to be done
…		…
256		253
257	$_->reconfigure	254	$_->reconfigure
258	for $self->children;	255	for $self->children;
259		256
260	$self->check_size;	257	$self->check_size;
261	$self->size_allocate ($self->{w}, $self->{h});	258	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
262	$self->update;	259	$self->update;
263	}	260	}
264		261
265	sub set_max_size {	262	sub set_max_size {
266	my ($self, $w, $h) = @_;	263	my ($self, $w, $h) = @_;
267		264
268	delete $self->{max_w}; $self->{max_w} = $w if $w;	265	delete $self->{max_w}; $self->{max_w} = $w if $w;
269	delete $self->{max_h}; $self->{max_h} = $h if $h;	266	delete $self->{max_h}; $self->{max_h} = $h if $h;
270	}
271
272	# return top left coordinates
273	sub _topleft {
274	my ($self, $x, $y) = @_;
275
276	$self->{parent}
277	or Carp::confess "no parent widget in _topleft\n";#d#
278
279	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
280	}	267	}
281		268
282	# translate global coordinates to local coordinate system	269	# translate global coordinates to local coordinate system
283	sub coord2local {	270	sub coord2local {
284	my ($self, $x, $y) = @_;	271	my ($self, $x, $y) = @_;
285		272
286	my ($X, $Y) = $self->_topleft;	273	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287	($x - $X, $y - $Y)
288	}	274	}
289		275
290	# translate local coordinates to global coordinate system	276	# translate local coordinates to global coordinate system
291	sub coord2global {	277	sub coord2global {
292	my ($self, $x, $y) = @_;	278	my ($self, $x, $y) = @_;
293		279
294	my ($X, $Y) = $self->_topleft;	280	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295	($x + $X, $y + $Y)
296	}	281	}
297		282
298	sub focus_in {	283	sub focus_in {
299	my ($self) = @_;	284	my ($self) = @_;
300		285
…		…
398		383
399	sub set_parent {	384	sub set_parent {
400	my ($self, $parent) = @_;	385	my ($self, $parent) = @_;
401		386
402	Scalar::Util::weaken ($self->{parent} = $parent);	387	Scalar::Util::weaken ($self->{parent} = $parent);
		388
		389	$self->check_size
		390	unless exists $self->{req_w};
403	}	391	}
404		392
405	sub check_size {	393	sub check_size {
406	my ($self) = @_;	394	my ($self, $forced) = @_;
407		395
408	$self->_check_size;	396	$self->{force_alloc} = 1 if $forced;
409	return;
410	my $check_size = $CFClient::UI::ROOT->{_check_size} \|\|= {};
411
412	$check_size->{$self} = $self;
413
414	$CFClient::UI::ROOT->on_refresh (_check_size => sub {
415	while (%$check_size) {
416	my @widgets = values %$check_size;
417	$_->_check_size
418	for @widgets;
419	}
420	});
421	}
422
423	sub _check_size {
424	my ($self) = @_;
425
426	delete $CFClient::UI::ROOT->{_check_size}{$self};	397	$CFClient::UI::ROOT->{check_size}{$self} = $self;
427
428	$self->{parent}
429	or return 1;
430
431	my ($w, $h) = $self->{user_w} && $self->{user_h}
432	? @$self{qw(user_w user_h)}
433	: $self->size_request;
434
435	if ($w != $self->{req_w} \|\| $h != $self->{req_h}) {
436	$self->{req_w} = $w;
437	$self->{req_h} = $h;
438
439	$self->{parent}->_check_size
440	or $self->size_allocate (
441	(List::Util::max $self->{w}, $w),
442	(List::Util::max $self->{h}, $h),
443	);
444
445	1
446	} else {
447	0
448	}
449	}	398	}
450		399
451	sub update {	400	sub update {
452	my ($self) = @_;	401	my ($self) = @_;
453		402
454	my $update = $CFClient::UI::ROOT->{_update} \|\|= {};	403	$self->{parent}->update
455		404	if $self->{parent};
456	$update->{$self} = $self;
457
458	$CFClient::UI::ROOT->on_refresh (_update => sub {
459	while (%$update) {
460	my @widgets = values %$update;
461	%$update = ();
462
463	$_->{parent} && $_->{parent}->update
464	for @widgets;
465	}
466	});
467	}	405	}
468		406
469	sub connect {	407	sub connect {
470	my ($self, $signal, $cb) = @_;	408	my ($self, $signal, $cb) = @_;
471		409
…		…
573	$self->{children} = [	511	$self->{children} = [
574	sort { $a->{z} <=> $b->{z} }	512	sort { $a->{z} <=> $b->{z} }
575	@{$self->{children}}, @widgets	513	@{$self->{children}}, @widgets
576	];	514	];
577		515
578	$_->check_size	516	$self->check_size (1);
579	for @widgets;
580
581	$self->update;	517	$self->update;
582	}	518	}
583		519
584	sub children {	520	sub children {
585	@{ $_[0]{children} }	521	@{ $_[0]{children} }
…		…
733	my ($w, $h) = ($self->w, $self->h);	669	my ($w, $h) = ($self->w, $self->h);
734		670
735	my $tex = $self->{texture}	671	my $tex = $self->{texture}
736	or return;	672	or return;
737		673
738	glEnable GL_BLEND;
739	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
740	glEnable GL_TEXTURE_2D;	674	glEnable GL_TEXTURE_2D;
741	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
742	glColor 0, 0, 0, 1;	676	glColor 0, 0, 0, 1;
743		677
744	$tex->draw_quad (0, 0, $w, $h);	678	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
745		679
746	glDisable GL_BLEND;
747	glDisable GL_TEXTURE_2D;	680	glDisable GL_TEXTURE_2D;
748	}	681	}
749		682
750	#############################################################################	683	#############################################################################
751		684
…		…
775	$self->{view_y} = int $y;	708	$self->{view_y} = int $y;
776		709
777	$self->update;	710	$self->update;
778	}	711	}
779		712
780	# hmm, this does not work for topleft of $self... but we should not aks for that	713	# hmm, this does not work for topleft of $self... but we should not ask for that
781	sub _topleft {	714	sub coord2local {
782	my ($self, $x, $y) = @_;	715	my ($self, $x, $y) = @_;
783		716
784	$self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})	717	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		718	}
		719
		720	sub coord2global {
		721	my ($self, $x, $y) = @_;
		722
		723	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		724	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		725
		726	$self->SUPER::coord2global ($x, $y)
785	}	727	}
786		728
787	sub find_widget {	729	sub find_widget {
788	my ($self, $x, $y) = @_;	730	my ($self, $x, $y) = @_;
789		731
…		…
845		787
846	our @ISA = CFClient::UI::Bin::;	788	our @ISA = CFClient::UI::Bin::;
847		789
848	use CFClient::OpenGL;	790	use CFClient::OpenGL;
849		791
850	sub new {
851	my $class = shift;
852
853	my $self = $class->SUPER::new (
854	bg => [1, 1, 1, 1],
855	border_bg => [1, 1, 1, 1],
856	border => 0.8,
857	@_
858	);
859
860	$self
861	}
862
863	sub _draw {
864	my ($self) = @_;
865
866	my ($w, $h) = ($self->{w}, $self->{h});
867
868	glEnable GL_BLEND;
869	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
870	glEnable GL_TEXTURE_2D;
871	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
872
873	# glBegin GL_QUADS;
874	# glColor 0, 0, 0, 0;
875	# glVertex 0 , 0;
876	# glVertex 0 , $h;
877	# glVertex $w, $h;
878	# glVertex $w, 0;
879	# glEnd;
880
881
882	$self->child->draw;
883	glDisable GL_BLEND;
884	glDisable GL_TEXTURE_2D;
885	}
886
887	#############################################################################	792	#############################################################################
888		793
889	package CFClient::UI::FancyFrame;	794	package CFClient::UI::FancyFrame;
890		795
891	our @ISA = CFClient::UI::Bin::;	796	our @ISA = CFClient::UI::Bin::;
…		…
1005	my ($self) = @_;	910	my ($self) = @_;
1006		911
1007	my ($w, $h ) = ($self->{w}, $self->{h});	912	my ($w, $h ) = ($self->{w}, $self->{h});
1008	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	913	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
1009		914
1010	glEnable GL_BLEND;
1011	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1012	glEnable GL_TEXTURE_2D;	915	glEnable GL_TEXTURE_2D;
1013	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	916	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1014		917
1015	my $border = $self->border;	918	my $border = $self->border;
1016		919
1017	glColor @{ $self->{border_bg} };	920	glColor @{ $self->{border_bg} };
1018	$tex[1]->draw_quad (0, 0, $w, $border);	921	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
1019	$tex[3]->draw_quad (0, $border, $border, $ch);	922	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
1020	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	923	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1021	$tex[4]->draw_quad (0, $h - $border, $w, $border);	924	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
1022		925
1023	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {	926	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
1024	my $bg = $tex[0];	927	my $bg = $tex[0];
1025		928
1026	# TODO: repeat texture not scale	929	# TODO: repeat texture not scale
…		…
1030	glColor @{ $self->{bg} };	933	glColor @{ $self->{bg} };
1031		934
1032	$bg->{s} = $rep_x;	935	$bg->{s} = $rep_x;
1033	$bg->{t} = $rep_y;	936	$bg->{t} = $rep_y;
1034	$bg->{wrap_mode} = 1;	937	$bg->{wrap_mode} = 1;
1035	$bg->draw_quad ($border, $border, $cw, $ch);	938	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		939	}
1036		940
1037	glDisable GL_TEXTURE_2D;	941	glDisable GL_TEXTURE_2D;
1038	glDisable GL_BLEND;
1039	}
1040		942
1041	$self->{title}->draw if $self->{title};	943	$self->{title}->draw if $self->{title};
1042		944
1043	$self->child->draw;	945	$self->child->draw;
1044	}	946	}
…		…
1271	}	1173	}
1272		1174
1273	sub size_allocate {	1175	sub size_allocate {
1274	my ($self, $w, $h) = @_;	1176	my ($self, $w, $h) = @_;
1275		1177
		1178	Carp::confess "negative size" if $w < 0 \|\| $h < 0;#d#
		1179
1276	my $children = $self->{children};	1180	my $children = $self->{children};
1277		1181
1278	my @h = map $_->{req_h}, @$children;	1182	my @h = map $_->{req_h}, @$children;
1279		1183
1280	my $req_h = List::Util::sum @h;	1184	my $req_h = List::Util::sum @h;
…		…
1319	my ($class, %arg) = @_;	1223	my ($class, %arg) = @_;
1320		1224
1321	my $self = $class->SUPER::new (	1225	my $self = $class->SUPER::new (
1322	fg => [1, 1, 1],	1226	fg => [1, 1, 1],
1323	#font => default_font	1227	#font => default_font
		1228	#text => initial text
		1229	#markup => initial narkup
		1230	layout => (new CFClient::Layout),
1324	fontsize => 1,	1231	fontsize => 1,
1325	text => "",
1326	align => -1,	1232	align => -1,
1327	valign => -1,	1233	valign => -1,
1328	padding => 2,	1234	padding => 2,
1329	layout => new CFClient::Layout,
1330	can_events => 0,	1235	can_events => 0,
1331	%arg	1236	%arg
1332	);	1237	);
1333		1238
1334	if (exists $self->{template}) {	1239	if (exists $self->{template}) {
1335	my $layout = new CFClient::Layout;	1240	my $layout = new CFClient::Layout;
1336	$layout->set_text (delete $self->{template});	1241	$layout->set_text (delete $self->{template});
1337	$self->{template} = $layout;	1242	$self->{template} = $layout;
1338	}	1243	}
1339		1244
1340	$self->set_text (delete $self->{text}) if exists $self->{text};	1245	if (exists $self->{markup}) {
1341	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1246	$self->set_markup (delete $self->{markup});
		1247	} else {
		1248	$self->set_text (delete $self->{text});
		1249	}
1342		1250
1343	$self	1251	$self
1344	}	1252	}
1345		1253
1346	sub escape {	1254	sub escape {
…		…
1364	my ($self, $text) = @_;	1272	my ($self, $text) = @_;
1365		1273
1366	return if $self->{text} eq "T$text";	1274	return if $self->{text} eq "T$text";
1367	$self->{text} = "T$text";	1275	$self->{text} = "T$text";
1368		1276
		1277	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1369	$self->{layout}->set_text ($text);	1278	$self->{layout}->set_text ($text);
1370		1279
1371	delete $self->{texture};
1372	$self->update;	1280	$self->update;
1373	$self->check_size;	1281	$self->check_size;
1374	}	1282	}
1375		1283
1376	sub set_markup {	1284	sub set_markup {
1377	my ($self, $markup) = @_;	1285	my ($self, $markup) = @_;
1378		1286
1379	return if $self->{text} eq "M$markup";	1287	return if $self->{text} eq "M$markup";
1380	$self->{text} = "M$markup";	1288	$self->{text} = "M$markup";
1381		1289
		1290	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
		1291
		1292	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1382	$self->{layout}->set_markup ($markup);	1293	$self->{layout}->set_markup ($markup);
1383		1294
1384	delete $self->{texture};
1385	$self->update;	1295	$self->update;
1386	$self->check_size;	1296	$self->check_size;
1387	}	1297	}
1388		1298
1389	sub size_request {	1299	sub size_request {
…		…
1429		1339
1430	sub _draw {	1340	sub _draw {
1431	my ($self) = @_;	1341	my ($self) = @_;
1432		1342
1433	my $tex = $self->{texture} \|\|= do {	1343	my $tex = $self->{texture} \|\|= do {
		1344	$self->{layout}->set_foreground (@{$self->{fg}});
1434	$self->{layout}->set_font ($self->{font}) if $self->{font};	1345	$self->{layout}->set_font ($self->{font}) if $self->{font};
1435	$self->{layout}->set_width ($self->{w});	1346	$self->{layout}->set_width ($self->{w});
1436	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1347	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
		1348
1437	new_from_layout CFClient::Texture $self->{layout}	1349	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1350
		1351	$self->{ox} = int $self->{align} < 0 ? $self->{padding}
		1352	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1353	: ($self->{w} - $tex->{w}) * 0.5;
		1354
		1355	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}
		1356	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1357	: ($self->{h} - $tex->{h}) * 0.5;
		1358
		1359	$tex
1438	};	1360	};
1439		1361
1440	glEnable GL_BLEND;
1441	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1442	glEnable GL_TEXTURE_2D;	1362	glEnable GL_TEXTURE_2D;
1443	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1363	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1444		1364
		1365	if ($tex->{format} == GL_ALPHA) {
1445	glColor @{$self->{fg}};	1366	glColor @{$self->{fg}};
1446
1447	$self->{ox} = int (
1448	$self->{align} < 0 ? $self->{padding}
1449	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1450	: ($self->{w} - $tex->{w}) * 0.5
1451	);
1452
1453	$self->{oy} = int (
1454	$self->{valign} < 0 ? $self->{padding}
1455	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1456	: ($self->{h} - $tex->{h}) * 0.5
1457	);
1458
1459	$tex->draw_quad ($self->{ox}, $self->{oy});	1367	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1368	} else {
		1369	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1370	}
1460		1371
1461	glDisable GL_TEXTURE_2D;	1372	glDisable GL_TEXTURE_2D;
1462	glDisable GL_BLEND;
1463	}	1373	}
1464		1374
1465	#############################################################################	1375	#############################################################################
1466		1376
1467	package CFClient::UI::EntryBase;	1377	package CFClient::UI::EntryBase;
…		…
1502	$self->{layout}->set_text ("$text ");	1412	$self->{layout}->set_text ("$text ");
1503		1413
1504	$self->emit (changed => $self->{text});	1414	$self->emit (changed => $self->{text});
1505	}	1415	}
1506		1416
		1417	sub set_text {
		1418	my ($self, $text) = @_;
		1419
		1420	$self->{cursor} = length $text;
		1421	$self->_set_text ($text);
		1422	$self->check_size;
		1423	$self->update;
		1424	}
		1425
1507	sub get_text {	1426	sub get_text {
1508	$_[0]{text}	1427	$_[0]{text}
1509	}	1428	}
1510		1429
1511	sub size_request {	1430	sub size_request {
…		…
1518		1437
1519	sub size_allocate {	1438	sub size_allocate {
1520	my ($self, $w, $h) = @_;	1439	my ($self, $w, $h) = @_;
1521		1440
1522	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text	1441	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1523	}
1524
1525	sub set_text {
1526	my ($self, $text) = @_;
1527
1528	$self->{cursor} = length $text;
1529	$self->_set_text ($text);
1530	$self->update;
1531	}	1442	}
1532		1443
1533	sub key_down {	1444	sub key_down {
1534	my ($self, $ev) = @_;	1445	my ($self, $ev) = @_;
1535		1446
…		…
1723		1634
1724	if ($GRAB == $self) {	1635	if ($GRAB == $self) {
1725	$self->{fg} = $self->{active_fg};	1636	$self->{fg} = $self->{active_fg};
1726	}	1637	}
1727		1638
1728	glEnable GL_BLEND;
1729	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1730	glEnable GL_TEXTURE_2D;	1639	glEnable GL_TEXTURE_2D;
1731	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1640	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1732	glColor 0, 0, 0, 1;	1641	glColor 0, 0, 0, 1;
1733		1642
1734	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1643	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1735		1644
1736	glDisable GL_TEXTURE_2D;	1645	glDisable GL_TEXTURE_2D;
1737	glDisable GL_BLEND;
1738		1646
1739	$self->SUPER::_draw;	1647	$self->SUPER::_draw;
1740	}	1648	}
1741		1649
1742	#############################################################################	1650	#############################################################################
…		…
1789		1697
1790	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1698	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1791		1699
1792	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1700	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1793		1701
1794	glEnable GL_BLEND;	1702	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1703
1795	glEnable GL_TEXTURE_2D;	1704	glEnable GL_TEXTURE_2D;
1796	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1797
1798	my $tex = $self->{state} ? $tex[1] : $tex[0];
1799
1800	$tex->draw_quad (0, 0, $s, $s);	1705	$tex->draw_quad_alpha (0, 0, $s, $s);
1801
1802	glDisable GL_TEXTURE_2D;	1706	glDisable GL_TEXTURE_2D;
1803	glDisable GL_BLEND;
1804	}	1707	}
1805		1708
1806	#############################################################################	1709	#############################################################################
1807		1710
1808	package CFClient::UI::Image;	1711	package CFClient::UI::Image;
…		…
1851	glTranslate 0, -$self->{w}, 0;	1754	glTranslate 0, -$self->{w}, 0;
1852		1755
1853	($w, $h) = ($h, $w);	1756	($w, $h) = ($h, $w);
1854	}	1757	}
1855		1758
1856	glEnable GL_BLEND;
1857	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1858	glEnable GL_TEXTURE_2D;	1759	glEnable GL_TEXTURE_2D;
1859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1760	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1860		1761
1861	$tex->draw_quad (0, 0, $w, $h);	1762	$tex->draw_quad_alpha (0, 0, $w, $h);
1862		1763
1863	glDisable GL_BLEND;
1864	glDisable GL_TEXTURE_2D;	1764	glDisable GL_TEXTURE_2D;
1865	}	1765	}
1866		1766
1867	#############################################################################	1767	#############################################################################
1868		1768
…		…
2160	$page \|\|= 2;	2060	$page \|\|= 2;
2161		2061
2162	my $knob_a = $inner_pad_px + ($value - $page * 0.5);	2062	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2163	my $knob_b = $inner_pad_px + ($value + $page * 0.5);	2063	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2164		2064
2165	glEnable GL_BLEND;
2166	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2167	glEnable GL_TEXTURE_2D;	2065	glEnable GL_TEXTURE_2D;
2168	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2066	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2169		2067
2170	# draw background	2068	# draw background
2171	$tex[1]->draw_quad (0, 0, $w, $h);	2069	$tex[1]->draw_quad_alpha (0, 0, $w, $h);
2172		2070
2173	# draw handle	2071	# draw handle
2174	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2072	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
2175		2073
2176	glDisable GL_BLEND;
2177	glDisable GL_TEXTURE_2D;	2074	glDisable GL_TEXTURE_2D;
2178	}	2075	}
2179		2076
2180	#############################################################################	2077	#############################################################################
2181		2078
…		…
2192	fontsize => 1,	2089	fontsize => 1,
2193	can_events => 0,	2090	can_events => 0,
2194	#font => default_font	2091	#font => default_font
2195	@_,	2092	@_,
2196		2093
2197	layout => (new CFClient::Layout),	2094	layout => (new CFClient::Layout 1),
2198	par => [],	2095	par => [],
2199	height => 0,	2096	height => 0,
2200	children => [	2097	children => [
2201	(new CFClient::UI::Empty expand => 1),	2098	(new CFClient::UI::Empty expand => 1),
2202	(new CFClient::UI::Slider vertical => 1),	2099	(new CFClient::UI::Slider vertical => 1),
…		…
2220		2117
2221	my $layout = $self->{layout};	2118	my $layout = $self->{layout};
2222		2119
2223	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2120	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2224	$layout->set_width ($self->{children}[0]{w});	2121	$layout->set_width ($self->{children}[0]{w});
2225	$layout->set_text ($text);	2122	$layout->set_markup ($text);
2226		2123
2227	($layout->size)[1]	2124	($layout->size)[1]
2228	}	2125	}
2229		2126
2230	sub reflow {	2127	sub reflow {
…		…
2286		2183
2287	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2184	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2288	glClearColor 0, 0, 0, 0;	2185	glClearColor 0, 0, 0, 0;
2289	glClear GL_COLOR_BUFFER_BIT;	2186	glClear GL_COLOR_BUFFER_BIT;
2290		2187
2291	glEnable GL_BLEND;
2292	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2293	glEnable GL_TEXTURE_2D;	2188	glEnable GL_TEXTURE_2D;
2294	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2189	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2295		2190
2296	my $top = int $self->{children}[1]{range}[0];	2191	my $top = int $self->{children}[1]{range}[0];
2297		2192
…		…
2306		2201
2307	for my $par (@{$self->{par}}) {	2202	for my $par (@{$self->{par}}) {
2308	my $h = $par->[0];	2203	my $h = $par->[0];
2309		2204
2310	if ($y0 < $y + $h && $y < $y1) {	2205	if ($y0 < $y + $h && $y < $y1) {
		2206	$layout->set_foreground (@{ $par->[1] });
2311	$layout->set_text ($par->[2]);	2207	$layout->set_markup ($par->[2]);
2312		2208
2313	glColor @{ $par->[1] };
2314	my ($W, $H) = $layout->size;	2209	my ($W, $H) = $layout->size;
2315	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2210	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2316	}	2211	}
2317		2212
2318	$y += $h;	2213	$y += $h;
2319	}	2214	}
2320		2215
2321	glDisable GL_TEXTURE_2D;	2216	glDisable GL_TEXTURE_2D;
2322	glDisable GL_BLEND;
2323	};	2217	};
2324	});	2218	});
2325	}	2219	}
2326		2220
2327	sub _draw {	2221	sub _draw {
2328	my ($self) = @_;	2222	my ($self) = @_;
2329		2223
2330	glEnable GL_BLEND;
2331	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2332	glEnable GL_TEXTURE_2D;	2224	glEnable GL_TEXTURE_2D;
2333	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2225	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2334	glColor 1, 1, 1, 1;	2226	glColor 1, 1, 1, 1;
2335	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2227	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2336	glDisable GL_TEXTURE_2D;	2228	glDisable GL_TEXTURE_2D;
2337	glDisable GL_BLEND;
2338		2229
2339	$self->{children}[1]->draw;	2230	$self->{children}[1]->draw;
2340		2231
2341	}	2232	}
2342		2233
…		…
2436	@_,	2327	@_,
2437	can_events => 0,	2328	can_events => 0,
2438	)	2329	)
2439	}	2330	}
2440		2331
2441	sub set_markup {	2332	sub set_tooltip_from {
2442	my ($self, $text) = @_;	2333	my ($self, $widget) = @_;
2443		2334
2444	$self->{label} \|\|= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2335	$self->add (new CFClient::UI::Label
2445	$self->{label}->set_markup ($text);	2336	markup => $widget->{tooltip},
2446	$self->add ($self->{label});	2337	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
		2338	fontsize => 0.8,
		2339	fg => [0, 0, 0, 1],
		2340	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
		2341	);
2447	}	2342	}
2448		2343
2449	sub size_request {	2344	sub size_request {
2450	my ($self) = @_;	2345	my ($self) = @_;
2451
2452	$self->child->set_max_size ($::WIDTH * 0.3);
2453		2346
2454	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2347	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2455		2348
2456	($w + 4, $h + 4)	2349	($w + 4, $h + 4)
2457	}	2350	}
…		…
2463	}	2356	}
2464		2357
2465	sub _draw {	2358	sub _draw {
2466	my ($self) = @_;	2359	my ($self) = @_;
2467		2360
2468	glPushMatrix;
2469	glTranslate 0.375, 0.375;	2361	glTranslate 0.375, 0.375;
2470		2362
2471	my ($w, $h) = @$self{qw(w h)};	2363	my ($w, $h) = @$self{qw(w h)};
2472		2364
2473	glColor 1, 0.8, 0.4;	2365	glColor 1, 0.8, 0.4;
…		…
2484	glVertex 0 , $h;	2376	glVertex 0 , $h;
2485	glVertex $w, $h;	2377	glVertex $w, $h;
2486	glVertex $w, 0;	2378	glVertex $w, 0;
2487	glEnd;	2379	glEnd;
2488		2380
2489	glPopMatrix;	2381	glTranslate 2 - 0.375, 2 - 0.375;
2490
2491	glTranslate 2, 2;
2492	$self->SUPER::_draw;	2382	$self->SUPER::_draw;
2493	}	2383	}
2494		2384
2495	#############################################################################	2385	#############################################################################
2496		2386
…		…
2519	return unless $::CONN;#d# manage and cache textures differently	2409	return unless $::CONN;#d# manage and cache textures differently
2520	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2410	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2521		2411
2522	# TODO animation	2412	# TODO animation
2523	if ($tex) {	2413	if ($tex) {
2524	glEnable GL_BLEND;
2525	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2526	glEnable GL_TEXTURE_2D;	2414	glEnable GL_TEXTURE_2D;
2527	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2415	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2528	glColor 1, 1, 1, 1;	2416	glColor 1, 1, 1, 1;
2529	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2417	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2530	glDisable GL_TEXTURE_2D;	2418	glDisable GL_TEXTURE_2D;
2531	glDisable GL_BLEND;
2532	}	2419	}
2533	}	2420	}
2534		2421
2535	#############################################################################	2422	#############################################################################
2536		2423
…		…
2541	sub new {	2428	sub new {
2542	my $class = shift;	2429	my $class = shift;
2543		2430
2544	my %args = @_;	2431	my %args = @_;
2545		2432
2546	my $item = $args{item};	2433	my $item = delete $args{item};
2547		2434
2548	my $desc = $item->{nrof} < 2	2435	my $desc = $item->{nrof} < 2
2549	? $item->{name}	2436	? $item->{name}
2550	: "$item->{nrof} $item->{name_pl}";	2437	: "$item->{nrof} $item->{name_pl}";
2551		2438
…		…
2580		2467
2581	1	2468	1
2582	},	2469	},
2583	%args	2470	%args
2584	);	2471	);
		2472
2585	$self->add(new CFClient::UI::Face	2473	$self->add (new CFClient::UI::Face
2586	can_events => 0,	2474	can_events => 0,
2587	face => $item->{face},	2475	face => $item->{face},
2588	anim => $item->{anim},	2476	anim => $item->{anim},
2589	animspeed => $item->{animspeed});	2477	animspeed => $item->{animspeed},
		2478	);
		2479
2590	$self->add(new CFClient::UI::Label	2480	$self->add (new CFClient::UI::Label
2591	can_events => 0,	2481	can_events => 0,
2592	text => $desc);	2482	text => $desc,
		2483	);
2593		2484
2594	$self	2485	$self
2595	}	2486	}
2596		2487
2597	#############################################################################	2488	#############################################################################
…		…
2624	for my $item (@items) {	2515	for my $item (@items) {
2625	my $desc = $item->{nrof} < 2	2516	my $desc = $item->{nrof} < 2
2626	? $item->{name}	2517	? $item->{name}
2627	: "$item->{nrof} $item->{name_pl}";	2518	: "$item->{nrof} $item->{name_pl}";
2628		2519
2629	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);	2520	$self->{scrolled}->add ($item->{widget} \|\|= new CFClient::UI::InventoryItem item => $item);
2630	}	2521	}
2631		2522
2632	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2523	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633	}	2524	}
2634		2525
…		…
2709	}	2600	}
2710	}	2601	}
2711		2602
2712	#############################################################################	2603	#############################################################################
2713		2604
		2605	package CFClient::UI::Statusbox;
		2606
		2607	our @ISA = CFClient::UI::VBox::;
		2608
		2609	sub reorder {
		2610	my ($self) = @_;
		2611	my $NOW = time;
		2612
		2613	while (my ($k, $v) = each %{ $self->{item} }) {
		2614	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2615	}
		2616
		2617	my @widgets;
		2618
		2619	my @items = sort {
		2620	$a->{pri} <=> $b->{pri}
		2621	or $b->{id} <=> $a->{id}
		2622	} values %{ $self->{item} };
		2623
		2624	my $count = 10 + 1;
		2625	for my $item (@items) {
		2626	last unless --$count;
		2627
		2628	push @widgets, $item->{label} \|\|= do {
		2629	# TODO: doesn't handle markup well (read as: at all)
		2630	my $short = $item->{count} > 1
		2631	? "<b>$item->{count} ×</b> $item->{text}"
		2632	: $item->{text};
		2633
		2634	for ($short) {
		2635	s/^\s+//;
		2636	s/\012.*/…/s;
		2637	my $len = int 30 / $item->{fontsize};
		2638	substr $_, $len, length, "…" if $len < length;
		2639	}
		2640
		2641	new CFClient::UI::Label
		2642	markup => $short,
		2643	tooltip => $item->{tooltip},
		2644	tooltip_font => $::FONT_PROP,
		2645	tooltip_width => 0.67,
		2646	fontsize => $item->{fontsize},
		2647	color => $item->{color},
		2648	can_events => 1,
		2649	can_hover => 1
		2650	};
		2651	}
		2652
		2653	$self->clear;
		2654	$self->SUPER::add (reverse @widgets);
		2655	}
		2656
		2657	sub add {
		2658	my ($self, $text, %arg) = @_;
		2659
		2660	my $timeout = time + ((delete $arg{timeout}) \|\| 60);
		2661
		2662	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2663
		2664	if (my $item = $self->{item}{$group}) {
		2665	if ($item->{text} eq $text) {
		2666	$item->{count}++;
		2667	} else {
		2668	$item->{count} = 1;
		2669	$item->{text} = $item->{tooltip} = $text;
		2670	}
		2671	$item->{timeout} = $timeout;
		2672	delete $item->{label};
		2673	} else {
		2674	$self->{item}{$group} = {
		2675	id => ++$self->{id},
		2676	text => $text,
		2677	timeout => $timeout,
		2678	tooltip => $text,
		2679	fontsize => 0.8,
		2680	color => [0.8, 0.8, 0.8, 0.8],
		2681	pri => 0,
		2682	count => 1,
		2683	%arg,
		2684	};
		2685	}
		2686
		2687	$self->reorder;
		2688	}
		2689
		2690	#############################################################################
		2691
2714	package CFClient::UI::Root;	2692	package CFClient::UI::Root;
2715		2693
2716	our @ISA = CFClient::UI::Container::;	2694	our @ISA = CFClient::UI::Container::;
2717		2695
2718	use CFClient::OpenGL;	2696	use CFClient::OpenGL;
2719		2697
		2698	sub new {
		2699	my $class = shift;
		2700
		2701	$class->SUPER::new (
		2702	@_,
		2703	)
		2704	}
		2705
		2706	sub configure {
		2707	my ($self, $x, $y, $w, $h) = @_;
		2708
		2709	$self->{w} = $w;
		2710	$self->{h} = $h;
		2711	}
		2712
2720	sub check_size {	2713	sub check_size {
2721	my ($self) = @_;	2714	my ($self) = @_;
2722		2715
2723	$self->configure (0, 0, $self->{w}, $self->{h});	2716	$self->size_allocate ($self->{w}, $self->{h})
		2717	if $self->{w};
2724	}	2718	}
2725		2719
2726	sub size_request {	2720	sub size_request {
2727	my ($self) = @_;	2721	my ($self) = @_;
2728		2722
…		…
2746	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};	2740	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2747	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};	2741	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2748	}	2742	}
2749	}	2743	}
2750		2744
2751	$self->{old_w} = $w;
2752	$self->{old_h} = $h;
2753	}
2754
2755	sub configure {
2756	my ($self, $x, $y, $w, $h) = @_;
2757
2758	$self->SUPER::configure ($x, $y, $w, $h);
2759
2760	for my $child ($self->children) {	2745	for my $child ($self->children) {
2761	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2746	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2762		2747
2763	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2748	$X = List::Util::max 0, List::Util::min $w - $W, $X;
2764	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2749	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2765	$child->configure ($X, $Y, $W, $H);	2750	$child->configure ($X, $Y, $W, $H);
2766	}	2751	}
2767	}
2768		2752
2769	sub _topleft {	2753	$self->{old_w} = $w;
		2754	$self->{old_h} = $h;
		2755	}
		2756
		2757	sub coord2local {
2770	my ($self, $x, $y) = @_;	2758	my ($self, $x, $y) = @_;
2771		2759
2772	($x, $y)	2760	($x, $y)
2773	}	2761	}
2774		2762
		2763	sub coord2global {
		2764	my ($self, $x, $y) = @_;
		2765
		2766	($x, $y)
		2767	}
		2768
2775	sub update {	2769	sub update {
2776	my ($self) = @_;	2770	my ($self) = @_;
2777		2771
2778	$self->check_size;	2772	$self->check_size;
2779	::refresh ();	2773	$::WANT_REFRESH++;
2780	}	2774	}
2781		2775
2782	sub add {	2776	sub add {
2783	my ($self, $child) = @_;	2777	my ($self, $child) = @_;
2784		2778
2785	# integerize window positions	2779	# integerise window positions
2786	$child->{x} = int $child->{x};	2780	$child->{x} = int $child->{x};
2787	$child->{y} = int $child->{y};	2781	$child->{y} = int $child->{y};
2788		2782
2789	$self->SUPER::add ($child);	2783	$self->SUPER::add ($child);
2790	}	2784	}
…		…
2793	my ($self, $id, $cb) = @_;	2787	my ($self, $id, $cb) = @_;
2794		2788
2795	$self->{refresh_hook}{$id} = $cb;	2789	$self->{refresh_hook}{$id} = $cb;
2796	}	2790	}
2797		2791
2798	sub draw {	2792	sub draw {
2799	my ($self) = @_;	2793	my ($self) = @_;
2800		2794
		2795	if ($self->{check_size}) {
		2796	my @queue = ([], []);
		2797
		2798	for (;;) {
		2799	if ($self->{check_size}) {
		2800	# heuristic: check containers last
		2801	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2802	for values %{delete $self->{check_size}}
		2803	}
		2804
		2805	my $widget = (pop @{ $queue[0] }) \|\| (pop @{ $queue[1] }) \|\| last;
		2806
		2807	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2808	? @$widget{qw(user_w user_h)}
		2809	: $widget->size_request;
		2810
		2811	if (delete $widget->{force_alloc}
		2812	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		2813	Carp::confess "$widget: size_request is negative" if $w < 0 \|\| $h < 0;#d#
		2814
		2815	$widget->{req_w} = $w;
		2816	$widget->{req_h} = $h;
		2817
		2818	$self->{size_alloc}{$widget} = [$widget, $widget->{w} \|\| $w, $widget->{h} \|\| $h];
		2819
		2820	$widget->{parent}->check_size
		2821	if $widget->{parent};
		2822	}
		2823	}
		2824	}
		2825
		2826	while ($self->{size_alloc}) {
		2827	for (values %{delete $self->{size_alloc}}) {
		2828	my ($widget, $w, $h) = @$_;
		2829
		2830	$w = 0 if $w < 0;
		2831	$h = 0 if $h < 0;
		2832
		2833	$widget->{w} = $w;
		2834	$widget->{h} = $h;
		2835	$widget->size_allocate ($w, $h);
		2836	$widget->emit (size_allocate => $w, $h);
		2837	}
		2838	}
		2839
2801	while (my $rcb = delete $self->{refresh_hook}) {	2840	while ($self->{refresh_hook}) {
2802	$_->() for values %$rcb;	2841	$_->()
		2842	for values %{delete $self->{refresh_hook}};
2803	}	2843	}
2804		2844
2805	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2845	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2806	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2846	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2807	glClear GL_COLOR_BUFFER_BIT;	2847	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.189 by root, Mon May 8 22:17:24 2006 UTC vs. Revision 1.197 by root, Fri May 12 01:47:04 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.189 by root, Mon May 8 22:17:24 2006 UTC vs.
Revision 1.197 by root, Fri May 12 01:47:04 2006 UTC