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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.87 by root, Mon Jun 5 05:23:19 2006 UTC vs.
Revision 1.100 by root, Sun Jul 16 20:04:07 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	sub load_pod($) {
75	my $pod = do {
76	local $/;
77	open my $pod, "<:utf8", $_[0]
78	or die "$_[0]: $!";
79	<$pod>
80	};
81
82	Pod::POM->new->parse_text ($pod);
83	}	157	}
84		158
85	our $DB_ENV;	159	our $DB_ENV;
86		160
87	{	161	{
…		…
116	-Property => DB_CHKSUM,	190	-Property => DB_CHKSUM,
117	-Flags => DB_CREATE \| DB_UPGRADE,	191	-Flags => DB_CREATE \| DB_UPGRADE,
118	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"	192	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
119	}	193	}
120		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
121	sub pod_to_pango($) {	225	sub pod_to_pango($) {
122	my ($pom) = @_;	226	my ($pom) = @_;
123		227
124	$pom->present ("CFClient::PodToPango")	228	$pom->present ("CFClient::PodToPango")
125	}	229	}
…		…
131	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],	235	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],
132	split /\n/, $pom->present ("CFClient::PodToPango")	236	split /\n/, $pom->present ("CFClient::PodToPango")
133	]	237	]
134	}	238	}
135		239
136	package CFClient::PodToPango;	240	package CFClient::Layout;
137		241
138	use base Pod::POM::View::Text;	242	$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub {
139		243	reset_glyph_cache;
140	our $indent = 0;
141
142	*view_seq_code =
143	*view_seq_bold = sub { "<b>$_[1]</b>" };
144	*view_seq_italic = sub { "<i>$_[1]</i>" };
145	*view_seq_space =
146	*view_seq_link =
147	*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
148
149	sub view_seq_text {
150	my $text = $_[1];
151	$text =~ s/\s+/ /g;
152	CFClient::UI::Label::escape ($text)
153	}
154
155	sub view_item {
156	("\t" x ($indent / 4))
157	. $_[1]->title->present ($_[0])
158	. "\n"
159	. $_[1]->content->present ($_[0])
160	}
161
162	sub view_verbatim {
163	(join "",
164	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
165	split /\n/, CFClient::UI::Label::escape ($_[1]))
166	. "\n"
167	}
168
169	sub view_textblock {
170	("\t" x ($indent / 2)) . "$_[1]\n\n"
171	}
172
173	sub view_head1 {
174	"\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
175	. $_[1]->content->present ($_[0])
176	};	244	};
177
178	sub view_head2 {
179	"\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
180	. $_[1]->content->present ($_[0])
181	};
182
183	sub view_head3 {
184	"\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
185	. $_[1]->content->present ($_[0])
186	};
187
188	sub view_over {
189	local $indent = $indent + $_[1]->indent;
190	$_[1]->content->present ($_[0])
191	}
192
193	package CFClient::Database;
194
195	our @ISA = BerkeleyDB::Btree::;
196
197	sub get($$) {
198	my $data;
199
200	$_[0]->db_get ($_[1], $data) == 0
201	? $data
202	: ()
203	}
204
205	my %DB_SYNC;
206
207	sub put($$$) {
208	my ($db, $key, $data) = @_;
209
210	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
211
212	$db->db_put ($key => $data)
213	}
214		245
215	package CFClient::Item;	246	package CFClient::Item;
216		247
217	use strict;	248	use strict;
218	use Crossfire::Protocol::Constants;	249	use Crossfire::Protocol::Constants;
…		…
254	}	285	}
255		286
256	sub do_n_dialog {	287	sub do_n_dialog {
257	my ($cb) = @_;	288	my ($cb) = @_;
258		289
259	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
260	$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");
261	$vb->add (new CFClient::UI::Label text => "Enter item count:");	296	$vb->add (new CFClient::UI::Label text => "Enter item count:");
262	$vb->add (my $entry = new CFClient::UI::Entry	297	$vb->add (my $entry = new CFClient::UI::Entry
263	text => $last_enter_count,	298	text => $last_enter_count,
264	on_activate => sub {	299	on_activate => sub {
265	my ($entry) = @_;	300	my ($entry) = @_;
266	$last_enter_count = $entry->get_text;	301	$last_enter_count = $entry->get_text;
267	$cb->($last_enter_count);	302	$cb->($last_enter_count);
268	$w->hide;	303	$w->hide;
269	$w = undef;	304	$w->destroy;
		305
		306	0
270	}	307	},
		308	on_escape => sub { $w->destroy; 1 },
271	);	309	);
272	$entry->focus_in;	310	$entry->grab_focus;
273	$w->show;	311	$w->show;
274
275	}	312	}
276		313
277	sub update_widgets {	314	sub update_widgets {
278	my ($self) = @_;	315	my ($self) = @_;
		316
		317	# necessary to avoid cyclic references
		318	Scalar::Util::weaken $self;
279		319
280	my $button_cb = sub {	320	my $button_cb = sub {
281	my (undef, $ev, $x, $y) = @_;	321	my (undef, $ev, $x, $y) = @_;
282		322
283	my $targ = $::CONN->{player}{tag};	323	my $targ = $::CONN->{player}{tag};
…		…
299	$::CONN->send ("apply $self->{tag}");	339	$::CONN->send ("apply $self->{tag}");
300	} elsif ($ev->{button} == 3) {	340	} elsif ($ev->{button} == 3) {
301	my @menu_items = (	341	my @menu_items = (
302	["examine", sub { $::CONN->send ("examine $self->{tag}") }],	342	["examine", sub { $::CONN->send ("examine $self->{tag}") }],
303	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],	343	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
		344	["ignite/thaw", # first try of an easier use of flint&steel
		345	sub {
		346	$::CONN->send ("mark ". pack "N", $self->{tag});
		347	$::CONN->send ("command apply flint and steel");
		348	}
		349	],
304	["apply", sub { $::CONN->send ("apply $self->{tag}") }],	350	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
305	(	351	(
306	$self->{flags} & F_LOCKED	352	$self->{flags} & F_LOCKED
307	? (	353	? (
308	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],	354	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
…		…
376	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")	422	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
377	. "\n\n$tooltip_std"	423	. "\n\n$tooltip_std"
378	);	424	);
379	}	425	}
380		426
381	package CFClient::Binder;
382
383	my @ALLOWED_MODIFIER_KEYS = (
384	CFClient::SDLK_LSHIFT,
385	CFClient::SDLK_LCTRL ,
386	CFClient::SDLK_LALT ,
387	CFClient::SDLK_LMETA ,
388
389	CFClient::SDLK_RSHIFT,
390	CFClient::SDLK_RCTRL ,
391	CFClient::SDLK_RALT ,
392	CFClient::SDLK_RMETA ,
393	);
394
395	my %ALLOWED_MODIFIERS = (
396	CFClient::KMOD_LSHIFT => "LSHIFT",
397	CFClient::KMOD_LCTRL => "LCTRL",
398	CFClient::KMOD_LALT => "LALT",
399	CFClient::KMOD_LMETA => "LMETA",
400
401	CFClient::KMOD_RSHIFT => "RSHIFT",
402	CFClient::KMOD_RCTRL => "RCTRL",
403	CFClient::KMOD_RALT => "RALT",
404	CFClient::KMOD_RMETA => "RMETA",
405	);
406
407	my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
408	my @DIRECT_BIND_KEYS = (
409	CFClient::SDLK_F1,
410	CFClient::SDLK_F2,
411	CFClient::SDLK_F3,
412	CFClient::SDLK_F4,
413	CFClient::SDLK_F5,
414	CFClient::SDLK_F6,
415	CFClient::SDLK_F7,
416	CFClient::SDLK_F8,
417	CFClient::SDLK_F9,
418	CFClient::SDLK_F10,
419	CFClient::SDLK_F11,
420	CFClient::SDLK_F12,
421	CFClient::SDLK_F13,
422	CFClient::SDLK_F14,
423	CFClient::SDLK_F15,
424	);
425
426	# this binding dialog asks for a key-combo to be pressed
427	# and if successful it calls the $cb with $mod and $sym as args.
428	sub open_binding_dialog {
429	my ($cb) = @_;
430
431	my $w = new CFClient::UI::FancyFrame
432	title => "Bind Action",
433	x => "center",
434	y => "center";
435
436	$w->add (my $vb = new CFClient::UI::VBox);
437	$vb->add (new CFClient::UI::Label
438	text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
439	."You can only bind 0-9 and F1-F15 without modifiers."
440	);
441	$vb->add (my $entry = new CFClient::UI::Entry
442	text => "",
443	on_key_down => sub {
444	my ($entry, $ev) = @_;
445
446	my $mod = $ev->{mod};
447	my $sym = $ev->{sym};
448
449	# XXX: This seems a little bit hackisch to me, but i have to ignore them
450	if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
451	return;
452	}
453
454	if ($mod == CFClient::KMOD_NONE
455	and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
456	and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
457	{
458	$::STATUSBOX->add (
459	"Can't bind key ".CFClient::SDL_GetKeyName ($sym)
460	." directly without modifier! It would damage the completer handling."
461	);
462	return;
463	}
464
465	$entry->focus_out;
466
467	$cb->($mod, $sym);
468
469	$w->destroy
470	});
471
472	$entry->focus_in;
473	$w->show;
474	}
475
476	sub keycombo_to_name {
477	my ($mod, $sym) = @_;
478
479	my $mods = join '+',
480	map { $ALLOWED_MODIFIERS{$_} }
481	grep { ($_ + 0) & ($mod + 0) }
482	keys %ALLOWED_MODIFIERS;
483	$mods .= "+" if $mods ne '';
484
485	return $mods . CFClient::SDL_GetKeyName ($sym);
486	}
487
488	package CFClient::Pickup;
489	# some pickup constants
490	sub PU_NOTHING { 0x00000000 }
491
492	sub PU_DEBUG { 0x10000000 }
493	sub PU_INHIBIT { 0x20000000 }
494	sub PU_STOP { 0x40000000 }
495	sub PU_NEWMODE { 0x80000000 }
496
497	sub PU_RATIO { 0x0000000F }
498
499	sub PU_FOOD { 0x00000010 }
500	sub PU_DRINK { 0x00000020 }
501	sub PU_VALUABLES { 0x00000040 }
502	sub PU_BOW { 0x00000080 }
503
504	sub PU_ARROW { 0x00000100 }
505	sub PU_HELMET { 0x00000200 }
506	sub PU_SHIELD { 0x00000400 }
507	sub PU_ARMOUR { 0x00000800 }
508
509	sub PU_BOOTS { 0x00001000 }
510	sub PU_GLOVES { 0x00002000 }
511	sub PU_CLOAK { 0x00004000 }
512	sub PU_KEY { 0x00008000 }
513
514	sub PU_MISSILEWEAPON { 0x00010000 }
515	sub PU_ALLWEAPON { 0x00020000 }
516	sub PU_MAGICAL { 0x00040000 }
517	sub PU_POTION { 0x00080000 }
518
519	sub PU_SPELLBOOK { 0x00100000 }
520	sub PU_SKILLSCROLL { 0x00200000 }
521	sub PU_READABLES { 0x00400000 }
522	sub PU_MAGIC_DEVICE { 0x00800000 }
523
524	sub PU_NOT_CURSED { 0x01000000 }
525
526	sub PU_JEWELS { 0x02000000 }
527
528
529	1;	427	1;
530		428
531	=back	429	=back
532		430
533	=head1 AUTHOR	431	=head1 AUTHOR

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.87 by root, Mon Jun 5 05:23:19 2006 UTC vs. Revision 1.100 by root, Sun Jul 16 20:04:07 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.87 by root, Mon Jun 5 05:23:19 2006 UTC vs.
Revision 1.100 by root, Sun Jul 16 20:04:07 2006 UTC