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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.95 by root, Sun Jul 2 13:57:57 2006 UTC vs.
Revision 1.192 by root, Wed Sep 3 10:36:25 2008 UTC

1	=head1 NAME	1	=head1 NAME
2		2
3	CFClient - undocumented utility garbage for our crossfire client	3	DC - undocumented utility garbage for our deliantra client
4		4
5	=head1 SYNOPSIS	5	=head1 SYNOPSIS
6		6
7	use CFClient;	7	use DC;
8		8
9	=head1 DESCRIPTION	9	=head1 DESCRIPTION
10		10
11	=over 4	11	=over 4
12		12
13	=cut	13	=cut
14		14
15	package CFClient;	15	package Deliantra::Client; # work around CPAN breakage
		16	package App::Deliantra; # try to reserve namespace
		17	package DC;
		18
		19	use Carp ();
		20
		21	our $VERSION;
16		22
17	BEGIN {	23	BEGIN {
18	$VERSION = '0.1';	24	$VERSION = '0.9975';
19		25
20	use XSLoader;	26	use XSLoader;
21	XSLoader::load "CFClient", $VERSION;	27	XSLoader::load "Deliantra::Client", $VERSION;
22	}	28	}
23		29
24	use utf8;	30	use utf8;
		31	use strict qw(vars subs);
25		32
26	use Carp ();
27	use AnyEvent ();	33	use AnyEvent ();
28	use BerkeleyDB;
29	use Pod::POM ();	34	use Pod::POM ();
30	use Scalar::Util ();	35	use File::Path ();
31	use Storable (); # finally	36	use Storable (); # finally
		37	use Fcntl ();
		38	use JSON::XS qw(encode_json decode_json);
32		39
33	package CFClient::PodToPango;	40	=item guard { BLOCK }
34		41
35	use base Pod::POM::View::Text;	42	Returns an object that executes the given block as soon as it is destroyed.
36		43
37	our $VERSION = 1; # bump if resultant formatting changes	44	=cut
38		45
39	our $indent = 0;	46	sub guard(&) {
40		47	bless \(my $cb = $_[0]), "DC::Guard"
41	*view_seq_code =
42	*view_seq_bold = sub { "<b>$_[1]</b>" };
43	*view_seq_italic = sub { "<i>$_[1]</i>" };
44	*view_seq_space =
45	*view_seq_link =
46	*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
47
48	sub view_seq_text {
49	my $text = $_[1];
50	$text =~ s/\s+/ /g;
51	CFClient::UI::Label::escape ($text)
52	}	48	}
53		49
54	sub view_item {	50	sub DC::Guard::DESTROY {
55	("\t" x ($indent / 4))	51	${$_[0]}->()
56	. $_[1]->title->present ($_[0])
57	. "\n\n"
58	. $_[1]->content->present ($_[0])
59	}	52	}
60		53
61	sub view_verbatim {	54	=item shorten $string[, $maxlength]
62	(join "",
63	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
64	split /\n/, CFClient::UI::Label::escape ($_[1]))
65	. "\n"
66	}
67		55
68	sub view_textblock {	56	=cut
69	("\t" x ($indent / 2)) . "$_[1]\n\n"
70	}
71		57
72	sub view_head1 {	58	sub shorten($;$) {
73	"\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"	59	my ($str, $len) = @_;
74	. $_[1]->content->present ($_[0])	60	substr $str, $len, (length $str), "..." if $len + 3 <= length $str;
75	};	61	$str
76
77	sub view_head2 {
78	"\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
79	. $_[1]->content->present ($_[0])
80	};
81
82	sub view_head3 {
83	"\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
84	. $_[1]->content->present ($_[0])
85	};
86
87	sub view_over {
88	local $indent = $indent + $_[1]->indent;
89	$_[1]->content->present ($_[0])
90	}	62	}
91		63
92	package CFClient::Database;	64	sub asxml($) {
		65	local $_ = $_[0];
93		66
94	our @ISA = BerkeleyDB::Btree::;	67	s/&/&/g;
		68	s/>/>/g;
		69	s/</</g;
95		70
96	sub get($$) {	71	$_
97	my $data;
98
99	$_[0]->db_get ($_[1], $data) == 0
100	? $data
101	: ()
102	}	72	}
103		73
104	my %DB_SYNC;	74	sub socketpipe() {
		75	socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
		76	or die "cannot establish bidirectional pipe: $!\n";
105		77
106	sub put($$$) {	78	($fh1, $fh2)
107	my ($db, $key, $data) = @_;
108
109	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
110
111	$db->db_put ($key => $data)
112	}	79	}
113		80
114	package CFClient;	81	sub background(&;&) {
		82	my ($bg, $cb) = @_;
		83
		84	my ($fh_r, $fh_w) = DC::socketpipe;
		85
		86	my $pid = fork;
		87
		88	if (defined $pid && !$pid) {
		89	local $SIG{__DIE__};
		90
		91	open STDOUT, ">&", $fh_w;
		92	open STDERR, ">&", $fh_w;
		93	close $fh_r;
		94	close $fh_w;
		95
		96	$\| = 1;
		97
		98	eval { $bg->() };
		99
		100	if ($@) {
		101	my $msg = $@;
		102	$msg =~ s/\n+/\n/;
		103	warn "FATAL: $msg";
		104	DC::_exit 1;
		105	}
		106
		107	# win32 is fucked up, of course. exit will clean stuff up,
		108	# which destroys our database etc. _exit will exit ALL
		109	# forked processes, because of the dreaded fork emulation.
		110	DC::_exit 0;
		111	}
		112
		113	close $fh_w;
		114
		115	my $buffer;
		116
		117	my $w; $w = AnyEvent->io (fh => $fh_r, poll => 'r', cb => sub {
		118	unless (sysread $fh_r, $buffer, 4096, length $buffer) {
		119	undef $w;
		120	$cb->();
		121	return;
		122	}
		123
		124	while ($buffer =~ s/^(.*)\n//) {
		125	my $line = $1;
		126	$line =~ s/\s+$//;
		127	utf8::decode $line;
		128	if ($line =~ /^\x{e877}json_msg (.*)$/s) {
		129	$cb->(JSON::XS->new->allow_nonref->decode ($1));
		130	} else {
		131	::message ({
		132	markup => "background($pid): " . DC::asxml $line,
		133	});
		134	}
		135	}
		136	});
		137	}
		138
		139	sub background_msg {
		140	my ($msg) = @_;
		141
		142	$msg = "\x{e877}json_msg " . JSON::XS->new->allow_nonref->encode ($msg);
		143	$msg =~ s/\n//g;
		144	utf8::encode $msg;
		145	print $msg, "\n";
		146	}
		147
		148	package DC;
		149
		150	our $RC_THEME;
		151	our %THEME;
		152	our @RC_PATH;
		153	our $RC_BASE;
		154
		155	for (grep !ref, @INC) {
		156	$RC_BASE = "$_/Deliantra/Client/private/resources";
		157	last if -d $RC_BASE;
		158	}
115		159
116	sub find_rcfile($) {	160	sub find_rcfile($) {
117	my $path;	161	my $path;
118		162
119	for (grep !ref, @INC) {	163	for (@RC_PATH, "") {
120	$path = "$_/CFClient/resources/$_[0]";	164	$path = "$RC_BASE/$_/$_[0]";
121	return $path if -r $path;	165	return $path if -r $path;
122	}	166	}
123		167
124	die "FATAL: can't find required file $_[0]\n";	168	die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
		169	}
		170
		171	sub load_json($) {
		172	my ($file) = @_;
		173
		174	open my $fh, $file
		175	or return;
		176
		177	local $/;
		178	JSON::XS->new->utf8->relaxed->decode (<$fh>)
		179	}
		180
		181	sub set_theme($) {
		182	return if $RC_THEME eq $_[0];
		183	$RC_THEME = $_[0];
		184
		185	# kind of hacky, find the main theme file, then load all theme files and merge them
		186
		187	%THEME = ();
		188	@RC_PATH = "theme-$RC_THEME";
		189
		190	my $theme = load_json find_rcfile "theme.json"
		191	or die "FATAL: theme resource file not found";
		192
		193	@RC_PATH = @{ $theme->{path} } if $theme->{path};
		194
		195	for (@RC_PATH, "") {
		196	my $theme = load_json "$RC_BASE/$_/theme.json"
		197	or next;
		198
		199	%THEME = ( %$theme, %THEME );
		200	}
125	}	201	}
126		202
127	sub read_cfg {	203	sub read_cfg {
128	my ($file) = @_;	204	my ($file) = @_;
129		205
130	open CFG, $file	206	$::CFG = load_json $file;
		207	}
		208
		209	sub write_cfg {
		210	my $file = "$Deliantra::VARDIR/client.cf";
		211
		212	$::CFG->{VERSION} = $::VERSION;
		213
		214	open my $fh, ">:utf8", $file
131	or return;	215	or return;
132		216	print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
133	my $CFG;
134
135	local $/;
136	$CFG = eval <CFG>;
137
138	$::CFG = $CFG;
139
140	close CFG;
141	}	217	}
142		218
143	sub write_cfg {	219	sub http_proxy {
144	my ($file) = @_;	220	my @proxy = win32_proxy_info;
145		221
146	open CFG, ">$file"	222	if (@proxy) {
		223	"http://" . (@proxy < 2 ? "" : @proxy < 3 ? "$proxy[1]\@" : "$proxy[1]:$proxy[2]\@") . $proxy[0]
		224	} elsif (exists $ENV{http_proxy}) {
		225	$ENV{http_proxy}
		226	} else {
		227	()
		228	}
		229	}
		230
		231	sub set_proxy {
		232	my $proxy = http_proxy
147	or return;	233	or return;
148		234
		235	$ENV{http_proxy} = $proxy;
		236	}
		237
		238	sub lwp_useragent {
		239	require LWP::UserAgent;
149	{	240
150	require Data::Dumper;	241	DC::set_proxy;
151	local $Data::Dumper::Purity = 1;
152	$::CFG->{VERSION} = $::VERSION;
153	print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
154	}
155		242
156	close CFG;	243	my $ua = LWP::UserAgent->new (
157	}	244	agent => "deliantra $VERSION",
158		245	keep_alive => 1,
159	our $DB_ENV;	246	env_proxy => 1,
160		247	timeout => 30,
161	{
162	use strict;
163
164	mkdir "$Crossfire::VARDIR/cfplus", 0777;
165	my $recover = $BerkeleyDB::db_version >= 4.4
166	? eval "DB_REGISTER \| DB_RECOVER"
167	: 0;
168
169	$DB_ENV = new BerkeleyDB::Env
170	-Home => "$Crossfire::VARDIR/cfplus",
171	-Cachesize => 1_000_000,
172	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
173	# -ErrPrefix => "DATABASE",
174	-Verbose => 1,
175	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN \| $recover,
176	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE,
177	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
178	}
179
180	sub db_table($) {
181	my ($table) = @_;
182
183	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
184
185	new CFClient::Database
186	-Env => $DB_ENV,
187	-Filename => $table,
188	# -Filename => "database",
189	# -Subname => $table,
190	-Property => DB_CHKSUM,
191	-Flags => DB_CREATE \| DB_UPGRADE,
192	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
193	}
194
195	my $pod_cache = db_table "pod_cache";
196
197	sub load_pod($$$$) {
198	my ($path, $filtertype, $filterversion, $filtercb) = @_;
199
200	stat $path
201	or die "$path: $!";
202
203	my $phash = join ",", $filterversion, $CFClient::PodToPango::VERSION, (stat _)[7,9];
204
205	my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } };
206
207	return $pom if $chash eq $phash;
208
209	my $pod = do {
210	local $/;
211	open my $pod, "<:utf8", $_[0]
212	or die "$_[0]: $!";
213	<$pod>
214	};
215
216	#utf8::downgrade $pod;
217
218	$pom = $filtercb-> (Pod::POM->new->parse_text ($pod));
219
220	$pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]);
221
222	$pom
223	}
224
225	sub pod_to_pango($) {
226	my ($pom) = @_;
227
228	$pom->present ("CFClient::PodToPango")
229	}
230
231	sub pod_to_pango_list($) {
232	my ($pom) = @_;
233
234	[
235	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],
236	split /\n/, $pom->present ("CFClient::PodToPango")
237	]
238	}
239
240	package CFClient::Item;
241
242	use strict;
243	use Crossfire::Protocol::Constants;
244
245	my $last_enter_count = 1;
246
247	sub desc_string {
248	my ($self) = @_;
249
250	my $desc =
251	$self->{nrof} < 2
252	? $self->{name}
253	: "$self->{nrof} × $self->{name_pl}";
254
255	$self->{flags} & F_OPEN
256	and $desc .= " (open)";
257	$self->{flags} & F_APPLIED
258	and $desc .= " (applied)";
259	$self->{flags} & F_UNPAID
260	and $desc .= " (unpaid)";
261	$self->{flags} & F_MAGIC
262	and $desc .= " (magic)";
263	$self->{flags} & F_CURSED
264	and $desc .= " (cursed)";
265	$self->{flags} & F_DAMNED
266	and $desc .= " (damned)";
267	$self->{flags} & F_LOCKED
268	and $desc .= " *";
269
270	$desc
271	}
272
273	sub weight_string {
274	my ($self) = @_;
275
276	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
277
278	$weight < 0 ? "?" : $weight * 0.001
279	}
280
281	sub do_n_dialog {
282	my ($cb) = @_;
283
284	my $w = new CFClient::UI::FancyFrame;
285	$w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
286	$vb->add (new CFClient::UI::Label text => "Enter item count:");
287	$vb->add (my $entry = new CFClient::UI::Entry
288	text => $last_enter_count,
289	on_activate => sub {
290	my ($entry) = @_;
291	$last_enter_count = $entry->get_text;
292	$cb->($last_enter_count);
293	$w->hide;
294	$w = undef;
295	}
296	);	248	);
297	$entry->grab_focus;
298	$w->show;
299
300	}	249	}
301		250
302	sub update_widgets {	251	sub lwp_check($) {
303	my ($self) = @_;	252	my ($res) = @_;
304		253
305	# necessary to avoid cyclic references	254	$res->is_error
306	Scalar::Util::weaken $self;	255	and die $res->status_line;
307		256
308	my $button_cb = sub {	257	$res
309	my (undef, $ev, $x, $y) = @_;	258	}
310		259
311	my $targ = $::CONN->{player}{tag};	260	sub fh_nonblocking($$) {
		261	my ($fh, $nb) = @_;
312		262
313	if ($self->{container} == $::CONN->{player}{tag}) {	263	if ($^O eq "MSWin32") {
314	$targ = $::CONN->{open_container};	264	$nb = (! ! $nb) + 0;
315	}	265	ioctl $fh, 0x8004667e, \$nb; # FIONBIO
316		266	} else {
317	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {	267	fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
318	$::CONN->send ("move $targ $self->{tag} 0")
319	if $targ \|\| !($self->{flags} & F_LOCKED);
320	} elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) {
321	$self->{flags} & F_LOCKED
322	? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
323	: $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
324	} elsif ($ev->{button} == 1) {
325	$::CONN->send ("examine $self->{tag}");
326	} elsif ($ev->{button} == 2) {
327	$::CONN->send ("apply $self->{tag}");
328	} elsif ($ev->{button} == 3) {
329	my @menu_items = (
330	["examine", sub { $::CONN->send ("examine $self->{tag}") }],
331	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
332	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
333	(
334	$self->{flags} & F_LOCKED
335	? (
336	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
337	)
338	: (
339	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
340	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
341	["move n",
342	sub {
343	do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
344	}
345	]
346	)
347	),
348	);
349
350	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
351	}
352
353	1
354	};	268	}
355
356	my $tooltip_std = "<small>"
357	. "Left click - examine item\n"
358	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
359	. "Middle click - apply\n"
360	. "Shift-Middle click - lock/unlock\n"
361	. "Right click - further options"
362	. "</small>\n";
363
364	$self->{face_widget} \|\|= new CFClient::UI::Face
365	can_events => 1,
366	can_hover => 1,
367	anim => $self->{anim},
368	animspeed => $self->{animspeed}, # TODO# must be set at creation time
369	on_button_down => $button_cb,
370	;
371	$self->{face_widget}{face} = $self->{face};
372	$self->{face_widget}{anim} = $self->{anim};
373	$self->{face_widget}{animspeed} = $self->{animspeed};
374	$self->{face_widget}->set_tooltip (
375	"<b>Face/Animation.</b>\n"
376	. "Item uses face #$self->{face}. "
377	. ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
378	. "\n\n$tooltip_std"
379	);
380
381	$self->{desc_widget} \|\|= new CFClient::UI::Label
382	can_events => 1,
383	can_hover => 1,
384	ellipsise => 2,
385	align => -1,
386	on_button_down => $button_cb,
387	;
388	my $desc = CFClient::Item::desc_string $self;
389	$self->{desc_widget}->set_text ($desc);
390	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
391
392	$self->{weight_widget} \|\|= new CFClient::UI::Label
393	can_events => 1,
394	can_hover => 1,
395	ellipsise => 0,
396	align => 0,
397	on_button_down => $button_cb,
398	;
399	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
400
401	$self->{weight_widget}->set_tooltip (
402	"<b>Weight</b>.\n"
403	. ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
404	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
405	. "\n\n$tooltip_std"
406	);
407	}	269	}
408		270
409	package CFClient::Binder;	271	package DC::Layout;
410		272
411	my @ALLOWED_MODIFIER_KEYS = (	273	$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
412	CFClient::SDLK_LSHIFT,	274	glyph_cache_restore;
413	CFClient::SDLK_LCTRL ,	275	};
414	CFClient::SDLK_LALT ,
415	CFClient::SDLK_LMETA ,
416		276
417	CFClient::SDLK_RSHIFT,	277	$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
418	CFClient::SDLK_RCTRL ,	278	glyph_cache_backup;
419	CFClient::SDLK_RALT ,	279	};
420	CFClient::SDLK_RMETA ,
421	);
422
423	my %ALLOWED_MODIFIERS = (
424	CFClient::KMOD_LSHIFT => "LSHIFT",
425	CFClient::KMOD_LCTRL => "LCTRL",
426	CFClient::KMOD_LALT => "LALT",
427	CFClient::KMOD_LMETA => "LMETA",
428
429	CFClient::KMOD_RSHIFT => "RSHIFT",
430	CFClient::KMOD_RCTRL => "RCTRL",
431	CFClient::KMOD_RALT => "RALT",
432	CFClient::KMOD_RMETA => "RMETA",
433	);
434
435	my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
436	my @DIRECT_BIND_KEYS = (
437	CFClient::SDLK_F1,
438	CFClient::SDLK_F2,
439	CFClient::SDLK_F3,
440	CFClient::SDLK_F4,
441	CFClient::SDLK_F5,
442	CFClient::SDLK_F6,
443	CFClient::SDLK_F7,
444	CFClient::SDLK_F8,
445	CFClient::SDLK_F9,
446	CFClient::SDLK_F10,
447	CFClient::SDLK_F11,
448	CFClient::SDLK_F12,
449	CFClient::SDLK_F13,
450	CFClient::SDLK_F14,
451	CFClient::SDLK_F15,
452	);
453
454	# this binding dialog asks for a key-combo to be pressed
455	# and if successful it calls the $cb with $mod and $sym as args.
456	sub open_binding_dialog {
457	my ($cb) = @_;
458
459	my $w = new CFClient::UI::FancyFrame
460	title => "Bind Action",
461	x => "center",
462	y => "center",
463	z => 1000,
464	has_close_button => 1;
465
466	$w->add (my $vb = new CFClient::UI::VBox);
467	$vb->add (new CFClient::UI::Label
468	text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
469	. "You can only bind 0-9 and F1-F15 without modifiers."
470	);
471	$vb->add (my $entry = new CFClient::UI::Entry
472	text => "",
473	on_key_down => sub {
474	my ($entry, $ev) = @_;
475
476	my $mod = $ev->{mod};
477	my $sym = $ev->{sym};
478
479	# XXX: This seems a little bit hackisch to me, but i have to ignore them
480	if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
481	return;
482	}
483
484	if ($mod == CFClient::KMOD_NONE
485	and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
486	and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
487	{
488	$::STATUSBOX->add (
489	"Can't bind key ".CFClient::SDL_GetKeyName ($sym)
490	." directly without modifier! It would damage the completer handling."
491	);
492	return;
493	}
494
495	$entry->grab_focus;
496
497	$cb->($mod, $sym);
498
499	$w->destroy
500	});
501
502	$entry->grab_focus;
503	$w->show;
504	}
505
506	sub keycombo_to_name {
507	my ($mod, $sym) = @_;
508
509	my $mods = join '+',
510	map { $ALLOWED_MODIFIERS{$_} }
511	grep { ($_ + 0) & ($mod + 0) }
512	keys %ALLOWED_MODIFIERS;
513	$mods .= "+" if $mods ne '';
514
515	return $mods . CFClient::SDL_GetKeyName ($sym);
516	}
517		280
518	1;	281	1;
519		282
520	=back	283	=back
521		284

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.95 by root, Sun Jul 2 13:57:57 2006 UTC vs. Revision 1.192 by root, Wed Sep 3 10:36:25 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.95 by root, Sun Jul 2 13:57:57 2006 UTC vs.
Revision 1.192 by root, Wed Sep 3 10:36:25 2008 UTC