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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.60 by root, Tue May 23 23:14:44 2006 UTC vs.
Revision 1.92 by root, Wed Jun 7 23:30:25 2006 UTC

…		…
18	$VERSION = '0.1';	18	$VERSION = '0.1';
19		19
20	use XSLoader;	20	use XSLoader;
21	XSLoader::load "CFClient", $VERSION;	21	XSLoader::load "CFClient", $VERSION;
22	}	22	}
		23
		24	use utf8;
23		25
24	use Carp ();	26	use Carp ();
25	use AnyEvent ();	27	use AnyEvent ();
26	use BerkeleyDB;	28	use BerkeleyDB;
		29	use Pod::POM ();
		30	use Scalar::Util ();
		31	use Storable (); # finally
27		32
28	use CFClient::OpenGL;	33	package CFClient::PodToPango;
29		34
30	our %GL_EXT;	35	use base Pod::POM::View::Text;
31	our $GL_VERSION;
32		36
33	our $GL_NPOT;	37	our $VERSION = 1; # bump if resultant formatting changes
34	our $GL_DEBUG = 1;
35		38
36	sub gl_init {	39	our $indent = 0;
37	$GL_VERSION = gl_version * 1;
38	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
39		40
40	$GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} \|\| $GL_VERSION >= 2;	41	*view_seq_code =
41	$GL_NPOT = 0 if gl_vendor =~ /ATI Technologies/; # ATI doesn't get it right...	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]) };
42		47
43	glDisable GL_COLOR_MATERIAL;	48	sub view_seq_text {
44	glShadeModel GL_FLAT;	49	my $text = $_[1];
45	glDisable GL_DITHER;	50	$text =~ s/\s+/ /g;
46	glDisable GL_DEPTH_TEST;	51	CFClient::UI::Label::escape ($text)
47	glDepthMask 0;
48	glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
49
50	CFClient::Texture::restore_state ();
51	}	52	}
52		53
53	sub gl_check {	54	sub view_item {
54	return unless $GL_DEBUG;	55	("\t" x ($indent / 4))
55		56	. $_[1]->title->present ($_[0])
56	if (my $error = glGetError) {	57	. "\n\n"
57	Carp::cluck sprintf "opengl error %x while %s", $error, &sprintf(@_);	58	. $_[1]->content->present ($_[0])
58	}
59	}	59	}
		60
		61	sub view_verbatim {
		62	(join "",
		63	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
		64	split /\n/, CFClient::UI::Label::escape ($_[1]))
		65	. "\n"
		66	}
		67
		68	sub view_textblock {
		69	("\t" x ($indent / 2)) . "$_[1]\n\n"
		70	}
		71
		72	sub view_head1 {
		73	"\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		74	. $_[1]->content->present ($_[0])
		75	};
		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	}
		91
		92	package CFClient::Database;
		93
		94	our @ISA = BerkeleyDB::Btree::;
		95
		96	sub get($$) {
		97	my $data;
		98
		99	$_[0]->db_get ($_[1], $data) == 0
		100	? $data
		101	: ()
		102	}
		103
		104	my %DB_SYNC;
		105
		106	sub put($$$) {
		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	}
		113
		114	package CFClient;
60		115
61	sub find_rcfile($) {	116	sub find_rcfile($) {
62	my $path;	117	my $path;
63		118
64	for (grep !ref, @INC) {	119	for (grep !ref, @INC) {
…		…
99	}	154	}
100		155
101	close CFG;	156	close CFG;
102	}	157	}
103		158
		159	our $DB_ENV;
		160
		161	{
		162	use strict;
		163
104	mkdir "$Crossfire::VARDIR/pclient", 0777;	164	mkdir "$Crossfire::VARDIR/cfplus", 0777;
		165	my $recover = $BerkeleyDB::db_version >= 4.4
		166	? eval "DB_REGISTER \| DB_RECOVER"
		167	: 0;
105		168
106	our $DB_ENV = new BerkeleyDB::Env	169	$DB_ENV = new BerkeleyDB::Env
107	-Home => "$Crossfire::VARDIR/pclient",	170	-Home => "$Crossfire::VARDIR/cfplus",
108	-Cachesize => 1_000_000,	171	-Cachesize => 1_000_000,
109	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",	172	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
110	# -ErrPrefix => "DATABASE",	173	# -ErrPrefix => "DATABASE",
111	-Verbose => 1,	174	-Verbose => 1,
112	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,	175	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN \| $recover,
		176	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE,
113	or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";	177	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
		178	}
114		179
115	sub db_table($) {	180	sub db_table($) {
116	my ($table) = @_;	181	my ($table) = @_;
117		182
118	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	183	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
119		184
120	new CFClient::Database	185	new CFClient::Database
121	-Env => $DB_ENV,	186	-Env => $DB_ENV,
122	-Filename => $table,	187	-Filename => $table,
123	# -Filename => "database",	188	# -Filename => "database",
124	# -Subname => $table,	189	# -Subname => $table,
125	-Property => DB_CHKSUM,	190	-Property => DB_CHKSUM,
126	-Flags => DB_CREATE \| DB_UPGRADE,	191	-Flags => DB_CREATE \| DB_UPGRADE,
127	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";	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
128	}	223	}
129		224
130	sub pod_to_pango($) {	225	sub pod_to_pango($) {
131	my ($pom) = @_;	226	my ($pom) = @_;
132		227
…		…
140	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],	235	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],
141	split /\n/, $pom->present ("CFClient::PodToPango")	236	split /\n/, $pom->present ("CFClient::PodToPango")
142	]	237	]
143	}	238	}
144		239
145	package CFClient::PodToPango;
146
147	use base Pod::POM::View::Text;
148
149	our $indent = 0;
150
151	*view_seq_code =
152	*view_seq_bold = sub { "<b>$_[1]</b>" };
153	*view_seq_italic = sub { "<i>$_[1]</i>" };
154	*view_seq_space =
155	*view_seq_link =
156	*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
157
158	sub view_seq_text {
159	my $text = $_[1];
160	$text =~ s/\s+/ /g;
161	CFClient::UI::Label::escape ($text)
162	}
163
164	sub view_item {
165	("\t" x ($indent / 4))
166	. $_[1]->title->present ($_[0])
167	. "\n"
168	. $_[1]->content->present ($_[0])
169	}
170
171	sub view_verbatim {
172	(join "",
173	map +("\t" x ($indent / 2)) . "$_\n",
174	split /\n/, CFClient::UI::Label::escape ($_[1]))
175	. "\n"
176	}
177
178	sub view_textblock {
179	("\t" x ($indent / 2)) . "$_[1]\n\n"
180	}
181
182	sub view_head1 {
183	"<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
184	. $_[1]->content->present ($_[0])
185	};
186
187	sub view_head2 {
188	"<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
189	. $_[1]->content->present ($_[0])
190	};
191
192	sub view_over {
193	local $indent = $indent + $_[1]->indent;
194	$_[1]->content->present ($_[0])
195	}
196
197	package CFClient::Database;	240	package CFClient::Item;
198
199	our @ISA = BerkeleyDB::Btree::;
200
201	sub get($$) {
202	my $data;
203
204	$_[0]->db_get ($_[1], $data) == 0
205	? $data
206	: ()
207	}
208
209	my %DB_SYNC;
210
211	sub put($$$) {
212	my ($db, $key, $data) = @_;
213
214	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
215
216	$db->db_put ($key => $data)
217	}
218
219	package CFClient::Texture;
220		241
221	use strict;	242	use strict;
		243	use Crossfire::Protocol::Constants;
222		244
223	use Scalar::Util;	245	my $last_enter_count = 1;
224		246
225	use CFClient::OpenGL;	247	sub desc_string {
226
227	my %TEXTURES;
228
229	sub new {
230	my ($class, %data) = @_;
231
232	my $self = bless {
233	internalformat => GL_RGBA,
234	format => GL_RGBA,
235	type => GL_UNSIGNED_BYTE,
236	%data,
237	}, $class;
238
239	Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
240
241	$self->upload;
242
243	$self
244	}
245
246	sub new_from_image {
247	my ($class, $image, %arg) = @_;
248
249	$class->new (image => $image, %arg)
250	}
251
252	sub new_from_file {
253	my ($class, $path, %arg) = @_;
254
255	open my $fh, "<:raw", $path
256	or die "$path: $!";
257
258	local $/;
259	$class->new_from_image (<$fh>, %arg)
260	}
261
262	#sub new_from_surface {
263	# my ($class, $surface) = @_;
264	#
265	# $surface->rgba;
266	#
267	# $class->new (
268	# data => $surface->pixels,
269	# w => $surface->width,
270	# h => $surface->height,
271	# )
272	#}
273
274	sub new_from_layout {
275	my ($class, $layout, %arg) = @_;
276
277	my ($w, $h, $data, $format, $internalformat) = $layout->render;
278
279	$class->new (
280	w => $w,
281	h => $h,
282	data => $data,
283	format => $format,
284	internalformat => $format,
285	type => GL_UNSIGNED_BYTE,
286	%arg,
287	)
288	}
289
290	sub new_from_opengl {
291	my ($class, $w, $h, $cb) = @_;
292
293	$class->new (w => $w \|\| 1, h => $h \|\| 1, render_cb => $cb)
294	}
295
296	sub topot {
297	(grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
298	}
299
300	sub upload {
301	my ($self) = @_;	248	my ($self) = @_;
302		249
303	return unless $GL_VERSION;	250	my $desc =
		251	$self->{nrof} < 2
		252	? $self->{name}
		253	: "$self->{nrof} × $self->{name_pl}";
304		254
305	my $data;	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 .= " *";
306		269
307	if (exists $self->{data}) {	270	$desc
308	$data = $self->{data};	271	}
309		272
310	} elsif (exists $self->{render_cb}) {	273	sub weight_string {
311	glViewport 0, 0, $self->{w}, $self->{h};	274	my ($self) = @_;
312	glMatrixMode GL_PROJECTION;
313	glLoadIdentity;
314	glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
315	glMatrixMode GL_MODELVIEW;
316	glLoadIdentity;
317	$self->{render_cb}->($self, $self->{w}, $self->{h});
318		275
319	} else {	276	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
320	($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
321	= CFClient::load_image_inline $self->{image};
322	}
323		277
324	my ($tw, $th) = @$self{qw(w h)};	278	$weight < 0 ? "?" : $weight * 0.001
		279	}
325		280
326	unless ($tw > 0 && $th > 0) {	281	sub do_n_dialog {
327	$tw = $th = 1;	282	my ($cb) = @_;
328	$data = "\x00" x 64;
329	}
330		283
331	$self->{minified} = [CFClient::average $tw, $th, $data]	284	my $w = new CFClient::UI::FancyFrame;
332	if $self->{minify};	285	$w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
333		286	$vb->add (new CFClient::UI::Label text => "Enter item count:");
334	unless ($GL_NPOT) {	287	$vb->add (my $entry = new CFClient::UI::Entry
335	# TODO: does not work for zero-sized textures	288	text => $last_enter_count,
336	$tw = topot $tw;	289	on_activate => sub {
337	$th = topot $th;	290	my ($entry) = @_;
338		291	$last_enter_count = $entry->get_text;
339	if (($tw != $self->{w} \|\| $th != $self->{h}) && defined $data) {	292	$cb->($last_enter_count);
340	my $bpp = (length $data) / ($self->{w} * $self->{h});	293	$w->hide;
341	$data = pack "(a" . ($tw * $bpp) . ")*",	294	$w = undef;
342	unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
343	$data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
344	}	295	}
		296	);
		297	$entry->focus_in;
		298	$w->show;
		299
		300	}
		301
		302	sub update_widgets {
		303	my ($self) = @_;
		304
		305	# necessary to avoid cyclic references
		306	Scalar::Util::weaken $self;
		307
		308	my $button_cb = sub {
		309	my (undef, $ev, $x, $y) = @_;
		310
		311	my $targ = $::CONN->{player}{tag};
		312
		313	if ($self->{container} == $::CONN->{player}{tag}) {
		314	$targ = $::CONN->{open_container};
		315	}
		316
		317	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		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
345	}	354	};
346		355
347	$self->{s} = $self->{w} / $tw;	356	my $tooltip_std = "<small>"
348	$self->{t} = $self->{h} / $th;	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";
349		363
350	$self->{name} \|\|= glGenTexture;	364	$self->{face_widget} \|\|= new CFClient::UI::Face
351		365	can_events => 1,
352	glBindTexture GL_TEXTURE_2D, $self->{name};	366	can_hover => 1,
353		367	anim => $self->{anim},
354	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;	368	animspeed => $self->{animspeed}, # TODO# must be set at creation time
355	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;	369	on_button_down => $button_cb,
356
357	if ($::FAST) {
358	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
359	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
360	} elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
361	# alternatively check for 0x8191
362	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
363	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
364	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
365	} else {
366	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
367	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
368	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
369	}	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	);
370		380
371	glGetError;	381	$self->{desc_widget} \|\|= new CFClient::UI::Label
372		382	can_events => 1,
373	if (defined $data) {	383	can_hover => 1,
374	glTexImage2D GL_TEXTURE_2D, 0,	384	ellipsise => 2,
375	$self->{internalformat},	385	align => -1,
376	$tw, $th,	386	on_button_down => $button_cb,
377	0,
378	$self->{format},
379	$self->{type},
380	$data;
381	CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
382	$tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
383	} else {
384	glCopyTexImage2D GL_TEXTURE_2D, 0,
385	$self->{internalformat},
386	0, 0,
387	$tw, $th,
388	0;
389	CFClient::gl_check "copying to texture %dx%d if=%x",
390	$tw, $th, $self->{internalformat};
391	}	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");
392		391
393	glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side	392	$self->{weight_widget} \|\|= new CFClient::UI::Label
394	}	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);
395		400
396	sub DESTROY {	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	}
		408
		409	package CFClient::Binder;
		410
		411	my @ALLOWED_MODIFIER_KEYS = (
		412	CFClient::SDLK_LSHIFT,
		413	CFClient::SDLK_LCTRL ,
		414	CFClient::SDLK_LALT ,
		415	CFClient::SDLK_LMETA ,
		416
		417	CFClient::SDLK_RSHIFT,
		418	CFClient::SDLK_RCTRL ,
		419	CFClient::SDLK_RALT ,
		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 {
397	my ($self) = @_;	457	my ($cb) = @_;
398		458
399	delete $TEXTURES{$self+0};	459	my $w = new CFClient::UI::FancyFrame
		460	title => "Bind Action",
		461	x => "center",
		462	y => "center";
400		463
401	glDeleteTexture delete $self->{name}	464	$w->add (my $vb = new CFClient::UI::VBox);
402	if $self->{name};	465	$vb->add (new CFClient::UI::Label
403	}	466	text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
		467	."You can only bind 0-9 and F1-F15 without modifiers."
		468	);
		469	$vb->add (my $entry = new CFClient::UI::Entry
		470	text => "",
		471	on_key_down => sub {
		472	my ($entry, $ev) = @_;
404		473
405	sub restore_state {	474	my $mod = $ev->{mod};
406	$_->upload	475	my $sym = $ev->{sym};
407	for values %TEXTURES;	476
		477	# XXX: This seems a little bit hackisch to me, but i have to ignore them
		478	if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
		479	return;
		480	}
		481
		482	if ($mod == CFClient::KMOD_NONE
		483	and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
		484	and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
		485	{
		486	$::STATUSBOX->add (
		487	"Can't bind key ".CFClient::SDL_GetKeyName ($sym)
		488	." directly without modifier! It would damage the completer handling."
		489	);
		490	return;
		491	}
		492
		493	$entry->focus_out;
		494
		495	$cb->($mod, $sym);
		496
		497	$w->destroy
		498	});
		499
		500	$entry->focus_in;
		501	$w->show;
		502	}
		503
		504	sub keycombo_to_name {
		505	my ($mod, $sym) = @_;
		506
		507	my $mods = join '+',
		508	map { $ALLOWED_MODIFIERS{$_} }
		509	grep { ($_ + 0) & ($mod + 0) }
		510	keys %ALLOWED_MODIFIERS;
		511	$mods .= "+" if $mods ne '';
		512
		513	return $mods . CFClient::SDL_GetKeyName ($sym);
408	}	514	}
409		515
410	1;	516	1;
411		517
412	=back	518	=back

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.60 by root, Tue May 23 23:14:44 2006 UTC vs. Revision 1.92 by root, Wed Jun 7 23:30:25 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.60 by root, Tue May 23 23:14:44 2006 UTC vs.
Revision 1.92 by root, Wed Jun 7 23:30:25 2006 UTC