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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.82 by root, Wed May 31 07:13:50 2006 UTC vs.
Revision 1.98 by root, Wed Jul 12 17:20:04 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	warn $recover;
84		168
85	$DB_ENV = new BerkeleyDB::Env	169	$DB_ENV = new BerkeleyDB::Env
86	-Home => "$Crossfire::VARDIR/cfplus",	170	-Home => "$Crossfire::VARDIR/cfplus",
87	-Cachesize => 1_000_000,	171	-Cachesize => 1_000_000,
88	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",	172	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
…		…
106	-Property => DB_CHKSUM,	190	-Property => DB_CHKSUM,
107	-Flags => DB_CREATE \| DB_UPGRADE,	191	-Flags => DB_CREATE \| DB_UPGRADE,
108	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"	192	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
109	}	193	}
110		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
111	sub pod_to_pango($) {	225	sub pod_to_pango($) {
112	my ($pom) = @_;	226	my ($pom) = @_;
113		227
114	$pom->present ("CFClient::PodToPango")	228	$pom->present ("CFClient::PodToPango")
115	}	229	}
…		…
121	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],	235	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],
122	split /\n/, $pom->present ("CFClient::PodToPango")	236	split /\n/, $pom->present ("CFClient::PodToPango")
123	]	237	]
124	}	238	}
125		239
126	package CFClient::PodToPango;	240	package CFClient::Layout;
127		241
128	use base Pod::POM::View::Text;	242	$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub {
129		243	reset_glyph_cache;
130	our $indent = 0;
131
132	*view_seq_code =
133	*view_seq_bold = sub { "<b>$_[1]</b>" };
134	*view_seq_italic = sub { "<i>$_[1]</i>" };
135	*view_seq_space =
136	*view_seq_link =
137	*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
138
139	sub view_seq_text {
140	my $text = $_[1];
141	$text =~ s/\s+/ /g;
142	CFClient::UI::Label::escape ($text)
143	}
144
145	sub view_item {
146	("\t" x ($indent / 4))
147	. $_[1]->title->present ($_[0])
148	. "\n"
149	. $_[1]->content->present ($_[0])
150	}
151
152	sub view_verbatim {
153	(join "",
154	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
155	split /\n/, CFClient::UI::Label::escape ($_[1]))
156	. "\n"
157	}
158
159	sub view_textblock {
160	("\t" x ($indent / 2)) . "$_[1]\n\n"
161	}
162
163	sub view_head1 {
164	"\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
165	. $_[1]->content->present ($_[0])
166	};	244	};
167
168	sub view_head2 {
169	"\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
170	. $_[1]->content->present ($_[0])
171	};
172
173	sub view_head3 {
174	"\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
175	. $_[1]->content->present ($_[0])
176	};
177
178	sub view_over {
179	local $indent = $indent + $_[1]->indent;
180	$_[1]->content->present ($_[0])
181	}
182
183	package CFClient::Database;
184
185	our @ISA = BerkeleyDB::Btree::;
186
187	sub get($$) {
188	my $data;
189
190	$_[0]->db_get ($_[1], $data) == 0
191	? $data
192	: ()
193	}
194
195	my %DB_SYNC;
196
197	sub put($$$) {
198	my ($db, $key, $data) = @_;
199
200	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
201
202	$db->db_put ($key => $data)
203	}
204		245
205	package CFClient::Item;	246	package CFClient::Item;
206		247
207	use strict;	248	use strict;
208	use Crossfire::Protocol::Constants;	249	use Crossfire::Protocol::Constants;
		250
		251	my $last_enter_count = 1;
209		252
210	sub desc_string {	253	sub desc_string {
211	my ($self) = @_;	254	my ($self) = @_;
212		255
213	my $desc =	256	my $desc =
…		…
239	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};	282	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
240		283
241	$weight < 0 ? "?" : $weight * 0.001	284	$weight < 0 ? "?" : $weight * 0.001
242	}	285	}
243		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
244	sub update_widgets {	308	sub update_widgets {
245	my ($self) = @_;	309	my ($self) = @_;
246		310
		311	# necessary to avoid cyclic references
		312	Scalar::Util::weaken $self;
		313
247	my $button_cb = sub {	314	my $button_cb = sub {
248	my (undef, $ev, $x, $y) = @_;	315	my (undef, $ev, $x, $y) = @_;
249		316
		317	my $targ = $::CONN->{player}{tag};
		318
		319	if ($self->{container} == $::CONN->{player}{tag}) {
		320	$targ = $::CONN->{open_container};
		321	}
		322
250	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {	323	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
251	my $targ = $::CONN->{player}{tag};
252
253	if ($self->{container} == $::CONN->{player}{tag}) {
254	$targ = $::CONN->{open_container};
255	}
256
257	$::CONN->send ("move $targ $self->{tag} 0")	324	$::CONN->send ("move $targ $self->{tag} 0")
258	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})
259	} elsif ($ev->{button} == 1) {	330	} elsif ($ev->{button} == 1) {
260	$::CONN->send ("examine $self->{tag}");	331	$::CONN->send ("examine $self->{tag}");
261	} elsif ($ev->{button} == 2) {	332	} elsif ($ev->{button} == 2) {
262	$::CONN->send ("apply $self->{tag}");	333	$::CONN->send ("apply $self->{tag}");
263	} elsif ($ev->{button} == 3) {	334	} elsif ($ev->{button} == 3) {
…		…
271	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],	342	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
272	)	343	)
273	: (	344	: (
274	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],	345	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
275	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],	346	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
		347	["move n",
		348	sub {
		349	do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
		350	}
		351	]
276	)	352	)
277	),	353	),
278	);	354	);
279		355
280	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	356	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
…		…
285		361
286	my $tooltip_std = "<small>"	362	my $tooltip_std = "<small>"
287	. "Left click - examine item\n"	363	. "Left click - examine item\n"
288	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"	364	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
289	. "Middle click - apply\n"	365	. "Middle click - apply\n"
		366	. "Shift-Middle click - lock/unlock\n"
290	. "Right click - further options"	367	. "Right click - further options"
291	. "</small>\n";	368	. "</small>\n";
292		369
293	$self->{face_widget} \|\|= new CFClient::UI::Face	370	$self->{face_widget} \|\|= new CFClient::UI::Face
294	can_events => 1,	371	can_events => 1,
…		…
333	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")	410	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
334	. "\n\n$tooltip_std"	411	. "\n\n$tooltip_std"
335	);	412	);
336	}	413	}
337		414
338	package CFClient::Binder;
339
340	my @ALLOWED_MODIFIER_KEYS = (
341	(CFClient::SDLK_LSHIFT),
342	(CFClient::SDLK_LCTRL ),
343	(CFClient::SDLK_LALT ),
344	(CFClient::SDLK_LMETA ),
345
346	(CFClient::SDLK_RSHIFT),
347	(CFClient::SDLK_RCTRL ),
348	(CFClient::SDLK_RALT ),
349	(CFClient::SDLK_RMETA ),
350	);
351
352	my %ALLOWED_MODIFIERS = (
353	(CFClient::KMOD_LSHIFT) => "LSHIFT",
354	(CFClient::KMOD_LCTRL ) => "LCTRL",
355	(CFClient::KMOD_LALT ) => "LALT",
356	(CFClient::KMOD_LMETA ) => "LMETA",
357
358	(CFClient::KMOD_RSHIFT) => "RSHIFT",
359	(CFClient::KMOD_RCTRL ) => "RCTRL",
360	(CFClient::KMOD_RALT ) => "RALT",
361	(CFClient::KMOD_RMETA ) => "RMETA",
362	);
363
364	my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
365	my @DIRECT_BIND_KEYS = (
366	CFClient::SDLK_F1,
367	CFClient::SDLK_F2,
368	CFClient::SDLK_F3,
369	CFClient::SDLK_F4,
370	CFClient::SDLK_F5,
371	CFClient::SDLK_F6,
372	CFClient::SDLK_F7,
373	CFClient::SDLK_F8,
374	CFClient::SDLK_F9,
375	CFClient::SDLK_F10,
376	CFClient::SDLK_F11,
377	CFClient::SDLK_F12,
378	CFClient::SDLK_F13,
379	CFClient::SDLK_F14,
380	CFClient::SDLK_F15,
381	);
382
383	# this binding dialog asks for a key-combo to be pressed
384	# and if successful it calls the $cb with $mod and $sym as args.
385	sub open_binding_dialog {
386	my ($cb) = @_;
387
388	my $w = new CFClient::UI::FancyFrame
389	title => "Bind Action",
390	x => "center",
391	y => "center";
392
393	$w->add (my $vb = new CFClient::UI::VBox);
394	$vb->add (new CFClient::UI::Label
395	text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
396	."You can only bind 0-9 and F1-F15 without modifiers."
397	);
398	$vb->add (my $entry = new CFClient::UI::Entry
399	text => "",
400	on_key_down => sub {
401	my ($entry, $ev) = @_;
402
403	my $mod = $ev->{mod};
404	my $sym = $ev->{sym};
405
406	# XXX: This seems a little bit hackisch to me, but i have to ignore them
407	if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
408	return;
409	}
410
411	if ($mod == CFClient::KMOD_NONE
412	and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
413	and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
414	{
415	$::STATUSBOX->add (
416	"Can't bind key ".CFClient::SDL_GetKeyName ($sym)
417	." directly without modifier! It would damage the completer handling."
418	);
419	return;
420	}
421
422	$entry->focus_out;
423
424	$cb->($mod, $sym);
425
426	$w->destroy
427	});
428
429	$entry->focus_in;
430	$w->show;
431	}
432
433	sub keycombo_to_name {
434	my ($mod, $sym) = @_;
435
436	my $mods = join '+',
437	map { $ALLOWED_MODIFIERS{$_} }
438	grep { ($_ + 0) & ($mod + 0) }
439	keys %ALLOWED_MODIFIERS;
440	$mods .= "+" if $mods ne '';
441
442	return $mods . CFClient::SDL_GetKeyName ($sym);
443	}
444
445	1;	415	1;
446		416
447	=back	417	=back
448		418
449	=head1 AUTHOR	419	=head1 AUTHOR

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.82 by root, Wed May 31 07:13:50 2006 UTC vs. Revision 1.98 by root, Wed Jul 12 17:20:04 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.82 by root, Wed May 31 07:13:50 2006 UTC vs.
Revision 1.98 by root, Wed Jul 12 17:20:04 2006 UTC