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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.72 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.90 by root, Mon Jun 5 22:07:42 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 Storable (); # finally
		31
		32	package CFClient::PodToPango;
		33
		34	use base Pod::POM::View::Text;
		35
		36	our $VERSION = 1; # bump if resultant formatting changes
		37
		38	our $indent = 0;
		39
		40	*view_seq_code =
		41	*view_seq_bold = sub { "<b>$_[1]</b>" };
		42	*view_seq_italic = sub { "<i>$_[1]</i>" };
		43	*view_seq_space =
		44	*view_seq_link =
		45	*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
		46
		47	sub view_seq_text {
		48	my $text = $_[1];
		49	$text =~ s/\s+/ /g;
		50	CFClient::UI::Label::escape ($text)
		51	}
		52
		53	sub view_item {
		54	("\t" x ($indent / 4))
		55	. $_[1]->title->present ($_[0])
		56	. "\n"
		57	. $_[1]->content->present ($_[0])
		58	}
		59
		60	sub view_verbatim {
		61	(join "",
		62	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
		63	split /\n/, CFClient::UI::Label::escape ($_[1]))
		64	. "\n"
		65	}
		66
		67	sub view_textblock {
		68	("\t" x ($indent / 2)) . "$_[1]\n\n"
		69	}
		70
		71	sub view_head1 {
		72	"\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		73	. $_[1]->content->present ($_[0])
		74	};
		75
		76	sub view_head2 {
		77	"\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		78	. $_[1]->content->present ($_[0])
		79	};
		80
		81	sub view_head3 {
		82	"\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		83	. $_[1]->content->present ($_[0])
		84	};
		85
		86	sub view_over {
		87	local $indent = $indent + $_[1]->indent;
		88	$_[1]->content->present ($_[0])
		89	}
		90
		91	package CFClient::Database;
		92
		93	our @ISA = BerkeleyDB::Btree::;
		94
		95	sub get($$) {
		96	my $data;
		97
		98	$_[0]->db_get ($_[1], $data) == 0
		99	? $data
		100	: ()
		101	}
		102
		103	my %DB_SYNC;
		104
		105	sub put($$$) {
		106	my ($db, $key, $data) = @_;
		107
		108	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
		109
		110	$db->db_put ($key => $data)
		111	}
		112
		113	package CFClient;
29		114
30	sub find_rcfile($) {	115	sub find_rcfile($) {
31	my $path;	116	my $path;
32		117
33	for (grep !ref, @INC) {	118	for (grep !ref, @INC) {
…		…
68	}	153	}
69		154
70	close CFG;	155	close CFG;
71	}	156	}
72		157
		158	our $DB_ENV;
		159
		160	{
		161	use strict;
		162
73	mkdir "$Crossfire::VARDIR/pclient", 0777;	163	mkdir "$Crossfire::VARDIR/cfplus", 0777;
		164	my $recover = $BerkeleyDB::db_version >= 4.4
		165	? eval "DB_REGISTER \| DB_RECOVER"
		166	: 0;
74		167
75	our $DB_ENV = new BerkeleyDB::Env	168	$DB_ENV = new BerkeleyDB::Env
76	-Home => "$Crossfire::VARDIR/pclient",	169	-Home => "$Crossfire::VARDIR/cfplus",
77	-Cachesize => 1_000_000,	170	-Cachesize => 1_000_000,
78	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",	171	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
79	# -ErrPrefix => "DATABASE",	172	# -ErrPrefix => "DATABASE",
80	-Verbose => 1,	173	-Verbose => 1,
81	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,	174	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN \| $recover,
		175	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE,
82	or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";	176	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
		177	}
83		178
84	sub db_table($) {	179	sub db_table($) {
85	my ($table) = @_;	180	my ($table) = @_;
86		181
87	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	182	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
88		183
89	new CFClient::Database	184	new CFClient::Database
90	-Env => $DB_ENV,	185	-Env => $DB_ENV,
91	-Filename => $table,	186	-Filename => $table,
92	# -Filename => "database",	187	# -Filename => "database",
93	# -Subname => $table,	188	# -Subname => $table,
94	-Property => DB_CHKSUM,	189	-Property => DB_CHKSUM,
95	-Flags => DB_CREATE \| DB_UPGRADE,	190	-Flags => DB_CREATE \| DB_UPGRADE,
96	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";	191	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
		192	}
		193
		194	my $pod_cache = db_table "pod_cache";
		195
		196	sub load_pod($$$$) {
		197	my ($path, $filtertype, $filterversion, $filtercb) = @_;
		198
		199	stat $path
		200	or die "$path: $!";
		201
		202	my $phash = join ",", $filterversion, $CFClient::PodToPango::VERSION, (stat _)[7,9];
		203
		204	my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } };
		205
		206	return $pom if $chash eq $phash;
		207
		208	my $pod = do {
		209	local $/;
		210	open my $pod, "<:utf8", $_[0]
		211	or die "$_[0]: $!";
		212	<$pod>
		213	};
		214
		215	#utf8::downgrade $pod;
		216
		217	$pom = $filtercb-> (Pod::POM->new->parse_text ($pod));
		218
		219	$pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]);
		220
		221	$pom
97	}	222	}
98		223
99	sub pod_to_pango($) {	224	sub pod_to_pango($) {
100	my ($pom) = @_;	225	my ($pom) = @_;
101		226
…		…
109	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],	234	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],
110	split /\n/, $pom->present ("CFClient::PodToPango")	235	split /\n/, $pom->present ("CFClient::PodToPango")
111	]	236	]
112	}	237	}
113		238
114	package CFClient::PodToPango;
115
116	use base Pod::POM::View::Text;
117
118	our $indent = 0;
119
120	*view_seq_code =
121	*view_seq_bold = sub { "<b>$_[1]</b>" };
122	*view_seq_italic = sub { "<i>$_[1]</i>" };
123	*view_seq_space =
124	*view_seq_link =
125	*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
126
127	sub view_seq_text {
128	my $text = $_[1];
129	$text =~ s/\s+/ /g;
130	CFClient::UI::Label::escape ($text)
131	}
132
133	sub view_item {
134	("\t" x ($indent / 4))
135	. $_[1]->title->present ($_[0])
136	. "\n"
137	. $_[1]->content->present ($_[0])
138	}
139
140	sub view_verbatim {
141	(join "",
142	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
143	split /\n/, CFClient::UI::Label::escape ($_[1]))
144	. "\n"
145	}
146
147	sub view_textblock {
148	("\t" x ($indent / 2)) . "$_[1]\n\n"
149	}
150
151	sub view_head1 {
152	"\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
153	. $_[1]->content->present ($_[0])
154	};
155
156	sub view_head2 {
157	"\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
158	. $_[1]->content->present ($_[0])
159	};
160
161	sub view_head3 {
162	"\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
163	. $_[1]->content->present ($_[0])
164	};
165
166	sub view_over {
167	local $indent = $indent + $_[1]->indent;
168	$_[1]->content->present ($_[0])
169	}
170
171	package CFClient::Database;
172
173	our @ISA = BerkeleyDB::Btree::;
174
175	sub get($$) {
176	my $data;
177
178	$_[0]->db_get ($_[1], $data) == 0
179	? $data
180	: ()
181	}
182
183	my %DB_SYNC;
184
185	sub put($$$) {
186	my ($db, $key, $data) = @_;
187
188	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
189
190	$db->db_put ($key => $data)
191	}
192
193	package CFClient::Item;	239	package CFClient::Item;
194		240
195	use strict;	241	use strict;
196	use Crossfire::Protocol::Constants;	242	use Crossfire::Protocol::Constants;
		243
		244	my $last_enter_count = 1;
197		245
198	sub desc_string {	246	sub desc_string {
199	my ($self) = @_;	247	my ($self) = @_;
200		248
201	my $desc =	249	my $desc =
…		…
227	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};	275	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
228		276
229	$weight < 0 ? "?" : $weight * 0.001	277	$weight < 0 ? "?" : $weight * 0.001
230	}	278	}
231		279
		280	sub do_n_dialog {
		281	my ($cb) = @_;
		282
		283	my $w = new CFClient::UI::FancyFrame;
		284	$w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
		285	$vb->add (new CFClient::UI::Label text => "Enter item count:");
		286	$vb->add (my $entry = new CFClient::UI::Entry
		287	text => $last_enter_count,
		288	on_activate => sub {
		289	my ($entry) = @_;
		290	$last_enter_count = $entry->get_text;
		291	$cb->($last_enter_count);
		292	$w->hide;
		293	$w = undef;
		294	}
		295	);
		296	$entry->focus_in;
		297	$w->show;
		298
		299	}
		300
232	sub update_widgets {	301	sub update_widgets {
233	my ($self) = @_;	302	my ($self) = @_;
234		303
235	my $button_cb = sub {	304	my $button_cb = sub {
236	my (undef, $ev, $x, $y) = @_;	305	my (undef, $ev, $x, $y) = @_;
237		306
		307	my $targ = $::CONN->{player}{tag};
		308
		309	if ($self->{container} == $::CONN->{player}{tag}) {
		310	$targ = $::CONN->{open_container};
		311	}
		312
238	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {	313	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
239	my $targ = $::CONN->{player}{tag};
240
241	if ($self->{container} == $::CONN->{player}{tag}) {
242	$targ = $::CONN->{open_container};
243	}
244
245	$::CONN->send ("move $targ $self->{tag} 0");	314	$::CONN->send ("move $targ $self->{tag} 0")
		315	if $targ \|\| !($self->{flags} & F_LOCKED);
		316	} elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) {
		317	$self->{flags} & F_LOCKED
		318	? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
		319	: $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
246	} elsif ($ev->{button} == 1) {	320	} elsif ($ev->{button} == 1) {
247	$::CONN->send ("examine $self->{tag}");	321	$::CONN->send ("examine $self->{tag}");
248	} elsif ($ev->{button} == 2) {	322	} elsif ($ev->{button} == 2) {
249	$::CONN->send ("apply $self->{tag}");	323	$::CONN->send ("apply $self->{tag}");
250	} elsif ($ev->{button} == 3) {	324	} elsif ($ev->{button} == 3) {
…		…
258	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],	332	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
259	)	333	)
260	: (	334	: (
261	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],	335	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
262	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],	336	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
		337	["move n",
		338	sub {
		339	do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
		340	}
		341	]
263	)	342	)
264	),	343	),
265	);	344	);
266		345
267	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	346	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
…		…
272		351
273	my $tooltip_std = "<small>"	352	my $tooltip_std = "<small>"
274	. "Left click - examine item\n"	353	. "Left click - examine item\n"
275	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"	354	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
276	. "Middle click - apply\n"	355	. "Middle click - apply\n"
		356	. "Shift-Middle click - lock/unlock\n"
277	. "Right click - further options"	357	. "Right click - further options"
278	. "</small>\n";	358	. "</small>\n";
279		359
280	$self->{face_widget} \|\|= new CFClient::UI::Face	360	$self->{face_widget} \|\|= new CFClient::UI::Face
281	can_events => 1,	361	can_events => 1,
…		…
320	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")	400	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
321	. "\n\n$tooltip_std"	401	. "\n\n$tooltip_std"
322	);	402	);
323	}	403	}
324		404
		405	package CFClient::Binder;
		406
		407	my @ALLOWED_MODIFIER_KEYS = (
		408	CFClient::SDLK_LSHIFT,
		409	CFClient::SDLK_LCTRL ,
		410	CFClient::SDLK_LALT ,
		411	CFClient::SDLK_LMETA ,
		412
		413	CFClient::SDLK_RSHIFT,
		414	CFClient::SDLK_RCTRL ,
		415	CFClient::SDLK_RALT ,
		416	CFClient::SDLK_RMETA ,
		417	);
		418
		419	my %ALLOWED_MODIFIERS = (
		420	CFClient::KMOD_LSHIFT => "LSHIFT",
		421	CFClient::KMOD_LCTRL => "LCTRL",
		422	CFClient::KMOD_LALT => "LALT",
		423	CFClient::KMOD_LMETA => "LMETA",
		424
		425	CFClient::KMOD_RSHIFT => "RSHIFT",
		426	CFClient::KMOD_RCTRL => "RCTRL",
		427	CFClient::KMOD_RALT => "RALT",
		428	CFClient::KMOD_RMETA => "RMETA",
		429	);
		430
		431	my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
		432	my @DIRECT_BIND_KEYS = (
		433	CFClient::SDLK_F1,
		434	CFClient::SDLK_F2,
		435	CFClient::SDLK_F3,
		436	CFClient::SDLK_F4,
		437	CFClient::SDLK_F5,
		438	CFClient::SDLK_F6,
		439	CFClient::SDLK_F7,
		440	CFClient::SDLK_F8,
		441	CFClient::SDLK_F9,
		442	CFClient::SDLK_F10,
		443	CFClient::SDLK_F11,
		444	CFClient::SDLK_F12,
		445	CFClient::SDLK_F13,
		446	CFClient::SDLK_F14,
		447	CFClient::SDLK_F15,
		448	);
		449
		450	# this binding dialog asks for a key-combo to be pressed
		451	# and if successful it calls the $cb with $mod and $sym as args.
		452	sub open_binding_dialog {
		453	my ($cb) = @_;
		454
		455	my $w = new CFClient::UI::FancyFrame
		456	title => "Bind Action",
		457	x => "center",
		458	y => "center";
		459
		460	$w->add (my $vb = new CFClient::UI::VBox);
		461	$vb->add (new CFClient::UI::Label
		462	text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
		463	."You can only bind 0-9 and F1-F15 without modifiers."
		464	);
		465	$vb->add (my $entry = new CFClient::UI::Entry
		466	text => "",
		467	on_key_down => sub {
		468	my ($entry, $ev) = @_;
		469
		470	my $mod = $ev->{mod};
		471	my $sym = $ev->{sym};
		472
		473	# XXX: This seems a little bit hackisch to me, but i have to ignore them
		474	if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
		475	return;
		476	}
		477
		478	if ($mod == CFClient::KMOD_NONE
		479	and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
		480	and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
		481	{
		482	$::STATUSBOX->add (
		483	"Can't bind key ".CFClient::SDL_GetKeyName ($sym)
		484	." directly without modifier! It would damage the completer handling."
		485	);
		486	return;
		487	}
		488
		489	$entry->focus_out;
		490
		491	$cb->($mod, $sym);
		492
		493	$w->destroy
		494	});
		495
		496	$entry->focus_in;
		497	$w->show;
		498	}
		499
		500	sub keycombo_to_name {
		501	my ($mod, $sym) = @_;
		502
		503	my $mods = join '+',
		504	map { $ALLOWED_MODIFIERS{$_} }
		505	grep { ($_ + 0) & ($mod + 0) }
		506	keys %ALLOWED_MODIFIERS;
		507	$mods .= "+" if $mods ne '';
		508
		509	return $mods . CFClient::SDL_GetKeyName ($sym);
		510	}
		511
325	1;	512	1;
326		513
327	=back	514	=back
328		515
329	=head1 AUTHOR	516	=head1 AUTHOR

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.72 by root, Sat May 27 20:46:54 2006 UTC vs. Revision 1.90 by root, Mon Jun 5 22:07:42 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.72 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.90 by root, Mon Jun 5 22:07:42 2006 UTC