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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.85 by root, Thu Jun 1 05:04:34 2006 UTC vs. Revision 1.215 by root, Wed Jan 18 13:42:19 2012 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.85 by root, Thu Jun 1 05:04:34 2006 UTC vs.
Revision 1.215 by root, Wed Jan 18 13:42:19 2012 UTC