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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.81 by elmex, Tue May 30 14:35:08 2006 UTC vs.
Revision 1.99 by elmex, Fri Jul 14 17:35:34 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 ();
		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;
29		115
30	sub find_rcfile($) {	116	sub find_rcfile($) {
31	my $path;	117	my $path;
32		118
33	for (grep !ref, @INC) {	119	for (grep !ref, @INC) {
…		…
68	}	154	}
69		155
70	close CFG;	156	close CFG;
71	}	157	}
72		158
73	mkdir "$Crossfire::VARDIR/cfplus", 0777;
74
75	our $DB_ENV;	159	our $DB_ENV;
76		160
77	{	161	{
78	use strict;	162	use strict;
79		163
		164	mkdir "$Crossfire::VARDIR/cfplus", 0777;
80	my $recover = $BerkeleyDB::db_version >= 4.4	165	my $recover = $BerkeleyDB::db_version >= 4.4
81	? eval "DB_REGISTER \| DB_RECOVER"	166	? eval "DB_REGISTER \| DB_RECOVER"
82	: 0;	167	: 0;
83		168
84	$DB_ENV = new BerkeleyDB::Env	169	$DB_ENV = new BerkeleyDB::Env
…		…
105	-Property => DB_CHKSUM,	190	-Property => DB_CHKSUM,
106	-Flags => DB_CREATE \| DB_UPGRADE,	191	-Flags => DB_CREATE \| DB_UPGRADE,
107	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"	192	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
108	}	193	}
109		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
110	sub pod_to_pango($) {	225	sub pod_to_pango($) {
111	my ($pom) = @_;	226	my ($pom) = @_;
112		227
113	$pom->present ("CFClient::PodToPango")	228	$pom->present ("CFClient::PodToPango")
114	}	229	}
…		…
120	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],	235	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],
121	split /\n/, $pom->present ("CFClient::PodToPango")	236	split /\n/, $pom->present ("CFClient::PodToPango")
122	]	237	]
123	}	238	}
124		239
125	package CFClient::PodToPango;	240	package CFClient::Layout;
126		241
127	use base Pod::POM::View::Text;	242	$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub {
128		243	reset_glyph_cache;
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	};	244	};
166
167	sub view_head2 {
168	"\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
169	. $_[1]->content->present ($_[0])
170	};
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		245
204	package CFClient::Item;	246	package CFClient::Item;
205		247
206	use strict;	248	use strict;
207	use Crossfire::Protocol::Constants;	249	use Crossfire::Protocol::Constants;
		250
		251	my $last_enter_count = 1;
208		252
209	sub desc_string {	253	sub desc_string {
210	my ($self) = @_;	254	my ($self) = @_;
211		255
212	my $desc =	256	my $desc =
…		…
238	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};	282	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
239		283
240	$weight < 0 ? "?" : $weight * 0.001	284	$weight < 0 ? "?" : $weight * 0.001
241	}	285	}
242		286
		287	sub do_n_dialog {
		288	my ($cb) = @_;
		289
		290	my $w = new CFClient::UI::FancyFrame;
		291	$w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
		292	$vb->add (new CFClient::UI::Label text => "Enter item count:");
		293	$vb->add (my $entry = new CFClient::UI::Entry
		294	text => $last_enter_count,
		295	on_activate => sub {
		296	my ($entry) = @_;
		297	$last_enter_count = $entry->get_text;
		298	$cb->($last_enter_count);
		299	$w->hide;
		300	$w = undef;
		301	}
		302	);
		303	$entry->grab_focus;
		304	$w->show;
		305
		306	}
		307
243	sub update_widgets {	308	sub update_widgets {
244	my ($self) = @_;	309	my ($self) = @_;
245		310
		311	# necessary to avoid cyclic references
		312	Scalar::Util::weaken $self;
		313
246	my $button_cb = sub {	314	my $button_cb = sub {
247	my (undef, $ev, $x, $y) = @_;	315	my (undef, $ev, $x, $y) = @_;
248		316
		317	my $targ = $::CONN->{player}{tag};
		318
		319	if ($self->{container} == $::CONN->{player}{tag}) {
		320	$targ = $::CONN->{open_container};
		321	}
		322
249	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {	323	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
250	my $targ = $::CONN->{player}{tag};
251
252	if ($self->{container} == $::CONN->{player}{tag}) {
253	$targ = $::CONN->{open_container};
254	}
255
256	$::CONN->send ("move $targ $self->{tag} 0")	324	$::CONN->send ("move $targ $self->{tag} 0")
257	if $targ \|\| !($self->{flags} & F_LOCKED);	325	if $targ \|\| !($self->{flags} & F_LOCKED);
		326	} elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) {
		327	$self->{flags} & F_LOCKED
		328	? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
		329	: $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
258	} elsif ($ev->{button} == 1) {	330	} elsif ($ev->{button} == 1) {
259	$::CONN->send ("examine $self->{tag}");	331	$::CONN->send ("examine $self->{tag}");
260	} elsif ($ev->{button} == 2) {	332	} elsif ($ev->{button} == 2) {
261	$::CONN->send ("apply $self->{tag}");	333	$::CONN->send ("apply $self->{tag}");
262	} elsif ($ev->{button} == 3) {	334	} elsif ($ev->{button} == 3) {
263	my @menu_items = (	335	my @menu_items = (
264	["examine", sub { $::CONN->send ("examine $self->{tag}") }],	336	["examine", sub { $::CONN->send ("examine $self->{tag}") }],
265	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],	337	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
		338	["ignite/thaw", # first try of an easier use of flint&steel
		339	sub {
		340	$::CONN->send ("mark ". pack "N", $self->{tag});
		341	$::CONN->send ("command apply flint and steel");
		342	}
		343	],
266	["apply", sub { $::CONN->send ("apply $self->{tag}") }],	344	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
267	(	345	(
268	$self->{flags} & F_LOCKED	346	$self->{flags} & F_LOCKED
269	? (	347	? (
270	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],	348	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
271	)	349	)
272	: (	350	: (
273	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],	351	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
274	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],	352	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
		353	["move n",
		354	sub {
		355	do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
		356	}
		357	]
275	)	358	)
276	),	359	),
277	);	360	);
278		361
279	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	362	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
…		…
284		367
285	my $tooltip_std = "<small>"	368	my $tooltip_std = "<small>"
286	. "Left click - examine item\n"	369	. "Left click - examine item\n"
287	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"	370	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
288	. "Middle click - apply\n"	371	. "Middle click - apply\n"
		372	. "Shift-Middle click - lock/unlock\n"
289	. "Right click - further options"	373	. "Right click - further options"
290	. "</small>\n";	374	. "</small>\n";
291		375
292	$self->{face_widget} \|\|= new CFClient::UI::Face	376	$self->{face_widget} \|\|= new CFClient::UI::Face
293	can_events => 1,	377	can_events => 1,
…		…
332	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")	416	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
333	. "\n\n$tooltip_std"	417	. "\n\n$tooltip_std"
334	);	418	);
335	}	419	}
336		420
337	package CFClient::Binder;
338
339	my @ALLOWED_MODIFIER_KEYS = (
340	(CFClient::SDLK_LSHIFT),
341	(CFClient::SDLK_LCTRL ),
342	(CFClient::SDLK_LALT ),
343	(CFClient::SDLK_LMETA ),
344
345	(CFClient::SDLK_RSHIFT),
346	(CFClient::SDLK_RCTRL ),
347	(CFClient::SDLK_RALT ),
348	(CFClient::SDLK_RMETA ),
349	);
350
351	my %ALLOWED_MODIFIERS = (
352	(CFClient::KMOD_LSHIFT) => "LSHIFT",
353	(CFClient::KMOD_LCTRL ) => "LCTRL",
354	(CFClient::KMOD_LALT ) => "LALT",
355	(CFClient::KMOD_LMETA ) => "LMETA",
356
357	(CFClient::KMOD_RSHIFT) => "RSHIFT",
358	(CFClient::KMOD_RCTRL ) => "RCTRL",
359	(CFClient::KMOD_RALT ) => "RALT",
360	(CFClient::KMOD_RMETA ) => "RMETA",
361	);
362
363	my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
364	my @DIRECT_BIND_KEYS = (
365	CFClient::SDLK_F1,
366	CFClient::SDLK_F2,
367	CFClient::SDLK_F3,
368	CFClient::SDLK_F4,
369	CFClient::SDLK_F5,
370	CFClient::SDLK_F6,
371	CFClient::SDLK_F7,
372	CFClient::SDLK_F8,
373	CFClient::SDLK_F9,
374	CFClient::SDLK_F10,
375	CFClient::SDLK_F11,
376	CFClient::SDLK_F12,
377	CFClient::SDLK_F13,
378	CFClient::SDLK_F14,
379	CFClient::SDLK_F15,
380	);
381
382	# this binding dialog asks for a key-combo to be pressed
383	# and if successful it calls the $cb with $mod and $sym as args.
384	sub open_binding_dialog {
385	my ($cb) = @_;
386
387	my $w = new CFClient::UI::FancyFrame
388	title => "Bind Action",
389	x => "center",
390	y => "center";
391
392	$w->add (my $vb = new CFClient::UI::VBox);
393	$vb->add (new CFClient::UI::Label
394	text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
395	."You can only bind 0-9 and F1-F15 without modifiers."
396	);
397	$vb->add (my $entry = new CFClient::UI::Entry
398	text => "",
399	on_key_down => sub {
400	my ($entry, $ev) = @_;
401
402	my $mod = $ev->{mod};
403	my $sym = $ev->{sym};
404
405	# XXX: This seems a little bit hackisch to me, but i have to ignore them
406	if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
407	return;
408	}
409
410	if ($mod == CFClient::KMOD_NONE
411	and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
412	and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
413	{
414	$::STATUSBOX->add (
415	"Can't bind key ".CFClient::SDL_GetKeyName ($sym)
416	." directly without modifier! It would damage the completer handling."
417	);
418	return;
419	}
420
421	$entry->focus_out;
422
423	$cb->($mod, $sym);
424
425	$w->destroy
426	});
427
428	$entry->focus_in;
429	$w->show;
430	}
431
432	sub keycombo_to_name {
433	my ($mod, $sym) = @_;
434
435	my $mods = join '+',
436	map { $ALLOWED_MODIFIERS{$_} }
437	grep { ($_ + 0) & ($mod + 0) }
438	keys %ALLOWED_MODIFIERS;
439	$mods .= "+" if $mods ne '';
440
441	return $mods . CFClient::SDL_GetKeyName ($sym);
442	}
443
444	1;	421	1;
445		422
446	=back	423	=back
447		424
448	=head1 AUTHOR	425	=head1 AUTHOR

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.81 by elmex, Tue May 30 14:35:08 2006 UTC vs. Revision 1.99 by elmex, Fri Jul 14 17:35:34 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.81 by elmex, Tue May 30 14:35:08 2006 UTC vs.
Revision 1.99 by elmex, Fri Jul 14 17:35:34 2006 UTC