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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.88 by root, Mon Jun 5 05:31:13 2006 UTC vs.
Revision 1.101 by elmex, Sat Jul 22 12:18:01 2006 UTC

…		…
24	use utf8;	24	use utf8;
25		25
26	use Carp ();	26	use Carp ();
27	use AnyEvent ();	27	use AnyEvent ();
28	use BerkeleyDB;	28	use BerkeleyDB;
29	use Pod::POM;	29	use Pod::POM ();
		30	use Scalar::Util ();
		31	use Storable (); # finally
		32
		33	package CFClient::PodToPango;
		34
		35	use base Pod::POM::View::Text;
		36
		37	our $VERSION = 1; # bump if resultant formatting changes
		38
		39	our $indent = 0;
		40
		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	}
		53
		54	sub view_item {
		55	("\t" x ($indent / 4))
		56	. $_[1]->title->present ($_[0])
		57	. "\n\n"
		58	. $_[1]->content->present ($_[0])
		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;
30		115
31	sub find_rcfile($) {	116	sub find_rcfile($) {
32	my $path;	117	my $path;
33		118
34	for (grep !ref, @INC) {	119	for (grep !ref, @INC) {
…		…
67	$::CFG->{VERSION} = $::VERSION;	152	$::CFG->{VERSION} = $::VERSION;
68	print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);	153	print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
69	}	154	}
70		155
71	close CFG;	156	close CFG;
72	}
73
74	my %POD_CACHE;
75
76	sub load_pod($) {
77	$POD_CACHE{$_[0]} \|\|= do {
78	my $pod = do {
79	local $/;
80	open my $pod, "<:utf8", $_[0]
81	or die "$_[0]: $!";
82	<$pod>
83	};
84
85	Pod::POM->new->parse_text ($pod)
86	}
87	}	157	}
88		158
89	our $DB_ENV;	159	our $DB_ENV;
90		160
91	{	161	{
…		…
120	-Property => DB_CHKSUM,	190	-Property => DB_CHKSUM,
121	-Flags => DB_CREATE \| DB_UPGRADE,	191	-Flags => DB_CREATE \| DB_UPGRADE,
122	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"	192	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
123	}	193	}
124		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
125	sub pod_to_pango($) {	225	sub pod_to_pango($) {
126	my ($pom) = @_;	226	my ($pom) = @_;
127		227
128	$pom->present ("CFClient::PodToPango")	228	$pom->present ("CFClient::PodToPango")
129	}	229	}
…		…
135	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],	235	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],
136	split /\n/, $pom->present ("CFClient::PodToPango")	236	split /\n/, $pom->present ("CFClient::PodToPango")
137	]	237	]
138	}	238	}
139		239
140	package CFClient::PodToPango;	240	package CFClient::Layout;
141		241
142	use base Pod::POM::View::Text;	242	$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub {
143		243	reset_glyph_cache;
144	our $indent = 0;
145
146	*view_seq_code =
147	*view_seq_bold = sub { "<b>$_[1]</b>" };
148	*view_seq_italic = sub { "<i>$_[1]</i>" };
149	*view_seq_space =
150	*view_seq_link =
151	*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
152
153	sub view_seq_text {
154	my $text = $_[1];
155	$text =~ s/\s+/ /g;
156	CFClient::UI::Label::escape ($text)
157	}
158
159	sub view_item {
160	("\t" x ($indent / 4))
161	. $_[1]->title->present ($_[0])
162	. "\n"
163	. $_[1]->content->present ($_[0])
164	}
165
166	sub view_verbatim {
167	(join "",
168	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
169	split /\n/, CFClient::UI::Label::escape ($_[1]))
170	. "\n"
171	}
172
173	sub view_textblock {
174	("\t" x ($indent / 2)) . "$_[1]\n\n"
175	}
176
177	sub view_head1 {
178	"\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
179	. $_[1]->content->present ($_[0])
180	};	244	};
181
182	sub view_head2 {
183	"\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
184	. $_[1]->content->present ($_[0])
185	};
186
187	sub view_head3 {
188	"\n<span 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;
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		245
219	package CFClient::Item;	246	package CFClient::Item;
220		247
221	use strict;	248	use strict;
222	use Crossfire::Protocol::Constants;	249	use Crossfire::Protocol::Constants;
…		…
258	}	285	}
259		286
260	sub do_n_dialog {	287	sub do_n_dialog {
261	my ($cb) = @_;	288	my ($cb) = @_;
262		289
263	my $w = new CFClient::UI::FancyFrame;	290	my $w = new CFClient::UI::FancyFrame
		291	on_delete => sub { $_[0]->destroy; 1 },
		292	has_close_button => 1,
		293	;
		294
264	$w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");	295	$w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
265	$vb->add (new CFClient::UI::Label text => "Enter item count:");	296	$vb->add (new CFClient::UI::Label text => "Enter item count:");
266	$vb->add (my $entry = new CFClient::UI::Entry	297	$vb->add (my $entry = new CFClient::UI::Entry
267	text => $last_enter_count,	298	text => $last_enter_count,
268	on_activate => sub {	299	on_activate => sub {
269	my ($entry) = @_;	300	my ($entry) = @_;
270	$last_enter_count = $entry->get_text;	301	$last_enter_count = $entry->get_text;
271	$cb->($last_enter_count);	302	$cb->($last_enter_count);
272	$w->hide;	303	$w->hide;
273	$w = undef;	304	$w->destroy;
		305
		306	0
274	}	307	},
		308	on_escape => sub { $w->destroy; 1 },
275	);	309	);
276	$entry->focus_in;	310	$entry->grab_focus;
277	$w->show;	311	$w->show;
278
279	}	312	}
280		313
281	sub update_widgets {	314	sub update_widgets {
282	my ($self) = @_;	315	my ($self) = @_;
		316
		317	# necessary to avoid cyclic references
		318	Scalar::Util::weaken $self;
283		319
284	my $button_cb = sub {	320	my $button_cb = sub {
285	my (undef, $ev, $x, $y) = @_;	321	my (undef, $ev, $x, $y) = @_;
286		322
287	my $targ = $::CONN->{player}{tag};	323	my $targ = $::CONN->{player}{tag};
…		…
300	} elsif ($ev->{button} == 1) {	336	} elsif ($ev->{button} == 1) {
301	$::CONN->send ("examine $self->{tag}");	337	$::CONN->send ("examine $self->{tag}");
302	} elsif ($ev->{button} == 2) {	338	} elsif ($ev->{button} == 2) {
303	$::CONN->send ("apply $self->{tag}");	339	$::CONN->send ("apply $self->{tag}");
304	} elsif ($ev->{button} == 3) {	340	} elsif ($ev->{button} == 3) {
		341	my $move_prefix = $::CONN->{open_container} ? 'put' : 'drop';
		342	if ($self->{container} == $::CONN->{open_container}) {
		343	$move_prefix = "take";
		344	}
		345
305	my @menu_items = (	346	my @menu_items = (
306	["examine", sub { $::CONN->send ("examine $self->{tag}") }],	347	["examine", sub { $::CONN->send ("examine $self->{tag}") }],
307	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],	348	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
		349	["ignite/thaw", # first try of an easier use of flint&steel
		350	sub {
		351	$::CONN->send ("mark ". pack "N", $self->{tag});
		352	$::CONN->send ("command apply flint and steel");
		353	}
		354	],
308	["apply", sub { $::CONN->send ("apply $self->{tag}") }],	355	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
309	(	356	(
310	$self->{flags} & F_LOCKED	357	$self->{flags} & F_LOCKED
311	? (	358	? (
312	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],	359	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
313	)	360	)
314	: (	361	: (
315	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],	362	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
316	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],	363	["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }],
317	["move n",	364	["$move_prefix n",
318	sub {	365	sub {
319	do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })	366	do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
320	}	367	}
321	]	368	]
322	)	369	)
…		…
380	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")	427	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
381	. "\n\n$tooltip_std"	428	. "\n\n$tooltip_std"
382	);	429	);
383	}	430	}
384		431
385	package CFClient::Binder;
386
387	my @ALLOWED_MODIFIER_KEYS = (
388	CFClient::SDLK_LSHIFT,
389	CFClient::SDLK_LCTRL ,
390	CFClient::SDLK_LALT ,
391	CFClient::SDLK_LMETA ,
392
393	CFClient::SDLK_RSHIFT,
394	CFClient::SDLK_RCTRL ,
395	CFClient::SDLK_RALT ,
396	CFClient::SDLK_RMETA ,
397	);
398
399	my %ALLOWED_MODIFIERS = (
400	CFClient::KMOD_LSHIFT => "LSHIFT",
401	CFClient::KMOD_LCTRL => "LCTRL",
402	CFClient::KMOD_LALT => "LALT",
403	CFClient::KMOD_LMETA => "LMETA",
404
405	CFClient::KMOD_RSHIFT => "RSHIFT",
406	CFClient::KMOD_RCTRL => "RCTRL",
407	CFClient::KMOD_RALT => "RALT",
408	CFClient::KMOD_RMETA => "RMETA",
409	);
410
411	my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
412	my @DIRECT_BIND_KEYS = (
413	CFClient::SDLK_F1,
414	CFClient::SDLK_F2,
415	CFClient::SDLK_F3,
416	CFClient::SDLK_F4,
417	CFClient::SDLK_F5,
418	CFClient::SDLK_F6,
419	CFClient::SDLK_F7,
420	CFClient::SDLK_F8,
421	CFClient::SDLK_F9,
422	CFClient::SDLK_F10,
423	CFClient::SDLK_F11,
424	CFClient::SDLK_F12,
425	CFClient::SDLK_F13,
426	CFClient::SDLK_F14,
427	CFClient::SDLK_F15,
428	);
429
430	# this binding dialog asks for a key-combo to be pressed
431	# and if successful it calls the $cb with $mod and $sym as args.
432	sub open_binding_dialog {
433	my ($cb) = @_;
434
435	my $w = new CFClient::UI::FancyFrame
436	title => "Bind Action",
437	x => "center",
438	y => "center";
439
440	$w->add (my $vb = new CFClient::UI::VBox);
441	$vb->add (new CFClient::UI::Label
442	text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
443	."You can only bind 0-9 and F1-F15 without modifiers."
444	);
445	$vb->add (my $entry = new CFClient::UI::Entry
446	text => "",
447	on_key_down => sub {
448	my ($entry, $ev) = @_;
449
450	my $mod = $ev->{mod};
451	my $sym = $ev->{sym};
452
453	# XXX: This seems a little bit hackisch to me, but i have to ignore them
454	if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
455	return;
456	}
457
458	if ($mod == CFClient::KMOD_NONE
459	and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
460	and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
461	{
462	$::STATUSBOX->add (
463	"Can't bind key ".CFClient::SDL_GetKeyName ($sym)
464	." directly without modifier! It would damage the completer handling."
465	);
466	return;
467	}
468
469	$entry->focus_out;
470
471	$cb->($mod, $sym);
472
473	$w->destroy
474	});
475
476	$entry->focus_in;
477	$w->show;
478	}
479
480	sub keycombo_to_name {
481	my ($mod, $sym) = @_;
482
483	my $mods = join '+',
484	map { $ALLOWED_MODIFIERS{$_} }
485	grep { ($_ + 0) & ($mod + 0) }
486	keys %ALLOWED_MODIFIERS;
487	$mods .= "+" if $mods ne '';
488
489	return $mods . CFClient::SDL_GetKeyName ($sym);
490	}
491
492	package CFClient::Pickup;
493	# some pickup constants
494	sub PU_NOTHING { 0x00000000 }
495
496	sub PU_DEBUG { 0x10000000 }
497	sub PU_INHIBIT { 0x20000000 }
498	sub PU_STOP { 0x40000000 }
499	sub PU_NEWMODE { 0x80000000 }
500
501	sub PU_RATIO { 0x0000000F }
502
503	sub PU_FOOD { 0x00000010 }
504	sub PU_DRINK { 0x00000020 }
505	sub PU_VALUABLES { 0x00000040 }
506	sub PU_BOW { 0x00000080 }
507
508	sub PU_ARROW { 0x00000100 }
509	sub PU_HELMET { 0x00000200 }
510	sub PU_SHIELD { 0x00000400 }
511	sub PU_ARMOUR { 0x00000800 }
512
513	sub PU_BOOTS { 0x00001000 }
514	sub PU_GLOVES { 0x00002000 }
515	sub PU_CLOAK { 0x00004000 }
516	sub PU_KEY { 0x00008000 }
517
518	sub PU_MISSILEWEAPON { 0x00010000 }
519	sub PU_ALLWEAPON { 0x00020000 }
520	sub PU_MAGICAL { 0x00040000 }
521	sub PU_POTION { 0x00080000 }
522
523	sub PU_SPELLBOOK { 0x00100000 }
524	sub PU_SKILLSCROLL { 0x00200000 }
525	sub PU_READABLES { 0x00400000 }
526	sub PU_MAGIC_DEVICE { 0x00800000 }
527
528	sub PU_NOT_CURSED { 0x01000000 }
529
530	sub PU_JEWELS { 0x02000000 }
531
532
533	1;	432	1;
534		433
535	=back	434	=back
536		435
537	=head1 AUTHOR	436	=head1 AUTHOR

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.88 by root, Mon Jun 5 05:31:13 2006 UTC vs. Revision 1.101 by elmex, Sat Jul 22 12:18:01 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.88 by root, Mon Jun 5 05:31:13 2006 UTC vs.
Revision 1.101 by elmex, Sat Jul 22 12:18:01 2006 UTC